diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000..7d9f992d
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,4 @@
+# Team: Integrations & Extensibility
+# Slack: #eng-integrations-and-extensibility
+
+* @flipdishbytes/integrations-extensibility
diff --git a/Flipdish.sln b/Flipdish.sln
index d37ae6a4..f3b484ad 100644
--- a/Flipdish.sln
+++ b/Flipdish.sln
@@ -1,11 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-VisualStudioVersion = 12.0.0.0
-MinimumVisualStudioVersion = 10.0.0.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flipdish", "src\Flipdish\Flipdish.csproj", "{4BF29234-5C39-4B57-9AB7-A80BB4210A51}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flipdish.Test", "src\Flipdish.Test\Flipdish.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/README.md b/README.md
index 549dfe08..b7a3495b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# IO.Swagger - the C# library for the Flipdish Open API v1.0
+# Flipdish - the C# library for the Flipdish Open API v1.0
 
 No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
 
@@ -10,58 +10,36 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 <a name="frameworks-supported"></a>
 ## Frameworks supported
-- .NET 4.0 or later
-- Windows Phone 7.1 (Mango)
+- .NET Core >=1.0
+- .NET Framework >=4.6
+- Mono/Xamarin >=vNext
+- UWP >=10.0
 
 <a name="dependencies"></a>
 ## Dependencies
-- [RestSharp](https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
-- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later
-- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.2.0 or later
-
-The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
-```
-Install-Package RestSharp
-Install-Package Newtonsoft.Json
-Install-Package JsonSubTypes
-```
-
-NOTE: RestSharp versions greater than 105.1.0 have a bug which causes file uploads to fail. See [RestSharp#742](https://github.com/restsharp/RestSharp/issues/742)
+- FubarCoder.RestSharp.Portable.Core >=4.0.7
+- FubarCoder.RestSharp.Portable.HttpClient >=4.0.7
+- Newtonsoft.Json >=10.0.3
 
 <a name="installation"></a>
 ## Installation
-Run the following command to generate the DLL
-- [Mac/Linux] `/bin/sh build.sh`
-- [Windows] `build.bat`
+Generate the DLL using your preferred tool
 
 Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
 ```csharp
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 ```
-<a name="packaging"></a>
-## Packaging
-
-A `.nuspec` is included with the project. You can follow the Nuget quickstart to [create](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#create-the-package) and [publish](https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package#publish-the-package) packages.
-
-This `.nuspec` uses placeholders from the `.csproj`, so build the `.csproj` directly:
-
-```
-nuget pack -Build -OutputDirectory out IO.Swagger.csproj
-```
-
-Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-packages/local-feeds) or [other host](https://docs.microsoft.com/en-us/nuget/hosting-packages/overview) and consume the new package via Nuget as usual.
-
 <a name="getting-started"></a>
 ## Getting Started
 
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -74,12 +52,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var signupStepAction = signupStepAction_example;  // string | Signup step action
-            var answerId = 56;  // int? | Identifier of the answer
+            var signupStepAction = signupStepAction_example;  // string | 
+            var answerId = 56;  // int? | 
 
             try
             {
-                // Answer a signup question
                 apiInstance.AnswerSignUpQuestion(signupStepAction, answerId);
             }
             catch (Exception e)
@@ -99,94 +76,109 @@ All URIs are relative to *https://api.flipdish.co*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AccountsApi* | [**AnswerSignUpQuestion**](docs/AccountsApi.md#answersignupquestion) | **POST** /api/v1.0/accounts/signupstep/{signupStepAction}/answer | Answer a signup question
-*AccountsApi* | [**ChangePassword**](docs/AccountsApi.md#changepassword) | **PUT** /api/v1.0/accounts/password | Change password
-*AccountsApi* | [**ChangePasswordWithPin**](docs/AccountsApi.md#changepasswordwithpin) | **PUT** /api/v1.0/accounts/password/pin | Change password
-*AccountsApi* | [**CreateAccount**](docs/AccountsApi.md#createaccount) | **POST** /api/v1.0/accounts | Create account with email address and store name
-*AccountsApi* | [**GetAccountDetails**](docs/AccountsApi.md#getaccountdetails) | **GET** /api/v1.0/accounts | Gets the current account detail
-*AccountsApi* | [**GetLocalisedTimeZones**](docs/AccountsApi.md#getlocalisedtimezones) | **GET** /api/v1.0/accounts/timezones | [PRIVATE API] Get timezones localised to users language
-*AccountsApi* | [**Login**](docs/AccountsApi.md#login) | **POST** /api/v1.0/accounts/login | Login with username and password
-*AccountsApi* | [**LoginWithPin**](docs/AccountsApi.md#loginwithpin) | **POST** /api/v1.0/accounts/login/pin | Login with username and password
-*AccountsApi* | [**Logout**](docs/AccountsApi.md#logout) | **POST** /api/v1.0/accounts/logout | Log out. It removes Flipdish authorization Cookie.
-*AccountsApi* | [**PasswordResetWithToken**](docs/AccountsApi.md#passwordresetwithtoken) | **POST** /api/v1.0/accounts/password | Reset password with token.
-*AccountsApi* | [**RequestLoginPin**](docs/AccountsApi.md#requestloginpin) | **POST** /api/v1.0/accounts/pin | Request login PIN. The server sends the PIN to the email address.
-*AccountsApi* | [**RequestPasswordReset**](docs/AccountsApi.md#requestpasswordreset) | **POST** /api/v1.0/accounts/passwordreset | Request password reset. Flipdish system will send a token via email.
-*AccountsApi* | [**SendPinForPasswordReset**](docs/AccountsApi.md#sendpinforpasswordreset) | **POST** /api/v1.0/accounts/password/resetpin | Request Password Reset PIN. The server sends the PIN to the email address.
-*AccountsApi* | [**SkipSignupStep**](docs/AccountsApi.md#skipsignupstep) | **POST** /api/v1.0/accounts/signupstep/{signupStepAction}/skip | Skip a signup question
-*AccountsApi* | [**UpdateAccount**](docs/AccountsApi.md#updateaccount) | **PUT** /api/v1.0/accounts | Update account with name and language
-*AddressApi* | [**FormByApp**](docs/AddressApi.md#formbyapp) | **GET** /api/v1.0/app/{appId}/address/form | Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language.
-*AddressApi* | [**FormByCountry**](docs/AddressApi.md#formbycountry) | **GET** /api/v1.0/address/country/{countryCode}/form | Provides a dyamic form definition for the given country code, with labels localized using the provided language.
-*AddressApi* | [**FormatGoogleAddress**](docs/AddressApi.md#formatgoogleaddress) | **POST** /api/v1.0/address/google | Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form.
-*AddressApi* | [**GetCountries**](docs/AddressApi.md#getcountries) | **GET** /api/v1.0/address/countries | Retuns a list of localised countries
-*ApmApi* | [**GetApmStatus**](docs/ApmApi.md#getapmstatus) | **GET** /api/v1.0/{appId}/apm/status | [PRIVATE API] Returns true if APM is enabled on at least one store in an application
-*ApmApi* | [**GetBasicStatistics**](docs/ApmApi.md#getbasicstatistics) | **GET** /api/v1.0/{appId}/apm/statistics | [PRIVATE API] Get Basic Statistics
-*ApmApi* | [**GetCalendarWeekStatistics**](docs/ApmApi.md#getcalendarweekstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/calendar | [PRIVATE API] Get Calendar statistics
-*ApmApi* | [**GetCallsStatistics**](docs/ApmApi.md#getcallsstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/calls/{aggregateDataBy} | [PRIVATE API] Get Calls Statistics
-*ApmApi* | [**GetOrderStatistics**](docs/ApmApi.md#getorderstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/orders/{aggregateDataBy} | [PRIVATE API] Get Order Statistics (Value of Orders)
-*ApmApi* | [**GetPaginatedCallList**](docs/ApmApi.md#getpaginatedcalllist) | **GET** /api/v1.0/{appId}/apm/calls | [PRIVATE API] Get paginated APM call list
-*AppStoreApi* | [**GetAppStoreApp**](docs/AppStoreApi.md#getappstoreapp) | **GET** /api/v1.0/appstore/apps/{appStoreAppId} | Get App store app
-*AppStoreApi* | [**GetAppStoreApps**](docs/AppStoreApi.md#getappstoreapps) | **GET** /api/v1.0/appstore/apps | Get list of App store app summaries
-*AppStoreConfigurationsApi* | [**CreateAppStoreConfig**](docs/AppStoreConfigurationsApi.md#createappstoreconfig) | **POST** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config | Create App store app configuration
-*AppStoreConfigurationsApi* | [**DeleteAppStoreConfig**](docs/AppStoreConfigurationsApi.md#deleteappstoreconfig) | **DELETE** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | Delete App store app configuration
-*AppStoreConfigurationsApi* | [**GetAppStoreConfig**](docs/AppStoreConfigurationsApi.md#getappstoreconfig) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | Get App store app configuration
-*AppStoreConfigurationsApi* | [**GetConfiguredAppSingleApp**](docs/AppStoreConfigurationsApi.md#getconfiguredappsingleapp) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId} | Get list of App store app configurations for one App store app
-*AppStoreConfigurationsApi* | [**GetConfiguredApps**](docs/AppStoreConfigurationsApi.md#getconfiguredapps) | **GET** /api/v1.0/{appId}/appstore/apps | Get list of App store apps which have been configured
-*AppStoreConfigurationsApi* | [**UpdateAppStoreConfig**](docs/AppStoreConfigurationsApi.md#updateappstoreconfig) | **PUT** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | Update App store app configuration
-*AppStoreDeveloperApi* | [**AppVerificationUpdate**](docs/AppStoreDeveloperApi.md#appverificationupdate) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/verification | Update App store app verification
-*AppStoreDeveloperApi* | [**CreateAppStoreApp**](docs/AppStoreDeveloperApi.md#createappstoreapp) | **POST** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps | Create App store app
-*AppStoreDeveloperApi* | [**DeleteAppStoreApp**](docs/AppStoreDeveloperApi.md#deleteappstoreapp) | **DELETE** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId} | Delete App store app
-*AppStoreDeveloperApi* | [**UpdateAppStoreApp**](docs/AppStoreDeveloperApi.md#updateappstoreapp) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId} | Update App store app
-*AppStoreDeveloperApi* | [**UploadAppStoreAppLogo**](docs/AppStoreDeveloperApi.md#uploadappstoreapplogo) | **POST** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/logo | Upload the App store app logo \\ icon
-*AppsApi* | [**GetApp**](docs/AppsApi.md#getapp) | **GET** /api/v1.0/apps/{appId} | Get the application configuration
-*AppsApi* | [**GetAppHostnameStatus**](docs/AppsApi.md#getapphostnamestatus) | **GET** /api/v1.0/apps/{appId}/hostnamestatus | Get the application hostname DNS delegation states for A and CNAME records.
-*AppsApi* | [**GetApps**](docs/AppsApi.md#getapps) | **GET** /api/v1.0/apps | Get Apps
-*AppsApi* | [**GetCompliance**](docs/AppsApi.md#getcompliance) | **GET** /api/v1.0/apps/{appId}/compliance | Get the application compliance configuration
-*AppsApi* | [**GetPanaceaVanityUrl**](docs/AppsApi.md#getpanaceavanityurl) | **GET** /api/v1.0/apps/{appId}/panacea/url | Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl]
-*AppsApi* | [**GetSupportedCountries**](docs/AppsApi.md#getsupportedcountries) | **GET** /api/v1.0/apps/supportedcountries | Get all supported countries.
-*AppsApi* | [**IsPanaceaVanityUrlAvailable**](docs/AppsApi.md#ispanaceavanityurlavailable) | **GET** /api/v1.0/apps/{appId}/panacea/url/available | Is panacea vanity url available
-*AppsApi* | [**SetAppConfig**](docs/AppsApi.md#setappconfig) | **POST** /api/v1.0/apps/{appId}/config | Set the application configuration
-*AppsApi* | [**SetAppHostname**](docs/AppsApi.md#setapphostname) | **POST** /api/v1.0/apps/{appId}/hostname | Set the application hostname.
-*AppsApi* | [**SetAppLanguages**](docs/AppsApi.md#setapplanguages) | **POST** /api/v1.0/apps/{appId}/config/languages | Set the application languages
-*AppsApi* | [**SetCompliance**](docs/AppsApi.md#setcompliance) | **POST** /api/v1.0/apps/{appId}/compliance | Set the application compliance configuration
-*AppsApi* | [**SetPanaceaVanityUrl**](docs/AppsApi.md#setpanaceavanityurl) | **POST** /api/v1.0/apps/{appId}/panacea/url | Set panacea vanity url
-*AppsApi* | [**UploadAppLogo**](docs/AppsApi.md#uploadapplogo) | **POST** /api/v1.0/apps/{appId}/logo | Set the application logo \\ icon
-*AuditLogsApi* | [**AddOrderAuditLog**](docs/AuditLogsApi.md#addorderauditlog) | **POST** /api/v1.0/auditlogs/orders/{orderId} | Create an order audit log event
-*AuditLogsApi* | [**AddStoreAuditLogEvent**](docs/AuditLogsApi.md#addstoreauditlogevent) | **POST** /api/v1.0/auditlogs/stores/{storeId} | Create a store audit log event
-*AuthorizationTokensApi* | [**GetAuthorizationTokens**](docs/AuthorizationTokensApi.md#getauthorizationtokens) | **GET** /api/v1.0/{appId}/authorizationtokens/{oauthAppId} | Get authorization tokens
-*AuthorizationTokensApi* | [**RevokeToken**](docs/AuthorizationTokensApi.md#revoketoken) | **DELETE** /api/v1.0/{appId}/authorizationtokens/{key} | Revoke token
-*BankAccountApi* | [**AttachBankAccountToStore**](docs/BankAccountApi.md#attachbankaccounttostore) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/store/{storeId} | [PRIVATE API] Attach Bank Account to Store
-*BankAccountApi* | [**CreateBankAccount**](docs/BankAccountApi.md#createbankaccount) | **POST** /api/v1.0/{appId}/bankaccounts | Create a new Bank Account and attach to this App
-*BankAccountApi* | [**DeleteBankAccount**](docs/BankAccountApi.md#deletebankaccount) | **DELETE** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | Delete BankAccount
-*BankAccountApi* | [**GetBankAccountById**](docs/BankAccountApi.md#getbankaccountbyid) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | Get BankAccount Detail by Id
-*BankAccountApi* | [**GetBankAccounts**](docs/BankAccountApi.md#getbankaccounts) | **GET** /api/v1.0/{appId}/bankaccounts | Get List of BankAccounts for WL
-*BankAccountApi* | [**GetCountriesWithFieldDefinitions**](docs/BankAccountApi.md#getcountrieswithfielddefinitions) | **GET** /api/v1.0/{appId}/bankaccounts/countries-field-definitions | Get bank account fields definitions
-*BankAccountApi* | [**GetFieldDefinitions**](docs/BankAccountApi.md#getfielddefinitions) | **GET** /api/v1.0/{appId}/bankaccounts/field-definitions | Get bank account fields definitions
-*BankAccountApi* | [**UpdateBankAccount**](docs/BankAccountApi.md#updatebankaccount) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | Update BankAccount
-*BankAccountApi* | [**UpdateBankAccountState**](docs/BankAccountApi.md#updatebankaccountstate) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/state/{state} | [PRIVATE API] Update State of Bank Account
-*CampaignsApi* | [**CreateLoyaltyCampaign**](docs/CampaignsApi.md#createloyaltycampaign) | **POST** /api/v1.0/{appId}/campaigns/loyalty | Creates loyalty campaign
-*CampaignsApi* | [**CreateRetentionCampaign**](docs/CampaignsApi.md#createretentioncampaign) | **POST** /api/v1.0/{appId}/campaigns/retention | Creates retention campaign
-*CampaignsApi* | [**GetLoyaltyCampaignsForApp**](docs/CampaignsApi.md#getloyaltycampaignsforapp) | **GET** /api/v1.0/{appId}/campaigns/loyalty | Gets loyalty campaigns for app
-*CampaignsApi* | [**GetLoyaltyCampaignsForStore**](docs/CampaignsApi.md#getloyaltycampaignsforstore) | **GET** /api/v1.0/{appId}/campaigns/loyalty/{storeId} | Gets loyalty campaigns for store
-*CampaignsApi* | [**GetRetentionCampaignsForApp**](docs/CampaignsApi.md#getretentioncampaignsforapp) | **GET** /api/v1.0/{appId}/campaigns/retention | Gets retention campaigns for app
-*CampaignsApi* | [**GetRetentionCampaignsForStore**](docs/CampaignsApi.md#getretentioncampaignsforstore) | **GET** /api/v1.0/{appId}/campaigns/retention/{storeId} | Gets retention campaigns for store
-*CampaignsApi* | [**GetStoreList**](docs/CampaignsApi.md#getstorelist) | **GET** /api/v1.0/{appId}/campaigns/stores | Gets list of stores for app
-*CampaignsApi* | [**RemoveCampaign**](docs/CampaignsApi.md#removecampaign) | **DELETE** /api/v1.0/{appId}/campaigns/{campaignId} | Deletes a campaign
-*CampaignsApi* | [**UpdateLoyaltyCampaign**](docs/CampaignsApi.md#updateloyaltycampaign) | **POST** /api/v1.0/{appId}/campaigns/loyalty/{campaignId} | Updates loyalty campaign
-*CampaignsApi* | [**UpdateRetentionCampaign**](docs/CampaignsApi.md#updateretentioncampaign) | **POST** /api/v1.0/{appId}/campaigns/retention/{campaignId} | Updates retention campaign
-*CardReadersApi* | [**AuthorizeStripeTerminal**](docs/CardReadersApi.md#authorizestripeterminal) | **POST** /api/v1.0/{appId}/stripeterminal/authorize | Get Authorization Key for Stripe Terminal
-*CardReadersApi* | [**CancelCurrentlyInitiatedBluetoothDeviceUpdate**](docs/CardReadersApi.md#cancelcurrentlyinitiatedbluetoothdeviceupdate) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/cancelUpdate | Cancel currently initiated install update for bluetooth terminal
-*CardReadersApi* | [**CancelReaderAction**](docs/CardReadersApi.md#cancelreaderaction) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/{readerId}/cancel_action | Cancel terminals action
-*CardReadersApi* | [**CardReadersGetReader**](docs/CardReadersApi.md#cardreadersgetreader) | **GET** /api/v1.0/{appId}/payments/terminals/stripe/{readerId} | Get reader
-*CardReadersApi* | [**GenerateStripeTerminalLocation**](docs/CardReadersApi.md#generatestripeterminallocation) | **POST** /api/v1.0/{appId}/stripeterminal/location | Get Location ID for Stripe Terminal
-*CardReadersApi* | [**GetBluetoothTerminalStatus**](docs/CardReadersApi.md#getbluetoothterminalstatus) | **GET** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/status | Get the status of the bluetooth terminal
-*CardReadersApi* | [**GetStripeConnectionToken**](docs/CardReadersApi.md#getstripeconnectiontoken) | **GET** /api/v1.0/{appId}/stripeterminal/connectiontoken | Get Connection Token For a Stripe Terminal
-*CardReadersApi* | [**InitiateBluetoothTerminalDeviceUpdateCheck**](docs/CardReadersApi.md#initiatebluetoothterminaldeviceupdatecheck) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/checkForUpdate | Trigger check for Bluetooth device update on Kiosk
-*CardReadersApi* | [**InitiateKioskBluetoothPairingMode**](docs/CardReadersApi.md#initiatekioskbluetoothpairingmode) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/pair | Initiate stripe terminal pairing mode
-*CardReadersApi* | [**InitiateKioskBluetoothUpdateInstall**](docs/CardReadersApi.md#initiatekioskbluetoothupdateinstall) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/installUpdate | Initiate Kiosk Update Install for bluetooth terminal
-*CardReadersApi* | [**InitiateReaderProcessPaymentIntent**](docs/CardReadersApi.md#initiatereaderprocesspaymentintent) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/{readerId}/processPaymentIntent | Initiate Stripe terminal to Process Payment Intent
+*AccountsApi* | [**AnswerSignUpQuestion**](docs/AccountsApi.md#answersignupquestion) | **POST** /api/v1.0/accounts/signupstep/{signupStepAction}/answer | 
+*AccountsApi* | [**ChangePassword**](docs/AccountsApi.md#changepassword) | **PUT** /api/v1.0/accounts/password | 
+*AccountsApi* | [**CreateAccount**](docs/AccountsApi.md#createaccount) | **POST** /api/v1.0/accounts | 
+*AccountsApi* | [**CreateBasicAccount**](docs/AccountsApi.md#createbasicaccount) | **POST** /api/v1.0/accounts/basic-account | 
+*AccountsApi* | [**GetAccountDetails**](docs/AccountsApi.md#getaccountdetails) | **GET** /api/v1.0/accounts | 
+*AccountsApi* | [**GetLocalisedTimeZones**](docs/AccountsApi.md#getlocalisedtimezones) | **GET** /api/v1.0/accounts/timezones | 
+*AccountsApi* | [**Login**](docs/AccountsApi.md#login) | **POST** /api/v1.0/accounts/login | 
+*AccountsApi* | [**LoginSso**](docs/AccountsApi.md#loginsso) | **POST** /api/v1.0/accounts/login/sso | 
+*AccountsApi* | [**Logout**](docs/AccountsApi.md#logout) | **POST** /api/v1.0/accounts/logout | 
+*AccountsApi* | [**PasswordResetWithToken**](docs/AccountsApi.md#passwordresetwithtoken) | **POST** /api/v1.0/accounts/password | 
+*AccountsApi* | [**RecaptchaValidate**](docs/AccountsApi.md#recaptchavalidate) | **POST** /api/v1.0/accounts/recaptcha | 
+*AccountsApi* | [**RequestPasswordReset**](docs/AccountsApi.md#requestpasswordreset) | **POST** /api/v1.0/accounts/passwordreset | 
+*AccountsApi* | [**SkipSignupStep**](docs/AccountsApi.md#skipsignupstep) | **POST** /api/v1.0/accounts/signupstep/{signupStepAction}/skip | 
+*AccountsApi* | [**UpdateAccount**](docs/AccountsApi.md#updateaccount) | **PUT** /api/v1.0/accounts | 
+*AddressApi* | [**AddressTemplates**](docs/AddressApi.md#addresstemplates) | **POST** /api/v1.0/address/templates | 
+*AddressApi* | [**FormByApp**](docs/AddressApi.md#formbyapp) | **GET** /api/v1.0/app/{appId}/address/form | 
+*AddressApi* | [**FormByCountry**](docs/AddressApi.md#formbycountry) | **GET** /api/v1.0/address/country/{countryCode}/form | 
+*AddressApi* | [**FormatGoogleAddress**](docs/AddressApi.md#formatgoogleaddress) | **POST** /api/v1.0/address/google | 
+*AddressApi* | [**GetCountries**](docs/AddressApi.md#getcountries) | **GET** /api/v1.0/address/countries | 
+*ApmApi* | [**GetApmStatus**](docs/ApmApi.md#getapmstatus) | **GET** /api/v1.0/{appId}/apm/status | 
+*ApmApi* | [**GetBasicStatistics**](docs/ApmApi.md#getbasicstatistics) | **GET** /api/v1.0/{appId}/apm/statistics | 
+*ApmApi* | [**GetCalendarWeekStatistics**](docs/ApmApi.md#getcalendarweekstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/calendar | 
+*ApmApi* | [**GetCallsStatistics**](docs/ApmApi.md#getcallsstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/calls/{aggregateDataBy} | 
+*ApmApi* | [**GetOrderStatistics**](docs/ApmApi.md#getorderstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/orders/{aggregateDataBy} | 
+*ApmApi* | [**GetPaginatedCallList**](docs/ApmApi.md#getpaginatedcalllist) | **GET** /api/v1.0/{appId}/apm/calls | 
+*AppStoreApi* | [**GetAppStoreApp**](docs/AppStoreApi.md#getappstoreapp) | **GET** /api/v1.0/appstore/apps/{appStoreAppId} | 
+*AppStoreApi* | [**GetAppStoreApps**](docs/AppStoreApi.md#getappstoreapps) | **GET** /api/v1.0/appstore/apps | 
+*AppStoreConfigurationsApi* | [**AppStoreConfigurationsAppStoreHandleOauthResponseCode**](docs/AppStoreConfigurationsApi.md#appstoreconfigurationsappstorehandleoauthresponsecode) | **GET** /api/v1.0/appstore/oauthresponse/{appStoreAppId}/responsecode | 
+*AppStoreConfigurationsApi* | [**CreateAppStoreConfig**](docs/AppStoreConfigurationsApi.md#createappstoreconfig) | **POST** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config | 
+*AppStoreConfigurationsApi* | [**DeleteAppStoreConfig**](docs/AppStoreConfigurationsApi.md#deleteappstoreconfig) | **DELETE** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | 
+*AppStoreConfigurationsApi* | [**ExecuteConfigurationAction**](docs/AppStoreConfigurationsApi.md#executeconfigurationaction) | **POST** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}/action | 
+*AppStoreConfigurationsApi* | [**GetAppStoreConfig**](docs/AppStoreConfigurationsApi.md#getappstoreconfig) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | 
+*AppStoreConfigurationsApi* | [**GetConfiguredAppSingleApp**](docs/AppStoreConfigurationsApi.md#getconfiguredappsingleapp) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId} | 
+*AppStoreConfigurationsApi* | [**GetConfiguredApps**](docs/AppStoreConfigurationsApi.md#getconfiguredapps) | **GET** /api/v1.0/{appId}/appstore/apps | 
+*AppStoreConfigurationsApi* | [**UpdateAppStoreConfig**](docs/AppStoreConfigurationsApi.md#updateappstoreconfig) | **PUT** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | 
+*AppStoreConfigurationsApi* | [**UpdateAppStoreConfigSettingValues**](docs/AppStoreConfigurationsApi.md#updateappstoreconfigsettingvalues) | **POST** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}/updatesettings | 
+*AppStoreDeveloperApi* | [**AppVerificationUpdate**](docs/AppStoreDeveloperApi.md#appverificationupdate) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/verification | 
+*AppStoreDeveloperApi* | [**CreateAppStoreApp**](docs/AppStoreDeveloperApi.md#createappstoreapp) | **POST** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps | 
+*AppStoreDeveloperApi* | [**DeleteAppStoreApp**](docs/AppStoreDeveloperApi.md#deleteappstoreapp) | **DELETE** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId} | 
+*AppStoreDeveloperApi* | [**GetAppExternalProduct**](docs/AppStoreDeveloperApi.md#getappexternalproduct) | **GET** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_product | 
+*AppStoreDeveloperApi* | [**GetExternalFunctionSigningKey**](docs/AppStoreDeveloperApi.md#getexternalfunctionsigningkey) | **GET** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_function_signing_key | 
+*AppStoreDeveloperApi* | [**UpdateAppStoreApp**](docs/AppStoreDeveloperApi.md#updateappstoreapp) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId} | 
+*AppStoreDeveloperApi* | [**UpdateExternalProduct**](docs/AppStoreDeveloperApi.md#updateexternalproduct) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_product | 
+*AppStoreDeveloperApi* | [**UploadAppStoreAppLogo**](docs/AppStoreDeveloperApi.md#uploadappstoreapplogo) | **POST** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/logo | 
+*AppStoreEntitlementsApi* | [**GetAppStoreAppEntitlements**](docs/AppStoreEntitlementsApi.md#getappstoreappentitlements) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/entitlements | 
+*AppsApi* | [**AppsSetPropertyId**](docs/AppsApi.md#appssetpropertyid) | **POST** /api/v1.0/apps/{appId}/orgId/{orgId} | 
+*AppsApi* | [**CreateApp**](docs/AppsApi.md#createapp) | **POST** /api/v1.0/apps | 
+*AppsApi* | [**GetApp**](docs/AppsApi.md#getapp) | **GET** /api/v1.0/apps/{appId} | 
+*AppsApi* | [**GetAppHostnameStatus**](docs/AppsApi.md#getapphostnamestatus) | **GET** /api/v1.0/apps/{appId}/hostnamestatus | 
+*AppsApi* | [**GetAppName**](docs/AppsApi.md#getappname) | **GET** /api/v1.0/apps/{appId}/name | 
+*AppsApi* | [**GetApps**](docs/AppsApi.md#getapps) | **GET** /api/v1.0/apps | 
+*AppsApi* | [**GetCompliance**](docs/AppsApi.md#getcompliance) | **GET** /api/v1.0/apps/{appId}/compliance | 
+*AppsApi* | [**GetPanaceaVanityUrl**](docs/AppsApi.md#getpanaceavanityurl) | **GET** /api/v1.0/apps/{appId}/panacea/url | 
+*AppsApi* | [**GetSupportedCountries**](docs/AppsApi.md#getsupportedcountries) | **GET** /api/v1.0/apps/supportedcountries | 
+*AppsApi* | [**IsPanaceaVanityUrlAvailable**](docs/AppsApi.md#ispanaceavanityurlavailable) | **GET** /api/v1.0/apps/{appId}/panacea/url/available | 
+*AppsApi* | [**LookupByWhitelabelId**](docs/AppsApi.md#lookupbywhitelabelid) | **GET** /api/v1.0/apps/{whitelabelId}/lookup | 
+*AppsApi* | [**SendPushNotification**](docs/AppsApi.md#sendpushnotification) | **POST** /api/v1.0/apps/{appId}/SendPushNotification/{customerId} | 
+*AppsApi* | [**SetAppConfig**](docs/AppsApi.md#setappconfig) | **POST** /api/v1.0/apps/{appId}/config | 
+*AppsApi* | [**SetAppHostname**](docs/AppsApi.md#setapphostname) | **POST** /api/v1.0/apps/{appId}/hostname | 
+*AppsApi* | [**SetAppLanguages**](docs/AppsApi.md#setapplanguages) | **POST** /api/v1.0/apps/{appId}/config/languages | 
+*AppsApi* | [**SetAppStoreName**](docs/AppsApi.md#setappstorename) | **POST** /api/v1.0/apps/{appId}/appstorename | 
+*AppsApi* | [**SetCompliance**](docs/AppsApi.md#setcompliance) | **POST** /api/v1.0/apps/{appId}/compliance | 
+*AppsApi* | [**SetPanaceaVanityUrl**](docs/AppsApi.md#setpanaceavanityurl) | **POST** /api/v1.0/apps/{appId}/panacea/url | 
+*AppsApi* | [**SetThirdPartyIntegrations**](docs/AppsApi.md#setthirdpartyintegrations) | **POST** /api/v1.0/apps/{appId}/third-party-integrations | 
+*AppsApi* | [**ToggleNextGenWeb**](docs/AppsApi.md#togglenextgenweb) | **POST** /api/v1.0/apps/{appId}/nextgenweb | 
+*AppsApi* | [**UploadAppLogo**](docs/AppsApi.md#uploadapplogo) | **POST** /api/v1.0/apps/{appId}/logo | 
+*AuditLogsApi* | [**AddOrderAuditLog**](docs/AuditLogsApi.md#addorderauditlog) | **POST** /api/v1.0/auditlogs/orders/{orderId} | 
+*AuditLogsApi* | [**AddStoreAuditLogEvent**](docs/AuditLogsApi.md#addstoreauditlogevent) | **POST** /api/v1.0/auditlogs/stores/{storeId} | 
+*AuthorizationTokensApi* | [**GetAuthorizationTokens**](docs/AuthorizationTokensApi.md#getauthorizationtokens) | **GET** /api/v1.0/{appId}/authorizationtokens/{oauthAppId} | 
+*AuthorizationTokensApi* | [**RevokeToken**](docs/AuthorizationTokensApi.md#revoketoken) | **DELETE** /api/v1.0/{appId}/authorizationtokens/{key} | 
+*BankAccountApi* | [**AttachBankAccountToStore**](docs/BankAccountApi.md#attachbankaccounttostore) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/store/{storeId} | 
+*BankAccountApi* | [**CreateBankAccount**](docs/BankAccountApi.md#createbankaccount) | **POST** /api/v1.0/{appId}/bankaccounts | 
+*BankAccountApi* | [**DeleteBankAccount**](docs/BankAccountApi.md#deletebankaccount) | **DELETE** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | 
+*BankAccountApi* | [**GetBankAccountById**](docs/BankAccountApi.md#getbankaccountbyid) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | 
+*BankAccountApi* | [**GetBankAccounts**](docs/BankAccountApi.md#getbankaccounts) | **GET** /api/v1.0/{appId}/bankaccounts | 
+*BankAccountApi* | [**GetCountriesWithFieldDefinitions**](docs/BankAccountApi.md#getcountrieswithfielddefinitions) | **GET** /api/v1.0/{appId}/bankaccounts/countries-field-definitions | 
+*BankAccountApi* | [**GetFieldDefinitions**](docs/BankAccountApi.md#getfielddefinitions) | **GET** /api/v1.0/{appId}/bankaccounts/field-definitions | 
+*BankAccountApi* | [**UpdateBankAccount**](docs/BankAccountApi.md#updatebankaccount) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | 
+*BankAccountApi* | [**UpdateBankAccountState**](docs/BankAccountApi.md#updatebankaccountstate) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/state/{state} | 
+*CampaignsApi* | [**CreateLoyaltyCampaign**](docs/CampaignsApi.md#createloyaltycampaign) | **POST** /api/v1.0/{appId}/campaigns/loyalty | 
+*CampaignsApi* | [**CreateRetentionCampaign**](docs/CampaignsApi.md#createretentioncampaign) | **POST** /api/v1.0/{appId}/campaigns/retention | 
+*CampaignsApi* | [**GetLoyaltyCampaignsForApp**](docs/CampaignsApi.md#getloyaltycampaignsforapp) | **GET** /api/v1.0/{appId}/campaigns/loyalty | 
+*CampaignsApi* | [**GetLoyaltyCampaignsForStore**](docs/CampaignsApi.md#getloyaltycampaignsforstore) | **GET** /api/v1.0/{appId}/campaigns/loyalty/{storeId} | 
+*CampaignsApi* | [**GetRetentionCampaignsForApp**](docs/CampaignsApi.md#getretentioncampaignsforapp) | **GET** /api/v1.0/{appId}/campaigns/retention | 
+*CampaignsApi* | [**GetRetentionCampaignsForStore**](docs/CampaignsApi.md#getretentioncampaignsforstore) | **GET** /api/v1.0/{appId}/campaigns/retention/{storeId} | 
+*CampaignsApi* | [**GetStoreList**](docs/CampaignsApi.md#getstorelist) | **GET** /api/v1.0/{appId}/campaigns/stores | 
+*CampaignsApi* | [**RemoveCampaign**](docs/CampaignsApi.md#removecampaign) | **DELETE** /api/v1.0/{appId}/campaigns/{campaignId} | 
+*CampaignsApi* | [**UpdateLoyaltyCampaign**](docs/CampaignsApi.md#updateloyaltycampaign) | **POST** /api/v1.0/{appId}/campaigns/loyalty/{campaignId} | 
+*CampaignsApi* | [**UpdateRetentionCampaign**](docs/CampaignsApi.md#updateretentioncampaign) | **POST** /api/v1.0/{appId}/campaigns/retention/{campaignId} | 
+*CardReadersApi* | [**CancelCurrentlyInitiatedBluetoothDeviceUpdate**](docs/CardReadersApi.md#cancelcurrentlyinitiatedbluetoothdeviceupdate) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/cancelUpdate | 
+*CardReadersApi* | [**CancelReaderAction**](docs/CardReadersApi.md#cancelreaderaction) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/{readerId}/cancel_action | 
+*CardReadersApi* | [**CardReadersGetReader**](docs/CardReadersApi.md#cardreadersgetreader) | **GET** /api/v1.0/{appId}/payments/terminals/stripe/{readerId} | 
+*CardReadersApi* | [**GenerateStripeTerminalLocation**](docs/CardReadersApi.md#generatestripeterminallocation) | **POST** /api/v1.0/{appId}/stripeterminal/location | 
+*CardReadersApi* | [**GetBluetoothTerminalStatus**](docs/CardReadersApi.md#getbluetoothterminalstatus) | **GET** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/status | 
+*CardReadersApi* | [**GetKioskStripeLocation**](docs/CardReadersApi.md#getkioskstripelocation) | **GET** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/stripe-location | 
+*CardReadersApi* | [**GetStripeConnectionToken**](docs/CardReadersApi.md#getstripeconnectiontoken) | **GET** /api/v1.0/{appId}/stripeterminal/connectiontoken | 
+*CardReadersApi* | [**InitiateBluetoothTerminalDeviceUpdateCheck**](docs/CardReadersApi.md#initiatebluetoothterminaldeviceupdatecheck) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/checkForUpdate | 
+*CardReadersApi* | [**InitiateKioskBluetoothPairingMode**](docs/CardReadersApi.md#initiatekioskbluetoothpairingmode) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/pair | 
+*CardReadersApi* | [**InitiateKioskBluetoothUpdateInstall**](docs/CardReadersApi.md#initiatekioskbluetoothupdateinstall) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/installUpdate | 
+*CardReadersApi* | [**InitiateReaderProcessPaymentIntent**](docs/CardReadersApi.md#initiatereaderprocesspaymentintent) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/{readerId}/processPaymentIntent | 
 *CardReadersApi* | [**RegisterStripeTerminal**](docs/CardReadersApi.md#registerstripeterminal) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/register | 
-*CardReadersApi* | [**UnRegisterTerminal**](docs/CardReadersApi.md#unregisterterminal) | **DELETE** /api/v1.0/{appId}/payments/terminals/stripe/unregister | Un-register terminal by deleting it from stripe
-*CardReadersApi* | [**UnpairCurrentlyPairedBluetoothDevice**](docs/CardReadersApi.md#unpaircurrentlypairedbluetoothdevice) | **DELETE** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/unpair | Unpair the currently paired stripe terminal
+*CardReadersApi* | [**UnRegisterTerminal**](docs/CardReadersApi.md#unregisterterminal) | **DELETE** /api/v1.0/{appId}/payments/terminals/stripe/unregister | 
+*CardReadersApi* | [**UnpairCurrentlyPairedBluetoothDevice**](docs/CardReadersApi.md#unpaircurrentlypairedbluetoothdevice) | **DELETE** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/unpair | 
 *CatalogChangesApi* | [**GetPendingMenuChanges**](docs/CatalogChangesApi.md#getpendingmenuchanges) | **GET** /api/v1.0/{appId}/menus/catalog-changes | Get menu pending changes from Catalog groups and items
 *CatalogChangesApi* | [**GetPendingMenuChangesSummaries**](docs/CatalogChangesApi.md#getpendingmenuchangessummaries) | **GET** /api/v1.0/{appId}/menus/catalog-changes/summaries | Get menu pending changes summaries by appId
 *CatalogChangesApi* | [**PublishPendingMenuChanges**](docs/CatalogChangesApi.md#publishpendingmenuchanges) | **POST** /api/v1.0/{appId}/menus/catalog-changes/publish | Update menus with the pending changes from Catalog groups and items
@@ -209,114 +201,134 @@ Class | Method | HTTP request | Description
 *CatalogProductsApi* | [**GetProductById**](docs/CatalogProductsApi.md#getproductbyid) | **GET** /api/v1.0/{appId}/catalog/products/{catalogItemId} | Get Product by Id
 *CatalogProductsApi* | [**GetProducts**](docs/CatalogProductsApi.md#getproducts) | **GET** /api/v1.0/{appId}/catalog/products | Get paginated products by app name id filtered by types
 *CatalogProductsApi* | [**UpdateProduct**](docs/CatalogProductsApi.md#updateproduct) | **POST** /api/v1.0/{appId}/catalog/products/{catalogItemId} | Update Product
-*ChannelsApi* | [**AssignAppIdToSalesChannel**](docs/ChannelsApi.md#assignappidtosaleschannel) | **POST** /api/v1.0/{appId}/channels/{channelId}/assign-appId | Assign a given AppId to a Sales Channel
-*ChannelsApi* | [**AssignStoreToChannel**](docs/ChannelsApi.md#assignstoretochannel) | **POST** /api/v1.0/{appId}/channels/assign-store | Assign a Store to a Sales Channel
-*ChannelsApi* | [**AttachStoreToSalesChannel**](docs/ChannelsApi.md#attachstoretosaleschannel) | **POST** /api/v1.0/{appId}/channels/{channelId}/stores/{storeId} | Attachs the specified store to the given sales channel.
-*ChannelsApi* | [**DetachAllStoresFromSalesChannel**](docs/ChannelsApi.md#detachallstoresfromsaleschannel) | **DELETE** /api/v1.0/{appId}/channels/{channelId}/stores | Detaches all the stores from the given sales channel.
-*ChannelsApi* | [**DetachStoreFromSalesChannel**](docs/ChannelsApi.md#detachstorefromsaleschannel) | **DELETE** /api/v1.0/{appId}/channels/{channelId}/stores/{storeId} | Detaches the specified store from the given sales channel.
-*ChannelsApi* | [**GetAssignedChannels**](docs/ChannelsApi.md#getassignedchannels) | **GET** /api/v1.0/{appId}/channels/assigned-channels | Returns a list of sales channels that are assigned to a given AppId
-*ChannelsApi* | [**GetAvailableChannels**](docs/ChannelsApi.md#getavailablechannels) | **GET** /api/v1.0/{appId}/channels/available-channels | Returns a list of sales channels that are not yet assigned to a given AppId
-*ChannelsApi* | [**GetChannel**](docs/ChannelsApi.md#getchannel) | **GET** /api/v1.0/{appId}/channels/{id} | Returns a Sales Channel by Id.
-*ChannelsApi* | [**GetChannels**](docs/ChannelsApi.md#getchannels) | **GET** /api/v1.0/{appId}/channels | Returns a list of enabled Channels
-*ChannelsApi* | [**GetStoresAssignedToChannel**](docs/ChannelsApi.md#getstoresassignedtochannel) | **GET** /api/v1.0/{appId}/channels/{channelId}/assigned-stores | Returns a list of stores of an AppId that are assigned to a given Sales Channel
-*ChannelsApi* | [**GetStoresBySalesChannel**](docs/ChannelsApi.md#getstoresbysaleschannel) | **GET** /api/v1.0/{appId}/channels/{channelId}/stores | Returns a list of store ids attached to the given channel type for the specified app.
-*ChannelsApi* | [**UnassignStoreFromChannel**](docs/ChannelsApi.md#unassignstorefromchannel) | **DELETE** /api/v1.0/{appId}/channels/unassign-store | Unassign a Store from a Sales Channel
-*ChannelsStoreMappingApi* | [**ChannelsGetStoreChannelStoreMapping**](docs/ChannelsStoreMappingApi.md#channelsgetstorechannelstoremapping) | **GET** /api/v1.0/{appId}/channels/storemappings | 
-*ChannelsStoreMappingApi* | [**ChannelsSetStoreChannelStoreMapping**](docs/ChannelsStoreMappingApi.md#channelssetstorechannelstoremapping) | **POST** /api/v1.0/{appId}/channels/storemappings | 
+*ChannelsApi* | [**AssignAppIdToSalesChannel**](docs/ChannelsApi.md#assignappidtosaleschannel) | **POST** /api/v1.0/{appId}/channels/{channelId}/assign-appId | 
+*ChannelsApi* | [**AssignStoreToChannel**](docs/ChannelsApi.md#assignstoretochannel) | **POST** /api/v1.0/{appId}/channels/assign-store | 
+*ChannelsApi* | [**AttachStoreToSalesChannel**](docs/ChannelsApi.md#attachstoretosaleschannel) | **POST** /api/v1.0/{appId}/channels/{channelId}/stores/{storeId} | 
+*ChannelsApi* | [**DetachAllStoresFromSalesChannel**](docs/ChannelsApi.md#detachallstoresfromsaleschannel) | **DELETE** /api/v1.0/{appId}/channels/{channelId}/stores | 
+*ChannelsApi* | [**DetachStoreFromSalesChannel**](docs/ChannelsApi.md#detachstorefromsaleschannel) | **DELETE** /api/v1.0/{appId}/channels/{channelId}/stores/{storeId} | 
+*ChannelsApi* | [**GetAssignedChannels**](docs/ChannelsApi.md#getassignedchannels) | **GET** /api/v1.0/{appId}/channels/assigned-channels | 
+*ChannelsApi* | [**GetAvailableChannels**](docs/ChannelsApi.md#getavailablechannels) | **GET** /api/v1.0/{appId}/channels/available-channels | 
+*ChannelsApi* | [**GetChannel**](docs/ChannelsApi.md#getchannel) | **GET** /api/v1.0/{appId}/channels/{id} | 
+*ChannelsApi* | [**GetChannels**](docs/ChannelsApi.md#getchannels) | **GET** /api/v1.0/{appId}/channels | 
+*ChannelsApi* | [**GetStoresAssignedToChannel**](docs/ChannelsApi.md#getstoresassignedtochannel) | **GET** /api/v1.0/{appId}/channels/{channelId}/assigned-stores | 
+*ChannelsApi* | [**GetStoresBySalesChannel**](docs/ChannelsApi.md#getstoresbysaleschannel) | **GET** /api/v1.0/{appId}/channels/{channelId}/stores | 
+*ChannelsApi* | [**UnassignStoreFromChannel**](docs/ChannelsApi.md#unassignstorefromchannel) | **DELETE** /api/v1.0/{appId}/channels/unassign-store | 
+*ClientsApi* | [**GetClient**](docs/ClientsApi.md#getclient) | **GET** /api/v1.0/clients/{clientId} | 
+*ClientsApi* | [**SetSalesForceContactId**](docs/ClientsApi.md#setsalesforcecontactid) | **POST** /api/v1.0/clients/{clientId}/salesforcecontactid | 
+*ClientsApi* | [**SetStripeCustomerId**](docs/ClientsApi.md#setstripecustomerid) | **POST** /api/v1.0/clients/{clientId}/stripecustomerid | 
 *ContentSecurityPolicyApi* | [**ContentSecurityPolicyReport**](docs/ContentSecurityPolicyApi.md#contentsecuritypolicyreport) | **POST** /api/v1.0/csp/report | 
-*CustomersApi* | [**GetCustomerById**](docs/CustomersApi.md#getcustomerbyid) | **GET** /api/v1.0/{appId}/customers/{customerId} | Get customer of an app by Id
-*CustomersApi* | [**UpdateCustomerById**](docs/CustomersApi.md#updatecustomerbyid) | **POST** /api/v1.0/{appId}/customers/{customerId} | Update customer of an app by Id
-*DeliveryTrackingApi* | [**AssignDriverToOrder**](docs/DeliveryTrackingApi.md#assigndrivertoorder) | **POST** /api/v1.0/{appId}/drivers/{driverId}/orders/{orderId} | [PRIVATE] Assign driver to order
-*DeliveryTrackingApi* | [**AssignDriverToOrders**](docs/DeliveryTrackingApi.md#assigndrivertoorders) | **POST** /api/v1.0/{appId}/drivers/{driverId}/orders | Assign driver to multiple orders
-*DeliveryTrackingApi* | [**GetDrivers**](docs/DeliveryTrackingApi.md#getdrivers) | **GET** /api/v1.0/{appId}/drivers | [PRIVATE] Get drivers by App
-*DeliveryTrackingApi* | [**InviteDriverToApp**](docs/DeliveryTrackingApi.md#invitedrivertoapp) | **POST** /api/v1.0/{appId}/drivers | [PRIVATE] Invite driver
-*DeliveryTrackingApi* | [**RemoveDriverFromApp**](docs/DeliveryTrackingApi.md#removedriverfromapp) | **DELETE** /api/v1.0/{appId}/drivers/{driverId} | [PRIVATE] Unassign driver from app
-*DeliveryTrackingApi* | [**UnassignDriverFromOrder**](docs/DeliveryTrackingApi.md#unassigndriverfromorder) | **DELETE** /api/v1.0/{appId}/orders/{orderId}/driver | [PRIVATE] Unassign driver from order
-*DeliveryZoneApi* | [**AddDeliveryZone**](docs/DeliveryZoneApi.md#adddeliveryzone) | **POST** /api/v1.0/stores/{storeId}/deliveryzones | Adds a delivery zone to the store id
-*DeliveryZoneApi* | [**GetDeliveryZones**](docs/DeliveryZoneApi.md#getdeliveryzones) | **GET** /api/v1.0/stores/{storeId}/deliveryzones | Get all the delivery zones associated with a store
-*DeliveryZoneApi* | [**RemoveDeliveryZone**](docs/DeliveryZoneApi.md#removedeliveryzone) | **DELETE** /api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId} | Removes the existing delivery zone
-*DeliveryZoneApi* | [**UpdateDeliveryZone**](docs/DeliveryZoneApi.md#updatedeliveryzone) | **POST** /api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId} | Updates the existing delivery zone
-*DriversApi* | [**AddDriverNotificationToken**](docs/DriversApi.md#adddrivernotificationtoken) | **POST** /api/v1.0/drivers/token | Add driver token
-*DriversApi* | [**DeleteDriverProfileImage**](docs/DriversApi.md#deletedriverprofileimage) | **DELETE** /api/v1.0/drivers/profile/image | Delete driver profile image
-*DriversApi* | [**DriverLogin**](docs/DriversApi.md#driverlogin) | **POST** /api/v1.0/drivers/login | [PRIVATE] Login with phone number and pin
-*DriversApi* | [**DriverRequestLoginCodeSms**](docs/DriversApi.md#driverrequestlogincodesms) | **POST** /api/v1.0/drivers/pin | [PRIVATE] Request an SMS to be sent to the driver with their login code
-*DriversApi* | [**GetDriverProfile**](docs/DriversApi.md#getdriverprofile) | **GET** /api/v1.0/drivers/profile | Get driver profile
-*DriversApi* | [**GetStoresForDriver**](docs/DriversApi.md#getstoresfordriver) | **GET** /api/v1.0/drivers/assignedstores | Get stores for driver
-*DriversApi* | [**RemoveDriverNotificationToken**](docs/DriversApi.md#removedrivernotificationtoken) | **DELETE** /api/v1.0/drivers/token | Delete driver token
-*DriversApi* | [**SetDriverPresenceForStore**](docs/DriversApi.md#setdriverpresenceforstore) | **POST** /api/v1.0/drivers/stores/{storeId}/presence/{presence} | 
-*DriversApi* | [**SetDriverProfileImage**](docs/DriversApi.md#setdriverprofileimage) | **POST** /api/v1.0/drivers/profile/image | Set driver profile image and returns it's url
-*DriversApi* | [**UpdateDeliveryTrackingStatus**](docs/DriversApi.md#updatedeliverytrackingstatus) | **POST** /api/v1.0/orders/{orderId}/tracking/{deliveryTrackingStatus} | Change delivery tracking status and return the updated status.
-*DriversApi* | [**UpdateDriverProfile**](docs/DriversApi.md#updatedriverprofile) | **POST** /api/v1.0/drivers/profile | Update driver profile
-*EventsApi* | [**GetCustomerEvents**](docs/EventsApi.md#getcustomerevents) | **GET** /api/v1.0/events/customer/{customerId} | Get customer events  For technical reasons, the number of records returned is limited to 100.
-*EventsApi* | [**GetEvents**](docs/EventsApi.md#getevents) | **GET** /api/v1.0/events | Get events  For technical reasons, the number of records returned is limited to 100.
-*EventsApi* | [**GetEventsById**](docs/EventsApi.md#geteventsbyid) | **GET** /api/v1.0/events/{eventId} | Get event by Id  For technical reasons, the number of records returned is limited to 100.
-*EventsApi* | [**GetMenuEvents**](docs/EventsApi.md#getmenuevents) | **GET** /api/v1.0/events/menu/{menuId} | Get menu events  For technical reasons, the number of records returned is limited to 100.
-*EventsApi* | [**GetOrderEvents**](docs/EventsApi.md#getorderevents) | **GET** /api/v1.0/events/order/{orderId} | Get order events  For technical reasons, the number of records returned is limited to 100.
-*EventsApi* | [**GetOrderEventsByCustomer**](docs/EventsApi.md#getordereventsbycustomer) | **GET** /api/v1.0/events/order | Get order events by customer  For technical reasons, the number of records returned is limited to 100.
-*EventsApi* | [**GetStoreEvents**](docs/EventsApi.md#getstoreevents) | **GET** /api/v1.0/events/store/{storeId} | Get store events  For technical reasons, the number of records returned is limited to 100.
-*EventsApi* | [**GetUserEvents**](docs/EventsApi.md#getuserevents) | **GET** /api/v1.0/events/user/{userId} | Get user events  For technical reasons, the number of records returned is limited to 100.
-*EventsApi* | [**GetWhiteLabelEvents**](docs/EventsApi.md#getwhitelabelevents) | **GET** /api/v1.0/events/whitelabel/{whitelabelId} | Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100.
-*FilesApi* | [**DownloadFile**](docs/FilesApi.md#downloadfile) | **GET** /api/v1.0/{appId}/files/download/{fileId} | Get file from storage
-*FulfillmentStateConfigurationApi* | [**CreateFulfillmentStatesConfig**](docs/FulfillmentStateConfigurationApi.md#createfulfillmentstatesconfig) | **POST** /api/v1.0/{appId}/fulfillment/configuration/states | Create fulfillment configuration
-*FulfillmentStateConfigurationApi* | [**DeleteFulfillmentStatesConfig**](docs/FulfillmentStateConfigurationApi.md#deletefulfillmentstatesconfig) | **DELETE** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | Delete fulfillment states configuration
-*FulfillmentStateConfigurationApi* | [**GetFulfillmentStatesConfiguration**](docs/FulfillmentStateConfigurationApi.md#getfulfillmentstatesconfiguration) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | Get fulfillment configuration
-*FulfillmentStateConfigurationApi* | [**SearchFulfillmentStatesConfigurations**](docs/FulfillmentStateConfigurationApi.md#searchfulfillmentstatesconfigurations) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states | List fulfillment configurations for AppId
-*FulfillmentStateConfigurationApi* | [**UpdateFulfillmentStatesConfig**](docs/FulfillmentStateConfigurationApi.md#updatefulfillmentstatesconfig) | **POST** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | Update fulfillment configuration
+*CrossSellApi* | [**GetCrossSellMenuItems**](docs/CrossSellApi.md#getcrosssellmenuitems) | **GET** /api/v1.0/{appId}/crossSell/menuItems | 
+*CustomersApi* | [**CreateCustomer**](docs/CustomersApi.md#createcustomer) | **POST** /api/v1.0/{appId}/customers | 
+*CustomersApi* | [**GetCustomerById**](docs/CustomersApi.md#getcustomerbyid) | **GET** /api/v1.0/{appId}/customers/{customerId} | 
+*CustomersApi* | [**GetCustomers**](docs/CustomersApi.md#getcustomers) | **GET** /api/v1.0/{appId}/customers | 
+*CustomersApi* | [**UpdateCustomerById**](docs/CustomersApi.md#updatecustomerbyid) | **POST** /api/v1.0/{appId}/customers/{customerId} | 
+*DeliveryZoneApi* | [**AddDeliveryZone**](docs/DeliveryZoneApi.md#adddeliveryzone) | **POST** /api/v1.0/stores/{storeId}/deliveryzones | 
+*DeliveryZoneApi* | [**GetDeliveryZones**](docs/DeliveryZoneApi.md#getdeliveryzones) | **GET** /api/v1.0/stores/{storeId}/deliveryzones | 
+*DeliveryZoneApi* | [**RemoveDeliveryZone**](docs/DeliveryZoneApi.md#removedeliveryzone) | **DELETE** /api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId} | 
+*DeliveryZoneApi* | [**UpdateDeliveryZone**](docs/DeliveryZoneApi.md#updatedeliveryzone) | **POST** /api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId} | 
+*DeviceApi* | [**AssignDevice**](docs/DeviceApi.md#assigndevice) | **POST** /api/v1.0/{appId}/devices/assign | 
+*DeviceApi* | [**EnrollDevice**](docs/DeviceApi.md#enrolldevice) | **POST** /api/v1.0/{appId}/devices/enroll | 
+*DeviceApi* | [**GetDeviceDetails**](docs/DeviceApi.md#getdevicedetails) | **GET** /api/v1.0/{appId}/devices/device/{deviceModel}/{deviceId} | 
+*DeviceApi* | [**SearchDevices**](docs/DeviceApi.md#searchdevices) | **GET** /api/v1.0/{appId}/devices/search | 
+*DriversApi* | [**DriversAddDriverNotificationToken**](docs/DriversApi.md#driversadddrivernotificationtoken) | **POST** /api/v1.0/drivers/token | 
+*DriversApi* | [**DriversDeleteDriverProfileImage**](docs/DriversApi.md#driversdeletedriverprofileimage) | **DELETE** /api/v1.0/drivers/profile/image | 
+*DriversApi* | [**DriversDriverLogin**](docs/DriversApi.md#driversdriverlogin) | **POST** /api/v1.0/drivers/login | 
+*DriversApi* | [**DriversDriverRequestLoginCodeSms**](docs/DriversApi.md#driversdriverrequestlogincodesms) | **POST** /api/v1.0/drivers/pin | 
+*DriversApi* | [**DriversGetDriverProfile**](docs/DriversApi.md#driversgetdriverprofile) | **GET** /api/v1.0/drivers/profile | 
+*DriversApi* | [**DriversGetStoresForDriver**](docs/DriversApi.md#driversgetstoresfordriver) | **GET** /api/v1.0/drivers/assignedstores | 
+*DriversApi* | [**DriversRemoveDriverNotificationToken**](docs/DriversApi.md#driversremovedrivernotificationtoken) | **DELETE** /api/v1.0/drivers/token | 
+*DriversApi* | [**DriversSetDriverPresenceForStore**](docs/DriversApi.md#driverssetdriverpresenceforstore) | **POST** /api/v1.0/drivers/stores/{storeId}/presence/{presence} | 
+*DriversApi* | [**DriversSetDriverProfileImage**](docs/DriversApi.md#driverssetdriverprofileimage) | **POST** /api/v1.0/drivers/profile/image | 
+*DriversApi* | [**DriversUpdateDeliveryTrackingStatus**](docs/DriversApi.md#driversupdatedeliverytrackingstatus) | **POST** /api/v1.0/orders/{orderId}/tracking/{deliveryTrackingStatus} | 
+*DriversApi* | [**DriversUpdateDriverProfile**](docs/DriversApi.md#driversupdatedriverprofile) | **POST** /api/v1.0/drivers/profile | 
+*EndUserFeesApi* | [**CreateEndUserFeeConfig**](docs/EndUserFeesApi.md#createenduserfeeconfig) | **POST** /api/v1.0/{appId}/stores/{storeId}/end-user-fees | 
+*EndUserFeesApi* | [**GetEndUserFeesForStore**](docs/EndUserFeesApi.md#getenduserfeesforstore) | **GET** /api/v1.0/{appId}/stores/{storeId}/end-user-fees | 
+*EndUserFeesApi* | [**SetV2FeeCalculation**](docs/EndUserFeesApi.md#setv2feecalculation) | **POST** /api/v1.0/{appId}/stores/{storeId}/end-user-fees/v2-fee-calculation | 
+*EventsApi* | [**GetCustomerEvents**](docs/EventsApi.md#getcustomerevents) | **GET** /api/v1.0/{appId}/events/customer/{customerId} | 
+*EventsApi* | [**GetEvents**](docs/EventsApi.md#getevents) | **GET** /api/v1.0/{appId}/events | 
+*EventsApi* | [**GetEventsById**](docs/EventsApi.md#geteventsbyid) | **GET** /api/v1.0/{appId}/events/{eventId} | 
+*EventsApi* | [**GetMenuEvents**](docs/EventsApi.md#getmenuevents) | **GET** /api/v1.0/{appId}/events/menu/{menuId} | 
+*EventsApi* | [**GetOrderEvents**](docs/EventsApi.md#getorderevents) | **GET** /api/v1.0/{appId}/events/order/{orderId} | 
+*EventsApi* | [**GetOrderEventsByCustomer**](docs/EventsApi.md#getordereventsbycustomer) | **GET** /api/v1.0/{appId}/events/order | 
+*EventsApi* | [**GetStoreEvents**](docs/EventsApi.md#getstoreevents) | **GET** /api/v1.0/{appId}/events/store/{storeId} | 
+*EventsApi* | [**GetUserEvents**](docs/EventsApi.md#getuserevents) | **GET** /api/v1.0/{appId}/events/user/{userId} | 
+*EventsApi* | [**GetWhiteLabelEvents**](docs/EventsApi.md#getwhitelabelevents) | **GET** /api/v1.0/{appId}/events/whitelabel/{whitelabelId} | 
+*FeaturesApi* | [**DisableFeatures**](docs/FeaturesApi.md#disablefeatures) | **POST** /api/v1.0/{appId}/features/disable | 
+*FeaturesApi* | [**EnableFeatures**](docs/FeaturesApi.md#enablefeatures) | **POST** /api/v1.0/{appId}/features/enable | 
+*FirebaseAppsApi* | [**FirebaseAppsAddFirebaseApp**](docs/FirebaseAppsApi.md#firebaseappsaddfirebaseapp) | **POST** /api/v1.0/FirebaseApp | 
+*FirebaseAppsApi* | [**FirebaseAppsDeleteFirebaseApp**](docs/FirebaseAppsApi.md#firebaseappsdeletefirebaseapp) | **DELETE** /api/v1.0/FirebaseApp/{whiteLabelId} | 
+*FirebaseAppsApi* | [**FirebaseAppsGetFirebaseApp**](docs/FirebaseAppsApi.md#firebaseappsgetfirebaseapp) | **GET** /api/v1.0/FirebaseApp/{whitelabelId} | 
+*FpmApi* | [**CreateFpmForStore**](docs/FpmApi.md#createfpmforstore) | **POST** /api/v1.0/{storeId}/fpm | 
+*FpmApi* | [**DeleteFpmForStore**](docs/FpmApi.md#deletefpmforstore) | **DELETE** /api/v1.0/{storeId}/fpm | 
+*FpmApi* | [**EditFpmForStore**](docs/FpmApi.md#editfpmforstore) | **POST** /api/v1.0/{storeId}/fpm/edit | 
+*FpmApi* | [**GetFpmForStore**](docs/FpmApi.md#getfpmforstore) | **GET** /api/v1.0/{storeId}/fpm | 
+*FulfillmentStateConfigurationApi* | [**CreateFulfillmentStatesConfig**](docs/FulfillmentStateConfigurationApi.md#createfulfillmentstatesconfig) | **POST** /api/v1.0/{appId}/fulfillment/configuration/states | 
+*FulfillmentStateConfigurationApi* | [**DeleteFulfillmentStatesConfig**](docs/FulfillmentStateConfigurationApi.md#deletefulfillmentstatesconfig) | **DELETE** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | 
+*FulfillmentStateConfigurationApi* | [**GetFulfillmentStatesConfiguration**](docs/FulfillmentStateConfigurationApi.md#getfulfillmentstatesconfiguration) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | 
+*FulfillmentStateConfigurationApi* | [**GetFulfillmentStatesConfigurationTemplate**](docs/FulfillmentStateConfigurationApi.md#getfulfillmentstatesconfigurationtemplate) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states_template | 
+*FulfillmentStateConfigurationApi* | [**SearchFulfillmentStatesConfigurations**](docs/FulfillmentStateConfigurationApi.md#searchfulfillmentstatesconfigurations) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states | 
+*FulfillmentStateConfigurationApi* | [**UpdateFulfillmentStatesConfig**](docs/FulfillmentStateConfigurationApi.md#updatefulfillmentstatesconfig) | **POST** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | 
 *HeartbeatApi* | [**HeadHostname**](docs/HeartbeatApi.md#headhostname) | **HEAD** /api/v1.0/heartbeat/Hostname | 
 *HeartbeatApi* | [**HeadPing**](docs/HeartbeatApi.md#headping) | **HEAD** /api/v1.0/heartbeat | 
 *HeartbeatApi* | [**Hostname**](docs/HeartbeatApi.md#hostname) | **GET** /api/v1.0/heartbeat/Hostname | 
 *HeartbeatApi* | [**Ping**](docs/HeartbeatApi.md#ping) | **GET** /api/v1.0/heartbeat | 
-*HomeApi* | [**CompleteHomeAction**](docs/HomeApi.md#completehomeaction) | **POST** /api/v1.0/{appId}/home/{homeActionId} | [PRIVATE API] Complete Home Action
-*HomeApi* | [**DismissOldPortalAction**](docs/HomeApi.md#dismissoldportalaction) | **POST** /api/v1.0/home/dismissoldportalaction | [PRIVATE API] Complete Home Action
-*HomeApi* | [**GetHomeActions**](docs/HomeApi.md#gethomeactions) | **GET** /api/v1.0/{appId}/home | [PRIVATE API] Get Home Actions
-*HomeApi* | [**GetHomeStatistics**](docs/HomeApi.md#gethomestatistics) | **GET** /api/v1.0/{appId}/home/stats | [PRIVATE API] Get Home Statistics
-*HttpRequestResponseLogsApi* | [**GetLogs**](docs/HttpRequestResponseLogsApi.md#getlogs) | **GET** /api/v1.0/{appId}/interactions/logs | Get API interaction logs
-*HydraApi* | [**AssignEmv**](docs/HydraApi.md#assignemv) | **POST** /api/v1.0/{appId}/hydra/emvterminal/assign/{hydraConfigId}/{emvTerminalId} | Assign an EMV terminal to a kiosk
-*HydraApi* | [**AttachStoreToKiosk**](docs/HydraApi.md#attachstoretokiosk) | **POST** /api/v1.0/{appId}/AttachStoreToKiosk/{deviceId}/store/{storeId} | [Private]
-*HydraApi* | [**AttachStoreToTerminal**](docs/HydraApi.md#attachstoretoterminal) | **POST** /api/v1.0/{appId}/hydra/{deviceId}/attach/{storeId} | [Private]
+*HomeApi* | [**CompleteHomeAction**](docs/HomeApi.md#completehomeaction) | **POST** /api/v1.0/{appId}/home/{homeActionId} | 
+*HomeApi* | [**GetHomeActions**](docs/HomeApi.md#gethomeactions) | **GET** /api/v1.0/{appId}/home | 
+*HomeApi* | [**GetHomeStatistics**](docs/HomeApi.md#gethomestatistics) | **GET** /api/v1.0/{appId}/home/stats | 
+*HomeApi* | [**GetOktaPortalFeatureFlag**](docs/HomeApi.md#getoktaportalfeatureflag) | **GET** /api/v1.0/home/okta-portal | 
+*HydraApi* | [**AssignEmv**](docs/HydraApi.md#assignemv) | **POST** /api/v1.0/{appId}/hydra/emvterminal/assign/{hydraConfigId}/{emvTerminalId} | 
+*HydraApi* | [**AttachStoreToKiosk**](docs/HydraApi.md#attachstoretokiosk) | **POST** /api/v1.0/{appId}/AttachStoreToKiosk/{deviceId}/store/{storeId} | 
+*HydraApi* | [**AttachStoreToTerminal**](docs/HydraApi.md#attachstoretoterminal) | **POST** /api/v1.0/{appId}/hydra/{deviceId}/attach/{storeId} | 
 *HydraApi* | [**CancelEmvPayment**](docs/HydraApi.md#cancelemvpayment) | **POST** /api/v1.0/{appId}/hydra/cancelemvpayment/{orderId} | 
-*HydraApi* | [**DetachStoreFromTerminal**](docs/HydraApi.md#detachstorefromterminal) | **POST** /api/v1.0/{appId}/hydra/{deviceId}/detach/{storeId} | [Private]
-*HydraApi* | [**GetAttachedDevice**](docs/HydraApi.md#getattacheddevice) | **GET** /api/v1.0/{appId}/hydra/{deviceType}/{deviceId} | [Private]
-*HydraApi* | [**GetAttachedDevices**](docs/HydraApi.md#getattacheddevices) | **GET** /api/v1.0/{appId}/hydra/{deviceType}/list | [Private]
-*HydraApi* | [**GetEMVTerminalDetails**](docs/HydraApi.md#getemvterminaldetails) | **GET** /api/v1.0/{appId}/hydra/emvterminal | [Private]
-*HydraApi* | [**GetEmvOrderState**](docs/HydraApi.md#getemvorderstate) | **GET** /api/v1.0/{appId}/hydra/emvorderstate/{orderId} | [Private]
-*HydraApi* | [**GetKioskCashPaymentSettings**](docs/HydraApi.md#getkioskcashpaymentsettings) | **GET** /api/v1.0/{appId}/kioskcashsettings/{deviceId} | Get the status of Cash Payment Methon on Kisok
+*HydraApi* | [**DetachStoreFromTerminal**](docs/HydraApi.md#detachstorefromterminal) | **POST** /api/v1.0/{appId}/hydra/{deviceId}/detach/{storeId} | 
+*HydraApi* | [**GetAblyToken**](docs/HydraApi.md#getablytoken) | **GET** /api/v1.0/hydra/ably_token | 
+*HydraApi* | [**GetAttachedDevice**](docs/HydraApi.md#getattacheddevice) | **GET** /api/v1.0/{appId}/hydra/{deviceType}/{deviceId} | 
+*HydraApi* | [**GetAttachedDevices**](docs/HydraApi.md#getattacheddevices) | **GET** /api/v1.0/{appId}/hydra/{deviceType}/list | 
+*HydraApi* | [**GetEMVTerminalDetails**](docs/HydraApi.md#getemvterminaldetails) | **GET** /api/v1.0/{appId}/hydra/emvterminal | 
+*HydraApi* | [**GetEmvOrderState**](docs/HydraApi.md#getemvorderstate) | **GET** /api/v1.0/{appId}/hydra/emvorderstate/{orderId} | 
+*HydraApi* | [**GetKioskCashPaymentSettings**](docs/HydraApi.md#getkioskcashpaymentsettings) | **GET** /api/v1.0/{appId}/kioskcashsettings/{deviceId} | 
+*HydraApi* | [**GetKioskSettings**](docs/HydraApi.md#getkiosksettings) | **GET** /api/v1.0/{appId}/kiosksettings/{deviceId} | 
 *HydraApi* | [**GetRegistration**](docs/HydraApi.md#getregistration) | **GET** /api/v1.0/hydra/registration | 
-*HydraApi* | [**GetSettings**](docs/HydraApi.md#getsettings) | **GET** /api/v1.0/hydra/settings | [Private]
-*HydraApi* | [**HydraCreateEmv**](docs/HydraApi.md#hydracreateemv) | **POST** /api/v1.0/{appId}/emvterminals | [Private]
-*HydraApi* | [**HydraDeleteEmv**](docs/HydraApi.md#hydradeleteemv) | **DELETE** /api/v1.0/{appId}/emvterminals/{id} | [Private]
-*HydraApi* | [**HydraDetachStoreFromKiosk**](docs/HydraApi.md#hydradetachstorefromkiosk) | **DELETE** /api/v1.0/{appId}/DetachStoreFromKiosk/{deviceId}/store/{storeId} | [Private]
-*HydraApi* | [**HydraGetEmvsForAppId**](docs/HydraApi.md#hydragetemvsforappid) | **GET** /api/v1.0/{appId}/emvterminals | List EMV terminals belonging to the given AppNameId
-*HydraApi* | [**LoginWithDeviceId**](docs/HydraApi.md#loginwithdeviceid) | **POST** /api/v1.0/hydra/{deviceId}/login | [Private]
-*HydraApi* | [**Register**](docs/HydraApi.md#register) | **POST** /api/v1.0/{appId}/hydra/registration | [Private]
-*HydraApi* | [**UnAssign**](docs/HydraApi.md#unassign) | **DELETE** /api/v1.0/{appId}/hydra/{deviceId}/registration | [Private]
-*HydraApi* | [**UnassignEmv**](docs/HydraApi.md#unassignemv) | **POST** /api/v1.0/{appId}/hydra/emvterminal/unassign/{hydraConfigId} | Unassign the currently assigned EMV terminal from a kiosk
-*HydraApi* | [**UpdateKioskCashVisibilitySettings**](docs/HydraApi.md#updatekioskcashvisibilitysettings) | **POST** /api/v1.0/{appId}/kioskupdatecashsettings | Update the Cash Payment Methon Visiability on Kisok
-*KioskIotApi* | [**GetKioskIotConnection**](docs/KioskIotApi.md#getkioskiotconnection) | **POST** /api/v1.0/kioskiot/connect | Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
-*KioskIotApi* | [**QueryTelemetrySeries**](docs/KioskIotApi.md#querytelemetryseries) | **POST** /api/v1.0/{appId}/kioskiot/timeseries/query | Get the IoT time series values for a given Kiosk Id, properties and time range
-*KioskStoreSettingsApi* | [**GetAllKioskSettingsForStore**](docs/KioskStoreSettingsApi.md#getallkiosksettingsforstore) | **GET** /api/v1.0/{appId}/kiosksettings/store/{storeId} | Get all kiosk settings associated with a store
-*KioskStoreSettingsApi* | [**GetAllStoreSettingsForKioskHydra**](docs/KioskStoreSettingsApi.md#getallstoresettingsforkioskhydra) | **GET** /api/v1.0/kioskstoresettings | [For Kiosk use only] Get all stores connected to a Kiosk
-*KioskStoreSettingsApi* | [**UpdateCashSettingForKiosk**](docs/KioskStoreSettingsApi.md#updatecashsettingforkiosk) | **POST** /api/v1.0/{appId}/kiosksettings/cash | 
+*HydraApi* | [**GetSettings**](docs/HydraApi.md#getsettings) | **GET** /api/v1.0/hydra/settings | 
+*HydraApi* | [**HydraCreateEmv**](docs/HydraApi.md#hydracreateemv) | **POST** /api/v1.0/{appId}/emvterminals | 
+*HydraApi* | [**HydraDeleteEmv**](docs/HydraApi.md#hydradeleteemv) | **DELETE** /api/v1.0/{appId}/emvterminals/{id} | 
+*HydraApi* | [**HydraDetachStoreFromKiosk**](docs/HydraApi.md#hydradetachstorefromkiosk) | **DELETE** /api/v1.0/{appId}/DetachStoreFromKiosk/{deviceId}/store/{storeId} | 
+*HydraApi* | [**HydraGetEmvsForAppId**](docs/HydraApi.md#hydragetemvsforappid) | **GET** /api/v1.0/{appId}/emvterminals | 
+*HydraApi* | [**LoginWithDeviceId**](docs/HydraApi.md#loginwithdeviceid) | **POST** /api/v1.0/hydra/{deviceId}/login | 
+*HydraApi* | [**Register**](docs/HydraApi.md#register) | **POST** /api/v1.0/{appId}/hydra/registration | 
+*HydraApi* | [**UnAssign**](docs/HydraApi.md#unassign) | **DELETE** /api/v1.0/{appId}/hydra/{deviceId}/registration | 
+*HydraApi* | [**UnassignEmv**](docs/HydraApi.md#unassignemv) | **POST** /api/v1.0/{appId}/hydra/emvterminal/unassign/{hydraConfigId} | 
+*HydraApi* | [**UpdateKioskCashVisibilitySettings**](docs/HydraApi.md#updatekioskcashvisibilitysettings) | **POST** /api/v1.0/{appId}/kioskupdatecashsettings | 
+*HydraApi* | [**UpdateKioskSettings**](docs/HydraApi.md#updatekiosksettings) | **POST** /api/v1.0/{appId}/kiosksettings/{deviceId} | 
+*IntegrationMetadataCatalogueApi* | [**IntegrationMetadataCatalogueGetPixelPointProducts**](docs/IntegrationMetadataCatalogueApi.md#integrationmetadatacataloguegetpixelpointproducts) | **GET** /api/v1.0/integrationmetadatacatalogue/pixelpoint/stores/{storeId}/products | 
+*IntercomApi* | [**UserHash**](docs/IntercomApi.md#userhash) | **GET** /api/v1.0/intercom/userHash | 
+*InvoicesApi* | [**GetInvoices**](docs/InvoicesApi.md#getinvoices) | **GET** /api/v1.0/{appId}/invoices | 
+*InvoicesApi* | [**InvoicePdf**](docs/InvoicesApi.md#invoicepdf) | **GET** /api/v1.0/{appId}/invoices/InvoicePdf | 
+*InvoicesApi* | [**ListInvoices**](docs/InvoicesApi.md#listinvoices) | **GET** /api/v1.0/{appId}/invoices/ListInvoices | 
+*InvoicesApi* | [**ListSubscriptionInvoices**](docs/InvoicesApi.md#listsubscriptioninvoices) | **GET** /api/v1.0/{appId}/invoices/ListSubscriptionInvoices | 
+*KioskEntitlementsApi* | [**QueryKioskEntitlementsByOrgId**](docs/KioskEntitlementsApi.md#querykioskentitlementsbyorgid) | **GET** /api/v1.0/orgs/{orgId}/kiosk/entitlements | 
+*KioskIotApi* | [**GetKioskIotConnection**](docs/KioskIotApi.md#getkioskiotconnection) | **POST** /api/v1.0/kioskiot/connect | 
+*KioskIotApi* | [**QueryTelemetrySeries**](docs/KioskIotApi.md#querytelemetryseries) | **POST** /api/v1.0/{appId}/kioskiot/timeseries/query | 
 *LightspeedApi* | [**LightspeedGenerateMenu**](docs/LightspeedApi.md#lightspeedgeneratemenu) | **POST** /api/v1.0/lightspeed/{storeId}/menu/generate | 
 *LightspeedApi* | [**LightspeedGetStoreSettings**](docs/LightspeedApi.md#lightspeedgetstoresettings) | **GET** /api/v1.0/lightspeed/{storeId}/settings | 
 *LightspeedApi* | [**LightspeedSaveStoreSettings**](docs/LightspeedApi.md#lightspeedsavestoresettings) | **POST** /api/v1.0/lightspeed/{storeId}/settings | 
-*LocationApi* | [**CreateLocation**](docs/LocationApi.md#createlocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location | Create a Location i.e: Table, Hotel Room, Car park space
-*LocationApi* | [**DeleteLocation**](docs/LocationApi.md#deletelocation) | **DELETE** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/delete | Set a Location as deleted
-*LocationApi* | [**MapLocationToExternalId**](docs/LocationApi.md#maplocationtoexternalid) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/map-external | Set or unset External Location Id on a Location
-*LocationApi* | [**MoveLocation**](docs/LocationApi.md#movelocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/move | Move a Location to a different location Area
-*LocationApi* | [**UpdateLocation**](docs/LocationApi.md#updatelocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/update | Update a Location i.e: Table, Hotel Room, Car park space
-*LocationAreasApi* | [**CreateLocationArea**](docs/LocationAreasApi.md#createlocationarea) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas | Create a Location Area, i.e: Room, Floor, Parking lot
-*LocationAreasApi* | [**GetLocationArea**](docs/LocationAreasApi.md#getlocationarea) | **GET** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId} | Retrieve a Location Area
-*LocationAreasApi* | [**GetLocationAreasForStore**](docs/LocationAreasApi.md#getlocationareasforstore) | **GET** /api/v1.0/{appId}/stores/{storeId}/location-areas | Retrieve all Location Areas for a Store
-*LocationAreasApi* | [**UpdateLocationArea**](docs/LocationAreasApi.md#updatelocationarea) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/update | Update a Location Area, i.e: Room, Floor, Car park space
-*LookerDashboardApi* | [**LookerDashboardGetAll**](docs/LookerDashboardApi.md#lookerdashboardgetall) | **GET** /api/v1.0/{appId}/looker/dashboards | Get all dashboards
-*LookerSingleSignOnApi* | [**GetSSOEndpoint**](docs/LookerSingleSignOnApi.md#getssoendpoint) | **GET** /api/v1.0/{appId}/looker/sso | Get the generic single sign on embed URL for Looker dashboards
+*LocationApi* | [**CreateLocation**](docs/LocationApi.md#createlocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location | 
+*LocationApi* | [**DeleteLocation**](docs/LocationApi.md#deletelocation) | **DELETE** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/delete | 
+*LocationApi* | [**MapLocationToExternalId**](docs/LocationApi.md#maplocationtoexternalid) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/map-external | 
+*LocationApi* | [**MoveLocation**](docs/LocationApi.md#movelocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/move | 
+*LocationApi* | [**UpdateLocation**](docs/LocationApi.md#updatelocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/update | 
+*LocationAreasApi* | [**CreateLocationArea**](docs/LocationAreasApi.md#createlocationarea) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas | 
+*LocationAreasApi* | [**GetLocationArea**](docs/LocationAreasApi.md#getlocationarea) | **GET** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId} | 
+*LocationAreasApi* | [**GetLocationAreasForStore**](docs/LocationAreasApi.md#getlocationareasforstore) | **GET** /api/v1.0/{appId}/stores/{storeId}/location-areas | 
+*LocationAreasApi* | [**UpdateLocationArea**](docs/LocationAreasApi.md#updatelocationarea) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/update | 
+*LookerDashboardApi* | [**LookerDashboardGetAll**](docs/LookerDashboardApi.md#lookerdashboardgetall) | **GET** /api/v1.0/{appId}/looker/dashboards | 
+*LookerSingleSignOnApi* | [**GetSSOEndpoint**](docs/LookerSingleSignOnApi.md#getssoendpoint) | **GET** /api/v1.0/{appId}/looker/sso | 
 *MenuOptionSetItemsApi* | [**AddMenuItemOptionSetItem**](docs/MenuOptionSetItemsApi.md#addmenuitemoptionsetitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems | Create menu item option set item
 *MenuOptionSetItemsApi* | [**DeleteOptionSetItemImage**](docs/MenuOptionSetItemsApi.md#deleteoptionsetitemimage) | **DELETE** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image | Delete menu item option set item image
 *MenuOptionSetItemsApi* | [**GetMenuItemOptionSetItemById**](docs/MenuOptionSetItemsApi.md#getmenuitemoptionsetitembyid) | **GET** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId} | Get menu item option set item by identifier
 *MenuOptionSetItemsApi* | [**GetMenuItemOptionSetItems**](docs/MenuOptionSetItemsApi.md#getmenuitemoptionsetitems) | **GET** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems | Get menu item option set items
 *MenuOptionSetItemsApi* | [**RemoveMenuItemOptionSetItem**](docs/MenuOptionSetItemsApi.md#removemenuitemoptionsetitem) | **DELETE** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId} | Delete menu item option set item
-*MenuOptionSetItemsApi* | [**SetOptionSetItemTax**](docs/MenuOptionSetItemsApi.md#setoptionsetitemtax) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/taxrate/{taxRateId} | [Private API] Set Tax Rate on OptionSetItem
+*MenuOptionSetItemsApi* | [**SetOptionSetItemTax**](docs/MenuOptionSetItemsApi.md#setoptionsetitemtax) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/taxrate/{taxRateId} | Set Tax Rate on OptionSetItem
 *MenuOptionSetItemsApi* | [**UpdateMenuItemOptionSetItem**](docs/MenuOptionSetItemsApi.md#updatemenuitemoptionsetitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId} | Update menu item option set item
 *MenuOptionSetItemsApi* | [**UploadOptionSetItemImage**](docs/MenuOptionSetItemsApi.md#uploadoptionsetitemimage) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image | Upload menu item option set item image
 *MenuOptionSetsApi* | [**CreateMenuItemOptionSet**](docs/MenuOptionSetsApi.md#createmenuitemoptionset) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets | Create menu item option set
@@ -333,8 +345,8 @@ Class | Method | HTTP request | Description
 *MenuSectionItemsApi* | [**DeleteMenuSectionItemImage**](docs/MenuSectionItemsApi.md#deletemenusectionitemimage) | **DELETE** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image | Delete menu section item image
 *MenuSectionItemsApi* | [**GetMenuItemById**](docs/MenuSectionItemsApi.md#getmenuitembyid) | **GET** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId} | Get menu item by identifier
 *MenuSectionItemsApi* | [**GetMenuItems**](docs/MenuSectionItemsApi.md#getmenuitems) | **GET** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems | Get menu items
-*MenuSectionItemsApi* | [**MoveMenuItem**](docs/MenuSectionItemsApi.md#movemenuitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/setorder/{destinationDisplayOrder} | [PRIVATE API]Move an Item within a menu
-*MenuSectionItemsApi* | [**SetSectionItemTax**](docs/MenuSectionItemsApi.md#setsectionitemtax) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/taxrate/{taxRateId} | [PRIVATE API]Move an Item within a menu
+*MenuSectionItemsApi* | [**MoveMenuItem**](docs/MenuSectionItemsApi.md#movemenuitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/setorder/{destinationDisplayOrder} | Move an Item within a menu
+*MenuSectionItemsApi* | [**SetSectionItemTax**](docs/MenuSectionItemsApi.md#setsectionitemtax) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/taxrate/{taxRateId} | Set tax rate for menu item
 *MenuSectionItemsApi* | [**UpdateMenuSectionItem**](docs/MenuSectionItemsApi.md#updatemenusectionitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId} | Update menu section item
 *MenuSectionItemsApi* | [**UploadMenuSectionItemImage**](docs/MenuSectionItemsApi.md#uploadmenusectionitemimage) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image | Upload menu section item image
 *MenuSectionsApi* | [**CloneMenuSection**](docs/MenuSectionsApi.md#clonemenusection) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/clone | Clone menu section
@@ -348,9 +360,21 @@ Class | Method | HTTP request | Description
 *MenuSectionsApi* | [**MenuSectionsSetItemDisplayOrders**](docs/MenuSectionsApi.md#menusectionssetitemdisplayorders) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitemdisplayorders | Re-arrange Items within a Section
 *MenuSectionsApi* | [**UpdateMenuSection**](docs/MenuSectionsApi.md#updatemenusection) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId} | Update menu section
 *MenuSectionsApi* | [**UploadMenuSectionImage**](docs/MenuSectionsApi.md#uploadmenusectionimage) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/image | Upload menu section image
-*MenusApi* | [**CreateDraftMenuFromExistingMenu**](docs/MenusApi.md#createdraftmenufromexistingmenu) | **POST** /api/v1.0/menus/{menuId}/clone/{newName} | [PRIVATE API]Clone a menu, (without attaching stores)
-*MenusApi* | [**CreateNewMenuForApp**](docs/MenusApi.md#createnewmenuforapp) | **POST** /api/v1.0/{appId}/menus | Create a new menu. If request body is empty, the system will create a menu with default items.
-*MenusApi* | [**DeleteMenu**](docs/MenusApi.md#deletemenu) | **DELETE** /api/v1.0/menus/{menuId} | [PRIVATE API]Mark a Menu as Deleted
+*MenuZonesApi* | [**AddMenuZone**](docs/MenuZonesApi.md#addmenuzone) | **POST** /api/v1.0/menus/{menuId}/zones | Adds a new menu zone to a menu.
+*MenuZonesApi* | [**DeleteMenuZone**](docs/MenuZonesApi.md#deletemenuzone) | **DELETE** /api/v1.0/menus/{menuId}/zones/{menuZoneId} | Deletes a menu zone.
+*MenuZonesApi* | [**DeleteMenuZoneImage**](docs/MenuZonesApi.md#deletemenuzoneimage) | **DELETE** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/image | Deletes a menu zone image.
+*MenuZonesApi* | [**FlipMenuZones**](docs/MenuZonesApi.md#flipmenuzones) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/flip/{menuZoneI2} | Flips the order of two menu zones.
+*MenuZonesApi* | [**GetMenuZone**](docs/MenuZonesApi.md#getmenuzone) | **GET** /api/v1.0/menus/{menuId}/zones/{menuZoneId} | Gets a specific menu zone for a given zone id
+*MenuZonesApi* | [**GetMenuZonesForMenuId**](docs/MenuZonesApi.md#getmenuzonesformenuid) | **GET** /api/v1.0/menus/{menuId}/zones | Gets all the menu zones for a menu
+*MenuZonesApi* | [**SetMenuSectionMenuZone**](docs/MenuZonesApi.md#setmenusectionmenuzone) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/section/{menuSectionId} | Assigns a zone to a menu section.
+*MenuZonesApi* | [**SetMenuZoneDescription**](docs/MenuZonesApi.md#setmenuzonedescription) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/description | Sets the description of a menu zone.
+*MenuZonesApi* | [**SetMenuZoneName**](docs/MenuZonesApi.md#setmenuzonename) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/name/{menuZoneName} | Sets the name of a menu zone.
+*MenuZonesApi* | [**UpdateMenuZone**](docs/MenuZonesApi.md#updatemenuzone) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId} | Updates a menu zone.
+*MenuZonesApi* | [**UploadMenuZoneImage**](docs/MenuZonesApi.md#uploadmenuzoneimage) | **POST** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/image | Uploads an image for a menu zone.
+*MenusApi* | [**CreateDraftMenuFromExistingMenu**](docs/MenusApi.md#createdraftmenufromexistingmenu) | **POST** /api/v1.0/menus/{menuId}/clone/{newName} | Clone a menu, (without attaching stores)
+*MenusApi* | [**CreateNewMenuAsync**](docs/MenusApi.md#createnewmenuasync) | **POST** /api/v1.0/{appId}/menus/async | Create a new menu asynchronously
+*MenusApi* | [**CreateNewMenuForApp**](docs/MenusApi.md#createnewmenuforapp) | **POST** /api/v1.0/{appId}/menus | Create a new menu
+*MenusApi* | [**DeleteMenu**](docs/MenusApi.md#deletemenu) | **DELETE** /api/v1.0/menus/{menuId} | Mark a Menu as Deleted
 *MenusApi* | [**DeleteMenuImage**](docs/MenusApi.md#deletemenuimage) | **DELETE** /api/v1.0/menus/{menuId}/image | Delete menu image
 *MenusApi* | [**DeleteMenuItemMetadata**](docs/MenusApi.md#deletemenuitemmetadata) | **DELETE** /api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId} | Delete menu item metadata
 *MenusApi* | [**GetAllMenuMetadataByMenuIdAndStoreId**](docs/MenusApi.md#getallmenumetadatabymenuidandstoreid) | **GET** /api/v1.0/menus/{menuId}/metadata/store/{storeId} | Get all menu metadata by menu ID and store ID
@@ -358,93 +382,111 @@ Class | Method | HTTP request | Description
 *MenusApi* | [**GetMenuItemMetadata**](docs/MenusApi.md#getmenuitemmetadata) | **GET** /api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId} | Get menu item metadata
 *MenusApi* | [**GetMenuItemMetadataByKey**](docs/MenusApi.md#getmenuitemmetadatabykey) | **GET** /api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId} | Get menu item metadata by key
 *MenusApi* | [**GetMenuItemOptionSetItemMetadata**](docs/MenusApi.md#getmenuitemoptionsetitemmetadata) | **GET** /api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId} | Get menu item option set item metadata by key
-*MenusApi* | [**GetMenuName**](docs/MenusApi.md#getmenuname) | **GET** /api/v1.0/menus/{menuId}/name | [PRIVATE API]Get Menus Name
-*MenusApi* | [**GetMenuStoreNames**](docs/MenusApi.md#getmenustorenames) | **GET** /api/v1.0/menus/{menuId}/stores | [PRIVATE API]Get menus store names
-*MenusApi* | [**GetMenuTaxDetails**](docs/MenusApi.md#getmenutaxdetails) | **GET** /api/v1.0/menus/{menuId}/tax | [PRIVATE API]Get menus tax details
-*MenusApi* | [**GetMenusByAppId**](docs/MenusApi.md#getmenusbyappid) | **GET** /api/v1.0/{appId}/menus | [PRIVATE API]Get menus by appId
-*MenusApi* | [**GetMenusCheckpoints**](docs/MenusApi.md#getmenuscheckpoints) | **GET** /api/v1.0/menus/{menuId}/checkpoints | [PRIVATE API]Get a Menus Checkpoints
-*MenusApi* | [**MenusDeleteTaxRate**](docs/MenusApi.md#menusdeletetaxrate) | **DELETE** /api/v1.0/menus/{menuId}/tax/{taxId} | [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
-*MenusApi* | [**MenusGetMenuBulkShowHide**](docs/MenusApi.md#menusgetmenubulkshowhide) | **GET** /api/v1.0/menus/{menuId}/bulkshowhide/list | 
-*MenusApi* | [**MenusSetDisplayOnMenuTax**](docs/MenusApi.md#menussetdisplayonmenutax) | **POST** /api/v1.0/menus/{menuId}/tax/show/{show} | [PRIVATE API]Set if tax shows for a Menu
-*MenusApi* | [**MenusSetItemDisplayOrders**](docs/MenusApi.md#menussetitemdisplayorders) | **POST** /api/v1.0/menus/{menuId}/sectiondisplayorders | [PRIVATE API]Re-arrange Sections within a Menu
-*MenusApi* | [**MenusShowHideBulkItems**](docs/MenusApi.md#menusshowhidebulkitems) | **POST** /api/v1.0/menus/{menuId}/bulkshowhide | 
-*MenusApi* | [**MenusUpdateTaxType**](docs/MenusApi.md#menusupdatetaxtype) | **POST** /api/v1.0/menus/{menuId}/tax/type/{type} | [PRIVATE API]Set the type of Tax on a Menu
-*MenusApi* | [**MenusUpsertTaxRate**](docs/MenusApi.md#menusupserttaxrate) | **POST** /api/v1.0/menus/{menuId}/taxrate | [PRIVATE API]Add/Update a Tax Rate
-*MenusApi* | [**RestoreAMenuCheckpoint**](docs/MenusApi.md#restoreamenucheckpoint) | **POST** /api/v1.0/menus/{menuId}/checkpoints/{checkpointId}/restore | [PRIVATE API]Restore a Menu to a checkpoint
+*MenusApi* | [**GetMenuName**](docs/MenusApi.md#getmenuname) | **GET** /api/v1.0/menus/{menuId}/name | Get Menus Name
+*MenusApi* | [**GetMenuStoreNames**](docs/MenusApi.md#getmenustorenames) | **GET** /api/v1.0/menus/{menuId}/stores | Get menus store names
+*MenusApi* | [**GetMenuTaxDetails**](docs/MenusApi.md#getmenutaxdetails) | **GET** /api/v1.0/menus/{menuId}/tax | Get menus tax details
+*MenusApi* | [**GetMenusByAppId**](docs/MenusApi.md#getmenusbyappid) | **GET** /api/v1.0/{appId}/menus | Get menus by appId
+*MenusApi* | [**GetMenusCheckpoints**](docs/MenusApi.md#getmenuscheckpoints) | **GET** /api/v1.0/menus/{menuId}/checkpoints | Get a Menus Checkpoints
+*MenusApi* | [**MenusDeleteTaxRate**](docs/MenusApi.md#menusdeletetaxrate) | **DELETE** /api/v1.0/menus/{menuId}/tax/{taxId} | Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
+*MenusApi* | [**MenusGetMenuBulkShowHide**](docs/MenusApi.md#menusgetmenubulkshowhide) | **GET** /api/v1.0/menus/{menuId}/bulkshowhide/list | Get bulk show/hide menu items and option set items
+*MenusApi* | [**MenusSetDisplayOnMenuTax**](docs/MenusApi.md#menussetdisplayonmenutax) | **POST** /api/v1.0/menus/{menuId}/tax/show/{show} | Set if tax shows for a Menu
+*MenusApi* | [**MenusSetItemDisplayOrders**](docs/MenusApi.md#menussetitemdisplayorders) | **POST** /api/v1.0/menus/{menuId}/sectiondisplayorders | Re-arrange Sections within a Menu
+*MenusApi* | [**MenusShowHideBulkItems**](docs/MenusApi.md#menusshowhidebulkitems) | **POST** /api/v1.0/menus/{menuId}/bulkshowhide | Bulk show/hide menu items or option set items
+*MenusApi* | [**MenusUpdateTaxType**](docs/MenusApi.md#menusupdatetaxtype) | **POST** /api/v1.0/menus/{menuId}/tax/type/{type} | Set the type of Tax on a Menu
+*MenusApi* | [**MenusUpsertTaxRate**](docs/MenusApi.md#menusupserttaxrate) | **POST** /api/v1.0/menus/{menuId}/taxrate | Add/Update a Tax Rate
+*MenusApi* | [**RestoreAMenuCheckpoint**](docs/MenusApi.md#restoreamenucheckpoint) | **POST** /api/v1.0/menus/{menuId}/checkpoints/{checkpointId}/restore | Restore a Menu to a checkpoint
 *MenusApi* | [**SetMenuItemMetadata**](docs/MenusApi.md#setmenuitemmetadata) | **PUT** /api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId} | Update menu item metadata
 *MenusApi* | [**SetMenuItemOptionSetItemMetadata**](docs/MenusApi.md#setmenuitemoptionsetitemmetadata) | **PUT** /api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId} | Update menu item option set item metadata
-*MenusApi* | [**SetMenuLock**](docs/MenusApi.md#setmenulock) | **POST** /api/v1.0/menus/{menuId}/lock | [PRIVATE API]Lock/Unlock a Menu for Editing
-*MenusApi* | [**SetMenuName**](docs/MenusApi.md#setmenuname) | **POST** /api/v1.0/menus/{menuId}/name | [PRIVATE API]Set Menus Name
+*MenusApi* | [**SetMenuLock**](docs/MenusApi.md#setmenulock) | **POST** /api/v1.0/menus/{menuId}/lock | Lock/Unlock a Menu for Editing
+*MenusApi* | [**SetMenuName**](docs/MenusApi.md#setmenuname) | **POST** /api/v1.0/menus/{menuId}/name | Set Menus Name
 *MenusApi* | [**UpdateMenu**](docs/MenusApi.md#updatemenu) | **POST** /api/v1.0/menus/{menuId} | Update menu
 *MenusApi* | [**UploadMenuImage**](docs/MenusApi.md#uploadmenuimage) | **POST** /api/v1.0/menus/{menuId}/image | Upload menu image
 *MenusApi* | [**UploadNewMenuForApp**](docs/MenusApi.md#uploadnewmenuforapp) | **POST** /api/v1.0/{appId}/menus/xlsx | Create a new menu from xlsx file.
-*MetafieldDefinitionsApi* | [**CreateMetafieldDefinition**](docs/MetafieldDefinitionsApi.md#createmetafielddefinition) | **POST** /api/v1.0/{appId}/metafields/definitions/{ownerEntity} | Create a Metafield Definition
-*MetafieldDefinitionsApi* | [**GetMetafieldDefinitionByKey**](docs/MetafieldDefinitionsApi.md#getmetafielddefinitionbykey) | **GET** /api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key} | Get a Metafield Definition for the specified owner entity and key.
-*MetafieldDefinitionsApi* | [**GetMetafieldDefinitions**](docs/MetafieldDefinitionsApi.md#getmetafielddefinitions) | **GET** /api/v1.0/{appId}/metafields/definitions/{ownerEntity} | Get Metafield Definitions for the specified owner entity.
-*MetafieldDefinitionsApi* | [**GetOwnerEntityConfigurations**](docs/MetafieldDefinitionsApi.md#getownerentityconfigurations) | **GET** /api/v1.0/{appId}/metafields/definitions | Get OwnerEntity Configurations which contain information to manage Metafield Definitions
-*MetafieldDefinitionsApi* | [**GetOwnerEntityRecommendations**](docs/MetafieldDefinitionsApi.md#getownerentityrecommendations) | **GET** /api/v1.0/{appId}/metafields/definitions/recommendations/{ownerEntity} | Get OwnerEntity Definition Recommendations
-*MetafieldDefinitionsApi* | [**UpdateMetafieldDefinition**](docs/MetafieldDefinitionsApi.md#updatemetafielddefinition) | **POST** /api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key} | Update a Metafield Definition
-*MobileAppsApi* | [**GetAppConfigSalesChannel**](docs/MobileAppsApi.md#getappconfigsaleschannel) | **GET** /api/v1.0/mobileapps/{appId}/saleschannel/details | Get sales channel configuration
-*MobileAppsApi* | [**GetStatistics**](docs/MobileAppsApi.md#getstatistics) | **GET** /api/v1.0/mobileapps/{appId}/statistics | Get statistics mobile apps
-*MobileAppsApi* | [**GetSubmissionDetails**](docs/MobileAppsApi.md#getsubmissiondetails) | **GET** /api/v1.0/mobileapps/{appId}/submission/details | Get submission details mobile apps
-*MobileAppsApi* | [**GetSubmissionStatus**](docs/MobileAppsApi.md#getsubmissionstatus) | **GET** /api/v1.0/mobileapps/{appId}/submission/status | Get submission status mobile apps
-*MobileAppsApi* | [**Submission**](docs/MobileAppsApi.md#submission) | **POST** /api/v1.0/mobileapps/{appId}/submission | Submission form mobile apps
-*MobileAppsApi* | [**UpdateAppConfigSalesChannel**](docs/MobileAppsApi.md#updateappconfigsaleschannel) | **POST** /api/v1.0/mobileapps/{appId}/saleschannel | Update the application sales channel configuration
-*MobileAppsApi* | [**UpdateSubmissionStatus**](docs/MobileAppsApi.md#updatesubmissionstatus) | **POST** /api/v1.0/mobileapps/{appId}/submission/{mobileAppsSubmissionId}/status | Update submission status
-*MobileAppsApi* | [**UploadImage**](docs/MobileAppsApi.md#uploadimage) | **POST** /api/v1.0/mobileapps/{appId}/submission/image | Upload image mobile apps
-*OAuthClientsApi* | [**AddRedirectUri**](docs/OAuthClientsApi.md#addredirecturi) | **POST** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis | Create OAuth App redirect uri
-*OAuthClientsApi* | [**CreateOAuthApp**](docs/OAuthClientsApi.md#createoauthapp) | **POST** /api/v1.0/{appId}/oauthclients | Create OAuth App
-*OAuthClientsApi* | [**DeleteOAuthApp**](docs/OAuthClientsApi.md#deleteoauthapp) | **DELETE** /api/v1.0/{appId}/oauthclients/{oauthAppId} | Delete OAuth App
-*OAuthClientsApi* | [**GetOAuthApps**](docs/OAuthClientsApi.md#getoauthapps) | **GET** /api/v1.0/{appId}/oauthclients | Get all OAuth Apps
-*OAuthClientsApi* | [**GetOAuthClientByClientId**](docs/OAuthClientsApi.md#getoauthclientbyclientid) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId} | Get OAuth App by identifier
-*OAuthClientsApi* | [**GetOAuthClientSecret**](docs/OAuthClientsApi.md#getoauthclientsecret) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/secret | Get OAuth App secret key
-*OAuthClientsApi* | [**GetOauthAccessToken**](docs/OAuthClientsApi.md#getoauthaccesstoken) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/accesstoken | Get OAuth access token for App
-*OAuthClientsApi* | [**GetRedirectUris**](docs/OAuthClientsApi.md#getredirecturis) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis | Get OAuth App redirect uris
+*MenusNutritionInfoApi* | [**AddOrUpdateMenuItemNutritionInfo**](docs/MenusNutritionInfoApi.md#addorupdatemenuitemnutritioninfo) | **POST** /api/v1.0/menus/{menuId}/menuItem/{publicId}/nutrition | Add or update menuitem nutrition info by menu item's publicId
+*MenusNutritionInfoApi* | [**AddOrUpdateMenuItemOptionSetItemNutritionInfo**](docs/MenusNutritionInfoApi.md#addorupdatemenuitemoptionsetitemnutritioninfo) | **POST** /api/v1.0/menus/{menuId}/menuItemOption/{publicId}/nutrition | Add or update menuitem optionsetitem nutrition info its publicId
+*MenusNutritionInfoApi* | [**AddOrUpdateMenuNutritionInfoByMenuId**](docs/MenusNutritionInfoApi.md#addorupdatemenunutritioninfobymenuid) | **POST** /api/v1.0/menus/{menuId}/nutrition | Add or update menu nutrition by identifier
+*MenusNutritionInfoApi* | [**DeleteMenuNutritionInfoByMenuId**](docs/MenusNutritionInfoApi.md#deletemenunutritioninfobymenuid) | **DELETE** /api/v1.0/menus/{menuId}/nutrition | Delete menu nutrition information by menuId
+*MenusNutritionInfoApi* | [**GetAllergens**](docs/MenusNutritionInfoApi.md#getallergens) | **GET** /api/v1.0/{appId}/menus/nutrition/allergens | Get allergens
+*MenusNutritionInfoApi* | [**GetMenuNutritionInfoByMenuId**](docs/MenusNutritionInfoApi.md#getmenunutritioninfobymenuid) | **GET** /api/v1.0/menus/{menuId}/nutrition | Get menu nutrition by menuId
+*MenusNutritionInfoV2Api* | [**AddOrUpdateMenuItemNutritionInfoV2**](docs/MenusNutritionInfoV2Api.md#addorupdatemenuitemnutritioninfov2) | **POST** /api/v1.0/{appId}/menus/{menuId}/menuItem/{publicId}/nutritionv2 | Add or update menuitem nutrition info by menu item's publicId
+*MenusNutritionInfoV2Api* | [**AddOrUpdateMenuItemOptionSetItemNutritionInfoV2**](docs/MenusNutritionInfoV2Api.md#addorupdatemenuitemoptionsetitemnutritioninfov2) | **POST** /api/v1.0/{appId}/menus/{menuId}/menuItemOption/{publicId}/nutritionv2 | Add or update menuitem option set item's nutrition info by its publicId
+*MenusNutritionInfoV2Api* | [**GetAllergensV2**](docs/MenusNutritionInfoV2Api.md#getallergensv2) | **GET** /api/v1.0/{appId}/menus/nutritionv2/allergens | Get allergens
+*MenusNutritionInfoV2Api* | [**GetMenuNutritionInfoV2ByMenuId**](docs/MenusNutritionInfoV2Api.md#getmenunutritioninfov2bymenuid) | **GET** /api/v1.0/{appId}/menus/{menuId}/nutritionv2 | Get menu nutrition by menuId
+*MetafieldDefinitionsApi* | [**CreateMetafieldDefinition**](docs/MetafieldDefinitionsApi.md#createmetafielddefinition) | **POST** /api/v1.0/{appId}/metafields/definitions/{ownerEntity} | 
+*MetafieldDefinitionsApi* | [**GetMetafieldDefinitionByKey**](docs/MetafieldDefinitionsApi.md#getmetafielddefinitionbykey) | **GET** /api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key} | 
+*MetafieldDefinitionsApi* | [**GetMetafieldDefinitions**](docs/MetafieldDefinitionsApi.md#getmetafielddefinitions) | **GET** /api/v1.0/{appId}/metafields/definitions/{ownerEntity} | 
+*MetafieldDefinitionsApi* | [**GetOwnerEntityConfigurations**](docs/MetafieldDefinitionsApi.md#getownerentityconfigurations) | **GET** /api/v1.0/{appId}/metafields/definitions | 
+*MetafieldDefinitionsApi* | [**GetOwnerEntityRecommendations**](docs/MetafieldDefinitionsApi.md#getownerentityrecommendations) | **GET** /api/v1.0/{appId}/metafields/definitions/recommendations/{ownerEntity} | 
+*MetafieldDefinitionsApi* | [**UpdateMetafieldDefinition**](docs/MetafieldDefinitionsApi.md#updatemetafielddefinition) | **POST** /api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key} | 
+*MobileAppsApi* | [**GetAppConfigSalesChannel**](docs/MobileAppsApi.md#getappconfigsaleschannel) | **GET** /api/v1.0/mobileapps/{appId}/saleschannel/details | 
+*MobileAppsApi* | [**GetStatistics**](docs/MobileAppsApi.md#getstatistics) | **GET** /api/v1.0/mobileapps/{appId}/statistics | 
+*MobileAppsApi* | [**GetSubmissionDetails**](docs/MobileAppsApi.md#getsubmissiondetails) | **GET** /api/v1.0/mobileapps/{appId}/submission/details | 
+*MobileAppsApi* | [**GetSubmissionStatus**](docs/MobileAppsApi.md#getsubmissionstatus) | **GET** /api/v1.0/mobileapps/{appId}/submission/{submissionId}/status | 
+*MobileAppsApi* | [**Publish**](docs/MobileAppsApi.md#publish) | **POST** /api/v1.0/mobileapps/{appId}/submission/{submissionId}/publish | 
+*MobileAppsApi* | [**Resubmission**](docs/MobileAppsApi.md#resubmission) | **POST** /api/v1.0/mobileapps/{appId}/resubmission | 
+*MobileAppsApi* | [**Submission**](docs/MobileAppsApi.md#submission) | **POST** /api/v1.0/mobileapps/{appId}/submission | 
+*MobileAppsApi* | [**Unpublish**](docs/MobileAppsApi.md#unpublish) | **POST** /api/v1.0/mobileapps/{appId}/submission/{submissionId}/unpublish | 
+*MobileAppsApi* | [**UpdateAppConfigSalesChannel**](docs/MobileAppsApi.md#updateappconfigsaleschannel) | **POST** /api/v1.0/mobileapps/{appId}/saleschannel | 
+*MobileAppsApi* | [**UpdateSubmissionStatus**](docs/MobileAppsApi.md#updatesubmissionstatus) | **POST** /api/v1.0/mobileapps/{appId}/submission/{submissionId}/status | 
+*MobileAppsApi* | [**UploadImage**](docs/MobileAppsApi.md#uploadimage) | **POST** /api/v1.0/mobileapps/{appId}/submission/image | 
+*OAuthClientsApi* | [**AddRedirectUri**](docs/OAuthClientsApi.md#addredirecturi) | **POST** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis | 
+*OAuthClientsApi* | [**CreateOAuthApp**](docs/OAuthClientsApi.md#createoauthapp) | **POST** /api/v1.0/{appId}/oauthclients | 
+*OAuthClientsApi* | [**DeleteOAuthApp**](docs/OAuthClientsApi.md#deleteoauthapp) | **DELETE** /api/v1.0/{appId}/oauthclients/{oauthAppId} | 
+*OAuthClientsApi* | [**GetOAuthApps**](docs/OAuthClientsApi.md#getoauthapps) | **GET** /api/v1.0/{appId}/oauthclients | 
+*OAuthClientsApi* | [**GetOAuthClientByClientId**](docs/OAuthClientsApi.md#getoauthclientbyclientid) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId} | 
+*OAuthClientsApi* | [**GetOAuthClientSecret**](docs/OAuthClientsApi.md#getoauthclientsecret) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/secret | 
+*OAuthClientsApi* | [**GetOauthAccessToken**](docs/OAuthClientsApi.md#getoauthaccesstoken) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/accesstoken | 
+*OAuthClientsApi* | [**GetRedirectUris**](docs/OAuthClientsApi.md#getredirecturis) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis | 
 *OAuthClientsApi* | [**OAuthClientsGetApplications**](docs/OAuthClientsApi.md#oauthclientsgetapplications) | **GET** /api/v1.0/{appId}/oauthclients/appnames | 
-*OAuthClientsApi* | [**RemoveRedirectUri**](docs/OAuthClientsApi.md#removeredirecturi) | **DELETE** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis/{uriId} | Delete OAuth App redirect uri
-*OAuthClientsApi* | [**UpdateOAuthApp**](docs/OAuthClientsApi.md#updateoauthapp) | **POST** /api/v1.0/{appId}/oauthclients/{oauthAppId} | Update OAuth App
+*OAuthClientsApi* | [**RemoveRedirectUri**](docs/OAuthClientsApi.md#removeredirecturi) | **DELETE** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis/{uriId} | 
+*OAuthClientsApi* | [**UpdateOAuthApp**](docs/OAuthClientsApi.md#updateoauthapp) | **POST** /api/v1.0/{appId}/oauthclients/{oauthAppId} | 
 *OnboardingApi* | [**OnboardingGetOnboardingConfig**](docs/OnboardingApi.md#onboardinggetonboardingconfig) | **GET** /api/v1.0/clients/{appId}/onboarding/config | 
+*OnboardingApi* | [**OnboardingGetOnboardingConfigs**](docs/OnboardingApi.md#onboardinggetonboardingconfigs) | **GET** /api/v1.0/clients/{appId}/onboarding/configs | 
 *OnboardingApi* | [**OnboardingGetOnboardingItems**](docs/OnboardingApi.md#onboardinggetonboardingitems) | **GET** /api/v1.0/clients/{appId}/onboarding/stores/{storeId} | 
+*OnboardingApi* | [**OnboardingGetOnboardingItemsV2**](docs/OnboardingApi.md#onboardinggetonboardingitemsv2) | **GET** /api/v1.0/clients/{appId}/onboarding/stores | 
 *OnboardingApi* | [**OnboardingUpdateOnboardingConfig**](docs/OnboardingApi.md#onboardingupdateonboardingconfig) | **POST** /api/v1.0/clients/{appId}/onboarding/config | 
+*OnboardingApi* | [**OnboardingUpdateOnboardingConfigById**](docs/OnboardingApi.md#onboardingupdateonboardingconfigbyid) | **POST** /api/v1.0/clients/{appId}/onboarding/config/{configId} | 
 *OnboardingApi* | [**OnboardingUpdateOnboardingItem**](docs/OnboardingApi.md#onboardingupdateonboardingitem) | **POST** /api/v1.0/clients/{appId}/onboarding/stores/{storeId}/items/{onboardingItemId} | 
-*OrderBatchesApi* | [**GetAllOrderBatches**](docs/OrderBatchesApi.md#getallorderbatches) | **GET** /api/v1.0/{appId}/stores/{storeId}/order-batches | Returns order batches
-*OrderBatchesApi* | [**GetOrderBatch**](docs/OrderBatchesApi.md#getorderbatch) | **GET** /api/v1.0/{appId}/stores/{storeId}/order-batches/{batchId} | Returns the order batch details
-*OrderBatchingConfigurationApi* | [**Get**](docs/OrderBatchingConfigurationApi.md#get) | **GET** /api/v1.0/stores/{storeId}/order-batching-configuration | Returns order batching configuration for a specific store
-*OrderBatchingConfigurationApi* | [**Post**](docs/OrderBatchingConfigurationApi.md#post) | **POST** /api/v1.0/stores/{storeId}/order-batching-configuration | Sets order batching configuration for a specific store
-*OrderIngestApi* | [**OrderIngestSubmitNewOrder**](docs/OrderIngestApi.md#orderingestsubmitneworder) | **POST** /api/v1.0/{appNameId}/order-ingest/submit | Provides an ability to ingest a 3rd party order into Flipdish ecosystem
-*OrdersApi* | [**AcceptOrder**](docs/OrdersApi.md#acceptorder) | **POST** /api/v1.0/orders/{id}/accept | Accept order
-*OrdersApi* | [**DispatchOrder**](docs/OrdersApi.md#dispatchorder) | **POST** /api/v1.0/orders/{id}/dispatch | Dispatch order
-*OrdersApi* | [**GetDeliveryInformation**](docs/OrdersApi.md#getdeliveryinformation) | **GET** /api/v1.0/orders/{orderId}/deliveryinfo | Get order delivery information
-*OrdersApi* | [**GetFulfillmentState**](docs/OrdersApi.md#getfulfillmentstate) | **GET** /api/v1.0/orders/{orderId}/fulfillment/state | Get order fulfillment state
-*OrdersApi* | [**GetFulfillmentStatusWithDetailsAndActions**](docs/OrdersApi.md#getfulfillmentstatuswithdetailsandactions) | **GET** /api/v1.0/orders/{orderId}/fulfillment/state/details | Get order fulfillment state with actionable details like default next state
-*OrdersApi* | [**GetOrderById**](docs/OrdersApi.md#getorderbyid) | **GET** /api/v1.0/orders/{id} | Get order by ID
-*OrdersApi* | [**GetOrders**](docs/OrdersApi.md#getorders) | **GET** /api/v1.0/orders | Get orders by filter
-*OrdersApi* | [**GetOrdersSummary**](docs/OrdersApi.md#getorderssummary) | **GET** /api/v1.0/{appId}/orders/summaries | [PRIVATE API] Get summary of orders by filter
-*OrdersApi* | [**RefundOrder**](docs/OrdersApi.md#refundorder) | **POST** /api/v1.0/orders/{id}/refund | Refund order
-*OrdersApi* | [**RejectOrder**](docs/OrdersApi.md#rejectorder) | **POST** /api/v1.0/orders/{id}/reject | Reject order
-*OrdersApi* | [**SearchFulfillmentStatuses**](docs/OrdersApi.md#searchfulfillmentstatuses) | **GET** /api/v1.0/{appId}/orders/fulfillmentstatuses | Get fulfillment status for a list of orders
-*OrdersApi* | [**UpdateDeliveryInformation**](docs/OrdersApi.md#updatedeliveryinformation) | **POST** /api/v1.0/orders/{orderId}/deliveryinfo | Add/update delivery-related information to an order
-*OrdersApi* | [**UpdateFulfillmentState**](docs/OrdersApi.md#updatefulfillmentstate) | **POST** /api/v1.0/orders/{orderId}/fulfillment/state | Update fulfillment status information to an order
-*PaymentIntentsApi* | [**GetPaymentIntent**](docs/PaymentIntentsApi.md#getpaymentintent) | **GET** /api/v1.0/payment_intents/{paymentIntentId} | Returns stripe payment intent for a given id
-*PaymentsApi* | [**GetOrderPaymentInformation**](docs/PaymentsApi.md#getorderpaymentinformation) | **GET** /api/v1.0/payments/payment/{orderId}/refundable | Returns payment refund information related to the order with the order id
-*PayoutsApi* | [**GetPayout**](docs/PayoutsApi.md#getpayout) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId} | Get Payout details broken down by Store
-*PayoutsApi* | [**GetPayoutChargebacks**](docs/PayoutsApi.md#getpayoutchargebacks) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks | Get list of payout's chargebacks
-*PayoutsApi* | [**GetPayoutOrders**](docs/PayoutsApi.md#getpayoutorders) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders | Get list of payout's orders
-*PayoutsApi* | [**GetPayoutOtherCharges**](docs/PayoutsApi.md#getpayoutothercharges) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges | Get list of payout's other charges
-*PayoutsApi* | [**GetPayoutRefunds**](docs/PayoutsApi.md#getpayoutrefunds) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds | Get list of payout's refunds
-*PayoutsApi* | [**GetPayoutSummaries**](docs/PayoutsApi.md#getpayoutsummaries) | **GET** /api/v1.0/{appId}/payouts/summaries | Get list of payout summaries
-*PayoutsApi* | [**GetPayouts**](docs/PayoutsApi.md#getpayouts) | **GET** /api/v1.0/{appId}/payouts | Get list of payouts
-*PayoutsExportApi* | [**ExportPayoutChargebacks**](docs/PayoutsExportApi.md#exportpayoutchargebacks) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks/export | Export a list of payout's chargebacks as CSV
-*PayoutsExportApi* | [**ExportPayoutOrders**](docs/PayoutsExportApi.md#exportpayoutorders) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders/export | Export a list of payout's orders as CSV
-*PayoutsExportApi* | [**ExportPayoutOtherCharges**](docs/PayoutsExportApi.md#exportpayoutothercharges) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges/export | Export a list of payout's other charges as CSV
-*PayoutsExportApi* | [**ExportPayoutRefunds**](docs/PayoutsExportApi.md#exportpayoutrefunds) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds/export | Export a list of payout's refunds as CSV
-*PayoutsExportApi* | [**ExportPayoutStores**](docs/PayoutsExportApi.md#exportpayoutstores) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/export | Export payout's details as CSV
-*PayoutsExportApi* | [**ExportPayouts**](docs/PayoutsExportApi.md#exportpayouts) | **GET** /api/v1.0/{appId}/payouts/export | Export payouts as CSV
-*ProcessingFeeConfigsApi* | [**GetProcessingFeeConfigsByStoreIds**](docs/ProcessingFeeConfigsApi.md#getprocessingfeeconfigsbystoreids) | **GET** /api/v1.0/processingfeeconfigs | Get processing fee configs by store identifiers
-*PushNotificationsApi* | [**DeletePushNotification**](docs/PushNotificationsApi.md#deletepushnotification) | **DELETE** /api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId} | [PRIVATE] Push notification to cutomers
-*PushNotificationsApi* | [**GetPushNotifications**](docs/PushNotificationsApi.md#getpushnotifications) | **GET** /api/v1.0/{appId}/pushnotifications | [PRIVATE] Push notification to cutomers
-*PushNotificationsApi* | [**SchedulePushNotification**](docs/PushNotificationsApi.md#schedulepushnotification) | **POST** /api/v1.0/{appId}/pushnotifications | [PRIVATE] Push notification to cutomers
-*PushNotificationsApi* | [**UpdatePushNotification**](docs/PushNotificationsApi.md#updatepushnotification) | **POST** /api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId} | [PRIVATE] Update the push notification
+*OnboardingApi* | [**OnboardingUpdateOnboardingItemV2**](docs/OnboardingApi.md#onboardingupdateonboardingitemv2) | **POST** /api/v1.0/clients/{appId}/onboarding/stores/items/{onboardingItemId} | 
+*OrderBatchesApi* | [**GetAllOrderBatches**](docs/OrderBatchesApi.md#getallorderbatches) | **GET** /api/v1.0/{appId}/order-batches | 
+*OrderBatchesApi* | [**GetOrderBatch**](docs/OrderBatchesApi.md#getorderbatch) | **GET** /api/v1.0/{appId}/order-batches/{orderBatchId} | 
+*OrderBatchingConfigurationApi* | [**Get**](docs/OrderBatchingConfigurationApi.md#get) | **GET** /api/v1.0/stores/{storeId}/order-batching-configuration | 
+*OrderBatchingConfigurationApi* | [**Post**](docs/OrderBatchingConfigurationApi.md#post) | **POST** /api/v1.0/stores/{storeId}/order-batching-configuration | 
+*OrdersApi* | [**AcceptOrder**](docs/OrdersApi.md#acceptorder) | **POST** /api/v1.0/orders/{id}/accept | 
+*OrdersApi* | [**DispatchOrder**](docs/OrdersApi.md#dispatchorder) | **POST** /api/v1.0/orders/{id}/dispatch | 
+*OrdersApi* | [**GetDeliveryInformation**](docs/OrdersApi.md#getdeliveryinformation) | **GET** /api/v1.0/orders/{orderId}/deliveryinfo | 
+*OrdersApi* | [**GetFulfillmentState**](docs/OrdersApi.md#getfulfillmentstate) | **GET** /api/v1.0/orders/{orderId}/fulfillment/state | 
+*OrdersApi* | [**GetFulfillmentStatusWithDetailsAndActions**](docs/OrdersApi.md#getfulfillmentstatuswithdetailsandactions) | **GET** /api/v1.0/orders/{orderId}/fulfillment/state/details | 
+*OrdersApi* | [**GetOrderById**](docs/OrdersApi.md#getorderbyid) | **GET** /api/v1.0/orders/{id} | 
+*OrdersApi* | [**GetOrders**](docs/OrdersApi.md#getorders) | **GET** /api/v1.0/orders | 
+*OrdersApi* | [**GetOrdersSummary**](docs/OrdersApi.md#getorderssummary) | **GET** /api/v1.0/{appId}/orders/summaries | 
+*OrdersApi* | [**GetOrdersSummaryNew**](docs/OrdersApi.md#getorderssummarynew) | **GET** /api/v1.0/{appId}/orders/summariesNew | 
+*OrdersApi* | [**GetReadyToProcess**](docs/OrdersApi.md#getreadytoprocess) | **GET** /api/v1.0/{appId}/orders/ready_to_process | 
+*OrdersApi* | [**RefundOrder**](docs/OrdersApi.md#refundorder) | **POST** /api/v1.0/orders/{id}/refund | 
+*OrdersApi* | [**RejectOrder**](docs/OrdersApi.md#rejectorder) | **POST** /api/v1.0/orders/{id}/reject | 
+*OrdersApi* | [**SearchFulfillmentStatuses**](docs/OrdersApi.md#searchfulfillmentstatuses) | **GET** /api/v1.0/{appId}/orders/fulfillmentstatuses | 
+*OrdersApi* | [**UpdateDeliveryInformation**](docs/OrdersApi.md#updatedeliveryinformation) | **POST** /api/v1.0/orders/{orderId}/deliveryinfo | 
+*OrdersApi* | [**UpdateFulfillmentState**](docs/OrdersApi.md#updatefulfillmentstate) | **POST** /api/v1.0/orders/{orderId}/fulfillment/state | 
+*PaymentIntentsApi* | [**GetPaymentIntent**](docs/PaymentIntentsApi.md#getpaymentintent) | **GET** /api/v1.0/payment_intents/{paymentIntentId} | 
+*PaymentsApi* | [**GetOrderPaymentInformation**](docs/PaymentsApi.md#getorderpaymentinformation) | **GET** /api/v1.0/payments/payment/{orderId}/refundable | 
+*PayoutReportsApi* | [**GetPayoutReport3Details**](docs/PayoutReportsApi.md#getpayoutreport3details) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/details | 
+*PayoutReportsApi* | [**GetPayoutReport3Overview**](docs/PayoutReportsApi.md#getpayoutreport3overview) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/overview | 
+*PayoutReportsApi* | [**GetPayoutReport3PropertyDetails**](docs/PayoutReportsApi.md#getpayoutreport3propertydetails) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/properties | 
+*PayoutReportsApi* | [**GetPayoutReport3RefundedOrders**](docs/PayoutReportsApi.md#getpayoutreport3refundedorders) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/refundedOrders | 
+*PayoutReportsApi* | [**GetPayoutReport3Stores**](docs/PayoutReportsApi.md#getpayoutreport3stores) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/stores | 
+*PayoutsApi* | [**GetPayout**](docs/PayoutsApi.md#getpayout) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId} | 
+*PayoutsApi* | [**GetPayoutChargebacks**](docs/PayoutsApi.md#getpayoutchargebacks) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks | 
+*PayoutsApi* | [**GetPayoutOrders**](docs/PayoutsApi.md#getpayoutorders) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders | 
+*PayoutsApi* | [**GetPayoutOtherCharges**](docs/PayoutsApi.md#getpayoutothercharges) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges | 
+*PayoutsApi* | [**GetPayoutRefunds**](docs/PayoutsApi.md#getpayoutrefunds) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds | 
+*PayoutsApi* | [**GetPayoutSummaries**](docs/PayoutsApi.md#getpayoutsummaries) | **GET** /api/v1.0/{appId}/payouts/summaries | 
+*PayoutsApi* | [**GetPayouts**](docs/PayoutsApi.md#getpayouts) | **GET** /api/v1.0/{appId}/payouts | 
+*ProcessingFeeConfigsApi* | [**GetProcessingFeeConfigsByStoreIds**](docs/ProcessingFeeConfigsApi.md#getprocessingfeeconfigsbystoreids) | **GET** /api/v1.0/processingfeeconfigs | 
+*PushNotificationsApi* | [**DeletePushNotification**](docs/PushNotificationsApi.md#deletepushnotification) | **DELETE** /api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId} | 
+*PushNotificationsApi* | [**GetPushNotifications**](docs/PushNotificationsApi.md#getpushnotifications) | **GET** /api/v1.0/{appId}/pushnotifications | 
+*PushNotificationsApi* | [**SchedulePushNotification**](docs/PushNotificationsApi.md#schedulepushnotification) | **POST** /api/v1.0/{appId}/pushnotifications | 
+*PushNotificationsApi* | [**UpdatePushNotification**](docs/PushNotificationsApi.md#updatepushnotification) | **POST** /api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId} | 
+*ReceiptsApi* | [**GetReceipt**](docs/ReceiptsApi.md#getreceipt) | **GET** /api/v1.0/receipts/{orderId} | 
 *RestaurantVouchersPayGreenApi* | [**CreatePayGreenConfiguration**](docs/RestaurantVouchersPayGreenApi.md#createpaygreenconfiguration) | **POST** /api/v1.0/{appId}/restaurant-vouchers/paygreen | 
 *RestaurantVouchersPayGreenApi* | [**DeletePayGreenConfiguration**](docs/RestaurantVouchersPayGreenApi.md#deletepaygreenconfiguration) | **DELETE** /api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId} | 
 *RestaurantVouchersPayGreenApi* | [**GetElegibleStores**](docs/RestaurantVouchersPayGreenApi.md#getelegiblestores) | **GET** /api/v1.0/{appId}/restaurant-vouchers/paygreen/stores | 
@@ -454,108 +496,182 @@ Class | Method | HTTP request | Description
 *RestaurantVouchersPayGreenApi* | [**ListPayGreenConfigurations**](docs/RestaurantVouchersPayGreenApi.md#listpaygreenconfigurations) | **GET** /api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId} | 
 *RestaurantVouchersPayGreenApi* | [**UpdatePayGreenConfiguration**](docs/RestaurantVouchersPayGreenApi.md#updatepaygreenconfiguration) | **POST** /api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId} | 
 *RestaurantVouchersPayGreenApi* | [**UpdateStorePayGreenConfiguration_**](docs/RestaurantVouchersPayGreenApi.md#updatestorepaygreenconfiguration_) | **POST** /api/v1.0/{appId}/restaurant-vouchers/paygreen/stores/{storeId} | 
-*StoreGroupsApi* | [**CreateStoreGroup**](docs/StoreGroupsApi.md#createstoregroup) | **POST** /api/v1.0/{appNameId}/storegroups | Creates a Store Group  It will be attached to an existing App
-*StoreGroupsApi* | [**GetStoreGroup**](docs/StoreGroupsApi.md#getstoregroup) | **GET** /api/v1.0/storegroups/{storeGroupId} | Returns a Store Groups
-*StoreGroupsApi* | [**GetStoreGroups**](docs/StoreGroupsApi.md#getstoregroups) | **GET** /api/v1.0/{appNameId}/storegroups | Returns a paginated list of Store Groups
-*StoreGroupsApi* | [**GetStoreGroupsExtended**](docs/StoreGroupsApi.md#getstoregroupsextended) | **GET** /api/v1.0/{appNameId}/storegroups/extended | [PRIVATE API] Returns a paginated list of Extended Store Groups
-*StoreGroupsApi* | [**RemoveStoreGroup**](docs/StoreGroupsApi.md#removestoregroup) | **DELETE** /api/v1.0/storegroups/{storeGroupId} | Deletes a Store Group  Can only remove a store group if there is no stores attached to the group
-*StoreGroupsApi* | [**UpdateStoreGroup**](docs/StoreGroupsApi.md#updatestoregroup) | **POST** /api/v1.0/storegroups/{storeGroupId} | Updates Store Group
-*StoreOrderCapacityApi* | [**GetStoreOrderCapacity**](docs/StoreOrderCapacityApi.md#getstoreordercapacity) | **GET** /api/v1.0/{appId}/storeordercapacity/{storeId}/{deliveryType} | Get store's order capacity configuration
-*StoreOrderCapacityApi* | [**UpdateStoreOrderCapacityConfig**](docs/StoreOrderCapacityApi.md#updatestoreordercapacityconfig) | **POST** /api/v1.0/{appId}/storeordercapacity/{storeId} | Create or update a store's order capacity configuration
-*StoresApi* | [**ArchiveStore**](docs/StoresApi.md#archivestore) | **POST** /api/v1.0/stores/{storeId}/archive | Archive store
-*StoresApi* | [**AssignMenu**](docs/StoresApi.md#assignmenu) | **POST** /api/v1.0/stores/{storeId}/menu/{menuId} | Assign Menu to Store
-*StoresApi* | [**CloneStore**](docs/StoresApi.md#clonestore) | **POST** /api/v1.0/stores/{storeId}/clone | Clone store with store clone settings
-*StoresApi* | [**ConfigureStoreServiceCharge**](docs/StoresApi.md#configurestoreservicecharge) | **POST** /api/v1.0/stores/{storeId}/servicecharge | Configure Store Service Charge; Idempotent Operation
-*StoresApi* | [**CreateBusinessHoursOverrideByStoreId**](docs/StoresApi.md#createbusinesshoursoverridebystoreid) | **POST** /api/v1.0/stores/{storeId}/businesshoursoverrides | Create Business Hours Override for a store
-*StoresApi* | [**CreateStore**](docs/StoresApi.md#createstore) | **POST** /api/v1.0/stores | Create store with Store Group identifier
-*StoresApi* | [**DeleteBusinessHoursOverride**](docs/StoresApi.md#deletebusinesshoursoverride) | **DELETE** /api/v1.0/stores/{storeId}/businesshoursoverrides/{businessHoursOverrideId} | Delete Business Hours Override for a store
-*StoresApi* | [**GetBankAccountForStore**](docs/StoresApi.md#getbankaccountforstore) | **GET** /api/v1.0/stores/{storeId}/bankaccount | Get Stores Bank Account Id
-*StoresApi* | [**GetBusinessHours**](docs/StoresApi.md#getbusinesshours) | **GET** /api/v1.0/stores/{storeId}/availability/{deliveryType} | Get Business hours
-*StoresApi* | [**GetBusinessHoursOverrideByStoreId**](docs/StoresApi.md#getbusinesshoursoverridebystoreid) | **GET** /api/v1.0/stores/{storeId}/businesshoursoverrides | Get business hours overrides by store identifier
-*StoresApi* | [**GetEndOfDayReport**](docs/StoresApi.md#getendofdayreport) | **GET** /api/v1.0/stores/{storeId}/endofdayreport | Get store end of day report
-*StoresApi* | [**GetPreOrderConfig**](docs/StoresApi.md#getpreorderconfig) | **GET** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType} | Get the pre order config for a store, by type
-*StoresApi* | [**GetPreOrderPreview**](docs/StoresApi.md#getpreorderpreview) | **GET** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/preview | Get the Preview times of the pre-order configuration
-*StoresApi* | [**GetProcessingFeeConfigsByStoreId**](docs/StoresApi.md#getprocessingfeeconfigsbystoreid) | **GET** /api/v1.0/stores/{storeId}/processingfeeconfigs | Get processing fee configs by store identifier
-*StoresApi* | [**GetProcessingFeeConfigsByStoreIdAndPaymentAccountType**](docs/StoresApi.md#getprocessingfeeconfigsbystoreidandpaymentaccounttype) | **GET** /api/v1.0/stores/{storeId}/processingfeeconfigs/{paymentAccountType} | Get processing fee configs by store identifier
-*StoresApi* | [**GetStoreById**](docs/StoresApi.md#getstorebyid) | **GET** /api/v1.0/stores/{storeId} | Get store by identifier
-*StoresApi* | [**GetStoreFeeConfig**](docs/StoresApi.md#getstorefeeconfig) | **GET** /api/v1.0/stores/{storeId}/feeConfig | Retrieve Store feeConfig
-*StoresApi* | [**GetStoreHeadersByAppId**](docs/StoresApi.md#getstoreheadersbyappid) | **GET** /api/v1.0/{appId}/stores/header | Get all stores by app name id
-*StoresApi* | [**GetStoreNetSales**](docs/StoresApi.md#getstorenetsales) | **GET** /api/v1.0/{appId}/stores/stats | Get stores statistics by app name id and storeIds
-*StoresApi* | [**GetStoreServiceCharge**](docs/StoresApi.md#getstoreservicecharge) | **GET** /api/v1.0/stores/{storeId}/servicecharge | Retrieve Store Service Charge
-*StoresApi* | [**GetStores**](docs/StoresApi.md#getstores) | **GET** /api/v1.0/stores | Get all stores, excluding archived ones
-*StoresApi* | [**GetStoresByAppId**](docs/StoresApi.md#getstoresbyappid) | **GET** /api/v1.0/{appId}/stores | Get all stores by app name id
-*StoresApi* | [**GetStoresByStoreIdWithValidations**](docs/StoresApi.md#getstoresbystoreidwithvalidations) | **GET** /api/v1.0/{appId}/storevalidation/kiosk | Get store validation by storeIds
-*StoresApi* | [**PublishStore**](docs/StoresApi.md#publishstore) | **POST** /api/v1.0/stores/{storeId}/publish | Publish store
-*StoresApi* | [**SetBusinessHours**](docs/StoresApi.md#setbusinesshours) | **POST** /api/v1.0/stores/{storeId}/availability/{deliveryType} | Set Business hours
-*StoresApi* | [**SetPreOrdeEnabled**](docs/StoresApi.md#setpreordeenabled) | **POST** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/enabled | UPDATE pre order config for a store, by type
-*StoresApi* | [**UnpublishStore**](docs/StoresApi.md#unpublishstore) | **POST** /api/v1.0/stores/{storeId}/unpublish | Unpublish store
-*StoresApi* | [**UpdatePreOrderConfig**](docs/StoresApi.md#updatepreorderconfig) | **POST** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType} | UPDATE pre order config for a store, by type
-*StoresApi* | [**UpdateStore**](docs/StoresApi.md#updatestore) | **POST** /api/v1.0/stores/{storeId} | Update store by identifier
-*StoresApi* | [**UpdateStoreAddress**](docs/StoresApi.md#updatestoreaddress) | **POST** /api/v1.0/stores/{storeId}/address | Update store address
-*StoresApi* | [**UpdateStoreAddressCoordinates**](docs/StoresApi.md#updatestoreaddresscoordinates) | **POST** /api/v1.0/stores/{storeId}/address/coordinates | Update store address coordinates
-*StoresApi* | [**UpdateStoreAddressForm**](docs/StoresApi.md#updatestoreaddressform) | **POST** /api/v1.0/stores/{storeId}/addressform | Update store address
-*StripeCustomConnectApi* | [**CreateBankAccountAndConnectedAccount**](docs/StripeCustomConnectApi.md#createbankaccountandconnectedaccount) | **POST** /api/v1.0/{appId}/customconnect/bank-account | Create a new Bank Account and Stripe connected account
-*StripeCustomConnectApi* | [**CreateStripeConnectedAccount**](docs/StripeCustomConnectApi.md#createstripeconnectedaccount) | **POST** /api/v1.0/{appId}/customconnect/{bankAccountId}/create-update-account | Create or update a Stripe connected account associated with the bank account of bankAccountId
-*StripeCustomConnectApi* | [**CreateStripeConnectedAccountLink**](docs/StripeCustomConnectApi.md#createstripeconnectedaccountlink) | **POST** /api/v1.0/{appId}/customconnect/{stripeConnectedAccountId}/create-account-link | Gets a single-use Stripe URL for the given account
-*StripeCustomConnectApi* | [**GetVerificationStatus**](docs/StripeCustomConnectApi.md#getverificationstatus) | **GET** /api/v1.0/{appId}/customconnect/verification-status | Gets the current verification status of the given connected account
-*StripeCustomConnectApi* | [**SetBankAccountBusinessType**](docs/StripeCustomConnectApi.md#setbankaccountbusinesstype) | **POST** /api/v1.0/{appId}/customconnect/bank-account/{bankAccountId}/businesstype | Update bank account's BusinessType and create a Stripe Connected Account
+*SearchApi* | [**SearchRestaurants**](docs/SearchApi.md#searchrestaurants) | **GET** /api/v1.0/search/restaurants | 
+*SmsProviderCredentialsApi* | [**GetBrandSmsProviderCredentialByServiceType**](docs/SmsProviderCredentialsApi.md#getbrandsmsprovidercredentialbyservicetype) | **GET** /api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType} | 
+*SmsProviderCredentialsApi* | [**GetBrandSmsProviderCredentials**](docs/SmsProviderCredentialsApi.md#getbrandsmsprovidercredentials) | **GET** /api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials | 
+*SmsProviderCredentialsApi* | [**SmsProviderCredentialDelete**](docs/SmsProviderCredentialsApi.md#smsprovidercredentialdelete) | **DELETE** /api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType} | 
+*SmsProviderCredentialsApi* | [**SmsProviderCredentialUpdate**](docs/SmsProviderCredentialsApi.md#smsprovidercredentialupdate) | **POST** /api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType} | 
+*SmsProviderCredentialsApi* | [**SmsProviderCredentialsBulkUpsert**](docs/SmsProviderCredentialsApi.md#smsprovidercredentialsbulkupsert) | **POST** /api/v1.0/sms-providers/bulk-upsert | 
+*StoreGroupsApi* | [**AssignStoresToStoreGroup**](docs/StoreGroupsApi.md#assignstorestostoregroup) | **POST** /api/v1.0/{appId}/storegroups/{storeGroupId}/assignStores | 
+*StoreGroupsApi* | [**CreateStoreGroup**](docs/StoreGroupsApi.md#createstoregroup) | **POST** /api/v1.0/{appNameId}/storegroups | 
+*StoreGroupsApi* | [**GetStoreGroup**](docs/StoreGroupsApi.md#getstoregroup) | **GET** /api/v1.0/storegroups/{storeGroupId} | 
+*StoreGroupsApi* | [**GetStoreGroups**](docs/StoreGroupsApi.md#getstoregroups) | **GET** /api/v1.0/{appNameId}/storegroups | 
+*StoreGroupsApi* | [**GetStoreGroupsExtended**](docs/StoreGroupsApi.md#getstoregroupsextended) | **GET** /api/v1.0/{appNameId}/storegroups/extended | 
+*StoreGroupsApi* | [**RemoveStoreGroup**](docs/StoreGroupsApi.md#removestoregroup) | **DELETE** /api/v1.0/storegroups/{storeGroupId} | 
+*StoreGroupsApi* | [**SetCustomerMessages**](docs/StoreGroupsApi.md#setcustomermessages) | **POST** /api/v1.0/storegroups/{storeGroupId}/CustomerMessages | 
+*StoreGroupsApi* | [**UpdateStoreGroup**](docs/StoreGroupsApi.md#updatestoregroup) | **POST** /api/v1.0/storegroups/{storeGroupId} | 
+*StoreOrderCapacityApi* | [**GetStoreOrderCapacity**](docs/StoreOrderCapacityApi.md#getstoreordercapacity) | **GET** /api/v1.0/{appId}/storeordercapacity/{storeId}/{deliveryType} | 
+*StoreOrderCapacityApi* | [**UpdateStoreOrderCapacityConfig**](docs/StoreOrderCapacityApi.md#updatestoreordercapacityconfig) | **POST** /api/v1.0/{appId}/storeordercapacity/{storeId} | 
+*StoresApi* | [**ArchiveStore**](docs/StoresApi.md#archivestore) | **POST** /api/v1.0/stores/{storeId}/archive | 
+*StoresApi* | [**AssignMenu**](docs/StoresApi.md#assignmenu) | **POST** /api/v1.0/stores/{storeId}/menu/{menuId} | 
+*StoresApi* | [**CloneStore**](docs/StoresApi.md#clonestore) | **POST** /api/v1.0/stores/{storeId}/clone | 
+*StoresApi* | [**ConfigureStoreServiceCharge**](docs/StoresApi.md#configurestoreservicecharge) | **POST** /api/v1.0/stores/{storeId}/servicecharge | 
+*StoresApi* | [**CreateBusinessHoursOverrideByStoreId**](docs/StoresApi.md#createbusinesshoursoverridebystoreid) | **POST** /api/v1.0/stores/{storeId}/businesshoursoverrides | 
+*StoresApi* | [**CreateStore**](docs/StoresApi.md#createstore) | **POST** /api/v1.0/stores | 
+*StoresApi* | [**CreateStoreInProperty**](docs/StoresApi.md#createstoreinproperty) | **POST** /api/v1.0/properties/{propertyId}/stores | 
+*StoresApi* | [**DeleteBusinessHoursOverride**](docs/StoresApi.md#deletebusinesshoursoverride) | **DELETE** /api/v1.0/stores/{storeId}/businesshoursoverrides/{businessHoursOverrideId} | 
+*StoresApi* | [**GetBankAccountForStore**](docs/StoresApi.md#getbankaccountforstore) | **GET** /api/v1.0/stores/{storeId}/bankaccount | 
+*StoresApi* | [**GetBusinessHours**](docs/StoresApi.md#getbusinesshours) | **GET** /api/v1.0/stores/{storeId}/availability/{deliveryType} | 
+*StoresApi* | [**GetBusinessHoursOverrideByStoreId**](docs/StoresApi.md#getbusinesshoursoverridebystoreid) | **GET** /api/v1.0/stores/{storeId}/businesshoursoverrides | 
+*StoresApi* | [**GetEndOfDayReport**](docs/StoresApi.md#getendofdayreport) | **GET** /api/v1.0/stores/{storeId}/endofdayreport | 
+*StoresApi* | [**GetPreOrderConfig**](docs/StoresApi.md#getpreorderconfig) | **GET** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType} | 
+*StoresApi* | [**GetPreOrderPreview**](docs/StoresApi.md#getpreorderpreview) | **GET** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/preview | 
+*StoresApi* | [**GetProcessingFeeConfigsByStoreId**](docs/StoresApi.md#getprocessingfeeconfigsbystoreid) | **GET** /api/v1.0/stores/{storeId}/processingfeeconfigs | 
+*StoresApi* | [**GetProcessingFeeConfigsByStoreIdAndPaymentAccountType**](docs/StoresApi.md#getprocessingfeeconfigsbystoreidandpaymentaccounttype) | **GET** /api/v1.0/stores/{storeId}/processingfeeconfigs/{paymentAccountType} | 
+*StoresApi* | [**GetStoreById**](docs/StoresApi.md#getstorebyid) | **GET** /api/v1.0/stores/{storeId} | 
+*StoresApi* | [**GetStoreDeliveryFeeConfig**](docs/StoresApi.md#getstoredeliveryfeeconfig) | **GET** /api/v1.0/stores/{storeId}/feeConfig/deliveryZones | 
+*StoresApi* | [**GetStoreFeeConfig**](docs/StoresApi.md#getstorefeeconfig) | **GET** /api/v1.0/stores/{storeId}/feeConfig | 
+*StoresApi* | [**GetStoreHeadersByAppId**](docs/StoresApi.md#getstoreheadersbyappid) | **GET** /api/v1.0/{appId}/stores/header | 
+*StoresApi* | [**GetStoreLeadTimes**](docs/StoresApi.md#getstoreleadtimes) | **GET** /api/v1.0/stores/{storeId}/leadTimes | 
+*StoresApi* | [**GetStoreNetSales**](docs/StoresApi.md#getstorenetsales) | **GET** /api/v1.0/{appId}/stores/stats | 
+*StoresApi* | [**GetStoreServiceCharge**](docs/StoresApi.md#getstoreservicecharge) | **GET** /api/v1.0/stores/{storeId}/servicecharge | 
+*StoresApi* | [**GetStores**](docs/StoresApi.md#getstores) | **GET** /api/v1.0/stores | 
+*StoresApi* | [**GetStoresByAppId**](docs/StoresApi.md#getstoresbyappid) | **GET** /api/v1.0/{appId}/stores | 
+*StoresApi* | [**GetStoresByStoreIdWithValidations**](docs/StoresApi.md#getstoresbystoreidwithvalidations) | **GET** /api/v1.0/{appId}/storevalidation/kiosk | 
+*StoresApi* | [**PublishStore**](docs/StoresApi.md#publishstore) | **POST** /api/v1.0/stores/{storeId}/publish | 
+*StoresApi* | [**PutStoreDeliveryFeeConfig**](docs/StoresApi.md#putstoredeliveryfeeconfig) | **PUT** /api/v1.0/stores/{storeId}/feeConfig/deliveryZones | 
+*StoresApi* | [**SetBusinessHours**](docs/StoresApi.md#setbusinesshours) | **POST** /api/v1.0/stores/{storeId}/availability/{deliveryType} | 
+*StoresApi* | [**SetPreOrdeEnabled**](docs/StoresApi.md#setpreordeenabled) | **POST** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/enabled | 
+*StoresApi* | [**SetStoreCollectionSettings**](docs/StoresApi.md#setstorecollectionsettings) | **POST** /api/v1.0/stores/{storeId}/collectionsettings | 
+*StoresApi* | [**SetStoreLeadTimes**](docs/StoresApi.md#setstoreleadtimes) | **POST** /api/v1.0/stores/{storeId}/leadTimes | 
+*StoresApi* | [**StoresSetPropertyId**](docs/StoresApi.md#storessetpropertyid) | **POST** /api/v1.0/stores/{storeId}/propertyId/{propertyId} | 
+*StoresApi* | [**SupportedSalesChannelsTypes**](docs/StoresApi.md#supportedsaleschannelstypes) | **POST** /api/v1.0/properties/{propertyId}/stores/{storeId}/supportedSalesChannels | 
+*StoresApi* | [**UnpublishStore**](docs/StoresApi.md#unpublishstore) | **POST** /api/v1.0/stores/{storeId}/unpublish | 
+*StoresApi* | [**UpdatePreOrderConfig**](docs/StoresApi.md#updatepreorderconfig) | **POST** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType} | 
+*StoresApi* | [**UpdateStore**](docs/StoresApi.md#updatestore) | **POST** /api/v1.0/stores/{storeId} | 
+*StoresApi* | [**UpdateStoreAddress**](docs/StoresApi.md#updatestoreaddress) | **POST** /api/v1.0/stores/{storeId}/address | 
+*StoresApi* | [**UpdateStoreAddressCoordinates**](docs/StoresApi.md#updatestoreaddresscoordinates) | **POST** /api/v1.0/stores/{storeId}/address/coordinates | 
+*StoresApi* | [**UpdateStoreAddressForm**](docs/StoresApi.md#updatestoreaddressform) | **POST** /api/v1.0/stores/{storeId}/addressform | 
+*StripeCustomConnectApi* | [**CreateBankAccountAndConnectedAccount**](docs/StripeCustomConnectApi.md#createbankaccountandconnectedaccount) | **POST** /api/v1.0/{appId}/customconnect/bank-account | 
+*StripeCustomConnectApi* | [**CreateStripeConnectedAccount**](docs/StripeCustomConnectApi.md#createstripeconnectedaccount) | **POST** /api/v1.0/{appId}/customconnect/{bankAccountId}/create-update-account | 
+*StripeCustomConnectApi* | [**CreateStripeConnectedAccountLink**](docs/StripeCustomConnectApi.md#createstripeconnectedaccountlink) | **POST** /api/v1.0/{appId}/customconnect/{stripeConnectedAccountId}/create-account-link | 
+*StripeCustomConnectApi* | [**GetCustomConnect**](docs/StripeCustomConnectApi.md#getcustomconnect) | **GET** /api/v1.0/{appId}/customconnect/{storeId} | 
+*StripeCustomConnectApi* | [**SetBankAccountBusinessType**](docs/StripeCustomConnectApi.md#setbankaccountbusinesstype) | **POST** /api/v1.0/{appId}/customconnect/bank-account/{bankAccountId}/businesstype | 
 *StripeCustomConnectApi* | [**StripeCustomConnectRefresh**](docs/StripeCustomConnectApi.md#stripecustomconnectrefresh) | **GET** /api/v1.0/{appId}/customconnect/refresh-link | 
-*StripeCustomConnectApi* | [**UpdateBankAccountDetails**](docs/StripeCustomConnectApi.md#updatebankaccountdetails) | **POST** /api/v1.0/{appId}/customconnect/{bankAccountId}/update-bank-account-details | Update bank account details
-*StripeCustomConnectApi* | [**UpdatePayoutSchedule**](docs/StripeCustomConnectApi.md#updatepayoutschedule) | **POST** /api/v1.0/{appId}/customconnect/update-payout-schedule/{stripeConnectedAccountId}/{interval} | Update Stripe Connection Account's payout schedule
-*StripeCustomConnectAdminApi* | [**InitializeBankAccountConnectedAccount**](docs/StripeCustomConnectAdminApi.md#initializebankaccountconnectedaccount) | **POST** /api/v1.0/customconnect/initialize-bank-account | Create a new Bank Account and Stripe connected account
-*StuartApi* | [**StuartCancelJob**](docs/StuartApi.md#stuartcanceljob) | **DELETE** /api/v1.0/stuart/jobs/{jobId} | Cancel a stuart job
-*StuartApi* | [**StuartGetJob**](docs/StuartApi.md#stuartgetjob) | **GET** /api/v1.0/stuart/jobs/{jobId} | Get start job details
-*StuartApi* | [**StuartGetStuartSettings**](docs/StuartApi.md#stuartgetstuartsettings) | **GET** /api/v1.0/stuart/settings/{storeId} | Get stuart settings for a store
-*StuartApi* | [**StuartPostStuartSettings**](docs/StuartApi.md#stuartpoststuartsettings) | **POST** /api/v1.0/stuart/settings/{storeId} | Set stuart settings for a store
-*TeammatesApi* | [**CreateTeammate**](docs/TeammatesApi.md#createteammate) | **POST** /api/v1.0/{appId}/teammates | Create teammate and send an invite.
-*TeammatesApi* | [**DeleteTeammate**](docs/TeammatesApi.md#deleteteammate) | **DELETE** /api/v1.0/{appId}/teammates/{id} | Delete teammate
-*TeammatesApi* | [**GetTeammateByAppIdAndTeammateId**](docs/TeammatesApi.md#getteammatebyappidandteammateid) | **GET** /api/v1.0/{appId}/teammates/{id} | Get a teammates by email address
-*TeammatesApi* | [**GetTeammatesByAppId**](docs/TeammatesApi.md#getteammatesbyappid) | **GET** /api/v1.0/{appId}/teammates | Get all teammates
-*TeammatesApi* | [**RedeemInvitation**](docs/TeammatesApi.md#redeeminvitation) | **GET** /api/v1.0/{appId}/teammates/redeem/{otc} | Redeem one-time code from invitation
-*TeammatesApi* | [**UpdateTeammate**](docs/TeammatesApi.md#updateteammate) | **POST** /api/v1.0/{appId}/teammates/{id} | Update teammates (this method does not support Deltas!)
-*TerminalIotApi* | [**GetTerminalIotConnection**](docs/TerminalIotApi.md#getterminaliotconnection) | **POST** /api/v1.0/terminaliot/connect | Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
-*TipsApi* | [**TipConfigGet**](docs/TipsApi.md#tipconfigget) | **GET** /api/v1.0/stores/{storeId}/tipconfig | Returns current tip configuration for a store
-*TipsApi* | [**TipConfigUpsert**](docs/TipsApi.md#tipconfigupsert) | **POST** /api/v1.0/stores/{storeId}/tipconfig | Update or insert current tip configuration for a store
+*StripeCustomConnectApi* | [**UpdateBankAccountDetails**](docs/StripeCustomConnectApi.md#updatebankaccountdetails) | **POST** /api/v1.0/{appId}/customconnect/{bankAccountId}/update-bank-account-details | 
+*StripeCustomConnectApi* | [**UpdatePayoutSchedule**](docs/StripeCustomConnectApi.md#updatepayoutschedule) | **POST** /api/v1.0/{appId}/customconnect/update-payout-schedule/{stripeConnectedAccountId}/{interval} | 
+*StuartApi* | [**StuartCancelJob**](docs/StuartApi.md#stuartcanceljob) | **DELETE** /api/v1.0/stuart/jobs/{jobId} | 
+*StuartApi* | [**StuartGetJob**](docs/StuartApi.md#stuartgetjob) | **GET** /api/v1.0/stuart/jobs/{jobId} | 
+*StuartApi* | [**StuartGetStuartSettings**](docs/StuartApi.md#stuartgetstuartsettings) | **GET** /api/v1.0/stuart/settings/{storeId} | 
+*StuartApi* | [**StuartPostStuartSettings**](docs/StuartApi.md#stuartpoststuartsettings) | **POST** /api/v1.0/stuart/settings/{storeId} | 
+*SubscriptionsApi* | [**GetSubscriptionById**](docs/SubscriptionsApi.md#getsubscriptionbyid) | **GET** /api/v1.0/{appId}/subscriptions/{subscriptionId} | 
+*SubscriptionsApi* | [**GetSubscriptionsForApp**](docs/SubscriptionsApi.md#getsubscriptionsforapp) | **GET** /api/v1.0/{appId}/subscriptions | 
+*SubscriptionsApi* | [**HasCustomerGotPaymentMethodOnFile**](docs/SubscriptionsApi.md#hascustomergotpaymentmethodonfile) | **GET** /api/v1.0/{appId}/subscriptions/hasPaymentMethod | 
+*TeammatesApi* | [**CreateTeammate**](docs/TeammatesApi.md#createteammate) | **POST** /api/v1.0/{appId}/teammates | 
+*TeammatesApi* | [**DeleteTeammate**](docs/TeammatesApi.md#deleteteammate) | **DELETE** /api/v1.0/{appId}/teammates/{id} | 
+*TeammatesApi* | [**GetTeammateByAppIdAndTeammateId**](docs/TeammatesApi.md#getteammatebyappidandteammateid) | **GET** /api/v1.0/{appId}/teammates/{id} | 
+*TeammatesApi* | [**GetTeammatesByAppId**](docs/TeammatesApi.md#getteammatesbyappid) | **GET** /api/v1.0/{appId}/teammates | 
+*TeammatesApi* | [**Grantaccess**](docs/TeammatesApi.md#grantaccess) | **POST** /api/v1.0/{appId}/teammates/grantaccess | 
+*TeammatesApi* | [**RedeemInvitation**](docs/TeammatesApi.md#redeeminvitation) | **GET** /api/v1.0/{appId}/teammates/redeem/{otc} | 
+*TeammatesApi* | [**TeammateMobileRedirect**](docs/TeammatesApi.md#teammatemobileredirect) | **GET** /api/v1.0/teammates/mobile-redirect | 
+*TeammatesApi* | [**TeammatesAcceptInvitation**](docs/TeammatesApi.md#teammatesacceptinvitation) | **GET** /api/v1.0/{appId}/teammates/accept/{otc} | 
+*TeammatesApi* | [**TeammatesAcceptInvitations**](docs/TeammatesApi.md#teammatesacceptinvitations) | **POST** /api/v1.0/teammates/acceptInvitations | 
+*TeammatesApi* | [**TeammatesPendingInvitations**](docs/TeammatesApi.md#teammatespendinginvitations) | **GET** /api/v1.0/teammates/pending-invitations | 
+*TeammatesApi* | [**UpdateTeammate**](docs/TeammatesApi.md#updateteammate) | **POST** /api/v1.0/{appId}/teammates/{id} | 
+*TerminalIotApi* | [**GetTerminalIotConnection**](docs/TerminalIotApi.md#getterminaliotconnection) | **POST** /api/v1.0/terminaliot/connect | 
+*TipsApi* | [**TipConfigGet**](docs/TipsApi.md#tipconfigget) | **GET** /api/v1.0/stores/{storeId}/tipconfig | 
+*TipsApi* | [**TipConfigUpsert**](docs/TipsApi.md#tipconfigupsert) | **POST** /api/v1.0/stores/{storeId}/tipconfig | 
+*UsersApi* | [**AddUserNote**](docs/UsersApi.md#addusernote) | **POST** /api/v1.0/users/{userId}/AddUserNote | 
+*UsersApi* | [**AddUserToRole**](docs/UsersApi.md#addusertorole) | **POST** /api/v1.0/users/{userId}/AddUserToRole/{roleName} | 
+*UsersApi* | [**AnonymizeUser**](docs/UsersApi.md#anonymizeuser) | **POST** /api/v1.0/users/{userId}/AnonymizeUser | 
+*UsersApi* | [**BlockUserPhoneNumber**](docs/UsersApi.md#blockuserphonenumber) | **POST** /api/v1.0/users/{userId}/BlockUserPhoneNumber | 
+*UsersApi* | [**CreateUserDeliveryLocation**](docs/UsersApi.md#createuserdeliverylocation) | **POST** /api/v1.0/users/{userId}/deliveryLocations | 
 *UsersApi* | [**GetPreviousOrderCountForStore**](docs/UsersApi.md#getpreviousordercountforstore) | **GET** /api/v1.0/users/{userId}/previousordercount/{storeId} | 
-*UsersApi* | [**GetRoles**](docs/UsersApi.md#getroles) | **GET** /api/v1.0/users/roles | Get role names
-*VouchersApi* | [**CreateVoucher**](docs/VouchersApi.md#createvoucher) | **POST** /api/v1.0/vouchers/{appId} | [PRIVATE API] Create voucher
-*VouchersApi* | [**GetVoucherById**](docs/VouchersApi.md#getvoucherbyid) | **GET** /api/v1.0/vouchers/{voucherId} | [PRIVATE API] Get voucher by identifier
-*VouchersApi* | [**GetVoucherStatsById**](docs/VouchersApi.md#getvoucherstatsbyid) | **GET** /api/v1.0/vouchers/stats/{voucherId} | [PRIVATE API] Get voucher stats by identifier
-*VouchersApi* | [**GetVouchers**](docs/VouchersApi.md#getvouchers) | **GET** /api/v1.0/{appId}/vouchers/summaries | [PRIVATE API] Get vouchers summaries for App Id
-*VouchersApi* | [**UpdateVoucher**](docs/VouchersApi.md#updatevoucher) | **POST** /api/v1.0/vouchers/{voucherId} | [PRIVATE API] Updates voucher
-*WebhooksApi* | [**CraeteWebhookSubscription**](docs/WebhooksApi.md#craetewebhooksubscription) | **POST** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions | Create a webhook subscription for you Oauth App
-*WebhooksApi* | [**CreateWebhookSubscriptionEventNames**](docs/WebhooksApi.md#createwebhooksubscriptioneventnames) | **POST** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName} | Add event name to your webhook subscription
-*WebhooksApi* | [**DeleteWebhookSubscription**](docs/WebhooksApi.md#deletewebhooksubscription) | **DELETE** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId} | Delete you webhook subscription
-*WebhooksApi* | [**DeleteWebhookSubscriptionEventName**](docs/WebhooksApi.md#deletewebhooksubscriptioneventname) | **DELETE** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName} | Remove event name to your webhook subscription
-*WebhooksApi* | [**GetWebhookEventNames**](docs/WebhooksApi.md#getwebhookeventnames) | **GET** /api/v1.0/{appId}/webhooks/events | Get all webhook subscription event names
-*WebhooksApi* | [**GetWebhookEventNamesBySubscriptionId**](docs/WebhooksApi.md#getwebhookeventnamesbysubscriptionid) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events | Get your webhook subscriptions selected event names
-*WebhooksApi* | [**GetWebhookEventSample**](docs/WebhooksApi.md#getwebhookeventsample) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}/test | Get a sample event from a webhook subscription
-*WebhooksApi* | [**GetWebhookLogs**](docs/WebhooksApi.md#getwebhooklogs) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/logs | Get logs for your webhook subscription
-*WebhooksApi* | [**GetWebhookSubscriptions**](docs/WebhooksApi.md#getwebhooksubscriptions) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions | Get all webhook subscriptions by your Oauth App id
-*WebhooksApi* | [**UpdateWebhookSubscription**](docs/WebhooksApi.md#updatewebhooksubscription) | **PUT** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId} | Update a webhook subscription object
-*WebsiteApi* | [**AddTestimonial**](docs/WebsiteApi.md#addtestimonial) | **POST** /api/v1.0/{appId}/website/testimonial | Add a testimonial
-*WebsiteApi* | [**DeleteTestimonial**](docs/WebsiteApi.md#deletetestimonial) | **DELETE** /api/v1.0/{appId}/website/testimonial/{testimonialId} | Delete a testimonial
-*WebsiteApi* | [**DeleteWebsiteImage**](docs/WebsiteApi.md#deletewebsiteimage) | **DELETE** /api/v1.0/{appId}/website/image/{imageId} | Delete Website Image
-*WebsiteApi* | [**EditTestimonial**](docs/WebsiteApi.md#edittestimonial) | **POST** /api/v1.0/{appId}/website/testimonial/{testimonialId} | Edit a testimonial
-*WebsiteApi* | [**GetIndexConfiguration**](docs/WebsiteApi.md#getindexconfiguration) | **GET** /api/v1.0/{appId}/website/index | Get Index Configuration
-*WebsiteApi* | [**SetIndexConfiguration**](docs/WebsiteApi.md#setindexconfiguration) | **POST** /api/v1.0/{appId}/website/index | Set Index Configuration
-*WebsiteApi* | [**UploadWebsiteImage**](docs/WebsiteApi.md#uploadwebsiteimage) | **POST** /api/v1.0/{appId}/website/image/{imageLocation} | Upload Website Image
-*WebsiteApi* | [**WebsiteCheckNow**](docs/WebsiteApi.md#websitechecknow) | **GET** /api/v1.0/{appId}/website/dnscheck | Triggers a Check DNS Process
+*UsersApi* | [**GetRestaurantUserAccounts**](docs/UsersApi.md#getrestaurantuseraccounts) | **GET** /api/v1.0/users/{userId}/RestaurantUserAccounts | 
+*UsersApi* | [**GetRestaurantUserStores**](docs/UsersApi.md#getrestaurantuserstores) | **GET** /api/v1.0/users/{userId}/RestaurantUserStores | 
+*UsersApi* | [**GetRoles**](docs/UsersApi.md#getroles) | **GET** /api/v1.0/users/roles | 
+*UsersApi* | [**GetRolesAndUnassignedRoles**](docs/UsersApi.md#getrolesandunassignedroles) | **GET** /api/v1.0/users/{userId}/roles | 
+*UsersApi* | [**GetUserById**](docs/UsersApi.md#getuserbyid) | **GET** /api/v1.0/users/{userId} | 
+*UsersApi* | [**GetUserDeliveryLocationsForAdmin**](docs/UsersApi.md#getuserdeliverylocationsforadmin) | **GET** /api/v1.0/users/{userId}/deliveryLocations | 
+*UsersApi* | [**GetUserNotes**](docs/UsersApi.md#getusernotes) | **GET** /api/v1.0/users/{userId}/UserNotes | 
+*UsersApi* | [**GetUserOrderByIdForAdmin**](docs/UsersApi.md#getuserorderbyidforadmin) | **GET** /api/v1.0/users/{userId}/orders/{orderId} | 
+*UsersApi* | [**GetUserOrdersForAdmin**](docs/UsersApi.md#getuserordersforadmin) | **GET** /api/v1.0/users/{userId}/orders | 
+*UsersApi* | [**GetUserSmsConversationItems**](docs/UsersApi.md#getusersmsconversationitems) | **GET** /api/v1.0/users/{userId}/smsConversationItems | 
+*UsersApi* | [**HideUserDeliveryLocation**](docs/UsersApi.md#hideuserdeliverylocation) | **POST** /api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/hide | 
+*UsersApi* | [**MarkUserAsFraudulent**](docs/UsersApi.md#markuserasfraudulent) | **POST** /api/v1.0/users/{userId}/MarkUserAsFraudulent | 
+*UsersApi* | [**MarkUserAsSuspicious**](docs/UsersApi.md#markuserassuspicious) | **POST** /api/v1.0/users/{userId}/MarkUserAsSuspicious | 
+*UsersApi* | [**RemoveFlipdishAccountIdForUser**](docs/UsersApi.md#removeflipdishaccountidforuser) | **POST** /api/v1.0/users/{userId}/RemoveFlipdishAccountId/{accountId} | 
+*UsersApi* | [**RemoveUserFromRole**](docs/UsersApi.md#removeuserfromrole) | **POST** /api/v1.0/users/{userId}/RemoveUserFromRole/{roleName} | 
+*UsersApi* | [**ResetMfa**](docs/UsersApi.md#resetmfa) | **POST** /api/v1.0/users/{userId}/ResetMfa | 
+*UsersApi* | [**SearchFlipdishAccounts**](docs/UsersApi.md#searchflipdishaccounts) | **GET** /api/v1.0/users/searchFlipdishAccounts | 
+*UsersApi* | [**SearchUsers**](docs/UsersApi.md#searchusers) | **GET** /api/v1.0/users/search | 
+*UsersApi* | [**SendUserPushNotification**](docs/UsersApi.md#senduserpushnotification) | **POST** /api/v1.0/users/{userId}/pushNotifications | 
+*UsersApi* | [**SendUserSms**](docs/UsersApi.md#sendusersms) | **POST** /api/v1.0/users/{userId}/sms | 
+*UsersApi* | [**SetCustomerName**](docs/UsersApi.md#setcustomername) | **POST** /api/v1.0/users/{userId}/SetCustomerName | 
+*UsersApi* | [**SetFlipdishAccountIdForUser**](docs/UsersApi.md#setflipdishaccountidforuser) | **POST** /api/v1.0/users/{userId}/SetFlipdishAccountId/{accountId} | 
+*UsersApi* | [**SetUserDeliveryLocationCoordinates**](docs/UsersApi.md#setuserdeliverylocationcoordinates) | **POST** /api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/coordinates | 
+*UsersApi* | [**SetUserDeliveryLocationField**](docs/UsersApi.md#setuserdeliverylocationfield) | **POST** /api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/fields | 
+*UsersApi* | [**SetUserLanguage**](docs/UsersApi.md#setuserlanguage) | **POST** /api/v1.0/users/{userId}/SetLanguage/{languageId} | 
+*UsersApi* | [**UnblockUserPhoneNumber**](docs/UsersApi.md#unblockuserphonenumber) | **POST** /api/v1.0/users/{userId}/UnblockUserPhoneNumber | 
+*VouchersApi* | [**CreateVoucher**](docs/VouchersApi.md#createvoucher) | **POST** /api/v1.0/vouchers/{appId} | 
+*VouchersApi* | [**GetVoucherByCode**](docs/VouchersApi.md#getvoucherbycode) | **GET** /api/v1.0/{appId}/vouchers/code/{code} | 
+*VouchersApi* | [**GetVoucherById**](docs/VouchersApi.md#getvoucherbyid) | **GET** /api/v1.0/vouchers/{voucherId} | 
+*VouchersApi* | [**GetVoucherStatsById**](docs/VouchersApi.md#getvoucherstatsbyid) | **GET** /api/v1.0/vouchers/stats/{voucherId} | 
+*VouchersApi* | [**GetVoucherValidityPeriods**](docs/VouchersApi.md#getvouchervalidityperiods) | **GET** /api/v1.0/{appId}/vouchers/{voucherId}/validity-periods | 
+*VouchersApi* | [**GetVouchers**](docs/VouchersApi.md#getvouchers) | **GET** /api/v1.0/{appId}/vouchers/summaries | 
+*VouchersApi* | [**GetVouchersByCustomerForApp**](docs/VouchersApi.md#getvouchersbycustomerforapp) | **GET** /api/v1.0/vouchers/{appId}/customer/{customerId} | 
+*VouchersApi* | [**SetVoucherValidityPeriodsSimplified**](docs/VouchersApi.md#setvouchervalidityperiodssimplified) | **POST** /api/v1.0/{appId}/vouchers/{voucherId}/validity-periods-simplified | 
+*VouchersApi* | [**UpdateVoucher**](docs/VouchersApi.md#updatevoucher) | **POST** /api/v1.0/vouchers/{voucherId} | 
+*VouchersApi* | [**UpdateVoucherUsage**](docs/VouchersApi.md#updatevoucherusage) | **POST** /api/v1.0/{appId}/vouchers/{voucherId}/usage | 
+*WebhooksApi* | [**CreateWebhookSubscription**](docs/WebhooksApi.md#createwebhooksubscription) | **POST** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions | 
+*WebhooksApi* | [**CreateWebhookSubscriptionEventNames**](docs/WebhooksApi.md#createwebhooksubscriptioneventnames) | **POST** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName} | 
+*WebhooksApi* | [**DeleteWebhookSubscription**](docs/WebhooksApi.md#deletewebhooksubscription) | **DELETE** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId} | 
+*WebhooksApi* | [**DeleteWebhookSubscriptionEventName**](docs/WebhooksApi.md#deletewebhooksubscriptioneventname) | **DELETE** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName} | 
+*WebhooksApi* | [**GetWebhookEventNames**](docs/WebhooksApi.md#getwebhookeventnames) | **GET** /api/v1.0/{appId}/webhooks/events | 
+*WebhooksApi* | [**GetWebhookEventNamesBySubscriptionId**](docs/WebhooksApi.md#getwebhookeventnamesbysubscriptionid) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events | 
+*WebhooksApi* | [**GetWebhookEventSample**](docs/WebhooksApi.md#getwebhookeventsample) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}/test | 
+*WebhooksApi* | [**GetWebhookLogs**](docs/WebhooksApi.md#getwebhooklogs) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/logs | 
+*WebhooksApi* | [**GetWebhookSubscriptions**](docs/WebhooksApi.md#getwebhooksubscriptions) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions | 
+*WebhooksApi* | [**UpdateWebhookSubscription**](docs/WebhooksApi.md#updatewebhooksubscription) | **PUT** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId} | 
+*WebsiteApi* | [**AddTestimonial**](docs/WebsiteApi.md#addtestimonial) | **POST** /api/v1.0/{appId}/website/testimonial | 
+*WebsiteApi* | [**DeleteTestimonial**](docs/WebsiteApi.md#deletetestimonial) | **DELETE** /api/v1.0/{appId}/website/testimonial/{testimonialId} | 
+*WebsiteApi* | [**DeleteWebsiteImage**](docs/WebsiteApi.md#deletewebsiteimage) | **DELETE** /api/v1.0/{appId}/website/image/{imageId} | 
+*WebsiteApi* | [**EditTestimonial**](docs/WebsiteApi.md#edittestimonial) | **POST** /api/v1.0/{appId}/website/testimonial/{testimonialId} | 
+*WebsiteApi* | [**GetIndexConfiguration**](docs/WebsiteApi.md#getindexconfiguration) | **GET** /api/v1.0/{appId}/website/index | 
+*WebsiteApi* | [**SetIndexConfiguration**](docs/WebsiteApi.md#setindexconfiguration) | **POST** /api/v1.0/{appId}/website/index | 
+*WebsiteApi* | [**UploadWebsiteImage**](docs/WebsiteApi.md#uploadwebsiteimage) | **POST** /api/v1.0/{appId}/website/image/{imageLocation} | 
+*WebsiteApi* | [**WebsiteCheckNow**](docs/WebsiteApi.md#websitechecknow) | **GET** /api/v1.0/{appId}/website/dnscheck | 
+*WhiteLabelBuildsApi* | [**HealthCheck**](docs/WhiteLabelBuildsApi.md#healthcheck) | **GET** /api/v1.0/whitelabelbuilds/health | 
+*WhiteLabelBuildsApi* | [**SubmitAndroidApps**](docs/WhiteLabelBuildsApi.md#submitandroidapps) | **POST** /api/v1.0/whitelabelbuilds/android/multiple | 
+*WhiteLabelBuildsApi* | [**SubmitAndroidBuild**](docs/WhiteLabelBuildsApi.md#submitandroidbuild) | **POST** /api/v1.0/whitelabelbuilds/{appId}/android | 
+*WhiteLabelBuildsApi* | [**SubmitIosApps**](docs/WhiteLabelBuildsApi.md#submitiosapps) | **POST** /api/v1.0/whitelabelbuilds/ios/multiple | 
+*WhiteLabelBuildsApi* | [**SubmitIosBuild**](docs/WhiteLabelBuildsApi.md#submitiosbuild) | **POST** /api/v1.0/whitelabelbuilds/{appId}/ios | 
+*WhiteLabelConfigApi* | [**GetAppGeneralConfig**](docs/WhiteLabelConfigApi.md#getappgeneralconfig) | **GET** /api/v1.0/whitelabelconfig/{appId}/general | 
+*WhiteLabelConfigApi* | [**GetAppStoreConfig**](docs/WhiteLabelConfigApi.md#getappstoreconfig) | **GET** /api/v1.0/whitelabelconfig/{appId}/appstore | 
+*WhiteLabelConfigApi* | [**GetPlayStoreConfig**](docs/WhiteLabelConfigApi.md#getplaystoreconfig) | **GET** /api/v1.0/whitelabelconfig/{appId}/playstore | 
+*WhiteLabelConfigApi* | [**GetWhiteLabelConfig**](docs/WhiteLabelConfigApi.md#getwhitelabelconfig) | **GET** /api/v1.0/whitelabelconfig/id/{wlid} | 
+*WhiteLabelConfigApi* | [**GetWhiteLabelConfigByAppNameId**](docs/WhiteLabelConfigApi.md#getwhitelabelconfigbyappnameid) | **GET** /api/v1.0/whitelabelconfig/name/{appId} | 
+*WhiteLabelConfigApi* | [**HealthCheck**](docs/WhiteLabelConfigApi.md#healthcheck) | **GET** /api/v1.0/whitelabelconfig/health | 
+*WhiteLabelConfigApi* | [**UpdateAppGeneralConfig**](docs/WhiteLabelConfigApi.md#updateappgeneralconfig) | **POST** /api/v1.0/whitelabelconfig/{appId}/general | 
+*WhiteLabelConfigApi* | [**UpdateAppStoreConfig**](docs/WhiteLabelConfigApi.md#updateappstoreconfig) | **POST** /api/v1.0/whitelabelconfig/{appId}/appstore | 
+*WhiteLabelConfigApi* | [**UpdatePlayStoreConfig**](docs/WhiteLabelConfigApi.md#updateplaystoreconfig) | **POST** /api/v1.0/whitelabelconfig/{appId}/playstore | 
+*WhiteLabelConfigApi* | [**UploadAppStoreIcon**](docs/WhiteLabelConfigApi.md#uploadappstoreicon) | **POST** /api/v1.0/whitelabelconfig/{appId}/app-store-icon | 
 
 
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
  - [Model.Accept](docs/Accept.md)
+ - [Model.AcceptInvitationResult](docs/AcceptInvitationResult.md)
  - [Model.AccountDetail](docs/AccountDetail.md)
  - [Model.AccountDetailBase](docs/AccountDetailBase.md)
  - [Model.AccountFieldDefinition](docs/AccountFieldDefinition.md)
  - [Model.AccountFieldKeyValuePair](docs/AccountFieldKeyValuePair.md)
  - [Model.AccountFieldsDefinitions](docs/AccountFieldsDefinitions.md)
- - [Model.AddItemDetails](docs/AddItemDetails.md)
  - [Model.AddressFormDisplayFormat](docs/AddressFormDisplayFormat.md)
  - [Model.AddressFormResponse](docs/AddressFormResponse.md)
  - [Model.AllMetadataResult](docs/AllMetadataResult.md)
+ - [Model.Allergen](docs/Allergen.md)
  - [Model.AnalyticsClientEvent](docs/AnalyticsClientEvent.md)
  - [Model.ApmCurrencyDataPoint](docs/ApmCurrencyDataPoint.md)
  - [Model.ApmDataPoint](docs/ApmDataPoint.md)
@@ -568,20 +684,27 @@ Class | Method | HTTP request | Description
  - [Model.AppConfigSalesChannel](docs/AppConfigSalesChannel.md)
  - [Model.AppConfigUpdateModel](docs/AppConfigUpdateModel.md)
  - [Model.AppCreatedEvent](docs/AppCreatedEvent.md)
+ - [Model.AppGeneralConfigModel](docs/AppGeneralConfigModel.md)
+ - [Model.AppInstall](docs/AppInstall.md)
+ - [Model.AppLookup](docs/AppLookup.md)
  - [Model.AppStoreApp](docs/AppStoreApp.md)
  - [Model.AppStoreAppConfiguration](docs/AppStoreAppConfiguration.md)
- - [Model.AppStoreAppConfigurationHeader](docs/AppStoreAppConfigurationHeader.md)
  - [Model.AppStoreAppConfigurationSummary](docs/AppStoreAppConfigurationSummary.md)
+ - [Model.AppStoreAppEntitlements](docs/AppStoreAppEntitlements.md)
  - [Model.AppStoreAppSummary](docs/AppStoreAppSummary.md)
  - [Model.AppStoreAppSupportInfo](docs/AppStoreAppSupportInfo.md)
  - [Model.AppStoreConfigCreatedEvent](docs/AppStoreConfigCreatedEvent.md)
  - [Model.AppStoreConfigDeletedEvent](docs/AppStoreConfigDeletedEvent.md)
+ - [Model.AppStoreConfigModel](docs/AppStoreConfigModel.md)
  - [Model.AppStoreConfigUpdatedEvent](docs/AppStoreConfigUpdatedEvent.md)
+ - [Model.AppStoreSubscriptionChangeJobUpdatedEvent](docs/AppStoreSubscriptionChangeJobUpdatedEvent.md)
  - [Model.AppUpdatedEvent](docs/AppUpdatedEvent.md)
+ - [Model.AssetResultModel](docs/AssetResultModel.md)
  - [Model.AssignedBankAccount](docs/AssignedBankAccount.md)
  - [Model.AuditLogFieldChangeInformation](docs/AuditLogFieldChangeInformation.md)
  - [Model.BalanceDetails](docs/BalanceDetails.md)
  - [Model.BankAccount](docs/BankAccount.md)
+ - [Model.BankAccountAssignedEvent](docs/BankAccountAssignedEvent.md)
  - [Model.BankAccountCreate](docs/BankAccountCreate.md)
  - [Model.BankAccountCreatedEvent](docs/BankAccountCreatedEvent.md)
  - [Model.BankAccountDeletedEvent](docs/BankAccountDeletedEvent.md)
@@ -590,14 +713,15 @@ Class | Method | HTTP request | Description
  - [Model.BankAccountSummary](docs/BankAccountSummary.md)
  - [Model.BankAccountUpdatedEvent](docs/BankAccountUpdatedEvent.md)
  - [Model.BluetoothTerminalStatus](docs/BluetoothTerminalStatus.md)
+ - [Model.BuildResultModel](docs/BuildResultModel.md)
  - [Model.BusinessHoursOverride](docs/BusinessHoursOverride.md)
  - [Model.BusinessHoursOverrideBase](docs/BusinessHoursOverrideBase.md)
  - [Model.BusinessHoursPeriod](docs/BusinessHoursPeriod.md)
  - [Model.BusinessHoursPeriodBase](docs/BusinessHoursPeriodBase.md)
  - [Model.CampaignStatistics](docs/CampaignStatistics.md)
+ - [Model.CancellationToken](docs/CancellationToken.md)
  - [Model.CardReader](docs/CardReader.md)
  - [Model.CardReaderRegistrationRequest](docs/CardReaderRegistrationRequest.md)
- - [Model.Cart](docs/Cart.md)
  - [Model.CatalogGroupArchivedEvent](docs/CatalogGroupArchivedEvent.md)
  - [Model.CatalogGroupCreatedEvent](docs/CatalogGroupCreatedEvent.md)
  - [Model.CatalogGroupReference](docs/CatalogGroupReference.md)
@@ -611,17 +735,25 @@ Class | Method | HTTP request | Description
  - [Model.CertificateRenewedEvent](docs/CertificateRenewedEvent.md)
  - [Model.ChangePasswordModel](docs/ChangePasswordModel.md)
  - [Model.Channel](docs/Channel.md)
- - [Model.ChannelStoreMapping](docs/ChannelStoreMapping.md)
+ - [Model.ChannelStoresUpdatedEvent](docs/ChannelStoresUpdatedEvent.md)
  - [Model.ChargebackDetails](docs/ChargebackDetails.md)
+ - [Model.ClientDevice](docs/ClientDevice.md)
+ - [Model.ClientDeviceAssignEnrolledDevice](docs/ClientDeviceAssignEnrolledDevice.md)
+ - [Model.ClientDeviceEnroll](docs/ClientDeviceEnroll.md)
+ - [Model.ClientDeviceEnrollmentResult](docs/ClientDeviceEnrollmentResult.md)
+ - [Model.ClientDeviceSummary](docs/ClientDeviceSummary.md)
  - [Model.ConfiguredStore](docs/ConfiguredStore.md)
- - [Model.Contact](docs/Contact.md)
  - [Model.Coordinates](docs/Coordinates.md)
  - [Model.CountryFormResponse](docs/CountryFormResponse.md)
  - [Model.CountryWithAccountFieldsDefinitions](docs/CountryWithAccountFieldsDefinitions.md)
  - [Model.CreateAccountModel](docs/CreateAccountModel.md)
+ - [Model.CreateAppParameters](docs/CreateAppParameters.md)
  - [Model.CreateAppStoreApp](docs/CreateAppStoreApp.md)
+ - [Model.CreateBasicAccountModel](docs/CreateBasicAccountModel.md)
  - [Model.CreateCatalogGroupReference](docs/CreateCatalogGroupReference.md)
  - [Model.CreateCatalogItem](docs/CreateCatalogItem.md)
+ - [Model.CreateEndUserFeeConfig](docs/CreateEndUserFeeConfig.md)
+ - [Model.CreateFulfillmentStatesConfiguration](docs/CreateFulfillmentStatesConfiguration.md)
  - [Model.CreateFullMenu](docs/CreateFullMenu.md)
  - [Model.CreateFullMenuItemOptionSet](docs/CreateFullMenuItemOptionSet.md)
  - [Model.CreateFullMenuItemOptionSetItem](docs/CreateFullMenuItemOptionSetItem.md)
@@ -638,21 +770,27 @@ Class | Method | HTTP request | Description
  - [Model.CreatePayGreenConfigurationRequest](docs/CreatePayGreenConfigurationRequest.md)
  - [Model.CreateProduct](docs/CreateProduct.md)
  - [Model.CreateProductReference](docs/CreateProductReference.md)
+ - [Model.CreatePromotion](docs/CreatePromotion.md)
  - [Model.CreateTeammate](docs/CreateTeammate.md)
+ - [Model.CreateUserDeliveryLocationRequest](docs/CreateUserDeliveryLocationRequest.md)
  - [Model.CreateVoucher](docs/CreateVoucher.md)
  - [Model.CreatedMenuSectionItems](docs/CreatedMenuSectionItems.md)
  - [Model.CreditNoteDetails](docs/CreditNoteDetails.md)
+ - [Model.CrossSellMenuItems](docs/CrossSellMenuItems.md)
  - [Model.CspReport](docs/CspReport.md)
  - [Model.CspReportRequest](docs/CspReportRequest.md)
  - [Model.CurrencyData](docs/CurrencyData.md)
  - [Model.Customer](docs/Customer.md)
  - [Model.CustomerConsentUpdatedEvent](docs/CustomerConsentUpdatedEvent.md)
+ - [Model.CustomerCreateModel](docs/CustomerCreateModel.md)
  - [Model.CustomerCreatedEvent](docs/CustomerCreatedEvent.md)
  - [Model.CustomerDeliveryTrackingOrder](docs/CustomerDeliveryTrackingOrder.md)
  - [Model.CustomerDeliveryTrackingOrderLine](docs/CustomerDeliveryTrackingOrderLine.md)
+ - [Model.CustomerMessages](docs/CustomerMessages.md)
  - [Model.CustomerSummary](docs/CustomerSummary.md)
  - [Model.CustomerUpdateModel](docs/CustomerUpdateModel.md)
  - [Model.CustomerUpdatedEvent](docs/CustomerUpdatedEvent.md)
+ - [Model.Customers](docs/Customers.md)
  - [Model.DashboardEmbed](docs/DashboardEmbed.md)
  - [Model.DeliveryLocation](docs/DeliveryLocation.md)
  - [Model.DeliveryZone](docs/DeliveryZone.md)
@@ -660,14 +798,12 @@ Class | Method | HTTP request | Description
  - [Model.DeliveryZoneCreatedEvent](docs/DeliveryZoneCreatedEvent.md)
  - [Model.DeliveryZoneDeletedEvent](docs/DeliveryZoneDeletedEvent.md)
  - [Model.DeliveryZoneUpdatedEvent](docs/DeliveryZoneUpdatedEvent.md)
+ - [Model.DepositReturnFeesSummary](docs/DepositReturnFeesSummary.md)
  - [Model.DeviceSettings](docs/DeviceSettings.md)
  - [Model.DnsRecordInformation](docs/DnsRecordInformation.md)
  - [Model.DnsVerifiedEvent](docs/DnsVerifiedEvent.md)
- - [Model.Driver](docs/Driver.md)
- - [Model.DriverInvitation](docs/DriverInvitation.md)
  - [Model.DriverLoginModel](docs/DriverLoginModel.md)
  - [Model.DriverRequestLoginPinModel](docs/DriverRequestLoginPinModel.md)
- - [Model.DriverStore](docs/DriverStore.md)
  - [Model.DynamicFormField](docs/DynamicFormField.md)
  - [Model.DynamicFormFieldOption](docs/DynamicFormFieldOption.md)
  - [Model.DynamicFormRule](docs/DynamicFormRule.md)
@@ -675,23 +811,28 @@ Class | Method | HTTP request | Description
  - [Model.EmvNotificationEvent](docs/EmvNotificationEvent.md)
  - [Model.EmvTerminal](docs/EmvTerminal.md)
  - [Model.EmvTerminalWithAssignments](docs/EmvTerminalWithAssignments.md)
+ - [Model.EndUserFeeConfig](docs/EndUserFeeConfig.md)
  - [Model.EventSearchResult](docs/EventSearchResult.md)
+ - [Model.ExecuteConfigurationActionRequest](docs/ExecuteConfigurationActionRequest.md)
+ - [Model.ExecuteConfigurationActionResult](docs/ExecuteConfigurationActionResult.md)
  - [Model.ExternalStoreAuditLog](docs/ExternalStoreAuditLog.md)
  - [Model.ExternalStoreEvent](docs/ExternalStoreEvent.md)
  - [Model.FeeSummary](docs/FeeSummary.md)
  - [Model.Field](docs/Field.md)
  - [Model.FieldChangeInformation](docs/FieldChangeInformation.md)
  - [Model.FieldGroup](docs/FieldGroup.md)
+ - [Model.FirebaseApp](docs/FirebaseApp.md)
+ - [Model.FlipdishAccountName](docs/FlipdishAccountName.md)
  - [Model.FlipdishEventBase](docs/FlipdishEventBase.md)
  - [Model.FlipdishFeesDetails](docs/FlipdishFeesDetails.md)
  - [Model.FulfillentStatusActionItem](docs/FulfillentStatusActionItem.md)
- - [Model.FulfillmentInfo](docs/FulfillmentInfo.md)
  - [Model.FulfillmentStatesConfiguration](docs/FulfillmentStatesConfiguration.md)
- - [Model.FulfillmentStatesConfigurationCreateBase](docs/FulfillmentStatesConfigurationCreateBase.md)
  - [Model.FulfillmentStatesConfigurationSummary](docs/FulfillmentStatesConfigurationSummary.md)
  - [Model.FulfillmentStatesConfiguredStore](docs/FulfillmentStatesConfiguredStore.md)
  - [Model.FulfillmentStatusConfigurationItem](docs/FulfillmentStatusConfigurationItem.md)
  - [Model.GeoPointRequest](docs/GeoPointRequest.md)
+ - [Model.GetEndUserFeeConfigsResponse](docs/GetEndUserFeeConfigsResponse.md)
+ - [Model.GetReceiptByOrderIdQueryResponse](docs/GetReceiptByOrderIdQueryResponse.md)
  - [Model.GoogleAddress](docs/GoogleAddress.md)
  - [Model.GoogleAddressComponent](docs/GoogleAddressComponent.md)
  - [Model.GoogleAddressResult](docs/GoogleAddressResult.md)
@@ -702,12 +843,14 @@ Class | Method | HTTP request | Description
  - [Model.Group](docs/Group.md)
  - [Model.GroupReference](docs/GroupReference.md)
  - [Model.GroupedCoordinates](docs/GroupedCoordinates.md)
+ - [Model.HasPaymentMethodResponse](docs/HasPaymentMethodResponse.md)
  - [Model.HomeAction](docs/HomeAction.md)
  - [Model.HomeStatistics](docs/HomeStatistics.md)
- - [Model.HttpRequestAndResponseLog](docs/HttpRequestAndResponseLog.md)
+ - [Model.HttpPostedFileBase](docs/HttpPostedFileBase.md)
  - [Model.HydraAssignedEvent](docs/HydraAssignedEvent.md)
  - [Model.HydraConfig](docs/HydraConfig.md)
  - [Model.HydraConnectionStatusChangedEvent](docs/HydraConnectionStatusChangedEvent.md)
+ - [Model.HydraCreatedEvent](docs/HydraCreatedEvent.md)
  - [Model.HydraDeviceDetails](docs/HydraDeviceDetails.md)
  - [Model.HydraRegistrationRequest](docs/HydraRegistrationRequest.md)
  - [Model.HydraRequestResetEvent](docs/HydraRequestResetEvent.md)
@@ -719,6 +862,13 @@ Class | Method | HTTP request | Description
  - [Model.HydraUnAssignedEvent](docs/HydraUnAssignedEvent.md)
  - [Model.IndexPage](docs/IndexPage.md)
  - [Model.IndexPageBase](docs/IndexPageBase.md)
+ - [Model.IntercomUserHash](docs/IntercomUserHash.md)
+ - [Model.Invoice](docs/Invoice.md)
+ - [Model.InvoiceDiscount](docs/InvoiceDiscount.md)
+ - [Model.InvoiceItem](docs/InvoiceItem.md)
+ - [Model.InvoicePeriod](docs/InvoicePeriod.md)
+ - [Model.ItemNutritionInfoAddUpdateModel](docs/ItemNutritionInfoAddUpdateModel.md)
+ - [Model.ItemNutritionInfoV2AddUpdateModel](docs/ItemNutritionInfoV2AddUpdateModel.md)
  - [Model.JobAddress](docs/JobAddress.md)
  - [Model.JobCancellation](docs/JobCancellation.md)
  - [Model.JobContact](docs/JobContact.md)
@@ -739,17 +889,16 @@ Class | Method | HTTP request | Description
  - [Model.KioskBluetoothTerminalUpdatedEvent](docs/KioskBluetoothTerminalUpdatedEvent.md)
  - [Model.KioskBluetoothUnpairingModeEvent](docs/KioskBluetoothUnpairingModeEvent.md)
  - [Model.KioskCashPaymentSettings](docs/KioskCashPaymentSettings.md)
- - [Model.KioskCashSetting](docs/KioskCashSetting.md)
+ - [Model.KioskEntitlementsResult](docs/KioskEntitlementsResult.md)
  - [Model.KioskIotConnectionParameters](docs/KioskIotConnectionParameters.md)
- - [Model.KioskStoreSettings](docs/KioskStoreSettings.md)
+ - [Model.KioskSettings](docs/KioskSettings.md)
+ - [Model.KioskStripeLocation](docs/KioskStripeLocation.md)
  - [Model.KioskTerminalActionStateChangedEvent](docs/KioskTerminalActionStateChangedEvent.md)
  - [Model.Language](docs/Language.md)
  - [Model.LastPaymentError](docs/LastPaymentError.md)
+ - [Model.LeadTime](docs/LeadTime.md)
  - [Model.LightspeedSettings](docs/LightspeedSettings.md)
- - [Model.LineItem](docs/LineItem.md)
- - [Model.LineItemOption](docs/LineItemOption.md)
  - [Model.LocalisedTimeZone](docs/LocalisedTimeZone.md)
- - [Model.Location](docs/Location.md)
  - [Model.LocationArea](docs/LocationArea.md)
  - [Model.LocationAreaCreatedEvent](docs/LocationAreaCreatedEvent.md)
  - [Model.LocationAreaLocation](docs/LocationAreaLocation.md)
@@ -758,7 +907,6 @@ Class | Method | HTTP request | Description
  - [Model.LocationCreatedEvent](docs/LocationCreatedEvent.md)
  - [Model.LocationDeletedEvent](docs/LocationDeletedEvent.md)
  - [Model.LoginModel](docs/LoginModel.md)
- - [Model.LoginWithPinModel](docs/LoginWithPinModel.md)
  - [Model.LoyaltyCampaign](docs/LoyaltyCampaign.md)
  - [Model.LoyaltyCampaignBase](docs/LoyaltyCampaignBase.md)
  - [Model.LoyaltyCampaignCreatedEvent](docs/LoyaltyCampaignCreatedEvent.md)
@@ -768,6 +916,7 @@ Class | Method | HTTP request | Description
  - [Model.MappedLocation](docs/MappedLocation.md)
  - [Model.MaskedPhoneNumber](docs/MaskedPhoneNumber.md)
  - [Model.Menu](docs/Menu.md)
+ - [Model.MenuAsyncCreationCompletedEvent](docs/MenuAsyncCreationCompletedEvent.md)
  - [Model.MenuBase](docs/MenuBase.md)
  - [Model.MenuBulkEditEvent](docs/MenuBulkEditEvent.md)
  - [Model.MenuCatalogItem](docs/MenuCatalogItem.md)
@@ -788,6 +937,7 @@ Class | Method | HTTP request | Description
  - [Model.MenuItemOptionSetItemDeletedEvent](docs/MenuItemOptionSetItemDeletedEvent.md)
  - [Model.MenuItemOptionSetItemUpdatedEvent](docs/MenuItemOptionSetItemUpdatedEvent.md)
  - [Model.MenuItemOptionSetUpdatedEvent](docs/MenuItemOptionSetUpdatedEvent.md)
+ - [Model.MenuNutritionInfoHeader](docs/MenuNutritionInfoHeader.md)
  - [Model.MenuObjectDisplayOrders](docs/MenuObjectDisplayOrders.md)
  - [Model.MenuSection](docs/MenuSection.md)
  - [Model.MenuSectionAvailability](docs/MenuSectionAvailability.md)
@@ -807,6 +957,7 @@ Class | Method | HTTP request | Description
  - [Model.MenuTaxRate](docs/MenuTaxRate.md)
  - [Model.MenuUpdatedEvent](docs/MenuUpdatedEvent.md)
  - [Model.MenuUploadedEvent](docs/MenuUploadedEvent.md)
+ - [Model.MenuZone](docs/MenuZone.md)
  - [Model.Metadata](docs/Metadata.md)
  - [Model.Metafield](docs/Metafield.md)
  - [Model.MetafieldDefinition](docs/MetafieldDefinition.md)
@@ -816,18 +967,30 @@ Class | Method | HTTP request | Description
  - [Model.MobileAppsSubmission](docs/MobileAppsSubmission.md)
  - [Model.MobileAppsSubmissionDetails](docs/MobileAppsSubmissionDetails.md)
  - [Model.MobileAppsSubmissionStatus](docs/MobileAppsSubmissionStatus.md)
+ - [Model.MobileAppsSubmissionStatusUpdatedEvent](docs/MobileAppsSubmissionStatusUpdatedEvent.md)
+ - [Model.MobileAppsSubmissionUpdatedEvent](docs/MobileAppsSubmissionUpdatedEvent.md)
  - [Model.ModelBase](docs/ModelBase.md)
  - [Model.NextStatusWithOrderType](docs/NextStatusWithOrderType.md)
+ - [Model.NutritionInfo](docs/NutritionInfo.md)
+ - [Model.NutritionInfoItemAddUpdateLabelModel](docs/NutritionInfoItemAddUpdateLabelModel.md)
+ - [Model.NutritionInfoLabel](docs/NutritionInfoLabel.md)
+ - [Model.NutritionInfoMenuItem](docs/NutritionInfoMenuItem.md)
+ - [Model.NutritionInfoMenuOptionSetItem](docs/NutritionInfoMenuOptionSetItem.md)
+ - [Model.NutritionInfoV2](docs/NutritionInfoV2.md)
+ - [Model.NutritionInfoV2Allergen](docs/NutritionInfoV2Allergen.md)
+ - [Model.NutritionInfoV2Item](docs/NutritionInfoV2Item.md)
  - [Model.OAuthApp](docs/OAuthApp.md)
  - [Model.OAuthTokenModel](docs/OAuthTokenModel.md)
  - [Model.OauthClientRedirectUri](docs/OauthClientRedirectUri.md)
  - [Model.ObjectDisplayOrder](docs/ObjectDisplayOrder.md)
+ - [Model.OktaPortalFeatureFlag](docs/OktaPortalFeatureFlag.md)
  - [Model.OnboardingConfigUpdate](docs/OnboardingConfigUpdate.md)
  - [Model.OnboardingItemUpdate](docs/OnboardingItemUpdate.md)
  - [Model.Order](docs/Order.md)
  - [Model.OrderAcceptedEvent](docs/OrderAcceptedEvent.md)
  - [Model.OrderBatch](docs/OrderBatch.md)
- - [Model.OrderBatchItem](docs/OrderBatchItem.md)
+ - [Model.OrderBatchPublishedEvent](docs/OrderBatchPublishedEvent.md)
+ - [Model.OrderBatchSummary](docs/OrderBatchSummary.md)
  - [Model.OrderBatchingConfiguration](docs/OrderBatchingConfiguration.md)
  - [Model.OrderCapacityConfigUpdatedEvent](docs/OrderCapacityConfigUpdatedEvent.md)
  - [Model.OrderCreatedEvent](docs/OrderCreatedEvent.md)
@@ -842,13 +1005,13 @@ Class | Method | HTTP request | Description
  - [Model.OrderFulfillmentStatusUpdate](docs/OrderFulfillmentStatusUpdate.md)
  - [Model.OrderFulfillmentStatusUpdatedEvent](docs/OrderFulfillmentStatusUpdatedEvent.md)
  - [Model.OrderFulfillmentStatusWithConfigurationActions](docs/OrderFulfillmentStatusWithConfigurationActions.md)
- - [Model.OrderIdAndSequenceNumber](docs/OrderIdAndSequenceNumber.md)
- - [Model.OrderIngestSubmitOrderRequest](docs/OrderIngestSubmitOrderRequest.md)
- - [Model.OrderIngestSubmitOrderResponse](docs/OrderIngestSubmitOrderResponse.md)
  - [Model.OrderItem](docs/OrderItem.md)
  - [Model.OrderItemOption](docs/OrderItemOption.md)
+ - [Model.OrderLeadTimes](docs/OrderLeadTimes.md)
+ - [Model.OrderList](docs/OrderList.md)
  - [Model.OrderPaymentInformation](docs/OrderPaymentInformation.md)
  - [Model.OrderRatingUpdatedEvent](docs/OrderRatingUpdatedEvent.md)
+ - [Model.OrderReference](docs/OrderReference.md)
  - [Model.OrderRefundedEvent](docs/OrderRefundedEvent.md)
  - [Model.OrderRejectedEvent](docs/OrderRejectedEvent.md)
  - [Model.OrderSummary](docs/OrderSummary.md)
@@ -858,7 +1021,7 @@ Class | Method | HTTP request | Description
  - [Model.OwnerEntityConfiguration](docs/OwnerEntityConfiguration.md)
  - [Model.OwnerEntityConfigurations](docs/OwnerEntityConfigurations.md)
  - [Model.PasswordResetModel](docs/PasswordResetModel.md)
- - [Model.PaymentInfo](docs/PaymentInfo.md)
+ - [Model.PaymentAccount](docs/PaymentAccount.md)
  - [Model.PaymentIntent](docs/PaymentIntent.md)
  - [Model.PaymentTerminalDetails](docs/PaymentTerminalDetails.md)
  - [Model.PaymentTerminalTransactionDetails](docs/PaymentTerminalTransactionDetails.md)
@@ -868,19 +1031,39 @@ Class | Method | HTTP request | Description
  - [Model.PayoutOrder](docs/PayoutOrder.md)
  - [Model.PayoutOtherCharge](docs/PayoutOtherCharge.md)
  - [Model.PayoutRefund](docs/PayoutRefund.md)
+ - [Model.PayoutReport3Details](docs/PayoutReport3Details.md)
+ - [Model.PayoutReport3DetailsAdjustments](docs/PayoutReport3DetailsAdjustments.md)
+ - [Model.PayoutReport3DetailsFlipdishFees](docs/PayoutReport3DetailsFlipdishFees.md)
+ - [Model.PayoutReport3DetailsRevenue](docs/PayoutReport3DetailsRevenue.md)
+ - [Model.PayoutReport3DetailsSalesLine](docs/PayoutReport3DetailsSalesLine.md)
+ - [Model.PayoutReport3DetailsSummary](docs/PayoutReport3DetailsSummary.md)
+ - [Model.PayoutReport3Overview](docs/PayoutReport3Overview.md)
+ - [Model.PayoutReport3OverviewHeader](docs/PayoutReport3OverviewHeader.md)
+ - [Model.PayoutReport3PropertyDetails](docs/PayoutReport3PropertyDetails.md)
+ - [Model.PayoutReport3PropertyFilterOption](docs/PayoutReport3PropertyFilterOption.md)
+ - [Model.PayoutReport3RefundedOrder](docs/PayoutReport3RefundedOrder.md)
+ - [Model.PayoutReport3Store](docs/PayoutReport3Store.md)
+ - [Model.PayoutReport3StorePayout](docs/PayoutReport3StorePayout.md)
+ - [Model.PayoutReport3StorePayouts](docs/PayoutReport3StorePayouts.md)
  - [Model.PayoutRequestIds](docs/PayoutRequestIds.md)
  - [Model.PayoutStore](docs/PayoutStore.md)
  - [Model.PayoutSummary](docs/PayoutSummary.md)
+ - [Model.PendingInvitation](docs/PendingInvitation.md)
  - [Model.PendingMenuChanges](docs/PendingMenuChanges.md)
  - [Model.PendingMenuChangesSummaries](docs/PendingMenuChangesSummaries.md)
  - [Model.PercentDiscountDetails](docs/PercentDiscountDetails.md)
  - [Model.PhoneCall](docs/PhoneCall.md)
  - [Model.PhoneCallEndedEvent](docs/PhoneCallEndedEvent.md)
  - [Model.PhoneCallStartedEvent](docs/PhoneCallStartedEvent.md)
+ - [Model.PixelPointProductCatalogue](docs/PixelPointProductCatalogue.md)
+ - [Model.PlayStoreConfigModel](docs/PlayStoreConfigModel.md)
+ - [Model.PosRevenueDetails](docs/PosRevenueDetails.md)
  - [Model.PreOrderConfig](docs/PreOrderConfig.md)
  - [Model.PreOrderTime](docs/PreOrderTime.md)
  - [Model.PredefinedAnswer](docs/PredefinedAnswer.md)
- - [Model.Price](docs/Price.md)
+ - [Model.PreviousOrder](docs/PreviousOrder.md)
+ - [Model.PreviousOrderItem](docs/PreviousOrderItem.md)
+ - [Model.PreviousOrderItemOption](docs/PreviousOrderItemOption.md)
  - [Model.Printer](docs/Printer.md)
  - [Model.PrinterAssignedToStoreEvent](docs/PrinterAssignedToStoreEvent.md)
  - [Model.PrinterTurnedOffEvent](docs/PrinterTurnedOffEvent.md)
@@ -890,6 +1073,8 @@ Class | Method | HTTP request | Description
  - [Model.ProcessingFeeConfig](docs/ProcessingFeeConfig.md)
  - [Model.Product](docs/Product.md)
  - [Model.ProductReference](docs/ProductReference.md)
+ - [Model.PromotionAward](docs/PromotionAward.md)
+ - [Model.PromotionDetails](docs/PromotionDetails.md)
  - [Model.PublishMenuChanges](docs/PublishMenuChanges.md)
  - [Model.PushNotificationDeletedEvent](docs/PushNotificationDeletedEvent.md)
  - [Model.PushNotificationRequest](docs/PushNotificationRequest.md)
@@ -901,25 +1086,23 @@ Class | Method | HTTP request | Description
  - [Model.RedeemInvitationResult](docs/RedeemInvitationResult.md)
  - [Model.Refund](docs/Refund.md)
  - [Model.Reject](docs/Reject.md)
- - [Model.RequestLoginPinModel](docs/RequestLoginPinModel.md)
- - [Model.RequestLoginPinResposne](docs/RequestLoginPinResposne.md)
  - [Model.RequestPasswordResetModel](docs/RequestPasswordResetModel.md)
- - [Model.RequestPasswordResetPinResponse](docs/RequestPasswordResetPinResponse.md)
  - [Model.Response](docs/Response.md)
  - [Model.RestApiArrayResultAllMetadataResult](docs/RestApiArrayResultAllMetadataResult.md)
+ - [Model.RestApiArrayResultAllergen](docs/RestApiArrayResultAllergen.md)
  - [Model.RestApiArrayResultApmCurrencyDataPoint](docs/RestApiArrayResultApmCurrencyDataPoint.md)
  - [Model.RestApiArrayResultApmDataPoint](docs/RestApiArrayResultApmDataPoint.md)
  - [Model.RestApiArrayResultApmHourlyDataPoint](docs/RestApiArrayResultApmHourlyDataPoint.md)
- - [Model.RestApiArrayResultAppStoreAppConfigurationHeader](docs/RestApiArrayResultAppStoreAppConfigurationHeader.md)
  - [Model.RestApiArrayResultAppStoreAppConfigurationSummary](docs/RestApiArrayResultAppStoreAppConfigurationSummary.md)
+ - [Model.RestApiArrayResultAppStoreAppSummary](docs/RestApiArrayResultAppStoreAppSummary.md)
  - [Model.RestApiArrayResultBankAccountSummary](docs/RestApiArrayResultBankAccountSummary.md)
  - [Model.RestApiArrayResultBusinessHoursPeriod](docs/RestApiArrayResultBusinessHoursPeriod.md)
  - [Model.RestApiArrayResultChannel](docs/RestApiArrayResultChannel.md)
+ - [Model.RestApiArrayResultClientDeviceSummary](docs/RestApiArrayResultClientDeviceSummary.md)
  - [Model.RestApiArrayResultCountryWithAccountFieldsDefinitions](docs/RestApiArrayResultCountryWithAccountFieldsDefinitions.md)
  - [Model.RestApiArrayResultDeliveryZone](docs/RestApiArrayResultDeliveryZone.md)
- - [Model.RestApiArrayResultDriver](docs/RestApiArrayResultDriver.md)
- - [Model.RestApiArrayResultDriverStore](docs/RestApiArrayResultDriverStore.md)
  - [Model.RestApiArrayResultEmvTerminalWithAssignments](docs/RestApiArrayResultEmvTerminalWithAssignments.md)
+ - [Model.RestApiArrayResultFlipdishAccountName](docs/RestApiArrayResultFlipdishAccountName.md)
  - [Model.RestApiArrayResultFulfillmentStatesConfigurationSummary](docs/RestApiArrayResultFulfillmentStatesConfigurationSummary.md)
  - [Model.RestApiArrayResultHomeAction](docs/RestApiArrayResultHomeAction.md)
  - [Model.RestApiArrayResultKioskCashPaymentSettings](docs/RestApiArrayResultKioskCashPaymentSettings.md)
@@ -937,31 +1120,46 @@ Class | Method | HTTP request | Description
  - [Model.RestApiArrayResultMenuStoreNames](docs/RestApiArrayResultMenuStoreNames.md)
  - [Model.RestApiArrayResultMenuSummary](docs/RestApiArrayResultMenuSummary.md)
  - [Model.RestApiArrayResultMenuTaxDetails](docs/RestApiArrayResultMenuTaxDetails.md)
+ - [Model.RestApiArrayResultMenuZone](docs/RestApiArrayResultMenuZone.md)
  - [Model.RestApiArrayResultMetadata](docs/RestApiArrayResultMetadata.md)
  - [Model.RestApiArrayResultMobileAppsStatistics](docs/RestApiArrayResultMobileAppsStatistics.md)
  - [Model.RestApiArrayResultOAuthApp](docs/RestApiArrayResultOAuthApp.md)
  - [Model.RestApiArrayResultOauthClientRedirectUri](docs/RestApiArrayResultOauthClientRedirectUri.md)
- - [Model.RestApiArrayResultOrderBatchItem](docs/RestApiArrayResultOrderBatchItem.md)
+ - [Model.RestApiArrayResultOrderBatch](docs/RestApiArrayResultOrderBatch.md)
  - [Model.RestApiArrayResultOrderFulfillmentStatus](docs/RestApiArrayResultOrderFulfillmentStatus.md)
  - [Model.RestApiArrayResultPayoutSummary](docs/RestApiArrayResultPayoutSummary.md)
+ - [Model.RestApiArrayResultPendingInvitation](docs/RestApiArrayResultPendingInvitation.md)
  - [Model.RestApiArrayResultPendingMenuChangesSummaries](docs/RestApiArrayResultPendingMenuChangesSummaries.md)
  - [Model.RestApiArrayResultPreOrderTime](docs/RestApiArrayResultPreOrderTime.md)
  - [Model.RestApiArrayResultProcessingFeeConfig](docs/RestApiArrayResultProcessingFeeConfig.md)
+ - [Model.RestApiArrayResultRedeemInvitationResult](docs/RestApiArrayResultRedeemInvitationResult.md)
  - [Model.RestApiArrayResultRestApiDefaultResponse](docs/RestApiArrayResultRestApiDefaultResponse.md)
  - [Model.RestApiArrayResultRestaurantVoucherEligibleStore](docs/RestApiArrayResultRestaurantVoucherEligibleStore.md)
  - [Model.RestApiArrayResultRestaurantVoucherPayGreenConfiguration](docs/RestApiArrayResultRestaurantVoucherPayGreenConfiguration.md)
  - [Model.RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary](docs/RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary.md)
  - [Model.RestApiArrayResultRetentionCampaign](docs/RestApiArrayResultRetentionCampaign.md)
+ - [Model.RestApiArrayResultSmsProviderCredential](docs/RestApiArrayResultSmsProviderCredential.md)
  - [Model.RestApiArrayResultStoreChannelAssignment](docs/RestApiArrayResultStoreChannelAssignment.md)
- - [Model.RestApiArrayResultStoreChannelStoreMapping](docs/RestApiArrayResultStoreChannelStoreMapping.md)
+ - [Model.RestApiArrayResultStoreDeliveryZoneFeeConfig](docs/RestApiArrayResultStoreDeliveryZoneFeeConfig.md)
  - [Model.RestApiArrayResultStoreListItem](docs/RestApiArrayResultStoreListItem.md)
  - [Model.RestApiArrayResultStoreStatistics](docs/RestApiArrayResultStoreStatistics.md)
+ - [Model.RestApiArrayResultStripeCustomConnectedAccount](docs/RestApiArrayResultStripeCustomConnectedAccount.md)
+ - [Model.RestApiArrayResultSubscriptionSummary](docs/RestApiArrayResultSubscriptionSummary.md)
  - [Model.RestApiArrayResultSupportedCountry](docs/RestApiArrayResultSupportedCountry.md)
  - [Model.RestApiArrayResultTeammate](docs/RestApiArrayResultTeammate.md)
+ - [Model.RestApiArrayResultUserDeliveryLocationAdmin](docs/RestApiArrayResultUserDeliveryLocationAdmin.md)
+ - [Model.RestApiArrayResultUserFlipdishAccount](docs/RestApiArrayResultUserFlipdishAccount.md)
+ - [Model.RestApiArrayResultUserNote](docs/RestApiArrayResultUserNote.md)
+ - [Model.RestApiArrayResultUserOrderSummary](docs/RestApiArrayResultUserOrderSummary.md)
+ - [Model.RestApiArrayResultUserSmsChatItem](docs/RestApiArrayResultUserSmsChatItem.md)
+ - [Model.RestApiArrayResultUserStoreInfo](docs/RestApiArrayResultUserStoreInfo.md)
  - [Model.RestApiArrayResultVoucherDataPoint](docs/RestApiArrayResultVoucherDataPoint.md)
+ - [Model.RestApiArrayResultVoucherSummary](docs/RestApiArrayResultVoucherSummary.md)
  - [Model.RestApiDefaultResponse](docs/RestApiDefaultResponse.md)
  - [Model.RestApiErrorResult](docs/RestApiErrorResult.md)
  - [Model.RestApiEventSearchPaginationResult](docs/RestApiEventSearchPaginationResult.md)
+ - [Model.RestApiFinanceSearchPaginationResultInvoice](docs/RestApiFinanceSearchPaginationResultInvoice.md)
+ - [Model.RestApiFinanceSearchPaginationResultSubscriptionInvoice](docs/RestApiFinanceSearchPaginationResultSubscriptionInvoice.md)
  - [Model.RestApiForbiddenResult](docs/RestApiForbiddenResult.md)
  - [Model.RestApiIntegerResult](docs/RestApiIntegerResult.md)
  - [Model.RestApiPaginationResultApp](docs/RestApiPaginationResultApp.md)
@@ -969,7 +1167,6 @@ Class | Method | HTTP request | Description
  - [Model.RestApiPaginationResultBusinessHoursOverride](docs/RestApiPaginationResultBusinessHoursOverride.md)
  - [Model.RestApiPaginationResultCatalogItem](docs/RestApiPaginationResultCatalogItem.md)
  - [Model.RestApiPaginationResultGroup](docs/RestApiPaginationResultGroup.md)
- - [Model.RestApiPaginationResultHttpRequestAndResponseLog](docs/RestApiPaginationResultHttpRequestAndResponseLog.md)
  - [Model.RestApiPaginationResultHydraDeviceDetails](docs/RestApiPaginationResultHydraDeviceDetails.md)
  - [Model.RestApiPaginationResultMetafieldDefinition](docs/RestApiPaginationResultMetafieldDefinition.md)
  - [Model.RestApiPaginationResultMetafieldDefinitionRecommendation](docs/RestApiPaginationResultMetafieldDefinitionRecommendation.md)
@@ -981,18 +1178,22 @@ Class | Method | HTTP request | Description
  - [Model.RestApiPaginationResultPayoutOrder](docs/RestApiPaginationResultPayoutOrder.md)
  - [Model.RestApiPaginationResultPayoutOtherCharge](docs/RestApiPaginationResultPayoutOtherCharge.md)
  - [Model.RestApiPaginationResultPayoutRefund](docs/RestApiPaginationResultPayoutRefund.md)
+ - [Model.RestApiPaginationResultPayoutReport3RefundedOrder](docs/RestApiPaginationResultPayoutReport3RefundedOrder.md)
  - [Model.RestApiPaginationResultPendingMenuChanges](docs/RestApiPaginationResultPendingMenuChanges.md)
  - [Model.RestApiPaginationResultPhoneCall](docs/RestApiPaginationResultPhoneCall.md)
  - [Model.RestApiPaginationResultProduct](docs/RestApiPaginationResultProduct.md)
  - [Model.RestApiPaginationResultPushNotificationResponse](docs/RestApiPaginationResultPushNotificationResponse.md)
+ - [Model.RestApiPaginationResultRestaurant](docs/RestApiPaginationResultRestaurant.md)
  - [Model.RestApiPaginationResultStore](docs/RestApiPaginationResultStore.md)
  - [Model.RestApiPaginationResultStoreGroup](docs/RestApiPaginationResultStoreGroup.md)
  - [Model.RestApiPaginationResultStoreGroupExtended](docs/RestApiPaginationResultStoreGroupExtended.md)
  - [Model.RestApiPaginationResultStoreHeader](docs/RestApiPaginationResultStoreHeader.md)
  - [Model.RestApiPaginationResultStoreValidationConfig](docs/RestApiPaginationResultStoreValidationConfig.md)
+ - [Model.RestApiPaginationResultUserSearch](docs/RestApiPaginationResultUserSearch.md)
  - [Model.RestApiPaginationResultVoucherSummary](docs/RestApiPaginationResultVoucherSummary.md)
  - [Model.RestApiPaginationResultWebhookLog](docs/RestApiPaginationResultWebhookLog.md)
  - [Model.RestApiPaginationResultWebhookSubscription](docs/RestApiPaginationResultWebhookSubscription.md)
+ - [Model.RestApiResultAcceptInvitationResult](docs/RestApiResultAcceptInvitationResult.md)
  - [Model.RestApiResultAccountDetail](docs/RestApiResultAccountDetail.md)
  - [Model.RestApiResultAccountFieldsDefinitions](docs/RestApiResultAccountFieldsDefinitions.md)
  - [Model.RestApiResultAddressFormResponse](docs/RestApiResultAddressFormResponse.md)
@@ -1002,35 +1203,49 @@ Class | Method | HTTP request | Description
  - [Model.RestApiResultAppChannelAssignment](docs/RestApiResultAppChannelAssignment.md)
  - [Model.RestApiResultAppCompliance](docs/RestApiResultAppCompliance.md)
  - [Model.RestApiResultAppConfigSalesChannel](docs/RestApiResultAppConfigSalesChannel.md)
+ - [Model.RestApiResultAppGeneralConfigModel](docs/RestApiResultAppGeneralConfigModel.md)
  - [Model.RestApiResultAppStoreApp](docs/RestApiResultAppStoreApp.md)
  - [Model.RestApiResultAppStoreAppConfiguration](docs/RestApiResultAppStoreAppConfiguration.md)
+ - [Model.RestApiResultAppStoreAppEntitlements](docs/RestApiResultAppStoreAppEntitlements.md)
+ - [Model.RestApiResultAppStoreConfigModel](docs/RestApiResultAppStoreConfigModel.md)
+ - [Model.RestApiResultAssetResultModel](docs/RestApiResultAssetResultModel.md)
  - [Model.RestApiResultAssignedBankAccount](docs/RestApiResultAssignedBankAccount.md)
  - [Model.RestApiResultBankAccountDetail](docs/RestApiResultBankAccountDetail.md)
  - [Model.RestApiResultBluetoothTerminalStatus](docs/RestApiResultBluetoothTerminalStatus.md)
+ - [Model.RestApiResultBuildResultModel](docs/RestApiResultBuildResultModel.md)
  - [Model.RestApiResultBusinessHoursOverride](docs/RestApiResultBusinessHoursOverride.md)
  - [Model.RestApiResultBusinessHoursPeriod](docs/RestApiResultBusinessHoursPeriod.md)
  - [Model.RestApiResultCardReader](docs/RestApiResultCardReader.md)
  - [Model.RestApiResultCatalogItem](docs/RestApiResultCatalogItem.md)
  - [Model.RestApiResultChannel](docs/RestApiResultChannel.md)
+ - [Model.RestApiResultClientDevice](docs/RestApiResultClientDevice.md)
+ - [Model.RestApiResultClientDeviceEnrollmentResult](docs/RestApiResultClientDeviceEnrollmentResult.md)
  - [Model.RestApiResultCoordinates](docs/RestApiResultCoordinates.md)
  - [Model.RestApiResultCountryFormResponse](docs/RestApiResultCountryFormResponse.md)
  - [Model.RestApiResultCreatedMenuSectionItems](docs/RestApiResultCreatedMenuSectionItems.md)
+ - [Model.RestApiResultCrossSellMenuItems](docs/RestApiResultCrossSellMenuItems.md)
  - [Model.RestApiResultCustomer](docs/RestApiResultCustomer.md)
+ - [Model.RestApiResultCustomers](docs/RestApiResultCustomers.md)
  - [Model.RestApiResultDeliveryZone](docs/RestApiResultDeliveryZone.md)
  - [Model.RestApiResultDnsRecordInformation](docs/RestApiResultDnsRecordInformation.md)
- - [Model.RestApiResultDriver](docs/RestApiResultDriver.md)
+ - [Model.RestApiResultEndUserFeeConfig](docs/RestApiResultEndUserFeeConfig.md)
+ - [Model.RestApiResultExecuteConfigurationActionResult](docs/RestApiResultExecuteConfigurationActionResult.md)
  - [Model.RestApiResultFulfillmentStatesConfiguration](docs/RestApiResultFulfillmentStatesConfiguration.md)
+ - [Model.RestApiResultGetEndUserFeeConfigsResponse](docs/RestApiResultGetEndUserFeeConfigsResponse.md)
  - [Model.RestApiResultGroup](docs/RestApiResultGroup.md)
+ - [Model.RestApiResultHasPaymentMethodResponse](docs/RestApiResultHasPaymentMethodResponse.md)
  - [Model.RestApiResultHomeStatistics](docs/RestApiResultHomeStatistics.md)
  - [Model.RestApiResultHydraConfig](docs/RestApiResultHydraConfig.md)
  - [Model.RestApiResultHydraDeviceDetails](docs/RestApiResultHydraDeviceDetails.md)
  - [Model.RestApiResultHydraStatus](docs/RestApiResultHydraStatus.md)
  - [Model.RestApiResultIndexPage](docs/RestApiResultIndexPage.md)
  - [Model.RestApiResultIndexPageBase](docs/RestApiResultIndexPageBase.md)
+ - [Model.RestApiResultIntercomUserHash](docs/RestApiResultIntercomUserHash.md)
  - [Model.RestApiResultJobResponse](docs/RestApiResultJobResponse.md)
- - [Model.RestApiResultKioskCashSetting](docs/RestApiResultKioskCashSetting.md)
+ - [Model.RestApiResultKioskEntitlementsResult](docs/RestApiResultKioskEntitlementsResult.md)
  - [Model.RestApiResultKioskIotConnectionParameters](docs/RestApiResultKioskIotConnectionParameters.md)
- - [Model.RestApiResultKioskStoreSettings](docs/RestApiResultKioskStoreSettings.md)
+ - [Model.RestApiResultKioskSettings](docs/RestApiResultKioskSettings.md)
+ - [Model.RestApiResultKioskStripeLocation](docs/RestApiResultKioskStripeLocation.md)
  - [Model.RestApiResultLightspeedSettings](docs/RestApiResultLightspeedSettings.md)
  - [Model.RestApiResultLocationArea](docs/RestApiResultLocationArea.md)
  - [Model.RestApiResultLocationAreaLocation](docs/RestApiResultLocationAreaLocation.md)
@@ -1040,9 +1255,11 @@ Class | Method | HTTP request | Description
  - [Model.RestApiResultMenu](docs/RestApiResultMenu.md)
  - [Model.RestApiResultMenuItemOptionSet](docs/RestApiResultMenuItemOptionSet.md)
  - [Model.RestApiResultMenuItemOptionSetItem](docs/RestApiResultMenuItemOptionSetItem.md)
+ - [Model.RestApiResultMenuNutritionInfoHeader](docs/RestApiResultMenuNutritionInfoHeader.md)
  - [Model.RestApiResultMenuSection](docs/RestApiResultMenuSection.md)
  - [Model.RestApiResultMenuSectionAvailability](docs/RestApiResultMenuSectionAvailability.md)
  - [Model.RestApiResultMenuSectionItem](docs/RestApiResultMenuSectionItem.md)
+ - [Model.RestApiResultMenuZone](docs/RestApiResultMenuZone.md)
  - [Model.RestApiResultMetadata](docs/RestApiResultMetadata.md)
  - [Model.RestApiResultMetafieldDefinition](docs/RestApiResultMetafieldDefinition.md)
  - [Model.RestApiResultMobileAppsImage](docs/RestApiResultMobileAppsImage.md)
@@ -1050,51 +1267,69 @@ Class | Method | HTTP request | Description
  - [Model.RestApiResultMobileAppsSubmissionDetails](docs/RestApiResultMobileAppsSubmissionDetails.md)
  - [Model.RestApiResultMobileAppsSubmissionStatus](docs/RestApiResultMobileAppsSubmissionStatus.md)
  - [Model.RestApiResultModelBase](docs/RestApiResultModelBase.md)
+ - [Model.RestApiResultNutritionInfo](docs/RestApiResultNutritionInfo.md)
+ - [Model.RestApiResultNutritionInfoV2](docs/RestApiResultNutritionInfoV2.md)
  - [Model.RestApiResultOAuthApp](docs/RestApiResultOAuthApp.md)
  - [Model.RestApiResultOauthClientRedirectUri](docs/RestApiResultOauthClientRedirectUri.md)
+ - [Model.RestApiResultOktaPortalFeatureFlag](docs/RestApiResultOktaPortalFeatureFlag.md)
  - [Model.RestApiResultOrder](docs/RestApiResultOrder.md)
  - [Model.RestApiResultOrderBatch](docs/RestApiResultOrderBatch.md)
  - [Model.RestApiResultOrderBatchingConfiguration](docs/RestApiResultOrderBatchingConfiguration.md)
  - [Model.RestApiResultOrderDeliveryInformation](docs/RestApiResultOrderDeliveryInformation.md)
  - [Model.RestApiResultOrderFulfillmentStatus](docs/RestApiResultOrderFulfillmentStatus.md)
  - [Model.RestApiResultOrderFulfillmentStatusWithConfigurationActions](docs/RestApiResultOrderFulfillmentStatusWithConfigurationActions.md)
- - [Model.RestApiResultOrderIngestSubmitOrderResponse](docs/RestApiResultOrderIngestSubmitOrderResponse.md)
+ - [Model.RestApiResultOrderLeadTimes](docs/RestApiResultOrderLeadTimes.md)
  - [Model.RestApiResultOrderPaymentInformation](docs/RestApiResultOrderPaymentInformation.md)
  - [Model.RestApiResultPaymentIntent](docs/RestApiResultPaymentIntent.md)
  - [Model.RestApiResultPaymentTerminalDetails](docs/RestApiResultPaymentTerminalDetails.md)
  - [Model.RestApiResultPaymentTerminalTransactionDetails](docs/RestApiResultPaymentTerminalTransactionDetails.md)
+ - [Model.RestApiResultPayoutReport3Details](docs/RestApiResultPayoutReport3Details.md)
+ - [Model.RestApiResultPayoutReport3Overview](docs/RestApiResultPayoutReport3Overview.md)
+ - [Model.RestApiResultPayoutReport3PropertyDetails](docs/RestApiResultPayoutReport3PropertyDetails.md)
+ - [Model.RestApiResultPayoutReport3StorePayouts](docs/RestApiResultPayoutReport3StorePayouts.md)
+ - [Model.RestApiResultPixelPointProductCatalogue](docs/RestApiResultPixelPointProductCatalogue.md)
+ - [Model.RestApiResultPlayStoreConfigModel](docs/RestApiResultPlayStoreConfigModel.md)
  - [Model.RestApiResultPreOrderConfig](docs/RestApiResultPreOrderConfig.md)
  - [Model.RestApiResultProcessingFeeConfig](docs/RestApiResultProcessingFeeConfig.md)
  - [Model.RestApiResultProduct](docs/RestApiResultProduct.md)
  - [Model.RestApiResultPushNotificationResponse](docs/RestApiResultPushNotificationResponse.md)
  - [Model.RestApiResultRedeemInvitationResult](docs/RestApiResultRedeemInvitationResult.md)
+ - [Model.RestApiResultRestApiDefaultResponse](docs/RestApiResultRestApiDefaultResponse.md)
+ - [Model.RestApiResultRestApiIntegerResult](docs/RestApiResultRestApiIntegerResult.md)
  - [Model.RestApiResultRestaurantVoucherPayGreenConfiguration](docs/RestApiResultRestaurantVoucherPayGreenConfiguration.md)
  - [Model.RestApiResultRestaurantVoucherPayGreenStoreConfiguration](docs/RestApiResultRestaurantVoucherPayGreenStoreConfiguration.md)
  - [Model.RestApiResultRetentionCampaign](docs/RestApiResultRetentionCampaign.md)
  - [Model.RestApiResultServiceCharge](docs/RestApiResultServiceCharge.md)
+ - [Model.RestApiResultSetV2FeeCalculationRequest](docs/RestApiResultSetV2FeeCalculationRequest.md)
+ - [Model.RestApiResultSmsProviderCredential](docs/RestApiResultSmsProviderCredential.md)
  - [Model.RestApiResultStore](docs/RestApiResultStore.md)
  - [Model.RestApiResultStoreAddress](docs/RestApiResultStoreAddress.md)
  - [Model.RestApiResultStoreChannelAssignment](docs/RestApiResultStoreChannelAssignment.md)
  - [Model.RestApiResultStoreEndOfDayReport](docs/RestApiResultStoreEndOfDayReport.md)
  - [Model.RestApiResultStoreGroup](docs/RestApiResultStoreGroup.md)
  - [Model.RestApiResultStoreGroupBase](docs/RestApiResultStoreGroupBase.md)
- - [Model.RestApiResultStoreKioskSettings](docs/RestApiResultStoreKioskSettings.md)
  - [Model.RestApiResultStoreOrderCapacityConfig](docs/RestApiResultStoreOrderCapacityConfig.md)
  - [Model.RestApiResultStripeConnectedAccount](docs/RestApiResultStripeConnectedAccount.md)
  - [Model.RestApiResultStripeTerminalConnectionToken](docs/RestApiResultStripeTerminalConnectionToken.md)
  - [Model.RestApiResultStripeTerminalLocation](docs/RestApiResultStripeTerminalLocation.md)
- - [Model.RestApiResultStripeTerminalPrivateKey](docs/RestApiResultStripeTerminalPrivateKey.md)
  - [Model.RestApiResultStuartSettings](docs/RestApiResultStuartSettings.md)
+ - [Model.RestApiResultSubscription](docs/RestApiResultSubscription.md)
  - [Model.RestApiResultTeammate](docs/RestApiResultTeammate.md)
  - [Model.RestApiResultTelemetrySeriesResult](docs/RestApiResultTelemetrySeriesResult.md)
  - [Model.RestApiResultTipConfiguration](docs/RestApiResultTipConfiguration.md)
  - [Model.RestApiResultUpdateMobileAppsSubmissionStatus](docs/RestApiResultUpdateMobileAppsSubmissionStatus.md)
+ - [Model.RestApiResultUserInfo](docs/RestApiResultUserInfo.md)
+ - [Model.RestApiResultUserPushNotificationSentResult](docs/RestApiResultUserPushNotificationSentResult.md)
+ - [Model.RestApiResultUserRole](docs/RestApiResultUserRole.md)
+ - [Model.RestApiResultVoucher](docs/RestApiResultVoucher.md)
  - [Model.RestApiResultVoucherWithStats](docs/RestApiResultVoucherWithStats.md)
  - [Model.RestApiResultWebsiteImage](docs/RestApiResultWebsiteImage.md)
  - [Model.RestApiResultWebsiteTestimonial](docs/RestApiResultWebsiteTestimonial.md)
+ - [Model.RestApiResultWhiteLabelConfigModel](docs/RestApiResultWhiteLabelConfigModel.md)
  - [Model.RestApiStringArrayResult](docs/RestApiStringArrayResult.md)
  - [Model.RestApiStringResult](docs/RestApiStringResult.md)
  - [Model.RestApiUnauthorizedResult](docs/RestApiUnauthorizedResult.md)
+ - [Model.Restaurant](docs/Restaurant.md)
  - [Model.RestaurantVoucherAssignedStore](docs/RestaurantVoucherAssignedStore.md)
  - [Model.RestaurantVoucherEligibleStore](docs/RestaurantVoucherEligibleStore.md)
  - [Model.RestaurantVoucherPayGreenConfiguration](docs/RestaurantVoucherPayGreenConfiguration.md)
@@ -1107,13 +1342,21 @@ Class | Method | HTTP request | Description
  - [Model.RetentionCampaignUpdatedEvent](docs/RetentionCampaignUpdatedEvent.md)
  - [Model.RevenueAdjustmentsDetails](docs/RevenueAdjustmentsDetails.md)
  - [Model.RevenueDetail](docs/RevenueDetail.md)
+ - [Model.SafeWaitHandle](docs/SafeWaitHandle.md)
  - [Model.SearchCriteria](docs/SearchCriteria.md)
+ - [Model.SendUserPushNotificationRequest](docs/SendUserPushNotificationRequest.md)
+ - [Model.SendUserSmsRequest](docs/SendUserSmsRequest.md)
  - [Model.ServiceCharge](docs/ServiceCharge.md)
  - [Model.SetOrderBatchingConfiguration](docs/SetOrderBatchingConfiguration.md)
- - [Model.SetPasswordWithPinModel](docs/SetPasswordWithPinModel.md)
+ - [Model.SetUserDeliveryLocationCoordinatesRequest](docs/SetUserDeliveryLocationCoordinatesRequest.md)
+ - [Model.SetUserDeliveryLocationFieldRequest](docs/SetUserDeliveryLocationFieldRequest.md)
+ - [Model.SetV2FeeCalculationRequest](docs/SetV2FeeCalculationRequest.md)
+ - [Model.SetVoucherValidityPeriodsSimplifiedRequest](docs/SetVoucherValidityPeriodsSimplifiedRequest.md)
  - [Model.Setting](docs/Setting.md)
  - [Model.SignupStep](docs/SignupStep.md)
  - [Model.SmsInfo](docs/SmsInfo.md)
+ - [Model.SmsProviderCredential](docs/SmsProviderCredential.md)
+ - [Model.SmsProviderCredentialUpdateRequest](docs/SmsProviderCredentialUpdateRequest.md)
  - [Model.SmsReceivedEvent](docs/SmsReceivedEvent.md)
  - [Model.StatisticsCurrencyDataPoint](docs/StatisticsCurrencyDataPoint.md)
  - [Model.Store](docs/Store.md)
@@ -1127,15 +1370,18 @@ Class | Method | HTTP request | Description
  - [Model.StoreBusinessHoursOverrideDeletedEvent](docs/StoreBusinessHoursOverrideDeletedEvent.md)
  - [Model.StoreCampaignStartTime](docs/StoreCampaignStartTime.md)
  - [Model.StoreChannelAssignment](docs/StoreChannelAssignment.md)
- - [Model.StoreChannelStoreMapping](docs/StoreChannelStoreMapping.md)
  - [Model.StoreCloneSettings](docs/StoreCloneSettings.md)
+ - [Model.StoreCollectionSettings](docs/StoreCollectionSettings.md)
  - [Model.StoreConfig](docs/StoreConfig.md)
  - [Model.StoreCreateBase](docs/StoreCreateBase.md)
  - [Model.StoreCreatedEvent](docs/StoreCreatedEvent.md)
  - [Model.StoreDataPoint](docs/StoreDataPoint.md)
  - [Model.StoreDeletedEvent](docs/StoreDeletedEvent.md)
+ - [Model.StoreDeliveryZoneFeeConfig](docs/StoreDeliveryZoneFeeConfig.md)
+ - [Model.StoreDeliveryZoneFeeConfigUpdateRequest](docs/StoreDeliveryZoneFeeConfigUpdateRequest.md)
  - [Model.StoreEndOfDayReport](docs/StoreEndOfDayReport.md)
  - [Model.StoreFeeConfig](docs/StoreFeeConfig.md)
+ - [Model.StoreFeeConfigUpdatedEvent](docs/StoreFeeConfigUpdatedEvent.md)
  - [Model.StoreGroup](docs/StoreGroup.md)
  - [Model.StoreGroupBase](docs/StoreGroupBase.md)
  - [Model.StoreGroupCreatedEvent](docs/StoreGroupCreatedEvent.md)
@@ -1145,9 +1391,7 @@ Class | Method | HTTP request | Description
  - [Model.StoreHeader](docs/StoreHeader.md)
  - [Model.StoreItemHeader](docs/StoreItemHeader.md)
  - [Model.StoreKioskSetting](docs/StoreKioskSetting.md)
- - [Model.StoreKioskSettingModel](docs/StoreKioskSettingModel.md)
  - [Model.StoreKioskSettingUpdatedEvent](docs/StoreKioskSettingUpdatedEvent.md)
- - [Model.StoreKioskSettings](docs/StoreKioskSettings.md)
  - [Model.StoreListItem](docs/StoreListItem.md)
  - [Model.StoreLogoCreatedEvent](docs/StoreLogoCreatedEvent.md)
  - [Model.StoreLogoDeletedEvent](docs/StoreLogoDeletedEvent.md)
@@ -1168,15 +1412,23 @@ Class | Method | HTTP request | Description
  - [Model.StoreUnpublishedEvent](docs/StoreUnpublishedEvent.md)
  - [Model.StoreUpdatedEvent](docs/StoreUpdatedEvent.md)
  - [Model.StoreValidationConfig](docs/StoreValidationConfig.md)
+ - [Model.Stream](docs/Stream.md)
  - [Model.StripeAccountLinkRequest](docs/StripeAccountLinkRequest.md)
  - [Model.StripeConnectedAccount](docs/StripeConnectedAccount.md)
  - [Model.StripeConnectedAccountInfo](docs/StripeConnectedAccountInfo.md)
+ - [Model.StripeCustomConnectedAccount](docs/StripeCustomConnectedAccount.md)
  - [Model.StripeTerminalConnectionToken](docs/StripeTerminalConnectionToken.md)
  - [Model.StripeTerminalLocation](docs/StripeTerminalLocation.md)
- - [Model.StripeTerminalPrivateKey](docs/StripeTerminalPrivateKey.md)
  - [Model.StuartSettings](docs/StuartSettings.md)
  - [Model.StuartSettingsTransportPrices](docs/StuartSettingsTransportPrices.md)
+ - [Model.Subscription](docs/Subscription.md)
+ - [Model.SubscriptionInvoice](docs/SubscriptionInvoice.md)
+ - [Model.SubscriptionProduct](docs/SubscriptionProduct.md)
+ - [Model.SubscriptionStore](docs/SubscriptionStore.md)
+ - [Model.SubscriptionSummary](docs/SubscriptionSummary.md)
  - [Model.SupportedCountry](docs/SupportedCountry.md)
+ - [Model.TaxItem](docs/TaxItem.md)
+ - [Model.TaxRate](docs/TaxRate.md)
  - [Model.Teammate](docs/Teammate.md)
  - [Model.TeammateBase](docs/TeammateBase.md)
  - [Model.TeammateDeletedEvent](docs/TeammateDeletedEvent.md)
@@ -1186,11 +1438,17 @@ Class | Method | HTTP request | Description
  - [Model.TelemetrySeriesProperty](docs/TelemetrySeriesProperty.md)
  - [Model.TelemetrySeriesQueryParameters](docs/TelemetrySeriesQueryParameters.md)
  - [Model.TelemetrySeriesResult](docs/TelemetrySeriesResult.md)
+ - [Model.TelephonyConfig](docs/TelephonyConfig.md)
+ - [Model.TelephonyConfigUpdatedEvent](docs/TelephonyConfigUpdatedEvent.md)
+ - [Model.ThirdPartyFeesDetails](docs/ThirdPartyFeesDetails.md)
  - [Model.TipConfiguration](docs/TipConfiguration.md)
  - [Model.UnRegisterCardReaderRequest](docs/UnRegisterCardReaderRequest.md)
+ - [Model.UpcomingInvoice](docs/UpcomingInvoice.md)
  - [Model.UpdateAppStoreApp](docs/UpdateAppStoreApp.md)
  - [Model.UpdateAppStoreAppConfiguration](docs/UpdateAppStoreAppConfiguration.md)
+ - [Model.UpdateAppStoreAppConfigurationValuesBatch](docs/UpdateAppStoreAppConfigurationValuesBatch.md)
  - [Model.UpdateAppStoreAppConfigurationWebhookDTO](docs/UpdateAppStoreAppConfigurationWebhookDTO.md)
+ - [Model.UpdateAppStoreAppExternalProduct](docs/UpdateAppStoreAppExternalProduct.md)
  - [Model.UpdateCatalogGroupReference](docs/UpdateCatalogGroupReference.md)
  - [Model.UpdateCatalogItem](docs/UpdateCatalogItem.md)
  - [Model.UpdateDriverNotificationToken](docs/UpdateDriverNotificationToken.md)
@@ -1206,23 +1464,40 @@ Class | Method | HTTP request | Description
  - [Model.UpdateProductReference](docs/UpdateProductReference.md)
  - [Model.UpdateStorePayGreenConfigurationRequest](docs/UpdateStorePayGreenConfigurationRequest.md)
  - [Model.UpdateTipConfiguration](docs/UpdateTipConfiguration.md)
+ - [Model.UpdateVoucher](docs/UpdateVoucher.md)
+ - [Model.UpdateVoucherUsage](docs/UpdateVoucherUsage.md)
  - [Model.UserAnsweredSignupQuestionsEvent](docs/UserAnsweredSignupQuestionsEvent.md)
  - [Model.UserCreatedEvent](docs/UserCreatedEvent.md)
  - [Model.UserDeletedEvent](docs/UserDeletedEvent.md)
+ - [Model.UserDeliveryLocationAdmin](docs/UserDeliveryLocationAdmin.md)
  - [Model.UserEventInfo](docs/UserEventInfo.md)
+ - [Model.UserFlipdishAccount](docs/UserFlipdishAccount.md)
+ - [Model.UserInfo](docs/UserInfo.md)
  - [Model.UserLoginEvent](docs/UserLoginEvent.md)
+ - [Model.UserMonthlyCommission](docs/UserMonthlyCommission.md)
+ - [Model.UserNote](docs/UserNote.md)
+ - [Model.UserOrderSummary](docs/UserOrderSummary.md)
  - [Model.UserPasswordCreatedEvent](docs/UserPasswordCreatedEvent.md)
+ - [Model.UserPushNotificationSentResult](docs/UserPushNotificationSentResult.md)
+ - [Model.UserRole](docs/UserRole.md)
+ - [Model.UserSearch](docs/UserSearch.md)
+ - [Model.UserSmsChatItem](docs/UserSmsChatItem.md)
+ - [Model.UserStoreInfo](docs/UserStoreInfo.md)
  - [Model.UserUpdatedEvent](docs/UserUpdatedEvent.md)
+ - [Model.UserWhiteLabelConfig](docs/UserWhiteLabelConfig.md)
+ - [Model.UserWhiteLabelInfo](docs/UserWhiteLabelInfo.md)
  - [Model.ValidValue](docs/ValidValue.md)
  - [Model.ValidationErrorResult](docs/ValidationErrorResult.md)
+ - [Model.ValidityPeriod](docs/ValidityPeriod.md)
  - [Model.Voucher](docs/Voucher.md)
- - [Model.VoucherBase](docs/VoucherBase.md)
+ - [Model.VoucherAppliedEvent](docs/VoucherAppliedEvent.md)
  - [Model.VoucherCreatedEvent](docs/VoucherCreatedEvent.md)
  - [Model.VoucherDataPoint](docs/VoucherDataPoint.md)
  - [Model.VoucherDeletedEvent](docs/VoucherDeletedEvent.md)
  - [Model.VoucherSummary](docs/VoucherSummary.md)
  - [Model.VoucherUpdatedEvent](docs/VoucherUpdatedEvent.md)
  - [Model.VoucherWithStats](docs/VoucherWithStats.md)
+ - [Model.WaitHandle](docs/WaitHandle.md)
  - [Model.WebhookEventSample](docs/WebhookEventSample.md)
  - [Model.WebhookLog](docs/WebhookLog.md)
  - [Model.WebhookSubscription](docs/WebhookSubscription.md)
@@ -1235,6 +1510,11 @@ Class | Method | HTTP request | Description
  - [Model.WebsiteTestimonialBase](docs/WebsiteTestimonialBase.md)
  - [Model.WebsiteUpdatedEvent](docs/WebsiteUpdatedEvent.md)
  - [Model.WebsiteVanityUrlUpdatedEvent](docs/WebsiteVanityUrlUpdatedEvent.md)
+ - [Model.WhiteLabelAssetModel](docs/WhiteLabelAssetModel.md)
+ - [Model.WhiteLabelColorSchemeModel](docs/WhiteLabelColorSchemeModel.md)
+ - [Model.WhiteLabelConfig](docs/WhiteLabelConfig.md)
+ - [Model.WhiteLabelConfigModel](docs/WhiteLabelConfigModel.md)
+ - [Model.WhiteLabelLanguageModel](docs/WhiteLabelLanguageModel.md)
 
 
 <a name="documentation-for-authorization"></a>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2848d444..c76a3e0e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,30 +3,53 @@
 # Add steps that publish symbols, save build artifacts, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
 
-name: 1.1$(Rev:.r)
+name: 1.2$(Rev:.r)
 
 trigger:
   branches:
     include:
       - master
 
-pr: none
+pr:
+  branches:
+    include:
+      - master
 
 pool:
   vmImage: 'windows-latest'
 
 variables:
-  nuspec: '**/Flipdish.csproj'
-  buildPlatform: 'Any CPU'
-  buildConfiguration: 'Release'
-
+  # Secret nuget.org API key (NUGET_API_KEY) lives in this variable group
+  # (Pipelines > Library > 'Flipdish NuGet'). Keep the group authorized for
+  # this pipeline, otherwise runs fail with an authorization error.
+- group: 'Flipdish NuGet'
+- name: nuspec
+  value: '**/Flipdish.csproj'
+- name: buildPlatform
+  value: 'Any CPU'
+- name: buildConfiguration
+  value: 'Release'
+  # Publishing (pack + push) only on push to master. PR runs build + restore only.
+  # Azure Pipelines has no 'Push' Build.Reason: push-triggered runs are 'IndividualCI'
+  # or 'BatchedCI'. Build.Reason is a runtime variable - it is NOT available to
+  # ${{ }} template expressions - so evaluate isMaster with $[ ].
+  # String eq/in are case-insensitive, so eq(variables['isMaster'], 'true') below
+  # matches the 'True'/'False' values a runtime expression produces.
+- name: isMaster
+  value: $[ and(eq(variables['Build.SourceBranch'], 'refs/heads/master'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) ]
 
 steps:
+# Pin NuGet to 6.x: NuGet 7.x fails to parse the legacy solution file format
+# (Format Version 12.00 / VS 14) with "Could not load Microsoft.Build.Framework
+# Version=15.1.0.0" (see builds 1.1.530/1.2.434).
 - task: NuGetToolInstaller@1
+  inputs:
+    versionSpec: '6.x'
 
 - task: NuGetCommand@2
   inputs:
-    restoreSolution: '$(solution)'
+    # 'solution' was never defined - restore silently did nothing before.
+    restoreSolution: 'Flipdish.sln'
 
 - task: MSBuild@1
   inputs:
@@ -36,22 +59,54 @@ steps:
     configuration: '$(buildConfiguration)'
     clean: true
     maximumCpuCount: true
-    restoreNugetPackages: true
+    # restoreNugetPackages must stay OFF: it makes MSBuild@1 run the agent's
+    # bundled externals NuGet (C:\actions-runner\...\externals\nuget\NuGet.exe),
+    # which fails on this legacy .sln ("Error parsing solution file ...
+    # Microsoft.Build.Framework, Version=15.1.0.0" -> exit 1). Restore is
+    # already handled above by NuGetCommand@2 using the pinned NuGet 6.x.
 
 - task: NuGetCommand@2
+  condition: and(succeeded(), eq(variables['isMaster'], 'true'))
   inputs:
     command: 'pack'
     packagesToPack: '$(nuspec)'
     versioningScheme: 'byBuildNumber'
+  env:
+    NUGET_ENABLE_LEGACY_PROJECT_JSON_PACK: true
 
-- task: NuGetCommand@2
+# Push with the API key from the 'Flipdish NuGet' variable group (secret
+# NUGET_API_KEY, mapped into env below so it is masked in logs). The
+# NuGetCommand@2 task (>= 2.280.1) refuses API-key external service
+# connections on NuGet 6.x ("External service connections that use API key
+# authentication require NuGet 7.6 or later" - build 1.2.439), and the 6.x
+# pin must stay for the legacy .sln restore, so push runs as a script.
+# dotnet is preinstalled on hosted Windows agents; the nupkg produced by
+# nuget.exe pack pushes exactly like any other package.
+- task: PowerShell@2
+  displayName: 'dotnet nuget push (nuget.org)'
+  condition: and(succeeded(), eq(variables['isMaster'], 'true'))
+  env:
+    NUGET_API_KEY: $(NUGET_API_KEY)
   inputs:
-    command: 'push'
-    packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
-    nuGetFeedType: 'external'
-    publishFeedCredentials: 'Nuget service'
+    targetType: 'inline'
+    script: |
+      $ErrorActionPreference = 'Stop'
+      $pkgs = Get-ChildItem "$env:BUILD_ARTIFACTSTAGINGDIRECTORY" -Filter *.nupkg |
+        Where-Object { $_.Name -notlike '*.symbols.nupkg' }
+      if (-not $pkgs) {
+        Write-Host "##vso[task.logissue type=error]No .nupkg packages found in $env:BUILD_ARTIFACTSTAGINGDIRECTORY"
+        exit 1
+      }
+      foreach ($pkg in $pkgs) {
+        Write-Host "Pushing $($pkg.Name)"
+        # --no-symbols: dotnet push would otherwise auto-push a matching .snupkg
+        # --skip-duplicate: build re-runs after a successful push become a no-op
+        dotnet nuget push "$($pkg.FullName)" --source https://api.nuget.org/v3/index.json --api-key "$env:NUGET_API_KEY" --no-symbols --skip-duplicate
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+      }
 
-- task: VSTest@2
-  inputs:
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+# there are no tests in the solution (only src\Flipdish) - same as netcore repo
+#- task: VSTest@2
+#  inputs:
+#    platform: '$(buildPlatform)'
+#    configuration: '$(buildConfiguration)'
diff --git a/docs/Accept.md b/docs/Accept.md
index 30cadd39..de97b954 100644
--- a/docs/Accept.md
+++ b/docs/Accept.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Accept
+# Flipdish.Model.Accept
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AcceptInvitationResult.md b/docs/AcceptInvitationResult.md
new file mode 100644
index 00000000..fd757c94
--- /dev/null
+++ b/docs/AcceptInvitationResult.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.AcceptInvitationResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**IsNewUser** | **bool?** | Bool indicating if the user accepting the invitation is a new user | [optional] 
+**InvitedEmailAddress** | **string** | The email address that was invited. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AccountDetail.md b/docs/AccountDetail.md
index ded03e3a..b753cb03 100644
--- a/docs/AccountDetail.md
+++ b/docs/AccountDetail.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AccountDetail
+# Flipdish.Model.AccountDetail
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,6 +13,7 @@ Name | Type | Description | Notes
 **TimeZoneInfoId** | **string** | Time Zone Info Id | [optional] 
 **DisplayTimesInUserLocalTimeZone** | **bool?** | Display the time in time zone local to the user | [optional] 
 **ShowHiddenFeatures** | **bool?** | Show hidden features | [optional] 
+**CreatedAt** | **DateTime?** | User created at | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AccountDetailBase.md b/docs/AccountDetailBase.md
index 3f1a3520..1b6cef88 100644
--- a/docs/AccountDetailBase.md
+++ b/docs/AccountDetailBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AccountDetailBase
+# Flipdish.Model.AccountDetailBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **TimeZoneInfoId** | **string** | Time Zone Info Id | [optional] 
 **DisplayTimesInUserLocalTimeZone** | **bool?** | Display the time in time zone local to the user | [optional] 
 **ShowHiddenFeatures** | **bool?** | Show hidden features | [optional] 
+**CreatedAt** | **DateTime?** | User created at | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AccountFieldDefinition.md b/docs/AccountFieldDefinition.md
index e81cd4b7..fe4f367b 100644
--- a/docs/AccountFieldDefinition.md
+++ b/docs/AccountFieldDefinition.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AccountFieldDefinition
+# Flipdish.Model.AccountFieldDefinition
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AccountFieldKeyValuePair.md b/docs/AccountFieldKeyValuePair.md
index 5da9ddfb..7bb3ee20 100644
--- a/docs/AccountFieldKeyValuePair.md
+++ b/docs/AccountFieldKeyValuePair.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AccountFieldKeyValuePair
+# Flipdish.Model.AccountFieldKeyValuePair
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AccountFieldsDefinitions.md b/docs/AccountFieldsDefinitions.md
index 8ddbc48c..56959f8d 100644
--- a/docs/AccountFieldsDefinitions.md
+++ b/docs/AccountFieldsDefinitions.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AccountFieldsDefinitions
+# Flipdish.Model.AccountFieldsDefinitions
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AccountsApi.md b/docs/AccountsApi.md
index 69882718..b1fe833b 100644
--- a/docs/AccountsApi.md
+++ b/docs/AccountsApi.md
@@ -1,39 +1,38 @@
-# IO.Swagger.Api.AccountsApi
+# Flipdish.Api.AccountsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AnswerSignUpQuestion**](AccountsApi.md#answersignupquestion) | **POST** /api/v1.0/accounts/signupstep/{signupStepAction}/answer | Answer a signup question
-[**ChangePassword**](AccountsApi.md#changepassword) | **PUT** /api/v1.0/accounts/password | Change password
-[**ChangePasswordWithPin**](AccountsApi.md#changepasswordwithpin) | **PUT** /api/v1.0/accounts/password/pin | Change password
-[**CreateAccount**](AccountsApi.md#createaccount) | **POST** /api/v1.0/accounts | Create account with email address and store name
-[**GetAccountDetails**](AccountsApi.md#getaccountdetails) | **GET** /api/v1.0/accounts | Gets the current account detail
-[**GetLocalisedTimeZones**](AccountsApi.md#getlocalisedtimezones) | **GET** /api/v1.0/accounts/timezones | [PRIVATE API] Get timezones localised to users language
-[**Login**](AccountsApi.md#login) | **POST** /api/v1.0/accounts/login | Login with username and password
-[**LoginWithPin**](AccountsApi.md#loginwithpin) | **POST** /api/v1.0/accounts/login/pin | Login with username and password
-[**Logout**](AccountsApi.md#logout) | **POST** /api/v1.0/accounts/logout | Log out. It removes Flipdish authorization Cookie.
-[**PasswordResetWithToken**](AccountsApi.md#passwordresetwithtoken) | **POST** /api/v1.0/accounts/password | Reset password with token.
-[**RequestLoginPin**](AccountsApi.md#requestloginpin) | **POST** /api/v1.0/accounts/pin | Request login PIN. The server sends the PIN to the email address.
-[**RequestPasswordReset**](AccountsApi.md#requestpasswordreset) | **POST** /api/v1.0/accounts/passwordreset | Request password reset. Flipdish system will send a token via email.
-[**SendPinForPasswordReset**](AccountsApi.md#sendpinforpasswordreset) | **POST** /api/v1.0/accounts/password/resetpin | Request Password Reset PIN. The server sends the PIN to the email address.
-[**SkipSignupStep**](AccountsApi.md#skipsignupstep) | **POST** /api/v1.0/accounts/signupstep/{signupStepAction}/skip | Skip a signup question
-[**UpdateAccount**](AccountsApi.md#updateaccount) | **PUT** /api/v1.0/accounts | Update account with name and language
+[**AnswerSignUpQuestion**](AccountsApi.md#answersignupquestion) | **POST** /api/v1.0/accounts/signupstep/{signupStepAction}/answer | 
+[**ChangePassword**](AccountsApi.md#changepassword) | **PUT** /api/v1.0/accounts/password | 
+[**CreateAccount**](AccountsApi.md#createaccount) | **POST** /api/v1.0/accounts | 
+[**CreateBasicAccount**](AccountsApi.md#createbasicaccount) | **POST** /api/v1.0/accounts/basic-account | 
+[**GetAccountDetails**](AccountsApi.md#getaccountdetails) | **GET** /api/v1.0/accounts | 
+[**GetLocalisedTimeZones**](AccountsApi.md#getlocalisedtimezones) | **GET** /api/v1.0/accounts/timezones | 
+[**Login**](AccountsApi.md#login) | **POST** /api/v1.0/accounts/login | 
+[**LoginSso**](AccountsApi.md#loginsso) | **POST** /api/v1.0/accounts/login/sso | 
+[**Logout**](AccountsApi.md#logout) | **POST** /api/v1.0/accounts/logout | 
+[**PasswordResetWithToken**](AccountsApi.md#passwordresetwithtoken) | **POST** /api/v1.0/accounts/password | 
+[**RecaptchaValidate**](AccountsApi.md#recaptchavalidate) | **POST** /api/v1.0/accounts/recaptcha | 
+[**RequestPasswordReset**](AccountsApi.md#requestpasswordreset) | **POST** /api/v1.0/accounts/passwordreset | 
+[**SkipSignupStep**](AccountsApi.md#skipsignupstep) | **POST** /api/v1.0/accounts/signupstep/{signupStepAction}/skip | 
+[**UpdateAccount**](AccountsApi.md#updateaccount) | **PUT** /api/v1.0/accounts | 
 
 
 <a name="answersignupquestion"></a>
 # **AnswerSignUpQuestion**
 > void AnswerSignUpQuestion (string signupStepAction, int? answerId)
 
-Answer a signup question
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -45,12 +44,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var signupStepAction = signupStepAction_example;  // string | Signup step action
-            var answerId = 56;  // int? | Identifier of the answer
+            var signupStepAction = signupStepAction_example;  // string | 
+            var answerId = 56;  // int? | 
 
             try
             {
-                // Answer a signup question
                 apiInstance.AnswerSignUpQuestion(signupStepAction, answerId);
             }
             catch (Exception e)
@@ -66,8 +64,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **signupStepAction** | **string**| Signup step action | 
- **answerId** | **int?**| Identifier of the answer | 
+ **signupStepAction** | **string**|  | 
+ **answerId** | **int?**|  | 
 
 ### Return type
 
@@ -88,15 +86,15 @@ void (empty response body)
 # **ChangePassword**
 > void ChangePassword (ChangePasswordModel changePasswordModel)
 
-Change password
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -108,11 +106,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var changePasswordModel = new ChangePasswordModel(); // ChangePasswordModel | Change password model
+            var changePasswordModel = new ChangePasswordModel(); // ChangePasswordModel | 
 
             try
             {
-                // Change password
                 apiInstance.ChangePassword(changePasswordModel);
             }
             catch (Exception e)
@@ -128,7 +125,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **changePasswordModel** | [**ChangePasswordModel**](ChangePasswordModel.md)| Change password model | 
+ **changePasswordModel** | [**ChangePasswordModel**](ChangePasswordModel.md)|  | 
 
 ### Return type
 
@@ -145,23 +142,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="changepasswordwithpin"></a>
-# **ChangePasswordWithPin**
-> void ChangePasswordWithPin (SetPasswordWithPinModel changePasswordModel)
+<a name="createaccount"></a>
+# **CreateAccount**
+> void CreateAccount (CreateAccountModel createAccountModel)
+
 
-Change password
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class ChangePasswordWithPinExample
+    public class CreateAccountExample
     {
         public void main()
         {
@@ -169,16 +166,15 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var changePasswordModel = new SetPasswordWithPinModel(); // SetPasswordWithPinModel | Change password model
+            var createAccountModel = new CreateAccountModel(); // CreateAccountModel | 
 
             try
             {
-                // Change password
-                apiInstance.ChangePasswordWithPin(changePasswordModel);
+                apiInstance.CreateAccount(createAccountModel);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling AccountsApi.ChangePasswordWithPin: " + e.Message );
+                Debug.Print("Exception when calling AccountsApi.CreateAccount: " + e.Message );
             }
         }
     }
@@ -189,7 +185,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **changePasswordModel** | [**SetPasswordWithPinModel**](SetPasswordWithPinModel.md)| Change password model | 
+ **createAccountModel** | [**CreateAccountModel**](CreateAccountModel.md)|  | 
 
 ### Return type
 
@@ -206,23 +202,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="createaccount"></a>
-# **CreateAccount**
-> void CreateAccount (CreateAccountModel createAccountModel)
+<a name="createbasicaccount"></a>
+# **CreateBasicAccount**
+> string CreateBasicAccount (CreateBasicAccountModel basicAccountModel)
+
 
-Create account with email address and store name
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class CreateAccountExample
+    public class CreateBasicAccountExample
     {
         public void main()
         {
@@ -230,16 +226,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var createAccountModel = new CreateAccountModel(); // CreateAccountModel | Create account model
+            var basicAccountModel = new CreateBasicAccountModel(); // CreateBasicAccountModel | 
 
             try
             {
-                // Create account with email address and store name
-                apiInstance.CreateAccount(createAccountModel);
+                string result = apiInstance.CreateBasicAccount(basicAccountModel);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling AccountsApi.CreateAccount: " + e.Message );
+                Debug.Print("Exception when calling AccountsApi.CreateBasicAccount: " + e.Message );
             }
         }
     }
@@ -250,11 +246,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **createAccountModel** | [**CreateAccountModel**](CreateAccountModel.md)| Create account model | 
+ **basicAccountModel** | [**CreateBasicAccountModel**](CreateBasicAccountModel.md)|  | 
 
 ### Return type
 
-void (empty response body)
+**string**
 
 ### Authorization
 
@@ -271,15 +267,15 @@ void (empty response body)
 # **GetAccountDetails**
 > RestApiResultAccountDetail GetAccountDetails ()
 
-Gets the current account detail
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -294,7 +290,6 @@ namespace Example
 
             try
             {
-                // Gets the current account detail
                 RestApiResultAccountDetail result = apiInstance.GetAccountDetails();
                 Debug.WriteLine(result);
             }
@@ -329,15 +324,15 @@ This endpoint does not need any parameter.
 # **GetLocalisedTimeZones**
 > RestApiArrayResultLocalisedTimeZone GetLocalisedTimeZones ()
 
-[PRIVATE API] Get timezones localised to users language
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -352,7 +347,6 @@ namespace Example
 
             try
             {
-                // [PRIVATE API] Get timezones localised to users language
                 RestApiArrayResultLocalisedTimeZone result = apiInstance.GetLocalisedTimeZones();
                 Debug.WriteLine(result);
             }
@@ -387,15 +381,15 @@ This endpoint does not need any parameter.
 # **Login**
 > void Login (LoginModel loginModel)
 
-Login with username and password
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -407,11 +401,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var loginModel = new LoginModel(); // LoginModel | Login model
+            var loginModel = new LoginModel(); // LoginModel | 
 
             try
             {
-                // Login with username and password
                 apiInstance.Login(loginModel);
             }
             catch (Exception e)
@@ -427,7 +420,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **loginModel** | [**LoginModel**](LoginModel.md)| Login model | 
+ **loginModel** | [**LoginModel**](LoginModel.md)|  | 
 
 ### Return type
 
@@ -444,23 +437,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="loginwithpin"></a>
-# **LoginWithPin**
-> void LoginWithPin (LoginWithPinModel loginModel)
+<a name="loginsso"></a>
+# **LoginSso**
+> void LoginSso ()
+
 
-Login with username and password
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class LoginWithPinExample
+    public class LoginSsoExample
     {
         public void main()
         {
@@ -468,16 +461,14 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var loginModel = new LoginWithPinModel(); // LoginWithPinModel | Login model
 
             try
             {
-                // Login with username and password
-                apiInstance.LoginWithPin(loginModel);
+                apiInstance.LoginSso();
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling AccountsApi.LoginWithPin: " + e.Message );
+                Debug.Print("Exception when calling AccountsApi.LoginSso: " + e.Message );
             }
         }
     }
@@ -485,10 +476,7 @@ namespace Example
 ```
 
 ### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **loginModel** | [**LoginWithPinModel**](LoginWithPinModel.md)| Login model | 
+This endpoint does not need any parameter.
 
 ### Return type
 
@@ -500,7 +488,7 @@ void (empty response body)
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Content-Type**: Not defined
  - **Accept**: application/json, text/json, application/xml, text/xml
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -509,15 +497,15 @@ void (empty response body)
 # **Logout**
 > void Logout ()
 
-Log out. It removes Flipdish authorization Cookie.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -532,7 +520,6 @@ namespace Example
 
             try
             {
-                // Log out. It removes Flipdish authorization Cookie.
                 apiInstance.Logout();
             }
             catch (Exception e)
@@ -566,15 +553,15 @@ void (empty response body)
 # **PasswordResetWithToken**
 > void PasswordResetWithToken (PasswordResetModel passwordResetModel)
 
-Reset password with token.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -586,11 +573,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var passwordResetModel = new PasswordResetModel(); // PasswordResetModel | Password reset model
+            var passwordResetModel = new PasswordResetModel(); // PasswordResetModel | 
 
             try
             {
-                // Reset password with token.
                 apiInstance.PasswordResetWithToken(passwordResetModel);
             }
             catch (Exception e)
@@ -606,7 +592,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **passwordResetModel** | [**PasswordResetModel**](PasswordResetModel.md)| Password reset model | 
+ **passwordResetModel** | [**PasswordResetModel**](PasswordResetModel.md)|  | 
 
 ### Return type
 
@@ -623,23 +609,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="requestloginpin"></a>
-# **RequestLoginPin**
-> RequestLoginPinResposne RequestLoginPin (RequestLoginPinModel requestLoginPinRequest)
+<a name="recaptchavalidate"></a>
+# **RecaptchaValidate**
+> void RecaptchaValidate (string token)
+
 
-Request login PIN. The server sends the PIN to the email address.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class RequestLoginPinExample
+    public class RecaptchaValidateExample
     {
         public void main()
         {
@@ -647,17 +633,15 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var requestLoginPinRequest = new RequestLoginPinModel(); // RequestLoginPinModel | Request login PIN request
+            var token = token_example;  // string | 
 
             try
             {
-                // Request login PIN. The server sends the PIN to the email address.
-                RequestLoginPinResposne result = apiInstance.RequestLoginPin(requestLoginPinRequest);
-                Debug.WriteLine(result);
+                apiInstance.RecaptchaValidate(token);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling AccountsApi.RequestLoginPin: " + e.Message );
+                Debug.Print("Exception when calling AccountsApi.RecaptchaValidate: " + e.Message );
             }
         }
     }
@@ -668,11 +652,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **requestLoginPinRequest** | [**RequestLoginPinModel**](RequestLoginPinModel.md)| Request login PIN request | 
+ **token** | **string**|  | 
 
 ### Return type
 
-[**RequestLoginPinResposne**](RequestLoginPinResposne.md)
+void (empty response body)
 
 ### Authorization
 
@@ -680,7 +664,7 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Content-Type**: Not defined
  - **Accept**: application/json, text/json, application/xml, text/xml
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
@@ -689,15 +673,15 @@ Name | Type | Description  | Notes
 # **RequestPasswordReset**
 > void RequestPasswordReset (RequestPasswordResetModel requestPasswordResetModel)
 
-Request password reset. Flipdish system will send a token via email.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -709,11 +693,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var requestPasswordResetModel = new RequestPasswordResetModel(); // RequestPasswordResetModel | Request password reset model
+            var requestPasswordResetModel = new RequestPasswordResetModel(); // RequestPasswordResetModel | 
 
             try
             {
-                // Request password reset. Flipdish system will send a token via email.
                 apiInstance.RequestPasswordReset(requestPasswordResetModel);
             }
             catch (Exception e)
@@ -729,7 +712,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **requestPasswordResetModel** | [**RequestPasswordResetModel**](RequestPasswordResetModel.md)| Request password reset model | 
+ **requestPasswordResetModel** | [**RequestPasswordResetModel**](RequestPasswordResetModel.md)|  | 
 
 ### Return type
 
@@ -746,81 +729,19 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="sendpinforpasswordreset"></a>
-# **SendPinForPasswordReset**
-> RequestPasswordResetPinResponse SendPinForPasswordReset (RequestPasswordResetModel requestPasswordResetRequest)
-
-Request Password Reset PIN. The server sends the PIN to the email address.
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class SendPinForPasswordResetExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new AccountsApi();
-            var requestPasswordResetRequest = new RequestPasswordResetModel(); // RequestPasswordResetModel | 
-
-            try
-            {
-                // Request Password Reset PIN. The server sends the PIN to the email address.
-                RequestPasswordResetPinResponse result = apiInstance.SendPinForPasswordReset(requestPasswordResetRequest);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling AccountsApi.SendPinForPasswordReset: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **requestPasswordResetRequest** | [**RequestPasswordResetModel**](RequestPasswordResetModel.md)|  | 
-
-### Return type
-
-[**RequestPasswordResetPinResponse**](RequestPasswordResetPinResponse.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
 <a name="skipsignupstep"></a>
 # **SkipSignupStep**
 > void SkipSignupStep (string signupStepAction)
 
-Skip a signup question
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -832,11 +753,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var signupStepAction = signupStepAction_example;  // string | Signup step action
+            var signupStepAction = signupStepAction_example;  // string | 
 
             try
             {
-                // Skip a signup question
                 apiInstance.SkipSignupStep(signupStepAction);
             }
             catch (Exception e)
@@ -852,7 +772,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **signupStepAction** | **string**| Signup step action | 
+ **signupStepAction** | **string**|  | 
 
 ### Return type
 
@@ -873,15 +793,15 @@ void (empty response body)
 # **UpdateAccount**
 > void UpdateAccount (AccountDetailBase updateAccountModel)
 
-Update account with name and language
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -893,11 +813,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AccountsApi();
-            var updateAccountModel = new AccountDetailBase(); // AccountDetailBase | Update account model
+            var updateAccountModel = new AccountDetailBase(); // AccountDetailBase | 
 
             try
             {
-                // Update account with name and language
                 apiInstance.UpdateAccount(updateAccountModel);
             }
             catch (Exception e)
@@ -913,7 +832,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **updateAccountModel** | [**AccountDetailBase**](AccountDetailBase.md)| Update account model | 
+ **updateAccountModel** | [**AccountDetailBase**](AccountDetailBase.md)|  | 
 
 ### Return type
 
diff --git a/docs/AddItemDetails.md b/docs/AddItemDetails.md
deleted file mode 100644
index 80b02a90..00000000
--- a/docs/AddItemDetails.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.AddItemDetails
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**PromotionalItemId** | **int?** | Promotional Item Id | [optional] 
-**PromotionalItemName** | **string** | Promotional Item Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AddressApi.md b/docs/AddressApi.md
index d6a2b32d..58b1d878 100644
--- a/docs/AddressApi.md
+++ b/docs/AddressApi.md
@@ -1,28 +1,90 @@
-# IO.Swagger.Api.AddressApi
+# Flipdish.Api.AddressApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**FormByApp**](AddressApi.md#formbyapp) | **GET** /api/v1.0/app/{appId}/address/form | Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language.
-[**FormByCountry**](AddressApi.md#formbycountry) | **GET** /api/v1.0/address/country/{countryCode}/form | Provides a dyamic form definition for the given country code, with labels localized using the provided language.
-[**FormatGoogleAddress**](AddressApi.md#formatgoogleaddress) | **POST** /api/v1.0/address/google | Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form.
-[**GetCountries**](AddressApi.md#getcountries) | **GET** /api/v1.0/address/countries | Retuns a list of localised countries
+[**AddressTemplates**](AddressApi.md#addresstemplates) | **POST** /api/v1.0/address/templates | 
+[**FormByApp**](AddressApi.md#formbyapp) | **GET** /api/v1.0/app/{appId}/address/form | 
+[**FormByCountry**](AddressApi.md#formbycountry) | **GET** /api/v1.0/address/country/{countryCode}/form | 
+[**FormatGoogleAddress**](AddressApi.md#formatgoogleaddress) | **POST** /api/v1.0/address/google | 
+[**GetCountries**](AddressApi.md#getcountries) | **GET** /api/v1.0/address/countries | 
 
 
+<a name="addresstemplates"></a>
+# **AddressTemplates**
+> RestApiStringResult AddressTemplates (StoreAddressForm address)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddressTemplatesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AddressApi();
+            var address = new StoreAddressForm(); // StoreAddressForm | 
+
+            try
+            {
+                RestApiStringResult result = apiInstance.AddressTemplates(address);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AddressApi.AddressTemplates: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **address** | [**StoreAddressForm**](StoreAddressForm.md)|  | 
+
+### Return type
+
+[**RestApiStringResult**](RestApiStringResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="formbyapp"></a>
 # **FormByApp**
 > RestApiResultAddressFormResponse FormByApp (string appId, string language = null)
 
-Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -34,12 +96,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AddressApi();
-            var appId = appId_example;  // string | Application (WhiteLabel) Id (WhiteLabelId or AppNameId).
-            var language = language_example;  // string | (Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional) 
+            var appId = appId_example;  // string | 
+            var language = language_example;  // string |  (optional) 
 
             try
             {
-                // Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language.
                 RestApiResultAddressFormResponse result = apiInstance.FormByApp(appId, language);
                 Debug.WriteLine(result);
             }
@@ -56,8 +117,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application (WhiteLabel) Id (WhiteLabelId or AppNameId). | 
- **language** | **string**| (Optional) ISO culture info code, e.g.: en-IE, the default is en-US. | [optional] 
+ **appId** | **string**|  | 
+ **language** | **string**|  | [optional] 
 
 ### Return type
 
@@ -78,15 +139,15 @@ Name | Type | Description  | Notes
 # **FormByCountry**
 > RestApiResultAddressFormResponse FormByCountry (string countryCode, string language = null)
 
-Provides a dyamic form definition for the given country code, with labels localized using the provided language.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -98,12 +159,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AddressApi();
-            var countryCode = countryCode_example;  // string | The 2 letter ISO country code, e.g.: IE.
-            var language = language_example;  // string | (Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional) 
+            var countryCode = countryCode_example;  // string | 
+            var language = language_example;  // string |  (optional) 
 
             try
             {
-                // Provides a dyamic form definition for the given country code, with labels localized using the provided language.
                 RestApiResultAddressFormResponse result = apiInstance.FormByCountry(countryCode, language);
                 Debug.WriteLine(result);
             }
@@ -120,8 +180,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **countryCode** | **string**| The 2 letter ISO country code, e.g.: IE. | 
- **language** | **string**| (Optional) ISO culture info code, e.g.: en-IE, the default is en-US. | [optional] 
+ **countryCode** | **string**|  | 
+ **language** | **string**|  | [optional] 
 
 ### Return type
 
@@ -142,15 +202,15 @@ Name | Type | Description  | Notes
 # **FormatGoogleAddress**
 > RestApiResultAddressFormResponse FormatGoogleAddress (GoogleAddress googleAddress, string language = null)
 
-Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -162,12 +222,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AddressApi();
-            var googleAddress = new GoogleAddress(); // GoogleAddress | A Google address object, as it is retuned from the maps API.
-            var language = language_example;  // string | (Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional) 
+            var googleAddress = new GoogleAddress(); // GoogleAddress | 
+            var language = language_example;  // string |  (optional) 
 
             try
             {
-                // Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form.
                 RestApiResultAddressFormResponse result = apiInstance.FormatGoogleAddress(googleAddress, language);
                 Debug.WriteLine(result);
             }
@@ -184,8 +243,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **googleAddress** | [**GoogleAddress**](GoogleAddress.md)| A Google address object, as it is retuned from the maps API. | 
- **language** | **string**| (Optional) ISO culture info code, e.g.: en-IE, the default is en-US. | [optional] 
+ **googleAddress** | [**GoogleAddress**](GoogleAddress.md)|  | 
+ **language** | **string**|  | [optional] 
 
 ### Return type
 
@@ -206,15 +265,15 @@ Name | Type | Description  | Notes
 # **GetCountries**
 > RestApiResultCountryFormResponse GetCountries (string language = null)
 
-Retuns a list of localised countries
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -230,7 +289,6 @@ namespace Example
 
             try
             {
-                // Retuns a list of localised countries
                 RestApiResultCountryFormResponse result = apiInstance.GetCountries(language);
                 Debug.WriteLine(result);
             }
diff --git a/docs/AddressFormDisplayFormat.md b/docs/AddressFormDisplayFormat.md
index be4a4e24..a617d89a 100644
--- a/docs/AddressFormDisplayFormat.md
+++ b/docs/AddressFormDisplayFormat.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AddressFormDisplayFormat
+# Flipdish.Model.AddressFormDisplayFormat
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AddressFormResponse.md b/docs/AddressFormResponse.md
index be0de396..88d283d7 100644
--- a/docs/AddressFormResponse.md
+++ b/docs/AddressFormResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AddressFormResponse
+# Flipdish.Model.AddressFormResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AllMetadataResult.md b/docs/AllMetadataResult.md
index 8503f0a1..22b58949 100644
--- a/docs/AllMetadataResult.md
+++ b/docs/AllMetadataResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AllMetadataResult
+# Flipdish.Model.AllMetadataResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Allergen.md b/docs/Allergen.md
new file mode 100644
index 00000000..81a32c73
--- /dev/null
+++ b/docs/Allergen.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.Allergen
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AllergenId** | **string** | A unique identifier for the allergen | [optional] 
+**LocalizedName** | **string** | Localized name of the allergen | [optional] 
+**IconUrl** | **string** | Url to the icon for the allergen | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AnalyticsClientEvent.md b/docs/AnalyticsClientEvent.md
index 239d1b67..5de05884 100644
--- a/docs/AnalyticsClientEvent.md
+++ b/docs/AnalyticsClientEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AnalyticsClientEvent
+# Flipdish.Model.AnalyticsClientEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -14,7 +14,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ApmApi.md b/docs/ApmApi.md
index 088d6663..54f281b6 100644
--- a/docs/ApmApi.md
+++ b/docs/ApmApi.md
@@ -1,30 +1,30 @@
-# IO.Swagger.Api.ApmApi
+# Flipdish.Api.ApmApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetApmStatus**](ApmApi.md#getapmstatus) | **GET** /api/v1.0/{appId}/apm/status | [PRIVATE API] Returns true if APM is enabled on at least one store in an application
-[**GetBasicStatistics**](ApmApi.md#getbasicstatistics) | **GET** /api/v1.0/{appId}/apm/statistics | [PRIVATE API] Get Basic Statistics
-[**GetCalendarWeekStatistics**](ApmApi.md#getcalendarweekstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/calendar | [PRIVATE API] Get Calendar statistics
-[**GetCallsStatistics**](ApmApi.md#getcallsstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/calls/{aggregateDataBy} | [PRIVATE API] Get Calls Statistics
-[**GetOrderStatistics**](ApmApi.md#getorderstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/orders/{aggregateDataBy} | [PRIVATE API] Get Order Statistics (Value of Orders)
-[**GetPaginatedCallList**](ApmApi.md#getpaginatedcalllist) | **GET** /api/v1.0/{appId}/apm/calls | [PRIVATE API] Get paginated APM call list
+[**GetApmStatus**](ApmApi.md#getapmstatus) | **GET** /api/v1.0/{appId}/apm/status | 
+[**GetBasicStatistics**](ApmApi.md#getbasicstatistics) | **GET** /api/v1.0/{appId}/apm/statistics | 
+[**GetCalendarWeekStatistics**](ApmApi.md#getcalendarweekstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/calendar | 
+[**GetCallsStatistics**](ApmApi.md#getcallsstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/calls/{aggregateDataBy} | 
+[**GetOrderStatistics**](ApmApi.md#getorderstatistics) | **GET** /api/v1.0/{appId}/apm/statistics/orders/{aggregateDataBy} | 
+[**GetPaginatedCallList**](ApmApi.md#getpaginatedcalllist) | **GET** /api/v1.0/{appId}/apm/calls | 
 
 
 <a name="getapmstatus"></a>
 # **GetApmStatus**
 > RestApiResultApmStatus GetApmStatus (string appId)
 
-[PRIVATE API] Returns true if APM is enabled on at least one store in an application
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -36,11 +36,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ApmApi();
-            var appId = appId_example;  // string | App Id
+            var appId = appId_example;  // string | 
 
             try
             {
-                // [PRIVATE API] Returns true if APM is enabled on at least one store in an application
                 RestApiResultApmStatus result = apiInstance.GetApmStatus(appId);
                 Debug.WriteLine(result);
             }
@@ -57,7 +56,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -78,15 +77,15 @@ Name | Type | Description  | Notes
 # **GetBasicStatistics**
 > RestApiResultApmStatistics GetBasicStatistics (string appId, List<int?> storeId = null)
 
-[PRIVATE API] Get Basic Statistics
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -98,12 +97,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ApmApi();
-            var appId = appId_example;  // string | App Id
-            var storeId = new List<int?>(); // List<int?> | List of stores to search by (optional) 
+            var appId = appId_example;  // string | 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
 
             try
             {
-                // [PRIVATE API] Get Basic Statistics
                 RestApiResultApmStatistics result = apiInstance.GetBasicStatistics(appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -120,8 +118,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **storeId** | [**List&lt;int?&gt;**](int?.md)| List of stores to search by | [optional] 
+ **appId** | **string**|  | 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
 
 ### Return type
 
@@ -142,15 +140,15 @@ Name | Type | Description  | Notes
 # **GetCalendarWeekStatistics**
 > RestApiArrayResultApmHourlyDataPoint GetCalendarWeekStatistics (string appId, List<int?> storeId = null)
 
-[PRIVATE API] Get Calendar statistics
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -162,12 +160,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ApmApi();
-            var appId = appId_example;  // string | App Id
-            var storeId = new List<int?>(); // List<int?> | List of stores to search by (optional) 
+            var appId = appId_example;  // string | 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
 
             try
             {
-                // [PRIVATE API] Get Calendar statistics
                 RestApiArrayResultApmHourlyDataPoint result = apiInstance.GetCalendarWeekStatistics(appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -184,8 +181,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **storeId** | [**List&lt;int?&gt;**](int?.md)| List of stores to search by | [optional] 
+ **appId** | **string**|  | 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
 
 ### Return type
 
@@ -206,15 +203,15 @@ Name | Type | Description  | Notes
 # **GetCallsStatistics**
 > RestApiArrayResultApmDataPoint GetCallsStatistics (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
 
-[PRIVATE API] Get Calls Statistics
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -226,14 +223,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ApmApi();
-            var appId = appId_example;  // string | App Id
-            var aggregateDataBy = aggregateDataBy_example;  // string | Aggregate data by day \\ week
-            var dataPointLimit = 56;  // int? | Amount of data points per request (optional) 
-            var storeId = new List<int?>(); // List<int?> | List of stores to search by (optional) 
+            var appId = appId_example;  // string | 
+            var aggregateDataBy = aggregateDataBy_example;  // string | 
+            var dataPointLimit = 56;  // int? |  (optional) 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
 
             try
             {
-                // [PRIVATE API] Get Calls Statistics
                 RestApiArrayResultApmDataPoint result = apiInstance.GetCallsStatistics(appId, aggregateDataBy, dataPointLimit, storeId);
                 Debug.WriteLine(result);
             }
@@ -250,10 +246,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **aggregateDataBy** | **string**| Aggregate data by day \\ week | 
- **dataPointLimit** | **int?**| Amount of data points per request | [optional] 
- **storeId** | [**List&lt;int?&gt;**](int?.md)| List of stores to search by | [optional] 
+ **appId** | **string**|  | 
+ **aggregateDataBy** | **string**|  | 
+ **dataPointLimit** | **int?**|  | [optional] 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
 
 ### Return type
 
@@ -274,15 +270,15 @@ Name | Type | Description  | Notes
 # **GetOrderStatistics**
 > RestApiArrayResultApmCurrencyDataPoint GetOrderStatistics (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
 
-[PRIVATE API] Get Order Statistics (Value of Orders)
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -294,14 +290,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ApmApi();
-            var appId = appId_example;  // string | App Id
-            var aggregateDataBy = aggregateDataBy_example;  // string | Aggregate data by day \\ week
-            var dataPointLimit = 56;  // int? | Amount of data points per request (optional) 
-            var storeId = new List<int?>(); // List<int?> | List of stores to search by (optional) 
+            var appId = appId_example;  // string | 
+            var aggregateDataBy = aggregateDataBy_example;  // string | 
+            var dataPointLimit = 56;  // int? |  (optional) 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
 
             try
             {
-                // [PRIVATE API] Get Order Statistics (Value of Orders)
                 RestApiArrayResultApmCurrencyDataPoint result = apiInstance.GetOrderStatistics(appId, aggregateDataBy, dataPointLimit, storeId);
                 Debug.WriteLine(result);
             }
@@ -318,10 +313,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **aggregateDataBy** | **string**| Aggregate data by day \\ week | 
- **dataPointLimit** | **int?**| Amount of data points per request | [optional] 
- **storeId** | [**List&lt;int?&gt;**](int?.md)| List of stores to search by | [optional] 
+ **appId** | **string**|  | 
+ **aggregateDataBy** | **string**|  | 
+ **dataPointLimit** | **int?**|  | [optional] 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
 
 ### Return type
 
@@ -342,15 +337,15 @@ Name | Type | Description  | Notes
 # **GetPaginatedCallList**
 > RestApiPaginationResultPhoneCall GetPaginatedCallList (string appId, int? page = null, int? limit = null, List<int?> storeId = null)
 
-[PRIVATE API] Get paginated APM call list
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -362,14 +357,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ApmApi();
-            var appId = appId_example;  // string | App Id
-            var page = 56;  // int? | Requested page index (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
-            var storeId = new List<int?>(); // List<int?> | List of stores to search by (optional) 
+            var appId = appId_example;  // string | 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
 
             try
             {
-                // [PRIVATE API] Get paginated APM call list
                 RestApiPaginationResultPhoneCall result = apiInstance.GetPaginatedCallList(appId, page, limit, storeId);
                 Debug.WriteLine(result);
             }
@@ -386,10 +380,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **page** | **int?**| Requested page index | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
- **storeId** | [**List&lt;int?&gt;**](int?.md)| List of stores to search by | [optional] 
+ **appId** | **string**|  | 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
 
 ### Return type
 
diff --git a/docs/ApmCurrencyDataPoint.md b/docs/ApmCurrencyDataPoint.md
index d1148eee..56aa41b0 100644
--- a/docs/ApmCurrencyDataPoint.md
+++ b/docs/ApmCurrencyDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ApmCurrencyDataPoint
+# Flipdish.Model.ApmCurrencyDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ApmDataPoint.md b/docs/ApmDataPoint.md
index 8919c233..454a78a2 100644
--- a/docs/ApmDataPoint.md
+++ b/docs/ApmDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ApmDataPoint
+# Flipdish.Model.ApmDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ApmHourlyDataPoint.md b/docs/ApmHourlyDataPoint.md
index 736ddffd..6d796265 100644
--- a/docs/ApmHourlyDataPoint.md
+++ b/docs/ApmHourlyDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ApmHourlyDataPoint
+# Flipdish.Model.ApmHourlyDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ApmStatistics.md b/docs/ApmStatistics.md
index 88197d5a..2078d764 100644
--- a/docs/ApmStatistics.md
+++ b/docs/ApmStatistics.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ApmStatistics
+# Flipdish.Model.ApmStatistics
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ApmStatus.md b/docs/ApmStatus.md
index b79442fa..162df574 100644
--- a/docs/ApmStatus.md
+++ b/docs/ApmStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ApmStatus
+# Flipdish.Model.ApmStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/App.md b/docs/App.md
index 661df8fa..84403d2f 100644
--- a/docs/App.md
+++ b/docs/App.md
@@ -1,12 +1,14 @@
-# IO.Swagger.Model.App
+# Flipdish.Model.App
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **AppId** | **string** | App Identifier | [optional] 
 **HasIosApp** | **bool?** | Has iOS app in Apple App Store. This is readonly. | [optional] 
+**IosAppStoreUrl** | **string** | IOS App Store URL | [optional] 
 **HasAndroidApp** | **bool?** | Has Android app in Google Play Store. This is readonly. | [optional] 
-**CountryId** | **string** | Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks | [optional] 
+**AndroidPlayStoreUrl** | **string** | Android Play Store URL | [optional] 
+**DisplayDeliveryRestaurantScreen** | **bool?** | Display delivery restaurant screen | [optional] 
 **LogoImageUrl** | **string** | Application Logo. | [optional] 
 **Languages** | [**List&lt;Language&gt;**](Language.md) | Languages that have been selected to be available to customers. | [optional] 
 **AvailableAppLanguages** | [**List&lt;Language&gt;**](Language.md) | Lists all languages that are supported by Flipdish. | [optional] 
@@ -16,12 +18,19 @@ Name | Type | Description | Notes
 **MapCenter** | [**Coordinates**](Coordinates.md) | Center of the map coordinates. This is used to center the map when the iOS and Android app first open.  This value is automatically set based on the locations of the Stores in the App. | [optional] 
 **MapNorthEast** | [**Coordinates**](Coordinates.md) | North East(Top Right) Corner of the map coordinates. This is used to frame the map when the iOS and Android app first open.  This value is automatically set based on the locations of the Stores in the App. | [optional] 
 **MapSouthWest** | [**Coordinates**](Coordinates.md) | South West (Bottom Left) Corner of the map coordinates. This is used to frame the map when the iOS and Android app first open.  This value is automatically set based on the locations of the Stores in the App. | [optional] 
+**GoogleMapsApiKeyWeb** | **string** | Key to be passed with Google Maps requests | [optional] 
+**OrgId** | **string** | Org Id | [optional] 
+**SmsRestaurantName** | **string** | SMS Restaurant Name | [optional] 
+**WebToAppRedirect** | **string** | Web to App Redirect settings | [optional] 
 **Name** | **string** | App name.   This is used in various places on the Apple App Store, Google Play Store, mobile apps and websites. | [optional] 
 **HostName** | **string** | HostName on which the web-ordering system is allowed to be hosted or that a Flipdish website is hosted on. | [optional] 
 **MainColor** | **string** | Main color of the web / Android / iOS applications | [optional] 
+**KioskPrimaryColour** | **string** | Primary colour used on the Kiosk | [optional] 
 **ApplicationCategory** | **string** | Application Category | [optional] 
-**IsPanaceaEnabled** | **bool?** | Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The aternative to using Panacea websites is to use a custom domain. | [optional] 
+**IsPanaceaEnabled** | **bool?** | Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The alternative to using Panacea websites is to use a custom domain. | [optional] 
+**PanaceaVanityUrl** | **string** | In case of IsPanaceaEnabled is true, the app can be accessed via https://my.flipdish.com/{PanaceaVanityUrl} | [optional] 
 **CookieConsentPromptEnabled** | **bool?** | Cookie Consent Prompt Enabled | [optional] 
+**CountryId** | **string** | Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppChannelAssignment.md b/docs/AppChannelAssignment.md
index e7bff36a..32f7c556 100644
--- a/docs/AppChannelAssignment.md
+++ b/docs/AppChannelAssignment.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AppChannelAssignment
+# Flipdish.Model.AppChannelAssignment
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AppCompliance.md b/docs/AppCompliance.md
index 46b21704..84b60949 100644
--- a/docs/AppCompliance.md
+++ b/docs/AppCompliance.md
@@ -1,10 +1,11 @@
-# IO.Swagger.Model.AppCompliance
+# Flipdish.Model.AppCompliance
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **AppId** | **string** | App ID | [optional] 
 **ComplianceType** | **string** | Type of compliance.  This controls if the Flipdish websites and apps display cookie consent banners and adjust cookies to be inline with various regulations.   You should set this correctly based on your region. | [optional] 
+**AllowDisablingOfGdpr** | **bool?** | For EU countries, we should not allow to change the option to “Default banner”, but all other countries should be able to do so. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppConfigSalesChannel.md b/docs/AppConfigSalesChannel.md
index d6d63e3a..74c10200 100644
--- a/docs/AppConfigSalesChannel.md
+++ b/docs/AppConfigSalesChannel.md
@@ -1,11 +1,11 @@
-# IO.Swagger.Model.AppConfigSalesChannel
+# Flipdish.Model.AppConfigSalesChannel
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EmailRequestMode** | **string** | Display a popup to users requesting their email address | [optional] 
 **WebToAppRedirect** | **string** | Sends users to their native apps or request them to install the pwa | [optional] 
-**AddressEntryType** | **string** | Address entry type | [optional] 
+**AddressEntryType** | **string** | Address entry type - TextEntryManualDisallowed is the only supported configuration | [optional] 
 **DisplayDeliveryRestaurantListScreen** | **bool?** | Display Pickup Restaurant List Screen | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/AppConfigUpdateModel.md b/docs/AppConfigUpdateModel.md
index e89d289e..2d7fa61a 100644
--- a/docs/AppConfigUpdateModel.md
+++ b/docs/AppConfigUpdateModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AppConfigUpdateModel
+# Flipdish.Model.AppConfigUpdateModel
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,9 +6,13 @@ Name | Type | Description | Notes
 **Name** | **string** | App name.   This is used in various places on the Apple App Store, Google Play Store, mobile apps and websites. | [optional] 
 **HostName** | **string** | HostName on which the web-ordering system is allowed to be hosted or that a Flipdish website is hosted on. | [optional] 
 **MainColor** | **string** | Main color of the web / Android / iOS applications | [optional] 
+**KioskPrimaryColour** | **string** | Primary colour used on the Kiosk | [optional] 
 **ApplicationCategory** | **string** | Application Category | [optional] 
-**IsPanaceaEnabled** | **bool?** | Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The aternative to using Panacea websites is to use a custom domain. | [optional] 
+**IsPanaceaEnabled** | **bool?** | Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The alternative to using Panacea websites is to use a custom domain. | [optional] 
+**PanaceaVanityUrl** | **string** | In case of IsPanaceaEnabled is true, the app can be accessed via https://my.flipdish.com/{PanaceaVanityUrl} | [optional] 
 **CookieConsentPromptEnabled** | **bool?** | Cookie Consent Prompt Enabled | [optional] 
+**LogoImageUrl** | **string** | Logo image URL | [optional] 
+**CountryId** | **string** | Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppConfiguration.md b/docs/AppConfiguration.md
deleted file mode 100644
index 0e883756..00000000
--- a/docs/AppConfiguration.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.AppConfiguration
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **string** |  | [optional] 
-**PhysicalRestaurants** | **List&lt;int?&gt;** |  | [optional] 
-**IsEnabled** | **bool?** |  | [optional] 
-**Settings** | [**List&lt;AppConfigurationSetting&gt;**](AppConfigurationSetting.md) |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppConfigurationBase.md b/docs/AppConfigurationBase.md
deleted file mode 100644
index 810d8071..00000000
--- a/docs/AppConfigurationBase.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.AppConfigurationBase
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **string** | Application Configuration Public Id | 
-**IsEnabled** | **bool?** | Is Enabled | 
-**PhysicalRestaurants** | **List&lt;int?&gt;** | Physical Restaurant Id&#39;s | [optional] 
-**Settings** | [**List&lt;Setting&gt;**](Setting.md) | Settings | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppConfigurationDetail.md b/docs/AppConfigurationDetail.md
deleted file mode 100644
index e5d10cf0..00000000
--- a/docs/AppConfigurationDetail.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Flipdish.Model.AppConfigurationDetail
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **string** | Application Configuration Public Id | 
-**AppId** | **string** | Whitelabel App Id | 
-**AppStoreAppId** | **string** | App Store App Id | 
-**IsEnabled** | **bool?** | Is Enabled | 
-**PhysicalRestaurants** | **List&lt;int?&gt;** | Physical Restaurant Id&#39;s | [optional] 
-**Settings** | [**List&lt;Setting&gt;**](Setting.md) | Settings | [optional] 
-**ConfigurationType** | **string** | Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt; | 
-**StoreSelectorType** | **string** | Store Selector Type | 
-**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) | Field Groups | [optional] 
-**SetupInstructions** | **string** | Setup Instructions | [optional] 
-**ExternalSetupLink** | **string** | External Setup Link | [optional] 
-**OAuthAppId** | **string** | OAuth App Id | 
-**TeammateAppAccessLevel** | **string** | Teammate App Access Level | [optional] 
-**PermissionsType** | **string** | Permissions Type | 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**Logo** | **string** | Logo | [optional] 
-**VerificationStatus** | **string** | Application verification status | 
-**Tags** | **List&lt;string&gt;** | Tags | 
-**Regions** | **List&lt;string&gt;** | Regions | 
-**DeveloperName** | **string** | Developer Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppConfigurationHeader.md b/docs/AppConfigurationHeader.md
deleted file mode 100644
index fcfc6f9f..00000000
--- a/docs/AppConfigurationHeader.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Flipdish.Model.AppConfigurationHeader
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**AppStoreAppId** | **string** | AppStore App Id | 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**Logo** | **string** | Logo | [optional] 
-**DeveloperName** | **string** | Developer Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppConfigurationSetting.md b/docs/AppConfigurationSetting.md
deleted file mode 100644
index bf706bda..00000000
--- a/docs/AppConfigurationSetting.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Flipdish.Model.AppConfigurationSetting
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Key** | **string** |  | [optional] 
-**Value** | **string** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppConfigurationSummary.md b/docs/AppConfigurationSummary.md
deleted file mode 100644
index fe6ffe78..00000000
--- a/docs/AppConfigurationSummary.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Flipdish.Model.AppConfigurationSummary
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **string** | Application Configuration Public Id | 
-**AppId** | **string** | Whitelabel App Id | 
-**IsEnabled** | **bool?** | Is Enabled | 
-**PhysicalRestaurants** | [**List&lt;ConfiguredPhysicalRestaurant&gt;**](ConfiguredPhysicalRestaurant.md) | List of restaurants | 
-**ConfigurationType** | **string** | Configuration Type | [optional] 
-**StoreSelectorType** | **string** | Store Selector Type | [optional] 
-**AppStoreAppId** | **string** | AppStore App Id | 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**Logo** | **string** | Logo | [optional] 
-**DeveloperName** | **string** | Developer Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppCreatedEvent.md b/docs/AppCreatedEvent.md
index ddeb7490..d157b5ed 100644
--- a/docs/AppCreatedEvent.md
+++ b/docs/AppCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AppCreatedEvent
+# Flipdish.Model.AppCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -8,11 +8,15 @@ Name | Type | Description | Notes
 **AppName** | **string** | App Name | [optional] 
 **CountryId** | **string** | Country Id | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User information | [optional] 
+**AccountId** | **string** | Salesforce Account Id | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppDetail.md b/docs/AppDetail.md
deleted file mode 100644
index 12561695..00000000
--- a/docs/AppDetail.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Flipdish.Model.AppDetail
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **string** | Integration Public Id | 
-**ConfigurationType** | **string** | Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt; | 
-**StoreSelectorType** | **string** | Store Selector Type | 
-**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) | Field Groups | [optional] 
-**SetupInstructions** | **string** | Setup Instructions | [optional] 
-**ExternalSetupLink** | **string** | External Setup Link | [optional] 
-**OAuthAppId** | **string** | OAuth App Id | 
-**TeammateAppAccessLevel** | **string** | Teammate App Access Level | [optional] 
-**PermissionsType** | **string** | Permissions Type | 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**Logo** | **string** | Logo | [optional] 
-**IsEnabled** | **bool?** | Is application enabled | [optional] 
-**VerificationStatus** | **string** | Application verification status | 
-**Tags** | **List&lt;string&gt;** | Tags | 
-**Regions** | **List&lt;string&gt;** | Regions | 
-**DeveloperName** | **string** | Developer Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppDetailBase.md b/docs/AppDetailBase.md
deleted file mode 100644
index 2880c674..00000000
--- a/docs/AppDetailBase.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Flipdish.Model.AppDetailBase
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**ConfigurationType** | **string** | Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt; | 
-**StoreSelectorType** | **string** | Store Selector Type | 
-**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) | Field Groups | [optional] 
-**SetupInstructions** | **string** | Setup Instructions | [optional] 
-**ExternalSetupLink** | **string** | External Setup Link | [optional] 
-**OAuthAppId** | **string** | OAuth App Id | 
-**TeammateAppAccessLevel** | **string** | Teammate App Access Level | [optional] 
-**PermissionsType** | **string** | Permissions Type | 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**Logo** | **string** | Logo | [optional] 
-**IsEnabled** | **bool?** | Is application enabled | [optional] 
-**VerificationStatus** | **string** | Application verification status | 
-**Tags** | **List&lt;string&gt;** | Tags | 
-**Regions** | **List&lt;string&gt;** | Regions | 
-**DeveloperName** | **string** | Developer Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppGeneralConfigModel.md b/docs/AppGeneralConfigModel.md
new file mode 100644
index 00000000..6a522e71
--- /dev/null
+++ b/docs/AppGeneralConfigModel.md
@@ -0,0 +1,23 @@
+# Flipdish.Model.AppGeneralConfigModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelId** | **int?** | White label ID | [optional] 
+**DeepLinkUrlScheme** | **string** | Deep link URL scheme | [optional] 
+**SmsRestaurantName** | **string** | SMS restaurant name | [optional] 
+**NexmoSupportSmsNumber** | **string** | Nexmo support SMS number | [optional] 
+**TwilioSupportSmsNumber** | **string** | Twilio support SMS number | [optional] 
+**FallbackPhoneNumberPrefix** | **string** | Fallback phone number prefix | [optional] 
+**AutocompletePhoneNumberLength** | **int?** | Autocomplete phone number length | [optional] 
+**ContactFormType** | **string** | Contact form type  None &#x3D; 0,  Email &#x3D; 1,  Intercom &#x3D; 2,  WebView &#x3D; 3,  FlipdishMessages &#x3D; 4 | [optional] 
+**PrivateSupportEmailAddress** | **string** | Private support email address | [optional] 
+**ContactPhoneNumber** | **string** | Contact phone number | [optional] 
+**DeliveryEnabled** | **bool?** | Delivery enabled | [optional] 
+**PickupEnabled** | **bool?** | Pickup enabled | [optional] 
+**DineInEnabled** | **bool?** | Dine in enabled | [optional] 
+**DisplayDeliveryRestaurantListScreen** | **bool?** | Display delivery restaurant list screen | [optional] 
+**DisplayPickupRestaurantListScreen** | **bool?** | Display pickup restaurant list screen | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AppInstall.md b/docs/AppInstall.md
new file mode 100644
index 00000000..672416d2
--- /dev/null
+++ b/docs/AppInstall.md
@@ -0,0 +1,18 @@
+# Flipdish.Model.AppInstall
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** | Name of the installed application. | [optional] 
+**FirstLogin** | **DateTime?** | Date and time of the user&#39;s first login to the app. | [optional] 
+**FirstLoginHuman** | **string** | Human-readable representation of the first login date. | [optional] 
+**LastActivity** | **DateTime?** | Date and time of the user&#39;s last activity in the app. | [optional] 
+**LastActivityHuman** | **string** | Human-readable representation of the last activity date. | [optional] 
+**GoogleTokens** | **int?** | Number of Google push notification tokens associated with the app install. | [optional] 
+**AppleTokens** | **int?** | Number of Apple push notification tokens associated with the app install. | [optional] 
+**OrderCount** | **int?** | Number of orders placed by the user through this app install. | [optional] 
+**UserAgentAtSignup** | **string** | User agent string at the time of signup. | [optional] 
+**UserAgentMostRecent** | **string** | Most recent user agent string used by the user. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AppLookup.md b/docs/AppLookup.md
new file mode 100644
index 00000000..c1f14e51
--- /dev/null
+++ b/docs/AppLookup.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.AppLookup
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AppId** | **string** | App id | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AppStoreApi.md b/docs/AppStoreApi.md
index 25d132ec..f8708e1f 100644
--- a/docs/AppStoreApi.md
+++ b/docs/AppStoreApi.md
@@ -1,28 +1,26 @@
-# IO.Swagger.Api.AppStoreApi
+# Flipdish.Api.AppStoreApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetAppStoreApp**](AppStoreApi.md#getappstoreapp) | **GET** /api/v1.0/appstore/apps/{appStoreAppId} | Get App store app
-[**GetAppStoreApps**](AppStoreApi.md#getappstoreapps) | **GET** /api/v1.0/appstore/apps | Get list of App store app summaries
+[**GetAppStoreApp**](AppStoreApi.md#getappstoreapp) | **GET** /api/v1.0/appstore/apps/{appStoreAppId} | 
+[**GetAppStoreApps**](AppStoreApi.md#getappstoreapps) | **GET** /api/v1.0/appstore/apps | 
 
 
 <a name="getappstoreapp"></a>
 # **GetAppStoreApp**
-> AppStoreApp GetAppStoreApp (string appStoreAppId)
+> RestApiResultAppStoreApp GetAppStoreApp (string appStoreAppId, string appId = null)
 
-Get App store app
 
-App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -34,12 +32,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreApi();
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var appId = appId_example;  // string |  (optional) 
 
             try
             {
-                // Get App store app
-                AppStoreApp result = apiInstance.GetAppStoreApp(appStoreAppId);
+                RestApiResultAppStoreApp result = apiInstance.GetAppStoreApp(appStoreAppId, appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -55,11 +53,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appStoreAppId** | **string**| App store app id | 
+ **appStoreAppId** | **string**|  | 
+ **appId** | **string**|  | [optional] 
 
 ### Return type
 
-[**AppStoreApp**](AppStoreApp.md)
+[**RestApiResultAppStoreApp**](RestApiResultAppStoreApp.md)
 
 ### Authorization
 
@@ -74,19 +73,17 @@ Name | Type | Description  | Notes
 
 <a name="getappstoreapps"></a>
 # **GetAppStoreApps**
-> RestApiPaginationResultAppStoreAppSummary GetAppStoreApps (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null)
+> RestApiPaginationResultAppStoreAppSummary GetAppStoreApps (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null)
 
-Get list of App store app summaries
 
-Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -98,15 +95,15 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreApi();
-            var search = search_example;  // string | Query App store app name
-            var page = 56;  // int? | Requested page index (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
-            var excludeNotOwned = true;  // bool? | Exclude App store apps that user is not the owner off (optional) 
+            var search = search_example;  // string | 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
+            var excludeNotOwned = true;  // bool? |  (optional) 
+            var showOnlyVerified = true;  // bool? |  (optional) 
 
             try
             {
-                // Get list of App store app summaries
-                RestApiPaginationResultAppStoreAppSummary result = apiInstance.GetAppStoreApps(search, page, limit, excludeNotOwned);
+                RestApiPaginationResultAppStoreAppSummary result = apiInstance.GetAppStoreApps(search, page, limit, excludeNotOwned, showOnlyVerified);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -122,10 +119,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **search** | **string**| Query App store app name | 
- **page** | **int?**| Requested page index | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
- **excludeNotOwned** | **bool?**| Exclude App store apps that user is not the owner off | [optional] 
+ **search** | **string**|  | 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
+ **excludeNotOwned** | **bool?**|  | [optional] 
+ **showOnlyVerified** | **bool?**|  | [optional] 
 
 ### Return type
 
diff --git a/docs/AppStoreApp.md b/docs/AppStoreApp.md
index b8d50f67..c4f6153d 100644
--- a/docs/AppStoreApp.md
+++ b/docs/AppStoreApp.md
@@ -1,27 +1,31 @@
-# IO.Swagger.Model.AppStoreApp
+# Flipdish.Model.AppStoreApp
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **string** | Unique App store app id | 
-**VerificationStatus** | **string** | Application verification status | 
-**Logo** | **string** | Logo | [optional] 
-**OAuthAppId** | **string** | OAuth App identifier | 
-**Details** | **string** | Details | 
-**ConfigurationType** | **string** | Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt; | 
-**StoreSelectorType** | **string** | Store selector type | 
-**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) | Field groups | [optional] 
-**SetupInstructions** | **string** | Setup instructions | [optional] 
-**ExternalSetupLink** | **string** | External setup link | [optional] 
-**TeammateAppAccessLevel** | **string** | Teammate app access level | [optional] 
-**PermissionsType** | **string** | Permissions type | 
-**Support** | [**AppStoreAppSupportInfo**](AppStoreAppSupportInfo.md) | Support information | [optional] 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**IsEnabled** | **bool?** | Is application enabled | [optional] 
-**Categories** | **List&lt;string&gt;** | Categories | 
-**Countries** | **List&lt;string&gt;** | Countries | 
-**DeveloperName** | **string** | Developer Name | [optional] 
+**Id** | **string** |  | 
+**VerificationStatus** | **string** |  | 
+**Logo** | **string** |  | [optional] 
+**OAuthAppId** | **string** |  | 
+**Internal** | **bool?** |  | 
+**Details** | **string** |  | 
+**ConfigurationType** | **string** |  | 
+**StoreSelectorType** | **string** |  | 
+**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) |  | [optional] 
+**SetupInstructions** | **string** |  | [optional] 
+**ExternalSetupLink** | **string** |  | [optional] 
+**TeammateAppAccessLevel** | **string** |  | [optional] 
+**PermissionsType** | **string** |  | 
+**Support** | [**AppStoreAppSupportInfo**](AppStoreAppSupportInfo.md) |  | [optional] 
+**ExternalFunctionActionUrl** | **string** |  | [optional] 
+**ExternalFunctionSignatureKey** | **string** |  | [optional] 
+**IsPaid** | **bool?** |  | [optional] 
+**Name** | **string** |  | 
+**Description** | **string** |  | 
+**IsEnabled** | **bool?** |  | [optional] 
+**Categories** | **List&lt;string&gt;** |  | 
+**Countries** | **List&lt;string&gt;** |  | 
+**DeveloperName** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppStoreAppConfiguration.md b/docs/AppStoreAppConfiguration.md
index 66bc363f..5b0e9230 100644
--- a/docs/AppStoreAppConfiguration.md
+++ b/docs/AppStoreAppConfiguration.md
@@ -1,31 +1,35 @@
-# IO.Swagger.Model.AppStoreAppConfiguration
+# Flipdish.Model.AppStoreAppConfiguration
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **string** | Unique App store app configuration id | 
-**AppId** | **string** | App id | 
-**AppStoreAppId** | **string** | App store app id | 
-**IsEnabled** | **bool?** | Is enabled | 
-**StoreIds** | **List&lt;int?&gt;** | Stores id&#39;s | [optional] 
-**Settings** | [**List&lt;Setting&gt;**](Setting.md) | Settings | [optional] 
-**VerificationStatus** | **string** | Application verification status | 
-**Logo** | **string** | Logo | [optional] 
-**OAuthAppId** | **string** | OAuth App identifier | 
-**Details** | **string** | Details | 
-**ConfigurationType** | **string** | Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt; | 
-**StoreSelectorType** | **string** | Store selector type | 
-**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) | Field groups | [optional] 
-**SetupInstructions** | **string** | Setup instructions | [optional] 
-**ExternalSetupLink** | **string** | External setup link | [optional] 
-**TeammateAppAccessLevel** | **string** | Teammate app access level | [optional] 
-**PermissionsType** | **string** | Permissions type | 
-**Support** | [**AppStoreAppSupportInfo**](AppStoreAppSupportInfo.md) | Support information | [optional] 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**Categories** | **List&lt;string&gt;** | Categories | 
-**Countries** | **List&lt;string&gt;** | Countries | 
-**DeveloperName** | **string** | Developer Name | [optional] 
+**Id** | **string** |  | 
+**AppId** | **string** |  | 
+**AppStoreAppId** | **string** |  | 
+**IsEnabled** | **bool?** |  | 
+**StoreIds** | **List&lt;int?&gt;** |  | [optional] 
+**Settings** | [**List&lt;Setting&gt;**](Setting.md) |  | [optional] 
+**VerificationStatus** | **string** |  | 
+**Logo** | **string** |  | [optional] 
+**OAuthAppId** | **string** |  | 
+**Internal** | **bool?** |  | 
+**Details** | **string** |  | 
+**ConfigurationType** | **string** |  | 
+**StoreSelectorType** | **string** |  | 
+**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) |  | [optional] 
+**SetupInstructions** | **string** |  | [optional] 
+**ExternalSetupLink** | **string** |  | [optional] 
+**TeammateAppAccessLevel** | **string** |  | [optional] 
+**PermissionsType** | **string** |  | 
+**Support** | [**AppStoreAppSupportInfo**](AppStoreAppSupportInfo.md) |  | [optional] 
+**ExternalFunctionActionUrl** | **string** |  | [optional] 
+**ExternalFunctionSignatureKey** | **string** |  | [optional] 
+**IsPaid** | **bool?** |  | [optional] 
+**Name** | **string** |  | 
+**Description** | **string** |  | 
+**Categories** | **List&lt;string&gt;** |  | 
+**Countries** | **List&lt;string&gt;** |  | 
+**DeveloperName** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppStoreAppConfigurationHeader.md b/docs/AppStoreAppConfigurationHeader.md
deleted file mode 100644
index 76b7d03a..00000000
--- a/docs/AppStoreAppConfigurationHeader.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# IO.Swagger.Model.AppStoreAppConfigurationHeader
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**AppStoreAppId** | **string** | Unique App store app id | 
-**Name** | **string** | Name of Appstore app | 
-**Description** | **string** | Description | 
-**Logo** | **string** | Logo | [optional] 
-**DeveloperName** | **string** | Developer name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppStoreAppConfigurationSummary.md b/docs/AppStoreAppConfigurationSummary.md
index 954f3466..32b61b5e 100644
--- a/docs/AppStoreAppConfigurationSummary.md
+++ b/docs/AppStoreAppConfigurationSummary.md
@@ -1,19 +1,20 @@
-# IO.Swagger.Model.AppStoreAppConfigurationSummary
+# Flipdish.Model.AppStoreAppConfigurationSummary
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **string** | Unique App store app configuration id | 
-**AppId** | **string** | App Id | 
-**IsEnabled** | **bool?** | Is enabled | 
-**Stores** | [**List&lt;ConfiguredStore&gt;**](ConfiguredStore.md) | List of stores | 
-**ConfigurationType** | **string** | Configuration type | [optional] 
-**StoreSelectorType** | **string** | Store selector type | [optional] 
-**AppStoreAppId** | **string** | Unique App store app id | 
-**Name** | **string** | Name of Appstore app | 
-**Description** | **string** | Description | 
-**Logo** | **string** | Logo | [optional] 
-**DeveloperName** | **string** | Developer name | [optional] 
+**Id** | **string** |  | 
+**AppId** | **string** |  | 
+**IsEnabled** | **bool?** |  | 
+**Stores** | [**List&lt;ConfiguredStore&gt;**](ConfiguredStore.md) |  | 
+**ConfigurationType** | **string** |  | 
+**StoreSelectorType** | **string** |  | 
+**Internal** | **bool?** |  | 
+**AppStoreAppId** | **string** |  | 
+**Name** | **string** |  | 
+**Description** | **string** |  | 
+**Logo** | **string** |  | [optional] 
+**DeveloperName** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppStoreAppEntitlements.md b/docs/AppStoreAppEntitlements.md
new file mode 100644
index 00000000..2cfaa789
--- /dev/null
+++ b/docs/AppStoreAppEntitlements.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.AppStoreAppEntitlements
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EntitlementQuantity** | **int?** |  | [optional] 
+**CurrentUsage** | **int?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AppStoreAppSummary.md b/docs/AppStoreAppSummary.md
index 35c1d5f1..8933282f 100644
--- a/docs/AppStoreAppSummary.md
+++ b/docs/AppStoreAppSummary.md
@@ -1,17 +1,18 @@
-# IO.Swagger.Model.AppStoreAppSummary
+# Flipdish.Model.AppStoreAppSummary
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **string** | Unique App store app id | [optional] 
-**VerificationStatus** | **string** | Application verification status | 
-**Logo** | **string** | Logo | [optional] 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**IsEnabled** | **bool?** | Is application enabled | [optional] 
-**Categories** | **List&lt;string&gt;** | Categories | 
-**Countries** | **List&lt;string&gt;** | Countries | 
-**DeveloperName** | **string** | Developer Name | [optional] 
+**Id** | **string** |  | 
+**VerificationStatus** | **string** |  | 
+**Logo** | **string** |  | [optional] 
+**Internal** | **bool?** |  | 
+**Name** | **string** |  | 
+**Description** | **string** |  | 
+**IsEnabled** | **bool?** |  | [optional] 
+**Categories** | **List&lt;string&gt;** |  | 
+**Countries** | **List&lt;string&gt;** |  | 
+**DeveloperName** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppStoreAppSupportInfo.md b/docs/AppStoreAppSupportInfo.md
index 2baf655f..beeb6fd8 100644
--- a/docs/AppStoreAppSupportInfo.md
+++ b/docs/AppStoreAppSupportInfo.md
@@ -1,14 +1,14 @@
-# IO.Swagger.Model.AppStoreAppSupportInfo
+# Flipdish.Model.AppStoreAppSupportInfo
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**PrivacyPolicy** | **string** | Privacy policy url | [optional] 
-**TermsOfUse** | **string** | Terms of use url | [optional] 
-**CompanyWebsite** | **string** | Company website url | [optional] 
-**LearnMore** | **string** | Learn more url | [optional] 
-**InstallationMessage** | **string** | Installation message | [optional] 
-**SupportEmail** | **string** | Support email | [optional] 
+**PrivacyPolicy** | **string** |  | [optional] 
+**TermsOfUse** | **string** |  | [optional] 
+**CompanyWebsite** | **string** |  | [optional] 
+**LearnMore** | **string** |  | [optional] 
+**InstallationMessage** | **string** |  | [optional] 
+**SupportEmail** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppStoreConfigCreatedEvent.md b/docs/AppStoreConfigCreatedEvent.md
index 283c64e8..36a10991 100644
--- a/docs/AppStoreConfigCreatedEvent.md
+++ b/docs/AppStoreConfigCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AppStoreConfigCreatedEvent
+# Flipdish.Model.AppStoreConfigCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,11 +6,15 @@ Name | Type | Description | Notes
 **EventName** | **string** | The event name | [optional] 
 **AppStoreAppId** | **string** | App Store App Id | [optional] 
 **AppStoreAppConfigurationId** | **string** | App Store Configuration Id | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has created the configuration | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppStoreConfigDeletedEvent.md b/docs/AppStoreConfigDeletedEvent.md
index 915870cf..7b41b387 100644
--- a/docs/AppStoreConfigDeletedEvent.md
+++ b/docs/AppStoreConfigDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AppStoreConfigDeletedEvent
+# Flipdish.Model.AppStoreConfigDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,11 +6,15 @@ Name | Type | Description | Notes
 **EventName** | **string** | The event name | [optional] 
 **AppStoreAppId** | **string** | App Store Id | [optional] 
 **AppStoreAppConfigurationId** | **string** | App Store Configuration Id | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has deleted the configuration | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppStoreConfigModel.md b/docs/AppStoreConfigModel.md
new file mode 100644
index 00000000..d416955a
--- /dev/null
+++ b/docs/AppStoreConfigModel.md
@@ -0,0 +1,23 @@
+# Flipdish.Model.AppStoreConfigModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelId** | **int?** | White label ID | [optional] 
+**ReadyToPublishToAppStore** | **bool?** | Ready to publish to app store | [optional] 
+**AppStoreName** | **string** | App store name | [optional] 
+**AppStoreAppleId** | **string** | App Store Apple ID | [optional] 
+**AppStoreUrl** | **string** | App Store URL | [optional] 
+**AppStoreId** | **string** | App Store ID | [optional] 
+**AppStorePassword** | **string** | App Store password | [optional] 
+**TeamId** | **string** | Team ID | [optional] 
+**AppGroupId** | **string** | App Group ID | [optional] 
+**BundleId** | **string** | Bundle ID | [optional] 
+**AppStoreSigningIdentity** | **string** | App Store signing identity | [optional] 
+**AppStoreToken** | **string** | App Store token | [optional] 
+**AppStoreMerchantId** | **string** | App Store merchant ID | [optional] 
+**P8PrivateKey** | **string** | P8 private key | [optional] 
+**P8PrivateKeyId** | **string** | P8 private key ID | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AppStoreConfigUpdatedEvent.md b/docs/AppStoreConfigUpdatedEvent.md
index c479858a..53b903a9 100644
--- a/docs/AppStoreConfigUpdatedEvent.md
+++ b/docs/AppStoreConfigUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AppStoreConfigUpdatedEvent
+# Flipdish.Model.AppStoreConfigUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,11 +6,15 @@ Name | Type | Description | Notes
 **EventName** | **string** | The event name | [optional] 
 **AppStoreAppId** | **string** | App Store Id | [optional] 
 **AppStoreAppConfiguration** | [**UpdateAppStoreAppConfigurationWebhookDTO**](UpdateAppStoreAppConfigurationWebhookDTO.md) | App Configuration | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has update the configuration | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppStoreConfigurationsApi.md b/docs/AppStoreConfigurationsApi.md
index 9bdf3b91..d4e0e4df 100644
--- a/docs/AppStoreConfigurationsApi.md
+++ b/docs/AppStoreConfigurationsApi.md
@@ -1,32 +1,94 @@
-# IO.Swagger.Api.AppStoreConfigurationsApi
+# Flipdish.Api.AppStoreConfigurationsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateAppStoreConfig**](AppStoreConfigurationsApi.md#createappstoreconfig) | **POST** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config | Create App store app configuration
-[**DeleteAppStoreConfig**](AppStoreConfigurationsApi.md#deleteappstoreconfig) | **DELETE** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | Delete App store app configuration
-[**GetAppStoreConfig**](AppStoreConfigurationsApi.md#getappstoreconfig) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | Get App store app configuration
-[**GetConfiguredAppSingleApp**](AppStoreConfigurationsApi.md#getconfiguredappsingleapp) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId} | Get list of App store app configurations for one App store app
-[**GetConfiguredApps**](AppStoreConfigurationsApi.md#getconfiguredapps) | **GET** /api/v1.0/{appId}/appstore/apps | Get list of App store apps which have been configured
-[**UpdateAppStoreConfig**](AppStoreConfigurationsApi.md#updateappstoreconfig) | **PUT** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | Update App store app configuration
+[**AppStoreConfigurationsAppStoreHandleOauthResponseCode**](AppStoreConfigurationsApi.md#appstoreconfigurationsappstorehandleoauthresponsecode) | **GET** /api/v1.0/appstore/oauthresponse/{appStoreAppId}/responsecode | 
+[**CreateAppStoreConfig**](AppStoreConfigurationsApi.md#createappstoreconfig) | **POST** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config | 
+[**DeleteAppStoreConfig**](AppStoreConfigurationsApi.md#deleteappstoreconfig) | **DELETE** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | 
+[**ExecuteConfigurationAction**](AppStoreConfigurationsApi.md#executeconfigurationaction) | **POST** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}/action | 
+[**GetAppStoreConfig**](AppStoreConfigurationsApi.md#getappstoreconfig) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | 
+[**GetConfiguredAppSingleApp**](AppStoreConfigurationsApi.md#getconfiguredappsingleapp) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId} | 
+[**GetConfiguredApps**](AppStoreConfigurationsApi.md#getconfiguredapps) | **GET** /api/v1.0/{appId}/appstore/apps | 
+[**UpdateAppStoreConfig**](AppStoreConfigurationsApi.md#updateappstoreconfig) | **PUT** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId} | 
+[**UpdateAppStoreConfigSettingValues**](AppStoreConfigurationsApi.md#updateappstoreconfigsettingvalues) | **POST** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}/updatesettings | 
 
 
+<a name="appstoreconfigurationsappstorehandleoauthresponsecode"></a>
+# **AppStoreConfigurationsAppStoreHandleOauthResponseCode**
+> Object AppStoreConfigurationsAppStoreHandleOauthResponseCode (string appStoreAppId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AppStoreConfigurationsAppStoreHandleOauthResponseCodeExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppStoreConfigurationsApi();
+            var appStoreAppId = appStoreAppId_example;  // string | 
+
+            try
+            {
+                Object result = apiInstance.AppStoreConfigurationsAppStoreHandleOauthResponseCode(appStoreAppId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppStoreConfigurationsApi.AppStoreConfigurationsAppStoreHandleOauthResponseCode: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appStoreAppId** | **string**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="createappstoreconfig"></a>
 # **CreateAppStoreConfig**
 > RestApiResultAppStoreAppConfiguration CreateAppStoreConfig (string appId, string appStoreAppId)
 
-Create App store app configuration
 
-[BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -38,12 +100,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreConfigurationsApi();
-            var appId = appId_example;  // string | App id
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
+            var appId = appId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
 
             try
             {
-                // Create App store app configuration
                 RestApiResultAppStoreAppConfiguration result = apiInstance.CreateAppStoreConfig(appId, appStoreAppId);
                 Debug.WriteLine(result);
             }
@@ -60,8 +121,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **appStoreAppId** | **string**| App store app id | 
+ **appId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
 
 ### Return type
 
@@ -82,17 +143,15 @@ Name | Type | Description  | Notes
 # **DeleteAppStoreConfig**
 > RestApiStringResult DeleteAppStoreConfig (string appId, string appStoreAppId, string configId)
 
-Delete App store app configuration
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -104,13 +163,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreConfigurationsApi();
-            var appId = appId_example;  // string | App id
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
-            var configId = configId_example;  // string | App store app configuration id
+            var appId = appId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var configId = configId_example;  // string | 
 
             try
             {
-                // Delete App store app configuration
                 RestApiStringResult result = apiInstance.DeleteAppStoreConfig(appId, appStoreAppId, configId);
                 Debug.WriteLine(result);
             }
@@ -127,9 +185,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **appStoreAppId** | **string**| App store app id | 
- **configId** | **string**| App store app configuration id | 
+ **appId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+ **configId** | **string**|  | 
 
 ### Return type
 
@@ -146,21 +204,86 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="executeconfigurationaction"></a>
+# **ExecuteConfigurationAction**
+> RestApiResultExecuteConfigurationActionResult ExecuteConfigurationAction (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class ExecuteConfigurationActionExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppStoreConfigurationsApi();
+            var appId = appId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var configId = configId_example;  // string | 
+            var executeConfigurationActionRequest = new ExecuteConfigurationActionRequest(); // ExecuteConfigurationActionRequest | 
+
+            try
+            {
+                RestApiResultExecuteConfigurationActionResult result = apiInstance.ExecuteConfigurationAction(appId, appStoreAppId, configId, executeConfigurationActionRequest);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppStoreConfigurationsApi.ExecuteConfigurationAction: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+ **configId** | **string**|  | 
+ **executeConfigurationActionRequest** | [**ExecuteConfigurationActionRequest**](ExecuteConfigurationActionRequest.md)|  | 
+
+### Return type
+
+[**RestApiResultExecuteConfigurationActionResult**](RestApiResultExecuteConfigurationActionResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getappstoreconfig"></a>
 # **GetAppStoreConfig**
-> AppStoreAppConfiguration GetAppStoreConfig (string appId, string appStoreAppId, string configId)
+> RestApiResultAppStoreAppConfiguration GetAppStoreConfig (string appId, string appStoreAppId, string configId)
 
-Get App store app configuration
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -172,14 +295,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreConfigurationsApi();
-            var appId = appId_example;  // string | App id
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
-            var configId = configId_example;  // string | App store app configuration id
+            var appId = appId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var configId = configId_example;  // string | 
 
             try
             {
-                // Get App store app configuration
-                AppStoreAppConfiguration result = apiInstance.GetAppStoreConfig(appId, appStoreAppId, configId);
+                RestApiResultAppStoreAppConfiguration result = apiInstance.GetAppStoreConfig(appId, appStoreAppId, configId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -195,13 +317,13 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **appStoreAppId** | **string**| App store app id | 
- **configId** | **string**| App store app configuration id | 
+ **appId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+ **configId** | **string**|  | 
 
 ### Return type
 
-[**AppStoreAppConfiguration**](AppStoreAppConfiguration.md)
+[**RestApiResultAppStoreAppConfiguration**](RestApiResultAppStoreAppConfiguration.md)
 
 ### Authorization
 
@@ -218,17 +340,15 @@ Name | Type | Description  | Notes
 # **GetConfiguredAppSingleApp**
 > RestApiArrayResultAppStoreAppConfigurationSummary GetConfiguredAppSingleApp (string appId, string appStoreAppId)
 
-Get list of App store app configurations for one App store app
 
-[ALPHA - this endpoint is not ready to be consumed]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -240,12 +360,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreConfigurationsApi();
-            var appId = appId_example;  // string | App id
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
+            var appId = appId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
 
             try
             {
-                // Get list of App store app configurations for one App store app
                 RestApiArrayResultAppStoreAppConfigurationSummary result = apiInstance.GetConfiguredAppSingleApp(appId, appStoreAppId);
                 Debug.WriteLine(result);
             }
@@ -262,8 +381,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **appStoreAppId** | **string**| App store app id | 
+ **appId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
 
 ### Return type
 
@@ -282,19 +401,17 @@ Name | Type | Description  | Notes
 
 <a name="getconfiguredapps"></a>
 # **GetConfiguredApps**
-> RestApiArrayResultAppStoreAppConfigurationHeader GetConfiguredApps (string appId)
+> RestApiArrayResultAppStoreAppSummary GetConfiguredApps (string appId)
 
-Get list of App store apps which have been configured
 
-[ALPHA - this endpoint is not ready to be consumed]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -306,12 +423,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreConfigurationsApi();
-            var appId = appId_example;  // string | App id
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Get list of App store apps which have been configured
-                RestApiArrayResultAppStoreAppConfigurationHeader result = apiInstance.GetConfiguredApps(appId);
+                RestApiArrayResultAppStoreAppSummary result = apiInstance.GetConfiguredApps(appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -327,11 +443,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
+ **appId** | **string**|  | 
 
 ### Return type
 
-[**RestApiArrayResultAppStoreAppConfigurationHeader**](RestApiArrayResultAppStoreAppConfigurationHeader.md)
+[**RestApiArrayResultAppStoreAppSummary**](RestApiArrayResultAppStoreAppSummary.md)
 
 ### Authorization
 
@@ -348,17 +464,15 @@ Name | Type | Description  | Notes
 # **UpdateAppStoreConfig**
 > void UpdateAppStoreConfig (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration)
 
-Update App store app configuration
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -370,14 +484,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreConfigurationsApi();
-            var appId = appId_example;  // string | App id
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
-            var configId = configId_example;  // string | App store app configuration id
-            var updateAppStoreAppConfiguration = new UpdateAppStoreAppConfiguration(); // UpdateAppStoreAppConfiguration | Update App store app configuration
+            var appId = appId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var configId = configId_example;  // string | 
+            var updateAppStoreAppConfiguration = new UpdateAppStoreAppConfiguration(); // UpdateAppStoreAppConfiguration | 
 
             try
             {
-                // Update App store app configuration
                 apiInstance.UpdateAppStoreConfig(appId, appStoreAppId, configId, updateAppStoreAppConfiguration);
             }
             catch (Exception e)
@@ -393,10 +506,76 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **appStoreAppId** | **string**| App store app id | 
- **configId** | **string**| App store app configuration id | 
- **updateAppStoreAppConfiguration** | [**UpdateAppStoreAppConfiguration**](UpdateAppStoreAppConfiguration.md)| Update App store app configuration | 
+ **appId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+ **configId** | **string**|  | 
+ **updateAppStoreAppConfiguration** | [**UpdateAppStoreAppConfiguration**](UpdateAppStoreAppConfiguration.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="updateappstoreconfigsettingvalues"></a>
+# **UpdateAppStoreConfigSettingValues**
+> void UpdateAppStoreConfigSettingValues (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UpdateAppStoreConfigSettingValuesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppStoreConfigurationsApi();
+            var appId = appId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var configId = configId_example;  // string | 
+            var updateAppStoreAppConfigurationValues = new UpdateAppStoreAppConfigurationValuesBatch(); // UpdateAppStoreAppConfigurationValuesBatch | 
+
+            try
+            {
+                apiInstance.UpdateAppStoreConfigSettingValues(appId, appStoreAppId, configId, updateAppStoreAppConfigurationValues);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppStoreConfigurationsApi.UpdateAppStoreConfigSettingValues: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+ **configId** | **string**|  | 
+ **updateAppStoreAppConfigurationValues** | [**UpdateAppStoreAppConfigurationValuesBatch**](UpdateAppStoreAppConfigurationValuesBatch.md)|  | 
 
 ### Return type
 
diff --git a/docs/AppStoreDeveloperApi.md b/docs/AppStoreDeveloperApi.md
index b0591e4b..3e1f2590 100644
--- a/docs/AppStoreDeveloperApi.md
+++ b/docs/AppStoreDeveloperApi.md
@@ -1,31 +1,32 @@
-# IO.Swagger.Api.AppStoreDeveloperApi
+# Flipdish.Api.AppStoreDeveloperApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AppVerificationUpdate**](AppStoreDeveloperApi.md#appverificationupdate) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/verification | Update App store app verification
-[**CreateAppStoreApp**](AppStoreDeveloperApi.md#createappstoreapp) | **POST** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps | Create App store app
-[**DeleteAppStoreApp**](AppStoreDeveloperApi.md#deleteappstoreapp) | **DELETE** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId} | Delete App store app
-[**UpdateAppStoreApp**](AppStoreDeveloperApi.md#updateappstoreapp) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId} | Update App store app
-[**UploadAppStoreAppLogo**](AppStoreDeveloperApi.md#uploadappstoreapplogo) | **POST** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/logo | Upload the App store app logo \\ icon
+[**AppVerificationUpdate**](AppStoreDeveloperApi.md#appverificationupdate) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/verification | 
+[**CreateAppStoreApp**](AppStoreDeveloperApi.md#createappstoreapp) | **POST** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps | 
+[**DeleteAppStoreApp**](AppStoreDeveloperApi.md#deleteappstoreapp) | **DELETE** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId} | 
+[**GetAppExternalProduct**](AppStoreDeveloperApi.md#getappexternalproduct) | **GET** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_product | 
+[**GetExternalFunctionSigningKey**](AppStoreDeveloperApi.md#getexternalfunctionsigningkey) | **GET** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_function_signing_key | 
+[**UpdateAppStoreApp**](AppStoreDeveloperApi.md#updateappstoreapp) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId} | 
+[**UpdateExternalProduct**](AppStoreDeveloperApi.md#updateexternalproduct) | **PUT** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_product | 
+[**UploadAppStoreAppLogo**](AppStoreDeveloperApi.md#uploadappstoreapplogo) | **POST** /api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/logo | 
 
 
 <a name="appverificationupdate"></a>
 # **AppVerificationUpdate**
 > void AppVerificationUpdate (string oauthAppId, string appStoreAppId, string verificationStatus)
 
-Update App store app verification
 
-[BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -37,13 +38,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreDeveloperApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
-            var verificationStatus = verificationStatus_example;  // string | New verification status
+            var oauthAppId = oauthAppId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var verificationStatus = verificationStatus_example;  // string | 
 
             try
             {
-                // Update App store app verification
                 apiInstance.AppVerificationUpdate(oauthAppId, appStoreAppId, verificationStatus);
             }
             catch (Exception e)
@@ -59,9 +59,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
- **appStoreAppId** | **string**| App store app id | 
- **verificationStatus** | **string**| New verification status | 
+ **oauthAppId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+ **verificationStatus** | **string**|  | 
 
 ### Return type
 
@@ -82,17 +82,15 @@ void (empty response body)
 # **CreateAppStoreApp**
 > RestApiResultAppStoreApp CreateAppStoreApp (string oauthAppId, CreateAppStoreApp createAppStoreApp)
 
-Create App store app
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -104,12 +102,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreDeveloperApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
-            var createAppStoreApp = new CreateAppStoreApp(); // CreateAppStoreApp | App store app
+            var oauthAppId = oauthAppId_example;  // string | 
+            var createAppStoreApp = new CreateAppStoreApp(); // CreateAppStoreApp | 
 
             try
             {
-                // Create App store app
                 RestApiResultAppStoreApp result = apiInstance.CreateAppStoreApp(oauthAppId, createAppStoreApp);
                 Debug.WriteLine(result);
             }
@@ -126,8 +123,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
- **createAppStoreApp** | [**CreateAppStoreApp**](CreateAppStoreApp.md)| App store app | 
+ **oauthAppId** | **string**|  | 
+ **createAppStoreApp** | [**CreateAppStoreApp**](CreateAppStoreApp.md)|  | 
 
 ### Return type
 
@@ -148,17 +145,15 @@ Name | Type | Description  | Notes
 # **DeleteAppStoreApp**
 > RestApiStringResult DeleteAppStoreApp (string oauthAppId, string appStoreAppId)
 
-Delete App store app
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -170,12 +165,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreDeveloperApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
+            var oauthAppId = oauthAppId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
 
             try
             {
-                // Delete App store app
                 RestApiStringResult result = apiInstance.DeleteAppStoreApp(oauthAppId, appStoreAppId);
                 Debug.WriteLine(result);
             }
@@ -192,8 +186,133 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
- **appStoreAppId** | **string**| App store app id | 
+ **oauthAppId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+
+### Return type
+
+[**RestApiStringResult**](RestApiStringResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getappexternalproduct"></a>
+# **GetAppExternalProduct**
+> void GetAppExternalProduct (string oauthAppId, string appStoreAppId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetAppExternalProductExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppStoreDeveloperApi();
+            var oauthAppId = oauthAppId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+
+            try
+            {
+                apiInstance.GetAppExternalProduct(oauthAppId, appStoreAppId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppStoreDeveloperApi.GetAppExternalProduct: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **oauthAppId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getexternalfunctionsigningkey"></a>
+# **GetExternalFunctionSigningKey**
+> RestApiStringResult GetExternalFunctionSigningKey (string oauthAppId, string appStoreAppId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetExternalFunctionSigningKeyExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppStoreDeveloperApi();
+            var oauthAppId = oauthAppId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+
+            try
+            {
+                RestApiStringResult result = apiInstance.GetExternalFunctionSigningKey(oauthAppId, appStoreAppId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppStoreDeveloperApi.GetExternalFunctionSigningKey: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **oauthAppId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
 
 ### Return type
 
@@ -214,17 +333,15 @@ Name | Type | Description  | Notes
 # **UpdateAppStoreApp**
 > void UpdateAppStoreApp (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
 
-Update App store app
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -236,13 +353,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreDeveloperApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
-            var appStoreApp = new UpdateAppStoreApp(); // UpdateAppStoreApp | Update App store app
+            var oauthAppId = oauthAppId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var appStoreApp = new UpdateAppStoreApp(); // UpdateAppStoreApp | 
 
             try
             {
-                // Update App store app
                 apiInstance.UpdateAppStoreApp(oauthAppId, appStoreAppId, appStoreApp);
             }
             catch (Exception e)
@@ -258,9 +374,73 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
- **appStoreAppId** | **string**| App store app id | 
- **appStoreApp** | [**UpdateAppStoreApp**](UpdateAppStoreApp.md)| Update App store app | 
+ **oauthAppId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+ **appStoreApp** | [**UpdateAppStoreApp**](UpdateAppStoreApp.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="updateexternalproduct"></a>
+# **UpdateExternalProduct**
+> void UpdateExternalProduct (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UpdateExternalProductExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppStoreDeveloperApi();
+            var oauthAppId = oauthAppId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+            var appStoreAppExternalProduct = new UpdateAppStoreAppExternalProduct(); // UpdateAppStoreAppExternalProduct | 
+
+            try
+            {
+                apiInstance.UpdateExternalProduct(oauthAppId, appStoreAppId, appStoreAppExternalProduct);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppStoreDeveloperApi.UpdateExternalProduct: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **oauthAppId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+ **appStoreAppExternalProduct** | [**UpdateAppStoreAppExternalProduct**](UpdateAppStoreAppExternalProduct.md)|  | 
 
 ### Return type
 
@@ -281,15 +461,15 @@ void (empty response body)
 # **UploadAppStoreAppLogo**
 > void UploadAppStoreAppLogo (string oauthAppId, string appStoreAppId, System.IO.Stream image)
 
-Upload the App store app logo \\ icon
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -301,13 +481,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppStoreDeveloperApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
-            var appStoreAppId = appStoreAppId_example;  // string | App store app id
+            var oauthAppId = oauthAppId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
             var image = new System.IO.Stream(); // System.IO.Stream | App Store App Logo
 
             try
             {
-                // Upload the App store app logo \\ icon
                 apiInstance.UploadAppStoreAppLogo(oauthAppId, appStoreAppId, image);
             }
             catch (Exception e)
@@ -323,8 +502,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
- **appStoreAppId** | **string**| App store app id | 
+ **oauthAppId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
  **image** | **System.IO.Stream**| App Store App Logo | 
 
 ### Return type
diff --git a/docs/AppStoreEntitlementsApi.md b/docs/AppStoreEntitlementsApi.md
new file mode 100644
index 00000000..b98949ea
--- /dev/null
+++ b/docs/AppStoreEntitlementsApi.md
@@ -0,0 +1,72 @@
+# Flipdish.Api.AppStoreEntitlementsApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**GetAppStoreAppEntitlements**](AppStoreEntitlementsApi.md#getappstoreappentitlements) | **GET** /api/v1.0/{appId}/appstore/apps/{appStoreAppId}/entitlements | 
+
+
+<a name="getappstoreappentitlements"></a>
+# **GetAppStoreAppEntitlements**
+> RestApiResultAppStoreAppEntitlements GetAppStoreAppEntitlements (string appId, string appStoreAppId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetAppStoreAppEntitlementsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppStoreEntitlementsApi();
+            var appId = appId_example;  // string | 
+            var appStoreAppId = appStoreAppId_example;  // string | 
+
+            try
+            {
+                RestApiResultAppStoreAppEntitlements result = apiInstance.GetAppStoreAppEntitlements(appId, appStoreAppId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppStoreEntitlementsApi.GetAppStoreAppEntitlements: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **appStoreAppId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultAppStoreAppEntitlements**](RestApiResultAppStoreAppEntitlements.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/AppStoreSubscriptionChangeJobUpdatedEvent.md b/docs/AppStoreSubscriptionChangeJobUpdatedEvent.md
new file mode 100644
index 00000000..70862f9e
--- /dev/null
+++ b/docs/AppStoreSubscriptionChangeJobUpdatedEvent.md
@@ -0,0 +1,19 @@
+# Flipdish.Model.AppStoreSubscriptionChangeJobUpdatedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
+**AppStoreAppId** | **string** | App Store Id | [optional] 
+**Status** | **string** | Status | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AppSummary.md b/docs/AppSummary.md
deleted file mode 100644
index b76e28c4..00000000
--- a/docs/AppSummary.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Flipdish.Model.AppSummary
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **string** | Integration Public Id | [optional] 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**Logo** | **string** | Logo | [optional] 
-**IsEnabled** | **bool?** | Is application enabled | [optional] 
-**VerificationStatus** | **string** | Application verification status | 
-**Tags** | **List&lt;string&gt;** | Tags | 
-**Regions** | **List&lt;string&gt;** | Regions | 
-**DeveloperName** | **string** | Developer Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/AppUpdatedEvent.md b/docs/AppUpdatedEvent.md
index acbac014..f29723eb 100644
--- a/docs/AppUpdatedEvent.md
+++ b/docs/AppUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AppUpdatedEvent
+# Flipdish.Model.AppUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,11 +9,15 @@ Name | Type | Description | Notes
 **AppName** | **string** | App Name | [optional] 
 **CountryId** | **string** | Country Id | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User information | [optional] 
+**App** | [**App**](App.md) | App - Whitelabel config | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/AppsApi.md b/docs/AppsApi.md
index d5e06e4c..c1dcc6ce 100644
--- a/docs/AppsApi.md
+++ b/docs/AppsApi.md
@@ -1,37 +1,169 @@
-# IO.Swagger.Api.AppsApi
+# Flipdish.Api.AppsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetApp**](AppsApi.md#getapp) | **GET** /api/v1.0/apps/{appId} | Get the application configuration
-[**GetAppHostnameStatus**](AppsApi.md#getapphostnamestatus) | **GET** /api/v1.0/apps/{appId}/hostnamestatus | Get the application hostname DNS delegation states for A and CNAME records.
-[**GetApps**](AppsApi.md#getapps) | **GET** /api/v1.0/apps | Get Apps
-[**GetCompliance**](AppsApi.md#getcompliance) | **GET** /api/v1.0/apps/{appId}/compliance | Get the application compliance configuration
-[**GetPanaceaVanityUrl**](AppsApi.md#getpanaceavanityurl) | **GET** /api/v1.0/apps/{appId}/panacea/url | Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl]
-[**GetSupportedCountries**](AppsApi.md#getsupportedcountries) | **GET** /api/v1.0/apps/supportedcountries | Get all supported countries.
-[**IsPanaceaVanityUrlAvailable**](AppsApi.md#ispanaceavanityurlavailable) | **GET** /api/v1.0/apps/{appId}/panacea/url/available | Is panacea vanity url available
-[**SetAppConfig**](AppsApi.md#setappconfig) | **POST** /api/v1.0/apps/{appId}/config | Set the application configuration
-[**SetAppHostname**](AppsApi.md#setapphostname) | **POST** /api/v1.0/apps/{appId}/hostname | Set the application hostname.
-[**SetAppLanguages**](AppsApi.md#setapplanguages) | **POST** /api/v1.0/apps/{appId}/config/languages | Set the application languages
-[**SetCompliance**](AppsApi.md#setcompliance) | **POST** /api/v1.0/apps/{appId}/compliance | Set the application compliance configuration
-[**SetPanaceaVanityUrl**](AppsApi.md#setpanaceavanityurl) | **POST** /api/v1.0/apps/{appId}/panacea/url | Set panacea vanity url
-[**UploadAppLogo**](AppsApi.md#uploadapplogo) | **POST** /api/v1.0/apps/{appId}/logo | Set the application logo \\ icon
+[**AppsSetPropertyId**](AppsApi.md#appssetpropertyid) | **POST** /api/v1.0/apps/{appId}/orgId/{orgId} | 
+[**CreateApp**](AppsApi.md#createapp) | **POST** /api/v1.0/apps | 
+[**GetApp**](AppsApi.md#getapp) | **GET** /api/v1.0/apps/{appId} | 
+[**GetAppHostnameStatus**](AppsApi.md#getapphostnamestatus) | **GET** /api/v1.0/apps/{appId}/hostnamestatus | 
+[**GetAppName**](AppsApi.md#getappname) | **GET** /api/v1.0/apps/{appId}/name | 
+[**GetApps**](AppsApi.md#getapps) | **GET** /api/v1.0/apps | 
+[**GetCompliance**](AppsApi.md#getcompliance) | **GET** /api/v1.0/apps/{appId}/compliance | 
+[**GetPanaceaVanityUrl**](AppsApi.md#getpanaceavanityurl) | **GET** /api/v1.0/apps/{appId}/panacea/url | 
+[**GetSupportedCountries**](AppsApi.md#getsupportedcountries) | **GET** /api/v1.0/apps/supportedcountries | 
+[**IsPanaceaVanityUrlAvailable**](AppsApi.md#ispanaceavanityurlavailable) | **GET** /api/v1.0/apps/{appId}/panacea/url/available | 
+[**LookupByWhitelabelId**](AppsApi.md#lookupbywhitelabelid) | **GET** /api/v1.0/apps/{whitelabelId}/lookup | 
+[**SendPushNotification**](AppsApi.md#sendpushnotification) | **POST** /api/v1.0/apps/{appId}/SendPushNotification/{customerId} | 
+[**SetAppConfig**](AppsApi.md#setappconfig) | **POST** /api/v1.0/apps/{appId}/config | 
+[**SetAppHostname**](AppsApi.md#setapphostname) | **POST** /api/v1.0/apps/{appId}/hostname | 
+[**SetAppLanguages**](AppsApi.md#setapplanguages) | **POST** /api/v1.0/apps/{appId}/config/languages | 
+[**SetAppStoreName**](AppsApi.md#setappstorename) | **POST** /api/v1.0/apps/{appId}/appstorename | 
+[**SetCompliance**](AppsApi.md#setcompliance) | **POST** /api/v1.0/apps/{appId}/compliance | 
+[**SetPanaceaVanityUrl**](AppsApi.md#setpanaceavanityurl) | **POST** /api/v1.0/apps/{appId}/panacea/url | 
+[**SetThirdPartyIntegrations**](AppsApi.md#setthirdpartyintegrations) | **POST** /api/v1.0/apps/{appId}/third-party-integrations | 
+[**ToggleNextGenWeb**](AppsApi.md#togglenextgenweb) | **POST** /api/v1.0/apps/{appId}/nextgenweb | 
+[**UploadAppLogo**](AppsApi.md#uploadapplogo) | **POST** /api/v1.0/apps/{appId}/logo | 
+
+
+<a name="appssetpropertyid"></a>
+# **AppsSetPropertyId**
+> Object AppsSetPropertyId (string appId, string orgId)
 
 
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AppsSetPropertyIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppsApi();
+            var appId = appId_example;  // string | 
+            var orgId = orgId_example;  // string | 
+
+            try
+            {
+                Object result = apiInstance.AppsSetPropertyId(appId, orgId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppsApi.AppsSetPropertyId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **orgId** | **string**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="createapp"></a>
+# **CreateApp**
+> RestApiStringResult CreateApp (CreateAppParameters parameters)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class CreateAppExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppsApi();
+            var parameters = new CreateAppParameters(); // CreateAppParameters | 
+
+            try
+            {
+                RestApiStringResult result = apiInstance.CreateApp(parameters);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppsApi.CreateApp: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **parameters** | [**CreateAppParameters**](CreateAppParameters.md)|  | 
+
+### Return type
+
+[**RestApiStringResult**](RestApiStringResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getapp"></a>
 # **GetApp**
 > RestApiResultApp GetApp (string appId)
 
-Get the application configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -43,11 +175,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Get the application configuration
                 RestApiResultApp result = apiInstance.GetApp(appId);
                 Debug.WriteLine(result);
             }
@@ -64,7 +195,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -85,17 +216,15 @@ Name | Type | Description  | Notes
 # **GetAppHostnameStatus**
 > RestApiResultDnsRecordInformation GetAppHostnameStatus (string appId)
 
-Get the application hostname DNS delegation states for A and CNAME records.
 
-A domain might be ready but still need 10 minutes to work properly because of HAProxy.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -107,11 +236,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier.
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Get the application hostname DNS delegation states for A and CNAME records.
                 RestApiResultDnsRecordInformation result = apiInstance.GetAppHostnameStatus(appId);
                 Debug.WriteLine(result);
             }
@@ -128,7 +256,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier. | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -145,19 +273,80 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getappname"></a>
+# **GetAppName**
+> RestApiStringResult GetAppName (string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetAppNameExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppsApi();
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                RestApiStringResult result = apiInstance.GetAppName(appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppsApi.GetAppName: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+
+### Return type
+
+[**RestApiStringResult**](RestApiStringResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getapps"></a>
 # **GetApps**
 > RestApiPaginationResultApp GetApps (string nameFilter = null, int? page = null, int? limit = null)
 
-Get Apps
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -175,7 +364,6 @@ namespace Example
 
             try
             {
-                // Get Apps
                 RestApiPaginationResultApp result = apiInstance.GetApps(nameFilter, page, limit);
                 Debug.WriteLine(result);
             }
@@ -215,15 +403,15 @@ Name | Type | Description  | Notes
 # **GetCompliance**
 > RestApiResultAppCompliance GetCompliance (string appId)
 
-Get the application compliance configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -235,11 +423,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Get the application compliance configuration
                 RestApiResultAppCompliance result = apiInstance.GetCompliance(appId);
                 Debug.WriteLine(result);
             }
@@ -256,7 +443,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -277,15 +464,15 @@ Name | Type | Description  | Notes
 # **GetPanaceaVanityUrl**
 > RestApiStringResult GetPanaceaVanityUrl (string appId)
 
-Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -297,11 +484,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier.
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl]
                 RestApiStringResult result = apiInstance.GetPanaceaVanityUrl(appId);
                 Debug.WriteLine(result);
             }
@@ -318,7 +504,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier. | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -339,15 +525,15 @@ Name | Type | Description  | Notes
 # **GetSupportedCountries**
 > RestApiArrayResultSupportedCountry GetSupportedCountries ()
 
-Get all supported countries.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -362,7 +548,6 @@ namespace Example
 
             try
             {
-                // Get all supported countries.
                 RestApiArrayResultSupportedCountry result = apiInstance.GetSupportedCountries();
                 Debug.WriteLine(result);
             }
@@ -397,17 +582,15 @@ This endpoint does not need any parameter.
 # **IsPanaceaVanityUrlAvailable**
 > RestApiStringResult IsPanaceaVanityUrlAvailable (string vanityUrl, string appId)
 
-Is panacea vanity url available
 
-Minimum length of 3 characters
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -419,12 +602,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var vanityUrl = vanityUrl_example;  // string | Vanity url to check
+            var vanityUrl = vanityUrl_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Is panacea vanity url available
                 RestApiStringResult result = apiInstance.IsPanaceaVanityUrlAvailable(vanityUrl, appId);
                 Debug.WriteLine(result);
             }
@@ -441,7 +623,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **vanityUrl** | **string**| Vanity url to check | 
+ **vanityUrl** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -459,19 +641,144 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="lookupbywhitelabelid"></a>
+# **LookupByWhitelabelId**
+> AppLookup LookupByWhitelabelId (int? whitelabelId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class LookupByWhitelabelIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppsApi();
+            var whitelabelId = 56;  // int? | 
+
+            try
+            {
+                AppLookup result = apiInstance.LookupByWhitelabelId(whitelabelId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppsApi.LookupByWhitelabelId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **whitelabelId** | **int?**|  | 
+
+### Return type
+
+[**AppLookup**](AppLookup.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="sendpushnotification"></a>
+# **SendPushNotification**
+> void SendPushNotification (string appId, int? customerId, string message)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SendPushNotificationExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppsApi();
+            var appId = appId_example;  // string | 
+            var customerId = 56;  // int? | 
+            var message = message_example;  // string | 
+
+            try
+            {
+                apiInstance.SendPushNotification(appId, customerId, message);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppsApi.SendPushNotification: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **customerId** | **int?**|  | 
+ **message** | **string**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="setappconfig"></a>
 # **SetAppConfig**
 > RestApiResultApp SetAppConfig (string appId, AppConfigUpdateModel appConfigUpdate)
 
-Set the application configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -483,12 +790,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier
-            var appConfigUpdate = new AppConfigUpdateModel(); // AppConfigUpdateModel | Changes to the configuration
+            var appId = appId_example;  // string | 
+            var appConfigUpdate = new AppConfigUpdateModel(); // AppConfigUpdateModel | 
 
             try
             {
-                // Set the application configuration
                 RestApiResultApp result = apiInstance.SetAppConfig(appId, appConfigUpdate);
                 Debug.WriteLine(result);
             }
@@ -505,8 +811,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **appConfigUpdate** | [**AppConfigUpdateModel**](AppConfigUpdateModel.md)| Changes to the configuration | 
+ **appId** | **string**|  | 
+ **appConfigUpdate** | [**AppConfigUpdateModel**](AppConfigUpdateModel.md)|  | 
 
 ### Return type
 
@@ -527,17 +833,15 @@ Name | Type | Description  | Notes
 # **SetAppHostname**
 > RestApiStringResult SetAppHostname (string appId, string hostname, bool? isEmbed = null)
 
-Set the application hostname.
 
-If no subdomain is specified in {hostname} 'www' will be prepended.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -549,13 +853,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier.
-            var hostname = hostname_example;  // string | The new Hostname.
-            var isEmbed = true;  // bool? | Will the website be embedded (optional) 
+            var appId = appId_example;  // string | 
+            var hostname = hostname_example;  // string | 
+            var isEmbed = true;  // bool? |  (optional) 
 
             try
             {
-                // Set the application hostname.
                 RestApiStringResult result = apiInstance.SetAppHostname(appId, hostname, isEmbed);
                 Debug.WriteLine(result);
             }
@@ -572,9 +875,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier. | 
- **hostname** | **string**| The new Hostname. | 
- **isEmbed** | **bool?**| Will the website be embedded | [optional] 
+ **appId** | **string**|  | 
+ **hostname** | **string**|  | 
+ **isEmbed** | **bool?**|  | [optional] 
 
 ### Return type
 
@@ -595,15 +898,15 @@ Name | Type | Description  | Notes
 # **SetAppLanguages**
 > RestApiResultApp SetAppLanguages (string appId, List<Language> languages)
 
-Set the application languages
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -615,12 +918,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier
-            var languages = new List<Language>(); // List<Language> | New list of languages
+            var appId = appId_example;  // string | 
+            var languages = new List<Language>(); // List<Language> | 
 
             try
             {
-                // Set the application languages
                 RestApiResultApp result = apiInstance.SetAppLanguages(appId, languages);
                 Debug.WriteLine(result);
             }
@@ -637,8 +939,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **languages** | [**List&lt;Language&gt;**](Language.md)| New list of languages | 
+ **appId** | **string**|  | 
+ **languages** | [**List&lt;Language&gt;**](Language.md)|  | 
 
 ### Return type
 
@@ -655,19 +957,81 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="setappstorename"></a>
+# **SetAppStoreName**
+> void SetAppStoreName (string appId, string appStoreName)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetAppStoreNameExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppsApi();
+            var appId = appId_example;  // string | 
+            var appStoreName = appStoreName_example;  // string | 
+
+            try
+            {
+                apiInstance.SetAppStoreName(appId, appStoreName);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppsApi.SetAppStoreName: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **appStoreName** | **string**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="setcompliance"></a>
 # **SetCompliance**
 > RestApiResultAppCompliance SetCompliance (string appId, string complianceType)
 
-Set the application compliance configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -679,12 +1043,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier
-            var complianceType = complianceType_example;  // string | Compliance type
+            var appId = appId_example;  // string | 
+            var complianceType = complianceType_example;  // string | 
 
             try
             {
-                // Set the application compliance configuration
                 RestApiResultAppCompliance result = apiInstance.SetCompliance(appId, complianceType);
                 Debug.WriteLine(result);
             }
@@ -701,8 +1064,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **complianceType** | **string**| Compliance type | 
+ **appId** | **string**|  | 
+ **complianceType** | **string**|  | 
 
 ### Return type
 
@@ -723,17 +1086,15 @@ Name | Type | Description  | Notes
 # **SetPanaceaVanityUrl**
 > RestApiStringResult SetPanaceaVanityUrl (string appId, string vanityUrl)
 
-Set panacea vanity url
 
-Minimum length of 3 characters
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -745,12 +1106,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier.
-            var vanityUrl = vanityUrl_example;  // string | Vanity url
+            var appId = appId_example;  // string | 
+            var vanityUrl = vanityUrl_example;  // string | 
 
             try
             {
-                // Set panacea vanity url
                 RestApiStringResult result = apiInstance.SetPanaceaVanityUrl(appId, vanityUrl);
                 Debug.WriteLine(result);
             }
@@ -767,8 +1127,137 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier. | 
- **vanityUrl** | **string**| Vanity url | 
+ **appId** | **string**|  | 
+ **vanityUrl** | **string**|  | 
+
+### Return type
+
+[**RestApiStringResult**](RestApiStringResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setthirdpartyintegrations"></a>
+# **SetThirdPartyIntegrations**
+> void SetThirdPartyIntegrations (string appId, bool? enabled)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetThirdPartyIntegrationsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppsApi();
+            var appId = appId_example;  // string | 
+            var enabled = true;  // bool? | 
+
+            try
+            {
+                apiInstance.SetThirdPartyIntegrations(appId, enabled);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppsApi.SetThirdPartyIntegrations: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **enabled** | **bool?**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="togglenextgenweb"></a>
+# **ToggleNextGenWeb**
+> RestApiStringResult ToggleNextGenWeb (string appId, string hostname, string vanityUrl, bool? isNextGenWeb)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class ToggleNextGenWebExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new AppsApi();
+            var appId = appId_example;  // string | 
+            var hostname = hostname_example;  // string | 
+            var vanityUrl = vanityUrl_example;  // string | 
+            var isNextGenWeb = true;  // bool? | 
+
+            try
+            {
+                RestApiStringResult result = apiInstance.ToggleNextGenWeb(appId, hostname, vanityUrl, isNextGenWeb);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling AppsApi.ToggleNextGenWeb: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **hostname** | **string**|  | 
+ **vanityUrl** | **string**|  | 
+ **isNextGenWeb** | **bool?**|  | 
 
 ### Return type
 
@@ -789,15 +1278,15 @@ Name | Type | Description  | Notes
 # **UploadAppLogo**
 > void UploadAppLogo (string appId, System.IO.Stream image)
 
-Set the application logo \\ icon
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -809,12 +1298,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AppsApi();
-            var appId = appId_example;  // string | Application identifier
+            var appId = appId_example;  // string | 
             var image = new System.IO.Stream(); // System.IO.Stream | App Logo
 
             try
             {
-                // Set the application logo \\ icon
                 apiInstance.UploadAppLogo(appId, image);
             }
             catch (Exception e)
@@ -830,7 +1318,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
+ **appId** | **string**|  | 
  **image** | **System.IO.Stream**| App Logo | 
 
 ### Return type
diff --git a/docs/AssetResultModel.md b/docs/AssetResultModel.md
new file mode 100644
index 00000000..4e7d31e4
--- /dev/null
+++ b/docs/AssetResultModel.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.AssetResultModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Message** | **string** | Asset result message | [optional] 
+**AssetUrl** | **string** | Asset URL or path | [optional] 
+**AssetName** | **string** | Asset name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/AssignedBankAccount.md b/docs/AssignedBankAccount.md
index 954b8b93..d582aa94 100644
--- a/docs/AssignedBankAccount.md
+++ b/docs/AssignedBankAccount.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AssignedBankAccount
+# Flipdish.Model.AssignedBankAccount
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AuditLogFieldChangeInformation.md b/docs/AuditLogFieldChangeInformation.md
index 8908aa09..e4fa20f7 100644
--- a/docs/AuditLogFieldChangeInformation.md
+++ b/docs/AuditLogFieldChangeInformation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.AuditLogFieldChangeInformation
+# Flipdish.Model.AuditLogFieldChangeInformation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/AuditLogsApi.md b/docs/AuditLogsApi.md
index fdb5f374..f829942b 100644
--- a/docs/AuditLogsApi.md
+++ b/docs/AuditLogsApi.md
@@ -1,28 +1,26 @@
-# IO.Swagger.Api.AuditLogsApi
+# Flipdish.Api.AuditLogsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AddOrderAuditLog**](AuditLogsApi.md#addorderauditlog) | **POST** /api/v1.0/auditlogs/orders/{orderId} | Create an order audit log event
-[**AddStoreAuditLogEvent**](AuditLogsApi.md#addstoreauditlogevent) | **POST** /api/v1.0/auditlogs/stores/{storeId} | Create a store audit log event
+[**AddOrderAuditLog**](AuditLogsApi.md#addorderauditlog) | **POST** /api/v1.0/auditlogs/orders/{orderId} | 
+[**AddStoreAuditLogEvent**](AuditLogsApi.md#addstoreauditlogevent) | **POST** /api/v1.0/auditlogs/stores/{storeId} | 
 
 
 <a name="addorderauditlog"></a>
 # **AddOrderAuditLog**
 > void AddOrderAuditLog (int? orderId, List<ExternalStoreAuditLog> externalEventCreate)
 
-Create an order audit log event
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -39,7 +37,6 @@ namespace Example
 
             try
             {
-                // Create an order audit log event
                 apiInstance.AddOrderAuditLog(orderId, externalEventCreate);
             }
             catch (Exception e)
@@ -77,17 +74,15 @@ void (empty response body)
 # **AddStoreAuditLogEvent**
 > void AddStoreAuditLogEvent (int? storeId, List<ExternalStoreAuditLog> externalEventCreate)
 
-Create a store audit log event
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -104,7 +99,6 @@ namespace Example
 
             try
             {
-                // Create a store audit log event
                 apiInstance.AddStoreAuditLogEvent(storeId, externalEventCreate);
             }
             catch (Exception e)
diff --git a/docs/AuthorizationTokensApi.md b/docs/AuthorizationTokensApi.md
index 3843528e..271942b8 100644
--- a/docs/AuthorizationTokensApi.md
+++ b/docs/AuthorizationTokensApi.md
@@ -1,26 +1,26 @@
-# IO.Swagger.Api.AuthorizationTokensApi
+# Flipdish.Api.AuthorizationTokensApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetAuthorizationTokens**](AuthorizationTokensApi.md#getauthorizationtokens) | **GET** /api/v1.0/{appId}/authorizationtokens/{oauthAppId} | Get authorization tokens
-[**RevokeToken**](AuthorizationTokensApi.md#revoketoken) | **DELETE** /api/v1.0/{appId}/authorizationtokens/{key} | Revoke token
+[**GetAuthorizationTokens**](AuthorizationTokensApi.md#getauthorizationtokens) | **GET** /api/v1.0/{appId}/authorizationtokens/{oauthAppId} | 
+[**RevokeToken**](AuthorizationTokensApi.md#revoketoken) | **DELETE** /api/v1.0/{appId}/authorizationtokens/{key} | 
 
 
 <a name="getauthorizationtokens"></a>
 # **GetAuthorizationTokens**
 > RestApiPaginationResultOAuthTokenModel GetAuthorizationTokens (string oauthAppId, string appId, int? page = null, int? limit = null)
 
-Get authorization tokens
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -32,14 +32,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AuthorizationTokensApi();
-            var oauthAppId = oauthAppId_example;  // string | Client identifier
+            var oauthAppId = oauthAppId_example;  // string | 
             var appId = appId_example;  // string | 
-            var page = 56;  // int? | Requested page number (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Get authorization tokens
                 RestApiPaginationResultOAuthTokenModel result = apiInstance.GetAuthorizationTokens(oauthAppId, appId, page, limit);
                 Debug.WriteLine(result);
             }
@@ -56,10 +55,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Client identifier | 
+ **oauthAppId** | **string**|  | 
  **appId** | **string**|  | 
- **page** | **int?**| Requested page number | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -80,15 +79,15 @@ Name | Type | Description  | Notes
 # **RevokeToken**
 > void RevokeToken (string key, string appId)
 
-Revoke token
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -100,12 +99,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new AuthorizationTokensApi();
-            var key = key_example;  // string | Token identifier key
+            var key = key_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Revoke token
                 apiInstance.RevokeToken(key, appId);
             }
             catch (Exception e)
@@ -121,7 +119,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **key** | **string**| Token identifier key | 
+ **key** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
diff --git a/docs/BalanceDetails.md b/docs/BalanceDetails.md
index 784b6736..34ee73e1 100644
--- a/docs/BalanceDetails.md
+++ b/docs/BalanceDetails.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.BalanceDetails
+# Flipdish.Model.BalanceDetails
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**OpeningBalance** | **double?** |  | [optional] 
-**ClosingBalance** | **double?** |  | [optional] 
+**OpeningBalance** | **double?** | OpeningBalance. | [optional] 
+**ClosingBalance** | **double?** | ClosingBalance. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/BankAccount.md b/docs/BankAccount.md
index 9977fe9d..f0321d2f 100644
--- a/docs/BankAccount.md
+++ b/docs/BankAccount.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BankAccount
+# Flipdish.Model.BankAccount
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,11 +10,13 @@ Name | Type | Description | Notes
 **PopulatedAccountFields** | [**List&lt;AccountFieldKeyValuePair&gt;**](AccountFieldKeyValuePair.md) | A list of one or more populated account fields (field key-value pairs).  If this list contains at least one item, the Iban, Swift and NationalClearingCode fields should be ignored. | [optional] 
 **AccountState** | **string** | Status of Account | [optional] 
 **StoreNames** | **List&lt;string&gt;** | Store Names that are attached to this account | [optional] 
+**StoreIds** | **List&lt;int?&gt;** | Store Ids that are attached to this account | [optional] 
 **BankAddress** | **string** | Address lf the bank | [optional] 
 **BankCountryCode** | **string** | CountryCode of the Bank Account | [optional] 
 **AccountHolderAddress** | **string** | Account Holders Address | [optional] 
 **AccountHolderCountryCode** | **string** | Account Holders Country Code | [optional] 
 **VatNumber** | **string** | Account Holders Vat Number | [optional] 
+**StripeAccountId** | **string** | Stripe Id of the connected account | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/BankAccountApi.md b/docs/BankAccountApi.md
index 16c8d630..92a25c57 100644
--- a/docs/BankAccountApi.md
+++ b/docs/BankAccountApi.md
@@ -1,33 +1,33 @@
-# IO.Swagger.Api.BankAccountApi
+# Flipdish.Api.BankAccountApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AttachBankAccountToStore**](BankAccountApi.md#attachbankaccounttostore) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/store/{storeId} | [PRIVATE API] Attach Bank Account to Store
-[**CreateBankAccount**](BankAccountApi.md#createbankaccount) | **POST** /api/v1.0/{appId}/bankaccounts | Create a new Bank Account and attach to this App
-[**DeleteBankAccount**](BankAccountApi.md#deletebankaccount) | **DELETE** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | Delete BankAccount
-[**GetBankAccountById**](BankAccountApi.md#getbankaccountbyid) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | Get BankAccount Detail by Id
-[**GetBankAccounts**](BankAccountApi.md#getbankaccounts) | **GET** /api/v1.0/{appId}/bankaccounts | Get List of BankAccounts for WL
-[**GetCountriesWithFieldDefinitions**](BankAccountApi.md#getcountrieswithfielddefinitions) | **GET** /api/v1.0/{appId}/bankaccounts/countries-field-definitions | Get bank account fields definitions
-[**GetFieldDefinitions**](BankAccountApi.md#getfielddefinitions) | **GET** /api/v1.0/{appId}/bankaccounts/field-definitions | Get bank account fields definitions
-[**UpdateBankAccount**](BankAccountApi.md#updatebankaccount) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | Update BankAccount
-[**UpdateBankAccountState**](BankAccountApi.md#updatebankaccountstate) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/state/{state} | [PRIVATE API] Update State of Bank Account
+[**AttachBankAccountToStore**](BankAccountApi.md#attachbankaccounttostore) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/store/{storeId} | 
+[**CreateBankAccount**](BankAccountApi.md#createbankaccount) | **POST** /api/v1.0/{appId}/bankaccounts | 
+[**DeleteBankAccount**](BankAccountApi.md#deletebankaccount) | **DELETE** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | 
+[**GetBankAccountById**](BankAccountApi.md#getbankaccountbyid) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | 
+[**GetBankAccounts**](BankAccountApi.md#getbankaccounts) | **GET** /api/v1.0/{appId}/bankaccounts | 
+[**GetCountriesWithFieldDefinitions**](BankAccountApi.md#getcountrieswithfielddefinitions) | **GET** /api/v1.0/{appId}/bankaccounts/countries-field-definitions | 
+[**GetFieldDefinitions**](BankAccountApi.md#getfielddefinitions) | **GET** /api/v1.0/{appId}/bankaccounts/field-definitions | 
+[**UpdateBankAccount**](BankAccountApi.md#updatebankaccount) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId} | 
+[**UpdateBankAccountState**](BankAccountApi.md#updatebankaccountstate) | **POST** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/state/{state} | 
 
 
 <a name="attachbankaccounttostore"></a>
 # **AttachBankAccountToStore**
-> void AttachBankAccountToStore (string appId, int? bankAccountId, int? storeId)
+> void AttachBankAccountToStore (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null)
+
 
-[PRIVATE API] Attach Bank Account to Store
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -39,14 +39,14 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new BankAccountApi();
-            var appId = appId_example;  // string | App Name
-            var bankAccountId = 56;  // int? | Id of account to be updated
-            var storeId = 56;  // int? | Store to be attached to Bank account
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var storeId = 56;  // int? | 
+            var skipBankAccountUpdateWarningEmail = true;  // bool? |  (optional) 
 
             try
             {
-                // [PRIVATE API] Attach Bank Account to Store
-                apiInstance.AttachBankAccountToStore(appId, bankAccountId, storeId);
+                apiInstance.AttachBankAccountToStore(appId, bankAccountId, storeId, skipBankAccountUpdateWarningEmail);
             }
             catch (Exception e)
             {
@@ -61,9 +61,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
- **bankAccountId** | **int?**| Id of account to be updated | 
- **storeId** | **int?**| Store to be attached to Bank account | 
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **storeId** | **int?**|  | 
+ **skipBankAccountUpdateWarningEmail** | **bool?**|  | [optional] 
 
 ### Return type
 
@@ -84,15 +85,15 @@ void (empty response body)
 # **CreateBankAccount**
 > RestApiResultBankAccountDetail CreateBankAccount (string appId, BankAccountCreate account)
 
-Create a new Bank Account and attach to this App
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -104,12 +105,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new BankAccountApi();
-            var appId = appId_example;  // string | App Name
-            var account = new BankAccountCreate(); // BankAccountCreate | Account to be created
+            var appId = appId_example;  // string | 
+            var account = new BankAccountCreate(); // BankAccountCreate | 
 
             try
             {
-                // Create a new Bank Account and attach to this App
                 RestApiResultBankAccountDetail result = apiInstance.CreateBankAccount(appId, account);
                 Debug.WriteLine(result);
             }
@@ -126,8 +126,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
- **account** | [**BankAccountCreate**](BankAccountCreate.md)| Account to be created | 
+ **appId** | **string**|  | 
+ **account** | [**BankAccountCreate**](BankAccountCreate.md)|  | 
 
 ### Return type
 
@@ -148,15 +148,15 @@ Name | Type | Description  | Notes
 # **DeleteBankAccount**
 > void DeleteBankAccount (string appId, int? bankAccountId)
 
-Delete BankAccount
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -168,12 +168,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new BankAccountApi();
-            var appId = appId_example;  // string | App Name
-            var bankAccountId = 56;  // int? | Id of account to be marked as deleted
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
 
             try
             {
-                // Delete BankAccount
                 apiInstance.DeleteBankAccount(appId, bankAccountId);
             }
             catch (Exception e)
@@ -189,8 +188,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
- **bankAccountId** | **int?**| Id of account to be marked as deleted | 
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
 
 ### Return type
 
@@ -211,15 +210,15 @@ void (empty response body)
 # **GetBankAccountById**
 > RestApiResultBankAccountDetail GetBankAccountById (int? bankAccountId, string appId)
 
-Get BankAccount Detail by Id
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -231,12 +230,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new BankAccountApi();
-            var bankAccountId = 56;  // int? | Id of account
+            var bankAccountId = 56;  // int? | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Get BankAccount Detail by Id
                 RestApiResultBankAccountDetail result = apiInstance.GetBankAccountById(bankAccountId, appId);
                 Debug.WriteLine(result);
             }
@@ -253,7 +251,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **bankAccountId** | **int?**| Id of account | 
+ **bankAccountId** | **int?**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -275,15 +273,15 @@ Name | Type | Description  | Notes
 # **GetBankAccounts**
 > RestApiArrayResultBankAccountSummary GetBankAccounts (string appId)
 
-Get List of BankAccounts for WL
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -295,11 +293,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new BankAccountApi();
-            var appId = appId_example;  // string | App Name
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Get List of BankAccounts for WL
                 RestApiArrayResultBankAccountSummary result = apiInstance.GetBankAccounts(appId);
                 Debug.WriteLine(result);
             }
@@ -316,7 +313,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -337,15 +334,15 @@ Name | Type | Description  | Notes
 # **GetCountriesWithFieldDefinitions**
 > RestApiArrayResultCountryWithAccountFieldsDefinitions GetCountriesWithFieldDefinitions (string appId)
 
-Get bank account fields definitions
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -361,7 +358,6 @@ namespace Example
 
             try
             {
-                // Get bank account fields definitions
                 RestApiArrayResultCountryWithAccountFieldsDefinitions result = apiInstance.GetCountriesWithFieldDefinitions(appId);
                 Debug.WriteLine(result);
             }
@@ -399,15 +395,15 @@ Name | Type | Description  | Notes
 # **GetFieldDefinitions**
 > RestApiResultAccountFieldsDefinitions GetFieldDefinitions (string appId)
 
-Get bank account fields definitions
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -423,7 +419,6 @@ namespace Example
 
             try
             {
-                // Get bank account fields definitions
                 RestApiResultAccountFieldsDefinitions result = apiInstance.GetFieldDefinitions(appId);
                 Debug.WriteLine(result);
             }
@@ -461,15 +456,15 @@ Name | Type | Description  | Notes
 # **UpdateBankAccount**
 > void UpdateBankAccount (string appId, int? bankAccountId, BankAccountCreate account)
 
-Update BankAccount
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -481,13 +476,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new BankAccountApi();
-            var appId = appId_example;  // string | App Name
-            var bankAccountId = 56;  // int? | Id of account to be updated
-            var account = new BankAccountCreate(); // BankAccountCreate | Details to update account with
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var account = new BankAccountCreate(); // BankAccountCreate | 
 
             try
             {
-                // Update BankAccount
                 apiInstance.UpdateBankAccount(appId, bankAccountId, account);
             }
             catch (Exception e)
@@ -503,9 +497,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
- **bankAccountId** | **int?**| Id of account to be updated | 
- **account** | [**BankAccountCreate**](BankAccountCreate.md)| Details to update account with | 
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **account** | [**BankAccountCreate**](BankAccountCreate.md)|  | 
 
 ### Return type
 
@@ -526,15 +520,15 @@ void (empty response body)
 # **UpdateBankAccountState**
 > void UpdateBankAccountState (string appId, int? bankAccountId, string state, string reason)
 
-[PRIVATE API] Update State of Bank Account
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -546,14 +540,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new BankAccountApi();
-            var appId = appId_example;  // string | App Name
-            var bankAccountId = 56;  // int? | Id of account to be updated
-            var state = state_example;  // string | New state
-            var reason = reason_example;  // string | Reason for state change, Mandatory for rejections
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var state = state_example;  // string | 
+            var reason = reason_example;  // string | 
 
             try
             {
-                // [PRIVATE API] Update State of Bank Account
                 apiInstance.UpdateBankAccountState(appId, bankAccountId, state, reason);
             }
             catch (Exception e)
@@ -569,10 +562,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
- **bankAccountId** | **int?**| Id of account to be updated | 
- **state** | **string**| New state | 
- **reason** | **string**| Reason for state change, Mandatory for rejections | 
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **state** | **string**|  | 
+ **reason** | **string**|  | 
 
 ### Return type
 
diff --git a/docs/BankAccountAssignedEvent.md b/docs/BankAccountAssignedEvent.md
new file mode 100644
index 00000000..047786ea
--- /dev/null
+++ b/docs/BankAccountAssignedEvent.md
@@ -0,0 +1,20 @@
+# Flipdish.Model.BankAccountAssignedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**OrgId** | **string** | Organisation Id | [optional] 
+**BankAccount** | [**BankAccount**](BankAccount.md) | The assigned bank account | [optional] 
+**Description** | **string** | Event description | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | Updated by user | [optional] 
+**EventName** | **string** | The event name | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/BankAccountCreate.md b/docs/BankAccountCreate.md
index 439762ab..ac8c867e 100644
--- a/docs/BankAccountCreate.md
+++ b/docs/BankAccountCreate.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BankAccountCreate
+# Flipdish.Model.BankAccountCreate
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/BankAccountCreatedEvent.md b/docs/BankAccountCreatedEvent.md
index 22d41334..87277b79 100644
--- a/docs/BankAccountCreatedEvent.md
+++ b/docs/BankAccountCreatedEvent.md
@@ -1,15 +1,19 @@
-# IO.Swagger.Model.BankAccountCreatedEvent
+# Flipdish.Model.BankAccountCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**OrgId** | **string** | Organisation Id | [optional] 
 **BankAccount** | [**BankAccount**](BankAccount.md) | The create bank account | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | Updated by user | [optional] 
 **EventName** | **string** | The event name | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/BankAccountDeletedEvent.md b/docs/BankAccountDeletedEvent.md
index 7ab3a437..d39f281e 100644
--- a/docs/BankAccountDeletedEvent.md
+++ b/docs/BankAccountDeletedEvent.md
@@ -1,15 +1,19 @@
-# IO.Swagger.Model.BankAccountDeletedEvent
+# Flipdish.Model.BankAccountDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**OrgId** | **string** | Organisation Id | [optional] 
 **BankAccount** | [**BankAccount**](BankAccount.md) | The create bank account | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | Updated by user | [optional] 
 **EventName** | **string** | The event name | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/BankAccountDetail.md b/docs/BankAccountDetail.md
index 25b16518..189c01c6 100644
--- a/docs/BankAccountDetail.md
+++ b/docs/BankAccountDetail.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BankAccountDetail
+# Flipdish.Model.BankAccountDetail
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/BankAccountDetailsUpdateRequest.md b/docs/BankAccountDetailsUpdateRequest.md
index 6cd26391..bf99dbf0 100644
--- a/docs/BankAccountDetailsUpdateRequest.md
+++ b/docs/BankAccountDetailsUpdateRequest.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BankAccountDetailsUpdateRequest
+# Flipdish.Model.BankAccountDetailsUpdateRequest
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/BankAccountSummary.md b/docs/BankAccountSummary.md
index 69e4be29..e090339d 100644
--- a/docs/BankAccountSummary.md
+++ b/docs/BankAccountSummary.md
@@ -1,12 +1,16 @@
-# IO.Swagger.Model.BankAccountSummary
+# Flipdish.Model.BankAccountSummary
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | **int?** | Id of this account | [optional] 
 **StoreNames** | **List&lt;string&gt;** | Store Names that are attached to this account | [optional] 
+**StoreIds** | **List&lt;int?&gt;** | Store Ids that are attached to this account | [optional] 
 **AccountState** | **string** | Status of Account | [optional] 
 **CurrencyCode** | **string** | Currency of Account | [optional] 
+**VatNumber** | **string** | Account Holders Vat Number | [optional] 
+**AccountHolderAddress** | **string** | Account Holders Address | [optional] 
+**AccountHolderCountryCode** | **string** | Account Holders Country Code | [optional] 
 **StripeConnectedAccountInfo** | [**StripeConnectedAccountInfo**](StripeConnectedAccountInfo.md) | Information about the Stripe connected account associated with this bank account (if any) | [optional] 
 **AccountName** | **string** | Name of this account | [optional] 
 **Iban** | **string** | IBAN of this account | [optional] 
diff --git a/docs/BankAccountUpdatedEvent.md b/docs/BankAccountUpdatedEvent.md
index 1e80c0da..68a6fd36 100644
--- a/docs/BankAccountUpdatedEvent.md
+++ b/docs/BankAccountUpdatedEvent.md
@@ -1,15 +1,19 @@
-# IO.Swagger.Model.BankAccountUpdatedEvent
+# Flipdish.Model.BankAccountUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**OrgId** | **string** | Organisation Id | [optional] 
 **BankAccount** | [**BankAccount**](BankAccount.md) | The create bank account | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | Updated by user | [optional] 
 **EventName** | **string** | The event name | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/BluetoothTerminalStatus.md b/docs/BluetoothTerminalStatus.md
index dd114c2b..64e83083 100644
--- a/docs/BluetoothTerminalStatus.md
+++ b/docs/BluetoothTerminalStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BluetoothTerminalStatus
+# Flipdish.Model.BluetoothTerminalStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/BuildResultModel.md b/docs/BuildResultModel.md
new file mode 100644
index 00000000..2583f251
--- /dev/null
+++ b/docs/BuildResultModel.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.BuildResultModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Message** | **string** | Build result message | [optional] 
+**BuildId** | **string** | Build ID or reference | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/BusinessHoursOverride.md b/docs/BusinessHoursOverride.md
index a25896fa..cade6fd3 100644
--- a/docs/BusinessHoursOverride.md
+++ b/docs/BusinessHoursOverride.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BusinessHoursOverride
+# Flipdish.Model.BusinessHoursOverride
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/BusinessHoursOverrideBase.md b/docs/BusinessHoursOverrideBase.md
index 7099c7da..85e0233b 100644
--- a/docs/BusinessHoursOverrideBase.md
+++ b/docs/BusinessHoursOverrideBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BusinessHoursOverrideBase
+# Flipdish.Model.BusinessHoursOverrideBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/BusinessHoursPeriod.md b/docs/BusinessHoursPeriod.md
index c2b3f823..f05ebc87 100644
--- a/docs/BusinessHoursPeriod.md
+++ b/docs/BusinessHoursPeriod.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BusinessHoursPeriod
+# Flipdish.Model.BusinessHoursPeriod
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/BusinessHoursPeriodBase.md b/docs/BusinessHoursPeriodBase.md
index 521d2540..ff1d7c12 100644
--- a/docs/BusinessHoursPeriodBase.md
+++ b/docs/BusinessHoursPeriodBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.BusinessHoursPeriodBase
+# Flipdish.Model.BusinessHoursPeriodBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CampaignStatistics.md b/docs/CampaignStatistics.md
index 8b9e8aa9..1d687db8 100644
--- a/docs/CampaignStatistics.md
+++ b/docs/CampaignStatistics.md
@@ -1,13 +1,13 @@
-# IO.Swagger.Model.CampaignStatistics
+# Flipdish.Model.CampaignStatistics
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**VouchersIssued** | **int?** | Number of issued vouchers | [optional] 
-**VouchersRedeemed** | **int?** | Number of redeemed vouchers | [optional] 
-**Conversion** | **double?** | Conversion percentage of campaign (VouchersIssued / VouchersRedeemed) | [optional] 
-**SalesGenerated** | **double?** | Sales generated by campaign (TotalAmount - FeeChargedToCustomer ie. the discounted sale value) | [optional] 
-**ReturnOfInvestment** | **double?** | Return of investment percentage of campaign (TotalAmount / DiscountAmount) | [optional] 
+**VouchersIssued** | **int?** | Deprecated. Number of issued vouchers.  This field is always zero. | [optional] 
+**VouchersRedeemed** | **int?** | Deprecated. Number of redeemed vouchers. This field is always zero.  This field is always zero. | [optional] 
+**Conversion** | **double?** | Deprecated. Conversion of campaign (VouchersIssued / VouchersRedeemed).  This field is always zero. | [optional] 
+**SalesGenerated** | **double?** | Deprecated.  Sales generated by campaign (TotalAmount - FeeChargedToCustomer ie. the discounted sale value).  This field is always zero. | [optional] 
+**ReturnOfInvestment** | **double?** | Deprecated.  Return of investment of campaign (TotalAmount / DiscountAmount).  This field is always zero. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CampaignsApi.md b/docs/CampaignsApi.md
index f336971f..dfe96743 100644
--- a/docs/CampaignsApi.md
+++ b/docs/CampaignsApi.md
@@ -1,34 +1,34 @@
-# IO.Swagger.Api.CampaignsApi
+# Flipdish.Api.CampaignsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateLoyaltyCampaign**](CampaignsApi.md#createloyaltycampaign) | **POST** /api/v1.0/{appId}/campaigns/loyalty | Creates loyalty campaign
-[**CreateRetentionCampaign**](CampaignsApi.md#createretentioncampaign) | **POST** /api/v1.0/{appId}/campaigns/retention | Creates retention campaign
-[**GetLoyaltyCampaignsForApp**](CampaignsApi.md#getloyaltycampaignsforapp) | **GET** /api/v1.0/{appId}/campaigns/loyalty | Gets loyalty campaigns for app
-[**GetLoyaltyCampaignsForStore**](CampaignsApi.md#getloyaltycampaignsforstore) | **GET** /api/v1.0/{appId}/campaigns/loyalty/{storeId} | Gets loyalty campaigns for store
-[**GetRetentionCampaignsForApp**](CampaignsApi.md#getretentioncampaignsforapp) | **GET** /api/v1.0/{appId}/campaigns/retention | Gets retention campaigns for app
-[**GetRetentionCampaignsForStore**](CampaignsApi.md#getretentioncampaignsforstore) | **GET** /api/v1.0/{appId}/campaigns/retention/{storeId} | Gets retention campaigns for store
-[**GetStoreList**](CampaignsApi.md#getstorelist) | **GET** /api/v1.0/{appId}/campaigns/stores | Gets list of stores for app
-[**RemoveCampaign**](CampaignsApi.md#removecampaign) | **DELETE** /api/v1.0/{appId}/campaigns/{campaignId} | Deletes a campaign
-[**UpdateLoyaltyCampaign**](CampaignsApi.md#updateloyaltycampaign) | **POST** /api/v1.0/{appId}/campaigns/loyalty/{campaignId} | Updates loyalty campaign
-[**UpdateRetentionCampaign**](CampaignsApi.md#updateretentioncampaign) | **POST** /api/v1.0/{appId}/campaigns/retention/{campaignId} | Updates retention campaign
+[**CreateLoyaltyCampaign**](CampaignsApi.md#createloyaltycampaign) | **POST** /api/v1.0/{appId}/campaigns/loyalty | 
+[**CreateRetentionCampaign**](CampaignsApi.md#createretentioncampaign) | **POST** /api/v1.0/{appId}/campaigns/retention | 
+[**GetLoyaltyCampaignsForApp**](CampaignsApi.md#getloyaltycampaignsforapp) | **GET** /api/v1.0/{appId}/campaigns/loyalty | 
+[**GetLoyaltyCampaignsForStore**](CampaignsApi.md#getloyaltycampaignsforstore) | **GET** /api/v1.0/{appId}/campaigns/loyalty/{storeId} | 
+[**GetRetentionCampaignsForApp**](CampaignsApi.md#getretentioncampaignsforapp) | **GET** /api/v1.0/{appId}/campaigns/retention | 
+[**GetRetentionCampaignsForStore**](CampaignsApi.md#getretentioncampaignsforstore) | **GET** /api/v1.0/{appId}/campaigns/retention/{storeId} | 
+[**GetStoreList**](CampaignsApi.md#getstorelist) | **GET** /api/v1.0/{appId}/campaigns/stores | 
+[**RemoveCampaign**](CampaignsApi.md#removecampaign) | **DELETE** /api/v1.0/{appId}/campaigns/{campaignId} | 
+[**UpdateLoyaltyCampaign**](CampaignsApi.md#updateloyaltycampaign) | **POST** /api/v1.0/{appId}/campaigns/loyalty/{campaignId} | 
+[**UpdateRetentionCampaign**](CampaignsApi.md#updateretentioncampaign) | **POST** /api/v1.0/{appId}/campaigns/retention/{campaignId} | 
 
 
 <a name="createloyaltycampaign"></a>
 # **CreateLoyaltyCampaign**
 > RestApiResultLoyaltyCampaign CreateLoyaltyCampaign (string appId, LoyaltyCampaignBase campaign)
 
-Creates loyalty campaign
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -40,12 +40,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
-            var campaign = new LoyaltyCampaignBase(); // LoyaltyCampaignBase | Loyalty campaign details
+            var appId = appId_example;  // string | 
+            var campaign = new LoyaltyCampaignBase(); // LoyaltyCampaignBase | 
 
             try
             {
-                // Creates loyalty campaign
                 RestApiResultLoyaltyCampaign result = apiInstance.CreateLoyaltyCampaign(appId, campaign);
                 Debug.WriteLine(result);
             }
@@ -62,8 +61,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **campaign** | [**LoyaltyCampaignBase**](LoyaltyCampaignBase.md)| Loyalty campaign details | 
+ **appId** | **string**|  | 
+ **campaign** | [**LoyaltyCampaignBase**](LoyaltyCampaignBase.md)|  | 
 
 ### Return type
 
@@ -84,15 +83,15 @@ Name | Type | Description  | Notes
 # **CreateRetentionCampaign**
 > RestApiResultRetentionCampaign CreateRetentionCampaign (string appId, RetentionCampaignBase campaign)
 
-Creates retention campaign
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -104,12 +103,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
-            var campaign = new RetentionCampaignBase(); // RetentionCampaignBase | Retention campaign details
+            var appId = appId_example;  // string | 
+            var campaign = new RetentionCampaignBase(); // RetentionCampaignBase | 
 
             try
             {
-                // Creates retention campaign
                 RestApiResultRetentionCampaign result = apiInstance.CreateRetentionCampaign(appId, campaign);
                 Debug.WriteLine(result);
             }
@@ -126,8 +124,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **campaign** | [**RetentionCampaignBase**](RetentionCampaignBase.md)| Retention campaign details | 
+ **appId** | **string**|  | 
+ **campaign** | [**RetentionCampaignBase**](RetentionCampaignBase.md)|  | 
 
 ### Return type
 
@@ -148,15 +146,15 @@ Name | Type | Description  | Notes
 # **GetLoyaltyCampaignsForApp**
 > RestApiArrayResultLoyaltyCampaign GetLoyaltyCampaignsForApp (string appId)
 
-Gets loyalty campaigns for app
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -168,11 +166,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Gets loyalty campaigns for app
                 RestApiArrayResultLoyaltyCampaign result = apiInstance.GetLoyaltyCampaignsForApp(appId);
                 Debug.WriteLine(result);
             }
@@ -189,7 +186,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -210,15 +207,15 @@ Name | Type | Description  | Notes
 # **GetLoyaltyCampaignsForStore**
 > RestApiArrayResultLoyaltyCampaign GetLoyaltyCampaignsForStore (string appId, int? storeId)
 
-Gets loyalty campaigns for store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -230,12 +227,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
-            var storeId = 56;  // int? | Store Id
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Gets loyalty campaigns for store
                 RestApiArrayResultLoyaltyCampaign result = apiInstance.GetLoyaltyCampaignsForStore(appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -252,8 +248,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **storeId** | **int?**| Store Id | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -274,15 +270,15 @@ Name | Type | Description  | Notes
 # **GetRetentionCampaignsForApp**
 > RestApiArrayResultRetentionCampaign GetRetentionCampaignsForApp (string appId)
 
-Gets retention campaigns for app
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -294,11 +290,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Gets retention campaigns for app
                 RestApiArrayResultRetentionCampaign result = apiInstance.GetRetentionCampaignsForApp(appId);
                 Debug.WriteLine(result);
             }
@@ -315,7 +310,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -336,15 +331,15 @@ Name | Type | Description  | Notes
 # **GetRetentionCampaignsForStore**
 > RestApiArrayResultRetentionCampaign GetRetentionCampaignsForStore (string appId, int? storeId)
 
-Gets retention campaigns for store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -356,12 +351,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
-            var storeId = 56;  // int? | Store Id
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Gets retention campaigns for store
                 RestApiArrayResultRetentionCampaign result = apiInstance.GetRetentionCampaignsForStore(appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -378,8 +372,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **storeId** | **int?**| Store Id | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -400,15 +394,15 @@ Name | Type | Description  | Notes
 # **GetStoreList**
 > RestApiArrayResultStoreListItem GetStoreList (string appId, bool? onlyPublished = null)
 
-Gets list of stores for app
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -420,12 +414,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
+            var appId = appId_example;  // string | 
             var onlyPublished = true;  // bool? |  (optional) 
 
             try
             {
-                // Gets list of stores for app
                 RestApiArrayResultStoreListItem result = apiInstance.GetStoreList(appId, onlyPublished);
                 Debug.WriteLine(result);
             }
@@ -442,7 +435,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
+ **appId** | **string**|  | 
  **onlyPublished** | **bool?**|  | [optional] 
 
 ### Return type
@@ -464,15 +457,15 @@ Name | Type | Description  | Notes
 # **RemoveCampaign**
 > void RemoveCampaign (string appId, int? campaignId)
 
-Deletes a campaign
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -484,12 +477,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
-            var campaignId = 56;  // int? | Campaign Id
+            var appId = appId_example;  // string | 
+            var campaignId = 56;  // int? | 
 
             try
             {
-                // Deletes a campaign
                 apiInstance.RemoveCampaign(appId, campaignId);
             }
             catch (Exception e)
@@ -505,8 +497,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **campaignId** | **int?**| Campaign Id | 
+ **appId** | **string**|  | 
+ **campaignId** | **int?**|  | 
 
 ### Return type
 
@@ -527,15 +519,15 @@ void (empty response body)
 # **UpdateLoyaltyCampaign**
 > RestApiResultLoyaltyCampaign UpdateLoyaltyCampaign (string appId, int? campaignId, LoyaltyCampaignBase campaign)
 
-Updates loyalty campaign
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -547,13 +539,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
-            var campaignId = 56;  // int? | Loyalty campaign Id
-            var campaign = new LoyaltyCampaignBase(); // LoyaltyCampaignBase | Loyalty campaign details
+            var appId = appId_example;  // string | 
+            var campaignId = 56;  // int? | 
+            var campaign = new LoyaltyCampaignBase(); // LoyaltyCampaignBase | 
 
             try
             {
-                // Updates loyalty campaign
                 RestApiResultLoyaltyCampaign result = apiInstance.UpdateLoyaltyCampaign(appId, campaignId, campaign);
                 Debug.WriteLine(result);
             }
@@ -570,9 +561,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **campaignId** | **int?**| Loyalty campaign Id | 
- **campaign** | [**LoyaltyCampaignBase**](LoyaltyCampaignBase.md)| Loyalty campaign details | 
+ **appId** | **string**|  | 
+ **campaignId** | **int?**|  | 
+ **campaign** | [**LoyaltyCampaignBase**](LoyaltyCampaignBase.md)|  | 
 
 ### Return type
 
@@ -593,15 +584,15 @@ Name | Type | Description  | Notes
 # **UpdateRetentionCampaign**
 > RestApiResultRetentionCampaign UpdateRetentionCampaign (string appId, int? campaignId, RetentionCampaignBase campaign)
 
-Updates retention campaign
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -613,13 +604,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CampaignsApi();
-            var appId = appId_example;  // string | App Name Id
-            var campaignId = 56;  // int? | Retention campaign Id
-            var campaign = new RetentionCampaignBase(); // RetentionCampaignBase | Retention campaign details
+            var appId = appId_example;  // string | 
+            var campaignId = 56;  // int? | 
+            var campaign = new RetentionCampaignBase(); // RetentionCampaignBase | 
 
             try
             {
-                // Updates retention campaign
                 RestApiResultRetentionCampaign result = apiInstance.UpdateRetentionCampaign(appId, campaignId, campaign);
                 Debug.WriteLine(result);
             }
@@ -636,9 +626,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **campaignId** | **int?**| Retention campaign Id | 
- **campaign** | [**RetentionCampaignBase**](RetentionCampaignBase.md)| Retention campaign details | 
+ **appId** | **string**|  | 
+ **campaignId** | **int?**|  | 
+ **campaign** | [**RetentionCampaignBase**](RetentionCampaignBase.md)|  | 
 
 ### Return type
 
diff --git a/docs/CancellationToken.md b/docs/CancellationToken.md
new file mode 100644
index 00000000..1c52248f
--- /dev/null
+++ b/docs/CancellationToken.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.CancellationToken
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**IsCancellationRequested** | **bool?** |  | [optional] 
+**CanBeCanceled** | **bool?** |  | [optional] 
+**WaitHandle** | [**WaitHandle**](WaitHandle.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/Card.md b/docs/Card.md
deleted file mode 100644
index d5c422e7..00000000
--- a/docs/Card.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Flipdish.Model.Card
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Last4Digit** | **string** | Last four digits | [optional] 
-**ExpiryMonth** | **int?** | Expiry month | [optional] 
-**ExpiryYear** | **int?** | Expiry yaer | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CardBase.md b/docs/CardBase.md
deleted file mode 100644
index 4bdc9f85..00000000
--- a/docs/CardBase.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Flipdish.Model.CardBase
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**ExpiryMonth** | **int?** | Expiry month | [optional] 
-**ExpiryYear** | **int?** | Expiry yaer | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CardReader.md b/docs/CardReader.md
index db39bf9c..6009fa70 100644
--- a/docs/CardReader.md
+++ b/docs/CardReader.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CardReader
+# Flipdish.Model.CardReader
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CardReaderRegistrationRequest.md b/docs/CardReaderRegistrationRequest.md
index 321f5a98..7c6ba0df 100644
--- a/docs/CardReaderRegistrationRequest.md
+++ b/docs/CardReaderRegistrationRequest.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CardReaderRegistrationRequest
+# Flipdish.Model.CardReaderRegistrationRequest
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CardReadersApi.md b/docs/CardReadersApi.md
index a5f39112..1a176179 100644
--- a/docs/CardReadersApi.md
+++ b/docs/CardReadersApi.md
@@ -1,44 +1,42 @@
-# IO.Swagger.Api.CardReadersApi
+# Flipdish.Api.CardReadersApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AuthorizeStripeTerminal**](CardReadersApi.md#authorizestripeterminal) | **POST** /api/v1.0/{appId}/stripeterminal/authorize | Get Authorization Key for Stripe Terminal
-[**CancelCurrentlyInitiatedBluetoothDeviceUpdate**](CardReadersApi.md#cancelcurrentlyinitiatedbluetoothdeviceupdate) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/cancelUpdate | Cancel currently initiated install update for bluetooth terminal
-[**CancelReaderAction**](CardReadersApi.md#cancelreaderaction) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/{readerId}/cancel_action | Cancel terminals action
-[**CardReadersGetReader**](CardReadersApi.md#cardreadersgetreader) | **GET** /api/v1.0/{appId}/payments/terminals/stripe/{readerId} | Get reader
-[**GenerateStripeTerminalLocation**](CardReadersApi.md#generatestripeterminallocation) | **POST** /api/v1.0/{appId}/stripeterminal/location | Get Location ID for Stripe Terminal
-[**GetBluetoothTerminalStatus**](CardReadersApi.md#getbluetoothterminalstatus) | **GET** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/status | Get the status of the bluetooth terminal
-[**GetStripeConnectionToken**](CardReadersApi.md#getstripeconnectiontoken) | **GET** /api/v1.0/{appId}/stripeterminal/connectiontoken | Get Connection Token For a Stripe Terminal
-[**InitiateBluetoothTerminalDeviceUpdateCheck**](CardReadersApi.md#initiatebluetoothterminaldeviceupdatecheck) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/checkForUpdate | Trigger check for Bluetooth device update on Kiosk
-[**InitiateKioskBluetoothPairingMode**](CardReadersApi.md#initiatekioskbluetoothpairingmode) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/pair | Initiate stripe terminal pairing mode
-[**InitiateKioskBluetoothUpdateInstall**](CardReadersApi.md#initiatekioskbluetoothupdateinstall) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/installUpdate | Initiate Kiosk Update Install for bluetooth terminal
-[**InitiateReaderProcessPaymentIntent**](CardReadersApi.md#initiatereaderprocesspaymentintent) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/{readerId}/processPaymentIntent | Initiate Stripe terminal to Process Payment Intent
+[**CancelCurrentlyInitiatedBluetoothDeviceUpdate**](CardReadersApi.md#cancelcurrentlyinitiatedbluetoothdeviceupdate) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/cancelUpdate | 
+[**CancelReaderAction**](CardReadersApi.md#cancelreaderaction) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/{readerId}/cancel_action | 
+[**CardReadersGetReader**](CardReadersApi.md#cardreadersgetreader) | **GET** /api/v1.0/{appId}/payments/terminals/stripe/{readerId} | 
+[**GenerateStripeTerminalLocation**](CardReadersApi.md#generatestripeterminallocation) | **POST** /api/v1.0/{appId}/stripeterminal/location | 
+[**GetBluetoothTerminalStatus**](CardReadersApi.md#getbluetoothterminalstatus) | **GET** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/status | 
+[**GetKioskStripeLocation**](CardReadersApi.md#getkioskstripelocation) | **GET** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/stripe-location | 
+[**GetStripeConnectionToken**](CardReadersApi.md#getstripeconnectiontoken) | **GET** /api/v1.0/{appId}/stripeterminal/connectiontoken | 
+[**InitiateBluetoothTerminalDeviceUpdateCheck**](CardReadersApi.md#initiatebluetoothterminaldeviceupdatecheck) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/checkForUpdate | 
+[**InitiateKioskBluetoothPairingMode**](CardReadersApi.md#initiatekioskbluetoothpairingmode) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/pair | 
+[**InitiateKioskBluetoothUpdateInstall**](CardReadersApi.md#initiatekioskbluetoothupdateinstall) | **POST** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/installUpdate | 
+[**InitiateReaderProcessPaymentIntent**](CardReadersApi.md#initiatereaderprocesspaymentintent) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/{readerId}/processPaymentIntent | 
 [**RegisterStripeTerminal**](CardReadersApi.md#registerstripeterminal) | **POST** /api/v1.0/{appId}/payments/terminals/stripe/register | 
-[**UnRegisterTerminal**](CardReadersApi.md#unregisterterminal) | **DELETE** /api/v1.0/{appId}/payments/terminals/stripe/unregister | Un-register terminal by deleting it from stripe
-[**UnpairCurrentlyPairedBluetoothDevice**](CardReadersApi.md#unpaircurrentlypairedbluetoothdevice) | **DELETE** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/unpair | Unpair the currently paired stripe terminal
+[**UnRegisterTerminal**](CardReadersApi.md#unregisterterminal) | **DELETE** /api/v1.0/{appId}/payments/terminals/stripe/unregister | 
+[**UnpairCurrentlyPairedBluetoothDevice**](CardReadersApi.md#unpaircurrentlypairedbluetoothdevice) | **DELETE** /api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/unpair | 
 
 
-<a name="authorizestripeterminal"></a>
-# **AuthorizeStripeTerminal**
-> RestApiResultStripeTerminalPrivateKey AuthorizeStripeTerminal (string appId)
+<a name="cancelcurrentlyinitiatedbluetoothdeviceupdate"></a>
+# **CancelCurrentlyInitiatedBluetoothDeviceUpdate**
+> void CancelCurrentlyInitiatedBluetoothDeviceUpdate (string appId, string deviceId, string terminalType)
 
-Get Authorization Key for Stripe Terminal
 
-Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class AuthorizeStripeTerminalExample
+    public class CancelCurrentlyInitiatedBluetoothDeviceUpdateExample
     {
         public void main()
         {
@@ -47,16 +45,16 @@ namespace Example
 
             var apiInstance = new CardReadersApi();
             var appId = appId_example;  // string | 
+            var deviceId = deviceId_example;  // string | 
+            var terminalType = terminalType_example;  // string | 
 
             try
             {
-                // Get Authorization Key for Stripe Terminal
-                RestApiResultStripeTerminalPrivateKey result = apiInstance.AuthorizeStripeTerminal(appId);
-                Debug.WriteLine(result);
+                apiInstance.CancelCurrentlyInitiatedBluetoothDeviceUpdate(appId, deviceId, terminalType);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling CardReadersApi.AuthorizeStripeTerminal: " + e.Message );
+                Debug.Print("Exception when calling CardReadersApi.CancelCurrentlyInitiatedBluetoothDeviceUpdate: " + e.Message );
             }
         }
     }
@@ -68,10 +66,12 @@ namespace Example
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **appId** | **string**|  | 
+ **deviceId** | **string**|  | 
+ **terminalType** | **string**|  | 
 
 ### Return type
 
-[**RestApiResultStripeTerminalPrivateKey**](RestApiResultStripeTerminalPrivateKey.md)
+void (empty response body)
 
 ### Authorization
 
@@ -84,25 +84,23 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="cancelcurrentlyinitiatedbluetoothdeviceupdate"></a>
-# **CancelCurrentlyInitiatedBluetoothDeviceUpdate**
-> void CancelCurrentlyInitiatedBluetoothDeviceUpdate (string appId, string deviceId, string terminalType)
+<a name="cancelreaderaction"></a>
+# **CancelReaderAction**
+> RestApiResultCardReader CancelReaderAction (string readerId, string appId)
 
-Cancel currently initiated install update for bluetooth terminal
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class CancelCurrentlyInitiatedBluetoothDeviceUpdateExample
+    public class CancelReaderActionExample
     {
         public void main()
         {
@@ -110,18 +108,17 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CardReadersApi();
+            var readerId = readerId_example;  // string | 
             var appId = appId_example;  // string | 
-            var deviceId = deviceId_example;  // string | 
-            var terminalType = terminalType_example;  // string | 
 
             try
             {
-                // Cancel currently initiated install update for bluetooth terminal
-                apiInstance.CancelCurrentlyInitiatedBluetoothDeviceUpdate(appId, deviceId, terminalType);
+                RestApiResultCardReader result = apiInstance.CancelReaderAction(readerId, appId);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling CardReadersApi.CancelCurrentlyInitiatedBluetoothDeviceUpdate: " + e.Message );
+                Debug.Print("Exception when calling CardReadersApi.CancelReaderAction: " + e.Message );
             }
         }
     }
@@ -132,13 +129,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **readerId** | **string**|  | 
  **appId** | **string**|  | 
- **deviceId** | **string**|  | 
- **terminalType** | **string**|  | 
 
 ### Return type
 
-void (empty response body)
+[**RestApiResultCardReader**](RestApiResultCardReader.md)
 
 ### Authorization
 
@@ -151,25 +147,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="cancelreaderaction"></a>
-# **CancelReaderAction**
-> RestApiResultCardReader CancelReaderAction (string readerId, string appId)
+<a name="cardreadersgetreader"></a>
+# **CardReadersGetReader**
+> RestApiResultCardReader CardReadersGetReader (string readerId, string appId)
 
-Cancel terminals action
 
-Can only be called by Kiosk
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class CancelReaderActionExample
+    public class CardReadersGetReaderExample
     {
         public void main()
         {
@@ -182,13 +176,12 @@ namespace Example
 
             try
             {
-                // Cancel terminals action
-                RestApiResultCardReader result = apiInstance.CancelReaderAction(readerId, appId);
+                RestApiResultCardReader result = apiInstance.CardReadersGetReader(readerId, appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling CardReadersApi.CancelReaderAction: " + e.Message );
+                Debug.Print("Exception when calling CardReadersApi.CardReadersGetReader: " + e.Message );
             }
         }
     }
@@ -217,25 +210,23 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="cardreadersgetreader"></a>
-# **CardReadersGetReader**
-> RestApiResultCardReader CardReadersGetReader (string readerId, string appId)
+<a name="generatestripeterminallocation"></a>
+# **GenerateStripeTerminalLocation**
+> RestApiResultStripeTerminalLocation GenerateStripeTerminalLocation (GeoPointRequest geoPointRequest, string appId)
 
-Get reader
 
-Can only be called by Kiosk
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class CardReadersGetReaderExample
+    public class GenerateStripeTerminalLocationExample
     {
         public void main()
         {
@@ -243,18 +234,17 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CardReadersApi();
-            var readerId = readerId_example;  // string | 
+            var geoPointRequest = new GeoPointRequest(); // GeoPointRequest | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Get reader
-                RestApiResultCardReader result = apiInstance.CardReadersGetReader(readerId, appId);
+                RestApiResultStripeTerminalLocation result = apiInstance.GenerateStripeTerminalLocation(geoPointRequest, appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling CardReadersApi.CardReadersGetReader: " + e.Message );
+                Debug.Print("Exception when calling CardReadersApi.GenerateStripeTerminalLocation: " + e.Message );
             }
         }
     }
@@ -265,12 +255,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **readerId** | **string**|  | 
+ **geoPointRequest** | [**GeoPointRequest**](GeoPointRequest.md)|  | 
  **appId** | **string**|  | 
 
 ### Return type
 
-[**RestApiResultCardReader**](RestApiResultCardReader.md)
+[**RestApiResultStripeTerminalLocation**](RestApiResultStripeTerminalLocation.md)
 
 ### Authorization
 
@@ -278,30 +268,28 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
  - **Accept**: application/json, text/json, application/xml, text/xml
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="generatestripeterminallocation"></a>
-# **GenerateStripeTerminalLocation**
-> RestApiResultStripeTerminalLocation GenerateStripeTerminalLocation (GeoPointRequest geoPointRequest, string appId)
+<a name="getbluetoothterminalstatus"></a>
+# **GetBluetoothTerminalStatus**
+> RestApiResultBluetoothTerminalStatus GetBluetoothTerminalStatus (string appId, string deviceId)
 
-Get Location ID for Stripe Terminal
 
-Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GenerateStripeTerminalLocationExample
+    public class GetBluetoothTerminalStatusExample
     {
         public void main()
         {
@@ -309,18 +297,17 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CardReadersApi();
-            var geoPointRequest = new GeoPointRequest(); // GeoPointRequest | 
             var appId = appId_example;  // string | 
+            var deviceId = deviceId_example;  // string | 
 
             try
             {
-                // Get Location ID for Stripe Terminal
-                RestApiResultStripeTerminalLocation result = apiInstance.GenerateStripeTerminalLocation(geoPointRequest, appId);
+                RestApiResultBluetoothTerminalStatus result = apiInstance.GetBluetoothTerminalStatus(appId, deviceId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling CardReadersApi.GenerateStripeTerminalLocation: " + e.Message );
+                Debug.Print("Exception when calling CardReadersApi.GetBluetoothTerminalStatus: " + e.Message );
             }
         }
     }
@@ -331,12 +318,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **geoPointRequest** | [**GeoPointRequest**](GeoPointRequest.md)|  | 
  **appId** | **string**|  | 
+ **deviceId** | **string**|  | 
 
 ### Return type
 
-[**RestApiResultStripeTerminalLocation**](RestApiResultStripeTerminalLocation.md)
+[**RestApiResultBluetoothTerminalStatus**](RestApiResultBluetoothTerminalStatus.md)
 
 ### Authorization
 
@@ -344,30 +331,28 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Content-Type**: Not defined
  - **Accept**: application/json, text/json, application/xml, text/xml
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="getbluetoothterminalstatus"></a>
-# **GetBluetoothTerminalStatus**
-> RestApiResultBluetoothTerminalStatus GetBluetoothTerminalStatus (string appId, string deviceId)
+<a name="getkioskstripelocation"></a>
+# **GetKioskStripeLocation**
+> RestApiResultKioskStripeLocation GetKioskStripeLocation (string appId, string deviceId)
 
-Get the status of the bluetooth terminal
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GetBluetoothTerminalStatusExample
+    public class GetKioskStripeLocationExample
     {
         public void main()
         {
@@ -380,13 +365,12 @@ namespace Example
 
             try
             {
-                // Get the status of the bluetooth terminal
-                RestApiResultBluetoothTerminalStatus result = apiInstance.GetBluetoothTerminalStatus(appId, deviceId);
+                RestApiResultKioskStripeLocation result = apiInstance.GetKioskStripeLocation(appId, deviceId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling CardReadersApi.GetBluetoothTerminalStatus: " + e.Message );
+                Debug.Print("Exception when calling CardReadersApi.GetKioskStripeLocation: " + e.Message );
             }
         }
     }
@@ -402,7 +386,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**RestApiResultBluetoothTerminalStatus**](RestApiResultBluetoothTerminalStatus.md)
+[**RestApiResultKioskStripeLocation**](RestApiResultKioskStripeLocation.md)
 
 ### Authorization
 
@@ -419,17 +403,15 @@ Name | Type | Description  | Notes
 # **GetStripeConnectionToken**
 > RestApiResultStripeTerminalConnectionToken GetStripeConnectionToken (string appId)
 
-Get Connection Token For a Stripe Terminal
 
-Can only be called by Kiosk
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -445,7 +427,6 @@ namespace Example
 
             try
             {
-                // Get Connection Token For a Stripe Terminal
                 RestApiResultStripeTerminalConnectionToken result = apiInstance.GetStripeConnectionToken(appId);
                 Debug.WriteLine(result);
             }
@@ -483,17 +464,15 @@ Name | Type | Description  | Notes
 # **InitiateBluetoothTerminalDeviceUpdateCheck**
 > void InitiateBluetoothTerminalDeviceUpdateCheck (string appId, string deviceId, string terminalType)
 
-Trigger check for Bluetooth device update on Kiosk
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -511,7 +490,6 @@ namespace Example
 
             try
             {
-                // Trigger check for Bluetooth device update on Kiosk
                 apiInstance.InitiateBluetoothTerminalDeviceUpdateCheck(appId, deviceId, terminalType);
             }
             catch (Exception e)
@@ -550,17 +528,15 @@ void (empty response body)
 # **InitiateKioskBluetoothPairingMode**
 > void InitiateKioskBluetoothPairingMode (string appId, string deviceId, string terminalType)
 
-Initiate stripe terminal pairing mode
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -578,7 +554,6 @@ namespace Example
 
             try
             {
-                // Initiate stripe terminal pairing mode
                 apiInstance.InitiateKioskBluetoothPairingMode(appId, deviceId, terminalType);
             }
             catch (Exception e)
@@ -617,17 +592,15 @@ void (empty response body)
 # **InitiateKioskBluetoothUpdateInstall**
 > void InitiateKioskBluetoothUpdateInstall (string appId, string deviceId, string terminalType)
 
-Initiate Kiosk Update Install for bluetooth terminal
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -645,7 +618,6 @@ namespace Example
 
             try
             {
-                // Initiate Kiosk Update Install for bluetooth terminal
                 apiInstance.InitiateKioskBluetoothUpdateInstall(appId, deviceId, terminalType);
             }
             catch (Exception e)
@@ -684,17 +656,15 @@ void (empty response body)
 # **InitiateReaderProcessPaymentIntent**
 > RestApiResultCardReader InitiateReaderProcessPaymentIntent (ProcessPaymentIntentRequest request, string readerId, string appId)
 
-Initiate Stripe terminal to Process Payment Intent
 
-Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -712,7 +682,6 @@ namespace Example
 
             try
             {
-                // Initiate Stripe terminal to Process Payment Intent
                 RestApiResultCardReader result = apiInstance.InitiateReaderProcessPaymentIntent(request, readerId, appId);
                 Debug.WriteLine(result);
             }
@@ -758,9 +727,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -815,17 +784,15 @@ Name | Type | Description  | Notes
 # **UnRegisterTerminal**
 > RestApiResultCardReader UnRegisterTerminal (UnRegisterCardReaderRequest request, string appId)
 
-Un-register terminal by deleting it from stripe
 
-Can only be called by Kiosk
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -842,7 +809,6 @@ namespace Example
 
             try
             {
-                // Un-register terminal by deleting it from stripe
                 RestApiResultCardReader result = apiInstance.UnRegisterTerminal(request, appId);
                 Debug.WriteLine(result);
             }
@@ -881,17 +847,15 @@ Name | Type | Description  | Notes
 # **UnpairCurrentlyPairedBluetoothDevice**
 > void UnpairCurrentlyPairedBluetoothDevice (string appId, string deviceId)
 
-Unpair the currently paired stripe terminal
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -908,7 +872,6 @@ namespace Example
 
             try
             {
-                // Unpair the currently paired stripe terminal
                 apiInstance.UnpairCurrentlyPairedBluetoothDevice(appId, deviceId);
             }
             catch (Exception e)
diff --git a/docs/CardWithToken.md b/docs/CardWithToken.md
deleted file mode 100644
index 5b7e09b6..00000000
--- a/docs/CardWithToken.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.CardWithToken
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Token** | **string** | Token | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/Cart.md b/docs/Cart.md
deleted file mode 100644
index 6a3412aa..00000000
--- a/docs/Cart.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# IO.Swagger.Model.Cart
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**LineItems** | [**List&lt;LineItem&gt;**](LineItem.md) | Line items from the cart | [optional] 
-**CartAmount** | [**Price**](Price.md) | Total cart price | [optional] 
-**Tip** | [**Price**](Price.md) | Total tip amount | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CatalogChangesApi.md b/docs/CatalogChangesApi.md
index 5b5ca91e..f5b58d29 100644
--- a/docs/CatalogChangesApi.md
+++ b/docs/CatalogChangesApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.CatalogChangesApi
+# Flipdish.Api.CatalogChangesApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -21,9 +21,9 @@ Get menu pending changes from Catalog groups and items
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -91,9 +91,9 @@ Get menu pending changes summaries by appId
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -155,9 +155,9 @@ Update menus with the pending changes from Catalog groups and items
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/CatalogGroup.md b/docs/CatalogGroup.md
deleted file mode 100644
index 3c6c74fc..00000000
--- a/docs/CatalogGroup.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Flipdish.Model.CatalogGroup
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**CatalogGroupId** | **string** | Unique catalog group id | [optional] 
-**CatalogItemId** | **string** | Unique catalog item id | [optional] 
-**IsArchived** | **bool?** | Returns true if the group is archived | [optional] 
-**MinSelectCount** | **int?** | Minimum number of items that the user has to select | [optional] 
-**MaxSelectCount** | **int?** | Maximum number of items that the user has to select | [optional] 
-**Items** | [**List&lt;CatalogItemReference&gt;**](CatalogItemReference.md) | Collection of items associated with this product | [optional] 
-**Metafields** | [**List&lt;Metafield&gt;**](Metafield.md) | Collection of metafields | [optional] 
-**GroupType** | **string** | Type of group (ModifierGroup, etc) | 
-**Sku** | **string** | Stock Keeping Unit (SKU) | 
-**Name** | **string** | Group name | 
-**AutogenerateDisplayText** | **bool?** | Autogenerate display text in ordering applications | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CatalogGroupArchivedEvent.md b/docs/CatalogGroupArchivedEvent.md
index 27b4fdff..edd259bc 100644
--- a/docs/CatalogGroupArchivedEvent.md
+++ b/docs/CatalogGroupArchivedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CatalogGroupArchivedEvent
+# Flipdish.Model.CatalogGroupArchivedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CatalogGroupCreatedEvent.md b/docs/CatalogGroupCreatedEvent.md
index 6c32da23..023f025d 100644
--- a/docs/CatalogGroupCreatedEvent.md
+++ b/docs/CatalogGroupCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CatalogGroupCreatedEvent
+# Flipdish.Model.CatalogGroupCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CatalogGroupReference.md b/docs/CatalogGroupReference.md
index b7ec20f1..f5b4189d 100644
--- a/docs/CatalogGroupReference.md
+++ b/docs/CatalogGroupReference.md
@@ -1,9 +1,9 @@
-# IO.Swagger.Model.CatalogGroupReference
+# Flipdish.Model.CatalogGroupReference
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Group** | [**Group**](Group.md) | Details of the referenced {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem} | [optional] 
+**Group** | [**Group**](Group.md) | Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Items.CatalogItem} | [optional] 
 **CatalogGroupId** | **string** | Identifier of the ProductId to use as SubProduct | 
 **CatalogItemId** | **string** | Identifier of the ProductId to use as SubProduct | [optional] 
 **GroupType** | **string** | Type of the SupProduct | 
diff --git a/docs/CatalogGroupUpdatedEvent.md b/docs/CatalogGroupUpdatedEvent.md
index 0ecb9db2..deeefc99 100644
--- a/docs/CatalogGroupUpdatedEvent.md
+++ b/docs/CatalogGroupUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CatalogGroupUpdatedEvent
+# Flipdish.Model.CatalogGroupUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CatalogGroupsApi.md b/docs/CatalogGroupsApi.md
index 59db28e9..313f605e 100644
--- a/docs/CatalogGroupsApi.md
+++ b/docs/CatalogGroupsApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.CatalogGroupsApi
+# Flipdish.Api.CatalogGroupsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -24,9 +24,9 @@ Archive Catalog Group
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -89,9 +89,9 @@ Create a Catalog Group
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -155,9 +155,9 @@ Duplicate Catalog Group
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -220,9 +220,9 @@ Get group by Id
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -286,9 +286,9 @@ Get paginated groups by app name id filtered by types
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -358,9 +358,9 @@ Update Catalog Group
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/CatalogImage.md b/docs/CatalogImage.md
index b0fa2e32..4dd9f6d6 100644
--- a/docs/CatalogImage.md
+++ b/docs/CatalogImage.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CatalogImage
+# Flipdish.Model.CatalogImage
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CatalogImagesApi.md b/docs/CatalogImagesApi.md
index e6ae9d6c..a52038c3 100644
--- a/docs/CatalogImagesApi.md
+++ b/docs/CatalogImagesApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.CatalogImagesApi
+# Flipdish.Api.CatalogImagesApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -19,9 +19,9 @@ Upload a Catalog Image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/CatalogItem.md b/docs/CatalogItem.md
index bfd4f8f9..bb2172f8 100644
--- a/docs/CatalogItem.md
+++ b/docs/CatalogItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CatalogItem
+# Flipdish.Model.CatalogItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CatalogItemArchivedEvent.md b/docs/CatalogItemArchivedEvent.md
index 64e0a84d..6e99707c 100644
--- a/docs/CatalogItemArchivedEvent.md
+++ b/docs/CatalogItemArchivedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CatalogItemArchivedEvent
+# Flipdish.Model.CatalogItemArchivedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CatalogItemCreatedEvent.md b/docs/CatalogItemCreatedEvent.md
index c319eb2b..a3696480 100644
--- a/docs/CatalogItemCreatedEvent.md
+++ b/docs/CatalogItemCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CatalogItemCreatedEvent
+# Flipdish.Model.CatalogItemCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CatalogItemReference.md b/docs/CatalogItemReference.md
deleted file mode 100644
index 05683cf5..00000000
--- a/docs/CatalogItemReference.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.CatalogItemReference
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Item** | [**CatalogItem**](CatalogItem.md) | Details of the referenced {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem} | [optional] 
-**CatalogItemId** | **string** | Identifier of the CatalogItemId to use as SubProduct | 
-**ItemType** | **string** | Type of the SupProduct | 
-**PreselectedQuantity** | **int?** | Quantity of the modifier that will be set when the parent product is placed in the basket | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CatalogItemUpdatedEvent.md b/docs/CatalogItemUpdatedEvent.md
index fbb1d44d..939d563f 100644
--- a/docs/CatalogItemUpdatedEvent.md
+++ b/docs/CatalogItemUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CatalogItemUpdatedEvent
+# Flipdish.Model.CatalogItemUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CatalogItemsApi.md b/docs/CatalogItemsApi.md
index f22e919c..1577ec98 100644
--- a/docs/CatalogItemsApi.md
+++ b/docs/CatalogItemsApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.CatalogItemsApi
+# Flipdish.Api.CatalogItemsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -24,9 +24,9 @@ Archive Catalog Item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -89,9 +89,9 @@ Create a Catalog Item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -155,9 +155,9 @@ Duplicate Catalog Item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -220,9 +220,9 @@ Get item by Id
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -286,9 +286,9 @@ Get paginated items by app name id filtered by types
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -358,9 +358,9 @@ Update Catalog Item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/CatalogProductsApi.md b/docs/CatalogProductsApi.md
index a872babd..ac0af20c 100644
--- a/docs/CatalogProductsApi.md
+++ b/docs/CatalogProductsApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.CatalogProductsApi
+# Flipdish.Api.CatalogProductsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -24,9 +24,9 @@ Archive Product
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -89,9 +89,9 @@ Create a Product
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -155,9 +155,9 @@ Duplicate Product
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -220,9 +220,9 @@ Get Product by Id
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -286,9 +286,9 @@ Get paginated products by app name id filtered by types
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -358,9 +358,9 @@ Update Product
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/CertificateCreatedEvent.md b/docs/CertificateCreatedEvent.md
index d8ebc687..930efb63 100644
--- a/docs/CertificateCreatedEvent.md
+++ b/docs/CertificateCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CertificateCreatedEvent
+# Flipdish.Model.CertificateCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,7 +9,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CertificateRenewedEvent.md b/docs/CertificateRenewedEvent.md
index 93ca9f67..78be1125 100644
--- a/docs/CertificateRenewedEvent.md
+++ b/docs/CertificateRenewedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CertificateRenewedEvent
+# Flipdish.Model.CertificateRenewedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,7 +9,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ChangePasswordModel.md b/docs/ChangePasswordModel.md
index 464a8d9c..643b370a 100644
--- a/docs/ChangePasswordModel.md
+++ b/docs/ChangePasswordModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ChangePasswordModel
+# Flipdish.Model.ChangePasswordModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Channel.md b/docs/Channel.md
index aed5f859..b540584e 100644
--- a/docs/Channel.md
+++ b/docs/Channel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Channel
+# Flipdish.Model.Channel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ChannelStoreMapping.md b/docs/ChannelStoreMapping.md
deleted file mode 100644
index 68701077..00000000
--- a/docs/ChannelStoreMapping.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.ChannelStoreMapping
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**StoreId** | **int?** |  | [optional] 
-**ChannelStoreId** | **string** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/ChannelStoresUpdatedEvent.md b/docs/ChannelStoresUpdatedEvent.md
new file mode 100644
index 00000000..e622d12e
--- /dev/null
+++ b/docs/ChannelStoresUpdatedEvent.md
@@ -0,0 +1,20 @@
+# Flipdish.Model.ChannelStoresUpdatedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
+**ChannelId** | **int?** | ID of the channel | [optional] 
+**StoreIds** | **List&lt;int?&gt;** | List of store ids | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User info | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ChannelsApi.md b/docs/ChannelsApi.md
index 15843192..c6f7abaa 100644
--- a/docs/ChannelsApi.md
+++ b/docs/ChannelsApi.md
@@ -1,36 +1,36 @@
-# IO.Swagger.Api.ChannelsApi
+# Flipdish.Api.ChannelsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AssignAppIdToSalesChannel**](ChannelsApi.md#assignappidtosaleschannel) | **POST** /api/v1.0/{appId}/channels/{channelId}/assign-appId | Assign a given AppId to a Sales Channel
-[**AssignStoreToChannel**](ChannelsApi.md#assignstoretochannel) | **POST** /api/v1.0/{appId}/channels/assign-store | Assign a Store to a Sales Channel
-[**AttachStoreToSalesChannel**](ChannelsApi.md#attachstoretosaleschannel) | **POST** /api/v1.0/{appId}/channels/{channelId}/stores/{storeId} | Attachs the specified store to the given sales channel.
-[**DetachAllStoresFromSalesChannel**](ChannelsApi.md#detachallstoresfromsaleschannel) | **DELETE** /api/v1.0/{appId}/channels/{channelId}/stores | Detaches all the stores from the given sales channel.
-[**DetachStoreFromSalesChannel**](ChannelsApi.md#detachstorefromsaleschannel) | **DELETE** /api/v1.0/{appId}/channels/{channelId}/stores/{storeId} | Detaches the specified store from the given sales channel.
-[**GetAssignedChannels**](ChannelsApi.md#getassignedchannels) | **GET** /api/v1.0/{appId}/channels/assigned-channels | Returns a list of sales channels that are assigned to a given AppId
-[**GetAvailableChannels**](ChannelsApi.md#getavailablechannels) | **GET** /api/v1.0/{appId}/channels/available-channels | Returns a list of sales channels that are not yet assigned to a given AppId
-[**GetChannel**](ChannelsApi.md#getchannel) | **GET** /api/v1.0/{appId}/channels/{id} | Returns a Sales Channel by Id.
-[**GetChannels**](ChannelsApi.md#getchannels) | **GET** /api/v1.0/{appId}/channels | Returns a list of enabled Channels
-[**GetStoresAssignedToChannel**](ChannelsApi.md#getstoresassignedtochannel) | **GET** /api/v1.0/{appId}/channels/{channelId}/assigned-stores | Returns a list of stores of an AppId that are assigned to a given Sales Channel
-[**GetStoresBySalesChannel**](ChannelsApi.md#getstoresbysaleschannel) | **GET** /api/v1.0/{appId}/channels/{channelId}/stores | Returns a list of store ids attached to the given channel type for the specified app.
-[**UnassignStoreFromChannel**](ChannelsApi.md#unassignstorefromchannel) | **DELETE** /api/v1.0/{appId}/channels/unassign-store | Unassign a Store from a Sales Channel
+[**AssignAppIdToSalesChannel**](ChannelsApi.md#assignappidtosaleschannel) | **POST** /api/v1.0/{appId}/channels/{channelId}/assign-appId | 
+[**AssignStoreToChannel**](ChannelsApi.md#assignstoretochannel) | **POST** /api/v1.0/{appId}/channels/assign-store | 
+[**AttachStoreToSalesChannel**](ChannelsApi.md#attachstoretosaleschannel) | **POST** /api/v1.0/{appId}/channels/{channelId}/stores/{storeId} | 
+[**DetachAllStoresFromSalesChannel**](ChannelsApi.md#detachallstoresfromsaleschannel) | **DELETE** /api/v1.0/{appId}/channels/{channelId}/stores | 
+[**DetachStoreFromSalesChannel**](ChannelsApi.md#detachstorefromsaleschannel) | **DELETE** /api/v1.0/{appId}/channels/{channelId}/stores/{storeId} | 
+[**GetAssignedChannels**](ChannelsApi.md#getassignedchannels) | **GET** /api/v1.0/{appId}/channels/assigned-channels | 
+[**GetAvailableChannels**](ChannelsApi.md#getavailablechannels) | **GET** /api/v1.0/{appId}/channels/available-channels | 
+[**GetChannel**](ChannelsApi.md#getchannel) | **GET** /api/v1.0/{appId}/channels/{id} | 
+[**GetChannels**](ChannelsApi.md#getchannels) | **GET** /api/v1.0/{appId}/channels | 
+[**GetStoresAssignedToChannel**](ChannelsApi.md#getstoresassignedtochannel) | **GET** /api/v1.0/{appId}/channels/{channelId}/assigned-stores | 
+[**GetStoresBySalesChannel**](ChannelsApi.md#getstoresbysaleschannel) | **GET** /api/v1.0/{appId}/channels/{channelId}/stores | 
+[**UnassignStoreFromChannel**](ChannelsApi.md#unassignstorefromchannel) | **DELETE** /api/v1.0/{appId}/channels/unassign-store | 
 
 
 <a name="assignappidtosaleschannel"></a>
 # **AssignAppIdToSalesChannel**
 > Object AssignAppIdToSalesChannel (string appId, int? channelId)
 
-Assign a given AppId to a Sales Channel
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -42,12 +42,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var appId = appId_example;  // string | Application Id (AppNameIdxxx)
-            var channelId = 56;  // int? | Channel Id (123, 456)
+            var appId = appId_example;  // string | 
+            var channelId = 56;  // int? | 
 
             try
             {
-                // Assign a given AppId to a Sales Channel
                 Object result = apiInstance.AssignAppIdToSalesChannel(appId, channelId);
                 Debug.WriteLine(result);
             }
@@ -64,8 +63,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id (AppNameIdxxx) | 
- **channelId** | **int?**| Channel Id (123, 456) | 
+ **appId** | **string**|  | 
+ **channelId** | **int?**|  | 
 
 ### Return type
 
@@ -86,15 +85,15 @@ Name | Type | Description  | Notes
 # **AssignStoreToChannel**
 > Object AssignStoreToChannel (int? storeId, string appId, int? channelId)
 
-Assign a Store to a Sales Channel
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -106,13 +105,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var storeId = 56;  // int? | Store Id (123, 456)
-            var appId = appId_example;  // string | AppId (AppNameIdxxx)
-            var channelId = 56;  // int? | Channel Id (123, 456)
+            var storeId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var channelId = 56;  // int? | 
 
             try
             {
-                // Assign a Store to a Sales Channel
                 Object result = apiInstance.AssignStoreToChannel(storeId, appId, channelId);
                 Debug.WriteLine(result);
             }
@@ -129,9 +127,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id (123, 456) | 
- **appId** | **string**| AppId (AppNameIdxxx) | 
- **channelId** | **int?**| Channel Id (123, 456) | 
+ **storeId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **channelId** | **int?**|  | 
 
 ### Return type
 
@@ -152,15 +150,15 @@ Name | Type | Description  | Notes
 # **AttachStoreToSalesChannel**
 > Object AttachStoreToSalesChannel (string appId, int? channelId, int? storeId)
 
-Attachs the specified store to the given sales channel.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -172,13 +170,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var appId = appId_example;  // string | Application Id (AppNameId)
-            var channelId = 56;  // int? | Type of sales channel (Android, IOS, Web, etc.)
-            var storeId = 56;  // int? | Store Id (Phyisical Restaurant) to attach.
+            var appId = appId_example;  // string | 
+            var channelId = 56;  // int? | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Attachs the specified store to the given sales channel.
                 Object result = apiInstance.AttachStoreToSalesChannel(appId, channelId, storeId);
                 Debug.WriteLine(result);
             }
@@ -195,9 +192,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id (AppNameId) | 
- **channelId** | **int?**| Type of sales channel (Android, IOS, Web, etc.) | 
- **storeId** | **int?**| Store Id (Phyisical Restaurant) to attach. | 
+ **appId** | **string**|  | 
+ **channelId** | **int?**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -218,15 +215,15 @@ Name | Type | Description  | Notes
 # **DetachAllStoresFromSalesChannel**
 > Object DetachAllStoresFromSalesChannel (string appId, int? channelId)
 
-Detaches all the stores from the given sales channel.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -238,12 +235,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var appId = appId_example;  // string | Application Id (AppNameId)
-            var channelId = 56;  // int? | Type of sales channel (Android, IOS, Web, etc.)
+            var appId = appId_example;  // string | 
+            var channelId = 56;  // int? | 
 
             try
             {
-                // Detaches all the stores from the given sales channel.
                 Object result = apiInstance.DetachAllStoresFromSalesChannel(appId, channelId);
                 Debug.WriteLine(result);
             }
@@ -260,8 +256,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id (AppNameId) | 
- **channelId** | **int?**| Type of sales channel (Android, IOS, Web, etc.) | 
+ **appId** | **string**|  | 
+ **channelId** | **int?**|  | 
 
 ### Return type
 
@@ -282,15 +278,15 @@ Name | Type | Description  | Notes
 # **DetachStoreFromSalesChannel**
 > Object DetachStoreFromSalesChannel (string appId, int? channelId, int? storeId)
 
-Detaches the specified store from the given sales channel.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -302,13 +298,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var appId = appId_example;  // string | Application Id (AppNameId)
-            var channelId = 56;  // int? | Type of sales channel (Android, IOS, Web, etc.)
-            var storeId = 56;  // int? | Store Id (Phyisical Restaurant) to detach.
+            var appId = appId_example;  // string | 
+            var channelId = 56;  // int? | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Detaches the specified store from the given sales channel.
                 Object result = apiInstance.DetachStoreFromSalesChannel(appId, channelId, storeId);
                 Debug.WriteLine(result);
             }
@@ -325,9 +320,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id (AppNameId) | 
- **channelId** | **int?**| Type of sales channel (Android, IOS, Web, etc.) | 
- **storeId** | **int?**| Store Id (Phyisical Restaurant) to detach. | 
+ **appId** | **string**|  | 
+ **channelId** | **int?**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -348,15 +343,15 @@ Name | Type | Description  | Notes
 # **GetAssignedChannels**
 > RestApiArrayResultChannel GetAssignedChannels (string appId)
 
-Returns a list of sales channels that are assigned to a given AppId
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -368,11 +363,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var appId = appId_example;  // string | Application Id (AppNameIdxxx)
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Returns a list of sales channels that are assigned to a given AppId
                 RestApiArrayResultChannel result = apiInstance.GetAssignedChannels(appId);
                 Debug.WriteLine(result);
             }
@@ -389,7 +383,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id (AppNameIdxxx) | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -410,15 +404,15 @@ Name | Type | Description  | Notes
 # **GetAvailableChannels**
 > RestApiArrayResultChannel GetAvailableChannels (string appId)
 
-Returns a list of sales channels that are not yet assigned to a given AppId
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -430,11 +424,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var appId = appId_example;  // string | Application Id (AppNameIdxxx)
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Returns a list of sales channels that are not yet assigned to a given AppId
                 RestApiArrayResultChannel result = apiInstance.GetAvailableChannels(appId);
                 Debug.WriteLine(result);
             }
@@ -451,7 +444,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id (AppNameIdxxx) | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -472,15 +465,15 @@ Name | Type | Description  | Notes
 # **GetChannel**
 > RestApiResultChannel GetChannel (int? id, string appId)
 
-Returns a Sales Channel by Id.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -492,12 +485,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var id = 56;  // int? | ChannelId
-            var appId = appId_example;  // string | AppId
+            var id = 56;  // int? | 
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Returns a Sales Channel by Id.
                 RestApiResultChannel result = apiInstance.GetChannel(id, appId);
                 Debug.WriteLine(result);
             }
@@ -514,8 +506,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **int?**| ChannelId | 
- **appId** | **string**| AppId | 
+ **id** | **int?**|  | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -536,15 +528,15 @@ Name | Type | Description  | Notes
 # **GetChannels**
 > RestApiArrayResultChannel GetChannels (string appId)
 
-Returns a list of enabled Channels
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -560,7 +552,6 @@ namespace Example
 
             try
             {
-                // Returns a list of enabled Channels
                 RestApiArrayResultChannel result = apiInstance.GetChannels(appId);
                 Debug.WriteLine(result);
             }
@@ -598,15 +589,15 @@ Name | Type | Description  | Notes
 # **GetStoresAssignedToChannel**
 > RestApiArrayResultStoreChannelAssignment GetStoresAssignedToChannel (string appId, int? channelId)
 
-Returns a list of stores of an AppId that are assigned to a given Sales Channel
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -618,12 +609,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var appId = appId_example;  // string | Application Id (AppNameId)
-            var channelId = 56;  // int? | Sales channel (Android, IOS, Web, etc.)
+            var appId = appId_example;  // string | 
+            var channelId = 56;  // int? | 
 
             try
             {
-                // Returns a list of stores of an AppId that are assigned to a given Sales Channel
                 RestApiArrayResultStoreChannelAssignment result = apiInstance.GetStoresAssignedToChannel(appId, channelId);
                 Debug.WriteLine(result);
             }
@@ -640,8 +630,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id (AppNameId) | 
- **channelId** | **int?**| Sales channel (Android, IOS, Web, etc.) | 
+ **appId** | **string**|  | 
+ **channelId** | **int?**|  | 
 
 ### Return type
 
@@ -662,15 +652,15 @@ Name | Type | Description  | Notes
 # **GetStoresBySalesChannel**
 > Response GetStoresBySalesChannel (string appId, int? channelId)
 
-Returns a list of store ids attached to the given channel type for the specified app.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -682,12 +672,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var appId = appId_example;  // string | Application Id (AppNameId)
-            var channelId = 56;  // int? | Type of sales channel (Android, IOS, Web, etc.)
+            var appId = appId_example;  // string | 
+            var channelId = 56;  // int? | 
 
             try
             {
-                // Returns a list of store ids attached to the given channel type for the specified app.
                 Response result = apiInstance.GetStoresBySalesChannel(appId, channelId);
                 Debug.WriteLine(result);
             }
@@ -704,8 +693,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id (AppNameId) | 
- **channelId** | **int?**| Type of sales channel (Android, IOS, Web, etc.) | 
+ **appId** | **string**|  | 
+ **channelId** | **int?**|  | 
 
 ### Return type
 
@@ -726,15 +715,15 @@ Name | Type | Description  | Notes
 # **UnassignStoreFromChannel**
 > Object UnassignStoreFromChannel (int? storeId, string appId, int? channelId)
 
-Unassign a Store from a Sales Channel
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -746,13 +735,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ChannelsApi();
-            var storeId = 56;  // int? | Store Id (123, 456)
-            var appId = appId_example;  // string | AppId (AppNameIdxxx)
-            var channelId = 56;  // int? | Channel Id (123, 456)
+            var storeId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var channelId = 56;  // int? | 
 
             try
             {
-                // Unassign a Store from a Sales Channel
                 Object result = apiInstance.UnassignStoreFromChannel(storeId, appId, channelId);
                 Debug.WriteLine(result);
             }
@@ -769,9 +757,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id (123, 456) | 
- **appId** | **string**| AppId (AppNameIdxxx) | 
- **channelId** | **int?**| Channel Id (123, 456) | 
+ **storeId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **channelId** | **int?**|  | 
 
 ### Return type
 
diff --git a/docs/ChannelsStoreMappingApi.md b/docs/ChannelsStoreMappingApi.md
deleted file mode 100644
index 40623e18..00000000
--- a/docs/ChannelsStoreMappingApi.md
+++ /dev/null
@@ -1,138 +0,0 @@
-# IO.Swagger.Api.ChannelsStoreMappingApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**ChannelsGetStoreChannelStoreMapping**](ChannelsStoreMappingApi.md#channelsgetstorechannelstoremapping) | **GET** /api/v1.0/{appId}/channels/storemappings | 
-[**ChannelsSetStoreChannelStoreMapping**](ChannelsStoreMappingApi.md#channelssetstorechannelstoremapping) | **POST** /api/v1.0/{appId}/channels/storemappings | 
-
-
-<a name="channelsgetstorechannelstoremapping"></a>
-# **ChannelsGetStoreChannelStoreMapping**
-> RestApiArrayResultStoreChannelStoreMapping ChannelsGetStoreChannelStoreMapping (string appId, int? channelId)
-
-
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class ChannelsGetStoreChannelStoreMappingExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new ChannelsStoreMappingApi();
-            var appId = appId_example;  // string | 
-            var channelId = 56;  // int? | 
-
-            try
-            {
-                RestApiArrayResultStoreChannelStoreMapping result = apiInstance.ChannelsGetStoreChannelStoreMapping(appId, channelId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling ChannelsStoreMappingApi.ChannelsGetStoreChannelStoreMapping: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **channelId** | **int?**|  | 
-
-### Return type
-
-[**RestApiArrayResultStoreChannelStoreMapping**](RestApiArrayResultStoreChannelStoreMapping.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="channelssetstorechannelstoremapping"></a>
-# **ChannelsSetStoreChannelStoreMapping**
-> RestApiArrayResultStoreChannelStoreMapping ChannelsSetStoreChannelStoreMapping (string appId, int? channelId, List<ChannelStoreMapping> stores)
-
-
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class ChannelsSetStoreChannelStoreMappingExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new ChannelsStoreMappingApi();
-            var appId = appId_example;  // string | 
-            var channelId = 56;  // int? | 
-            var stores = new List<ChannelStoreMapping>(); // List<ChannelStoreMapping> | 
-
-            try
-            {
-                RestApiArrayResultStoreChannelStoreMapping result = apiInstance.ChannelsSetStoreChannelStoreMapping(appId, channelId, stores);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling ChannelsStoreMappingApi.ChannelsSetStoreChannelStoreMapping: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **channelId** | **int?**|  | 
- **stores** | [**List&lt;ChannelStoreMapping&gt;**](ChannelStoreMapping.md)|  | 
-
-### Return type
-
-[**RestApiArrayResultStoreChannelStoreMapping**](RestApiArrayResultStoreChannelStoreMapping.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/ChargebackDetails.md b/docs/ChargebackDetails.md
index 7b752907..bef20b39 100644
--- a/docs/ChargebackDetails.md
+++ b/docs/ChargebackDetails.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.ChargebackDetails
+# Flipdish.Model.ChargebackDetails
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **ChargebackAmount** | **double?** | Chargeback amount | [optional] 
+**PosSalesChargebackAmount** | **double?** | POS Chargeback amount | [optional] 
 **ChargebackRefundedFees** | **double?** | Chargeback refunded feeds | [optional] 
 **ChargebacksCount** | **int?** | Number of chargebacks | [optional] 
 **TotalChargebackCost** | **double?** | Total amount | [optional] 
diff --git a/docs/ClientDevice.md b/docs/ClientDevice.md
new file mode 100644
index 00000000..6c69654f
--- /dev/null
+++ b/docs/ClientDevice.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.ClientDevice
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeviceModel** | **string** | Device Model | [optional] 
+**DeviceId** | **string** | Device Id | [optional] 
+**DeviceName** | **string** | Device Name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ClientDeviceAssignEnrolledDevice.md b/docs/ClientDeviceAssignEnrolledDevice.md
new file mode 100644
index 00000000..a3f24d9b
--- /dev/null
+++ b/docs/ClientDeviceAssignEnrolledDevice.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.ClientDeviceAssignEnrolledDevice
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeviceModel** | **string** | Device Model | [optional] 
+**PinCode** | **string** | Pin Code | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ClientDeviceEnroll.md b/docs/ClientDeviceEnroll.md
new file mode 100644
index 00000000..5fb9deeb
--- /dev/null
+++ b/docs/ClientDeviceEnroll.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.ClientDeviceEnroll
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeviceModel** | **string** | Device model | [optional] 
+**DeviceId** | **string** | Device Id | [optional] 
+**DeviceName** | **string** | Device Name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ClientDeviceEnrollmentResult.md b/docs/ClientDeviceEnrollmentResult.md
new file mode 100644
index 00000000..014572e3
--- /dev/null
+++ b/docs/ClientDeviceEnrollmentResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.ClientDeviceEnrollmentResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PinCode** | **string** | PIN Code for assigning | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ClientDeviceSummary.md b/docs/ClientDeviceSummary.md
new file mode 100644
index 00000000..9a54bf3b
--- /dev/null
+++ b/docs/ClientDeviceSummary.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.ClientDeviceSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeviceModel** | **string** | Device Model | [optional] 
+**DeviceId** | **string** | Device Id | [optional] 
+**DeviceName** | **string** | Device Name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ClientsApi.md b/docs/ClientsApi.md
new file mode 100644
index 00000000..ff3652e0
--- /dev/null
+++ b/docs/ClientsApi.md
@@ -0,0 +1,195 @@
+# Flipdish.Api.ClientsApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**GetClient**](ClientsApi.md#getclient) | **GET** /api/v1.0/clients/{clientId} | 
+[**SetSalesForceContactId**](ClientsApi.md#setsalesforcecontactid) | **POST** /api/v1.0/clients/{clientId}/salesforcecontactid | 
+[**SetStripeCustomerId**](ClientsApi.md#setstripecustomerid) | **POST** /api/v1.0/clients/{clientId}/stripecustomerid | 
+
+
+<a name="getclient"></a>
+# **GetClient**
+> void GetClient (int? clientId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetClientExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new ClientsApi();
+            var clientId = 56;  // int? | 
+
+            try
+            {
+                apiInstance.GetClient(clientId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling ClientsApi.GetClient: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **clientId** | **int?**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setsalesforcecontactid"></a>
+# **SetSalesForceContactId**
+> void SetSalesForceContactId (int? clientId, string salesForceContactId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetSalesForceContactIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new ClientsApi();
+            var clientId = 56;  // int? | 
+            var salesForceContactId = salesForceContactId_example;  // string | 
+
+            try
+            {
+                apiInstance.SetSalesForceContactId(clientId, salesForceContactId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling ClientsApi.SetSalesForceContactId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **clientId** | **int?**|  | 
+ **salesForceContactId** | **string**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setstripecustomerid"></a>
+# **SetStripeCustomerId**
+> void SetStripeCustomerId (int? clientId, string stripeCustomerId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetStripeCustomerIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new ClientsApi();
+            var clientId = 56;  // int? | 
+            var stripeCustomerId = stripeCustomerId_example;  // string | 
+
+            try
+            {
+                apiInstance.SetStripeCustomerId(clientId, stripeCustomerId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling ClientsApi.SetStripeCustomerId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **clientId** | **int?**|  | 
+ **stripeCustomerId** | **string**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/ConfiguredAppHeader.md b/docs/ConfiguredAppHeader.md
deleted file mode 100644
index 7cab058e..00000000
--- a/docs/ConfiguredAppHeader.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Flipdish.Model.ConfiguredAppHeader
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Name** | **string** | Name | 
-**AppStoreAppId** | **string** | AppStore App Id | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/ConfiguredPhysicalRestaurant.md b/docs/ConfiguredPhysicalRestaurant.md
deleted file mode 100644
index 8aaaf95e..00000000
--- a/docs/ConfiguredPhysicalRestaurant.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Flipdish.Model.ConfiguredPhysicalRestaurant
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**StoreId** | **int?** | Store id | [optional] 
-**Name** | **string** | Name of store | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/ConfiguredStore.md b/docs/ConfiguredStore.md
index 033fe5d2..7ebde6f3 100644
--- a/docs/ConfiguredStore.md
+++ b/docs/ConfiguredStore.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.ConfiguredStore
+# Flipdish.Model.ConfiguredStore
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StoreId** | **int?** | Store id | [optional] 
-**Name** | **string** | Name of store | [optional] 
+**StoreId** | **int?** |  | [optional] 
+**Name** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Contact.md b/docs/Contact.md
deleted file mode 100644
index 3c8c9adb..00000000
--- a/docs/Contact.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# IO.Swagger.Model.Contact
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Email** | **string** | Email Address | [optional] 
-**PhoneNumber** | **string** | International format Phone Number | [optional] 
-**FirstName** | **string** | First Name | [optional] 
-**LastName** | **string** | Last Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/ContentSecurityPolicyApi.md b/docs/ContentSecurityPolicyApi.md
index a85f1418..b8c59bbc 100644
--- a/docs/ContentSecurityPolicyApi.md
+++ b/docs/ContentSecurityPolicyApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.ContentSecurityPolicyApi
+# Flipdish.Api.ContentSecurityPolicyApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -17,9 +17,9 @@ Method | HTTP request | Description
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/Coordinates.md b/docs/Coordinates.md
index 15ca9c53..08c6c52d 100644
--- a/docs/Coordinates.md
+++ b/docs/Coordinates.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Coordinates
+# Flipdish.Model.Coordinates
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CountryFormResponse.md b/docs/CountryFormResponse.md
index af056d0a..fdfa9ac9 100644
--- a/docs/CountryFormResponse.md
+++ b/docs/CountryFormResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CountryFormResponse
+# Flipdish.Model.CountryFormResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CountryWithAccountFieldsDefinitions.md b/docs/CountryWithAccountFieldsDefinitions.md
index bb7f220a..02244a40 100644
--- a/docs/CountryWithAccountFieldsDefinitions.md
+++ b/docs/CountryWithAccountFieldsDefinitions.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CountryWithAccountFieldsDefinitions
+# Flipdish.Model.CountryWithAccountFieldsDefinitions
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateAccountModel.md b/docs/CreateAccountModel.md
index 60dac813..a9a90ccb 100644
--- a/docs/CreateAccountModel.md
+++ b/docs/CreateAccountModel.md
@@ -1,13 +1,14 @@
-# IO.Swagger.Model.CreateAccountModel
+# Flipdish.Model.CreateAccountModel
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Email** | **string** | Email addres | 
+**Email** | **string** | Email address | 
 **StoreName** | **string** | Store name | 
 **LanguageId** | **string** | LanguageId | [optional] 
 **Rid** | **int?** | Referral ID | [optional] 
 **Cid** | **string** | Campaign ID | [optional] 
+**RecaptchaToken** | **string** | Google Recaptcha Token | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateAppParameters.md b/docs/CreateAppParameters.md
new file mode 100644
index 00000000..90aed183
--- /dev/null
+++ b/docs/CreateAppParameters.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.CreateAppParameters
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** | The name of the brand that this app/white-label represents. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CreateAppStoreApp.md b/docs/CreateAppStoreApp.md
index 6f204188..bd1bfae2 100644
--- a/docs/CreateAppStoreApp.md
+++ b/docs/CreateAppStoreApp.md
@@ -1,23 +1,26 @@
-# IO.Swagger.Model.CreateAppStoreApp
+# Flipdish.Model.CreateAppStoreApp
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Details** | **string** | Details | 
-**ConfigurationType** | **string** | Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt; | 
-**StoreSelectorType** | **string** | Store selector type | 
-**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) | Field groups | [optional] 
-**SetupInstructions** | **string** | Setup instructions | [optional] 
-**ExternalSetupLink** | **string** | External setup link | [optional] 
-**TeammateAppAccessLevel** | **string** | Teammate app access level | [optional] 
-**PermissionsType** | **string** | Permissions type | 
-**Support** | [**AppStoreAppSupportInfo**](AppStoreAppSupportInfo.md) | Support information | [optional] 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**IsEnabled** | **bool?** | Is application enabled | [optional] 
-**Categories** | **List&lt;string&gt;** | Categories | 
-**Countries** | **List&lt;string&gt;** | Countries | 
-**DeveloperName** | **string** | Developer Name | [optional] 
+**Details** | **string** |  | 
+**ConfigurationType** | **string** |  | 
+**StoreSelectorType** | **string** |  | 
+**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) |  | [optional] 
+**SetupInstructions** | **string** |  | [optional] 
+**ExternalSetupLink** | **string** |  | [optional] 
+**TeammateAppAccessLevel** | **string** |  | [optional] 
+**PermissionsType** | **string** |  | 
+**Support** | [**AppStoreAppSupportInfo**](AppStoreAppSupportInfo.md) |  | [optional] 
+**ExternalFunctionActionUrl** | **string** |  | [optional] 
+**ExternalFunctionSignatureKey** | **string** |  | [optional] 
+**IsPaid** | **bool?** |  | [optional] 
+**Name** | **string** |  | 
+**Description** | **string** |  | 
+**IsEnabled** | **bool?** |  | [optional] 
+**Categories** | **List&lt;string&gt;** |  | 
+**Countries** | **List&lt;string&gt;** |  | 
+**DeveloperName** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateBasicAccountModel.md b/docs/CreateBasicAccountModel.md
new file mode 100644
index 00000000..2986e5fd
--- /dev/null
+++ b/docs/CreateBasicAccountModel.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.CreateBasicAccountModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StoreName** | **string** | Store name | 
+**LanguageId** | **string** | LanguageId | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CreateCatalogGroup.md b/docs/CreateCatalogGroup.md
deleted file mode 100644
index 827d4487..00000000
--- a/docs/CreateCatalogGroup.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Flipdish.Model.CreateCatalogGroup
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**MinSelectCount** | **int?** | Minimum number of items that the user has to select | [optional] 
-**MaxSelectCount** | **int?** | Maximum number of items that the user has to select | [optional] 
-**Items** | [**List&lt;CreateCatalogItemReference&gt;**](CreateCatalogItemReference.md) | Collection of items associated with this group | [optional] 
-**Metafields** | [**List&lt;Metafield&gt;**](Metafield.md) | Collection of metafields | [optional] 
-**GroupType** | **string** | Type of group (ModifierGroup, etc) | 
-**Sku** | **string** | Stock Keeping Unit (SKU) | 
-**Name** | **string** | Group name | 
-**AutogenerateDisplayText** | **bool?** | Autogenerate display text in ordering applications | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CreateCatalogGroupReference.md b/docs/CreateCatalogGroupReference.md
index 6fedcb3e..bb8d92b5 100644
--- a/docs/CreateCatalogGroupReference.md
+++ b/docs/CreateCatalogGroupReference.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateCatalogGroupReference
+# Flipdish.Model.CreateCatalogGroupReference
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateCatalogItem.md b/docs/CreateCatalogItem.md
index 396e76d5..acc22c36 100644
--- a/docs/CreateCatalogItem.md
+++ b/docs/CreateCatalogItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateCatalogItem
+# Flipdish.Model.CreateCatalogItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateCatalogItemReference.md b/docs/CreateCatalogItemReference.md
deleted file mode 100644
index 4684024b..00000000
--- a/docs/CreateCatalogItemReference.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Flipdish.Model.CreateCatalogItemReference
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**CatalogItemId** | **string** | Identifier of the CatalogItemId to use as SubProduct | 
-**ItemType** | **string** | Type of the SupProduct | 
-**PreselectedQuantity** | **int?** | Quantity of the modifier that will be set when the parent product is placed in the basket | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CreateEndUserFeeConfig.md b/docs/CreateEndUserFeeConfig.md
new file mode 100644
index 00000000..4152a5aa
--- /dev/null
+++ b/docs/CreateEndUserFeeConfig.md
@@ -0,0 +1,15 @@
+# Flipdish.Model.CreateEndUserFeeConfig
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Channel** | **string** | The order channel this fee config applies to | 
+**PaymentMethod** | **string** | The payment method this fee config applies to | 
+**MinOrderAmount** | **double?** | Order amount below which MinFixedFee is charged instead of the percent/fixed calculation | [optional] 
+**MinFixedFee** | **double?** | Fixed fee charged for orders at or below MinOrderAmount | [optional] 
+**PercentFee** | **double?** | Percentage fee applied to the order amount | [optional] 
+**FixedFee** | **double?** | Fixed fee compared against the percentage fee - the greater of the two is charged | [optional] 
+**Cap** | **double?** | Maximum fee that can be charged | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CreateFulfillmentStatesConfiguration.md b/docs/CreateFulfillmentStatesConfiguration.md
new file mode 100644
index 00000000..b5346cf5
--- /dev/null
+++ b/docs/CreateFulfillmentStatesConfiguration.md
@@ -0,0 +1,13 @@
+# Flipdish.Model.CreateFulfillmentStatesConfiguration
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StoreIds** | **List&lt;int?&gt;** | Stores id&#39;s | [optional] 
+**StoreSelectorType** | **string** | Store Selector Type | [optional] 
+**States** | [**List&lt;FulfillmentStatusConfigurationItem&gt;**](FulfillmentStatusConfigurationItem.md) | Settings | [optional] 
+**AutomaticTransitionsEnabled** | **bool?** | Enable automatic transitions | [optional] 
+**Name** | **string** | Name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CreateFullMenu.md b/docs/CreateFullMenu.md
index 4eff1180..959a1cee 100644
--- a/docs/CreateFullMenu.md
+++ b/docs/CreateFullMenu.md
@@ -1,15 +1,16 @@
-# IO.Swagger.Model.CreateFullMenu
+# Flipdish.Model.CreateFullMenu
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Name** | **string** | Name of Menu, only shown in portal | [optional] 
 **ImageUrl** | **string** | Image url | [optional] 
-**MenuSections** | [**List&lt;CreateFullMenuSection&gt;**](CreateFullMenuSection.md) | Menu sections (startes, main etc) | [optional] 
+**MenuSections** | [**List&lt;CreateFullMenuSection&gt;**](CreateFullMenuSection.md) | Menu sections (starters, main etc) | [optional] 
 **TaxRates** | [**List&lt;CreateMenuTaxRate&gt;**](CreateMenuTaxRate.md) | Menu tax rates | [optional] 
 **DisplaySectionLinks** | **bool?** | Display menu section link on UI | [optional] 
 **MenuSectionBehaviour** | **string** | Menu section behaviour | [optional] 
 **TaxType** | **string** | Tax type | [optional] 
+**IsIntegrated** | **bool?** | Flag to indicate if the menu is integrated (contains metadata) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateFullMenuItemOptionSet.md b/docs/CreateFullMenuItemOptionSet.md
index 39f1f9ec..4cce8a3c 100644
--- a/docs/CreateFullMenuItemOptionSet.md
+++ b/docs/CreateFullMenuItemOptionSet.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateFullMenuItemOptionSet
+# Flipdish.Model.CreateFullMenuItemOptionSet
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **MinSelectCount** | **int?** | Minimum items must be selected | [optional] 
 **MaxSelectCount** | **int?** | Maximum number of items can be selected | [optional] 
 **CellLayoutType** | **string** | Small | Medium | Large  Affects the layout of the menu. | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateFullMenuItemOptionSetItem.md b/docs/CreateFullMenuItemOptionSetItem.md
index ef82efd3..376543e3 100644
--- a/docs/CreateFullMenuItemOptionSetItem.md
+++ b/docs/CreateFullMenuItemOptionSetItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateFullMenuItemOptionSetItem
+# Flipdish.Model.CreateFullMenuItemOptionSetItem
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,10 +9,12 @@ Name | Type | Description | Notes
 **NextMenuItemOptionSetId** | **int?** | if null, next option set is next. if -1, this is the final option set | [optional] 
 **Name** | **string** | Name | [optional] 
 **Price** | **double?** | Price | [optional] 
+**DepositReturnFee** | **double?** | An optional fee that can be added to the price of the item. | [optional] 
 **IsAvailable** | **bool?** | Is available | [optional] 
 **DisplayOrder** | **int?** | Display order. Displayed in ascending order. | [optional] 
 **CellLayoutType** | **string** | Small | Medium | Large  Affects the layout of the menu. | [optional] 
 **ImageUrl** | **string** | Image url | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateFullMenuSection.md b/docs/CreateFullMenuSection.md
index e3f3fc3f..31c3224a 100644
--- a/docs/CreateFullMenuSection.md
+++ b/docs/CreateFullMenuSection.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateFullMenuSection
+# Flipdish.Model.CreateFullMenuSection
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **IsHiddenFromCustomers** | **bool?** | Is hidden from customer. Perhaps when the item is out of stock. | [optional] 
 **ImageUrl** | **string** | Image url | [optional] 
 **MenuSectionId** | **int?** | Menu Section Id | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateFullMenuSectionItem.md b/docs/CreateFullMenuSectionItem.md
index 04de075b..80fce367 100644
--- a/docs/CreateFullMenuSectionItem.md
+++ b/docs/CreateFullMenuSectionItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateFullMenuSectionItem
+# Flipdish.Model.CreateFullMenuSectionItem
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **Description** | **string** | Description (like \&quot;A lovely dish from the east\&quot;) | [optional] 
 **SpicinessRating** | **string** | Spiciness rating | [optional] 
 **Price** | **double?** | Price - this is only used when there is no master option set and should be set to 0 if a master option set exists. | [optional] 
+**DepositReturnFee** | **double?** | An optional fee that can be added to the price of the item. | [optional] 
 **DisplayOrder** | **int?** | Display order | [optional] 
 **Alcohol** | **bool?** | To be set true if the item or an option of the item contains an alcoholic drink. | [optional] 
 **IsAvailable** | **bool?** | True if we accept orders for this item still | [optional] 
@@ -18,6 +19,8 @@ Name | Type | Description | Notes
 **ImageName** | **string** | Image url | [optional] 
 **ImageUrl** | **string** | Image url | [optional] 
 **MenuItemId** | **int?** | Menu Item Id | [optional] 
+**ExcludeFromVoucherDiscounting** | **bool?** | If true, the item is excluded from voucher discount calculations | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateGroup.md b/docs/CreateGroup.md
index abc14d47..2b8b5c38 100644
--- a/docs/CreateGroup.md
+++ b/docs/CreateGroup.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateGroup
+# Flipdish.Model.CreateGroup
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateGroupReference.md b/docs/CreateGroupReference.md
index a52d661e..33ecc52e 100644
--- a/docs/CreateGroupReference.md
+++ b/docs/CreateGroupReference.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateGroupReference
+# Flipdish.Model.CreateGroupReference
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateLocation.md b/docs/CreateLocation.md
index 4b60fbb9..1e297cbe 100644
--- a/docs/CreateLocation.md
+++ b/docs/CreateLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateLocation
+# Flipdish.Model.CreateLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateLocationArea.md b/docs/CreateLocationArea.md
index f1506244..eda62907 100644
--- a/docs/CreateLocationArea.md
+++ b/docs/CreateLocationArea.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateLocationArea
+# Flipdish.Model.CreateLocationArea
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateMenuSectionItemFromCatalogItems.md b/docs/CreateMenuSectionItemFromCatalogItems.md
index 19ff2057..119e238f 100644
--- a/docs/CreateMenuSectionItemFromCatalogItems.md
+++ b/docs/CreateMenuSectionItemFromCatalogItems.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateMenuSectionItemFromCatalogItems
+# Flipdish.Model.CreateMenuSectionItemFromCatalogItems
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateMenuSectionItemFromProducts.md b/docs/CreateMenuSectionItemFromProducts.md
deleted file mode 100644
index 7a3807cd..00000000
--- a/docs/CreateMenuSectionItemFromProducts.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.CreateMenuSectionItemFromProducts
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**ProductItems** | [**List&lt;ProductItem&gt;**](ProductItem.md) | List of Products to add to the section | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CreateMenuTaxRate.md b/docs/CreateMenuTaxRate.md
index cf9e7fe6..92cccf86 100644
--- a/docs/CreateMenuTaxRate.md
+++ b/docs/CreateMenuTaxRate.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateMenuTaxRate
+# Flipdish.Model.CreateMenuTaxRate
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateMetadata.md b/docs/CreateMetadata.md
index 3155ff7e..159b8a58 100644
--- a/docs/CreateMetadata.md
+++ b/docs/CreateMetadata.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateMetadata
+# Flipdish.Model.CreateMetadata
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateMetafieldDefinition.md b/docs/CreateMetafieldDefinition.md
index 3fa921d3..9c12eb2f 100644
--- a/docs/CreateMetafieldDefinition.md
+++ b/docs/CreateMetafieldDefinition.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.CreateMetafieldDefinition
+# Flipdish.Model.CreateMetafieldDefinition
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **IsReadOnly** | **bool?** | Indicates if a definition can be edited or not | [optional] 
-**OwnerEntity** | **string** | The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity} | [optional] 
+**OwnerEntity** | **string** | The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity} | [optional] 
 **Key** | **string** | Key of the metafield.  The key must have two parts, separated by a dot. The first part acts as a category, for organizational purposes.  The parts can be composed of lowercase letters, numbers, hyphen and underscore | 
 **ValueType** | **string** | The excepted type for the Value field | [optional] 
 **Name** | **string** | Field Name | 
diff --git a/docs/CreateModifier.md b/docs/CreateModifier.md
deleted file mode 100644
index c14f79ff..00000000
--- a/docs/CreateModifier.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Flipdish.Model.CreateModifier
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CreateModifierGroup.md b/docs/CreateModifierGroup.md
deleted file mode 100644
index 82e95063..00000000
--- a/docs/CreateModifierGroup.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Flipdish.Model.CreateModifierGroup
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**MinSelection** | **int?** | Minimum number of items that the user has to select | [optional] 
-**MaxSelection** | **int?** | Maximum number of items that the user has to select | [optional] 
-**SubProducts** | [**List&lt;ModifierGroupSubProduct&gt;**](ModifierGroupSubProduct.md) | Collection of products associated with this product | [optional] 
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CreatePayGreenConfigurationRequest.md b/docs/CreatePayGreenConfigurationRequest.md
index 309d8cc0..41afa127 100644
--- a/docs/CreatePayGreenConfigurationRequest.md
+++ b/docs/CreatePayGreenConfigurationRequest.md
@@ -1,12 +1,12 @@
-# IO.Swagger.Model.CreatePayGreenConfigurationRequest
+# Flipdish.Model.CreatePayGreenConfigurationRequest
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
-**PayGreenId** | **string** |  | [optional] 
-**PayGreenPrivateKey** | **string** |  | [optional] 
-**AssignedStores** | **List&lt;int?&gt;** |  | [optional] 
+**Name** | **string** | Name. | [optional] 
+**PayGreenId** | **string** | PayGreenId. | [optional] 
+**PayGreenPrivateKey** | **string** | PayGreenPrivateKey. | [optional] 
+**AssignedStores** | **List&lt;int?&gt;** | AssignedStores. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateProduct.md b/docs/CreateProduct.md
index 0f78421f..378278c3 100644
--- a/docs/CreateProduct.md
+++ b/docs/CreateProduct.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateProduct
+# Flipdish.Model.CreateProduct
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreateProductReference.md b/docs/CreateProductReference.md
index 784e75a4..ac8ea559 100644
--- a/docs/CreateProductReference.md
+++ b/docs/CreateProductReference.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateProductReference
+# Flipdish.Model.CreateProductReference
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreatePromotion.md b/docs/CreatePromotion.md
new file mode 100644
index 00000000..59bd71c4
--- /dev/null
+++ b/docs/CreatePromotion.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.CreatePromotion
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** | Promotion Name | [optional] 
+**MenuItemPublicIds** | **List&lt;Guid?&gt;** | Promotion Menu Item Awards | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CreateSimpleProduct.md b/docs/CreateSimpleProduct.md
deleted file mode 100644
index aeaf42e0..00000000
--- a/docs/CreateSimpleProduct.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Flipdish.Model.CreateSimpleProduct
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**SubProducts** | [**List&lt;SimpleProductSubProduct&gt;**](SimpleProductSubProduct.md) | Collection of products associated with this product | [optional] 
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/CreateTeammate.md b/docs/CreateTeammate.md
index 34cf6095..5ea59e8f 100644
--- a/docs/CreateTeammate.md
+++ b/docs/CreateTeammate.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreateTeammate
+# Flipdish.Model.CreateTeammate
 ## Properties
 
 Name | Type | Description | Notes
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **AppAccessLevel** | **string** | App access level | [optional] 
 **HasAccessToAllStores** | **bool?** | The user has access to all stores for the app (including new stores that added later) | [optional] 
 **StoreIds** | **List&lt;int?&gt;** | Store IDs the user has access to (if HasAccessToAllStores is false) | [optional] 
+**PropertyIds** | **List&lt;string&gt;** | Property Ids the user has access to (if HasAccessToAllStores is false) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreateUserDeliveryLocationRequest.md b/docs/CreateUserDeliveryLocationRequest.md
new file mode 100644
index 00000000..ecd98fba
--- /dev/null
+++ b/docs/CreateUserDeliveryLocationRequest.md
@@ -0,0 +1,16 @@
+# Flipdish.Model.CreateUserDeliveryLocationRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Building** | **string** | Building. | [optional] 
+**Street** | **string** | Street. | [optional] 
+**Town** | **string** | Town. | [optional] 
+**PostCode** | **string** | PostCode. | [optional] 
+**FullAddressJson** | **string** | FullAddressJson. | [optional] 
+**DeliveryInstructions** | **string** | DeliveryInstructions. | [optional] 
+**Coordinates** | [**Coordinates**](Coordinates.md) | Coordinates. | [optional] 
+**IsDisplayed** | **bool?** | Passed through to the same parameter position as legacy admin MVC (maps to IsCustomAddress in map service). | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CreateVoucher.md b/docs/CreateVoucher.md
index 98d7478f..29dccb71 100644
--- a/docs/CreateVoucher.md
+++ b/docs/CreateVoucher.md
@@ -1,16 +1,16 @@
-# IO.Swagger.Model.CreateVoucher
+# Flipdish.Model.CreateVoucher
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **VoucherType** | **string** | Voucher Type | [optional] 
-**Stores** | **List&lt;int?&gt;** | Stores that this voucher applies to | [optional] 
-**AddItemDetails** | [**AddItemDetails**](AddItemDetails.md) | Add item details | [optional] 
+**Promotion** | [**CreatePromotion**](CreatePromotion.md) | Create Promotion details | [optional] 
 **CreditNoteDetails** | [**CreditNoteDetails**](CreditNoteDetails.md) | Credit note details | [optional] 
 **LumpDiscountDetails** | [**LumpDiscountDetails**](LumpDiscountDetails.md) | Lump discount details | [optional] 
 **PercentDiscountDetails** | [**PercentDiscountDetails**](PercentDiscountDetails.md) | Percent discount details | [optional] 
 **Code** | **string** | Voucher Code | [optional] 
 **Description** | **string** | Voucher Description (Visible on printout) | [optional] 
+**Stores** | **List&lt;int?&gt;** | Stores that this voucher applies to | [optional] 
 **ValidOnOrdersOver** | **double?** | Valid on orders on or above | [optional] 
 **TakesPriority** | **bool?** | Takes priority | [optional] 
 **IsEnabled** | **bool?** | Is voucher enabled | [optional] 
@@ -23,8 +23,16 @@ Name | Type | Description | Notes
 **IsValidForFirstOrderOnly** | **bool?** | Valid only on the first order by the customer | [optional] 
 **IsValidOncePerCustomer** | **bool?** | Valid once per customer | [optional] 
 **IsValidOnlyOnce** | **bool?** | Valid only once, by any customer (once used cannot be used again by any other customer) | [optional] 
+**IsDiscoverable** | **bool?** | Enables the voucher to be offered in the Voucher Discoverability feature | [optional] 
+**IsPromoted** | **bool?** | Marks the voucher as promoted | [optional] 
+**ForceDiscount** | **bool?** | Force the discount to be applied which bypasses some menu restrictions | [optional] 
 **StartDate** | **DateTime?** | Voucher Starts On (Time in UTC) | [optional] 
 **ExpiryDate** | **DateTime?** | Voucher Expires On (Time in UTC) | [optional] 
+**ChannelRestrictions** | **List&lt;string&gt;** | Limit the channels this voucher can be used on | [optional] 
+**ValidityPeriods** | [**List&lt;ValidityPeriod&gt;**](ValidityPeriod.md) | Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated. | [optional] 
+**VoucherSubType** | **string** | Voucher Subtype | [optional] 
+**CustomerId** | **int?** | Customer UserID | [optional] 
+**MaxRedemptions** | **int?** | Maximum number of times the voucher can be redeemed (used) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CreatedMenuSectionItems.md b/docs/CreatedMenuSectionItems.md
index 2b7698ba..c7618f2a 100644
--- a/docs/CreatedMenuSectionItems.md
+++ b/docs/CreatedMenuSectionItems.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreatedMenuSectionItems
+# Flipdish.Model.CreatedMenuSectionItems
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CreditNoteDetails.md b/docs/CreditNoteDetails.md
index 6e354fd2..13f33404 100644
--- a/docs/CreditNoteDetails.md
+++ b/docs/CreditNoteDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CreditNoteDetails
+# Flipdish.Model.CreditNoteDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CrossSellApi.md b/docs/CrossSellApi.md
new file mode 100644
index 00000000..d110031b
--- /dev/null
+++ b/docs/CrossSellApi.md
@@ -0,0 +1,78 @@
+# Flipdish.Api.CrossSellApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**GetCrossSellMenuItems**](CrossSellApi.md#getcrosssellmenuitems) | **GET** /api/v1.0/{appId}/crossSell/menuItems | 
+
+
+<a name="getcrosssellmenuitems"></a>
+# **GetCrossSellMenuItems**
+> RestApiResultCrossSellMenuItems GetCrossSellMenuItems (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetCrossSellMenuItemsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new CrossSellApi();
+            var appId = appId_example;  // string | 
+            var menuId = 56;  // int? | 
+            var menuItemId = new List<int?>(); // List<int?> | 
+            var limit = 56;  // int? | 
+            var totalValue = 1.2;  // double? | 
+
+            try
+            {
+                RestApiResultCrossSellMenuItems result = apiInstance.GetCrossSellMenuItems(appId, menuId, menuItemId, limit, totalValue);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling CrossSellApi.GetCrossSellMenuItems: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **menuId** | **int?**|  | 
+ **menuItemId** | [**List&lt;int?&gt;**](int?.md)|  | 
+ **limit** | **int?**|  | 
+ **totalValue** | **double?**|  | 
+
+### Return type
+
+[**RestApiResultCrossSellMenuItems**](RestApiResultCrossSellMenuItems.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/CrossSellMenuItems.md b/docs/CrossSellMenuItems.md
new file mode 100644
index 00000000..a2f3b706
--- /dev/null
+++ b/docs/CrossSellMenuItems.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.CrossSellMenuItems
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**MenuItemIds** | **List&lt;int?&gt;** | Menu Item Id&#39;s | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CspReport.md b/docs/CspReport.md
index 3420d82a..8d893468 100644
--- a/docs/CspReport.md
+++ b/docs/CspReport.md
@@ -1,15 +1,15 @@
-# IO.Swagger.Model.CspReport
+# Flipdish.Model.CspReport
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**DocumentUri** | **string** |  | [optional] 
+**Document_uri** | **string** |  | [optional] 
 **Referrer** | **string** |  | [optional] 
-**ViolatedDirective** | **string** |  | [optional] 
-**EffectiveDirective** | **string** |  | [optional] 
-**OriginalPolicy** | **string** |  | [optional] 
-**BlockedUri** | **string** |  | [optional] 
-**StatusCode** | **int?** |  | [optional] 
+**Violated_directive** | **string** |  | [optional] 
+**Effective_directive** | **string** |  | [optional] 
+**Original_policy** | **string** |  | [optional] 
+**Blocked_uri** | **string** |  | [optional] 
+**Status_code** | **int?** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CspReportRequest.md b/docs/CspReportRequest.md
index 6a901f7f..0a917710 100644
--- a/docs/CspReportRequest.md
+++ b/docs/CspReportRequest.md
@@ -1,9 +1,9 @@
-# IO.Swagger.Model.CspReportRequest
+# Flipdish.Model.CspReportRequest
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**CspReport** | [**CspReport**](CspReport.md) |  | [optional] 
+**Csp_report** | [**CspReport**](CspReport.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CurrencyData.md b/docs/CurrencyData.md
index c0ca9c4e..19ef2a63 100644
--- a/docs/CurrencyData.md
+++ b/docs/CurrencyData.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CurrencyData
+# Flipdish.Model.CurrencyData
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Customer.md b/docs/Customer.md
index 7ad6f957..ea5fe5c3 100644
--- a/docs/Customer.md
+++ b/docs/Customer.md
@@ -1,10 +1,12 @@
-# IO.Swagger.Model.Customer
+# Flipdish.Model.Customer
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **CustomerId** | **int?** | Id of the customer | [optional] 
+**Name** | **string** | Customer name | [optional] 
 **RegistrationDate** | **DateTime?** | Customer registration date | [optional] 
+**PhoneNumber** | **string** | Phone Number in international format | [optional] 
 **CashOrdersEnabled** | **bool?** | Customer can place cash orders | [optional] 
 **CardOrdersEnabled** | **bool?** | Customer can place card orders | [optional] 
 **MarketingEnabled** | **bool?** | Customer can receive marketing | [optional] 
diff --git a/docs/CustomerConsentUpdatedEvent.md b/docs/CustomerConsentUpdatedEvent.md
index 595e57ce..6f3b3490 100644
--- a/docs/CustomerConsentUpdatedEvent.md
+++ b/docs/CustomerConsentUpdatedEvent.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.CustomerConsentUpdatedEvent
+# Flipdish.Model.CustomerConsentUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **Enabled** | **bool?** | Enabled | [optional] 
 **Description** | **string** | Description | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | Customer User info | [optional] 
@@ -12,6 +13,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerCreateModel.md b/docs/CustomerCreateModel.md
new file mode 100644
index 00000000..577de54c
--- /dev/null
+++ b/docs/CustomerCreateModel.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.CustomerCreateModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PhoneNumber** | **string** | Customer Phone Number | [optional] 
+**AppType** | **string** | Customer AppType | [optional] 
+**Name** | **string** | Customer Name | [optional] 
+**MarketingEnabled** | **bool?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CustomerCreatedEvent.md b/docs/CustomerCreatedEvent.md
index f277e6b9..1a50dc2a 100644
--- a/docs/CustomerCreatedEvent.md
+++ b/docs/CustomerCreatedEvent.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.CustomerCreatedEvent
+# Flipdish.Model.CustomerCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | Customer User info | [optional] 
 **Description** | **string** | Description | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
@@ -11,6 +12,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerDeliveryTrackingOrder.md b/docs/CustomerDeliveryTrackingOrder.md
index 8a213171..8d26ca27 100644
--- a/docs/CustomerDeliveryTrackingOrder.md
+++ b/docs/CustomerDeliveryTrackingOrder.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CustomerDeliveryTrackingOrder
+# Flipdish.Model.CustomerDeliveryTrackingOrder
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CustomerDeliveryTrackingOrderLine.md b/docs/CustomerDeliveryTrackingOrderLine.md
index 8e38d320..17aeacc5 100644
--- a/docs/CustomerDeliveryTrackingOrderLine.md
+++ b/docs/CustomerDeliveryTrackingOrderLine.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CustomerDeliveryTrackingOrderLine
+# Flipdish.Model.CustomerDeliveryTrackingOrderLine
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CustomerMessages.md b/docs/CustomerMessages.md
new file mode 100644
index 00000000..bb609c2f
--- /dev/null
+++ b/docs/CustomerMessages.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.CustomerMessages
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeliveryMenuMessage** | **string** | Delivery menu message | [optional] 
+**PickupMenuMessage** | **string** | Pickup menu message | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CustomerSummary.md b/docs/CustomerSummary.md
index 42dac3ad..4e6dfb9d 100644
--- a/docs/CustomerSummary.md
+++ b/docs/CustomerSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CustomerSummary
+# Flipdish.Model.CustomerSummary
 ## Properties
 
 Name | Type | Description | Notes
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **EmailAddress** | **string** | Customer email address | [optional] 
 **PhoneNumberLocalFormat** | **string** | Customer local phone number | [optional] 
 **PhoneNumber** | **string** | Customer phone number | [optional] 
+**LanguagePreference** | **string** | Preferred language of the consumer | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CustomerUpdateModel.md b/docs/CustomerUpdateModel.md
index a793819e..fdafe291 100644
--- a/docs/CustomerUpdateModel.md
+++ b/docs/CustomerUpdateModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CustomerUpdateModel
+# Flipdish.Model.CustomerUpdateModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/CustomerUpdatedEvent.md b/docs/CustomerUpdatedEvent.md
index 354979ce..c7b107af 100644
--- a/docs/CustomerUpdatedEvent.md
+++ b/docs/CustomerUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.CustomerUpdatedEvent
+# Flipdish.Model.CustomerUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Customers.md b/docs/Customers.md
new file mode 100644
index 00000000..2f771c5c
--- /dev/null
+++ b/docs/Customers.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.Customers
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Items** | [**List&lt;Customer&gt;**](Customer.md) | List of customers | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/CustomersApi.md b/docs/CustomersApi.md
index 5903362d..639f21ec 100644
--- a/docs/CustomersApi.md
+++ b/docs/CustomersApi.md
@@ -1,26 +1,91 @@
-# IO.Swagger.Api.CustomersApi
+# Flipdish.Api.CustomersApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetCustomerById**](CustomersApi.md#getcustomerbyid) | **GET** /api/v1.0/{appId}/customers/{customerId} | Get customer of an app by Id
-[**UpdateCustomerById**](CustomersApi.md#updatecustomerbyid) | **POST** /api/v1.0/{appId}/customers/{customerId} | Update customer of an app by Id
+[**CreateCustomer**](CustomersApi.md#createcustomer) | **POST** /api/v1.0/{appId}/customers | 
+[**GetCustomerById**](CustomersApi.md#getcustomerbyid) | **GET** /api/v1.0/{appId}/customers/{customerId} | 
+[**GetCustomers**](CustomersApi.md#getcustomers) | **GET** /api/v1.0/{appId}/customers | 
+[**UpdateCustomerById**](CustomersApi.md#updatecustomerbyid) | **POST** /api/v1.0/{appId}/customers/{customerId} | 
 
 
+<a name="createcustomer"></a>
+# **CreateCustomer**
+> RestApiResultCustomer CreateCustomer (string appId, CustomerCreateModel customerCreateModel)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class CreateCustomerExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new CustomersApi();
+            var appId = appId_example;  // string | 
+            var customerCreateModel = new CustomerCreateModel(); // CustomerCreateModel | 
+
+            try
+            {
+                RestApiResultCustomer result = apiInstance.CreateCustomer(appId, customerCreateModel);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling CustomersApi.CreateCustomer: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **customerCreateModel** | [**CustomerCreateModel**](CustomerCreateModel.md)|  | 
+
+### Return type
+
+[**RestApiResultCustomer**](RestApiResultCustomer.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getcustomerbyid"></a>
 # **GetCustomerById**
 > RestApiResultCustomer GetCustomerById (string appId, int? customerId)
 
-Get customer of an app by Id
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -32,12 +97,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CustomersApi();
-            var appId = appId_example;  // string | App Name Id
-            var customerId = 56;  // int? | Customer Id
+            var appId = appId_example;  // string | 
+            var customerId = 56;  // int? | 
 
             try
             {
-                // Get customer of an app by Id
                 RestApiResultCustomer result = apiInstance.GetCustomerById(appId, customerId);
                 Debug.WriteLine(result);
             }
@@ -54,8 +118,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **customerId** | **int?**| Customer Id | 
+ **appId** | **string**|  | 
+ **customerId** | **int?**|  | 
 
 ### Return type
 
@@ -72,19 +136,82 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getcustomers"></a>
+# **GetCustomers**
+> RestApiResultCustomers GetCustomers (string appId, string phoneNumber)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetCustomersExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new CustomersApi();
+            var appId = appId_example;  // string | 
+            var phoneNumber = phoneNumber_example;  // string | 
+
+            try
+            {
+                RestApiResultCustomers result = apiInstance.GetCustomers(appId, phoneNumber);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling CustomersApi.GetCustomers: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **phoneNumber** | **string**|  | 
+
+### Return type
+
+[**RestApiResultCustomers**](RestApiResultCustomers.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="updatecustomerbyid"></a>
 # **UpdateCustomerById**
 > RestApiResultCustomer UpdateCustomerById (string appId, int? customerId, CustomerUpdateModel updateCustomer)
 
-Update customer of an app by Id
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -96,13 +223,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new CustomersApi();
-            var appId = appId_example;  // string | App Name Id
-            var customerId = 56;  // int? | Customer Id
-            var updateCustomer = new CustomerUpdateModel(); // CustomerUpdateModel | Updated customer information
+            var appId = appId_example;  // string | 
+            var customerId = 56;  // int? | 
+            var updateCustomer = new CustomerUpdateModel(); // CustomerUpdateModel | 
 
             try
             {
-                // Update customer of an app by Id
                 RestApiResultCustomer result = apiInstance.UpdateCustomerById(appId, customerId, updateCustomer);
                 Debug.WriteLine(result);
             }
@@ -119,9 +245,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **customerId** | **int?**| Customer Id | 
- **updateCustomer** | [**CustomerUpdateModel**](CustomerUpdateModel.md)| Updated customer information | 
+ **appId** | **string**|  | 
+ **customerId** | **int?**|  | 
+ **updateCustomer** | [**CustomerUpdateModel**](CustomerUpdateModel.md)|  | 
 
 ### Return type
 
diff --git a/docs/DashboardEmbed.md b/docs/DashboardEmbed.md
index 44eb90f9..9c65184a 100644
--- a/docs/DashboardEmbed.md
+++ b/docs/DashboardEmbed.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DashboardEmbed
+# Flipdish.Model.DashboardEmbed
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DeliveryLocation.md b/docs/DeliveryLocation.md
index 13204cd0..57a7dfae 100644
--- a/docs/DeliveryLocation.md
+++ b/docs/DeliveryLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DeliveryLocation
+# Flipdish.Model.DeliveryLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DeliveryTrackingApi.md b/docs/DeliveryTrackingApi.md
deleted file mode 100644
index 4a6ef8fb..00000000
--- a/docs/DeliveryTrackingApi.md
+++ /dev/null
@@ -1,404 +0,0 @@
-# IO.Swagger.Api.DeliveryTrackingApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**AssignDriverToOrder**](DeliveryTrackingApi.md#assigndrivertoorder) | **POST** /api/v1.0/{appId}/drivers/{driverId}/orders/{orderId} | [PRIVATE] Assign driver to order
-[**AssignDriverToOrders**](DeliveryTrackingApi.md#assigndrivertoorders) | **POST** /api/v1.0/{appId}/drivers/{driverId}/orders | Assign driver to multiple orders
-[**GetDrivers**](DeliveryTrackingApi.md#getdrivers) | **GET** /api/v1.0/{appId}/drivers | [PRIVATE] Get drivers by App
-[**InviteDriverToApp**](DeliveryTrackingApi.md#invitedrivertoapp) | **POST** /api/v1.0/{appId}/drivers | [PRIVATE] Invite driver
-[**RemoveDriverFromApp**](DeliveryTrackingApi.md#removedriverfromapp) | **DELETE** /api/v1.0/{appId}/drivers/{driverId} | [PRIVATE] Unassign driver from app
-[**UnassignDriverFromOrder**](DeliveryTrackingApi.md#unassigndriverfromorder) | **DELETE** /api/v1.0/{appId}/orders/{orderId}/driver | [PRIVATE] Unassign driver from order
-
-
-<a name="assigndrivertoorder"></a>
-# **AssignDriverToOrder**
-> void AssignDriverToOrder (string appId, int? orderId, int? driverId)
-
-[PRIVATE] Assign driver to order
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class AssignDriverToOrderExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new DeliveryTrackingApi();
-            var appId = appId_example;  // string | Application identifier
-            var orderId = 56;  // int? | Order Id
-            var driverId = 56;  // int? | Driver Id
-
-            try
-            {
-                // [PRIVATE] Assign driver to order
-                apiInstance.AssignDriverToOrder(appId, orderId, driverId);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling DeliveryTrackingApi.AssignDriverToOrder: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **orderId** | **int?**| Order Id | 
- **driverId** | **int?**| Driver Id | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="assigndrivertoorders"></a>
-# **AssignDriverToOrders**
-> void AssignDriverToOrders (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers)
-
-Assign driver to multiple orders
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class AssignDriverToOrdersExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new DeliveryTrackingApi();
-            var appId = appId_example;  // string | Application identifier
-            var driverId = 56;  // int? | Driver Id
-            var orderIdAndSequenceNumbers = new List<OrderIdAndSequenceNumber>(); // List<OrderIdAndSequenceNumber> | Array of object containing OrderId and Sequence
-
-            try
-            {
-                // Assign driver to multiple orders
-                apiInstance.AssignDriverToOrders(appId, driverId, orderIdAndSequenceNumbers);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling DeliveryTrackingApi.AssignDriverToOrders: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **driverId** | **int?**| Driver Id | 
- **orderIdAndSequenceNumbers** | [**List&lt;OrderIdAndSequenceNumber&gt;**](OrderIdAndSequenceNumber.md)| Array of object containing OrderId and Sequence | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="getdrivers"></a>
-# **GetDrivers**
-> RestApiArrayResultDriver GetDrivers (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null)
-
-[PRIVATE] Get drivers by App
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class GetDriversExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new DeliveryTrackingApi();
-            var appId = appId_example;  // string | Application identifier
-            var name = name_example;  // string | Driver's username (optional) 
-            var phoneNumber = phoneNumber_example;  // string | Driver's phone number (optional) 
-            var storeId = 56;  // int? | Store Id (optional) 
-            var presence = presence_example;  // string | Offline/Online (optional) 
-
-            try
-            {
-                // [PRIVATE] Get drivers by App
-                RestApiArrayResultDriver result = apiInstance.GetDrivers(appId, name, phoneNumber, storeId, presence);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling DeliveryTrackingApi.GetDrivers: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **name** | **string**| Driver&#39;s username | [optional] 
- **phoneNumber** | **string**| Driver&#39;s phone number | [optional] 
- **storeId** | **int?**| Store Id | [optional] 
- **presence** | **string**| Offline/Online | [optional] 
-
-### Return type
-
-[**RestApiArrayResultDriver**](RestApiArrayResultDriver.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="invitedrivertoapp"></a>
-# **InviteDriverToApp**
-> RestApiResultDriver InviteDriverToApp (string appId, DriverInvitation driverInvitation)
-
-[PRIVATE] Invite driver
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class InviteDriverToAppExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new DeliveryTrackingApi();
-            var appId = appId_example;  // string | Application identifier
-            var driverInvitation = new DriverInvitation(); // DriverInvitation | Driver invitation model
-
-            try
-            {
-                // [PRIVATE] Invite driver
-                RestApiResultDriver result = apiInstance.InviteDriverToApp(appId, driverInvitation);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling DeliveryTrackingApi.InviteDriverToApp: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **driverInvitation** | [**DriverInvitation**](DriverInvitation.md)| Driver invitation model | 
-
-### Return type
-
-[**RestApiResultDriver**](RestApiResultDriver.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="removedriverfromapp"></a>
-# **RemoveDriverFromApp**
-> void RemoveDriverFromApp (string appId, int? driverId)
-
-[PRIVATE] Unassign driver from app
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class RemoveDriverFromAppExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new DeliveryTrackingApi();
-            var appId = appId_example;  // string | Application identifier
-            var driverId = 56;  // int? | Driver Id
-
-            try
-            {
-                // [PRIVATE] Unassign driver from app
-                apiInstance.RemoveDriverFromApp(appId, driverId);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling DeliveryTrackingApi.RemoveDriverFromApp: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **driverId** | **int?**| Driver Id | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="unassigndriverfromorder"></a>
-# **UnassignDriverFromOrder**
-> void UnassignDriverFromOrder (string appId, int? orderId)
-
-[PRIVATE] Unassign driver from order
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class UnassignDriverFromOrderExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new DeliveryTrackingApi();
-            var appId = appId_example;  // string | Application identifier
-            var orderId = 56;  // int? | Order Id
-
-            try
-            {
-                // [PRIVATE] Unassign driver from order
-                apiInstance.UnassignDriverFromOrder(appId, orderId);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling DeliveryTrackingApi.UnassignDriverFromOrder: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **orderId** | **int?**| Order Id | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/DeliveryZone.md b/docs/DeliveryZone.md
index 39a650f2..7a319b70 100644
--- a/docs/DeliveryZone.md
+++ b/docs/DeliveryZone.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.DeliveryZone
+# Flipdish.Model.DeliveryZone
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Id** | **int?** | Delivery Fee Area Id | [optional] 
+**FeeChargedToStore** | **double?** | Delivery Fee charged to store | [optional] 
 **DeliveryFee** | **double?** | Delivery fee (will not be set below 0) | [optional] 
 **MinimumDeliveryOrderAmount** | **double?** | Minimum delivery order amount (will not be set below 0) | [optional] 
 **WellKnownText** | **string** | Spatial data in Well Known Text format  We also support CIRCLE((0 0, 200)) - (centerLong centerLat, radius in m) | [optional] 
diff --git a/docs/DeliveryZoneApi.md b/docs/DeliveryZoneApi.md
index 8f721272..8eb3439b 100644
--- a/docs/DeliveryZoneApi.md
+++ b/docs/DeliveryZoneApi.md
@@ -1,28 +1,28 @@
-# IO.Swagger.Api.DeliveryZoneApi
+# Flipdish.Api.DeliveryZoneApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AddDeliveryZone**](DeliveryZoneApi.md#adddeliveryzone) | **POST** /api/v1.0/stores/{storeId}/deliveryzones | Adds a delivery zone to the store id
-[**GetDeliveryZones**](DeliveryZoneApi.md#getdeliveryzones) | **GET** /api/v1.0/stores/{storeId}/deliveryzones | Get all the delivery zones associated with a store
-[**RemoveDeliveryZone**](DeliveryZoneApi.md#removedeliveryzone) | **DELETE** /api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId} | Removes the existing delivery zone
-[**UpdateDeliveryZone**](DeliveryZoneApi.md#updatedeliveryzone) | **POST** /api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId} | Updates the existing delivery zone
+[**AddDeliveryZone**](DeliveryZoneApi.md#adddeliveryzone) | **POST** /api/v1.0/stores/{storeId}/deliveryzones | 
+[**GetDeliveryZones**](DeliveryZoneApi.md#getdeliveryzones) | **GET** /api/v1.0/stores/{storeId}/deliveryzones | 
+[**RemoveDeliveryZone**](DeliveryZoneApi.md#removedeliveryzone) | **DELETE** /api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId} | 
+[**UpdateDeliveryZone**](DeliveryZoneApi.md#updatedeliveryzone) | **POST** /api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId} | 
 
 
 <a name="adddeliveryzone"></a>
 # **AddDeliveryZone**
 > RestApiResultDeliveryZone AddDeliveryZone (int? storeId, DeliveryZoneBase deliveryZoneBase)
 
-Adds a delivery zone to the store id
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -34,12 +34,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new DeliveryZoneApi();
-            var storeId = 56;  // int? | Store Id to which the delivery zone will be added
-            var deliveryZoneBase = new DeliveryZoneBase(); // DeliveryZoneBase | Optional delivery zone, if not supplied will create a default zone
+            var storeId = 56;  // int? | 
+            var deliveryZoneBase = new DeliveryZoneBase(); // DeliveryZoneBase | 
 
             try
             {
-                // Adds a delivery zone to the store id
                 RestApiResultDeliveryZone result = apiInstance.AddDeliveryZone(storeId, deliveryZoneBase);
                 Debug.WriteLine(result);
             }
@@ -56,8 +55,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id to which the delivery zone will be added | 
- **deliveryZoneBase** | [**DeliveryZoneBase**](DeliveryZoneBase.md)| Optional delivery zone, if not supplied will create a default zone | 
+ **storeId** | **int?**|  | 
+ **deliveryZoneBase** | [**DeliveryZoneBase**](DeliveryZoneBase.md)|  | 
 
 ### Return type
 
@@ -78,15 +77,15 @@ Name | Type | Description  | Notes
 # **GetDeliveryZones**
 > RestApiArrayResultDeliveryZone GetDeliveryZones (int? storeId)
 
-Get all the delivery zones associated with a store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -98,11 +97,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new DeliveryZoneApi();
-            var storeId = 56;  // int? | Store Id to which the delivery zones are associated
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Get all the delivery zones associated with a store
                 RestApiArrayResultDeliveryZone result = apiInstance.GetDeliveryZones(storeId);
                 Debug.WriteLine(result);
             }
@@ -119,7 +117,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id to which the delivery zones are associated | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -140,15 +138,15 @@ Name | Type | Description  | Notes
 # **RemoveDeliveryZone**
 > void RemoveDeliveryZone (int? storeId, int? deliveryZoneId)
 
-Removes the existing delivery zone
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -160,12 +158,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new DeliveryZoneApi();
-            var storeId = 56;  // int? | Store Id to which the delivery zone belongs
-            var deliveryZoneId = 56;  // int? | Delivery zone id to be removed
+            var storeId = 56;  // int? | 
+            var deliveryZoneId = 56;  // int? | 
 
             try
             {
-                // Removes the existing delivery zone
                 apiInstance.RemoveDeliveryZone(storeId, deliveryZoneId);
             }
             catch (Exception e)
@@ -181,8 +178,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id to which the delivery zone belongs | 
- **deliveryZoneId** | **int?**| Delivery zone id to be removed | 
+ **storeId** | **int?**|  | 
+ **deliveryZoneId** | **int?**|  | 
 
 ### Return type
 
@@ -203,15 +200,15 @@ void (empty response body)
 # **UpdateDeliveryZone**
 > RestApiResultDeliveryZone UpdateDeliveryZone (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone)
 
-Updates the existing delivery zone
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -223,13 +220,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new DeliveryZoneApi();
-            var storeId = 56;  // int? | Store Id to which the delivery zone belongs
-            var deliveryZoneId = 56;  // int? | Delivery zone id to be updated
-            var deliveryZone = new DeliveryZoneBase(); // DeliveryZoneBase | Delta of delivery zone parameters that need to be changed
+            var storeId = 56;  // int? | 
+            var deliveryZoneId = 56;  // int? | 
+            var deliveryZone = new DeliveryZoneBase(); // DeliveryZoneBase | 
 
             try
             {
-                // Updates the existing delivery zone
                 RestApiResultDeliveryZone result = apiInstance.UpdateDeliveryZone(storeId, deliveryZoneId, deliveryZone);
                 Debug.WriteLine(result);
             }
@@ -246,9 +242,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id to which the delivery zone belongs | 
- **deliveryZoneId** | **int?**| Delivery zone id to be updated | 
- **deliveryZone** | [**DeliveryZoneBase**](DeliveryZoneBase.md)| Delta of delivery zone parameters that need to be changed | 
+ **storeId** | **int?**|  | 
+ **deliveryZoneId** | **int?**|  | 
+ **deliveryZone** | [**DeliveryZoneBase**](DeliveryZoneBase.md)|  | 
 
 ### Return type
 
diff --git a/docs/DeliveryZoneBase.md b/docs/DeliveryZoneBase.md
index 6d72f7e7..09c616bb 100644
--- a/docs/DeliveryZoneBase.md
+++ b/docs/DeliveryZoneBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DeliveryZoneBase
+# Flipdish.Model.DeliveryZoneBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DeliveryZoneCreatedEvent.md b/docs/DeliveryZoneCreatedEvent.md
index 021e85ab..a1950342 100644
--- a/docs/DeliveryZoneCreatedEvent.md
+++ b/docs/DeliveryZoneCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DeliveryZoneCreatedEvent
+# Flipdish.Model.DeliveryZoneCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DeliveryZoneDeletedEvent.md b/docs/DeliveryZoneDeletedEvent.md
index 8dd68b28..9594fe6c 100644
--- a/docs/DeliveryZoneDeletedEvent.md
+++ b/docs/DeliveryZoneDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DeliveryZoneDeletedEvent
+# Flipdish.Model.DeliveryZoneDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DeliveryZoneUpdatedEvent.md b/docs/DeliveryZoneUpdatedEvent.md
index e44b3e15..7edc8fa5 100644
--- a/docs/DeliveryZoneUpdatedEvent.md
+++ b/docs/DeliveryZoneUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DeliveryZoneUpdatedEvent
+# Flipdish.Model.DeliveryZoneUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DepositReturnFeesSummary.md b/docs/DepositReturnFeesSummary.md
new file mode 100644
index 00000000..478874fe
--- /dev/null
+++ b/docs/DepositReturnFeesSummary.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.DepositReturnFeesSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Count** | **int?** |  | [optional] 
+**Fee** | **double?** |  | [optional] 
+**Total** | **double?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/DeviceApi.md b/docs/DeviceApi.md
new file mode 100644
index 00000000..2f939fe0
--- /dev/null
+++ b/docs/DeviceApi.md
@@ -0,0 +1,268 @@
+# Flipdish.Api.DeviceApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**AssignDevice**](DeviceApi.md#assigndevice) | **POST** /api/v1.0/{appId}/devices/assign | 
+[**EnrollDevice**](DeviceApi.md#enrolldevice) | **POST** /api/v1.0/{appId}/devices/enroll | 
+[**GetDeviceDetails**](DeviceApi.md#getdevicedetails) | **GET** /api/v1.0/{appId}/devices/device/{deviceModel}/{deviceId} | 
+[**SearchDevices**](DeviceApi.md#searchdevices) | **GET** /api/v1.0/{appId}/devices/search | 
+
+
+<a name="assigndevice"></a>
+# **AssignDevice**
+> RestApiResultClientDeviceEnrollmentResult AssignDevice (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AssignDeviceExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new DeviceApi();
+            var appId = appId_example;  // string | 
+            var assignDeviceRequest = new ClientDeviceAssignEnrolledDevice(); // ClientDeviceAssignEnrolledDevice | 
+
+            try
+            {
+                RestApiResultClientDeviceEnrollmentResult result = apiInstance.AssignDevice(appId, assignDeviceRequest);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling DeviceApi.AssignDevice: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **assignDeviceRequest** | [**ClientDeviceAssignEnrolledDevice**](ClientDeviceAssignEnrolledDevice.md)|  | 
+
+### Return type
+
+[**RestApiResultClientDeviceEnrollmentResult**](RestApiResultClientDeviceEnrollmentResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="enrolldevice"></a>
+# **EnrollDevice**
+> RestApiResultClientDeviceEnrollmentResult EnrollDevice (string appId, ClientDeviceEnroll deviceEnrollmentRequest)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class EnrollDeviceExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new DeviceApi();
+            var appId = appId_example;  // string | 
+            var deviceEnrollmentRequest = new ClientDeviceEnroll(); // ClientDeviceEnroll | 
+
+            try
+            {
+                RestApiResultClientDeviceEnrollmentResult result = apiInstance.EnrollDevice(appId, deviceEnrollmentRequest);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling DeviceApi.EnrollDevice: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **deviceEnrollmentRequest** | [**ClientDeviceEnroll**](ClientDeviceEnroll.md)|  | 
+
+### Return type
+
+[**RestApiResultClientDeviceEnrollmentResult**](RestApiResultClientDeviceEnrollmentResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getdevicedetails"></a>
+# **GetDeviceDetails**
+> RestApiResultClientDevice GetDeviceDetails (string appId, string deviceModel, string deviceId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetDeviceDetailsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new DeviceApi();
+            var appId = appId_example;  // string | 
+            var deviceModel = deviceModel_example;  // string | 
+            var deviceId = deviceId_example;  // string | 
+
+            try
+            {
+                RestApiResultClientDevice result = apiInstance.GetDeviceDetails(appId, deviceModel, deviceId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling DeviceApi.GetDeviceDetails: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **deviceModel** | **string**|  | 
+ **deviceId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultClientDevice**](RestApiResultClientDevice.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="searchdevices"></a>
+# **SearchDevices**
+> RestApiArrayResultClientDeviceSummary SearchDevices (string appId, int? storeId = null, string deviceModel = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SearchDevicesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new DeviceApi();
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? |  (optional) 
+            var deviceModel = deviceModel_example;  // string |  (optional) 
+
+            try
+            {
+                RestApiArrayResultClientDeviceSummary result = apiInstance.SearchDevices(appId, storeId, deviceModel);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling DeviceApi.SearchDevices: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | [optional] 
+ **deviceModel** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiArrayResultClientDeviceSummary**](RestApiArrayResultClientDeviceSummary.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/DeviceSettings.md b/docs/DeviceSettings.md
index 010a75cf..10c133cf 100644
--- a/docs/DeviceSettings.md
+++ b/docs/DeviceSettings.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DeviceSettings
+# Flipdish.Model.DeviceSettings
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DnsRecordInformation.md b/docs/DnsRecordInformation.md
index 6c99c574..e0c5706f 100644
--- a/docs/DnsRecordInformation.md
+++ b/docs/DnsRecordInformation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DnsRecordInformation
+# Flipdish.Model.DnsRecordInformation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DnsVerifiedEvent.md b/docs/DnsVerifiedEvent.md
index 901494bf..c06dd562 100644
--- a/docs/DnsVerifiedEvent.md
+++ b/docs/DnsVerifiedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DnsVerifiedEvent
+# Flipdish.Model.DnsVerifiedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,7 +9,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Driver.md b/docs/Driver.md
deleted file mode 100644
index fdb7e831..00000000
--- a/docs/Driver.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# IO.Swagger.Model.Driver
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**UserId** | **int?** | User Id | [optional] 
-**UserName** | **string** | User Name | [optional] 
-**UserPhoneNumber** | **string** | User Phone Number | [optional] 
-**Stores** | [**List&lt;DriverStore&gt;**](DriverStore.md) |  | [optional] 
-**ProfileImageUrl** | **string** | Profile image url | [optional] 
-**DriverKey** | **string** | Driver Key | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/DriverInvitation.md b/docs/DriverInvitation.md
deleted file mode 100644
index acbfe138..00000000
--- a/docs/DriverInvitation.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# IO.Swagger.Model.DriverInvitation
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**PhoneNumber** | **string** | Phone number | [optional] 
-**Name** | **string** | Driver&#39;s name | [optional] 
-**StoreIds** | **List&lt;int?&gt;** | Assigned store IDs | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/DriverLoginModel.md b/docs/DriverLoginModel.md
index 48ce79f1..bacf01b2 100644
--- a/docs/DriverLoginModel.md
+++ b/docs/DriverLoginModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DriverLoginModel
+# Flipdish.Model.DriverLoginModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DriverRequestLoginPinModel.md b/docs/DriverRequestLoginPinModel.md
index 8eecff05..5c94b826 100644
--- a/docs/DriverRequestLoginPinModel.md
+++ b/docs/DriverRequestLoginPinModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DriverRequestLoginPinModel
+# Flipdish.Model.DriverRequestLoginPinModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DriverStore.md b/docs/DriverStore.md
deleted file mode 100644
index 6c4c1fc5..00000000
--- a/docs/DriverStore.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# IO.Swagger.Model.DriverStore
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**StoreId** | **int?** | Store identifier | [optional] 
-**StoreName** | **string** | Store name | [optional] 
-**Presence** | **string** | Presence | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/DriversApi.md b/docs/DriversApi.md
index bd2dc334..2ed8a7ff 100644
--- a/docs/DriversApi.md
+++ b/docs/DriversApi.md
@@ -1,39 +1,39 @@
-# IO.Swagger.Api.DriversApi
+# Flipdish.Api.DriversApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AddDriverNotificationToken**](DriversApi.md#adddrivernotificationtoken) | **POST** /api/v1.0/drivers/token | Add driver token
-[**DeleteDriverProfileImage**](DriversApi.md#deletedriverprofileimage) | **DELETE** /api/v1.0/drivers/profile/image | Delete driver profile image
-[**DriverLogin**](DriversApi.md#driverlogin) | **POST** /api/v1.0/drivers/login | [PRIVATE] Login with phone number and pin
-[**DriverRequestLoginCodeSms**](DriversApi.md#driverrequestlogincodesms) | **POST** /api/v1.0/drivers/pin | [PRIVATE] Request an SMS to be sent to the driver with their login code
-[**GetDriverProfile**](DriversApi.md#getdriverprofile) | **GET** /api/v1.0/drivers/profile | Get driver profile
-[**GetStoresForDriver**](DriversApi.md#getstoresfordriver) | **GET** /api/v1.0/drivers/assignedstores | Get stores for driver
-[**RemoveDriverNotificationToken**](DriversApi.md#removedrivernotificationtoken) | **DELETE** /api/v1.0/drivers/token | Delete driver token
-[**SetDriverPresenceForStore**](DriversApi.md#setdriverpresenceforstore) | **POST** /api/v1.0/drivers/stores/{storeId}/presence/{presence} | 
-[**SetDriverProfileImage**](DriversApi.md#setdriverprofileimage) | **POST** /api/v1.0/drivers/profile/image | Set driver profile image and returns it&#39;s url
-[**UpdateDeliveryTrackingStatus**](DriversApi.md#updatedeliverytrackingstatus) | **POST** /api/v1.0/orders/{orderId}/tracking/{deliveryTrackingStatus} | Change delivery tracking status and return the updated status.
-[**UpdateDriverProfile**](DriversApi.md#updatedriverprofile) | **POST** /api/v1.0/drivers/profile | Update driver profile
+[**DriversAddDriverNotificationToken**](DriversApi.md#driversadddrivernotificationtoken) | **POST** /api/v1.0/drivers/token | 
+[**DriversDeleteDriverProfileImage**](DriversApi.md#driversdeletedriverprofileimage) | **DELETE** /api/v1.0/drivers/profile/image | 
+[**DriversDriverLogin**](DriversApi.md#driversdriverlogin) | **POST** /api/v1.0/drivers/login | 
+[**DriversDriverRequestLoginCodeSms**](DriversApi.md#driversdriverrequestlogincodesms) | **POST** /api/v1.0/drivers/pin | 
+[**DriversGetDriverProfile**](DriversApi.md#driversgetdriverprofile) | **GET** /api/v1.0/drivers/profile | 
+[**DriversGetStoresForDriver**](DriversApi.md#driversgetstoresfordriver) | **GET** /api/v1.0/drivers/assignedstores | 
+[**DriversRemoveDriverNotificationToken**](DriversApi.md#driversremovedrivernotificationtoken) | **DELETE** /api/v1.0/drivers/token | 
+[**DriversSetDriverPresenceForStore**](DriversApi.md#driverssetdriverpresenceforstore) | **POST** /api/v1.0/drivers/stores/{storeId}/presence/{presence} | 
+[**DriversSetDriverProfileImage**](DriversApi.md#driverssetdriverprofileimage) | **POST** /api/v1.0/drivers/profile/image | 
+[**DriversUpdateDeliveryTrackingStatus**](DriversApi.md#driversupdatedeliverytrackingstatus) | **POST** /api/v1.0/orders/{orderId}/tracking/{deliveryTrackingStatus} | 
+[**DriversUpdateDriverProfile**](DriversApi.md#driversupdatedriverprofile) | **POST** /api/v1.0/drivers/profile | 
 
 
-<a name="adddrivernotificationtoken"></a>
-# **AddDriverNotificationToken**
-> void AddDriverNotificationToken (UpdateDriverNotificationToken updateDriverToken)
+<a name="driversadddrivernotificationtoken"></a>
+# **DriversAddDriverNotificationToken**
+> Object DriversAddDriverNotificationToken (UpdateDriverNotificationToken updateDriverToken)
+
 
-Add driver token
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class AddDriverNotificationTokenExample
+    public class DriversAddDriverNotificationTokenExample
     {
         public void main()
         {
@@ -45,12 +45,12 @@ namespace Example
 
             try
             {
-                // Add driver token
-                apiInstance.AddDriverNotificationToken(updateDriverToken);
+                Object result = apiInstance.DriversAddDriverNotificationToken(updateDriverToken);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.AddDriverNotificationToken: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversAddDriverNotificationToken: " + e.Message );
             }
         }
     }
@@ -65,7 +65,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-void (empty response body)
+**Object**
 
 ### Authorization
 
@@ -78,23 +78,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="deletedriverprofileimage"></a>
-# **DeleteDriverProfileImage**
-> void DeleteDriverProfileImage ()
+<a name="driversdeletedriverprofileimage"></a>
+# **DriversDeleteDriverProfileImage**
+> Object DriversDeleteDriverProfileImage ()
+
 
-Delete driver profile image
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class DeleteDriverProfileImageExample
+    public class DriversDeleteDriverProfileImageExample
     {
         public void main()
         {
@@ -105,12 +105,12 @@ namespace Example
 
             try
             {
-                // Delete driver profile image
-                apiInstance.DeleteDriverProfileImage();
+                Object result = apiInstance.DriversDeleteDriverProfileImage();
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.DeleteDriverProfileImage: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversDeleteDriverProfileImage: " + e.Message );
             }
         }
     }
@@ -122,7 +122,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-void (empty response body)
+**Object**
 
 ### Authorization
 
@@ -135,23 +135,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="driverlogin"></a>
-# **DriverLogin**
-> void DriverLogin (DriverLoginModel driverLoginModel)
+<a name="driversdriverlogin"></a>
+# **DriversDriverLogin**
+> Object DriversDriverLogin (DriverLoginModel driverLoginModel)
+
 
-[PRIVATE] Login with phone number and pin
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class DriverLoginExample
+    public class DriversDriverLoginExample
     {
         public void main()
         {
@@ -159,16 +159,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new DriversApi();
-            var driverLoginModel = new DriverLoginModel(); // DriverLoginModel | Driver request login code model
+            var driverLoginModel = new DriverLoginModel(); // DriverLoginModel | 
 
             try
             {
-                // [PRIVATE] Login with phone number and pin
-                apiInstance.DriverLogin(driverLoginModel);
+                Object result = apiInstance.DriversDriverLogin(driverLoginModel);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.DriverLogin: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversDriverLogin: " + e.Message );
             }
         }
     }
@@ -179,11 +179,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **driverLoginModel** | [**DriverLoginModel**](DriverLoginModel.md)| Driver request login code model | 
+ **driverLoginModel** | [**DriverLoginModel**](DriverLoginModel.md)|  | 
 
 ### Return type
 
-void (empty response body)
+**Object**
 
 ### Authorization
 
@@ -196,23 +196,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="driverrequestlogincodesms"></a>
-# **DriverRequestLoginCodeSms**
-> void DriverRequestLoginCodeSms (DriverRequestLoginPinModel driverRequestLoginPinModel)
+<a name="driversdriverrequestlogincodesms"></a>
+# **DriversDriverRequestLoginCodeSms**
+> Object DriversDriverRequestLoginCodeSms (DriverRequestLoginPinModel driverRequestLoginPinModel)
+
 
-[PRIVATE] Request an SMS to be sent to the driver with their login code
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class DriverRequestLoginCodeSmsExample
+    public class DriversDriverRequestLoginCodeSmsExample
     {
         public void main()
         {
@@ -220,16 +220,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new DriversApi();
-            var driverRequestLoginPinModel = new DriverRequestLoginPinModel(); // DriverRequestLoginPinModel | Driver request login code model
+            var driverRequestLoginPinModel = new DriverRequestLoginPinModel(); // DriverRequestLoginPinModel | 
 
             try
             {
-                // [PRIVATE] Request an SMS to be sent to the driver with their login code
-                apiInstance.DriverRequestLoginCodeSms(driverRequestLoginPinModel);
+                Object result = apiInstance.DriversDriverRequestLoginCodeSms(driverRequestLoginPinModel);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.DriverRequestLoginCodeSms: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversDriverRequestLoginCodeSms: " + e.Message );
             }
         }
     }
@@ -240,11 +240,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **driverRequestLoginPinModel** | [**DriverRequestLoginPinModel**](DriverRequestLoginPinModel.md)| Driver request login code model | 
+ **driverRequestLoginPinModel** | [**DriverRequestLoginPinModel**](DriverRequestLoginPinModel.md)|  | 
 
 ### Return type
 
-void (empty response body)
+**Object**
 
 ### Authorization
 
@@ -257,23 +257,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="getdriverprofile"></a>
-# **GetDriverProfile**
-> RestApiResultDriver GetDriverProfile ()
+<a name="driversgetdriverprofile"></a>
+# **DriversGetDriverProfile**
+> Object DriversGetDriverProfile ()
+
 
-Get driver profile
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GetDriverProfileExample
+    public class DriversGetDriverProfileExample
     {
         public void main()
         {
@@ -284,13 +284,12 @@ namespace Example
 
             try
             {
-                // Get driver profile
-                RestApiResultDriver result = apiInstance.GetDriverProfile();
+                Object result = apiInstance.DriversGetDriverProfile();
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.GetDriverProfile: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversGetDriverProfile: " + e.Message );
             }
         }
     }
@@ -302,7 +301,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-[**RestApiResultDriver**](RestApiResultDriver.md)
+**Object**
 
 ### Authorization
 
@@ -315,23 +314,23 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="getstoresfordriver"></a>
-# **GetStoresForDriver**
-> RestApiArrayResultDriverStore GetStoresForDriver ()
+<a name="driversgetstoresfordriver"></a>
+# **DriversGetStoresForDriver**
+> Object DriversGetStoresForDriver ()
+
 
-Get stores for driver
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GetStoresForDriverExample
+    public class DriversGetStoresForDriverExample
     {
         public void main()
         {
@@ -342,13 +341,12 @@ namespace Example
 
             try
             {
-                // Get stores for driver
-                RestApiArrayResultDriverStore result = apiInstance.GetStoresForDriver();
+                Object result = apiInstance.DriversGetStoresForDriver();
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.GetStoresForDriver: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversGetStoresForDriver: " + e.Message );
             }
         }
     }
@@ -360,7 +358,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-[**RestApiArrayResultDriverStore**](RestApiArrayResultDriverStore.md)
+**Object**
 
 ### Authorization
 
@@ -373,23 +371,23 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="removedrivernotificationtoken"></a>
-# **RemoveDriverNotificationToken**
-> void RemoveDriverNotificationToken (UpdateDriverNotificationToken removeDriverToken)
+<a name="driversremovedrivernotificationtoken"></a>
+# **DriversRemoveDriverNotificationToken**
+> Object DriversRemoveDriverNotificationToken (UpdateDriverNotificationToken removeDriverToken)
+
 
-Delete driver token
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class RemoveDriverNotificationTokenExample
+    public class DriversRemoveDriverNotificationTokenExample
     {
         public void main()
         {
@@ -401,12 +399,12 @@ namespace Example
 
             try
             {
-                // Delete driver token
-                apiInstance.RemoveDriverNotificationToken(removeDriverToken);
+                Object result = apiInstance.DriversRemoveDriverNotificationToken(removeDriverToken);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.RemoveDriverNotificationToken: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversRemoveDriverNotificationToken: " + e.Message );
             }
         }
     }
@@ -421,7 +419,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-void (empty response body)
+**Object**
 
 ### Authorization
 
@@ -434,9 +432,9 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="setdriverpresenceforstore"></a>
-# **SetDriverPresenceForStore**
-> void SetDriverPresenceForStore (int? storeId, string presence)
+<a name="driverssetdriverpresenceforstore"></a>
+# **DriversSetDriverPresenceForStore**
+> Object DriversSetDriverPresenceForStore (int? storeId, string presence)
 
 
 
@@ -444,13 +442,13 @@ void (empty response body)
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class SetDriverPresenceForStoreExample
+    public class DriversSetDriverPresenceForStoreExample
     {
         public void main()
         {
@@ -463,11 +461,12 @@ namespace Example
 
             try
             {
-                apiInstance.SetDriverPresenceForStore(storeId, presence);
+                Object result = apiInstance.DriversSetDriverPresenceForStore(storeId, presence);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.SetDriverPresenceForStore: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversSetDriverPresenceForStore: " + e.Message );
             }
         }
     }
@@ -483,7 +482,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-void (empty response body)
+**Object**
 
 ### Authorization
 
@@ -496,23 +495,23 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="setdriverprofileimage"></a>
-# **SetDriverProfileImage**
-> RestApiStringResult SetDriverProfileImage ()
+<a name="driverssetdriverprofileimage"></a>
+# **DriversSetDriverProfileImage**
+> Object DriversSetDriverProfileImage ()
+
 
-Set driver profile image and returns it's url
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class SetDriverProfileImageExample
+    public class DriversSetDriverProfileImageExample
     {
         public void main()
         {
@@ -523,13 +522,12 @@ namespace Example
 
             try
             {
-                // Set driver profile image and returns it's url
-                RestApiStringResult result = apiInstance.SetDriverProfileImage();
+                Object result = apiInstance.DriversSetDriverProfileImage();
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.SetDriverProfileImage: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversSetDriverProfileImage: " + e.Message );
             }
         }
     }
@@ -541,7 +539,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-[**RestApiStringResult**](RestApiStringResult.md)
+**Object**
 
 ### Authorization
 
@@ -554,25 +552,23 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="updatedeliverytrackingstatus"></a>
-# **UpdateDeliveryTrackingStatus**
-> RestApiStringResult UpdateDeliveryTrackingStatus (int? orderId, string deliveryTrackingStatus)
+<a name="driversupdatedeliverytrackingstatus"></a>
+# **DriversUpdateDeliveryTrackingStatus**
+> Object DriversUpdateDeliveryTrackingStatus (int? orderId, string deliveryTrackingStatus)
 
-Change delivery tracking status and return the updated status.
 
-...
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class UpdateDeliveryTrackingStatusExample
+    public class DriversUpdateDeliveryTrackingStatusExample
     {
         public void main()
         {
@@ -580,18 +576,17 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new DriversApi();
-            var orderId = 56;  // int? | Order identifier
+            var orderId = 56;  // int? | 
             var deliveryTrackingStatus = deliveryTrackingStatus_example;  // string | 
 
             try
             {
-                // Change delivery tracking status and return the updated status.
-                RestApiStringResult result = apiInstance.UpdateDeliveryTrackingStatus(orderId, deliveryTrackingStatus);
+                Object result = apiInstance.DriversUpdateDeliveryTrackingStatus(orderId, deliveryTrackingStatus);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.UpdateDeliveryTrackingStatus: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversUpdateDeliveryTrackingStatus: " + e.Message );
             }
         }
     }
@@ -602,12 +597,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **int?**| Order identifier | 
+ **orderId** | **int?**|  | 
  **deliveryTrackingStatus** | **string**|  | 
 
 ### Return type
 
-[**RestApiStringResult**](RestApiStringResult.md)
+**Object**
 
 ### Authorization
 
@@ -620,23 +615,23 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="updatedriverprofile"></a>
-# **UpdateDriverProfile**
-> void UpdateDriverProfile (UpdateDriverProfileModel updateDriverProfile)
+<a name="driversupdatedriverprofile"></a>
+# **DriversUpdateDriverProfile**
+> Object DriversUpdateDriverProfile (UpdateDriverProfileModel updateDriverProfile)
+
 
-Update driver profile
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class UpdateDriverProfileExample
+    public class DriversUpdateDriverProfileExample
     {
         public void main()
         {
@@ -644,16 +639,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new DriversApi();
-            var updateDriverProfile = new UpdateDriverProfileModel(); // UpdateDriverProfileModel | Update the driver profile (i.e Name)
+            var updateDriverProfile = new UpdateDriverProfileModel(); // UpdateDriverProfileModel | 
 
             try
             {
-                // Update driver profile
-                apiInstance.UpdateDriverProfile(updateDriverProfile);
+                Object result = apiInstance.DriversUpdateDriverProfile(updateDriverProfile);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling DriversApi.UpdateDriverProfile: " + e.Message );
+                Debug.Print("Exception when calling DriversApi.DriversUpdateDriverProfile: " + e.Message );
             }
         }
     }
@@ -664,11 +659,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **updateDriverProfile** | [**UpdateDriverProfileModel**](UpdateDriverProfileModel.md)| Update the driver profile (i.e Name) | 
+ **updateDriverProfile** | [**UpdateDriverProfileModel**](UpdateDriverProfileModel.md)|  | 
 
 ### Return type
 
-void (empty response body)
+**Object**
 
 ### Authorization
 
diff --git a/docs/DynamicFormField.md b/docs/DynamicFormField.md
index ec6f44f4..19fbc0fc 100644
--- a/docs/DynamicFormField.md
+++ b/docs/DynamicFormField.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DynamicFormField
+# Flipdish.Model.DynamicFormField
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **Mapping** | **Dictionary&lt;string, string&gt;** |  | [optional] 
 **Modifiers** | **List&lt;string&gt;** |  | [optional] 
 **Value** | **Object** |  | [optional] 
+**Scopes** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/DynamicFormFieldMapping.md b/docs/DynamicFormFieldMapping.md
deleted file mode 100644
index 45d467f5..00000000
--- a/docs/DynamicFormFieldMapping.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.DynamicFormFieldMapping
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Source** | **string** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/DynamicFormFieldOption.md b/docs/DynamicFormFieldOption.md
index 60b68b4f..8c3d7aba 100644
--- a/docs/DynamicFormFieldOption.md
+++ b/docs/DynamicFormFieldOption.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DynamicFormFieldOption
+# Flipdish.Model.DynamicFormFieldOption
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DynamicFormRule.md b/docs/DynamicFormRule.md
index 50431116..7a111aa1 100644
--- a/docs/DynamicFormRule.md
+++ b/docs/DynamicFormRule.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DynamicFormRule
+# Flipdish.Model.DynamicFormRule
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/DynamicFormRules.md b/docs/DynamicFormRules.md
index f5803e85..bbd0dfff 100644
--- a/docs/DynamicFormRules.md
+++ b/docs/DynamicFormRules.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.DynamicFormRules
+# Flipdish.Model.DynamicFormRules
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/EmvNotificationEvent.md b/docs/EmvNotificationEvent.md
index c0bacd10..c6e7eace 100644
--- a/docs/EmvNotificationEvent.md
+++ b/docs/EmvNotificationEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.EmvNotificationEvent
+# Flipdish.Model.EmvNotificationEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -18,7 +18,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/EmvTerminal.md b/docs/EmvTerminal.md
index fa30f6b5..d356a3f9 100644
--- a/docs/EmvTerminal.md
+++ b/docs/EmvTerminal.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.EmvTerminal
+# Flipdish.Model.EmvTerminal
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/EmvTerminalWithAssignments.md b/docs/EmvTerminalWithAssignments.md
index 8fd26964..72aaa0aa 100644
--- a/docs/EmvTerminalWithAssignments.md
+++ b/docs/EmvTerminalWithAssignments.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.EmvTerminalWithAssignments
+# Flipdish.Model.EmvTerminalWithAssignments
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/EndUserFeeConfig.md b/docs/EndUserFeeConfig.md
new file mode 100644
index 00000000..10760bc7
--- /dev/null
+++ b/docs/EndUserFeeConfig.md
@@ -0,0 +1,15 @@
+# Flipdish.Model.EndUserFeeConfig
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Channel** | **string** | The order channel this fee config applies to | [optional] 
+**PaymentMethod** | **string** | The payment method this fee config applies to | [optional] 
+**MinOrderAmount** | **double?** | Order amount below which MinFixedFee is charged instead of the percent/fixed calculation | [optional] 
+**MinFixedFee** | **double?** | Fixed fee charged for orders at or below MinOrderAmount | [optional] 
+**PercentFee** | **double?** | Percentage fee applied to the order amount | [optional] 
+**FixedFee** | **double?** | Fixed fee compared against the percentage fee - the greater of the two is charged | [optional] 
+**Cap** | **double?** | Maximum fee that can be charged | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/EndUserFeesApi.md b/docs/EndUserFeesApi.md
new file mode 100644
index 00000000..90328cf8
--- /dev/null
+++ b/docs/EndUserFeesApi.md
@@ -0,0 +1,204 @@
+# Flipdish.Api.EndUserFeesApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**CreateEndUserFeeConfig**](EndUserFeesApi.md#createenduserfeeconfig) | **POST** /api/v1.0/{appId}/stores/{storeId}/end-user-fees | 
+[**GetEndUserFeesForStore**](EndUserFeesApi.md#getenduserfeesforstore) | **GET** /api/v1.0/{appId}/stores/{storeId}/end-user-fees | 
+[**SetV2FeeCalculation**](EndUserFeesApi.md#setv2feecalculation) | **POST** /api/v1.0/{appId}/stores/{storeId}/end-user-fees/v2-fee-calculation | 
+
+
+<a name="createenduserfeeconfig"></a>
+# **CreateEndUserFeeConfig**
+> Object CreateEndUserFeeConfig (CreateEndUserFeeConfig input, string appId, int? storeId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class CreateEndUserFeeConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new EndUserFeesApi();
+            var input = new CreateEndUserFeeConfig(); // CreateEndUserFeeConfig | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
+
+            try
+            {
+                Object result = apiInstance.CreateEndUserFeeConfig(input, appId, storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling EndUserFeesApi.CreateEndUserFeeConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **input** | [**CreateEndUserFeeConfig**](CreateEndUserFeeConfig.md)|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getenduserfeesforstore"></a>
+# **GetEndUserFeesForStore**
+> RestApiResultGetEndUserFeeConfigsResponse GetEndUserFeesForStore (string appId, int? storeId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetEndUserFeesForStoreExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new EndUserFeesApi();
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
+
+            try
+            {
+                RestApiResultGetEndUserFeeConfigsResponse result = apiInstance.GetEndUserFeesForStore(appId, storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling EndUserFeesApi.GetEndUserFeesForStore: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
+
+### Return type
+
+[**RestApiResultGetEndUserFeeConfigsResponse**](RestApiResultGetEndUserFeeConfigsResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setv2feecalculation"></a>
+# **SetV2FeeCalculation**
+> RestApiResultSetV2FeeCalculationRequest SetV2FeeCalculation (SetV2FeeCalculationRequest input, string appId, int? storeId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetV2FeeCalculationExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new EndUserFeesApi();
+            var input = new SetV2FeeCalculationRequest(); // SetV2FeeCalculationRequest | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
+
+            try
+            {
+                RestApiResultSetV2FeeCalculationRequest result = apiInstance.SetV2FeeCalculation(input, appId, storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling EndUserFeesApi.SetV2FeeCalculation: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **input** | [**SetV2FeeCalculationRequest**](SetV2FeeCalculationRequest.md)|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
+
+### Return type
+
+[**RestApiResultSetV2FeeCalculationRequest**](RestApiResultSetV2FeeCalculationRequest.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/EventSearchResult.md b/docs/EventSearchResult.md
index 86cbfe07..445020ab 100644
--- a/docs/EventSearchResult.md
+++ b/docs/EventSearchResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.EventSearchResult
+# Flipdish.Model.EventSearchResult
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **OrderDispatchedEvent** | [**List&lt;OrderDispatchedEvent&gt;**](OrderDispatchedEvent.md) | Order dispatched events | [optional] 
 **OrderCustomerTrackingCreatedEvent** | [**List&lt;OrderCustomerTrackingCreatedEvent&gt;**](OrderCustomerTrackingCreatedEvent.md) | Order delivery tracking created events | [optional] 
 **OrderDeliveryTrackingStatusUpdatedEvent** | [**List&lt;OrderDeliveryTrackingStatusUpdatedEvent&gt;**](OrderDeliveryTrackingStatusUpdatedEvent.md) | Order delivery tracking updated events | [optional] 
+**OrderBatchPublishedEvent** | [**List&lt;OrderBatchPublishedEvent&gt;**](OrderBatchPublishedEvent.md) | Order Batch published event | [optional] 
 **OrderCreatedEvent** | [**List&lt;OrderCreatedEvent&gt;**](OrderCreatedEvent.md) | Order created events | [optional] 
 **OrderRatingUpdatedEvent** | [**List&lt;OrderRatingUpdatedEvent&gt;**](OrderRatingUpdatedEvent.md) | Order rating updated events | [optional] 
 **OrderRefundedEvent** | [**List&lt;OrderRefundedEvent&gt;**](OrderRefundedEvent.md) | Order refunded events | [optional] 
@@ -37,6 +38,7 @@ Name | Type | Description | Notes
 **StoreLogoUpdatedEvent** | [**List&lt;StoreLogoUpdatedEvent&gt;**](StoreLogoUpdatedEvent.md) | Store logo updated events | [optional] 
 **StoreLogoDeletedEvent** | [**List&lt;StoreLogoDeletedEvent&gt;**](StoreLogoDeletedEvent.md) | Store logo deleted events | [optional] 
 **MenuCreatedEvent** | [**List&lt;MenuCreatedEvent&gt;**](MenuCreatedEvent.md) | Menu created events | [optional] 
+**MenuAsyncCreationCompletedEvent** | [**List&lt;MenuAsyncCreationCompletedEvent&gt;**](MenuAsyncCreationCompletedEvent.md) | Menu async creation completed events | [optional] 
 **MenuUpdatedEvent** | [**List&lt;MenuUpdatedEvent&gt;**](MenuUpdatedEvent.md) | Menu updated events | [optional] 
 **MenuUploadedEvent** | [**List&lt;MenuUploadedEvent&gt;**](MenuUploadedEvent.md) | Menu uploaded events | [optional] 
 **MenuBulkEditEvent** | [**List&lt;MenuBulkEditEvent&gt;**](MenuBulkEditEvent.md) | Menu bulk events | [optional] 
@@ -68,6 +70,8 @@ Name | Type | Description | Notes
 **PrinterUnassignedFromStoreEvent** | [**List&lt;PrinterUnassignedFromStoreEvent&gt;**](PrinterUnassignedFromStoreEvent.md) | Printer unassigned from store event | [optional] 
 **PhoneCallStartedEvent** | [**List&lt;PhoneCallStartedEvent&gt;**](PhoneCallStartedEvent.md) | Phone call started event | [optional] 
 **PhoneCallEndedEvent** | [**List&lt;PhoneCallEndedEvent&gt;**](PhoneCallEndedEvent.md) | Phone call ended event | [optional] 
+**TelephonyConfigUpdatedEvent** | [**List&lt;TelephonyConfigUpdatedEvent&gt;**](TelephonyConfigUpdatedEvent.md) | Telephony config updated event | [optional] 
+**ChannelStoresUpdatedEvent** | [**List&lt;ChannelStoresUpdatedEvent&gt;**](ChannelStoresUpdatedEvent.md) | Channel stores updated event | [optional] 
 **LoyaltyCampaignCreatedEvent** | [**List&lt;LoyaltyCampaignCreatedEvent&gt;**](LoyaltyCampaignCreatedEvent.md) | Loyalty campaign created event | [optional] 
 **LoyaltyCampaignDeletedEvent** | [**List&lt;LoyaltyCampaignDeletedEvent&gt;**](LoyaltyCampaignDeletedEvent.md) | Loyalty campaign deleted event | [optional] 
 **LoyaltyCampaignUpdatedEvent** | [**List&lt;LoyaltyCampaignUpdatedEvent&gt;**](LoyaltyCampaignUpdatedEvent.md) | Loyalty campaign updated event | [optional] 
@@ -84,6 +88,7 @@ Name | Type | Description | Notes
 **VoucherCreatedEvent** | [**List&lt;VoucherCreatedEvent&gt;**](VoucherCreatedEvent.md) | Voucher created event | [optional] 
 **VoucherUpdatedEvent** | [**List&lt;VoucherUpdatedEvent&gt;**](VoucherUpdatedEvent.md) | Voucher updated event | [optional] 
 **VoucherDeletedEvent** | [**List&lt;VoucherDeletedEvent&gt;**](VoucherDeletedEvent.md) | Voucher deleted event | [optional] 
+**VoucherAppliedEvent** | [**List&lt;VoucherAppliedEvent&gt;**](VoucherAppliedEvent.md) | Voucher applied event | [optional] 
 **TeammateInviteSentEvent** | [**List&lt;TeammateInviteSentEvent&gt;**](TeammateInviteSentEvent.md) | Teammate invite sent event | [optional] 
 **TeammateInviteAcceptedEvent** | [**List&lt;TeammateInviteAcceptedEvent&gt;**](TeammateInviteAcceptedEvent.md) | Teammate invite accepted event | [optional] 
 **TeammateUpdatedEvent** | [**List&lt;TeammateUpdatedEvent&gt;**](TeammateUpdatedEvent.md) | Teammate updated event | [optional] 
@@ -91,8 +96,9 @@ Name | Type | Description | Notes
 **BankAccountCreatedEvent** | [**List&lt;BankAccountCreatedEvent&gt;**](BankAccountCreatedEvent.md) | Bank account created event | [optional] 
 **BankAccountUpdatedEvent** | [**List&lt;BankAccountUpdatedEvent&gt;**](BankAccountUpdatedEvent.md) | Bank account updated event | [optional] 
 **BankAccountDeletedEvent** | [**List&lt;BankAccountDeletedEvent&gt;**](BankAccountDeletedEvent.md) | Bank account updated event | [optional] 
-**BankAccountAssignedEvent** | [**List&lt;BankAccountDeletedEvent&gt;**](BankAccountDeletedEvent.md) | Bank account assigned event | [optional] 
+**BankAccountAssignedEvent** | [**List&lt;BankAccountAssignedEvent&gt;**](BankAccountAssignedEvent.md) | Bank account assigned event | [optional] 
 **HydraAssignedEvent** | [**List&lt;HydraAssignedEvent&gt;**](HydraAssignedEvent.md) | Hydra assigned event | [optional] 
+**HydraCreatedEvent** | [**List&lt;HydraCreatedEvent&gt;**](HydraCreatedEvent.md) | Hydra created event | [optional] 
 **HydraRequestResetEvent** | [**List&lt;HydraRequestResetEvent&gt;**](HydraRequestResetEvent.md) | Hydra reset requested event | [optional] 
 **HydraStoreAssignedEvent** | [**List&lt;HydraStoreAssignedEvent&gt;**](HydraStoreAssignedEvent.md) | Hydra store assigned event | [optional] 
 **HydraStoreUnassignedEvent** | [**List&lt;HydraStoreUnassignedEvent&gt;**](HydraStoreUnassignedEvent.md) | Hydra store unassigned | [optional] 
@@ -123,6 +129,7 @@ Name | Type | Description | Notes
 **AppStoreConfigCreatedEvent** | [**List&lt;AppStoreConfigCreatedEvent&gt;**](AppStoreConfigCreatedEvent.md) | App Store Config Created | [optional] 
 **AppStoreConfigUpdatedEvent** | [**List&lt;AppStoreConfigUpdatedEvent&gt;**](AppStoreConfigUpdatedEvent.md) | App Store Config Updated | [optional] 
 **AppStoreConfigDeletedEvent** | [**List&lt;AppStoreConfigDeletedEvent&gt;**](AppStoreConfigDeletedEvent.md) | App Store Config Deleted | [optional] 
+**AppStoreSubscriptionChangeJobUpdatedEvent** | [**List&lt;AppStoreSubscriptionChangeJobUpdatedEvent&gt;**](AppStoreSubscriptionChangeJobUpdatedEvent.md) | App Store Subscription Change Job Updated | [optional] 
 **CatalogItemCreatedEvent** | [**List&lt;CatalogItemCreatedEvent&gt;**](CatalogItemCreatedEvent.md) | Catalog Item Created | [optional] 
 **CatalogItemUpdatedEvent** | [**List&lt;CatalogItemUpdatedEvent&gt;**](CatalogItemUpdatedEvent.md) | Catalog Item Updated | [optional] 
 **CatalogItemArchivedEvent** | [**List&lt;CatalogItemArchivedEvent&gt;**](CatalogItemArchivedEvent.md) | Catalog Item Archived | [optional] 
@@ -135,6 +142,9 @@ Name | Type | Description | Notes
 **LocationCreatedEvent** | [**List&lt;LocationCreatedEvent&gt;**](LocationCreatedEvent.md) | Location created event | [optional] 
 **LocationDeletedEvent** | [**List&lt;LocationDeletedEvent&gt;**](LocationDeletedEvent.md) | Location deleted event | [optional] 
 **StoreServiceChargeUpdatedEvent** | [**List&lt;StoreServiceChargeUpdatedEvent&gt;**](StoreServiceChargeUpdatedEvent.md) | Service Charge Updated Event | [optional] 
+**MobileAppsSubmissionStatusUpdatedEvent** | [**List&lt;MobileAppsSubmissionStatusUpdatedEvent&gt;**](MobileAppsSubmissionStatusUpdatedEvent.md) | Mobile Submission Status Updated Event | [optional] 
+**MobileAppsSubmissionUpdatedEvent** | [**List&lt;MobileAppsSubmissionUpdatedEvent&gt;**](MobileAppsSubmissionUpdatedEvent.md) | Mobile Submission Updated Event | [optional] 
+**StoreFeeConfigUpdatedEvent** | [**List&lt;StoreFeeConfigUpdatedEvent&gt;**](StoreFeeConfigUpdatedEvent.md) | Store Fee Config Updated Event | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/EventsApi.md b/docs/EventsApi.md
index 19f8ca0f..2ec3a657 100644
--- a/docs/EventsApi.md
+++ b/docs/EventsApi.md
@@ -1,33 +1,33 @@
-# IO.Swagger.Api.EventsApi
+# Flipdish.Api.EventsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetCustomerEvents**](EventsApi.md#getcustomerevents) | **GET** /api/v1.0/events/customer/{customerId} | Get customer events  For technical reasons, the number of records returned is limited to 100.
-[**GetEvents**](EventsApi.md#getevents) | **GET** /api/v1.0/events | Get events  For technical reasons, the number of records returned is limited to 100.
-[**GetEventsById**](EventsApi.md#geteventsbyid) | **GET** /api/v1.0/events/{eventId} | Get event by Id  For technical reasons, the number of records returned is limited to 100.
-[**GetMenuEvents**](EventsApi.md#getmenuevents) | **GET** /api/v1.0/events/menu/{menuId} | Get menu events  For technical reasons, the number of records returned is limited to 100.
-[**GetOrderEvents**](EventsApi.md#getorderevents) | **GET** /api/v1.0/events/order/{orderId} | Get order events  For technical reasons, the number of records returned is limited to 100.
-[**GetOrderEventsByCustomer**](EventsApi.md#getordereventsbycustomer) | **GET** /api/v1.0/events/order | Get order events by customer  For technical reasons, the number of records returned is limited to 100.
-[**GetStoreEvents**](EventsApi.md#getstoreevents) | **GET** /api/v1.0/events/store/{storeId} | Get store events  For technical reasons, the number of records returned is limited to 100.
-[**GetUserEvents**](EventsApi.md#getuserevents) | **GET** /api/v1.0/events/user/{userId} | Get user events  For technical reasons, the number of records returned is limited to 100.
-[**GetWhiteLabelEvents**](EventsApi.md#getwhitelabelevents) | **GET** /api/v1.0/events/whitelabel/{whitelabelId} | Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100.
+[**GetCustomerEvents**](EventsApi.md#getcustomerevents) | **GET** /api/v1.0/{appId}/events/customer/{customerId} | 
+[**GetEvents**](EventsApi.md#getevents) | **GET** /api/v1.0/{appId}/events | 
+[**GetEventsById**](EventsApi.md#geteventsbyid) | **GET** /api/v1.0/{appId}/events/{eventId} | 
+[**GetMenuEvents**](EventsApi.md#getmenuevents) | **GET** /api/v1.0/{appId}/events/menu/{menuId} | 
+[**GetOrderEvents**](EventsApi.md#getorderevents) | **GET** /api/v1.0/{appId}/events/order/{orderId} | 
+[**GetOrderEventsByCustomer**](EventsApi.md#getordereventsbycustomer) | **GET** /api/v1.0/{appId}/events/order | 
+[**GetStoreEvents**](EventsApi.md#getstoreevents) | **GET** /api/v1.0/{appId}/events/store/{storeId} | 
+[**GetUserEvents**](EventsApi.md#getuserevents) | **GET** /api/v1.0/{appId}/events/user/{userId} | 
+[**GetWhiteLabelEvents**](EventsApi.md#getwhitelabelevents) | **GET** /api/v1.0/{appId}/events/whitelabel/{whitelabelId} | 
 
 
 <a name="getcustomerevents"></a>
 # **GetCustomerEvents**
-> RestApiEventSearchPaginationResult GetCustomerEvents (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+> RestApiEventSearchPaginationResult GetCustomerEvents (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+
 
-Get customer events  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -39,15 +39,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var customerId = 56;  // int? | Customer identifier identifier
+            var appId = appId_example;  // string | 
+            var customerId = 56;  // int? | 
             var limit = 56;  // int? | The maximum elements to return (optional) 
             var page = 56;  // int? | The index of the page to return, starting by 1 (optional) 
             var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date (optional) 
             var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date (optional) 
             var orderId = 56;  // int? | Events that have Order Id (optional) 
             var storeId = 56;  // int? | Events that have Store Id (optional) 
+            var storeIdList = new List<int?>(); // List<int?> | Events that have Store Id List (optional) 
             var storeGroupId = 56;  // int? | Events that have Store Group Id (optional) 
             var userId = 56;  // int? | Events that have User Id (optional) 
+            var menuId = 56;  // int? | Events that have Menu Id (optional) 
+            var campaignId = 56;  // int? | Events that have Campaign Id (optional) 
             var userEmail = userEmail_example;  // string | Events that have User Email (optional) 
             var userName = userName_example;  // string | Events that have User Name (optional) 
             var voucherCode = voucherCode_example;  // string | Events that have voucher code (optional) 
@@ -56,8 +60,7 @@ namespace Example
 
             try
             {
-                // Get customer events  For technical reasons, the number of records returned is limited to 100.
-                RestApiEventSearchPaginationResult result = apiInstance.GetCustomerEvents(customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+                RestApiEventSearchPaginationResult result = apiInstance.GetCustomerEvents(appId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -73,15 +76,19 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **customerId** | **int?**| Customer identifier identifier | 
+ **appId** | **string**|  | 
+ **customerId** | **int?**|  | 
  **limit** | **int?**| The maximum elements to return | [optional] 
  **page** | **int?**| The index of the page to return, starting by 1 | [optional] 
  **start** | **DateTime?**| Start date | [optional] 
  **end** | **DateTime?**| End date | [optional] 
  **orderId** | **int?**| Events that have Order Id | [optional] 
  **storeId** | **int?**| Events that have Store Id | [optional] 
+ **storeIdList** | [**List&lt;int?&gt;**](int?.md)| Events that have Store Id List | [optional] 
  **storeGroupId** | **int?**| Events that have Store Group Id | [optional] 
  **userId** | **int?**| Events that have User Id | [optional] 
+ **menuId** | **int?**| Events that have Menu Id | [optional] 
+ **campaignId** | **int?**| Events that have Campaign Id | [optional] 
  **userEmail** | **string**| Events that have User Email | [optional] 
  **userName** | **string**| Events that have User Name | [optional] 
  **voucherCode** | **string**| Events that have voucher code | [optional] 
@@ -105,17 +112,17 @@ Name | Type | Description  | Notes
 
 <a name="getevents"></a>
 # **GetEvents**
-> RestApiEventSearchPaginationResult GetEvents (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+> RestApiEventSearchPaginationResult GetEvents (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+
 
-Get events  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -127,16 +134,20 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var whiteLabelId = 56;  // int? | White Label Id (optional) 
-            var customerId = 56;  // int? | Customer Id (optional) 
+            var appId = appId_example;  // string | 
+            var whiteLabelId = 56;  // int? |  (optional) 
+            var customerId = 56;  // int? |  (optional) 
             var limit = 56;  // int? | The maximum elements to return (optional) 
             var page = 56;  // int? | The index of the page to return, starting by 1 (optional) 
             var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date (optional) 
             var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date (optional) 
             var orderId = 56;  // int? | Events that have Order Id (optional) 
             var storeId = 56;  // int? | Events that have Store Id (optional) 
+            var storeIdList = new List<int?>(); // List<int?> | Events that have Store Id List (optional) 
             var storeGroupId = 56;  // int? | Events that have Store Group Id (optional) 
             var userId = 56;  // int? | Events that have User Id (optional) 
+            var menuId = 56;  // int? | Events that have Menu Id (optional) 
+            var campaignId = 56;  // int? | Events that have Campaign Id (optional) 
             var userEmail = userEmail_example;  // string | Events that have User Email (optional) 
             var userName = userName_example;  // string | Events that have User Name (optional) 
             var voucherCode = voucherCode_example;  // string | Events that have voucher code (optional) 
@@ -145,8 +156,7 @@ namespace Example
 
             try
             {
-                // Get events  For technical reasons, the number of records returned is limited to 100.
-                RestApiEventSearchPaginationResult result = apiInstance.GetEvents(whiteLabelId, customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+                RestApiEventSearchPaginationResult result = apiInstance.GetEvents(appId, whiteLabelId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -162,16 +172,20 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **whiteLabelId** | **int?**| White Label Id | [optional] 
- **customerId** | **int?**| Customer Id | [optional] 
+ **appId** | **string**|  | 
+ **whiteLabelId** | **int?**|  | [optional] 
+ **customerId** | **int?**|  | [optional] 
  **limit** | **int?**| The maximum elements to return | [optional] 
  **page** | **int?**| The index of the page to return, starting by 1 | [optional] 
  **start** | **DateTime?**| Start date | [optional] 
  **end** | **DateTime?**| End date | [optional] 
  **orderId** | **int?**| Events that have Order Id | [optional] 
  **storeId** | **int?**| Events that have Store Id | [optional] 
+ **storeIdList** | [**List&lt;int?&gt;**](int?.md)| Events that have Store Id List | [optional] 
  **storeGroupId** | **int?**| Events that have Store Group Id | [optional] 
  **userId** | **int?**| Events that have User Id | [optional] 
+ **menuId** | **int?**| Events that have Menu Id | [optional] 
+ **campaignId** | **int?**| Events that have Campaign Id | [optional] 
  **userEmail** | **string**| Events that have User Email | [optional] 
  **userName** | **string**| Events that have User Name | [optional] 
  **voucherCode** | **string**| Events that have voucher code | [optional] 
@@ -195,17 +209,17 @@ Name | Type | Description  | Notes
 
 <a name="geteventsbyid"></a>
 # **GetEventsById**
-> EventSearchResult GetEventsById (Guid? eventId)
+> EventSearchResult GetEventsById (Guid? eventId, string appId)
+
 
-Get event by Id  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -217,12 +231,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var eventId = new Guid?(); // Guid? | Event identifier (Guid)
+            var eventId = new Guid?(); // Guid? | 
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Get event by Id  For technical reasons, the number of records returned is limited to 100.
-                EventSearchResult result = apiInstance.GetEventsById(eventId);
+                EventSearchResult result = apiInstance.GetEventsById(eventId, appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -238,7 +252,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **eventId** | [**Guid?**](Guid?.md)| Event identifier (Guid) | 
+ **eventId** | [**Guid?**](Guid?.md)|  | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -257,17 +272,17 @@ Name | Type | Description  | Notes
 
 <a name="getmenuevents"></a>
 # **GetMenuEvents**
-> RestApiEventSearchPaginationResult GetMenuEvents (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+> RestApiEventSearchPaginationResult GetMenuEvents (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+
 
-Get menu events  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -279,15 +294,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var menuId = 56;  // int? | Menu Identifier
+            var appId = appId_example;  // string | 
+            var menuId = 56;  // int? | 
             var limit = 56;  // int? | The maximum elements to return (optional) 
             var page = 56;  // int? | The index of the page to return, starting by 1 (optional) 
             var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date (optional) 
             var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date (optional) 
             var orderId = 56;  // int? | Events that have Order Id (optional) 
             var storeId = 56;  // int? | Events that have Store Id (optional) 
+            var storeIdList = new List<int?>(); // List<int?> | Events that have Store Id List (optional) 
             var storeGroupId = 56;  // int? | Events that have Store Group Id (optional) 
             var userId = 56;  // int? | Events that have User Id (optional) 
+            var menuId2 = 56;  // int? | Events that have Menu Id (optional) 
+            var campaignId = 56;  // int? | Events that have Campaign Id (optional) 
             var userEmail = userEmail_example;  // string | Events that have User Email (optional) 
             var userName = userName_example;  // string | Events that have User Name (optional) 
             var voucherCode = voucherCode_example;  // string | Events that have voucher code (optional) 
@@ -296,8 +315,7 @@ namespace Example
 
             try
             {
-                // Get menu events  For technical reasons, the number of records returned is limited to 100.
-                RestApiEventSearchPaginationResult result = apiInstance.GetMenuEvents(menuId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+                RestApiEventSearchPaginationResult result = apiInstance.GetMenuEvents(appId, menuId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId2, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -313,15 +331,19 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **menuId** | **int?**| Menu Identifier | 
+ **appId** | **string**|  | 
+ **menuId** | **int?**|  | 
  **limit** | **int?**| The maximum elements to return | [optional] 
  **page** | **int?**| The index of the page to return, starting by 1 | [optional] 
  **start** | **DateTime?**| Start date | [optional] 
  **end** | **DateTime?**| End date | [optional] 
  **orderId** | **int?**| Events that have Order Id | [optional] 
  **storeId** | **int?**| Events that have Store Id | [optional] 
+ **storeIdList** | [**List&lt;int?&gt;**](int?.md)| Events that have Store Id List | [optional] 
  **storeGroupId** | **int?**| Events that have Store Group Id | [optional] 
  **userId** | **int?**| Events that have User Id | [optional] 
+ **menuId2** | **int?**| Events that have Menu Id | [optional] 
+ **campaignId** | **int?**| Events that have Campaign Id | [optional] 
  **userEmail** | **string**| Events that have User Email | [optional] 
  **userName** | **string**| Events that have User Name | [optional] 
  **voucherCode** | **string**| Events that have voucher code | [optional] 
@@ -345,17 +367,17 @@ Name | Type | Description  | Notes
 
 <a name="getorderevents"></a>
 # **GetOrderEvents**
-> RestApiEventSearchPaginationResult GetOrderEvents (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+> RestApiEventSearchPaginationResult GetOrderEvents (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+
 
-Get order events  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -367,15 +389,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var orderId = 56;  // int? | Order identifier
+            var appId = appId_example;  // string | 
+            var orderId = 56;  // int? | 
             var limit = 56;  // int? | The maximum elements to return (optional) 
             var page = 56;  // int? | The index of the page to return, starting by 1 (optional) 
             var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date (optional) 
             var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date (optional) 
             var orderId2 = 56;  // int? | Events that have Order Id (optional) 
             var storeId = 56;  // int? | Events that have Store Id (optional) 
+            var storeIdList = new List<int?>(); // List<int?> | Events that have Store Id List (optional) 
             var storeGroupId = 56;  // int? | Events that have Store Group Id (optional) 
             var userId = 56;  // int? | Events that have User Id (optional) 
+            var menuId = 56;  // int? | Events that have Menu Id (optional) 
+            var campaignId = 56;  // int? | Events that have Campaign Id (optional) 
             var userEmail = userEmail_example;  // string | Events that have User Email (optional) 
             var userName = userName_example;  // string | Events that have User Name (optional) 
             var voucherCode = voucherCode_example;  // string | Events that have voucher code (optional) 
@@ -384,8 +410,7 @@ namespace Example
 
             try
             {
-                // Get order events  For technical reasons, the number of records returned is limited to 100.
-                RestApiEventSearchPaginationResult result = apiInstance.GetOrderEvents(orderId, limit, page, start, end, orderId2, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+                RestApiEventSearchPaginationResult result = apiInstance.GetOrderEvents(appId, orderId, limit, page, start, end, orderId2, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -401,15 +426,19 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **int?**| Order identifier | 
+ **appId** | **string**|  | 
+ **orderId** | **int?**|  | 
  **limit** | **int?**| The maximum elements to return | [optional] 
  **page** | **int?**| The index of the page to return, starting by 1 | [optional] 
  **start** | **DateTime?**| Start date | [optional] 
  **end** | **DateTime?**| End date | [optional] 
  **orderId2** | **int?**| Events that have Order Id | [optional] 
  **storeId** | **int?**| Events that have Store Id | [optional] 
+ **storeIdList** | [**List&lt;int?&gt;**](int?.md)| Events that have Store Id List | [optional] 
  **storeGroupId** | **int?**| Events that have Store Group Id | [optional] 
  **userId** | **int?**| Events that have User Id | [optional] 
+ **menuId** | **int?**| Events that have Menu Id | [optional] 
+ **campaignId** | **int?**| Events that have Campaign Id | [optional] 
  **userEmail** | **string**| Events that have User Email | [optional] 
  **userName** | **string**| Events that have User Name | [optional] 
  **voucherCode** | **string**| Events that have voucher code | [optional] 
@@ -433,17 +462,17 @@ Name | Type | Description  | Notes
 
 <a name="getordereventsbycustomer"></a>
 # **GetOrderEventsByCustomer**
-> RestApiEventSearchPaginationResult GetOrderEventsByCustomer (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+> RestApiEventSearchPaginationResult GetOrderEventsByCustomer (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+
 
-Get order events by customer  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -455,15 +484,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var customerId = 56;  // int? | Customer identifier
+            var appId = appId_example;  // string | 
+            var customerId = 56;  // int? | 
             var limit = 56;  // int? | The maximum elements to return (optional) 
             var page = 56;  // int? | The index of the page to return, starting by 1 (optional) 
             var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date (optional) 
             var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date (optional) 
             var orderId = 56;  // int? | Events that have Order Id (optional) 
             var storeId = 56;  // int? | Events that have Store Id (optional) 
+            var storeIdList = new List<int?>(); // List<int?> | Events that have Store Id List (optional) 
             var storeGroupId = 56;  // int? | Events that have Store Group Id (optional) 
             var userId = 56;  // int? | Events that have User Id (optional) 
+            var menuId = 56;  // int? | Events that have Menu Id (optional) 
+            var campaignId = 56;  // int? | Events that have Campaign Id (optional) 
             var userEmail = userEmail_example;  // string | Events that have User Email (optional) 
             var userName = userName_example;  // string | Events that have User Name (optional) 
             var voucherCode = voucherCode_example;  // string | Events that have voucher code (optional) 
@@ -472,8 +505,7 @@ namespace Example
 
             try
             {
-                // Get order events by customer  For technical reasons, the number of records returned is limited to 100.
-                RestApiEventSearchPaginationResult result = apiInstance.GetOrderEventsByCustomer(customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+                RestApiEventSearchPaginationResult result = apiInstance.GetOrderEventsByCustomer(appId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -489,15 +521,19 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **customerId** | **int?**| Customer identifier | 
+ **appId** | **string**|  | 
+ **customerId** | **int?**|  | 
  **limit** | **int?**| The maximum elements to return | [optional] 
  **page** | **int?**| The index of the page to return, starting by 1 | [optional] 
  **start** | **DateTime?**| Start date | [optional] 
  **end** | **DateTime?**| End date | [optional] 
  **orderId** | **int?**| Events that have Order Id | [optional] 
  **storeId** | **int?**| Events that have Store Id | [optional] 
+ **storeIdList** | [**List&lt;int?&gt;**](int?.md)| Events that have Store Id List | [optional] 
  **storeGroupId** | **int?**| Events that have Store Group Id | [optional] 
  **userId** | **int?**| Events that have User Id | [optional] 
+ **menuId** | **int?**| Events that have Menu Id | [optional] 
+ **campaignId** | **int?**| Events that have Campaign Id | [optional] 
  **userEmail** | **string**| Events that have User Email | [optional] 
  **userName** | **string**| Events that have User Name | [optional] 
  **voucherCode** | **string**| Events that have voucher code | [optional] 
@@ -521,17 +557,17 @@ Name | Type | Description  | Notes
 
 <a name="getstoreevents"></a>
 # **GetStoreEvents**
-> RestApiEventSearchPaginationResult GetStoreEvents (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+> RestApiEventSearchPaginationResult GetStoreEvents (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+
 
-Get store events  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -543,15 +579,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var storeId = 56;  // int? | Id of the store
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
             var limit = 56;  // int? | The maximum elements to return (optional) 
             var page = 56;  // int? | The index of the page to return, starting by 1 (optional) 
             var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date (optional) 
             var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date (optional) 
             var orderId = 56;  // int? | Events that have Order Id (optional) 
             var storeId2 = 56;  // int? | Events that have Store Id (optional) 
+            var storeIdList = new List<int?>(); // List<int?> | Events that have Store Id List (optional) 
             var storeGroupId = 56;  // int? | Events that have Store Group Id (optional) 
             var userId = 56;  // int? | Events that have User Id (optional) 
+            var menuId = 56;  // int? | Events that have Menu Id (optional) 
+            var campaignId = 56;  // int? | Events that have Campaign Id (optional) 
             var userEmail = userEmail_example;  // string | Events that have User Email (optional) 
             var userName = userName_example;  // string | Events that have User Name (optional) 
             var voucherCode = voucherCode_example;  // string | Events that have voucher code (optional) 
@@ -560,8 +600,7 @@ namespace Example
 
             try
             {
-                // Get store events  For technical reasons, the number of records returned is limited to 100.
-                RestApiEventSearchPaginationResult result = apiInstance.GetStoreEvents(storeId, limit, page, start, end, orderId, storeId2, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+                RestApiEventSearchPaginationResult result = apiInstance.GetStoreEvents(appId, storeId, limit, page, start, end, orderId, storeId2, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -577,15 +616,19 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Id of the store | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
  **limit** | **int?**| The maximum elements to return | [optional] 
  **page** | **int?**| The index of the page to return, starting by 1 | [optional] 
  **start** | **DateTime?**| Start date | [optional] 
  **end** | **DateTime?**| End date | [optional] 
  **orderId** | **int?**| Events that have Order Id | [optional] 
  **storeId2** | **int?**| Events that have Store Id | [optional] 
+ **storeIdList** | [**List&lt;int?&gt;**](int?.md)| Events that have Store Id List | [optional] 
  **storeGroupId** | **int?**| Events that have Store Group Id | [optional] 
  **userId** | **int?**| Events that have User Id | [optional] 
+ **menuId** | **int?**| Events that have Menu Id | [optional] 
+ **campaignId** | **int?**| Events that have Campaign Id | [optional] 
  **userEmail** | **string**| Events that have User Email | [optional] 
  **userName** | **string**| Events that have User Name | [optional] 
  **voucherCode** | **string**| Events that have voucher code | [optional] 
@@ -609,17 +652,17 @@ Name | Type | Description  | Notes
 
 <a name="getuserevents"></a>
 # **GetUserEvents**
-> RestApiEventSearchPaginationResult GetUserEvents (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+> RestApiEventSearchPaginationResult GetUserEvents (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+
 
-Get user events  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -631,15 +674,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var userId = 56;  // int? | User identifier
+            var appId = appId_example;  // string | 
+            var userId = 56;  // int? | 
             var limit = 56;  // int? | The maximum elements to return (optional) 
             var page = 56;  // int? | The index of the page to return, starting by 1 (optional) 
             var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date (optional) 
             var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date (optional) 
             var orderId = 56;  // int? | Events that have Order Id (optional) 
             var storeId = 56;  // int? | Events that have Store Id (optional) 
+            var storeIdList = new List<int?>(); // List<int?> | Events that have Store Id List (optional) 
             var storeGroupId = 56;  // int? | Events that have Store Group Id (optional) 
             var userId2 = 56;  // int? | Events that have User Id (optional) 
+            var menuId = 56;  // int? | Events that have Menu Id (optional) 
+            var campaignId = 56;  // int? | Events that have Campaign Id (optional) 
             var userEmail = userEmail_example;  // string | Events that have User Email (optional) 
             var userName = userName_example;  // string | Events that have User Name (optional) 
             var voucherCode = voucherCode_example;  // string | Events that have voucher code (optional) 
@@ -648,8 +695,7 @@ namespace Example
 
             try
             {
-                // Get user events  For technical reasons, the number of records returned is limited to 100.
-                RestApiEventSearchPaginationResult result = apiInstance.GetUserEvents(userId, limit, page, start, end, orderId, storeId, storeGroupId, userId2, userEmail, userName, voucherCode, eventType, flipdishEventId);
+                RestApiEventSearchPaginationResult result = apiInstance.GetUserEvents(appId, userId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId2, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -665,15 +711,19 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **userId** | **int?**| User identifier | 
+ **appId** | **string**|  | 
+ **userId** | **int?**|  | 
  **limit** | **int?**| The maximum elements to return | [optional] 
  **page** | **int?**| The index of the page to return, starting by 1 | [optional] 
  **start** | **DateTime?**| Start date | [optional] 
  **end** | **DateTime?**| End date | [optional] 
  **orderId** | **int?**| Events that have Order Id | [optional] 
  **storeId** | **int?**| Events that have Store Id | [optional] 
+ **storeIdList** | [**List&lt;int?&gt;**](int?.md)| Events that have Store Id List | [optional] 
  **storeGroupId** | **int?**| Events that have Store Group Id | [optional] 
  **userId2** | **int?**| Events that have User Id | [optional] 
+ **menuId** | **int?**| Events that have Menu Id | [optional] 
+ **campaignId** | **int?**| Events that have Campaign Id | [optional] 
  **userEmail** | **string**| Events that have User Email | [optional] 
  **userName** | **string**| Events that have User Name | [optional] 
  **voucherCode** | **string**| Events that have voucher code | [optional] 
@@ -697,17 +747,17 @@ Name | Type | Description  | Notes
 
 <a name="getwhitelabelevents"></a>
 # **GetWhiteLabelEvents**
-> RestApiEventSearchPaginationResult GetWhiteLabelEvents (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+> RestApiEventSearchPaginationResult GetWhiteLabelEvents (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+
 
-Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -719,15 +769,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new EventsApi();
-            var whitelabelId = 56;  // int? | White Label Identifier
+            var appId = appId_example;  // string | 
+            var whitelabelId = 56;  // int? | 
             var limit = 56;  // int? | The maximum elements to return (optional) 
             var page = 56;  // int? | The index of the page to return, starting by 1 (optional) 
             var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date (optional) 
             var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date (optional) 
             var orderId = 56;  // int? | Events that have Order Id (optional) 
             var storeId = 56;  // int? | Events that have Store Id (optional) 
+            var storeIdList = new List<int?>(); // List<int?> | Events that have Store Id List (optional) 
             var storeGroupId = 56;  // int? | Events that have Store Group Id (optional) 
             var userId = 56;  // int? | Events that have User Id (optional) 
+            var menuId = 56;  // int? | Events that have Menu Id (optional) 
+            var campaignId = 56;  // int? | Events that have Campaign Id (optional) 
             var userEmail = userEmail_example;  // string | Events that have User Email (optional) 
             var userName = userName_example;  // string | Events that have User Name (optional) 
             var voucherCode = voucherCode_example;  // string | Events that have voucher code (optional) 
@@ -736,8 +790,7 @@ namespace Example
 
             try
             {
-                // Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100.
-                RestApiEventSearchPaginationResult result = apiInstance.GetWhiteLabelEvents(whitelabelId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+                RestApiEventSearchPaginationResult result = apiInstance.GetWhiteLabelEvents(appId, whitelabelId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -753,15 +806,19 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **whitelabelId** | **int?**| White Label Identifier | 
+ **appId** | **string**|  | 
+ **whitelabelId** | **int?**|  | 
  **limit** | **int?**| The maximum elements to return | [optional] 
  **page** | **int?**| The index of the page to return, starting by 1 | [optional] 
  **start** | **DateTime?**| Start date | [optional] 
  **end** | **DateTime?**| End date | [optional] 
  **orderId** | **int?**| Events that have Order Id | [optional] 
  **storeId** | **int?**| Events that have Store Id | [optional] 
+ **storeIdList** | [**List&lt;int?&gt;**](int?.md)| Events that have Store Id List | [optional] 
  **storeGroupId** | **int?**| Events that have Store Group Id | [optional] 
  **userId** | **int?**| Events that have User Id | [optional] 
+ **menuId** | **int?**| Events that have Menu Id | [optional] 
+ **campaignId** | **int?**| Events that have Campaign Id | [optional] 
  **userEmail** | **string**| Events that have User Email | [optional] 
  **userName** | **string**| Events that have User Name | [optional] 
  **voucherCode** | **string**| Events that have voucher code | [optional] 
diff --git a/docs/ExecuteConfigurationActionRequest.md b/docs/ExecuteConfigurationActionRequest.md
new file mode 100644
index 00000000..26e82ded
--- /dev/null
+++ b/docs/ExecuteConfigurationActionRequest.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.ExecuteConfigurationActionRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Key** | **string** |  | [optional] 
+**Action** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ExecuteConfigurationActionResult.md b/docs/ExecuteConfigurationActionResult.md
new file mode 100644
index 00000000..bae84a7c
--- /dev/null
+++ b/docs/ExecuteConfigurationActionResult.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.ExecuteConfigurationActionResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ErrorMessage** | **string** |  | [optional] 
+**InfoMessage** | **string** |  | [optional] 
+**RedirectUrl** | **string** |  | [optional] 
+**RedirectTarget** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ExternalStoreAuditLog.md b/docs/ExternalStoreAuditLog.md
index 09a909e2..41faa982 100644
--- a/docs/ExternalStoreAuditLog.md
+++ b/docs/ExternalStoreAuditLog.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ExternalStoreAuditLog
+# Flipdish.Model.ExternalStoreAuditLog
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ExternalStoreEvent.md b/docs/ExternalStoreEvent.md
index e7eeec05..2ee27c6e 100644
--- a/docs/ExternalStoreEvent.md
+++ b/docs/ExternalStoreEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ExternalStoreEvent
+# Flipdish.Model.ExternalStoreEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -21,7 +21,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/FeaturesApi.md b/docs/FeaturesApi.md
new file mode 100644
index 00000000..256b8955
--- /dev/null
+++ b/docs/FeaturesApi.md
@@ -0,0 +1,136 @@
+# Flipdish.Api.FeaturesApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**DisableFeatures**](FeaturesApi.md#disablefeatures) | **POST** /api/v1.0/{appId}/features/disable | 
+[**EnableFeatures**](FeaturesApi.md#enablefeatures) | **POST** /api/v1.0/{appId}/features/enable | 
+
+
+<a name="disablefeatures"></a>
+# **DisableFeatures**
+> RestApiStringArrayResult DisableFeatures (string appId, List<string> features)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class DisableFeaturesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FeaturesApi();
+            var appId = appId_example;  // string | 
+            var features = ;  // List<string> | 
+
+            try
+            {
+                RestApiStringArrayResult result = apiInstance.DisableFeatures(appId, features);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FeaturesApi.DisableFeatures: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **features** | **List&lt;string&gt;**|  | 
+
+### Return type
+
+[**RestApiStringArrayResult**](RestApiStringArrayResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="enablefeatures"></a>
+# **EnableFeatures**
+> RestApiStringArrayResult EnableFeatures (string appId, List<string> features)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class EnableFeaturesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FeaturesApi();
+            var appId = appId_example;  // string | 
+            var features = ;  // List<string> | 
+
+            try
+            {
+                RestApiStringArrayResult result = apiInstance.EnableFeatures(appId, features);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FeaturesApi.EnableFeatures: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **features** | **List&lt;string&gt;**|  | 
+
+### Return type
+
+[**RestApiStringArrayResult**](RestApiStringArrayResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/FeeSummary.md b/docs/FeeSummary.md
index b6a230b9..65a66053 100644
--- a/docs/FeeSummary.md
+++ b/docs/FeeSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.FeeSummary
+# Flipdish.Model.FeeSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Field.md b/docs/Field.md
index b24e7da8..48632bc6 100644
--- a/docs/Field.md
+++ b/docs/Field.md
@@ -1,17 +1,18 @@
-# IO.Swagger.Model.Field
+# Flipdish.Model.Field
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**Key** | **string** | Key | 
-**Tooltip** | **string** | Tooltip | [optional] 
-**Position** | **int?** | Position | 
-**DefaultValue** | **string** | Default Value | [optional] 
-**ValidValues** | [**List&lt;ValidValue&gt;**](ValidValue.md) | Valid Values  &lt;remarks&gt;Used typically for dropdown/select&lt;/remarks&gt; | [optional] 
-**ValidationRegex** | **string** | Validation Regex | [optional] 
-**FieldType** | **string** | Field Type | 
+**Name** | **string** |  | 
+**Description** | **string** |  | 
+**Key** | **string** |  | 
+**Tooltip** | **string** |  | [optional] 
+**Position** | **int?** |  | 
+**DefaultValue** | **string** |  | [optional] 
+**ValidValues** | [**List&lt;ValidValue&gt;**](ValidValue.md) |  | [optional] 
+**ValidationRegex** | **string** |  | [optional] 
+**FieldType** | **string** |  | 
+**IsFlipdishRestricted** | **bool?** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/FieldChangeInformation.md b/docs/FieldChangeInformation.md
index ce24f55e..21814dc9 100644
--- a/docs/FieldChangeInformation.md
+++ b/docs/FieldChangeInformation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.FieldChangeInformation
+# Flipdish.Model.FieldChangeInformation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/FieldGroup.md b/docs/FieldGroup.md
index 8b1a23fe..189f0b0c 100644
--- a/docs/FieldGroup.md
+++ b/docs/FieldGroup.md
@@ -1,13 +1,13 @@
-# IO.Swagger.Model.FieldGroup
+# Flipdish.Model.FieldGroup
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** | Name | 
-**Description** | **string** | Description | [optional] 
-**Tooltip** | **string** | Tooltip  &lt;remarks&gt;Displays on text hover&lt;/remarks&gt; | [optional] 
-**Position** | **int?** | Position  &lt;remarks&gt;Position order in the field groups to display&lt;/remarks&gt; | 
-**Fields** | [**List&lt;Field&gt;**](Field.md) | Fields | [optional] 
+**Name** | **string** |  | 
+**Description** | **string** |  | [optional] 
+**Tooltip** | **string** |  | [optional] 
+**Position** | **int?** |  | 
+**Fields** | [**List&lt;Field&gt;**](Field.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/FilesApi.md b/docs/FilesApi.md
deleted file mode 100644
index b29e0491..00000000
--- a/docs/FilesApi.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# IO.Swagger.Api.FilesApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**DownloadFile**](FilesApi.md#downloadfile) | **GET** /api/v1.0/{appId}/files/download/{fileId} | Get file from storage
-
-
-<a name="downloadfile"></a>
-# **DownloadFile**
-> string DownloadFile (string appId, string fileId)
-
-Get file from storage
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class DownloadFileExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new FilesApi();
-            var appId = appId_example;  // string | 
-            var fileId = fileId_example;  // string | 
-
-            try
-            {
-                // Get file from storage
-                string result = apiInstance.DownloadFile(appId, fileId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling FilesApi.DownloadFile: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **fileId** | **string**|  | 
-
-### Return type
-
-**string**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/FirebaseApp.md b/docs/FirebaseApp.md
new file mode 100644
index 00000000..ad12bf06
--- /dev/null
+++ b/docs/FirebaseApp.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.FirebaseApp
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhitelabelId** | **int?** | WhitelabelId. | [optional] 
+**PackageId** | **string** | PackageId. | [optional] 
+**FirebaseAppId** | **string** | FirebaseAppId. | [optional] 
+**FirebaseProjectId** | **string** | FirebaseProjectId. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/FirebaseAppsApi.md b/docs/FirebaseAppsApi.md
new file mode 100644
index 00000000..9e15415f
--- /dev/null
+++ b/docs/FirebaseAppsApi.md
@@ -0,0 +1,194 @@
+# Flipdish.Api.FirebaseAppsApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**FirebaseAppsAddFirebaseApp**](FirebaseAppsApi.md#firebaseappsaddfirebaseapp) | **POST** /api/v1.0/FirebaseApp | 
+[**FirebaseAppsDeleteFirebaseApp**](FirebaseAppsApi.md#firebaseappsdeletefirebaseapp) | **DELETE** /api/v1.0/FirebaseApp/{whiteLabelId} | 
+[**FirebaseAppsGetFirebaseApp**](FirebaseAppsApi.md#firebaseappsgetfirebaseapp) | **GET** /api/v1.0/FirebaseApp/{whitelabelId} | 
+
+
+<a name="firebaseappsaddfirebaseapp"></a>
+# **FirebaseAppsAddFirebaseApp**
+> Object FirebaseAppsAddFirebaseApp (FirebaseApp firebaseApp)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class FirebaseAppsAddFirebaseAppExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FirebaseAppsApi();
+            var firebaseApp = new FirebaseApp(); // FirebaseApp | 
+
+            try
+            {
+                Object result = apiInstance.FirebaseAppsAddFirebaseApp(firebaseApp);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FirebaseAppsApi.FirebaseAppsAddFirebaseApp: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **firebaseApp** | [**FirebaseApp**](FirebaseApp.md)|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="firebaseappsdeletefirebaseapp"></a>
+# **FirebaseAppsDeleteFirebaseApp**
+> Object FirebaseAppsDeleteFirebaseApp (int? whiteLabelId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class FirebaseAppsDeleteFirebaseAppExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FirebaseAppsApi();
+            var whiteLabelId = 56;  // int? | 
+
+            try
+            {
+                Object result = apiInstance.FirebaseAppsDeleteFirebaseApp(whiteLabelId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FirebaseAppsApi.FirebaseAppsDeleteFirebaseApp: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **whiteLabelId** | **int?**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="firebaseappsgetfirebaseapp"></a>
+# **FirebaseAppsGetFirebaseApp**
+> Object FirebaseAppsGetFirebaseApp (int? whitelabelId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class FirebaseAppsGetFirebaseAppExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FirebaseAppsApi();
+            var whitelabelId = 56;  // int? | 
+
+            try
+            {
+                Object result = apiInstance.FirebaseAppsGetFirebaseApp(whitelabelId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FirebaseAppsApi.FirebaseAppsGetFirebaseApp: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **whitelabelId** | **int?**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/FlipdishAccountName.md b/docs/FlipdishAccountName.md
new file mode 100644
index 00000000..5186c0f0
--- /dev/null
+++ b/docs/FlipdishAccountName.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.FlipdishAccountName
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PayeeBankAccountDataId** | **int?** | Payee Bank Account Data Id | [optional] 
+**FlipdishAccountId** | **int?** | Flipdish Account Id | [optional] 
+**Name** | **string** | Account Name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/FlipdishEventBase.md b/docs/FlipdishEventBase.md
index 0a83cfa6..fcd2d6dd 100644
--- a/docs/FlipdishEventBase.md
+++ b/docs/FlipdishEventBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.FlipdishEventBase
+# Flipdish.Model.FlipdishEventBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -8,7 +8,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/FlipdishFeesDetails.md b/docs/FlipdishFeesDetails.md
index 5905caf2..39a8d1af 100644
--- a/docs/FlipdishFeesDetails.md
+++ b/docs/FlipdishFeesDetails.md
@@ -1,13 +1,15 @@
-# IO.Swagger.Model.FlipdishFeesDetails
+# Flipdish.Model.FlipdishFeesDetails
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **OnlineSalesFees** | **double?** | Fees on online sales | [optional] 
 **CashSalesFees** | **double?** | Fees on cash sales | [optional] 
+**PosSalesFees** | **double?** | Fees of POS sales | [optional] 
 **TotalSalesFees** | **double?** | Total online and cash sales | [optional] 
 **OnlineSalesRefundedFees** | **double?** | Fees on refunds for online sales | [optional] 
 **CashSalesRefundedFees** | **double?** | Fees on refunds for cash sales | [optional] 
+**PosSalesRefundedFees** | **double?** | Fees on refunds for POS sales | [optional] 
 **SalesFeesVat** | **double?** | VAT on sales fees | [optional] 
 **TotalFees** | **double?** | Total fees | [optional] 
 
diff --git a/docs/FpmApi.md b/docs/FpmApi.md
new file mode 100644
index 00000000..1697f332
--- /dev/null
+++ b/docs/FpmApi.md
@@ -0,0 +1,258 @@
+# Flipdish.Api.FpmApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**CreateFpmForStore**](FpmApi.md#createfpmforstore) | **POST** /api/v1.0/{storeId}/fpm | 
+[**DeleteFpmForStore**](FpmApi.md#deletefpmforstore) | **DELETE** /api/v1.0/{storeId}/fpm | 
+[**EditFpmForStore**](FpmApi.md#editfpmforstore) | **POST** /api/v1.0/{storeId}/fpm/edit | 
+[**GetFpmForStore**](FpmApi.md#getfpmforstore) | **GET** /api/v1.0/{storeId}/fpm | 
+
+
+<a name="createfpmforstore"></a>
+# **CreateFpmForStore**
+> Object CreateFpmForStore (int? storeId, string phoneNumber)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class CreateFpmForStoreExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FpmApi();
+            var storeId = 56;  // int? | 
+            var phoneNumber = phoneNumber_example;  // string | 
+
+            try
+            {
+                Object result = apiInstance.CreateFpmForStore(storeId, phoneNumber);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FpmApi.CreateFpmForStore: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+ **phoneNumber** | **string**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="deletefpmforstore"></a>
+# **DeleteFpmForStore**
+> void DeleteFpmForStore (int? storeId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class DeleteFpmForStoreExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FpmApi();
+            var storeId = 56;  // int? | 
+
+            try
+            {
+                apiInstance.DeleteFpmForStore(storeId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FpmApi.DeleteFpmForStore: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="editfpmforstore"></a>
+# **EditFpmForStore**
+> void EditFpmForStore (int? storeId, TelephonyConfig telephonyConfig)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class EditFpmForStoreExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FpmApi();
+            var storeId = 56;  // int? | 
+            var telephonyConfig = new TelephonyConfig(); // TelephonyConfig | 
+
+            try
+            {
+                apiInstance.EditFpmForStore(storeId, telephonyConfig);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FpmApi.EditFpmForStore: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+ **telephonyConfig** | [**TelephonyConfig**](TelephonyConfig.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getfpmforstore"></a>
+# **GetFpmForStore**
+> TelephonyConfig GetFpmForStore (int? storeId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetFpmForStoreExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FpmApi();
+            var storeId = 56;  // int? | 
+
+            try
+            {
+                TelephonyConfig result = apiInstance.GetFpmForStore(storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FpmApi.GetFpmForStore: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+
+### Return type
+
+[**TelephonyConfig**](TelephonyConfig.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/FulfillentStatusActionItem.md b/docs/FulfillentStatusActionItem.md
index 37a60d79..22f4a991 100644
--- a/docs/FulfillentStatusActionItem.md
+++ b/docs/FulfillentStatusActionItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.FulfillentStatusActionItem
+# Flipdish.Model.FulfillentStatusActionItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/FulfillmentInfo.md b/docs/FulfillmentInfo.md
deleted file mode 100644
index c053b134..00000000
--- a/docs/FulfillmentInfo.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# IO.Swagger.Model.FulfillmentInfo
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**DispatchType** | **string** | [Required] Dispatch Type (i.e Pickup / Delivery) | [optional] 
-**RequestedForUtc** | **DateTime?** | [Required] Time the order is requested for | [optional] 
-**Location** | [**Location**](Location.md) | Location the order is to be delivered to  [Required] Delivery  [Not Required] Pickup | [optional] 
-**DispatchAmount** | [**Price**](Price.md) | Price of the dispatch, normally 0 for collection and a value for delivery  [Required] Delivery  [Not Required] Pickup | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/FulfillmentStateConfigurationApi.md b/docs/FulfillmentStateConfigurationApi.md
index 08dc5cc7..444d2595 100644
--- a/docs/FulfillmentStateConfigurationApi.md
+++ b/docs/FulfillmentStateConfigurationApi.md
@@ -1,31 +1,30 @@
-# IO.Swagger.Api.FulfillmentStateConfigurationApi
+# Flipdish.Api.FulfillmentStateConfigurationApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateFulfillmentStatesConfig**](FulfillmentStateConfigurationApi.md#createfulfillmentstatesconfig) | **POST** /api/v1.0/{appId}/fulfillment/configuration/states | Create fulfillment configuration
-[**DeleteFulfillmentStatesConfig**](FulfillmentStateConfigurationApi.md#deletefulfillmentstatesconfig) | **DELETE** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | Delete fulfillment states configuration
-[**GetFulfillmentStatesConfiguration**](FulfillmentStateConfigurationApi.md#getfulfillmentstatesconfiguration) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | Get fulfillment configuration
-[**SearchFulfillmentStatesConfigurations**](FulfillmentStateConfigurationApi.md#searchfulfillmentstatesconfigurations) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states | List fulfillment configurations for AppId
-[**UpdateFulfillmentStatesConfig**](FulfillmentStateConfigurationApi.md#updatefulfillmentstatesconfig) | **POST** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | Update fulfillment configuration
+[**CreateFulfillmentStatesConfig**](FulfillmentStateConfigurationApi.md#createfulfillmentstatesconfig) | **POST** /api/v1.0/{appId}/fulfillment/configuration/states | 
+[**DeleteFulfillmentStatesConfig**](FulfillmentStateConfigurationApi.md#deletefulfillmentstatesconfig) | **DELETE** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | 
+[**GetFulfillmentStatesConfiguration**](FulfillmentStateConfigurationApi.md#getfulfillmentstatesconfiguration) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | 
+[**GetFulfillmentStatesConfigurationTemplate**](FulfillmentStateConfigurationApi.md#getfulfillmentstatesconfigurationtemplate) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states_template | 
+[**SearchFulfillmentStatesConfigurations**](FulfillmentStateConfigurationApi.md#searchfulfillmentstatesconfigurations) | **GET** /api/v1.0/{appId}/fulfillment/configuration/states | 
+[**UpdateFulfillmentStatesConfig**](FulfillmentStateConfigurationApi.md#updatefulfillmentstatesconfig) | **POST** /api/v1.0/{appId}/fulfillment/configuration/states/{configId} | 
 
 
 <a name="createfulfillmentstatesconfig"></a>
 # **CreateFulfillmentStatesConfig**
-> RestApiResultFulfillmentStatesConfiguration CreateFulfillmentStatesConfig (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration)
+> RestApiResultFulfillmentStatesConfiguration CreateFulfillmentStatesConfig (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration)
 
-Create fulfillment configuration
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -37,12 +36,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new FulfillmentStateConfigurationApi();
-            var appId = appId_example;  // string | App id
-            var fulfillmentStateConfiguration = new FulfillmentStatesConfigurationCreateBase(); // FulfillmentStatesConfigurationCreateBase | Fulfillment state configuration
+            var appId = appId_example;  // string | 
+            var fulfillmentStateConfiguration = new CreateFulfillmentStatesConfiguration(); // CreateFulfillmentStatesConfiguration | 
 
             try
             {
-                // Create fulfillment configuration
                 RestApiResultFulfillmentStatesConfiguration result = apiInstance.CreateFulfillmentStatesConfig(appId, fulfillmentStateConfiguration);
                 Debug.WriteLine(result);
             }
@@ -59,8 +57,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **fulfillmentStateConfiguration** | [**FulfillmentStatesConfigurationCreateBase**](FulfillmentStatesConfigurationCreateBase.md)| Fulfillment state configuration | 
+ **appId** | **string**|  | 
+ **fulfillmentStateConfiguration** | [**CreateFulfillmentStatesConfiguration**](CreateFulfillmentStatesConfiguration.md)|  | 
 
 ### Return type
 
@@ -81,17 +79,15 @@ Name | Type | Description  | Notes
 # **DeleteFulfillmentStatesConfig**
 > RestApiStringResult DeleteFulfillmentStatesConfig (string appId, string configId)
 
-Delete fulfillment states configuration
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -103,12 +99,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new FulfillmentStateConfigurationApi();
-            var appId = appId_example;  // string | App id
-            var configId = configId_example;  // string | Fulfillment states configuration id
+            var appId = appId_example;  // string | 
+            var configId = configId_example;  // string | 
 
             try
             {
-                // Delete fulfillment states configuration
                 RestApiStringResult result = apiInstance.DeleteFulfillmentStatesConfig(appId, configId);
                 Debug.WriteLine(result);
             }
@@ -125,8 +120,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **configId** | **string**| Fulfillment states configuration id | 
+ **appId** | **string**|  | 
+ **configId** | **string**|  | 
 
 ### Return type
 
@@ -147,17 +142,15 @@ Name | Type | Description  | Notes
 # **GetFulfillmentStatesConfiguration**
 > FulfillmentStatesConfiguration GetFulfillmentStatesConfiguration (string appId, string configId)
 
-Get fulfillment configuration
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -169,12 +162,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new FulfillmentStateConfigurationApi();
-            var appId = appId_example;  // string | App id
-            var configId = configId_example;  // string | App store app configuration id
+            var appId = appId_example;  // string | 
+            var configId = configId_example;  // string | 
 
             try
             {
-                // Get fulfillment configuration
                 FulfillmentStatesConfiguration result = apiInstance.GetFulfillmentStatesConfiguration(appId, configId);
                 Debug.WriteLine(result);
             }
@@ -191,8 +183,69 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **configId** | **string**| App store app configuration id | 
+ **appId** | **string**|  | 
+ **configId** | **string**|  | 
+
+### Return type
+
+[**FulfillmentStatesConfiguration**](FulfillmentStatesConfiguration.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getfulfillmentstatesconfigurationtemplate"></a>
+# **GetFulfillmentStatesConfigurationTemplate**
+> FulfillmentStatesConfiguration GetFulfillmentStatesConfigurationTemplate (string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetFulfillmentStatesConfigurationTemplateExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new FulfillmentStateConfigurationApi();
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                FulfillmentStatesConfiguration result = apiInstance.GetFulfillmentStatesConfigurationTemplate(appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling FulfillmentStateConfigurationApi.GetFulfillmentStatesConfigurationTemplate: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -213,17 +266,15 @@ Name | Type | Description  | Notes
 # **SearchFulfillmentStatesConfigurations**
 > RestApiArrayResultFulfillmentStatesConfigurationSummary SearchFulfillmentStatesConfigurations (string appId)
 
-List fulfillment configurations for AppId
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -235,11 +286,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new FulfillmentStateConfigurationApi();
-            var appId = appId_example;  // string | App id
+            var appId = appId_example;  // string | 
 
             try
             {
-                // List fulfillment configurations for AppId
                 RestApiArrayResultFulfillmentStatesConfigurationSummary result = apiInstance.SearchFulfillmentStatesConfigurations(appId);
                 Debug.WriteLine(result);
             }
@@ -256,7 +306,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -277,17 +327,15 @@ Name | Type | Description  | Notes
 # **UpdateFulfillmentStatesConfig**
 > void UpdateFulfillmentStatesConfig (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration)
 
-Update fulfillment configuration
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -299,13 +347,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new FulfillmentStateConfigurationApi();
-            var appId = appId_example;  // string | App id
-            var configId = configId_example;  // string | Fulfillment states configuration id
-            var updateFulfillmentStatesConfiguration = new UpdateFulfillmentStatesConfiguration(); // UpdateFulfillmentStatesConfiguration | Update fulfillment states configuration
+            var appId = appId_example;  // string | 
+            var configId = configId_example;  // string | 
+            var updateFulfillmentStatesConfiguration = new UpdateFulfillmentStatesConfiguration(); // UpdateFulfillmentStatesConfiguration | 
 
             try
             {
-                // Update fulfillment configuration
                 apiInstance.UpdateFulfillmentStatesConfig(appId, configId, updateFulfillmentStatesConfiguration);
             }
             catch (Exception e)
@@ -321,9 +368,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App id | 
- **configId** | **string**| Fulfillment states configuration id | 
- **updateFulfillmentStatesConfiguration** | [**UpdateFulfillmentStatesConfiguration**](UpdateFulfillmentStatesConfiguration.md)| Update fulfillment states configuration | 
+ **appId** | **string**|  | 
+ **configId** | **string**|  | 
+ **updateFulfillmentStatesConfiguration** | [**UpdateFulfillmentStatesConfiguration**](UpdateFulfillmentStatesConfiguration.md)|  | 
 
 ### Return type
 
diff --git a/docs/FulfillmentStatesConfiguration.md b/docs/FulfillmentStatesConfiguration.md
index 2c54fcde..aeb5ed7f 100644
--- a/docs/FulfillmentStatesConfiguration.md
+++ b/docs/FulfillmentStatesConfiguration.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.FulfillmentStatesConfiguration
+# Flipdish.Model.FulfillmentStatesConfiguration
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **States** | [**List&lt;FulfillmentStatusConfigurationItem&gt;**](FulfillmentStatusConfigurationItem.md) | States | [optional] 
+**AutomaticTransitionsEnabled** | **bool?** | Enable automatic transitions | [optional] 
 **AppId** | **string** | AppId | [optional] 
 **ConfigurationUid** | **string** | Configuration Uid | [optional] 
 **StoreSelectorType** | **string** | Store Selector Type | [optional] 
diff --git a/docs/FulfillmentStatesConfigurationCreateBase.md b/docs/FulfillmentStatesConfigurationCreateBase.md
deleted file mode 100644
index d0082390..00000000
--- a/docs/FulfillmentStatesConfigurationCreateBase.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.FulfillmentStatesConfigurationCreateBase
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Name** | **string** | Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/FulfillmentStatesConfigurationSummary.md b/docs/FulfillmentStatesConfigurationSummary.md
index d576af7e..802c4a6c 100644
--- a/docs/FulfillmentStatesConfigurationSummary.md
+++ b/docs/FulfillmentStatesConfigurationSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.FulfillmentStatesConfigurationSummary
+# Flipdish.Model.FulfillmentStatesConfigurationSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/FulfillmentStatesConfiguredStore.md b/docs/FulfillmentStatesConfiguredStore.md
index 643f2313..2ac92009 100644
--- a/docs/FulfillmentStatesConfiguredStore.md
+++ b/docs/FulfillmentStatesConfiguredStore.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.FulfillmentStatesConfiguredStore
+# Flipdish.Model.FulfillmentStatesConfiguredStore
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/FulfillmentStatusConfigurationItem.md b/docs/FulfillmentStatusConfigurationItem.md
index 5c8dc887..fed91726 100644
--- a/docs/FulfillmentStatusConfigurationItem.md
+++ b/docs/FulfillmentStatusConfigurationItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.FulfillmentStatusConfigurationItem
+# Flipdish.Model.FulfillmentStatusConfigurationItem
 ## Properties
 
 Name | Type | Description | Notes
@@ -17,7 +17,7 @@ Name | Type | Description | Notes
 **IsCustom** | **bool?** | Is custom state. If not, then it&#39;s a system state | [optional] 
 **OrderTypes** | **List&lt;string&gt;** | If empty then applies to all ordertypes, otherwise a list of order types this state applies to | [optional] 
 **Communication** | **bool?** | Whether state should fire off a notification to the customer | [optional] 
-**VisualOrder** | **int?** | Integer for ordering results in choices (eg. dropdowns) | [optional] 
+**Image** | **string** | Image (image filename, relative, not absolute URL) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/GeoPointRequest.md b/docs/GeoPointRequest.md
index de98409f..f65e475f 100644
--- a/docs/GeoPointRequest.md
+++ b/docs/GeoPointRequest.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.GeoPointRequest
+# Flipdish.Model.GeoPointRequest
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/GetEndUserFeeConfigsResponse.md b/docs/GetEndUserFeeConfigsResponse.md
new file mode 100644
index 00000000..6746fc10
--- /dev/null
+++ b/docs/GetEndUserFeeConfigsResponse.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.GetEndUserFeeConfigsResponse
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EndUserFees** | [**List&lt;EndUserFeeConfig&gt;**](EndUserFeeConfig.md) | The current end user fee configs for the Store, one per channel and payment method combination present | [optional] 
+**IsV2FeeCalculationEnabled** | **bool?** | Whether the V2 (tiered) fee calculation is enabled for this Store | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/GetReceiptByOrderIdQueryResponse.md b/docs/GetReceiptByOrderIdQueryResponse.md
new file mode 100644
index 00000000..e393ee42
--- /dev/null
+++ b/docs/GetReceiptByOrderIdQueryResponse.md
@@ -0,0 +1,18 @@
+# Flipdish.Model.GetReceiptByOrderIdQueryResponse
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PreviousOrder** | [**PreviousOrder**](PreviousOrder.md) |  | [optional] 
+**DepositReturnFeesSummary** | [**List&lt;DepositReturnFeesSummary&gt;**](DepositReturnFeesSummary.md) |  | [optional] 
+**TsRequestedForLocal** | **DateTime?** |  | [optional] 
+**TsOrderPlacedLocal** | **DateTime?** |  | [optional] 
+**LogoUrl** | **string** |  | [optional] 
+**Address** | **string** |  | [optional] 
+**VatNumber** | **string** |  | [optional] 
+**PaymentMethodDescription** | **string** |  | [optional] 
+**OrgId** | **string** |  | [optional] 
+**CountryCode** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/GoogleAddress.md b/docs/GoogleAddress.md
index 4413a08f..4e86059c 100644
--- a/docs/GoogleAddress.md
+++ b/docs/GoogleAddress.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.GoogleAddress
+# Flipdish.Model.GoogleAddress
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/GoogleAddressComponent.md b/docs/GoogleAddressComponent.md
index d9daf1ae..9eb7a00d 100644
--- a/docs/GoogleAddressComponent.md
+++ b/docs/GoogleAddressComponent.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.GoogleAddressComponent
+# Flipdish.Model.GoogleAddressComponent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**LongName** | **string** |  | [optional] 
-**ShortName** | **string** |  | [optional] 
+**Long_name** | **string** |  | [optional] 
+**Short_name** | **string** |  | [optional] 
 **Types** | **List&lt;string&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/GoogleAddressResult.md b/docs/GoogleAddressResult.md
index 676e9e35..32a96d81 100644
--- a/docs/GoogleAddressResult.md
+++ b/docs/GoogleAddressResult.md
@@ -1,12 +1,12 @@
-# IO.Swagger.Model.GoogleAddressResult
+# Flipdish.Model.GoogleAddressResult
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**AddressComponents** | [**List&lt;GoogleAddressComponent&gt;**](GoogleAddressComponent.md) |  | [optional] 
-**FormattedAddress** | **string** |  | [optional] 
+**Address_components** | [**List&lt;GoogleAddressComponent&gt;**](GoogleAddressComponent.md) |  | [optional] 
+**Formatted_address** | **string** |  | [optional] 
 **Geometry** | [**GoogleGeometry**](GoogleGeometry.md) |  | [optional] 
-**PlaceId** | **string** |  | [optional] 
+**Place_id** | **string** |  | [optional] 
 **Types** | **List&lt;string&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/GoogleCoordinates.md b/docs/GoogleCoordinates.md
index 92cbad3a..c356e5b0 100644
--- a/docs/GoogleCoordinates.md
+++ b/docs/GoogleCoordinates.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.GoogleCoordinates
+# Flipdish.Model.GoogleCoordinates
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/GoogleGeometry.md b/docs/GoogleGeometry.md
index f393cfa4..aff8436f 100644
--- a/docs/GoogleGeometry.md
+++ b/docs/GoogleGeometry.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.GoogleGeometry
+# Flipdish.Model.GoogleGeometry
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Location** | [**GoogleLocation**](GoogleLocation.md) |  | [optional] 
-**LocationType** | **string** |  | [optional] 
+**Location_type** | **string** |  | [optional] 
 **Viewport** | [**GoogleViewport**](GoogleViewport.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/GoogleLocation.md b/docs/GoogleLocation.md
index 649cd81f..a5d238f6 100644
--- a/docs/GoogleLocation.md
+++ b/docs/GoogleLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.GoogleLocation
+# Flipdish.Model.GoogleLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/GoogleViewport.md b/docs/GoogleViewport.md
index d45833ab..5d0ad6a6 100644
--- a/docs/GoogleViewport.md
+++ b/docs/GoogleViewport.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.GoogleViewport
+# Flipdish.Model.GoogleViewport
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Group.md b/docs/Group.md
index 54c66712..8bc72d2e 100644
--- a/docs/Group.md
+++ b/docs/Group.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Group
+# Flipdish.Model.Group
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/GroupReference.md b/docs/GroupReference.md
index 3fef5056..68226842 100644
--- a/docs/GroupReference.md
+++ b/docs/GroupReference.md
@@ -1,9 +1,9 @@
-# IO.Swagger.Model.GroupReference
+# Flipdish.Model.GroupReference
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Group** | [**Group**](Group.md) | Details of the referenced {Flipdish.PublicModels.V1.Catalog.Products.GroupReference.Group} | [optional] 
+**Group** | [**Group**](Group.md) | Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Products.GroupReference.Group} | [optional] 
 **CatalogItemId** | **string** | Identifier of the ProductId to use as SubProduct | 
 **GroupType** | **string** | Type of the SupProduct | 
 
diff --git a/docs/GroupedCoordinates.md b/docs/GroupedCoordinates.md
index bdac908f..3e076487 100644
--- a/docs/GroupedCoordinates.md
+++ b/docs/GroupedCoordinates.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.GroupedCoordinates
+# Flipdish.Model.GroupedCoordinates
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/HasPaymentMethodResponse.md b/docs/HasPaymentMethodResponse.md
new file mode 100644
index 00000000..2f7f60f1
--- /dev/null
+++ b/docs/HasPaymentMethodResponse.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.HasPaymentMethodResponse
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**HasPaymentMethod** | **bool?** | Has Payment Method | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/HealthApi.md b/docs/HealthApi.md
deleted file mode 100644
index d9db547e..00000000
--- a/docs/HealthApi.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Flipdish.Api.HealthApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**HealthCheck**](HealthApi.md#healthcheck) | **GET** /api/v1.0/health/HealthCheck | 
-
-
-<a name="healthcheck"></a>
-# **HealthCheck**
-> Object HealthCheck ()
-
-
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class HealthCheckExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new HealthApi();
-
-            try
-            {
-                Object result = apiInstance.HealthCheck();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling HealthApi.HealthCheck: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-**Object**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/HeartbeatApi.md b/docs/HeartbeatApi.md
index 25e15c2f..a9a8ff66 100644
--- a/docs/HeartbeatApi.md
+++ b/docs/HeartbeatApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.HeartbeatApi
+# Flipdish.Api.HeartbeatApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -20,9 +20,9 @@ Method | HTTP request | Description
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -77,9 +77,9 @@ This endpoint does not need any parameter.
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -134,9 +134,9 @@ This endpoint does not need any parameter.
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -191,9 +191,9 @@ This endpoint does not need any parameter.
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/HomeAction.md b/docs/HomeAction.md
index 9f8016b6..716042c7 100644
--- a/docs/HomeAction.md
+++ b/docs/HomeAction.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HomeAction
+# Flipdish.Model.HomeAction
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/HomeApi.md b/docs/HomeApi.md
index 5ae8bc56..867a5af1 100644
--- a/docs/HomeApi.md
+++ b/docs/HomeApi.md
@@ -1,28 +1,28 @@
-# IO.Swagger.Api.HomeApi
+# Flipdish.Api.HomeApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CompleteHomeAction**](HomeApi.md#completehomeaction) | **POST** /api/v1.0/{appId}/home/{homeActionId} | [PRIVATE API] Complete Home Action
-[**DismissOldPortalAction**](HomeApi.md#dismissoldportalaction) | **POST** /api/v1.0/home/dismissoldportalaction | [PRIVATE API] Complete Home Action
-[**GetHomeActions**](HomeApi.md#gethomeactions) | **GET** /api/v1.0/{appId}/home | [PRIVATE API] Get Home Actions
-[**GetHomeStatistics**](HomeApi.md#gethomestatistics) | **GET** /api/v1.0/{appId}/home/stats | [PRIVATE API] Get Home Statistics
+[**CompleteHomeAction**](HomeApi.md#completehomeaction) | **POST** /api/v1.0/{appId}/home/{homeActionId} | 
+[**GetHomeActions**](HomeApi.md#gethomeactions) | **GET** /api/v1.0/{appId}/home | 
+[**GetHomeStatistics**](HomeApi.md#gethomestatistics) | **GET** /api/v1.0/{appId}/home/stats | 
+[**GetOktaPortalFeatureFlag**](HomeApi.md#getoktaportalfeatureflag) | **GET** /api/v1.0/home/okta-portal | 
 
 
 <a name="completehomeaction"></a>
 # **CompleteHomeAction**
 > Object CompleteHomeAction (string appId, int? homeActionId, bool? isDismissed)
 
-[PRIVATE API] Complete Home Action
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -34,13 +34,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new HomeApi();
-            var appId = appId_example;  // string | App Name Id
-            var homeActionId = 56;  // int? | Id of the action
+            var appId = appId_example;  // string | 
+            var homeActionId = 56;  // int? | 
             var isDismissed = true;  // bool? | 
 
             try
             {
-                // [PRIVATE API] Complete Home Action
                 Object result = apiInstance.CompleteHomeAction(appId, homeActionId, isDismissed);
                 Debug.WriteLine(result);
             }
@@ -57,8 +56,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **homeActionId** | **int?**| Id of the action | 
+ **appId** | **string**|  | 
+ **homeActionId** | **int?**|  | 
  **isDismissed** | **bool?**|  | 
 
 ### Return type
@@ -76,23 +75,23 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="dismissoldportalaction"></a>
-# **DismissOldPortalAction**
-> Object DismissOldPortalAction ()
+<a name="gethomeactions"></a>
+# **GetHomeActions**
+> RestApiArrayResultHomeAction GetHomeActions (string appId)
+
 
-[PRIVATE API] Complete Home Action
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class DismissOldPortalActionExample
+    public class GetHomeActionsExample
     {
         public void main()
         {
@@ -100,16 +99,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new HomeApi();
+            var appId = appId_example;  // string | 
 
             try
             {
-                // [PRIVATE API] Complete Home Action
-                Object result = apiInstance.DismissOldPortalAction();
+                RestApiArrayResultHomeAction result = apiInstance.GetHomeActions(appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling HomeApi.DismissOldPortalAction: " + e.Message );
+                Debug.Print("Exception when calling HomeApi.GetHomeActions: " + e.Message );
             }
         }
     }
@@ -117,11 +116,14 @@ namespace Example
 ```
 
 ### Parameters
-This endpoint does not need any parameter.
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
 
 ### Return type
 
-**Object**
+[**RestApiArrayResultHomeAction**](RestApiArrayResultHomeAction.md)
 
 ### Authorization
 
@@ -134,23 +136,23 @@ This endpoint does not need any parameter.
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="gethomeactions"></a>
-# **GetHomeActions**
-> RestApiArrayResultHomeAction GetHomeActions (string appId)
+<a name="gethomestatistics"></a>
+# **GetHomeStatistics**
+> RestApiResultHomeStatistics GetHomeStatistics (string appId)
+
 
-[PRIVATE API] Get Home Actions
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GetHomeActionsExample
+    public class GetHomeStatisticsExample
     {
         public void main()
         {
@@ -158,17 +160,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new HomeApi();
-            var appId = appId_example;  // string | App Name Id
+            var appId = appId_example;  // string | 
 
             try
             {
-                // [PRIVATE API] Get Home Actions
-                RestApiArrayResultHomeAction result = apiInstance.GetHomeActions(appId);
+                RestApiResultHomeStatistics result = apiInstance.GetHomeStatistics(appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling HomeApi.GetHomeActions: " + e.Message );
+                Debug.Print("Exception when calling HomeApi.GetHomeStatistics: " + e.Message );
             }
         }
     }
@@ -179,11 +180,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
+ **appId** | **string**|  | 
 
 ### Return type
 
-[**RestApiArrayResultHomeAction**](RestApiArrayResultHomeAction.md)
+[**RestApiResultHomeStatistics**](RestApiResultHomeStatistics.md)
 
 ### Authorization
 
@@ -196,23 +197,23 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="gethomestatistics"></a>
-# **GetHomeStatistics**
-> RestApiResultHomeStatistics GetHomeStatistics (string appId)
+<a name="getoktaportalfeatureflag"></a>
+# **GetOktaPortalFeatureFlag**
+> RestApiResultOktaPortalFeatureFlag GetOktaPortalFeatureFlag ()
+
 
-[PRIVATE API] Get Home Statistics
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GetHomeStatisticsExample
+    public class GetOktaPortalFeatureFlagExample
     {
         public void main()
         {
@@ -220,17 +221,15 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new HomeApi();
-            var appId = appId_example;  // string | App Name Id
 
             try
             {
-                // [PRIVATE API] Get Home Statistics
-                RestApiResultHomeStatistics result = apiInstance.GetHomeStatistics(appId);
+                RestApiResultOktaPortalFeatureFlag result = apiInstance.GetOktaPortalFeatureFlag();
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling HomeApi.GetHomeStatistics: " + e.Message );
+                Debug.Print("Exception when calling HomeApi.GetOktaPortalFeatureFlag: " + e.Message );
             }
         }
     }
@@ -238,14 +237,11 @@ namespace Example
 ```
 
 ### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
+This endpoint does not need any parameter.
 
 ### Return type
 
-[**RestApiResultHomeStatistics**](RestApiResultHomeStatistics.md)
+[**RestApiResultOktaPortalFeatureFlag**](RestApiResultOktaPortalFeatureFlag.md)
 
 ### Authorization
 
diff --git a/docs/HomeStatistics.md b/docs/HomeStatistics.md
index a72371f6..cf777402 100644
--- a/docs/HomeStatistics.md
+++ b/docs/HomeStatistics.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HomeStatistics
+# Flipdish.Model.HomeStatistics
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/HttpPostedFileBase.md b/docs/HttpPostedFileBase.md
new file mode 100644
index 00000000..3fdaa6ce
--- /dev/null
+++ b/docs/HttpPostedFileBase.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.HttpPostedFileBase
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ContentLength** | **int?** |  | [optional] 
+**ContentType** | **string** |  | [optional] 
+**FileName** | **string** |  | [optional] 
+**InputStream** | [**Stream**](Stream.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/HttpRequestAndResponseLog.md b/docs/HttpRequestAndResponseLog.md
deleted file mode 100644
index 442fc953..00000000
--- a/docs/HttpRequestAndResponseLog.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# IO.Swagger.Model.HttpRequestAndResponseLog
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Guid** | **Guid?** | Id of the log | [optional] 
-**Verb** | **string** | Verb associated with the HTTP call. | [optional] 
-**RequestUri** | **string** | Http request URI. | [optional] 
-**StatusCode** | **int?** | Http response status code. | [optional] 
-**ReasonPhrase** | **string** | Http response status line. | [optional] 
-**CallDurationInMilliseconds** | **long?** | Call duration representing the duration of the HTTP call in milliseconds. | [optional] 
-**UserId** | **string** | Identity of the caller. | [optional] 
-**IpAddress** | **string** | Ip address of the caller | [optional] 
-**CreatedDateTime** | **string** | Timestamp at which the HTTP call took place. | [optional] 
-**RequestHeaders** | **Dictionary&lt;string, string&gt;** | Http request headers. | [optional] 
-**RequestBody** | **string** | Http request body, if any. | [optional] 
-**RequestLength** | **long?** | Http request content-length | [optional] 
-**ResponseHeaders** | **Dictionary&lt;string, string&gt;** | Http response headers. | [optional] 
-**ResponseBody** | **string** | Http response body. | [optional] 
-**ResponseLength** | **long?** | Http response content-length | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/HttpRequestResponseLogsApi.md b/docs/HttpRequestResponseLogsApi.md
deleted file mode 100644
index 154abf3b..00000000
--- a/docs/HttpRequestResponseLogsApi.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# IO.Swagger.Api.HttpRequestResponseLogsApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**GetLogs**](HttpRequestResponseLogsApi.md#getlogs) | **GET** /api/v1.0/{appId}/interactions/logs | Get API interaction logs
-
-
-<a name="getlogs"></a>
-# **GetLogs**
-> RestApiPaginationResultHttpRequestAndResponseLog GetLogs (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null)
-
-Get API interaction logs
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class GetLogsExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new HttpRequestResponseLogsApi();
-            var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date time
-            var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End date time
-            var appId = appId_example;  // string | 
-            var filterByUserId = 56;  // int? | User id (optional) (optional) 
-            var guid = guid_example;  // string | Id of the log (optional) 
-            var page = 56;  // int? | Page number (optional) 
-            var limit = 56;  // int? | Page size (optional) 
-
-            try
-            {
-                // Get API interaction logs
-                RestApiPaginationResultHttpRequestAndResponseLog result = apiInstance.GetLogs(start, end, appId, filterByUserId, guid, page, limit);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling HttpRequestResponseLogsApi.GetLogs: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **start** | **DateTime?**| Start date time | 
- **end** | **DateTime?**| End date time | 
- **appId** | **string**|  | 
- **filterByUserId** | **int?**| User id (optional) | [optional] 
- **guid** | **string**| Id of the log | [optional] 
- **page** | **int?**| Page number | [optional] 
- **limit** | **int?**| Page size | [optional] 
-
-### Return type
-
-[**RestApiPaginationResultHttpRequestAndResponseLog**](RestApiPaginationResultHttpRequestAndResponseLog.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/HydraApi.md b/docs/HydraApi.md
index 314bd3b1..71eb6614 100644
--- a/docs/HydraApi.md
+++ b/docs/HydraApi.md
@@ -1,45 +1,48 @@
-# IO.Swagger.Api.HydraApi
+# Flipdish.Api.HydraApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AssignEmv**](HydraApi.md#assignemv) | **POST** /api/v1.0/{appId}/hydra/emvterminal/assign/{hydraConfigId}/{emvTerminalId} | Assign an EMV terminal to a kiosk
-[**AttachStoreToKiosk**](HydraApi.md#attachstoretokiosk) | **POST** /api/v1.0/{appId}/AttachStoreToKiosk/{deviceId}/store/{storeId} | [Private]
-[**AttachStoreToTerminal**](HydraApi.md#attachstoretoterminal) | **POST** /api/v1.0/{appId}/hydra/{deviceId}/attach/{storeId} | [Private]
+[**AssignEmv**](HydraApi.md#assignemv) | **POST** /api/v1.0/{appId}/hydra/emvterminal/assign/{hydraConfigId}/{emvTerminalId} | 
+[**AttachStoreToKiosk**](HydraApi.md#attachstoretokiosk) | **POST** /api/v1.0/{appId}/AttachStoreToKiosk/{deviceId}/store/{storeId} | 
+[**AttachStoreToTerminal**](HydraApi.md#attachstoretoterminal) | **POST** /api/v1.0/{appId}/hydra/{deviceId}/attach/{storeId} | 
 [**CancelEmvPayment**](HydraApi.md#cancelemvpayment) | **POST** /api/v1.0/{appId}/hydra/cancelemvpayment/{orderId} | 
-[**DetachStoreFromTerminal**](HydraApi.md#detachstorefromterminal) | **POST** /api/v1.0/{appId}/hydra/{deviceId}/detach/{storeId} | [Private]
-[**GetAttachedDevice**](HydraApi.md#getattacheddevice) | **GET** /api/v1.0/{appId}/hydra/{deviceType}/{deviceId} | [Private]
-[**GetAttachedDevices**](HydraApi.md#getattacheddevices) | **GET** /api/v1.0/{appId}/hydra/{deviceType}/list | [Private]
-[**GetEMVTerminalDetails**](HydraApi.md#getemvterminaldetails) | **GET** /api/v1.0/{appId}/hydra/emvterminal | [Private]
-[**GetEmvOrderState**](HydraApi.md#getemvorderstate) | **GET** /api/v1.0/{appId}/hydra/emvorderstate/{orderId} | [Private]
-[**GetKioskCashPaymentSettings**](HydraApi.md#getkioskcashpaymentsettings) | **GET** /api/v1.0/{appId}/kioskcashsettings/{deviceId} | Get the status of Cash Payment Methon on Kisok
+[**DetachStoreFromTerminal**](HydraApi.md#detachstorefromterminal) | **POST** /api/v1.0/{appId}/hydra/{deviceId}/detach/{storeId} | 
+[**GetAblyToken**](HydraApi.md#getablytoken) | **GET** /api/v1.0/hydra/ably_token | 
+[**GetAttachedDevice**](HydraApi.md#getattacheddevice) | **GET** /api/v1.0/{appId}/hydra/{deviceType}/{deviceId} | 
+[**GetAttachedDevices**](HydraApi.md#getattacheddevices) | **GET** /api/v1.0/{appId}/hydra/{deviceType}/list | 
+[**GetEMVTerminalDetails**](HydraApi.md#getemvterminaldetails) | **GET** /api/v1.0/{appId}/hydra/emvterminal | 
+[**GetEmvOrderState**](HydraApi.md#getemvorderstate) | **GET** /api/v1.0/{appId}/hydra/emvorderstate/{orderId} | 
+[**GetKioskCashPaymentSettings**](HydraApi.md#getkioskcashpaymentsettings) | **GET** /api/v1.0/{appId}/kioskcashsettings/{deviceId} | 
+[**GetKioskSettings**](HydraApi.md#getkiosksettings) | **GET** /api/v1.0/{appId}/kiosksettings/{deviceId} | 
 [**GetRegistration**](HydraApi.md#getregistration) | **GET** /api/v1.0/hydra/registration | 
-[**GetSettings**](HydraApi.md#getsettings) | **GET** /api/v1.0/hydra/settings | [Private]
-[**HydraCreateEmv**](HydraApi.md#hydracreateemv) | **POST** /api/v1.0/{appId}/emvterminals | [Private]
-[**HydraDeleteEmv**](HydraApi.md#hydradeleteemv) | **DELETE** /api/v1.0/{appId}/emvterminals/{id} | [Private]
-[**HydraDetachStoreFromKiosk**](HydraApi.md#hydradetachstorefromkiosk) | **DELETE** /api/v1.0/{appId}/DetachStoreFromKiosk/{deviceId}/store/{storeId} | [Private]
-[**HydraGetEmvsForAppId**](HydraApi.md#hydragetemvsforappid) | **GET** /api/v1.0/{appId}/emvterminals | List EMV terminals belonging to the given AppNameId
-[**LoginWithDeviceId**](HydraApi.md#loginwithdeviceid) | **POST** /api/v1.0/hydra/{deviceId}/login | [Private]
-[**Register**](HydraApi.md#register) | **POST** /api/v1.0/{appId}/hydra/registration | [Private]
-[**UnAssign**](HydraApi.md#unassign) | **DELETE** /api/v1.0/{appId}/hydra/{deviceId}/registration | [Private]
-[**UnassignEmv**](HydraApi.md#unassignemv) | **POST** /api/v1.0/{appId}/hydra/emvterminal/unassign/{hydraConfigId} | Unassign the currently assigned EMV terminal from a kiosk
-[**UpdateKioskCashVisibilitySettings**](HydraApi.md#updatekioskcashvisibilitysettings) | **POST** /api/v1.0/{appId}/kioskupdatecashsettings | Update the Cash Payment Methon Visiability on Kisok
+[**GetSettings**](HydraApi.md#getsettings) | **GET** /api/v1.0/hydra/settings | 
+[**HydraCreateEmv**](HydraApi.md#hydracreateemv) | **POST** /api/v1.0/{appId}/emvterminals | 
+[**HydraDeleteEmv**](HydraApi.md#hydradeleteemv) | **DELETE** /api/v1.0/{appId}/emvterminals/{id} | 
+[**HydraDetachStoreFromKiosk**](HydraApi.md#hydradetachstorefromkiosk) | **DELETE** /api/v1.0/{appId}/DetachStoreFromKiosk/{deviceId}/store/{storeId} | 
+[**HydraGetEmvsForAppId**](HydraApi.md#hydragetemvsforappid) | **GET** /api/v1.0/{appId}/emvterminals | 
+[**LoginWithDeviceId**](HydraApi.md#loginwithdeviceid) | **POST** /api/v1.0/hydra/{deviceId}/login | 
+[**Register**](HydraApi.md#register) | **POST** /api/v1.0/{appId}/hydra/registration | 
+[**UnAssign**](HydraApi.md#unassign) | **DELETE** /api/v1.0/{appId}/hydra/{deviceId}/registration | 
+[**UnassignEmv**](HydraApi.md#unassignemv) | **POST** /api/v1.0/{appId}/hydra/emvterminal/unassign/{hydraConfigId} | 
+[**UpdateKioskCashVisibilitySettings**](HydraApi.md#updatekioskcashvisibilitysettings) | **POST** /api/v1.0/{appId}/kioskupdatecashsettings | 
+[**UpdateKioskSettings**](HydraApi.md#updatekiosksettings) | **POST** /api/v1.0/{appId}/kiosksettings/{deviceId} | 
 
 
 <a name="assignemv"></a>
 # **AssignEmv**
 > void AssignEmv (string appId, int? hydraConfigId, int? emvTerminalId)
 
-Assign an EMV terminal to a kiosk
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -57,7 +60,6 @@ namespace Example
 
             try
             {
-                // Assign an EMV terminal to a kiosk
                 apiInstance.AssignEmv(appId, hydraConfigId, emvTerminalId);
             }
             catch (Exception e)
@@ -96,15 +98,15 @@ void (empty response body)
 # **AttachStoreToKiosk**
 > RestApiResultHydraStatus AttachStoreToKiosk (string appId, int? storeId, string deviceId)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -122,7 +124,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultHydraStatus result = apiInstance.AttachStoreToKiosk(appId, storeId, deviceId);
                 Debug.WriteLine(result);
             }
@@ -162,15 +163,15 @@ Name | Type | Description  | Notes
 # **AttachStoreToTerminal**
 > RestApiResultHydraStatus AttachStoreToTerminal (string appId, string deviceId, int? storeId)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -188,7 +189,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultHydraStatus result = apiInstance.AttachStoreToTerminal(appId, deviceId, storeId);
                 Debug.WriteLine(result);
             }
@@ -234,9 +234,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -290,15 +290,15 @@ void (empty response body)
 # **DetachStoreFromTerminal**
 > RestApiResultHydraStatus DetachStoreFromTerminal (string appId, string deviceId, int? storeId)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -316,7 +316,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultHydraStatus result = apiInstance.DetachStoreFromTerminal(appId, deviceId, storeId);
                 Debug.WriteLine(result);
             }
@@ -352,19 +351,75 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getablytoken"></a>
+# **GetAblyToken**
+> void GetAblyToken ()
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetAblyTokenExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new HydraApi();
+
+            try
+            {
+                apiInstance.GetAblyToken();
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling HydraApi.GetAblyToken: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getattacheddevice"></a>
 # **GetAttachedDevice**
 > RestApiResultHydraDeviceDetails GetAttachedDevice (string appId, string deviceType, string deviceId)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -382,7 +437,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultHydraDeviceDetails result = apiInstance.GetAttachedDevice(appId, deviceType, deviceId);
                 Debug.WriteLine(result);
             }
@@ -422,15 +476,15 @@ Name | Type | Description  | Notes
 # **GetAttachedDevices**
 > RestApiPaginationResultHydraDeviceDetails GetAttachedDevices (string appId, string deviceType, int? pageIndex = null, int? pageSize = null, int? storeId = null, string deviceName = null, string deviceSerial = null)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -452,7 +506,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiPaginationResultHydraDeviceDetails result = apiInstance.GetAttachedDevices(appId, deviceType, pageIndex, pageSize, storeId, deviceName, deviceSerial);
                 Debug.WriteLine(result);
             }
@@ -496,15 +549,15 @@ Name | Type | Description  | Notes
 # **GetEMVTerminalDetails**
 > RestApiResultPaymentTerminalDetails GetEMVTerminalDetails (string appId)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -520,7 +573,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultPaymentTerminalDetails result = apiInstance.GetEMVTerminalDetails(appId);
                 Debug.WriteLine(result);
             }
@@ -558,15 +610,15 @@ Name | Type | Description  | Notes
 # **GetEmvOrderState**
 > RestApiResultPaymentTerminalTransactionDetails GetEmvOrderState (int? orderId, string appId)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -583,7 +635,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultPaymentTerminalTransactionDetails result = apiInstance.GetEmvOrderState(orderId, appId);
                 Debug.WriteLine(result);
             }
@@ -622,17 +673,15 @@ Name | Type | Description  | Notes
 # **GetKioskCashPaymentSettings**
 > RestApiArrayResultKioskCashPaymentSettings GetKioskCashPaymentSettings (string appId, string deviceId)
 
-Get the status of Cash Payment Methon on Kisok
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -649,7 +698,6 @@ namespace Example
 
             try
             {
-                // Get the status of Cash Payment Methon on Kisok
                 RestApiArrayResultKioskCashPaymentSettings result = apiInstance.GetKioskCashPaymentSettings(appId, deviceId);
                 Debug.WriteLine(result);
             }
@@ -684,6 +732,69 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getkiosksettings"></a>
+# **GetKioskSettings**
+> RestApiResultKioskSettings GetKioskSettings (string appId, string deviceId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetKioskSettingsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new HydraApi();
+            var appId = appId_example;  // string | 
+            var deviceId = deviceId_example;  // string | 
+
+            try
+            {
+                RestApiResultKioskSettings result = apiInstance.GetKioskSettings(appId, deviceId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling HydraApi.GetKioskSettings: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **deviceId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultKioskSettings**](RestApiResultKioskSettings.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getregistration"></a>
 # **GetRegistration**
 > RestApiResultHydraStatus GetRegistration ()
@@ -694,9 +805,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -745,15 +856,15 @@ This endpoint does not need any parameter.
 # **GetSettings**
 > RestApiResultHydraConfig GetSettings ()
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -768,7 +879,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultHydraConfig result = apiInstance.GetSettings();
                 Debug.WriteLine(result);
             }
@@ -803,15 +913,15 @@ This endpoint does not need any parameter.
 # **HydraCreateEmv**
 > Object HydraCreateEmv (string appId, EmvTerminal emv)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -828,7 +938,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 Object result = apiInstance.HydraCreateEmv(appId, emv);
                 Debug.WriteLine(result);
             }
@@ -867,15 +976,15 @@ Name | Type | Description  | Notes
 # **HydraDeleteEmv**
 > Object HydraDeleteEmv (string appId, int? id)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -892,7 +1001,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 Object result = apiInstance.HydraDeleteEmv(appId, id);
                 Debug.WriteLine(result);
             }
@@ -931,15 +1039,15 @@ Name | Type | Description  | Notes
 # **HydraDetachStoreFromKiosk**
 > RestApiResultHydraStatus HydraDetachStoreFromKiosk (string appId, int? storeId, string deviceId)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -957,7 +1065,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultHydraStatus result = apiInstance.HydraDetachStoreFromKiosk(appId, storeId, deviceId);
                 Debug.WriteLine(result);
             }
@@ -997,15 +1104,15 @@ Name | Type | Description  | Notes
 # **HydraGetEmvsForAppId**
 > RestApiArrayResultEmvTerminalWithAssignments HydraGetEmvsForAppId (string appId)
 
-List EMV terminals belonging to the given AppNameId
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1021,7 +1128,6 @@ namespace Example
 
             try
             {
-                // List EMV terminals belonging to the given AppNameId
                 RestApiArrayResultEmvTerminalWithAssignments result = apiInstance.HydraGetEmvsForAppId(appId);
                 Debug.WriteLine(result);
             }
@@ -1059,15 +1165,15 @@ Name | Type | Description  | Notes
 # **LoginWithDeviceId**
 > void LoginWithDeviceId (string deviceId, string hydraUserType = null, string serialNumber = null)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1085,7 +1191,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 apiInstance.LoginWithDeviceId(deviceId, hydraUserType, serialNumber);
             }
             catch (Exception e)
@@ -1124,15 +1229,15 @@ void (empty response body)
 # **Register**
 > RestApiResultHydraStatus Register (string appId, HydraRegistrationRequest hydraRegistration)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1149,7 +1254,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 RestApiResultHydraStatus result = apiInstance.Register(appId, hydraRegistration);
                 Debug.WriteLine(result);
             }
@@ -1188,15 +1292,15 @@ Name | Type | Description  | Notes
 # **UnAssign**
 > void UnAssign (string appId, string deviceId)
 
-[Private]
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1213,7 +1317,6 @@ namespace Example
 
             try
             {
-                // [Private]
                 apiInstance.UnAssign(appId, deviceId);
             }
             catch (Exception e)
@@ -1251,15 +1354,15 @@ void (empty response body)
 # **UnassignEmv**
 > void UnassignEmv (string appId, int? hydraConfigId)
 
-Unassign the currently assigned EMV terminal from a kiosk
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1276,7 +1379,6 @@ namespace Example
 
             try
             {
-                // Unassign the currently assigned EMV terminal from a kiosk
                 apiInstance.UnassignEmv(appId, hydraConfigId);
             }
             catch (Exception e)
@@ -1314,17 +1416,15 @@ void (empty response body)
 # **UpdateKioskCashVisibilitySettings**
 > void UpdateKioskCashVisibilitySettings (string appId, string deviceId, bool? isCashEnabled)
 
-Update the Cash Payment Methon Visiability on Kisok
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1342,7 +1442,6 @@ namespace Example
 
             try
             {
-                // Update the Cash Payment Methon Visiability on Kisok
                 apiInstance.UpdateKioskCashVisibilitySettings(appId, deviceId, isCashEnabled);
             }
             catch (Exception e)
@@ -1377,3 +1476,67 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="updatekiosksettings"></a>
+# **UpdateKioskSettings**
+> void UpdateKioskSettings (string appId, string deviceId, KioskSettings settings)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UpdateKioskSettingsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new HydraApi();
+            var appId = appId_example;  // string | 
+            var deviceId = deviceId_example;  // string | 
+            var settings = new KioskSettings(); // KioskSettings | 
+
+            try
+            {
+                apiInstance.UpdateKioskSettings(appId, deviceId, settings);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling HydraApi.UpdateKioskSettings: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **deviceId** | **string**|  | 
+ **settings** | [**KioskSettings**](KioskSettings.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/HydraAssignedEvent.md b/docs/HydraAssignedEvent.md
index 552bcf43..25a63df5 100644
--- a/docs/HydraAssignedEvent.md
+++ b/docs/HydraAssignedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraAssignedEvent
+# Flipdish.Model.HydraAssignedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HydraConfig.md b/docs/HydraConfig.md
index a0ecd2bb..27bfd42a 100644
--- a/docs/HydraConfig.md
+++ b/docs/HydraConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraConfig
+# Flipdish.Model.HydraConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/HydraConnectionStatusChangedEvent.md b/docs/HydraConnectionStatusChangedEvent.md
index 0eb3d9e0..6f63e764 100644
--- a/docs/HydraConnectionStatusChangedEvent.md
+++ b/docs/HydraConnectionStatusChangedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraConnectionStatusChangedEvent
+# Flipdish.Model.HydraConnectionStatusChangedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HydraCreatedEvent.md b/docs/HydraCreatedEvent.md
new file mode 100644
index 00000000..c8477d53
--- /dev/null
+++ b/docs/HydraCreatedEvent.md
@@ -0,0 +1,22 @@
+# Flipdish.Model.HydraCreatedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**User** | [**UserEventInfo**](UserEventInfo.md) | Optional user who triggered creation (may be null for device self-create). | [optional] 
+**DeviceId** | **string** | Device id | [optional] 
+**HydraUserId** | **int?** | Zeus Hydra user id | [optional] 
+**UserType** | **string** | Hydra user type (Kiosk / Terminal) as integer. Prefer {Flipdish.PublicModels.V1.Events.Hydra.HydraCreatedEvent.DeviceType}. | [optional] 
+**DeviceType** | **string** | Hydra device type (Kiosk / Terminal), serialized as string. | [optional] 
+**EventName** | **string** | The event name | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/HydraDeviceDetails.md b/docs/HydraDeviceDetails.md
index 5cebc9cc..f0215646 100644
--- a/docs/HydraDeviceDetails.md
+++ b/docs/HydraDeviceDetails.md
@@ -1,10 +1,11 @@
-# IO.Swagger.Model.HydraDeviceDetails
+# Flipdish.Model.HydraDeviceDetails
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **HydraConfigId** | **int?** | Flipdish internal device identifier | [optional] 
-**DeviceId** | **string** | Device Id or Serial Number | [optional] 
+**DeviceId** | **string** | Device Id | [optional] 
+**SerialNumber** | **string** | Serial Number | [optional] 
 **DeviceType** | **string** | Type of the device | [optional] 
 **Status** | **string** | Status of the device | [optional] 
 **DeviceName** | **string** | Device Name | [optional] 
diff --git a/docs/HydraRegistration.md b/docs/HydraRegistration.md
deleted file mode 100644
index 7798b404..00000000
--- a/docs/HydraRegistration.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.HydraRegistration
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**AppId** | **string** | App | 
-**StoreId** | **int?** | Store to assign the hydra | 
-**DeviceName** | **string** | Hydra device name | 
-**PinCode** | **int?** | 6 digit PIN code (not starting with zero). | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/HydraRegistrationRequest.md b/docs/HydraRegistrationRequest.md
index ae3402a5..0db64005 100644
--- a/docs/HydraRegistrationRequest.md
+++ b/docs/HydraRegistrationRequest.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraRegistrationRequest
+# Flipdish.Model.HydraRegistrationRequest
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/HydraRequestResetEvent.md b/docs/HydraRequestResetEvent.md
index 11e48ae7..610664af 100644
--- a/docs/HydraRequestResetEvent.md
+++ b/docs/HydraRequestResetEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraRequestResetEvent
+# Flipdish.Model.HydraRequestResetEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,7 +9,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HydraSettingChangedEvent.md b/docs/HydraSettingChangedEvent.md
index 32eeb1a4..9c276d7f 100644
--- a/docs/HydraSettingChangedEvent.md
+++ b/docs/HydraSettingChangedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraSettingChangedEvent
+# Flipdish.Model.HydraSettingChangedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HydraStatus.md b/docs/HydraStatus.md
index 3be87cf8..f636d5d8 100644
--- a/docs/HydraStatus.md
+++ b/docs/HydraStatus.md
@@ -1,14 +1,17 @@
-# IO.Swagger.Model.HydraStatus
+# Flipdish.Model.HydraStatus
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **AppId** | **string** |  | 
 **StoreIds** | **List&lt;int?&gt;** | Store to assign the hydra | [optional] 
+**PropertyIds** | **List&lt;string&gt;** | AuthZ Property ids for assigned stores | [optional] 
 **IsRegistered** | **bool?** | The device has been already registered | 
 **PinCode** | **int?** | 6 digit PIN code (not starting with zero). | [optional] 
 **Images** | **List&lt;string&gt;** | Hydra images (covers) | [optional] 
-**UserType** | **string** | Hydra User Type | [optional] 
+**UserType** | **string** | Hydra User Type as integer. Prefer {Flipdish.PublicModels.V1.Hydra.HydraStatus.DeviceType}. | [optional] 
+**DeviceType** | **string** | Hydra device type (Kiosk / Terminal), serialized as string. | [optional] 
+**HydraUserId** | **int?** | Zeus Hydra user id | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HydraStoreAssignedEvent.md b/docs/HydraStoreAssignedEvent.md
index ea0b52bb..8722b0e2 100644
--- a/docs/HydraStoreAssignedEvent.md
+++ b/docs/HydraStoreAssignedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraStoreAssignedEvent
+# Flipdish.Model.HydraStoreAssignedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HydraStoreData.md b/docs/HydraStoreData.md
index c8ca2b3d..e530583d 100644
--- a/docs/HydraStoreData.md
+++ b/docs/HydraStoreData.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraStoreData
+# Flipdish.Model.HydraStoreData
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/HydraStoreUnassignedEvent.md b/docs/HydraStoreUnassignedEvent.md
index 0608432a..5f6694f1 100644
--- a/docs/HydraStoreUnassignedEvent.md
+++ b/docs/HydraStoreUnassignedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraStoreUnassignedEvent
+# Flipdish.Model.HydraStoreUnassignedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/HydraUnAssignedEvent.md b/docs/HydraUnAssignedEvent.md
index c6f1c8b3..ac37b5cb 100644
--- a/docs/HydraUnAssignedEvent.md
+++ b/docs/HydraUnAssignedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.HydraUnAssignedEvent
+# Flipdish.Model.HydraUnAssignedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/IndexPage.md b/docs/IndexPage.md
index 51418c76..a72bd351 100644
--- a/docs/IndexPage.md
+++ b/docs/IndexPage.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.IndexPage
+# Flipdish.Model.IndexPage
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/IndexPageBase.md b/docs/IndexPageBase.md
index 241de4e3..645217af 100644
--- a/docs/IndexPageBase.md
+++ b/docs/IndexPageBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.IndexPageBase
+# Flipdish.Model.IndexPageBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/IntegrationMetadataCatalogueApi.md b/docs/IntegrationMetadataCatalogueApi.md
new file mode 100644
index 00000000..25728db2
--- /dev/null
+++ b/docs/IntegrationMetadataCatalogueApi.md
@@ -0,0 +1,76 @@
+# Flipdish.Api.IntegrationMetadataCatalogueApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**IntegrationMetadataCatalogueGetPixelPointProducts**](IntegrationMetadataCatalogueApi.md#integrationmetadatacataloguegetpixelpointproducts) | **GET** /api/v1.0/integrationmetadatacatalogue/pixelpoint/stores/{storeId}/products | 
+
+
+<a name="integrationmetadatacataloguegetpixelpointproducts"></a>
+# **IntegrationMetadataCatalogueGetPixelPointProducts**
+> RestApiResultPixelPointProductCatalogue IntegrationMetadataCatalogueGetPixelPointProducts (int? storeId, string nameContains = null, int? page = null, int? pageSize = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class IntegrationMetadataCatalogueGetPixelPointProductsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new IntegrationMetadataCatalogueApi();
+            var storeId = 56;  // int? | 
+            var nameContains = nameContains_example;  // string |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var pageSize = 56;  // int? |  (optional) 
+
+            try
+            {
+                RestApiResultPixelPointProductCatalogue result = apiInstance.IntegrationMetadataCatalogueGetPixelPointProducts(storeId, nameContains, page, pageSize);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling IntegrationMetadataCatalogueApi.IntegrationMetadataCatalogueGetPixelPointProducts: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+ **nameContains** | **string**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **pageSize** | **int?**|  | [optional] 
+
+### Return type
+
+[**RestApiResultPixelPointProductCatalogue**](RestApiResultPixelPointProductCatalogue.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/IntercomApi.md b/docs/IntercomApi.md
new file mode 100644
index 00000000..a022e0ce
--- /dev/null
+++ b/docs/IntercomApi.md
@@ -0,0 +1,66 @@
+# Flipdish.Api.IntercomApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**UserHash**](IntercomApi.md#userhash) | **GET** /api/v1.0/intercom/userHash | 
+
+
+<a name="userhash"></a>
+# **UserHash**
+> RestApiResultIntercomUserHash UserHash ()
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UserHashExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new IntercomApi();
+
+            try
+            {
+                RestApiResultIntercomUserHash result = apiInstance.UserHash();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling IntercomApi.UserHash: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**RestApiResultIntercomUserHash**](RestApiResultIntercomUserHash.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/IntercomUserHash.md b/docs/IntercomUserHash.md
new file mode 100644
index 00000000..5669cd62
--- /dev/null
+++ b/docs/IntercomUserHash.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.IntercomUserHash
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**UserHash** | **string** | User hash | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/Invoice.md b/docs/Invoice.md
new file mode 100644
index 00000000..294b5444
--- /dev/null
+++ b/docs/Invoice.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.Invoice
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**InvoiceNumber** | **string** | Invoice Number | [optional] 
+**StartDay** | **DateTime?** | The start day of the invoice period. | [optional] 
+**EndDay** | **DateTime?** | The end day of the invoice period. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/InvoiceDiscount.md b/docs/InvoiceDiscount.md
new file mode 100644
index 00000000..28fc86d4
--- /dev/null
+++ b/docs/InvoiceDiscount.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.InvoiceDiscount
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** | Name | 
+**Amount** | **double?** | Amount | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/InvoiceItem.md b/docs/InvoiceItem.md
new file mode 100644
index 00000000..d9217270
--- /dev/null
+++ b/docs/InvoiceItem.md
@@ -0,0 +1,14 @@
+# Flipdish.Model.InvoiceItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Description** | **string** | Description | 
+**Quantity** | **long?** | Quantity | 
+**UnitAmountExcludingTax** | **double?** | Unit Amount Excluding Tax | 
+**Tax** | **double?** | Tax | 
+**Amount** | **double?** | Amount | 
+**Period** | [**InvoicePeriod**](InvoicePeriod.md) | Period | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/InvoicePeriod.md b/docs/InvoicePeriod.md
new file mode 100644
index 00000000..59f350dd
--- /dev/null
+++ b/docs/InvoicePeriod.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.InvoicePeriod
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Start** | **DateTime?** | Start | [optional] 
+**End** | **DateTime?** | End | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/InvoicesApi.md b/docs/InvoicesApi.md
new file mode 100644
index 00000000..925fc8a6
--- /dev/null
+++ b/docs/InvoicesApi.md
@@ -0,0 +1,295 @@
+# Flipdish.Api.InvoicesApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**GetInvoices**](InvoicesApi.md#getinvoices) | **GET** /api/v1.0/{appId}/invoices | 
+[**InvoicePdf**](InvoicesApi.md#invoicepdf) | **GET** /api/v1.0/{appId}/invoices/InvoicePdf | 
+[**ListInvoices**](InvoicesApi.md#listinvoices) | **GET** /api/v1.0/{appId}/invoices/ListInvoices | 
+[**ListSubscriptionInvoices**](InvoicesApi.md#listsubscriptioninvoices) | **GET** /api/v1.0/{appId}/invoices/ListSubscriptionInvoices | 
+
+
+<a name="getinvoices"></a>
+# **GetInvoices**
+> RestApiFinanceSearchPaginationResultSubscriptionInvoice GetInvoices (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetInvoicesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new InvoicesApi();
+            var appId = appId_example;  // string | 
+            var subscriptionId = subscriptionId_example;  // string |  (optional) 
+            var limit = 56;  // int? |  (optional) 
+            var pageId = pageId_example;  // string |  (optional) 
+            var excludeNotOwnedInvoices = true;  // bool? |  (optional) 
+            var dateFrom = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var dateTo = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var invoiceNumber = invoiceNumber_example;  // string |  (optional) 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
+
+            try
+            {
+                RestApiFinanceSearchPaginationResultSubscriptionInvoice result = apiInstance.GetInvoices(appId, subscriptionId, limit, pageId, excludeNotOwnedInvoices, dateFrom, dateTo, invoiceNumber, storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InvoicesApi.GetInvoices: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **subscriptionId** | **string**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
+ **pageId** | **string**|  | [optional] 
+ **excludeNotOwnedInvoices** | **bool?**|  | [optional] 
+ **dateFrom** | **DateTime?**|  | [optional] 
+ **dateTo** | **DateTime?**|  | [optional] 
+ **invoiceNumber** | **string**|  | [optional] 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+
+### Return type
+
+[**RestApiFinanceSearchPaginationResultSubscriptionInvoice**](RestApiFinanceSearchPaginationResultSubscriptionInvoice.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="invoicepdf"></a>
+# **InvoicePdf**
+> void InvoicePdf (string invoiceNumber, string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class InvoicePdfExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new InvoicesApi();
+            var invoiceNumber = invoiceNumber_example;  // string | 
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                apiInstance.InvoicePdf(invoiceNumber, appId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InvoicesApi.InvoicePdf: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **invoiceNumber** | **string**|  | 
+ **appId** | **string**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="listinvoices"></a>
+# **ListInvoices**
+> RestApiFinanceSearchPaginationResultInvoice ListInvoices (int? storeId, string appId, int? limit = null, int? page = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class ListInvoicesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new InvoicesApi();
+            var storeId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var limit = 56;  // int? |  (optional) 
+            var page = 56;  // int? |  (optional) 
+
+            try
+            {
+                RestApiFinanceSearchPaginationResultInvoice result = apiInstance.ListInvoices(storeId, appId, limit, page);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InvoicesApi.ListInvoices: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **limit** | **int?**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+
+### Return type
+
+[**RestApiFinanceSearchPaginationResultInvoice**](RestApiFinanceSearchPaginationResultInvoice.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="listsubscriptioninvoices"></a>
+# **ListSubscriptionInvoices**
+> RestApiFinanceSearchPaginationResultSubscriptionInvoice ListSubscriptionInvoices (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class ListSubscriptionInvoicesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new InvoicesApi();
+            var appId = appId_example;  // string | 
+            var subscriptionId = subscriptionId_example;  // string |  (optional) 
+            var limit = 56;  // int? |  (optional) 
+            var pageId = pageId_example;  // string |  (optional) 
+            var excludeNotOwnedInvoices = true;  // bool? |  (optional) 
+            var dateFrom = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var dateTo = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var invoiceNumber = invoiceNumber_example;  // string |  (optional) 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
+
+            try
+            {
+                RestApiFinanceSearchPaginationResultSubscriptionInvoice result = apiInstance.ListSubscriptionInvoices(appId, subscriptionId, limit, pageId, excludeNotOwnedInvoices, dateFrom, dateTo, invoiceNumber, storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling InvoicesApi.ListSubscriptionInvoices: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **subscriptionId** | **string**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
+ **pageId** | **string**|  | [optional] 
+ **excludeNotOwnedInvoices** | **bool?**|  | [optional] 
+ **dateFrom** | **DateTime?**|  | [optional] 
+ **dateTo** | **DateTime?**|  | [optional] 
+ **invoiceNumber** | **string**|  | [optional] 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+
+### Return type
+
+[**RestApiFinanceSearchPaginationResultSubscriptionInvoice**](RestApiFinanceSearchPaginationResultSubscriptionInvoice.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/ItemNutritionInfoAddUpdateModel.md b/docs/ItemNutritionInfoAddUpdateModel.md
new file mode 100644
index 00000000..257bb0be
--- /dev/null
+++ b/docs/ItemNutritionInfoAddUpdateModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.ItemNutritionInfoAddUpdateModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Labels** | [**List&lt;NutritionInfoItemAddUpdateLabelModel&gt;**](NutritionInfoItemAddUpdateLabelModel.md) | Labels. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ItemNutritionInfoV2AddUpdateModel.md b/docs/ItemNutritionInfoV2AddUpdateModel.md
new file mode 100644
index 00000000..cfa67d9e
--- /dev/null
+++ b/docs/ItemNutritionInfoV2AddUpdateModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.ItemNutritionInfoV2AddUpdateModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AllergenIds** | **List&lt;string&gt;** | AllergenIds. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/JobAddress.md b/docs/JobAddress.md
index 5924592d..713916f8 100644
--- a/docs/JobAddress.md
+++ b/docs/JobAddress.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobAddress
+# Flipdish.Model.JobAddress
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobCancellation.md b/docs/JobCancellation.md
index 47df0178..cbceae4f 100644
--- a/docs/JobCancellation.md
+++ b/docs/JobCancellation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobCancellation
+# Flipdish.Model.JobCancellation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobContact.md b/docs/JobContact.md
index 068b5740..dedfaf7b 100644
--- a/docs/JobContact.md
+++ b/docs/JobContact.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobContact
+# Flipdish.Model.JobContact
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobDelivery.md b/docs/JobDelivery.md
index 90041416..f4d0df03 100644
--- a/docs/JobDelivery.md
+++ b/docs/JobDelivery.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobDelivery
+# Flipdish.Model.JobDelivery
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobDeliveryDetail.md b/docs/JobDeliveryDetail.md
index 492bfd19..bb626104 100644
--- a/docs/JobDeliveryDetail.md
+++ b/docs/JobDeliveryDetail.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobDeliveryDetail
+# Flipdish.Model.JobDeliveryDetail
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobDriver.md b/docs/JobDriver.md
index 6cab0756..308bdd5b 100644
--- a/docs/JobDriver.md
+++ b/docs/JobDriver.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobDriver
+# Flipdish.Model.JobDriver
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobEta.md b/docs/JobEta.md
index d295a7e0..4830d1f9 100644
--- a/docs/JobEta.md
+++ b/docs/JobEta.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobEta
+# Flipdish.Model.JobEta
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobPricing.md b/docs/JobPricing.md
index 8128fed8..46db4e0c 100644
--- a/docs/JobPricing.md
+++ b/docs/JobPricing.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobPricing
+# Flipdish.Model.JobPricing
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobProof.md b/docs/JobProof.md
index 321d394a..65f3398c 100644
--- a/docs/JobProof.md
+++ b/docs/JobProof.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobProof
+# Flipdish.Model.JobProof
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/JobResponse.md b/docs/JobResponse.md
index 7fdf75fe..5b754896 100644
--- a/docs/JobResponse.md
+++ b/docs/JobResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.JobResponse
+# Flipdish.Model.JobResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/KioskBluetoothInstallUpdateInitiateEvent.md b/docs/KioskBluetoothInstallUpdateInitiateEvent.md
index 5ae32689..6189294e 100644
--- a/docs/KioskBluetoothInstallUpdateInitiateEvent.md
+++ b/docs/KioskBluetoothInstallUpdateInitiateEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothInstallUpdateInitiateEvent
+# Flipdish.Model.KioskBluetoothInstallUpdateInitiateEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskBluetoothPairingModeEvent.md b/docs/KioskBluetoothPairingModeEvent.md
index 09237297..5e0d07a0 100644
--- a/docs/KioskBluetoothPairingModeEvent.md
+++ b/docs/KioskBluetoothPairingModeEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothPairingModeEvent
+# Flipdish.Model.KioskBluetoothPairingModeEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskBluetoothTerminalCancelUpdateEvent.md b/docs/KioskBluetoothTerminalCancelUpdateEvent.md
index 78ae36ae..f096eebd 100644
--- a/docs/KioskBluetoothTerminalCancelUpdateEvent.md
+++ b/docs/KioskBluetoothTerminalCancelUpdateEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothTerminalCancelUpdateEvent
+# Flipdish.Model.KioskBluetoothTerminalCancelUpdateEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskBluetoothTerminalFirmwareVersionStatusEvent.md b/docs/KioskBluetoothTerminalFirmwareVersionStatusEvent.md
index c67725b6..492058f2 100644
--- a/docs/KioskBluetoothTerminalFirmwareVersionStatusEvent.md
+++ b/docs/KioskBluetoothTerminalFirmwareVersionStatusEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothTerminalFirmwareVersionStatusEvent
+# Flipdish.Model.KioskBluetoothTerminalFirmwareVersionStatusEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -15,7 +15,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskBluetoothTerminalInitiateUpdateCheckEvent.md b/docs/KioskBluetoothTerminalInitiateUpdateCheckEvent.md
index 15801a89..fb87d0d2 100644
--- a/docs/KioskBluetoothTerminalInitiateUpdateCheckEvent.md
+++ b/docs/KioskBluetoothTerminalInitiateUpdateCheckEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothTerminalInitiateUpdateCheckEvent
+# Flipdish.Model.KioskBluetoothTerminalInitiateUpdateCheckEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskBluetoothTerminalInstallationStatusEvent.md b/docs/KioskBluetoothTerminalInstallationStatusEvent.md
index 2503c65f..e6d630ab 100644
--- a/docs/KioskBluetoothTerminalInstallationStatusEvent.md
+++ b/docs/KioskBluetoothTerminalInstallationStatusEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothTerminalInstallationStatusEvent
+# Flipdish.Model.KioskBluetoothTerminalInstallationStatusEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskBluetoothTerminalUnpairedEvent.md b/docs/KioskBluetoothTerminalUnpairedEvent.md
index b9cfda6d..16f5aa2b 100644
--- a/docs/KioskBluetoothTerminalUnpairedEvent.md
+++ b/docs/KioskBluetoothTerminalUnpairedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothTerminalUnpairedEvent
+# Flipdish.Model.KioskBluetoothTerminalUnpairedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskBluetoothTerminalUpdatedEvent.md b/docs/KioskBluetoothTerminalUpdatedEvent.md
index edad030c..66301f12 100644
--- a/docs/KioskBluetoothTerminalUpdatedEvent.md
+++ b/docs/KioskBluetoothTerminalUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothTerminalUpdatedEvent
+# Flipdish.Model.KioskBluetoothTerminalUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskBluetoothUnpairingModeEvent.md b/docs/KioskBluetoothUnpairingModeEvent.md
index 466e7a85..b0803a7c 100644
--- a/docs/KioskBluetoothUnpairingModeEvent.md
+++ b/docs/KioskBluetoothUnpairingModeEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskBluetoothUnpairingModeEvent
+# Flipdish.Model.KioskBluetoothUnpairingModeEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/KioskCashPaymentSettings.md b/docs/KioskCashPaymentSettings.md
index efed6af2..7b36f8eb 100644
--- a/docs/KioskCashPaymentSettings.md
+++ b/docs/KioskCashPaymentSettings.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskCashPaymentSettings
+# Flipdish.Model.KioskCashPaymentSettings
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/KioskCashSetting.md b/docs/KioskCashSetting.md
deleted file mode 100644
index 24d9f66e..00000000
--- a/docs/KioskCashSetting.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.KioskCashSetting
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**CashPaymentEnabled** | **bool?** | Indicated whether cash payment is enabled or not eg: true | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/KioskEntitlementsApi.md b/docs/KioskEntitlementsApi.md
new file mode 100644
index 00000000..a9872e33
--- /dev/null
+++ b/docs/KioskEntitlementsApi.md
@@ -0,0 +1,70 @@
+# Flipdish.Api.KioskEntitlementsApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**QueryKioskEntitlementsByOrgId**](KioskEntitlementsApi.md#querykioskentitlementsbyorgid) | **GET** /api/v1.0/orgs/{orgId}/kiosk/entitlements | 
+
+
+<a name="querykioskentitlementsbyorgid"></a>
+# **QueryKioskEntitlementsByOrgId**
+> RestApiResultKioskEntitlementsResult QueryKioskEntitlementsByOrgId (string orgId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class QueryKioskEntitlementsByOrgIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new KioskEntitlementsApi();
+            var orgId = orgId_example;  // string | 
+
+            try
+            {
+                RestApiResultKioskEntitlementsResult result = apiInstance.QueryKioskEntitlementsByOrgId(orgId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling KioskEntitlementsApi.QueryKioskEntitlementsByOrgId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orgId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultKioskEntitlementsResult**](RestApiResultKioskEntitlementsResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/KioskEntitlementsResult.md b/docs/KioskEntitlementsResult.md
new file mode 100644
index 00000000..dbf2e5a2
--- /dev/null
+++ b/docs/KioskEntitlementsResult.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.KioskEntitlementsResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EntitledQuantity** | **int?** | Number of kiosk devices entitled | [optional] 
+**UsedQuantity** | **int?** | The quantity of entitlements that have been used | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/KioskIotApi.md b/docs/KioskIotApi.md
index 1cc8963a..02d9c97b 100644
--- a/docs/KioskIotApi.md
+++ b/docs/KioskIotApi.md
@@ -1,28 +1,26 @@
-# IO.Swagger.Api.KioskIotApi
+# Flipdish.Api.KioskIotApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetKioskIotConnection**](KioskIotApi.md#getkioskiotconnection) | **POST** /api/v1.0/kioskiot/connect | Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
-[**QueryTelemetrySeries**](KioskIotApi.md#querytelemetryseries) | **POST** /api/v1.0/{appId}/kioskiot/timeseries/query | Get the IoT time series values for a given Kiosk Id, properties and time range
+[**GetKioskIotConnection**](KioskIotApi.md#getkioskiotconnection) | **POST** /api/v1.0/kioskiot/connect | 
+[**QueryTelemetrySeries**](KioskIotApi.md#querytelemetryseries) | **POST** /api/v1.0/{appId}/kioskiot/timeseries/query | 
 
 
 <a name="getkioskiotconnection"></a>
 # **GetKioskIotConnection**
 > RestApiResultKioskIotConnectionParameters GetKioskIotConnection ()
 
-Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -37,7 +35,6 @@ namespace Example
 
             try
             {
-                // Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
                 RestApiResultKioskIotConnectionParameters result = apiInstance.GetKioskIotConnection();
                 Debug.WriteLine(result);
             }
@@ -72,17 +69,15 @@ This endpoint does not need any parameter.
 # **QueryTelemetrySeries**
 > RestApiResultTelemetrySeriesResult QueryTelemetrySeries (string appId, TelemetrySeriesQueryParameters queryParams)
 
-Get the IoT time series values for a given Kiosk Id, properties and time range
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -99,7 +94,6 @@ namespace Example
 
             try
             {
-                // Get the IoT time series values for a given Kiosk Id, properties and time range
                 RestApiResultTelemetrySeriesResult result = apiInstance.QueryTelemetrySeries(appId, queryParams);
                 Debug.WriteLine(result);
             }
diff --git a/docs/KioskIotConnectionParameters.md b/docs/KioskIotConnectionParameters.md
index 5f78da89..767795ed 100644
--- a/docs/KioskIotConnectionParameters.md
+++ b/docs/KioskIotConnectionParameters.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskIotConnectionParameters
+# Flipdish.Model.KioskIotConnectionParameters
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/KioskSettings.md b/docs/KioskSettings.md
new file mode 100644
index 00000000..2e273164
--- /dev/null
+++ b/docs/KioskSettings.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.KioskSettings
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**HideLogoFromFrontPage** | **bool?** | Hide logo from front page | [optional] 
+**TwoColumnMenuLayout** | **bool?** | 2 Column Menu Layout | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/KioskStoreSettings.md b/docs/KioskStoreSettings.md
deleted file mode 100644
index de2630ea..00000000
--- a/docs/KioskStoreSettings.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# IO.Swagger.Model.KioskStoreSettings
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**StoreKioskSettings** | [**List&lt;StoreKioskSetting&gt;**](StoreKioskSetting.md) | Kiosks store settings | [optional] 
-**Timezone** | **string** | Kiosks timezone | [optional] 
-**CurrentUtcTime** | **DateTime?** | Servers current Utc time | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/KioskStoreSettingsApi.md b/docs/KioskStoreSettingsApi.md
deleted file mode 100644
index 8d28056c..00000000
--- a/docs/KioskStoreSettingsApi.md
+++ /dev/null
@@ -1,198 +0,0 @@
-# IO.Swagger.Api.KioskStoreSettingsApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**GetAllKioskSettingsForStore**](KioskStoreSettingsApi.md#getallkiosksettingsforstore) | **GET** /api/v1.0/{appId}/kiosksettings/store/{storeId} | Get all kiosk settings associated with a store
-[**GetAllStoreSettingsForKioskHydra**](KioskStoreSettingsApi.md#getallstoresettingsforkioskhydra) | **GET** /api/v1.0/kioskstoresettings | [For Kiosk use only] Get all stores connected to a Kiosk
-[**UpdateCashSettingForKiosk**](KioskStoreSettingsApi.md#updatecashsettingforkiosk) | **POST** /api/v1.0/{appId}/kiosksettings/cash | 
-
-
-<a name="getallkiosksettingsforstore"></a>
-# **GetAllKioskSettingsForStore**
-> RestApiResultStoreKioskSettings GetAllKioskSettingsForStore (int? storeId, string appId)
-
-Get all kiosk settings associated with a store
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class GetAllKioskSettingsForStoreExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new KioskStoreSettingsApi();
-            var storeId = 56;  // int? | Store identifier
-            var appId = appId_example;  // string | App Name Id
-
-            try
-            {
-                // Get all kiosk settings associated with a store
-                RestApiResultStoreKioskSettings result = apiInstance.GetAllKioskSettingsForStore(storeId, appId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling KioskStoreSettingsApi.GetAllKioskSettingsForStore: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **appId** | **string**| App Name Id | 
-
-### Return type
-
-[**RestApiResultStoreKioskSettings**](RestApiResultStoreKioskSettings.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="getallstoresettingsforkioskhydra"></a>
-# **GetAllStoreSettingsForKioskHydra**
-> RestApiResultKioskStoreSettings GetAllStoreSettingsForKioskHydra ()
-
-[For Kiosk use only] Get all stores connected to a Kiosk
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class GetAllStoreSettingsForKioskHydraExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new KioskStoreSettingsApi();
-
-            try
-            {
-                // [For Kiosk use only] Get all stores connected to a Kiosk
-                RestApiResultKioskStoreSettings result = apiInstance.GetAllStoreSettingsForKioskHydra();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling KioskStoreSettingsApi.GetAllStoreSettingsForKioskHydra: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**RestApiResultKioskStoreSettings**](RestApiResultKioskStoreSettings.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="updatecashsettingforkiosk"></a>
-# **UpdateCashSettingForKiosk**
-> RestApiResultKioskCashSetting UpdateCashSettingForKiosk (string appId, string deviceId, bool? isCashEnabled)
-
-
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class UpdateCashSettingForKioskExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new KioskStoreSettingsApi();
-            var appId = appId_example;  // string | 
-            var deviceId = deviceId_example;  // string | 
-            var isCashEnabled = true;  // bool? | 
-
-            try
-            {
-                RestApiResultKioskCashSetting result = apiInstance.UpdateCashSettingForKiosk(appId, deviceId, isCashEnabled);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling KioskStoreSettingsApi.UpdateCashSettingForKiosk: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **deviceId** | **string**|  | 
- **isCashEnabled** | **bool?**|  | 
-
-### Return type
-
-[**RestApiResultKioskCashSetting**](RestApiResultKioskCashSetting.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/KioskStripeLocation.md b/docs/KioskStripeLocation.md
new file mode 100644
index 00000000..ee50b2a3
--- /dev/null
+++ b/docs/KioskStripeLocation.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.KioskStripeLocation
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeviceId** | **string** | Kiosk device ID | [optional] 
+**StripeLocationId** | **string** | Stripe Terminal location ID. Null when card payments have not been set up on the kiosk. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/KioskTerminalActionStateChangedEvent.md b/docs/KioskTerminalActionStateChangedEvent.md
index 9646c868..885277e6 100644
--- a/docs/KioskTerminalActionStateChangedEvent.md
+++ b/docs/KioskTerminalActionStateChangedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.KioskTerminalActionStateChangedEvent
+# Flipdish.Model.KioskTerminalActionStateChangedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Language.md b/docs/Language.md
index cd4510b6..3a2e0f20 100644
--- a/docs/Language.md
+++ b/docs/Language.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Language
+# Flipdish.Model.Language
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **LanguageId** | **string** | ISO 639-1 Language Code | [optional] 
 **DisplayOrder** | **int?** | Display Order | [optional] 
 **Name** | **string** | Language Name | [optional] 
+**Enabled** | **bool?** | Is the language enabled for use. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LastPaymentError.md b/docs/LastPaymentError.md
index 1f1579d4..d67a231d 100644
--- a/docs/LastPaymentError.md
+++ b/docs/LastPaymentError.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LastPaymentError
+# Flipdish.Model.LastPaymentError
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/LeadTime.md b/docs/LeadTime.md
new file mode 100644
index 00000000..dd7cd688
--- /dev/null
+++ b/docs/LeadTime.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.LeadTime
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DispatchType** | **string** | There are two valid values for this field - &#x60;collection&#x60; and &#x60;delivery&#x60;. | 
+**LeadTimeMinutes** | **int?** | This must be a positive integer. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/LightspeedApi.md b/docs/LightspeedApi.md
index 31d1865d..08d8c4e7 100644
--- a/docs/LightspeedApi.md
+++ b/docs/LightspeedApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.LightspeedApi
+# Flipdish.Api.LightspeedApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -19,9 +19,9 @@ Method | HTTP request | Description
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -80,9 +80,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -141,9 +141,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/LightspeedSettings.md b/docs/LightspeedSettings.md
index f130c43f..3f87cc85 100644
--- a/docs/LightspeedSettings.md
+++ b/docs/LightspeedSettings.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LightspeedSettings
+# Flipdish.Model.LightspeedSettings
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/LineItem.md b/docs/LineItem.md
deleted file mode 100644
index 152aabc8..00000000
--- a/docs/LineItem.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# IO.Swagger.Model.LineItem
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **int?** | Flipdish Item Id, if unknown leave &#39;null&#39; | [optional] 
-**Name** | **string** | Item Name | [optional] 
-**SectionName** | **string** | Menu section name | [optional] 
-**ExternalId** | **string** | External Item Id | [optional] 
-**Quantity** | **int?** | Item Quantity | [optional] 
-**Price** | [**Price**](Price.md) | Item Price | [optional] 
-**Notes** | **string** | Item Notes | [optional] 
-**Options** | [**List&lt;LineItemOption&gt;**](LineItemOption.md) | Item Option | [optional] 
-**Metadata** | **Dictionary&lt;string, string&gt;** | Other Item Metadata | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/LineItemOption.md b/docs/LineItemOption.md
deleted file mode 100644
index 0b135222..00000000
--- a/docs/LineItemOption.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# IO.Swagger.Model.LineItemOption
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **int?** | Flipdish Item Option Id, if unknown leave &#39;null&#39; | [optional] 
-**ExternalId** | **string** | External Item Option Id | [optional] 
-**Name** | **string** | External Item Option Name | [optional] 
-**Price** | [**Price**](Price.md) | External Item Option Price | [optional] 
-**Metadata** | **Dictionary&lt;string, string&gt;** | Other Item Metadata | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/LocalisedTimeZone.md b/docs/LocalisedTimeZone.md
index 93773ae4..c2bfbfc3 100644
--- a/docs/LocalisedTimeZone.md
+++ b/docs/LocalisedTimeZone.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LocalisedTimeZone
+# Flipdish.Model.LocalisedTimeZone
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Location.md b/docs/Location.md
deleted file mode 100644
index d2f04123..00000000
--- a/docs/Location.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# IO.Swagger.Model.Location
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**AddressLine1** | **string** | Line 1 of the address | [optional] 
-**AddressLine2** | **string** | Line 2 of the address | [optional] 
-**FormattedAddress** | **string** | Formatted Address | [optional] 
-**PostalCode** | **string** | Postal / Zip Code | [optional] 
-**City** | **string** | City to deliver to | [optional] 
-**Coordinates** | [**Coordinates**](Coordinates.md) | Coordinates to deliver to | [optional] 
-**Notes** | **string** | Notes for delivery | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/LocationApi.md b/docs/LocationApi.md
index 7de3fd40..e955f2f3 100644
--- a/docs/LocationApi.md
+++ b/docs/LocationApi.md
@@ -1,29 +1,29 @@
-# IO.Swagger.Api.LocationApi
+# Flipdish.Api.LocationApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateLocation**](LocationApi.md#createlocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location | Create a Location i.e: Table, Hotel Room, Car park space
-[**DeleteLocation**](LocationApi.md#deletelocation) | **DELETE** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/delete | Set a Location as deleted
-[**MapLocationToExternalId**](LocationApi.md#maplocationtoexternalid) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/map-external | Set or unset External Location Id on a Location
-[**MoveLocation**](LocationApi.md#movelocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/move | Move a Location to a different location Area
-[**UpdateLocation**](LocationApi.md#updatelocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/update | Update a Location i.e: Table, Hotel Room, Car park space
+[**CreateLocation**](LocationApi.md#createlocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location | 
+[**DeleteLocation**](LocationApi.md#deletelocation) | **DELETE** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/delete | 
+[**MapLocationToExternalId**](LocationApi.md#maplocationtoexternalid) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/map-external | 
+[**MoveLocation**](LocationApi.md#movelocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/move | 
+[**UpdateLocation**](LocationApi.md#updatelocation) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/update | 
 
 
 <a name="createlocation"></a>
 # **CreateLocation**
 > Object CreateLocation (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId)
 
-Create a Location i.e: Table, Hotel Room, Car park space
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -35,14 +35,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationApi();
-            var createLocationInput = new List<CreateLocation>(); // List<CreateLocation> | Input data for creating the Location
-            var locationAreaId = 56;  // int? | Id of the Location area where the Location belongs
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
+            var createLocationInput = new List<CreateLocation>(); // List<CreateLocation> | 
+            var locationAreaId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Create a Location i.e: Table, Hotel Room, Car park space
                 Object result = apiInstance.CreateLocation(createLocationInput, locationAreaId, appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -59,10 +58,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **createLocationInput** | [**List&lt;CreateLocation&gt;**](CreateLocation.md)| Input data for creating the Location | 
- **locationAreaId** | **int?**| Id of the Location area where the Location belongs | 
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
+ **createLocationInput** | [**List&lt;CreateLocation&gt;**](CreateLocation.md)|  | 
+ **locationAreaId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -83,15 +82,15 @@ Name | Type | Description  | Notes
 # **DeleteLocation**
 > Object DeleteLocation (int? locationId, int? locationAreaId, string appId, int? storeId)
 
-Set a Location as deleted
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -103,14 +102,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationApi();
-            var locationId = 56;  // int? | Id of the Location that will be moved
-            var locationAreaId = 56;  // int? | Id of the Location Area that the Location belong
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
+            var locationId = 56;  // int? | 
+            var locationAreaId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Set a Location as deleted
                 Object result = apiInstance.DeleteLocation(locationId, locationAreaId, appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -127,10 +125,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **locationId** | **int?**| Id of the Location that will be moved | 
- **locationAreaId** | **int?**| Id of the Location Area that the Location belong | 
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
+ **locationId** | **int?**|  | 
+ **locationAreaId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -151,15 +149,15 @@ Name | Type | Description  | Notes
 # **MapLocationToExternalId**
 > RestApiResultMappedLocation MapLocationToExternalId (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null)
 
-Set or unset External Location Id on a Location
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -171,15 +169,14 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationApi();
-            var locationId = 56;  // int? | Id of the Location that will be mapped
-            var locationAreaId = 56;  // int? | Id of the Location Area that the Location belong
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
-            var externalLocationId = externalLocationId_example;  // string | External Id to be mapped to the location (optional) 
+            var locationId = 56;  // int? | 
+            var locationAreaId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
+            var externalLocationId = externalLocationId_example;  // string |  (optional) 
 
             try
             {
-                // Set or unset External Location Id on a Location
                 RestApiResultMappedLocation result = apiInstance.MapLocationToExternalId(locationId, locationAreaId, appId, storeId, externalLocationId);
                 Debug.WriteLine(result);
             }
@@ -196,11 +193,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **locationId** | **int?**| Id of the Location that will be mapped | 
- **locationAreaId** | **int?**| Id of the Location Area that the Location belong | 
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
- **externalLocationId** | **string**| External Id to be mapped to the location | [optional] 
+ **locationId** | **int?**|  | 
+ **locationAreaId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
+ **externalLocationId** | **string**|  | [optional] 
 
 ### Return type
 
@@ -221,15 +218,15 @@ Name | Type | Description  | Notes
 # **MoveLocation**
 > Object MoveLocation (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId)
 
-Move a Location to a different location Area
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -241,15 +238,14 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationApi();
-            var locationId = 56;  // int? | Id of the Location that will be moved
-            var locationAreaId = 56;  // int? | Id of the new Location area that it should be moved to
-            var newLocationAreaId = 56;  // int? | Id of the new Location area that it should be moved to
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
+            var locationId = 56;  // int? | 
+            var locationAreaId = 56;  // int? | 
+            var newLocationAreaId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Move a Location to a different location Area
                 Object result = apiInstance.MoveLocation(locationId, locationAreaId, newLocationAreaId, appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -266,11 +262,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **locationId** | **int?**| Id of the Location that will be moved | 
- **locationAreaId** | **int?**| Id of the new Location area that it should be moved to | 
- **newLocationAreaId** | **int?**| Id of the new Location area that it should be moved to | 
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
+ **locationId** | **int?**|  | 
+ **locationAreaId** | **int?**|  | 
+ **newLocationAreaId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -291,15 +287,15 @@ Name | Type | Description  | Notes
 # **UpdateLocation**
 > RestApiResultLocationAreaLocation UpdateLocation (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId)
 
-Update a Location i.e: Table, Hotel Room, Car park space
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -311,15 +307,14 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationApi();
-            var updateLocationInput = new CreateLocation(); // CreateLocation | Input data for updating the Location
-            var locationAreaId = 56;  // int? | Id of the Location area where the Location belongs
-            var locationId = 56;  // int? | Id of the Location to be updated
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
+            var updateLocationInput = new CreateLocation(); // CreateLocation | 
+            var locationAreaId = 56;  // int? | 
+            var locationId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Update a Location i.e: Table, Hotel Room, Car park space
                 RestApiResultLocationAreaLocation result = apiInstance.UpdateLocation(updateLocationInput, locationAreaId, locationId, appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -336,11 +331,11 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **updateLocationInput** | [**CreateLocation**](CreateLocation.md)| Input data for updating the Location | 
- **locationAreaId** | **int?**| Id of the Location area where the Location belongs | 
- **locationId** | **int?**| Id of the Location to be updated | 
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
+ **updateLocationInput** | [**CreateLocation**](CreateLocation.md)|  | 
+ **locationAreaId** | **int?**|  | 
+ **locationId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
diff --git a/docs/LocationArea.md b/docs/LocationArea.md
index 71b5ac80..7e77149f 100644
--- a/docs/LocationArea.md
+++ b/docs/LocationArea.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LocationArea
+# Flipdish.Model.LocationArea
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/LocationAreaCreatedEvent.md b/docs/LocationAreaCreatedEvent.md
index fdc5a242..b587fab5 100644
--- a/docs/LocationAreaCreatedEvent.md
+++ b/docs/LocationAreaCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LocationAreaCreatedEvent
+# Flipdish.Model.LocationAreaCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LocationAreaLocation.md b/docs/LocationAreaLocation.md
index e77b1614..33abd5eb 100644
--- a/docs/LocationAreaLocation.md
+++ b/docs/LocationAreaLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LocationAreaLocation
+# Flipdish.Model.LocationAreaLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/LocationAreaUpdatedEvent.md b/docs/LocationAreaUpdatedEvent.md
index 2b74e14e..c2519e24 100644
--- a/docs/LocationAreaUpdatedEvent.md
+++ b/docs/LocationAreaUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LocationAreaUpdatedEvent
+# Flipdish.Model.LocationAreaUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LocationAreaWithLocations.md b/docs/LocationAreaWithLocations.md
index 66d7ec30..c10f4bdc 100644
--- a/docs/LocationAreaWithLocations.md
+++ b/docs/LocationAreaWithLocations.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LocationAreaWithLocations
+# Flipdish.Model.LocationAreaWithLocations
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/LocationAreasApi.md b/docs/LocationAreasApi.md
index 6d02792b..bf3a8914 100644
--- a/docs/LocationAreasApi.md
+++ b/docs/LocationAreasApi.md
@@ -1,28 +1,28 @@
-# IO.Swagger.Api.LocationAreasApi
+# Flipdish.Api.LocationAreasApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateLocationArea**](LocationAreasApi.md#createlocationarea) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas | Create a Location Area, i.e: Room, Floor, Parking lot
-[**GetLocationArea**](LocationAreasApi.md#getlocationarea) | **GET** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId} | Retrieve a Location Area
-[**GetLocationAreasForStore**](LocationAreasApi.md#getlocationareasforstore) | **GET** /api/v1.0/{appId}/stores/{storeId}/location-areas | Retrieve all Location Areas for a Store
-[**UpdateLocationArea**](LocationAreasApi.md#updatelocationarea) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/update | Update a Location Area, i.e: Room, Floor, Car park space
+[**CreateLocationArea**](LocationAreasApi.md#createlocationarea) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas | 
+[**GetLocationArea**](LocationAreasApi.md#getlocationarea) | **GET** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId} | 
+[**GetLocationAreasForStore**](LocationAreasApi.md#getlocationareasforstore) | **GET** /api/v1.0/{appId}/stores/{storeId}/location-areas | 
+[**UpdateLocationArea**](LocationAreasApi.md#updatelocationarea) | **POST** /api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/update | 
 
 
 <a name="createlocationarea"></a>
 # **CreateLocationArea**
 > Object CreateLocationArea (CreateLocationArea locationAreaInput, string appId, int? storeId)
 
-Create a Location Area, i.e: Room, Floor, Parking lot
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -34,13 +34,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationAreasApi();
-            var locationAreaInput = new CreateLocationArea(); // CreateLocationArea | Input data for creating the Location Area
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
+            var locationAreaInput = new CreateLocationArea(); // CreateLocationArea | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Create a Location Area, i.e: Room, Floor, Parking lot
                 Object result = apiInstance.CreateLocationArea(locationAreaInput, appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -57,9 +56,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **locationAreaInput** | [**CreateLocationArea**](CreateLocationArea.md)| Input data for creating the Location Area | 
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
+ **locationAreaInput** | [**CreateLocationArea**](CreateLocationArea.md)|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -80,15 +79,15 @@ Name | Type | Description  | Notes
 # **GetLocationArea**
 > RestApiResultLocationAreaWithLocations GetLocationArea (int? locationAreaId, string appId, int? storeId)
 
-Retrieve a Location Area
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -100,13 +99,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationAreasApi();
-            var locationAreaId = 56;  // int? | Id of the Location Area
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
+            var locationAreaId = 56;  // int? | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Retrieve a Location Area
                 RestApiResultLocationAreaWithLocations result = apiInstance.GetLocationArea(locationAreaId, appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -123,9 +121,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **locationAreaId** | **int?**| Id of the Location Area | 
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
+ **locationAreaId** | **int?**|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -146,15 +144,15 @@ Name | Type | Description  | Notes
 # **GetLocationAreasForStore**
 > RestApiArrayResultLocationAreaWithLocations GetLocationAreasForStore (string appId, int? storeId)
 
-Retrieve all Location Areas for a Store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -166,12 +164,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationAreasApi();
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Retrieve all Location Areas for a Store
                 RestApiArrayResultLocationAreaWithLocations result = apiInstance.GetLocationAreasForStore(appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -188,8 +185,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -210,15 +207,15 @@ Name | Type | Description  | Notes
 # **UpdateLocationArea**
 > RestApiResultLocationArea UpdateLocationArea (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId)
 
-Update a Location Area, i.e: Room, Floor, Car park space
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -230,14 +227,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LocationAreasApi();
-            var locationAreaInput = new UpdateLocationArea(); // UpdateLocationArea | Input data for updating the Location Area
-            var appId = appId_example;  // string | AppId i.e: (fd1234)
-            var storeId = 56;  // int? | Id of the Store
+            var locationAreaInput = new UpdateLocationArea(); // UpdateLocationArea | 
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
             var locationAreaId = locationAreaId_example;  // string | 
 
             try
             {
-                // Update a Location Area, i.e: Room, Floor, Car park space
                 RestApiResultLocationArea result = apiInstance.UpdateLocationArea(locationAreaInput, appId, storeId, locationAreaId);
                 Debug.WriteLine(result);
             }
@@ -254,9 +250,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **locationAreaInput** | [**UpdateLocationArea**](UpdateLocationArea.md)| Input data for updating the Location Area | 
- **appId** | **string**| AppId i.e: (fd1234) | 
- **storeId** | **int?**| Id of the Store | 
+ **locationAreaInput** | [**UpdateLocationArea**](UpdateLocationArea.md)|  | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
  **locationAreaId** | **string**|  | 
 
 ### Return type
diff --git a/docs/LocationCreatedEvent.md b/docs/LocationCreatedEvent.md
index 101e4663..75237d84 100644
--- a/docs/LocationCreatedEvent.md
+++ b/docs/LocationCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LocationCreatedEvent
+# Flipdish.Model.LocationCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LocationDeletedEvent.md b/docs/LocationDeletedEvent.md
index f79155b9..58fea6e5 100644
--- a/docs/LocationDeletedEvent.md
+++ b/docs/LocationDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LocationDeletedEvent
+# Flipdish.Model.LocationDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LoginModel.md b/docs/LoginModel.md
index bc1ecb51..03aeb737 100644
--- a/docs/LoginModel.md
+++ b/docs/LoginModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LoginModel
+# Flipdish.Model.LoginModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/LoginWithPinModel.md b/docs/LoginWithPinModel.md
deleted file mode 100644
index 47ef5688..00000000
--- a/docs/LoginWithPinModel.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.LoginWithPinModel
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Email** | **string** | Email addres | 
-**Pin** | **int?** | PIN code (received via email) | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/LookerDashboardApi.md b/docs/LookerDashboardApi.md
index 928b60a3..96a79d58 100644
--- a/docs/LookerDashboardApi.md
+++ b/docs/LookerDashboardApi.md
@@ -1,25 +1,25 @@
-# IO.Swagger.Api.LookerDashboardApi
+# Flipdish.Api.LookerDashboardApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**LookerDashboardGetAll**](LookerDashboardApi.md#lookerdashboardgetall) | **GET** /api/v1.0/{appId}/looker/dashboards | Get all dashboards
+[**LookerDashboardGetAll**](LookerDashboardApi.md#lookerdashboardgetall) | **GET** /api/v1.0/{appId}/looker/dashboards | 
 
 
 <a name="lookerdashboardgetall"></a>
 # **LookerDashboardGetAll**
 > void LookerDashboardGetAll (string appId)
 
-Get all dashboards
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -35,7 +35,6 @@ namespace Example
 
             try
             {
-                // Get all dashboards
                 apiInstance.LookerDashboardGetAll(appId);
             }
             catch (Exception e)
diff --git a/docs/LookerSingleSignOnApi.md b/docs/LookerSingleSignOnApi.md
index 27f9eeb4..bef44ec0 100644
--- a/docs/LookerSingleSignOnApi.md
+++ b/docs/LookerSingleSignOnApi.md
@@ -1,25 +1,25 @@
-# IO.Swagger.Api.LookerSingleSignOnApi
+# Flipdish.Api.LookerSingleSignOnApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetSSOEndpoint**](LookerSingleSignOnApi.md#getssoendpoint) | **GET** /api/v1.0/{appId}/looker/sso | Get the generic single sign on embed URL for Looker dashboards
+[**GetSSOEndpoint**](LookerSingleSignOnApi.md#getssoendpoint) | **GET** /api/v1.0/{appId}/looker/sso | 
 
 
 <a name="getssoendpoint"></a>
 # **GetSSOEndpoint**
 > DashboardEmbed GetSSOEndpoint (string appId, string embedPath, string filters = null)
 
-Get the generic single sign on embed URL for Looker dashboards
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -31,13 +31,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new LookerSingleSignOnApi();
-            var appId = appId_example;  // string | AppNameId
-            var embedPath = embedPath_example;  // string | Embed URL of the dashboard
-            var filters = filters_example;  // string | Filters that will be passed to the dashboard (optional) 
+            var appId = appId_example;  // string | 
+            var embedPath = embedPath_example;  // string | 
+            var filters = filters_example;  // string |  (optional) 
 
             try
             {
-                // Get the generic single sign on embed URL for Looker dashboards
                 DashboardEmbed result = apiInstance.GetSSOEndpoint(appId, embedPath, filters);
                 Debug.WriteLine(result);
             }
@@ -54,9 +53,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| AppNameId | 
- **embedPath** | **string**| Embed URL of the dashboard | 
- **filters** | **string**| Filters that will be passed to the dashboard | [optional] 
+ **appId** | **string**|  | 
+ **embedPath** | **string**|  | 
+ **filters** | **string**|  | [optional] 
 
 ### Return type
 
diff --git a/docs/LoyaltyCampaign.md b/docs/LoyaltyCampaign.md
index 26521b86..2d6a40a0 100644
--- a/docs/LoyaltyCampaign.md
+++ b/docs/LoyaltyCampaign.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LoyaltyCampaign
+# Flipdish.Model.LoyaltyCampaign
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,8 +6,10 @@ Name | Type | Description | Notes
 **CampaignId** | **int?** | Id of campaign | [optional] 
 **Statistics** | [**CampaignStatistics**](CampaignStatistics.md) | Statistics of campaign | [optional] 
 **Stores** | [**List&lt;StoreCampaignStartTime&gt;**](StoreCampaignStartTime.md) | Stores this campaign applies to with campaign start time in Utc | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 **OrdersBeforeReceivingVoucher** | **int?** | Number of orders customer needs to make, before receiving voucher | [optional] 
 **PercentDiscountAmount** | **int?** | Discount amount in percents | [optional] 
+**MaxDiscount** | **double?** | Maximum discount for percentage discounts | [optional] 
 **RoundingStrategy** | **int?** | Controls how the loyalty voucher&#39;s amount is rounded | [optional] 
 **ShouldIncludeOrdersWithLoyaltyVoucher** | **bool?** | Controls whether we should include orders with loyalty vouchers in the campaign calculation | [optional] 
 **VoucherValidPeriodDays** | **int?** | Number of days for which the voucher will be valid. | [optional] 
@@ -16,6 +18,8 @@ Name | Type | Description | Notes
 **IncludeExistingOrders** | **bool?** | Campaign will apply to existing orders | [optional] 
 **IsEnabled** | **bool?** | Is campaign enabled | [optional] 
 **StoreIds** | **List&lt;int?&gt;** | Ids of stores this campaign applies to | [optional] 
+**AppId** | **string** | The app that this campaign belongs to. | [optional] 
+**ForceDiscount** | **bool?** | Controls whether the voucher generated from this campaign will override discount exclusions | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LoyaltyCampaignBase.md b/docs/LoyaltyCampaignBase.md
index 77e4380b..f77beaed 100644
--- a/docs/LoyaltyCampaignBase.md
+++ b/docs/LoyaltyCampaignBase.md
@@ -1,10 +1,11 @@
-# IO.Swagger.Model.LoyaltyCampaignBase
+# Flipdish.Model.LoyaltyCampaignBase
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **OrdersBeforeReceivingVoucher** | **int?** | Number of orders customer needs to make, before receiving voucher | [optional] 
 **PercentDiscountAmount** | **int?** | Discount amount in percents | [optional] 
+**MaxDiscount** | **double?** | Maximum discount for percentage discounts | [optional] 
 **RoundingStrategy** | **int?** | Controls how the loyalty voucher&#39;s amount is rounded | [optional] 
 **ShouldIncludeOrdersWithLoyaltyVoucher** | **bool?** | Controls whether we should include orders with loyalty vouchers in the campaign calculation | [optional] 
 **VoucherValidPeriodDays** | **int?** | Number of days for which the voucher will be valid. | [optional] 
@@ -13,6 +14,8 @@ Name | Type | Description | Notes
 **IncludeExistingOrders** | **bool?** | Campaign will apply to existing orders | [optional] 
 **IsEnabled** | **bool?** | Is campaign enabled | [optional] 
 **StoreIds** | **List&lt;int?&gt;** | Ids of stores this campaign applies to | [optional] 
+**AppId** | **string** | The app that this campaign belongs to. | [optional] 
+**ForceDiscount** | **bool?** | Controls whether the voucher generated from this campaign will override discount exclusions | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LoyaltyCampaignCreatedEvent.md b/docs/LoyaltyCampaignCreatedEvent.md
index 44b2b60f..0191826f 100644
--- a/docs/LoyaltyCampaignCreatedEvent.md
+++ b/docs/LoyaltyCampaignCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LoyaltyCampaignCreatedEvent
+# Flipdish.Model.LoyaltyCampaignCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LoyaltyCampaignDeletedEvent.md b/docs/LoyaltyCampaignDeletedEvent.md
index 8b4c75be..a0555ddf 100644
--- a/docs/LoyaltyCampaignDeletedEvent.md
+++ b/docs/LoyaltyCampaignDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LoyaltyCampaignDeletedEvent
+# Flipdish.Model.LoyaltyCampaignDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LoyaltyCampaignUpdatedEvent.md b/docs/LoyaltyCampaignUpdatedEvent.md
index 0c3af897..0f327bea 100644
--- a/docs/LoyaltyCampaignUpdatedEvent.md
+++ b/docs/LoyaltyCampaignUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LoyaltyCampaignUpdatedEvent
+# Flipdish.Model.LoyaltyCampaignUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/LumpDiscountDetails.md b/docs/LumpDiscountDetails.md
index e26cf800..78e2d070 100644
--- a/docs/LumpDiscountDetails.md
+++ b/docs/LumpDiscountDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.LumpDiscountDetails
+# Flipdish.Model.LumpDiscountDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MappedLocation.md b/docs/MappedLocation.md
index e3ef987b..0c4d7aae 100644
--- a/docs/MappedLocation.md
+++ b/docs/MappedLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MappedLocation
+# Flipdish.Model.MappedLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MaskedPhoneNumber.md b/docs/MaskedPhoneNumber.md
index 22dc0039..efeb11cb 100644
--- a/docs/MaskedPhoneNumber.md
+++ b/docs/MaskedPhoneNumber.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MaskedPhoneNumber
+# Flipdish.Model.MaskedPhoneNumber
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Menu.md b/docs/Menu.md
index e2c80468..e4f03ec5 100644
--- a/docs/Menu.md
+++ b/docs/Menu.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Menu
+# Flipdish.Model.Menu
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,9 +12,11 @@ Name | Type | Description | Notes
 **Locked** | **bool?** | Locked: is menu locked against modifcation | [optional] 
 **MenuSections** | [**List&lt;MenuSection&gt;**](MenuSection.md) | Menu sections (startes, main etc) | [optional] 
 **TaxRates** | [**List&lt;MenuTaxRate&gt;**](MenuTaxRate.md) | Menu tax rates | [optional] 
+**AppId** | **string** | Identifier of App the menu is attached to | [optional] 
 **DisplaySectionLinks** | **bool?** | Display menu section link on UI | [optional] 
 **MenuSectionBehaviour** | **string** | Menu section behaviour | [optional] 
 **TaxType** | **string** | Tax type | [optional] 
+**IsIntegrated** | **bool?** | Flag to indicate if the menu is integrated (contains metadata) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuAsyncCreationCompletedEvent.md b/docs/MenuAsyncCreationCompletedEvent.md
new file mode 100644
index 00000000..0434dfef
--- /dev/null
+++ b/docs/MenuAsyncCreationCompletedEvent.md
@@ -0,0 +1,21 @@
+# Flipdish.Model.MenuAsyncCreationCompletedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
+**Description** | **string** | Description | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has created the menu | [optional] 
+**Menu** | [**Menu**](Menu.md) | The menu | [optional] 
+**Success** | **bool?** | Flag indicating if the menu creation was successful | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/MenuBase.md b/docs/MenuBase.md
index 2fa73cbe..7e18dde2 100644
--- a/docs/MenuBase.md
+++ b/docs/MenuBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuBase
+# Flipdish.Model.MenuBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **DisplaySectionLinks** | **bool?** | Display menu section link on UI | [optional] 
 **MenuSectionBehaviour** | **string** | Menu section behaviour | [optional] 
 **TaxType** | **string** | Tax type | [optional] 
+**IsIntegrated** | **bool?** | Flag to indicate if the menu is integrated (contains metadata) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuBulkEditEvent.md b/docs/MenuBulkEditEvent.md
index 67aa1f20..8f1ca5a1 100644
--- a/docs/MenuBulkEditEvent.md
+++ b/docs/MenuBulkEditEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuBulkEditEvent
+# Flipdish.Model.MenuBulkEditEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -15,7 +15,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuCatalogItem.md b/docs/MenuCatalogItem.md
index c2741b69..d4a119aa 100644
--- a/docs/MenuCatalogItem.md
+++ b/docs/MenuCatalogItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuCatalogItem
+# Flipdish.Model.MenuCatalogItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuCheckpoint.md b/docs/MenuCheckpoint.md
index 29593be8..24154d6e 100644
--- a/docs/MenuCheckpoint.md
+++ b/docs/MenuCheckpoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuCheckpoint
+# Flipdish.Model.MenuCheckpoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuCheckpointCreatedEvent.md b/docs/MenuCheckpointCreatedEvent.md
index 8b6dc3c2..126ebfb8 100644
--- a/docs/MenuCheckpointCreatedEvent.md
+++ b/docs/MenuCheckpointCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuCheckpointCreatedEvent
+# Flipdish.Model.MenuCheckpointCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuCreatedEvent.md b/docs/MenuCreatedEvent.md
index 50778210..748c1780 100644
--- a/docs/MenuCreatedEvent.md
+++ b/docs/MenuCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuCreatedEvent
+# Flipdish.Model.MenuCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuElementEditResponse.md b/docs/MenuElementEditResponse.md
index f660b72b..b8e231b0 100644
--- a/docs/MenuElementEditResponse.md
+++ b/docs/MenuElementEditResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuElementEditResponse
+# Flipdish.Model.MenuElementEditResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuElementHide.md b/docs/MenuElementHide.md
index 9021e0bb..c0bd0fa6 100644
--- a/docs/MenuElementHide.md
+++ b/docs/MenuElementHide.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuElementHide
+# Flipdish.Model.MenuElementHide
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuElementListItemResponse.md b/docs/MenuElementListItemResponse.md
index 0ed3ac59..b2cc7a1f 100644
--- a/docs/MenuElementListItemResponse.md
+++ b/docs/MenuElementListItemResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuElementListItemResponse
+# Flipdish.Model.MenuElementListItemResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuElementListResponse.md b/docs/MenuElementListResponse.md
index 04abb6f4..73fa0652 100644
--- a/docs/MenuElementListResponse.md
+++ b/docs/MenuElementListResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuElementListResponse
+# Flipdish.Model.MenuElementListResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuItemOptionSet.md b/docs/MenuItemOptionSet.md
index 2b316317..f851235c 100644
--- a/docs/MenuItemOptionSet.md
+++ b/docs/MenuItemOptionSet.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSet
+# Flipdish.Model.MenuItemOptionSet
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuItemOptionSetBase.md b/docs/MenuItemOptionSetBase.md
index c3148a00..6eac18dc 100644
--- a/docs/MenuItemOptionSetBase.md
+++ b/docs/MenuItemOptionSetBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSetBase
+# Flipdish.Model.MenuItemOptionSetBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **MinSelectCount** | **int?** | Minimum items must be selected | [optional] 
 **MaxSelectCount** | **int?** | Maximum number of items can be selected | [optional] 
 **CellLayoutType** | **string** | Small | Medium | Large  Affects the layout of the menu. | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuItemOptionSetCreatedEvent.md b/docs/MenuItemOptionSetCreatedEvent.md
index c74fab55..6defe365 100644
--- a/docs/MenuItemOptionSetCreatedEvent.md
+++ b/docs/MenuItemOptionSetCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSetCreatedEvent
+# Flipdish.Model.MenuItemOptionSetCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuItemOptionSetDeletedEvent.md b/docs/MenuItemOptionSetDeletedEvent.md
index 4bba3f23..fd1eb65e 100644
--- a/docs/MenuItemOptionSetDeletedEvent.md
+++ b/docs/MenuItemOptionSetDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSetDeletedEvent
+# Flipdish.Model.MenuItemOptionSetDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuItemOptionSetItem.md b/docs/MenuItemOptionSetItem.md
index 2c9c5450..423a799d 100644
--- a/docs/MenuItemOptionSetItem.md
+++ b/docs/MenuItemOptionSetItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSetItem
+# Flipdish.Model.MenuItemOptionSetItem
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,10 +9,11 @@ Name | Type | Description | Notes
 **NextMenuItemOptionSetId** | **int?** | if null, next option set is next. if -1, this is the final option set | [optional] 
 **CatalogItemId** | **string** | Catalog item Id when the OptionSet is associated to a Product | [optional] 
 **TaxRateName** | **string** | Tax rate name | [optional] 
-**TaxRateId** | **int?** |  | [optional] 
-**TaxValue** | **double?** |  | [optional] 
+**TaxRateId** | **int?** | TaxRateId. | [optional] 
+**TaxValue** | **double?** | TaxValue. | [optional] 
 **Name** | **string** | Name | [optional] 
 **Price** | **double?** | Price | [optional] 
+**DepositReturnFee** | **double?** | An optional fee that can be added to the price of the item. | [optional] 
 **IsAvailable** | **bool?** | Is available | [optional] 
 **DisplayOrder** | **int?** | Display order. Displayed in ascending order. | [optional] 
 **CellLayoutType** | **string** | Small | Medium | Large  Affects the layout of the menu. | [optional] 
diff --git a/docs/MenuItemOptionSetItemBase.md b/docs/MenuItemOptionSetItemBase.md
index c8099966..7bc286d4 100644
--- a/docs/MenuItemOptionSetItemBase.md
+++ b/docs/MenuItemOptionSetItemBase.md
@@ -1,14 +1,16 @@
-# IO.Swagger.Model.MenuItemOptionSetItemBase
+# Flipdish.Model.MenuItemOptionSetItemBase
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Name** | **string** | Name | [optional] 
 **Price** | **double?** | Price | [optional] 
+**DepositReturnFee** | **double?** | An optional fee that can be added to the price of the item. | [optional] 
 **IsAvailable** | **bool?** | Is available | [optional] 
 **DisplayOrder** | **int?** | Display order. Displayed in ascending order. | [optional] 
 **CellLayoutType** | **string** | Small | Medium | Large  Affects the layout of the menu. | [optional] 
 **ImageUrl** | **string** | Image url | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuItemOptionSetItemCreatedEvent.md b/docs/MenuItemOptionSetItemCreatedEvent.md
index 505c6351..64835978 100644
--- a/docs/MenuItemOptionSetItemCreatedEvent.md
+++ b/docs/MenuItemOptionSetItemCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSetItemCreatedEvent
+# Flipdish.Model.MenuItemOptionSetItemCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuItemOptionSetItemDeletedEvent.md b/docs/MenuItemOptionSetItemDeletedEvent.md
index 9c1c8452..1483e496 100644
--- a/docs/MenuItemOptionSetItemDeletedEvent.md
+++ b/docs/MenuItemOptionSetItemDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSetItemDeletedEvent
+# Flipdish.Model.MenuItemOptionSetItemDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuItemOptionSetItemUpdatedEvent.md b/docs/MenuItemOptionSetItemUpdatedEvent.md
index 7a99bdaa..f7e3cf91 100644
--- a/docs/MenuItemOptionSetItemUpdatedEvent.md
+++ b/docs/MenuItemOptionSetItemUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSetItemUpdatedEvent
+# Flipdish.Model.MenuItemOptionSetItemUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuItemOptionSetUpdatedEvent.md b/docs/MenuItemOptionSetUpdatedEvent.md
index b9f8ed1a..74ae770f 100644
--- a/docs/MenuItemOptionSetUpdatedEvent.md
+++ b/docs/MenuItemOptionSetUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuItemOptionSetUpdatedEvent
+# Flipdish.Model.MenuItemOptionSetUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuNutritionInfoHeader.md b/docs/MenuNutritionInfoHeader.md
new file mode 100644
index 00000000..6bae6cce
--- /dev/null
+++ b/docs/MenuNutritionInfoHeader.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.MenuNutritionInfoHeader
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**MenuId** | **int?** | Menu Id | [optional] 
+**NutritionInfoVersionGuid** | **Guid?** | Nutrition information version guid (generated every time the nutrition information is updated) | [optional] 
+**AbsoluteUrl** | **string** | Absolute URL of the nutrition information json file | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/MenuObjectDisplayOrders.md b/docs/MenuObjectDisplayOrders.md
index 3f05abdf..f986f50a 100644
--- a/docs/MenuObjectDisplayOrders.md
+++ b/docs/MenuObjectDisplayOrders.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuObjectDisplayOrders
+# Flipdish.Model.MenuObjectDisplayOrders
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuOptionSetItemsApi.md b/docs/MenuOptionSetItemsApi.md
index bc9a93ca..8297efda 100644
--- a/docs/MenuOptionSetItemsApi.md
+++ b/docs/MenuOptionSetItemsApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.MenuOptionSetItemsApi
+# Flipdish.Api.MenuOptionSetItemsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -9,7 +9,7 @@ Method | HTTP request | Description
 [**GetMenuItemOptionSetItemById**](MenuOptionSetItemsApi.md#getmenuitemoptionsetitembyid) | **GET** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId} | Get menu item option set item by identifier
 [**GetMenuItemOptionSetItems**](MenuOptionSetItemsApi.md#getmenuitemoptionsetitems) | **GET** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems | Get menu item option set items
 [**RemoveMenuItemOptionSetItem**](MenuOptionSetItemsApi.md#removemenuitemoptionsetitem) | **DELETE** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId} | Delete menu item option set item
-[**SetOptionSetItemTax**](MenuOptionSetItemsApi.md#setoptionsetitemtax) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/taxrate/{taxRateId} | [Private API] Set Tax Rate on OptionSetItem
+[**SetOptionSetItemTax**](MenuOptionSetItemsApi.md#setoptionsetitemtax) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/taxrate/{taxRateId} | Set Tax Rate on OptionSetItem
 [**UpdateMenuItemOptionSetItem**](MenuOptionSetItemsApi.md#updatemenuitemoptionsetitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId} | Update menu item option set item
 [**UploadOptionSetItemImage**](MenuOptionSetItemsApi.md#uploadoptionsetitemimage) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image | Upload menu item option set item image
 
@@ -24,9 +24,9 @@ Create menu item option set item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -94,9 +94,9 @@ Delete menu item option set item image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -163,9 +163,9 @@ Get menu item option set item by identifier
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -233,9 +233,9 @@ Get menu item option set items
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -301,9 +301,9 @@ Delete menu item option set item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -364,15 +364,15 @@ void (empty response body)
 # **SetOptionSetItemTax**
 > void SetOptionSetItemTax (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, int? taxRateId)
 
-[Private API] Set Tax Rate on OptionSetItem
+Set Tax Rate on OptionSetItem
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -393,7 +393,7 @@ namespace Example
 
             try
             {
-                // [Private API] Set Tax Rate on OptionSetItem
+                // Set Tax Rate on OptionSetItem
                 apiInstance.SetOptionSetItemTax(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSetItemId, taxRateId);
             }
             catch (Exception e)
@@ -441,9 +441,9 @@ Update menu item option set item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -461,7 +461,7 @@ namespace Example
             var optionSetId = 56;  // int? | Option set identifier
             var menuItemOptionSetItemId = 56;  // int? | Option set item identifier
             var menuItemOptionSetItem = new MenuItemOptionSetItemBase(); // MenuItemOptionSetItemBase | Option set item (delta)
-            var undoAfter = 1.2;  // double? | An optional time period, in hours, after which the hide-section operaton will be undone. (optional) 
+            var undoAfter = 1.2;  // double? | An optional time period, in hours, after which the hide-section operation will be undone. (optional) 
 
             try
             {
@@ -487,7 +487,7 @@ Name | Type | Description  | Notes
  **optionSetId** | **int?**| Option set identifier | 
  **menuItemOptionSetItemId** | **int?**| Option set item identifier | 
  **menuItemOptionSetItem** | [**MenuItemOptionSetItemBase**](MenuItemOptionSetItemBase.md)| Option set item (delta) | 
- **undoAfter** | **double?**| An optional time period, in hours, after which the hide-section operaton will be undone. | [optional] 
+ **undoAfter** | **double?**| An optional time period, in hours, after which the hide-section operation will be undone. | [optional] 
 
 ### Return type
 
@@ -514,9 +514,9 @@ Upload menu item option set item image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/MenuOptionSetsApi.md b/docs/MenuOptionSetsApi.md
index c061d080..737b711e 100644
--- a/docs/MenuOptionSetsApi.md
+++ b/docs/MenuOptionSetsApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.MenuOptionSetsApi
+# Flipdish.Api.MenuOptionSetsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -23,9 +23,9 @@ Create menu item option set
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -91,9 +91,9 @@ Delete menu item option set
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -158,9 +158,9 @@ Delete option set image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -225,9 +225,9 @@ Get menu item option set by identifier
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -293,9 +293,9 @@ Get menu item option sets
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -359,9 +359,9 @@ Update menu item option set
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -428,9 +428,9 @@ Upload menu item option set image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/MenuSection.md b/docs/MenuSection.md
index 16b7076d..48d1ea73 100644
--- a/docs/MenuSection.md
+++ b/docs/MenuSection.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSection
+# Flipdish.Model.MenuSection
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuSectionAvailability.md b/docs/MenuSectionAvailability.md
index 0f53d4e7..15f41adb 100644
--- a/docs/MenuSectionAvailability.md
+++ b/docs/MenuSectionAvailability.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionAvailability
+# Flipdish.Model.MenuSectionAvailability
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuSectionAvailabilityBase.md b/docs/MenuSectionAvailabilityBase.md
index ce6123fc..9ade1f17 100644
--- a/docs/MenuSectionAvailabilityBase.md
+++ b/docs/MenuSectionAvailabilityBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionAvailabilityBase
+# Flipdish.Model.MenuSectionAvailabilityBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuSectionBase.md b/docs/MenuSectionBase.md
index 330bf413..63391483 100644
--- a/docs/MenuSectionBase.md
+++ b/docs/MenuSectionBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionBase
+# Flipdish.Model.MenuSectionBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 **IsHiddenFromCustomers** | **bool?** | Is hidden from customer. Perhaps when the item is out of stock. | [optional] 
 **ImageUrl** | **string** | Image url | [optional] 
 **MenuSectionId** | **int?** | Menu Section Id | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionCreatedEvent.md b/docs/MenuSectionCreatedEvent.md
index 5fc32b04..4bbbf29d 100644
--- a/docs/MenuSectionCreatedEvent.md
+++ b/docs/MenuSectionCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionCreatedEvent
+# Flipdish.Model.MenuSectionCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionDeletedEvent.md b/docs/MenuSectionDeletedEvent.md
index 1a87c770..a72b5c15 100644
--- a/docs/MenuSectionDeletedEvent.md
+++ b/docs/MenuSectionDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionDeletedEvent
+# Flipdish.Model.MenuSectionDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionItem.md b/docs/MenuSectionItem.md
index 41abf99f..c24a3afe 100644
--- a/docs/MenuSectionItem.md
+++ b/docs/MenuSectionItem.md
@@ -1,9 +1,8 @@
-# IO.Swagger.Model.MenuSectionItem
+# Flipdish.Model.MenuSectionItem
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MenuItemId** | **int?** | Menu item identifier. This ID may change at any time. Use &#x60;PublicId&#x60; if you need a permanent reference to the item. | [optional] 
 **ActualPrice** | **double?** | Actual price - the minimum price possible when all required option set items prices are included. | [optional] 
 **MenuItemOptionSets** | [**List&lt;MenuItemOptionSet&gt;**](MenuItemOptionSet.md) | Menu item option sets | [optional] 
 **DailySpecialHours** | [**List&lt;BusinessHoursPeriod&gt;**](BusinessHoursPeriod.md) | Daily special hours | [optional] 
@@ -11,12 +10,14 @@ Name | Type | Description | Notes
 **TaxRateName** | **string** | Tax rate name | [optional] 
 **TaxRateId** | **int?** | TaxRate | [optional] 
 **TaxValue** | **double?** | TaxValue - the tax associated with this item, based on TaxRate / TaxType and Currency (currency determines decimal point precision) | [optional] 
+**ExcludeFromVoucherDiscounting** | **bool?** | If true, the item is excluded from voucher discount calculations | [optional] 
 **Metadata** | [**List&lt;CreateMetadata&gt;**](CreateMetadata.md) | List of metadata | [optional] 
 **CatalogItemId** | **string** | Catalog item Id when the Item is associated to a Product | [optional] 
 **Name** | **string** | Menu item name (like \&quot;Korma\&quot;) | [optional] 
 **Description** | **string** | Description (like \&quot;A lovely dish from the east\&quot;) | [optional] 
 **SpicinessRating** | **string** | Spiciness rating | [optional] 
 **Price** | **double?** | Price - this is only used when there is no master option set and should be set to 0 if a master option set exists. | [optional] 
+**DepositReturnFee** | **double?** | An optional fee that can be added to the price of the item. | [optional] 
 **DisplayOrder** | **int?** | Display order | [optional] 
 **Alcohol** | **bool?** | To be set true if the item or an option of the item contains an alcoholic drink. | [optional] 
 **IsAvailable** | **bool?** | True if we accept orders for this item still | [optional] 
@@ -24,6 +25,7 @@ Name | Type | Description | Notes
 **DisableVouchers** | **bool?** | If true, then vouchers won&#39;t be applied for this item | [optional] 
 **ImageName** | **string** | Image url | [optional] 
 **ImageUrl** | **string** | Image url | [optional] 
+**MenuItemId** | **int?** | Menu Item Id | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionItemBase.md b/docs/MenuSectionItemBase.md
index 7f7c93b3..592ea0c5 100644
--- a/docs/MenuSectionItemBase.md
+++ b/docs/MenuSectionItemBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionItemBase
+# Flipdish.Model.MenuSectionItemBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **Description** | **string** | Description (like \&quot;A lovely dish from the east\&quot;) | [optional] 
 **SpicinessRating** | **string** | Spiciness rating | [optional] 
 **Price** | **double?** | Price - this is only used when there is no master option set and should be set to 0 if a master option set exists. | [optional] 
+**DepositReturnFee** | **double?** | An optional fee that can be added to the price of the item. | [optional] 
 **DisplayOrder** | **int?** | Display order | [optional] 
 **Alcohol** | **bool?** | To be set true if the item or an option of the item contains an alcoholic drink. | [optional] 
 **IsAvailable** | **bool?** | True if we accept orders for this item still | [optional] 
@@ -15,6 +16,8 @@ Name | Type | Description | Notes
 **ImageName** | **string** | Image url | [optional] 
 **ImageUrl** | **string** | Image url | [optional] 
 **MenuItemId** | **int?** | Menu Item Id | [optional] 
+**ExcludeFromVoucherDiscounting** | **bool?** | If true, the item is excluded from voucher discount calculations | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionItemCreatedEvent.md b/docs/MenuSectionItemCreatedEvent.md
index 94c05448..29192710 100644
--- a/docs/MenuSectionItemCreatedEvent.md
+++ b/docs/MenuSectionItemCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionItemCreatedEvent
+# Flipdish.Model.MenuSectionItemCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionItemDeletedEvent.md b/docs/MenuSectionItemDeletedEvent.md
index 1a756a1d..f7dea7d8 100644
--- a/docs/MenuSectionItemDeletedEvent.md
+++ b/docs/MenuSectionItemDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionItemDeletedEvent
+# Flipdish.Model.MenuSectionItemDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionItemUpdatedEvent.md b/docs/MenuSectionItemUpdatedEvent.md
index 9bb3b1f2..b928535e 100644
--- a/docs/MenuSectionItemUpdatedEvent.md
+++ b/docs/MenuSectionItemUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionItemUpdatedEvent
+# Flipdish.Model.MenuSectionItemUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionItemsApi.md b/docs/MenuSectionItemsApi.md
index 296e2aa4..8bf881f1 100644
--- a/docs/MenuSectionItemsApi.md
+++ b/docs/MenuSectionItemsApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.MenuSectionItemsApi
+# Flipdish.Api.MenuSectionItemsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -11,8 +11,8 @@ Method | HTTP request | Description
 [**DeleteMenuSectionItemImage**](MenuSectionItemsApi.md#deletemenusectionitemimage) | **DELETE** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image | Delete menu section item image
 [**GetMenuItemById**](MenuSectionItemsApi.md#getmenuitembyid) | **GET** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId} | Get menu item by identifier
 [**GetMenuItems**](MenuSectionItemsApi.md#getmenuitems) | **GET** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems | Get menu items
-[**MoveMenuItem**](MenuSectionItemsApi.md#movemenuitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/setorder/{destinationDisplayOrder} | [PRIVATE API]Move an Item within a menu
-[**SetSectionItemTax**](MenuSectionItemsApi.md#setsectionitemtax) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/taxrate/{taxRateId} | [PRIVATE API]Move an Item within a menu
+[**MoveMenuItem**](MenuSectionItemsApi.md#movemenuitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/setorder/{destinationDisplayOrder} | Move an Item within a menu
+[**SetSectionItemTax**](MenuSectionItemsApi.md#setsectionitemtax) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/taxrate/{taxRateId} | Set tax rate for menu item
 [**UpdateMenuSectionItem**](MenuSectionItemsApi.md#updatemenusectionitem) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId} | Update menu section item
 [**UploadMenuSectionItemImage**](MenuSectionItemsApi.md#uploadmenusectionitemimage) | **POST** /api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image | Upload menu section item image
 
@@ -27,9 +27,9 @@ Clone menu section item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -93,9 +93,9 @@ Create menu section item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -161,9 +161,9 @@ BETA - this endpoint is under development, do not use it in your production syst
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -227,9 +227,9 @@ Delete menu section item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -292,9 +292,9 @@ Delete menu section item image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -357,9 +357,9 @@ Get menu item by identifier
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -423,9 +423,9 @@ Get menu items
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -481,15 +481,15 @@ Name | Type | Description  | Notes
 # **MoveMenuItem**
 > void MoveMenuItem (int? menuId, int? menuSectionId, int? menuSectionItemId, int? destinationDisplayOrder)
 
-[PRIVATE API]Move an Item within a menu
+Move an Item within a menu
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -508,7 +508,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Move an Item within a menu
+                // Move an Item within a menu
                 apiInstance.MoveMenuItem(menuId, menuSectionId, menuSectionItemId, destinationDisplayOrder);
             }
             catch (Exception e)
@@ -548,15 +548,15 @@ void (empty response body)
 # **SetSectionItemTax**
 > void SetSectionItemTax (int? menuId, int? menuSectionId, int? menuSectionItemId, int? taxRateId)
 
-[PRIVATE API]Move an Item within a menu
+Set tax rate for menu item
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -575,7 +575,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Move an Item within a menu
+                // Set tax rate for menu item
                 apiInstance.SetSectionItemTax(menuId, menuSectionId, menuSectionItemId, taxRateId);
             }
             catch (Exception e)
@@ -621,9 +621,9 @@ Update menu section item
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -639,7 +639,7 @@ namespace Example
             var menuSectionId = 56;  // int? | Menu section identifier
             var menuSectionItemId = 56;  // int? | Menu section item identifier
             var menuSectionItem = new MenuSectionItemBase(); // MenuSectionItemBase | Menu section item (delta)
-            var undoAfter = 1.2;  // double? | An optional time period, in hours, after which the hide-section operaton will be undone. (optional) 
+            var undoAfter = 1.2;  // double? | An optional time period, in hours, after which the hide-section operation will be undone (optional) 
 
             try
             {
@@ -663,7 +663,7 @@ Name | Type | Description  | Notes
  **menuSectionId** | **int?**| Menu section identifier | 
  **menuSectionItemId** | **int?**| Menu section item identifier | 
  **menuSectionItem** | [**MenuSectionItemBase**](MenuSectionItemBase.md)| Menu section item (delta) | 
- **undoAfter** | **double?**| An optional time period, in hours, after which the hide-section operaton will be undone. | [optional] 
+ **undoAfter** | **double?**| An optional time period, in hours, after which the hide-section operation will be undone | [optional] 
 
 ### Return type
 
@@ -690,9 +690,9 @@ Upload menu section item image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/MenuSectionUpdatedEvent.md b/docs/MenuSectionUpdatedEvent.md
index 68841389..c71c4a4b 100644
--- a/docs/MenuSectionUpdatedEvent.md
+++ b/docs/MenuSectionUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSectionUpdatedEvent
+# Flipdish.Model.MenuSectionUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuSectionsApi.md b/docs/MenuSectionsApi.md
index 306af597..15688c42 100644
--- a/docs/MenuSectionsApi.md
+++ b/docs/MenuSectionsApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.MenuSectionsApi
+# Flipdish.Api.MenuSectionsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -27,9 +27,9 @@ Clone menu section
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -91,9 +91,9 @@ Set/update menu section availability hours.
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -159,9 +159,9 @@ Create menu section
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -223,9 +223,9 @@ Create menu availability type
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -289,9 +289,9 @@ Delete menu section
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -352,9 +352,9 @@ Delete menu section image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -415,9 +415,9 @@ Get menu section by identifier
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -479,9 +479,9 @@ Get menu sections
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -541,9 +541,9 @@ Re-arrange Items within a Section
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -606,9 +606,9 @@ Update menu section
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -673,9 +673,9 @@ Upload menu section image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/MenuStoreNames.md b/docs/MenuStoreNames.md
index ac27c5da..9aaba002 100644
--- a/docs/MenuStoreNames.md
+++ b/docs/MenuStoreNames.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuStoreNames
+# Flipdish.Model.MenuStoreNames
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuSummary.md b/docs/MenuSummary.md
index dbdb885d..95869403 100644
--- a/docs/MenuSummary.md
+++ b/docs/MenuSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuSummary
+# Flipdish.Model.MenuSummary
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,9 +6,11 @@ Name | Type | Description | Notes
 **MenuId** | **int?** | Menu identifier | [optional] 
 **ModifiedTime** | **DateTime?** | Last modified time | [optional] 
 **VersionNumber** | **int?** | Menu version | [optional] 
+**MenuUrl** | **string** | Menu Url | [optional] 
 **Name** | **string** | Name of Menu, only shown in portal | [optional] 
 **Locked** | **bool?** | Locked: is menu locked against modifcation | [optional] 
 **StoreNames** | **List&lt;string&gt;** | List of stores names which are associated with this menu | [optional] 
+**IsIntegrated** | **bool?** | Flag to indicate if the menu is integrated (contains metadata) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuTaxDetails.md b/docs/MenuTaxDetails.md
index 6bde3530..cbae2be7 100644
--- a/docs/MenuTaxDetails.md
+++ b/docs/MenuTaxDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuTaxDetails
+# Flipdish.Model.MenuTaxDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuTaxRate.md b/docs/MenuTaxRate.md
index 311c8bb5..4ee3ecd3 100644
--- a/docs/MenuTaxRate.md
+++ b/docs/MenuTaxRate.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuTaxRate
+# Flipdish.Model.MenuTaxRate
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MenuUpdatedEvent.md b/docs/MenuUpdatedEvent.md
index efacfcb1..933681ab 100644
--- a/docs/MenuUpdatedEvent.md
+++ b/docs/MenuUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuUpdatedEvent
+# Flipdish.Model.MenuUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuUploadedEvent.md b/docs/MenuUploadedEvent.md
index d94c8c06..8c8a150d 100644
--- a/docs/MenuUploadedEvent.md
+++ b/docs/MenuUploadedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MenuUploadedEvent
+# Flipdish.Model.MenuUploadedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/MenuZone.md b/docs/MenuZone.md
new file mode 100644
index 00000000..bbbbff93
--- /dev/null
+++ b/docs/MenuZone.md
@@ -0,0 +1,15 @@
+# Flipdish.Model.MenuZone
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**MenuZoneId** | **int?** | MenuZoneId. | [optional] 
+**MenuId** | **int?** | MenuId. | [optional] 
+**Name** | **string** | Name. | [optional] 
+**Description** | **string** | Description. | [optional] 
+**ImageName** | **string** | ImageName. | [optional] 
+**DisplayOrder** | **int?** | DisplayOrder. | [optional] 
+**ImageUrl** | **string** | ImageUrl. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/MenuZonesApi.md b/docs/MenuZonesApi.md
new file mode 100644
index 00000000..61a7b46b
--- /dev/null
+++ b/docs/MenuZonesApi.md
@@ -0,0 +1,725 @@
+# Flipdish.Api.MenuZonesApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**AddMenuZone**](MenuZonesApi.md#addmenuzone) | **POST** /api/v1.0/menus/{menuId}/zones | Adds a new menu zone to a menu.
+[**DeleteMenuZone**](MenuZonesApi.md#deletemenuzone) | **DELETE** /api/v1.0/menus/{menuId}/zones/{menuZoneId} | Deletes a menu zone.
+[**DeleteMenuZoneImage**](MenuZonesApi.md#deletemenuzoneimage) | **DELETE** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/image | Deletes a menu zone image.
+[**FlipMenuZones**](MenuZonesApi.md#flipmenuzones) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/flip/{menuZoneI2} | Flips the order of two menu zones.
+[**GetMenuZone**](MenuZonesApi.md#getmenuzone) | **GET** /api/v1.0/menus/{menuId}/zones/{menuZoneId} | Gets a specific menu zone for a given zone id
+[**GetMenuZonesForMenuId**](MenuZonesApi.md#getmenuzonesformenuid) | **GET** /api/v1.0/menus/{menuId}/zones | Gets all the menu zones for a menu
+[**SetMenuSectionMenuZone**](MenuZonesApi.md#setmenusectionmenuzone) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/section/{menuSectionId} | Assigns a zone to a menu section.
+[**SetMenuZoneDescription**](MenuZonesApi.md#setmenuzonedescription) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/description | Sets the description of a menu zone.
+[**SetMenuZoneName**](MenuZonesApi.md#setmenuzonename) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/name/{menuZoneName} | Sets the name of a menu zone.
+[**UpdateMenuZone**](MenuZonesApi.md#updatemenuzone) | **PUT** /api/v1.0/menus/{menuId}/zones/{menuZoneId} | Updates a menu zone.
+[**UploadMenuZoneImage**](MenuZonesApi.md#uploadmenuzoneimage) | **POST** /api/v1.0/menus/{menuId}/zones/{menuZoneId}/image | Uploads an image for a menu zone.
+
+
+<a name="addmenuzone"></a>
+# **AddMenuZone**
+> RestApiResultMenuZone AddMenuZone (int? menuId, MenuZone menuZone)
+
+Adds a new menu zone to a menu.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddMenuZoneExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | The menu id.
+            var menuZone = new MenuZone(); // MenuZone | The object containing the new zone. This is optional and not supplying it will generate an empty default zone.
+
+            try
+            {
+                // Adds a new menu zone to a menu.
+                RestApiResultMenuZone result = apiInstance.AddMenuZone(menuId, menuZone);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.AddMenuZone: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| The menu id. | 
+ **menuZone** | [**MenuZone**](MenuZone.md)| The object containing the new zone. This is optional and not supplying it will generate an empty default zone. | 
+
+### Return type
+
+[**RestApiResultMenuZone**](RestApiResultMenuZone.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="deletemenuzone"></a>
+# **DeleteMenuZone**
+> void DeleteMenuZone (int? menuId, int? menuZoneId)
+
+Deletes a menu zone.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class DeleteMenuZoneExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | Menu id.
+            var menuZoneId = 56;  // int? | The menu zone id.
+
+            try
+            {
+                // Deletes a menu zone.
+                apiInstance.DeleteMenuZone(menuId, menuZoneId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.DeleteMenuZone: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu id. | 
+ **menuZoneId** | **int?**| The menu zone id. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="deletemenuzoneimage"></a>
+# **DeleteMenuZoneImage**
+> void DeleteMenuZoneImage (int? menuId, int? menuZoneId)
+
+Deletes a menu zone image.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class DeleteMenuZoneImageExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | Menu id.
+            var menuZoneId = 56;  // int? | The zone Id/
+
+            try
+            {
+                // Deletes a menu zone image.
+                apiInstance.DeleteMenuZoneImage(menuId, menuZoneId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.DeleteMenuZoneImage: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu id. | 
+ **menuZoneId** | **int?**| The zone Id/ | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="flipmenuzones"></a>
+# **FlipMenuZones**
+> void FlipMenuZones (int? menuId, int? menuZoneId, int? menuZoneI2)
+
+Flips the order of two menu zones.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class FlipMenuZonesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | 
+            var menuZoneId = 56;  // int? | Source.
+            var menuZoneI2 = 56;  // int? | Destination.
+
+            try
+            {
+                // Flips the order of two menu zones.
+                apiInstance.FlipMenuZones(menuId, menuZoneId, menuZoneI2);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.FlipMenuZones: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**|  | 
+ **menuZoneId** | **int?**| Source. | 
+ **menuZoneI2** | **int?**| Destination. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getmenuzone"></a>
+# **GetMenuZone**
+> RestApiResultMenuZone GetMenuZone (int? menuId, int? menuZoneId)
+
+Gets a specific menu zone for a given zone id
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetMenuZoneExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | The menu id.
+            var menuZoneId = 56;  // int? | The menu zone id.
+
+            try
+            {
+                // Gets a specific menu zone for a given zone id
+                RestApiResultMenuZone result = apiInstance.GetMenuZone(menuId, menuZoneId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.GetMenuZone: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| The menu id. | 
+ **menuZoneId** | **int?**| The menu zone id. | 
+
+### Return type
+
+[**RestApiResultMenuZone**](RestApiResultMenuZone.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getmenuzonesformenuid"></a>
+# **GetMenuZonesForMenuId**
+> RestApiArrayResultMenuZone GetMenuZonesForMenuId (int? menuId)
+
+Gets all the menu zones for a menu
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetMenuZonesForMenuIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | The menu id to load zones for
+
+            try
+            {
+                // Gets all the menu zones for a menu
+                RestApiArrayResultMenuZone result = apiInstance.GetMenuZonesForMenuId(menuId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.GetMenuZonesForMenuId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| The menu id to load zones for | 
+
+### Return type
+
+[**RestApiArrayResultMenuZone**](RestApiArrayResultMenuZone.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setmenusectionmenuzone"></a>
+# **SetMenuSectionMenuZone**
+> void SetMenuSectionMenuZone (int? menuId, int? menuZoneId, int? menuSectionId)
+
+Assigns a zone to a menu section.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetMenuSectionMenuZoneExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | Menu id.
+            var menuZoneId = 56;  // int? | The menu id.
+            var menuSectionId = 56;  // int? | The menu section id.
+
+            try
+            {
+                // Assigns a zone to a menu section.
+                apiInstance.SetMenuSectionMenuZone(menuId, menuZoneId, menuSectionId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.SetMenuSectionMenuZone: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu id. | 
+ **menuZoneId** | **int?**| The menu id. | 
+ **menuSectionId** | **int?**| The menu section id. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setmenuzonedescription"></a>
+# **SetMenuZoneDescription**
+> void SetMenuZoneDescription (int? menuId, int? menuZoneId, string description)
+
+Sets the description of a menu zone.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetMenuZoneDescriptionExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | Menu id.
+            var menuZoneId = 56;  // int? | The zone id.
+            var description = description_example;  // string | The new description. Add as a raw string in the request, without any JSON wrapper.
+
+            try
+            {
+                // Sets the description of a menu zone.
+                apiInstance.SetMenuZoneDescription(menuId, menuZoneId, description);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.SetMenuZoneDescription: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu id. | 
+ **menuZoneId** | **int?**| The zone id. | 
+ **description** | **string**| The new description. Add as a raw string in the request, without any JSON wrapper. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setmenuzonename"></a>
+# **SetMenuZoneName**
+> void SetMenuZoneName (int? menuId, int? menuZoneId, string menuZoneName)
+
+Sets the name of a menu zone.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetMenuZoneNameExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | Menu id.
+            var menuZoneId = 56;  // int? | The menu zone id.
+            var menuZoneName = menuZoneName_example;  // string | The new name.
+
+            try
+            {
+                // Sets the name of a menu zone.
+                apiInstance.SetMenuZoneName(menuId, menuZoneId, menuZoneName);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.SetMenuZoneName: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu id. | 
+ **menuZoneId** | **int?**| The menu zone id. | 
+ **menuZoneName** | **string**| The new name. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="updatemenuzone"></a>
+# **UpdateMenuZone**
+> void UpdateMenuZone (int? menuId, int? menuZoneId, MenuZone menuZone)
+
+Updates a menu zone.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UpdateMenuZoneExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | The menu id.
+            var menuZoneId = 56;  // int? | The menu zone id.
+            var menuZone = new MenuZone(); // MenuZone | The object containing the updated values.
+
+            try
+            {
+                // Updates a menu zone.
+                apiInstance.UpdateMenuZone(menuId, menuZoneId, menuZone);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.UpdateMenuZone: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| The menu id. | 
+ **menuZoneId** | **int?**| The menu zone id. | 
+ **menuZone** | [**MenuZone**](MenuZone.md)| The object containing the updated values. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="uploadmenuzoneimage"></a>
+# **UploadMenuZoneImage**
+> void UploadMenuZoneImage (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file)
+
+Uploads an image for a menu zone.
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UploadMenuZoneImageExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenuZonesApi();
+            var menuId = 56;  // int? | Menu id.
+            var menuZoneId = 56;  // int? | The zone id.
+            var _file = new List<HttpPostedFileBase>(); // List<HttpPostedFileBase> | The file to upload.
+
+            try
+            {
+                // Uploads an image for a menu zone.
+                apiInstance.UploadMenuZoneImage(menuId, menuZoneId, _file);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenuZonesApi.UploadMenuZoneImage: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu id. | 
+ **menuZoneId** | **int?**| The zone id. | 
+ **_file** | [**List&lt;HttpPostedFileBase&gt;**](HttpPostedFileBase.md)| The file to upload. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/MenusApi.md b/docs/MenusApi.md
index 616d7733..a25b0ee9 100644
--- a/docs/MenusApi.md
+++ b/docs/MenusApi.md
@@ -1,12 +1,13 @@
-# IO.Swagger.Api.MenusApi
+# Flipdish.Api.MenusApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateDraftMenuFromExistingMenu**](MenusApi.md#createdraftmenufromexistingmenu) | **POST** /api/v1.0/menus/{menuId}/clone/{newName} | [PRIVATE API]Clone a menu, (without attaching stores)
-[**CreateNewMenuForApp**](MenusApi.md#createnewmenuforapp) | **POST** /api/v1.0/{appId}/menus | Create a new menu. If request body is empty, the system will create a menu with default items.
-[**DeleteMenu**](MenusApi.md#deletemenu) | **DELETE** /api/v1.0/menus/{menuId} | [PRIVATE API]Mark a Menu as Deleted
+[**CreateDraftMenuFromExistingMenu**](MenusApi.md#createdraftmenufromexistingmenu) | **POST** /api/v1.0/menus/{menuId}/clone/{newName} | Clone a menu, (without attaching stores)
+[**CreateNewMenuAsync**](MenusApi.md#createnewmenuasync) | **POST** /api/v1.0/{appId}/menus/async | Create a new menu asynchronously
+[**CreateNewMenuForApp**](MenusApi.md#createnewmenuforapp) | **POST** /api/v1.0/{appId}/menus | Create a new menu
+[**DeleteMenu**](MenusApi.md#deletemenu) | **DELETE** /api/v1.0/menus/{menuId} | Mark a Menu as Deleted
 [**DeleteMenuImage**](MenusApi.md#deletemenuimage) | **DELETE** /api/v1.0/menus/{menuId}/image | Delete menu image
 [**DeleteMenuItemMetadata**](MenusApi.md#deletemenuitemmetadata) | **DELETE** /api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId} | Delete menu item metadata
 [**GetAllMenuMetadataByMenuIdAndStoreId**](MenusApi.md#getallmenumetadatabymenuidandstoreid) | **GET** /api/v1.0/menus/{menuId}/metadata/store/{storeId} | Get all menu metadata by menu ID and store ID
@@ -14,23 +15,23 @@ Method | HTTP request | Description
 [**GetMenuItemMetadata**](MenusApi.md#getmenuitemmetadata) | **GET** /api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId} | Get menu item metadata
 [**GetMenuItemMetadataByKey**](MenusApi.md#getmenuitemmetadatabykey) | **GET** /api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId} | Get menu item metadata by key
 [**GetMenuItemOptionSetItemMetadata**](MenusApi.md#getmenuitemoptionsetitemmetadata) | **GET** /api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId} | Get menu item option set item metadata by key
-[**GetMenuName**](MenusApi.md#getmenuname) | **GET** /api/v1.0/menus/{menuId}/name | [PRIVATE API]Get Menus Name
-[**GetMenuStoreNames**](MenusApi.md#getmenustorenames) | **GET** /api/v1.0/menus/{menuId}/stores | [PRIVATE API]Get menus store names
-[**GetMenuTaxDetails**](MenusApi.md#getmenutaxdetails) | **GET** /api/v1.0/menus/{menuId}/tax | [PRIVATE API]Get menus tax details
-[**GetMenusByAppId**](MenusApi.md#getmenusbyappid) | **GET** /api/v1.0/{appId}/menus | [PRIVATE API]Get menus by appId
-[**GetMenusCheckpoints**](MenusApi.md#getmenuscheckpoints) | **GET** /api/v1.0/menus/{menuId}/checkpoints | [PRIVATE API]Get a Menus Checkpoints
-[**MenusDeleteTaxRate**](MenusApi.md#menusdeletetaxrate) | **DELETE** /api/v1.0/menus/{menuId}/tax/{taxId} | [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
-[**MenusGetMenuBulkShowHide**](MenusApi.md#menusgetmenubulkshowhide) | **GET** /api/v1.0/menus/{menuId}/bulkshowhide/list | 
-[**MenusSetDisplayOnMenuTax**](MenusApi.md#menussetdisplayonmenutax) | **POST** /api/v1.0/menus/{menuId}/tax/show/{show} | [PRIVATE API]Set if tax shows for a Menu
-[**MenusSetItemDisplayOrders**](MenusApi.md#menussetitemdisplayorders) | **POST** /api/v1.0/menus/{menuId}/sectiondisplayorders | [PRIVATE API]Re-arrange Sections within a Menu
-[**MenusShowHideBulkItems**](MenusApi.md#menusshowhidebulkitems) | **POST** /api/v1.0/menus/{menuId}/bulkshowhide | 
-[**MenusUpdateTaxType**](MenusApi.md#menusupdatetaxtype) | **POST** /api/v1.0/menus/{menuId}/tax/type/{type} | [PRIVATE API]Set the type of Tax on a Menu
-[**MenusUpsertTaxRate**](MenusApi.md#menusupserttaxrate) | **POST** /api/v1.0/menus/{menuId}/taxrate | [PRIVATE API]Add/Update a Tax Rate
-[**RestoreAMenuCheckpoint**](MenusApi.md#restoreamenucheckpoint) | **POST** /api/v1.0/menus/{menuId}/checkpoints/{checkpointId}/restore | [PRIVATE API]Restore a Menu to a checkpoint
+[**GetMenuName**](MenusApi.md#getmenuname) | **GET** /api/v1.0/menus/{menuId}/name | Get Menus Name
+[**GetMenuStoreNames**](MenusApi.md#getmenustorenames) | **GET** /api/v1.0/menus/{menuId}/stores | Get menus store names
+[**GetMenuTaxDetails**](MenusApi.md#getmenutaxdetails) | **GET** /api/v1.0/menus/{menuId}/tax | Get menus tax details
+[**GetMenusByAppId**](MenusApi.md#getmenusbyappid) | **GET** /api/v1.0/{appId}/menus | Get menus by appId
+[**GetMenusCheckpoints**](MenusApi.md#getmenuscheckpoints) | **GET** /api/v1.0/menus/{menuId}/checkpoints | Get a Menus Checkpoints
+[**MenusDeleteTaxRate**](MenusApi.md#menusdeletetaxrate) | **DELETE** /api/v1.0/menus/{menuId}/tax/{taxId} | Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
+[**MenusGetMenuBulkShowHide**](MenusApi.md#menusgetmenubulkshowhide) | **GET** /api/v1.0/menus/{menuId}/bulkshowhide/list | Get bulk show/hide menu items and option set items
+[**MenusSetDisplayOnMenuTax**](MenusApi.md#menussetdisplayonmenutax) | **POST** /api/v1.0/menus/{menuId}/tax/show/{show} | Set if tax shows for a Menu
+[**MenusSetItemDisplayOrders**](MenusApi.md#menussetitemdisplayorders) | **POST** /api/v1.0/menus/{menuId}/sectiondisplayorders | Re-arrange Sections within a Menu
+[**MenusShowHideBulkItems**](MenusApi.md#menusshowhidebulkitems) | **POST** /api/v1.0/menus/{menuId}/bulkshowhide | Bulk show/hide menu items or option set items
+[**MenusUpdateTaxType**](MenusApi.md#menusupdatetaxtype) | **POST** /api/v1.0/menus/{menuId}/tax/type/{type} | Set the type of Tax on a Menu
+[**MenusUpsertTaxRate**](MenusApi.md#menusupserttaxrate) | **POST** /api/v1.0/menus/{menuId}/taxrate | Add/Update a Tax Rate
+[**RestoreAMenuCheckpoint**](MenusApi.md#restoreamenucheckpoint) | **POST** /api/v1.0/menus/{menuId}/checkpoints/{checkpointId}/restore | Restore a Menu to a checkpoint
 [**SetMenuItemMetadata**](MenusApi.md#setmenuitemmetadata) | **PUT** /api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId} | Update menu item metadata
 [**SetMenuItemOptionSetItemMetadata**](MenusApi.md#setmenuitemoptionsetitemmetadata) | **PUT** /api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId} | Update menu item option set item metadata
-[**SetMenuLock**](MenusApi.md#setmenulock) | **POST** /api/v1.0/menus/{menuId}/lock | [PRIVATE API]Lock/Unlock a Menu for Editing
-[**SetMenuName**](MenusApi.md#setmenuname) | **POST** /api/v1.0/menus/{menuId}/name | [PRIVATE API]Set Menus Name
+[**SetMenuLock**](MenusApi.md#setmenulock) | **POST** /api/v1.0/menus/{menuId}/lock | Lock/Unlock a Menu for Editing
+[**SetMenuName**](MenusApi.md#setmenuname) | **POST** /api/v1.0/menus/{menuId}/name | Set Menus Name
 [**UpdateMenu**](MenusApi.md#updatemenu) | **POST** /api/v1.0/menus/{menuId} | Update menu
 [**UploadMenuImage**](MenusApi.md#uploadmenuimage) | **POST** /api/v1.0/menus/{menuId}/image | Upload menu image
 [**UploadNewMenuForApp**](MenusApi.md#uploadnewmenuforapp) | **POST** /api/v1.0/{appId}/menus/xlsx | Create a new menu from xlsx file.
@@ -40,15 +41,15 @@ Method | HTTP request | Description
 # **CreateDraftMenuFromExistingMenu**
 > RestApiResultMenu CreateDraftMenuFromExistingMenu (int? menuId, string newName)
 
-[PRIVATE API]Clone a menu, (without attaching stores)
+Clone a menu, (without attaching stores)
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -65,7 +66,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Clone a menu, (without attaching stores)
+                // Clone a menu, (without attaching stores)
                 RestApiResultMenu result = apiInstance.CreateDraftMenuFromExistingMenu(menuId, newName);
                 Debug.WriteLine(result);
             }
@@ -100,19 +101,89 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="createnewmenuasync"></a>
+# **CreateNewMenuAsync**
+> Object CreateNewMenuAsync (string appId, CreateFullMenu menu, string orgId = null)
+
+Create a new menu asynchronously
+
+You must listen to the webhook menu.async_creation.completed to know when the menu is ready
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class CreateNewMenuAsyncExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusApi();
+            var appId = appId_example;  // string | App id
+            var menu = new CreateFullMenu(); // CreateFullMenu | Menu
+            var orgId = orgId_example;  // string | Org id (optional) 
+
+            try
+            {
+                // Create a new menu asynchronously
+                Object result = apiInstance.CreateNewMenuAsync(appId, menu, orgId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusApi.CreateNewMenuAsync: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**| App id | 
+ **menu** | [**CreateFullMenu**](CreateFullMenu.md)| Menu | 
+ **orgId** | **string**| Org id | [optional] 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="createnewmenuforapp"></a>
 # **CreateNewMenuForApp**
 > int? CreateNewMenuForApp (string appId, CreateFullMenu menu)
 
-Create a new menu. If request body is empty, the system will create a menu with default items.
+Create a new menu
+
+[DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -125,11 +196,11 @@ namespace Example
 
             var apiInstance = new MenusApi();
             var appId = appId_example;  // string | App identifier
-            var menu = new CreateFullMenu(); // CreateFullMenu | Menu
+            var menu = new CreateFullMenu(); // CreateFullMenu | Menu. If empty the system will create a menu with default items
 
             try
             {
-                // Create a new menu. If request body is empty, the system will create a menu with default items.
+                // Create a new menu
                 int? result = apiInstance.CreateNewMenuForApp(appId, menu);
                 Debug.WriteLine(result);
             }
@@ -147,7 +218,7 @@ namespace Example
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **appId** | **string**| App identifier | 
- **menu** | [**CreateFullMenu**](CreateFullMenu.md)| Menu | 
+ **menu** | [**CreateFullMenu**](CreateFullMenu.md)| Menu. If empty the system will create a menu with default items | 
 
 ### Return type
 
@@ -168,15 +239,15 @@ Name | Type | Description  | Notes
 # **DeleteMenu**
 > void DeleteMenu (int? menuId)
 
-[PRIVATE API]Mark a Menu as Deleted
+Mark a Menu as Deleted
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -192,7 +263,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Mark a Menu as Deleted
+                // Mark a Menu as Deleted
                 apiInstance.DeleteMenu(menuId);
             }
             catch (Exception e)
@@ -235,9 +306,9 @@ Delete menu image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -296,9 +367,9 @@ Delete menu item metadata
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -363,9 +434,9 @@ Get all menu metadata by menu ID and store ID
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -427,9 +498,9 @@ Get menu by identifier
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -489,9 +560,9 @@ Get menu item metadata
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -547,7 +618,7 @@ Name | Type | Description  | Notes
 
 <a name="getmenuitemmetadatabykey"></a>
 # **GetMenuItemMetadataByKey**
-> void GetMenuItemMetadataByKey (int? menuId, int? storeId, int? menuItemId, string key)
+> RestApiResultMetadata GetMenuItemMetadataByKey (int? menuId, int? storeId, int? menuItemId, string key)
 
 Get menu item metadata by key
 
@@ -555,9 +626,9 @@ Get menu item metadata by key
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -577,7 +648,8 @@ namespace Example
             try
             {
                 // Get menu item metadata by key
-                apiInstance.GetMenuItemMetadataByKey(menuId, storeId, menuItemId, key);
+                RestApiResultMetadata result = apiInstance.GetMenuItemMetadataByKey(menuId, storeId, menuItemId, key);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
@@ -599,7 +671,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-void (empty response body)
+[**RestApiResultMetadata**](RestApiResultMetadata.md)
 
 ### Authorization
 
@@ -622,9 +694,9 @@ Get menu item option set item metadata by key
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -680,17 +752,17 @@ Name | Type | Description  | Notes
 
 <a name="getmenuname"></a>
 # **GetMenuName**
-> void GetMenuName (int? menuId)
+> string GetMenuName (int? menuId)
 
-[PRIVATE API]Get Menus Name
+Get Menus Name
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -706,8 +778,9 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Get Menus Name
-                apiInstance.GetMenuName(menuId);
+                // Get Menus Name
+                string result = apiInstance.GetMenuName(menuId);
+                Debug.WriteLine(result);
             }
             catch (Exception e)
             {
@@ -726,7 +799,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-void (empty response body)
+**string**
 
 ### Authorization
 
@@ -743,15 +816,15 @@ void (empty response body)
 # **GetMenuStoreNames**
 > RestApiArrayResultMenuStoreNames GetMenuStoreNames (int? menuId)
 
-[PRIVATE API]Get menus store names
+Get menus store names
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -767,7 +840,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Get menus store names
+                // Get menus store names
                 RestApiArrayResultMenuStoreNames result = apiInstance.GetMenuStoreNames(menuId);
                 Debug.WriteLine(result);
             }
@@ -805,15 +878,15 @@ Name | Type | Description  | Notes
 # **GetMenuTaxDetails**
 > RestApiArrayResultMenuTaxDetails GetMenuTaxDetails (int? menuId)
 
-[PRIVATE API]Get menus tax details
+Get menus tax details
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -829,7 +902,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Get menus tax details
+                // Get menus tax details
                 RestApiArrayResultMenuTaxDetails result = apiInstance.GetMenuTaxDetails(menuId);
                 Debug.WriteLine(result);
             }
@@ -867,15 +940,15 @@ Name | Type | Description  | Notes
 # **GetMenusByAppId**
 > RestApiArrayResultMenuSummary GetMenusByAppId (string appId)
 
-[PRIVATE API]Get menus by appId
+Get menus by appId
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -891,7 +964,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Get menus by appId
+                // Get menus by appId
                 RestApiArrayResultMenuSummary result = apiInstance.GetMenusByAppId(appId);
                 Debug.WriteLine(result);
             }
@@ -929,15 +1002,15 @@ Name | Type | Description  | Notes
 # **GetMenusCheckpoints**
 > RestApiArrayResultMenuCheckpoint GetMenusCheckpoints (int? menuId)
 
-[PRIVATE API]Get a Menus Checkpoints
+Get a Menus Checkpoints
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -953,7 +1026,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Get a Menus Checkpoints
+                // Get a Menus Checkpoints
                 RestApiArrayResultMenuCheckpoint result = apiInstance.GetMenusCheckpoints(menuId);
                 Debug.WriteLine(result);
             }
@@ -991,15 +1064,15 @@ Name | Type | Description  | Notes
 # **MenusDeleteTaxRate**
 > void MenusDeleteTaxRate (int? menuId, int? taxId)
 
-[PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
+Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1016,7 +1089,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
+                // Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
                 apiInstance.MenusDeleteTaxRate(menuId, taxId);
             }
             catch (Exception e)
@@ -1054,15 +1127,15 @@ void (empty response body)
 # **MenusGetMenuBulkShowHide**
 > RestApiArrayResultMenuElementListResponse MenusGetMenuBulkShowHide (int? menuId, bool? isAvailable)
 
-
+Get bulk show/hide menu items and option set items
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1074,11 +1147,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new MenusApi();
-            var menuId = 56;  // int? | 
-            var isAvailable = true;  // bool? | 
+            var menuId = 56;  // int? | Menu id
+            var isAvailable = true;  // bool? | Is available flag
 
             try
             {
+                // Get bulk show/hide menu items and option set items
                 RestApiArrayResultMenuElementListResponse result = apiInstance.MenusGetMenuBulkShowHide(menuId, isAvailable);
                 Debug.WriteLine(result);
             }
@@ -1095,8 +1169,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **menuId** | **int?**|  | 
- **isAvailable** | **bool?**|  | 
+ **menuId** | **int?**| Menu id | 
+ **isAvailable** | **bool?**| Is available flag | 
 
 ### Return type
 
@@ -1117,15 +1191,15 @@ Name | Type | Description  | Notes
 # **MenusSetDisplayOnMenuTax**
 > void MenusSetDisplayOnMenuTax (int? menuId, bool? show)
 
-[PRIVATE API]Set if tax shows for a Menu
+Set if tax shows for a Menu
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1142,7 +1216,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Set if tax shows for a Menu
+                // Set if tax shows for a Menu
                 apiInstance.MenusSetDisplayOnMenuTax(menuId, show);
             }
             catch (Exception e)
@@ -1180,15 +1254,15 @@ void (empty response body)
 # **MenusSetItemDisplayOrders**
 > void MenusSetItemDisplayOrders (int? menuId, MenuObjectDisplayOrders displayOrders)
 
-[PRIVATE API]Re-arrange Sections within a Menu
+Re-arrange Sections within a Menu
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1205,7 +1279,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Re-arrange Sections within a Menu
+                // Re-arrange Sections within a Menu
                 apiInstance.MenusSetItemDisplayOrders(menuId, displayOrders);
             }
             catch (Exception e)
@@ -1243,15 +1317,15 @@ void (empty response body)
 # **MenusShowHideBulkItems**
 > RestApiArrayResultMenuElementEditResponse MenusShowHideBulkItems (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable)
 
-
+Bulk show/hide menu items or option set items
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1263,12 +1337,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new MenusApi();
-            var menuId = 56;  // int? | 
-            var menuElements = new List<MenuElementHide>(); // List<MenuElementHide> | 
-            var isAvailable = true;  // bool? | 
+            var menuId = 56;  // int? | Menu id
+            var menuElements = new List<MenuElementHide>(); // List<MenuElementHide> | Elements to be show/hide
+            var isAvailable = true;  // bool? | Is available flag
 
             try
             {
+                // Bulk show/hide menu items or option set items
                 RestApiArrayResultMenuElementEditResponse result = apiInstance.MenusShowHideBulkItems(menuId, menuElements, isAvailable);
                 Debug.WriteLine(result);
             }
@@ -1285,9 +1360,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **menuId** | **int?**|  | 
- **menuElements** | [**List&lt;MenuElementHide&gt;**](MenuElementHide.md)|  | 
- **isAvailable** | **bool?**|  | 
+ **menuId** | **int?**| Menu id | 
+ **menuElements** | [**List&lt;MenuElementHide&gt;**](MenuElementHide.md)| Elements to be show/hide | 
+ **isAvailable** | **bool?**| Is available flag | 
 
 ### Return type
 
@@ -1308,15 +1383,15 @@ Name | Type | Description  | Notes
 # **MenusUpdateTaxType**
 > void MenusUpdateTaxType (int? menuId, string type)
 
-[PRIVATE API]Set the type of Tax on a Menu
+Set the type of Tax on a Menu
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1333,7 +1408,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Set the type of Tax on a Menu
+                // Set the type of Tax on a Menu
                 apiInstance.MenusUpdateTaxType(menuId, type);
             }
             catch (Exception e)
@@ -1371,15 +1446,15 @@ void (empty response body)
 # **MenusUpsertTaxRate**
 > MenuTaxRate MenusUpsertTaxRate (int? menuId, MenuTaxRate taxRate)
 
-[PRIVATE API]Add/Update a Tax Rate
+Add/Update a Tax Rate
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1392,11 +1467,11 @@ namespace Example
 
             var apiInstance = new MenusApi();
             var menuId = 56;  // int? | Menu identifier
-            var taxRate = new MenuTaxRate(); // MenuTaxRate | Tax Rate to Add/Update
+            var taxRate = new MenuTaxRate(); // MenuTaxRate | Tax rate to add/update
 
             try
             {
-                // [PRIVATE API]Add/Update a Tax Rate
+                // Add/Update a Tax Rate
                 MenuTaxRate result = apiInstance.MenusUpsertTaxRate(menuId, taxRate);
                 Debug.WriteLine(result);
             }
@@ -1414,7 +1489,7 @@ namespace Example
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **menuId** | **int?**| Menu identifier | 
- **taxRate** | [**MenuTaxRate**](MenuTaxRate.md)| Tax Rate to Add/Update | 
+ **taxRate** | [**MenuTaxRate**](MenuTaxRate.md)| Tax rate to add/update | 
 
 ### Return type
 
@@ -1435,15 +1510,15 @@ Name | Type | Description  | Notes
 # **RestoreAMenuCheckpoint**
 > void RestoreAMenuCheckpoint (int? menuId, int? checkpointId)
 
-[PRIVATE API]Restore a Menu to a checkpoint
+Restore a Menu to a checkpoint
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1460,7 +1535,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Restore a Menu to a checkpoint
+                // Restore a Menu to a checkpoint
                 apiInstance.RestoreAMenuCheckpoint(menuId, checkpointId);
             }
             catch (Exception e)
@@ -1504,9 +1579,9 @@ Update menu item metadata
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1571,9 +1646,9 @@ Update menu item option set item metadata
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1632,15 +1707,15 @@ void (empty response body)
 # **SetMenuLock**
 > void SetMenuLock (int? menuId, bool? locked)
 
-[PRIVATE API]Lock/Unlock a Menu for Editing
+Lock/Unlock a Menu for Editing
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1657,7 +1732,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Lock/Unlock a Menu for Editing
+                // Lock/Unlock a Menu for Editing
                 apiInstance.SetMenuLock(menuId, locked);
             }
             catch (Exception e)
@@ -1695,15 +1770,15 @@ void (empty response body)
 # **SetMenuName**
 > void SetMenuName (int? menuId, string name)
 
-[PRIVATE API]Set Menus Name
+Set Menus Name
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1720,7 +1795,7 @@ namespace Example
 
             try
             {
-                // [PRIVATE API]Set Menus Name
+                // Set Menus Name
                 apiInstance.SetMenuName(menuId, name);
             }
             catch (Exception e)
@@ -1764,9 +1839,9 @@ Update menu
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1779,7 +1854,7 @@ namespace Example
 
             var apiInstance = new MenusApi();
             var menuId = 56;  // int? | Menu identifier
-            var menu = new MenuBase(); // MenuBase | Menu (delta)
+            var menu = new MenuBase(); // MenuBase | Full menu data
 
             try
             {
@@ -1800,7 +1875,7 @@ namespace Example
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **menuId** | **int?**| Menu identifier | 
- **menu** | [**MenuBase**](MenuBase.md)| Menu (delta) | 
+ **menu** | [**MenuBase**](MenuBase.md)| Full menu data | 
 
 ### Return type
 
@@ -1827,9 +1902,9 @@ Upload menu image
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1891,9 +1966,9 @@ Create a new menu from xlsx file.
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/MenusNutritionInfoApi.md b/docs/MenusNutritionInfoApi.md
new file mode 100644
index 00000000..6c4b6244
--- /dev/null
+++ b/docs/MenusNutritionInfoApi.md
@@ -0,0 +1,396 @@
+# Flipdish.Api.MenusNutritionInfoApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**AddOrUpdateMenuItemNutritionInfo**](MenusNutritionInfoApi.md#addorupdatemenuitemnutritioninfo) | **POST** /api/v1.0/menus/{menuId}/menuItem/{publicId}/nutrition | Add or update menuitem nutrition info by menu item&#39;s publicId
+[**AddOrUpdateMenuItemOptionSetItemNutritionInfo**](MenusNutritionInfoApi.md#addorupdatemenuitemoptionsetitemnutritioninfo) | **POST** /api/v1.0/menus/{menuId}/menuItemOption/{publicId}/nutrition | Add or update menuitem optionsetitem nutrition info its publicId
+[**AddOrUpdateMenuNutritionInfoByMenuId**](MenusNutritionInfoApi.md#addorupdatemenunutritioninfobymenuid) | **POST** /api/v1.0/menus/{menuId}/nutrition | Add or update menu nutrition by identifier
+[**DeleteMenuNutritionInfoByMenuId**](MenusNutritionInfoApi.md#deletemenunutritioninfobymenuid) | **DELETE** /api/v1.0/menus/{menuId}/nutrition | Delete menu nutrition information by menuId
+[**GetAllergens**](MenusNutritionInfoApi.md#getallergens) | **GET** /api/v1.0/{appId}/menus/nutrition/allergens | Get allergens
+[**GetMenuNutritionInfoByMenuId**](MenusNutritionInfoApi.md#getmenunutritioninfobymenuid) | **GET** /api/v1.0/menus/{menuId}/nutrition | Get menu nutrition by menuId
+
+
+<a name="addorupdatemenuitemnutritioninfo"></a>
+# **AddOrUpdateMenuItemNutritionInfo**
+> RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuItemNutritionInfo (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+
+Add or update menuitem nutrition info by menu item's publicId
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddOrUpdateMenuItemNutritionInfoExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoApi();
+            var menuId = 56;  // int? | Menu identifier
+            var publicId = publicId_example;  // string | Menu item's publicId
+            var addOrUpdateModel = new ItemNutritionInfoAddUpdateModel(); // ItemNutritionInfoAddUpdateModel | 
+
+            try
+            {
+                // Add or update menuitem nutrition info by menu item's publicId
+                RestApiResultMenuNutritionInfoHeader result = apiInstance.AddOrUpdateMenuItemNutritionInfo(menuId, publicId, addOrUpdateModel);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoApi.AddOrUpdateMenuItemNutritionInfo: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu identifier | 
+ **publicId** | **string**| Menu item&#39;s publicId | 
+ **addOrUpdateModel** | [**ItemNutritionInfoAddUpdateModel**](ItemNutritionInfoAddUpdateModel.md)|  | 
+
+### Return type
+
+[**RestApiResultMenuNutritionInfoHeader**](RestApiResultMenuNutritionInfoHeader.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="addorupdatemenuitemoptionsetitemnutritioninfo"></a>
+# **AddOrUpdateMenuItemOptionSetItemNutritionInfo**
+> RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuItemOptionSetItemNutritionInfo (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+
+Add or update menuitem optionsetitem nutrition info its publicId
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddOrUpdateMenuItemOptionSetItemNutritionInfoExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoApi();
+            var menuId = 56;  // int? | Menu identifier
+            var publicId = new Guid?(); // Guid? | Menu item's publicId
+            var addOrUpdateModel = new ItemNutritionInfoAddUpdateModel(); // ItemNutritionInfoAddUpdateModel | 
+
+            try
+            {
+                // Add or update menuitem optionsetitem nutrition info its publicId
+                RestApiResultMenuNutritionInfoHeader result = apiInstance.AddOrUpdateMenuItemOptionSetItemNutritionInfo(menuId, publicId, addOrUpdateModel);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoApi.AddOrUpdateMenuItemOptionSetItemNutritionInfo: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu identifier | 
+ **publicId** | [**Guid?**](Guid?.md)| Menu item&#39;s publicId | 
+ **addOrUpdateModel** | [**ItemNutritionInfoAddUpdateModel**](ItemNutritionInfoAddUpdateModel.md)|  | 
+
+### Return type
+
+[**RestApiResultMenuNutritionInfoHeader**](RestApiResultMenuNutritionInfoHeader.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="addorupdatemenunutritioninfobymenuid"></a>
+# **AddOrUpdateMenuNutritionInfoByMenuId**
+> RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuNutritionInfoByMenuId (int? menuId)
+
+Add or update menu nutrition by identifier
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddOrUpdateMenuNutritionInfoByMenuIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoApi();
+            var menuId = 56;  // int? | Menu identifier
+
+            try
+            {
+                // Add or update menu nutrition by identifier
+                RestApiResultMenuNutritionInfoHeader result = apiInstance.AddOrUpdateMenuNutritionInfoByMenuId(menuId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoApi.AddOrUpdateMenuNutritionInfoByMenuId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu identifier | 
+
+### Return type
+
+[**RestApiResultMenuNutritionInfoHeader**](RestApiResultMenuNutritionInfoHeader.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="deletemenunutritioninfobymenuid"></a>
+# **DeleteMenuNutritionInfoByMenuId**
+> Object DeleteMenuNutritionInfoByMenuId (int? menuId)
+
+Delete menu nutrition information by menuId
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class DeleteMenuNutritionInfoByMenuIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoApi();
+            var menuId = 56;  // int? | Menu identifier
+
+            try
+            {
+                // Delete menu nutrition information by menuId
+                Object result = apiInstance.DeleteMenuNutritionInfoByMenuId(menuId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoApi.DeleteMenuNutritionInfoByMenuId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu identifier | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getallergens"></a>
+# **GetAllergens**
+> RestApiArrayResultAllergen GetAllergens (string appId, string languageId = null)
+
+Get allergens
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetAllergensExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoApi();
+            var appId = appId_example;  // string | 
+            var languageId = languageId_example;  // string |  (optional) 
+
+            try
+            {
+                // Get allergens
+                RestApiArrayResultAllergen result = apiInstance.GetAllergens(appId, languageId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoApi.GetAllergens: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **languageId** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiArrayResultAllergen**](RestApiArrayResultAllergen.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getmenunutritioninfobymenuid"></a>
+# **GetMenuNutritionInfoByMenuId**
+> RestApiResultNutritionInfo GetMenuNutritionInfoByMenuId (int? menuId)
+
+Get menu nutrition by menuId
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetMenuNutritionInfoByMenuIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoApi();
+            var menuId = 56;  // int? | Menu identifier
+
+            try
+            {
+                // Get menu nutrition by menuId
+                RestApiResultNutritionInfo result = apiInstance.GetMenuNutritionInfoByMenuId(menuId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoApi.GetMenuNutritionInfoByMenuId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu identifier | 
+
+### Return type
+
+[**RestApiResultNutritionInfo**](RestApiResultNutritionInfo.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/MenusNutritionInfoV2Api.md b/docs/MenusNutritionInfoV2Api.md
new file mode 100644
index 00000000..220bf7c2
--- /dev/null
+++ b/docs/MenusNutritionInfoV2Api.md
@@ -0,0 +1,278 @@
+# Flipdish.Api.MenusNutritionInfoV2Api
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**AddOrUpdateMenuItemNutritionInfoV2**](MenusNutritionInfoV2Api.md#addorupdatemenuitemnutritioninfov2) | **POST** /api/v1.0/{appId}/menus/{menuId}/menuItem/{publicId}/nutritionv2 | Add or update menuitem nutrition info by menu item&#39;s publicId
+[**AddOrUpdateMenuItemOptionSetItemNutritionInfoV2**](MenusNutritionInfoV2Api.md#addorupdatemenuitemoptionsetitemnutritioninfov2) | **POST** /api/v1.0/{appId}/menus/{menuId}/menuItemOption/{publicId}/nutritionv2 | Add or update menuitem option set item&#39;s nutrition info by its publicId
+[**GetAllergensV2**](MenusNutritionInfoV2Api.md#getallergensv2) | **GET** /api/v1.0/{appId}/menus/nutritionv2/allergens | Get allergens
+[**GetMenuNutritionInfoV2ByMenuId**](MenusNutritionInfoV2Api.md#getmenunutritioninfov2bymenuid) | **GET** /api/v1.0/{appId}/menus/{menuId}/nutritionv2 | Get menu nutrition by menuId
+
+
+<a name="addorupdatemenuitemnutritioninfov2"></a>
+# **AddOrUpdateMenuItemNutritionInfoV2**
+> Object AddOrUpdateMenuItemNutritionInfoV2 (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+
+Add or update menuitem nutrition info by menu item's publicId
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddOrUpdateMenuItemNutritionInfoV2Example
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoV2Api();
+            var menuId = 56;  // int? | Menu identifier
+            var publicId = publicId_example;  // string | Menu item's publicId
+            var addOrUpdateModel = new ItemNutritionInfoV2AddUpdateModel(); // ItemNutritionInfoV2AddUpdateModel | Allergen ids
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                // Add or update menuitem nutrition info by menu item's publicId
+                Object result = apiInstance.AddOrUpdateMenuItemNutritionInfoV2(menuId, publicId, addOrUpdateModel, appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoV2Api.AddOrUpdateMenuItemNutritionInfoV2: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu identifier | 
+ **publicId** | **string**| Menu item&#39;s publicId | 
+ **addOrUpdateModel** | [**ItemNutritionInfoV2AddUpdateModel**](ItemNutritionInfoV2AddUpdateModel.md)| Allergen ids | 
+ **appId** | **string**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="addorupdatemenuitemoptionsetitemnutritioninfov2"></a>
+# **AddOrUpdateMenuItemOptionSetItemNutritionInfoV2**
+> Object AddOrUpdateMenuItemOptionSetItemNutritionInfoV2 (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+
+Add or update menuitem option set item's nutrition info by its publicId
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddOrUpdateMenuItemOptionSetItemNutritionInfoV2Example
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoV2Api();
+            var menuId = 56;  // int? | Menu identifier
+            var publicId = publicId_example;  // string | Menu item option set item's publicId
+            var addOrUpdateModel = new ItemNutritionInfoV2AddUpdateModel(); // ItemNutritionInfoV2AddUpdateModel | Allergen ids
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                // Add or update menuitem option set item's nutrition info by its publicId
+                Object result = apiInstance.AddOrUpdateMenuItemOptionSetItemNutritionInfoV2(menuId, publicId, addOrUpdateModel, appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoV2Api.AddOrUpdateMenuItemOptionSetItemNutritionInfoV2: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **menuId** | **int?**| Menu identifier | 
+ **publicId** | **string**| Menu item option set item&#39;s publicId | 
+ **addOrUpdateModel** | [**ItemNutritionInfoV2AddUpdateModel**](ItemNutritionInfoV2AddUpdateModel.md)| Allergen ids | 
+ **appId** | **string**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getallergensv2"></a>
+# **GetAllergensV2**
+> RestApiArrayResultAllergen GetAllergensV2 (string appId, string languageId = null)
+
+Get allergens
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetAllergensV2Example
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoV2Api();
+            var appId = appId_example;  // string | 
+            var languageId = languageId_example;  // string |  (optional) 
+
+            try
+            {
+                // Get allergens
+                RestApiArrayResultAllergen result = apiInstance.GetAllergensV2(appId, languageId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoV2Api.GetAllergensV2: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **languageId** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiArrayResultAllergen**](RestApiArrayResultAllergen.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getmenunutritioninfov2bymenuid"></a>
+# **GetMenuNutritionInfoV2ByMenuId**
+> RestApiResultNutritionInfoV2 GetMenuNutritionInfoV2ByMenuId (string appId, int? menuId, string languageId = null)
+
+Get menu nutrition by menuId
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetMenuNutritionInfoV2ByMenuIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MenusNutritionInfoV2Api();
+            var appId = appId_example;  // string | 
+            var menuId = 56;  // int? | Menu identifier
+            var languageId = languageId_example;  // string |  (optional) 
+
+            try
+            {
+                // Get menu nutrition by menuId
+                RestApiResultNutritionInfoV2 result = apiInstance.GetMenuNutritionInfoV2ByMenuId(appId, menuId, languageId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MenusNutritionInfoV2Api.GetMenuNutritionInfoV2ByMenuId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **menuId** | **int?**| Menu identifier | 
+ **languageId** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiResultNutritionInfoV2**](RestApiResultNutritionInfoV2.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/Metadata.md b/docs/Metadata.md
index dd3bc7dc..b4caf370 100644
--- a/docs/Metadata.md
+++ b/docs/Metadata.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Metadata
+# Flipdish.Model.Metadata
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Metafield.md b/docs/Metafield.md
index 2972ccc8..4ee93a9a 100644
--- a/docs/Metafield.md
+++ b/docs/Metafield.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Metafield
+# Flipdish.Model.Metafield
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MetafieldDefinition.md b/docs/MetafieldDefinition.md
index 287702cf..742025e0 100644
--- a/docs/MetafieldDefinition.md
+++ b/docs/MetafieldDefinition.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.MetafieldDefinition
+# Flipdish.Model.MetafieldDefinition
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **IsReadOnly** | **bool?** | Indicates if a definition can be edited or not | [optional] 
-**OwnerEntity** | **string** | The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity} | [optional] 
+**OwnerEntity** | **string** | The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity} | [optional] 
 **Key** | **string** | Key of the metafield.  The key must have two parts, separated by a dot. The first part acts as a category, for organizational purposes.  The parts can be composed of lowercase letters, numbers, hyphen and underscore | 
 **ValueType** | **string** | The excepted type for the Value field | [optional] 
 **Name** | **string** | Field Name | 
diff --git a/docs/MetafieldDefinitionRecommendation.md b/docs/MetafieldDefinitionRecommendation.md
index 5ece1fa4..004e6e50 100644
--- a/docs/MetafieldDefinitionRecommendation.md
+++ b/docs/MetafieldDefinitionRecommendation.md
@@ -1,9 +1,9 @@
-# IO.Swagger.Model.MetafieldDefinitionRecommendation
+# Flipdish.Model.MetafieldDefinitionRecommendation
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**OwnerEntity** | **string** | The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity} | [optional] 
+**OwnerEntity** | **string** | The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity} | [optional] 
 **Key** | **string** | Key of the metafield.  The key must have two parts, separated by a dot. The first part acts as a category, for organizational purposes.  The parts can be composed of lowercase letters, numbers, hyphen and underscore | 
 **ValueType** | **string** | The excepted type for the Value field | [optional] 
 **Name** | **string** | Field Name | 
diff --git a/docs/MetafieldDefinitionsApi.md b/docs/MetafieldDefinitionsApi.md
index 177c48bc..56649322 100644
--- a/docs/MetafieldDefinitionsApi.md
+++ b/docs/MetafieldDefinitionsApi.md
@@ -1,32 +1,30 @@
-# IO.Swagger.Api.MetafieldDefinitionsApi
+# Flipdish.Api.MetafieldDefinitionsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateMetafieldDefinition**](MetafieldDefinitionsApi.md#createmetafielddefinition) | **POST** /api/v1.0/{appId}/metafields/definitions/{ownerEntity} | Create a Metafield Definition
-[**GetMetafieldDefinitionByKey**](MetafieldDefinitionsApi.md#getmetafielddefinitionbykey) | **GET** /api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key} | Get a Metafield Definition for the specified owner entity and key.
-[**GetMetafieldDefinitions**](MetafieldDefinitionsApi.md#getmetafielddefinitions) | **GET** /api/v1.0/{appId}/metafields/definitions/{ownerEntity} | Get Metafield Definitions for the specified owner entity.
-[**GetOwnerEntityConfigurations**](MetafieldDefinitionsApi.md#getownerentityconfigurations) | **GET** /api/v1.0/{appId}/metafields/definitions | Get OwnerEntity Configurations which contain information to manage Metafield Definitions
-[**GetOwnerEntityRecommendations**](MetafieldDefinitionsApi.md#getownerentityrecommendations) | **GET** /api/v1.0/{appId}/metafields/definitions/recommendations/{ownerEntity} | Get OwnerEntity Definition Recommendations
-[**UpdateMetafieldDefinition**](MetafieldDefinitionsApi.md#updatemetafielddefinition) | **POST** /api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key} | Update a Metafield Definition
+[**CreateMetafieldDefinition**](MetafieldDefinitionsApi.md#createmetafielddefinition) | **POST** /api/v1.0/{appId}/metafields/definitions/{ownerEntity} | 
+[**GetMetafieldDefinitionByKey**](MetafieldDefinitionsApi.md#getmetafielddefinitionbykey) | **GET** /api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key} | 
+[**GetMetafieldDefinitions**](MetafieldDefinitionsApi.md#getmetafielddefinitions) | **GET** /api/v1.0/{appId}/metafields/definitions/{ownerEntity} | 
+[**GetOwnerEntityConfigurations**](MetafieldDefinitionsApi.md#getownerentityconfigurations) | **GET** /api/v1.0/{appId}/metafields/definitions | 
+[**GetOwnerEntityRecommendations**](MetafieldDefinitionsApi.md#getownerentityrecommendations) | **GET** /api/v1.0/{appId}/metafields/definitions/recommendations/{ownerEntity} | 
+[**UpdateMetafieldDefinition**](MetafieldDefinitionsApi.md#updatemetafielddefinition) | **POST** /api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key} | 
 
 
 <a name="createmetafielddefinition"></a>
 # **CreateMetafieldDefinition**
 > RestApiResultMetafieldDefinition CreateMetafieldDefinition (string appId, string ownerEntity, CreateMetafieldDefinition createMetafieldDefinition)
 
-Create a Metafield Definition
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -44,7 +42,6 @@ namespace Example
 
             try
             {
-                // Create a Metafield Definition
                 RestApiResultMetafieldDefinition result = apiInstance.CreateMetafieldDefinition(appId, ownerEntity, createMetafieldDefinition);
                 Debug.WriteLine(result);
             }
@@ -84,17 +81,15 @@ Name | Type | Description  | Notes
 # **GetMetafieldDefinitionByKey**
 > RestApiResultMetafieldDefinition GetMetafieldDefinitionByKey (string appId, string ownerEntity, string key)
 
-Get a Metafield Definition for the specified owner entity and key.
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -112,7 +107,6 @@ namespace Example
 
             try
             {
-                // Get a Metafield Definition for the specified owner entity and key.
                 RestApiResultMetafieldDefinition result = apiInstance.GetMetafieldDefinitionByKey(appId, ownerEntity, key);
                 Debug.WriteLine(result);
             }
@@ -152,17 +146,15 @@ Name | Type | Description  | Notes
 # **GetMetafieldDefinitions**
 > RestApiPaginationResultMetafieldDefinition GetMetafieldDefinitions (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null)
 
-Get Metafield Definitions for the specified owner entity.
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -182,7 +174,6 @@ namespace Example
 
             try
             {
-                // Get Metafield Definitions for the specified owner entity.
                 RestApiPaginationResultMetafieldDefinition result = apiInstance.GetMetafieldDefinitions(appId, ownerEntity, searchTerm, page, limit);
                 Debug.WriteLine(result);
             }
@@ -224,17 +215,15 @@ Name | Type | Description  | Notes
 # **GetOwnerEntityConfigurations**
 > OwnerEntityConfigurations GetOwnerEntityConfigurations (string appId)
 
-Get OwnerEntity Configurations which contain information to manage Metafield Definitions
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -250,7 +239,6 @@ namespace Example
 
             try
             {
-                // Get OwnerEntity Configurations which contain information to manage Metafield Definitions
                 OwnerEntityConfigurations result = apiInstance.GetOwnerEntityConfigurations(appId);
                 Debug.WriteLine(result);
             }
@@ -288,17 +276,15 @@ Name | Type | Description  | Notes
 # **GetOwnerEntityRecommendations**
 > RestApiPaginationResultMetafieldDefinitionRecommendation GetOwnerEntityRecommendations (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null)
 
-Get OwnerEntity Definition Recommendations
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -318,7 +304,6 @@ namespace Example
 
             try
             {
-                // Get OwnerEntity Definition Recommendations
                 RestApiPaginationResultMetafieldDefinitionRecommendation result = apiInstance.GetOwnerEntityRecommendations(appId, ownerEntity, searchTerm, page, limit);
                 Debug.WriteLine(result);
             }
@@ -360,17 +345,15 @@ Name | Type | Description  | Notes
 # **UpdateMetafieldDefinition**
 > RestApiResultMetafieldDefinition UpdateMetafieldDefinition (string appId, string ownerEntity, string key, UpdateMetafieldDefinition updateMetafieldDefinition)
 
-Update a Metafield Definition
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -389,7 +372,6 @@ namespace Example
 
             try
             {
-                // Update a Metafield Definition
                 RestApiResultMetafieldDefinition result = apiInstance.UpdateMetafieldDefinition(appId, ownerEntity, key, updateMetafieldDefinition);
                 Debug.WriteLine(result);
             }
diff --git a/docs/MobileAppConfig.md b/docs/MobileAppConfig.md
deleted file mode 100644
index 2adc9cd3..00000000
--- a/docs/MobileAppConfig.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.MobileAppConfig
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**AutoPublish** | **bool?** | App Name | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/MobileAppsApi.md b/docs/MobileAppsApi.md
index d7026e1c..46642074 100644
--- a/docs/MobileAppsApi.md
+++ b/docs/MobileAppsApi.md
@@ -1,32 +1,35 @@
-# IO.Swagger.Api.MobileAppsApi
+# Flipdish.Api.MobileAppsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetAppConfigSalesChannel**](MobileAppsApi.md#getappconfigsaleschannel) | **GET** /api/v1.0/mobileapps/{appId}/saleschannel/details | Get sales channel configuration
-[**GetStatistics**](MobileAppsApi.md#getstatistics) | **GET** /api/v1.0/mobileapps/{appId}/statistics | Get statistics mobile apps
-[**GetSubmissionDetails**](MobileAppsApi.md#getsubmissiondetails) | **GET** /api/v1.0/mobileapps/{appId}/submission/details | Get submission details mobile apps
-[**GetSubmissionStatus**](MobileAppsApi.md#getsubmissionstatus) | **GET** /api/v1.0/mobileapps/{appId}/submission/status | Get submission status mobile apps
-[**Submission**](MobileAppsApi.md#submission) | **POST** /api/v1.0/mobileapps/{appId}/submission | Submission form mobile apps
-[**UpdateAppConfigSalesChannel**](MobileAppsApi.md#updateappconfigsaleschannel) | **POST** /api/v1.0/mobileapps/{appId}/saleschannel | Update the application sales channel configuration
-[**UpdateSubmissionStatus**](MobileAppsApi.md#updatesubmissionstatus) | **POST** /api/v1.0/mobileapps/{appId}/submission/{mobileAppsSubmissionId}/status | Update submission status
-[**UploadImage**](MobileAppsApi.md#uploadimage) | **POST** /api/v1.0/mobileapps/{appId}/submission/image | Upload image mobile apps
+[**GetAppConfigSalesChannel**](MobileAppsApi.md#getappconfigsaleschannel) | **GET** /api/v1.0/mobileapps/{appId}/saleschannel/details | 
+[**GetStatistics**](MobileAppsApi.md#getstatistics) | **GET** /api/v1.0/mobileapps/{appId}/statistics | 
+[**GetSubmissionDetails**](MobileAppsApi.md#getsubmissiondetails) | **GET** /api/v1.0/mobileapps/{appId}/submission/details | 
+[**GetSubmissionStatus**](MobileAppsApi.md#getsubmissionstatus) | **GET** /api/v1.0/mobileapps/{appId}/submission/{submissionId}/status | 
+[**Publish**](MobileAppsApi.md#publish) | **POST** /api/v1.0/mobileapps/{appId}/submission/{submissionId}/publish | 
+[**Resubmission**](MobileAppsApi.md#resubmission) | **POST** /api/v1.0/mobileapps/{appId}/resubmission | 
+[**Submission**](MobileAppsApi.md#submission) | **POST** /api/v1.0/mobileapps/{appId}/submission | 
+[**Unpublish**](MobileAppsApi.md#unpublish) | **POST** /api/v1.0/mobileapps/{appId}/submission/{submissionId}/unpublish | 
+[**UpdateAppConfigSalesChannel**](MobileAppsApi.md#updateappconfigsaleschannel) | **POST** /api/v1.0/mobileapps/{appId}/saleschannel | 
+[**UpdateSubmissionStatus**](MobileAppsApi.md#updatesubmissionstatus) | **POST** /api/v1.0/mobileapps/{appId}/submission/{submissionId}/status | 
+[**UploadImage**](MobileAppsApi.md#uploadimage) | **POST** /api/v1.0/mobileapps/{appId}/submission/image | 
 
 
 <a name="getappconfigsaleschannel"></a>
 # **GetAppConfigSalesChannel**
 > RestApiResultAppConfigSalesChannel GetAppConfigSalesChannel (string appId)
 
-Get sales channel configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -42,7 +45,6 @@ namespace Example
 
             try
             {
-                // Get sales channel configuration
                 RestApiResultAppConfigSalesChannel result = apiInstance.GetAppConfigSalesChannel(appId);
                 Debug.WriteLine(result);
             }
@@ -80,15 +82,15 @@ Name | Type | Description  | Notes
 # **GetStatistics**
 > RestApiArrayResultMobileAppsStatistics GetStatistics (string appId, List<string> platformTypes)
 
-Get statistics mobile apps
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -105,7 +107,6 @@ namespace Example
 
             try
             {
-                // Get statistics mobile apps
                 RestApiArrayResultMobileAppsStatistics result = apiInstance.GetStatistics(appId, platformTypes);
                 Debug.WriteLine(result);
             }
@@ -144,15 +145,15 @@ Name | Type | Description  | Notes
 # **GetSubmissionDetails**
 > RestApiResultMobileAppsSubmissionDetails GetSubmissionDetails (string appId)
 
-Get submission details mobile apps
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -168,7 +169,6 @@ namespace Example
 
             try
             {
-                // Get submission details mobile apps
                 RestApiResultMobileAppsSubmissionDetails result = apiInstance.GetSubmissionDetails(appId);
                 Debug.WriteLine(result);
             }
@@ -204,17 +204,17 @@ Name | Type | Description  | Notes
 
 <a name="getsubmissionstatus"></a>
 # **GetSubmissionStatus**
-> RestApiResultMobileAppsSubmissionStatus GetSubmissionStatus (string appId, int? mobileAppsSubmissionId)
+> RestApiResultMobileAppsSubmissionStatus GetSubmissionStatus (string appId, int? submissionId)
+
 
-Get submission status mobile apps
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -227,12 +227,11 @@ namespace Example
 
             var apiInstance = new MobileAppsApi();
             var appId = appId_example;  // string | 
-            var mobileAppsSubmissionId = 56;  // int? | 
+            var submissionId = 56;  // int? | 
 
             try
             {
-                // Get submission status mobile apps
-                RestApiResultMobileAppsSubmissionStatus result = apiInstance.GetSubmissionStatus(appId, mobileAppsSubmissionId);
+                RestApiResultMobileAppsSubmissionStatus result = apiInstance.GetSubmissionStatus(appId, submissionId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -249,7 +248,7 @@ namespace Example
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **appId** | **string**|  | 
- **mobileAppsSubmissionId** | **int?**|  | 
+ **submissionId** | **int?**|  | 
 
 ### Return type
 
@@ -266,19 +265,147 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="publish"></a>
+# **Publish**
+> RestApiResultRestApiIntegerResult Publish (string appId, int? submissionId, string platformType = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class PublishExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MobileAppsApi();
+            var appId = appId_example;  // string | 
+            var submissionId = 56;  // int? | 
+            var platformType = platformType_example;  // string |  (optional) 
+
+            try
+            {
+                RestApiResultRestApiIntegerResult result = apiInstance.Publish(appId, submissionId, platformType);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MobileAppsApi.Publish: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **submissionId** | **int?**|  | 
+ **platformType** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiResultRestApiIntegerResult**](RestApiResultRestApiIntegerResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="resubmission"></a>
+# **Resubmission**
+> RestApiResultMobileAppsSubmission Resubmission (string appId, MobileAppsSubmission mobileAppsSubmission)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class ResubmissionExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MobileAppsApi();
+            var appId = appId_example;  // string | 
+            var mobileAppsSubmission = new MobileAppsSubmission(); // MobileAppsSubmission | 
+
+            try
+            {
+                RestApiResultMobileAppsSubmission result = apiInstance.Resubmission(appId, mobileAppsSubmission);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MobileAppsApi.Resubmission: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **mobileAppsSubmission** | [**MobileAppsSubmission**](MobileAppsSubmission.md)|  | 
+
+### Return type
+
+[**RestApiResultMobileAppsSubmission**](RestApiResultMobileAppsSubmission.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="submission"></a>
 # **Submission**
 > RestApiResultMobileAppsSubmission Submission (string appId, MobileAppsSubmission mobileAppsSubmission)
 
-Submission form mobile apps
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -295,7 +422,6 @@ namespace Example
 
             try
             {
-                // Submission form mobile apps
                 RestApiResultMobileAppsSubmission result = apiInstance.Submission(appId, mobileAppsSubmission);
                 Debug.WriteLine(result);
             }
@@ -330,19 +456,84 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="unpublish"></a>
+# **Unpublish**
+> RestApiIntegerResult Unpublish (string appId, int? submissionId, string platformType = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UnpublishExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new MobileAppsApi();
+            var appId = appId_example;  // string | 
+            var submissionId = 56;  // int? | 
+            var platformType = platformType_example;  // string |  (optional) 
+
+            try
+            {
+                RestApiIntegerResult result = apiInstance.Unpublish(appId, submissionId, platformType);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling MobileAppsApi.Unpublish: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **submissionId** | **int?**|  | 
+ **platformType** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiIntegerResult**](RestApiIntegerResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="updateappconfigsaleschannel"></a>
 # **UpdateAppConfigSalesChannel**
 > RestApiResultAppConfigSalesChannel UpdateAppConfigSalesChannel (string appId, AppConfigSalesChannel appConfigSalesChannel)
 
-Update the application sales channel configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -359,7 +550,6 @@ namespace Example
 
             try
             {
-                // Update the application sales channel configuration
                 RestApiResultAppConfigSalesChannel result = apiInstance.UpdateAppConfigSalesChannel(appId, appConfigSalesChannel);
                 Debug.WriteLine(result);
             }
@@ -396,17 +586,17 @@ Name | Type | Description  | Notes
 
 <a name="updatesubmissionstatus"></a>
 # **UpdateSubmissionStatus**
-> RestApiResultUpdateMobileAppsSubmissionStatus UpdateSubmissionStatus (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus)
+> RestApiResultUpdateMobileAppsSubmissionStatus UpdateSubmissionStatus (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus)
+
 
-Update submission status
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -419,13 +609,12 @@ namespace Example
 
             var apiInstance = new MobileAppsApi();
             var appId = appId_example;  // string | 
-            var mobileAppsSubmissionId = 56;  // int? | 
-            var updateMobileAppsSubmissionStatus = new UpdateMobileAppsSubmissionStatus(); // UpdateMobileAppsSubmissionStatus | 
+            var submissionId = 56;  // int? | 
+            var updateSubmissionStatus = new UpdateMobileAppsSubmissionStatus(); // UpdateMobileAppsSubmissionStatus | 
 
             try
             {
-                // Update submission status
-                RestApiResultUpdateMobileAppsSubmissionStatus result = apiInstance.UpdateSubmissionStatus(appId, mobileAppsSubmissionId, updateMobileAppsSubmissionStatus);
+                RestApiResultUpdateMobileAppsSubmissionStatus result = apiInstance.UpdateSubmissionStatus(appId, submissionId, updateSubmissionStatus);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -442,8 +631,8 @@ namespace Example
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **appId** | **string**|  | 
- **mobileAppsSubmissionId** | **int?**|  | 
- **updateMobileAppsSubmissionStatus** | [**UpdateMobileAppsSubmissionStatus**](UpdateMobileAppsSubmissionStatus.md)|  | 
+ **submissionId** | **int?**|  | 
+ **updateSubmissionStatus** | [**UpdateMobileAppsSubmissionStatus**](UpdateMobileAppsSubmissionStatus.md)|  | 
 
 ### Return type
 
@@ -464,15 +653,15 @@ Name | Type | Description  | Notes
 # **UploadImage**
 > RestApiResultMobileAppsImage UploadImage (string appId, System.IO.Stream image)
 
-Upload image mobile apps
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -489,7 +678,6 @@ namespace Example
 
             try
             {
-                // Upload image mobile apps
                 RestApiResultMobileAppsImage result = apiInstance.UploadImage(appId, image);
                 Debug.WriteLine(result);
             }
diff --git a/docs/MobileAppsDetails.md b/docs/MobileAppsDetails.md
deleted file mode 100644
index d2286696..00000000
--- a/docs/MobileAppsDetails.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Flipdish.Model.MobileAppsDetails
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**AppName** | **string** | App Name | [optional] 
-**AppDescription** | **string** | App Description | [optional] 
-**AppShortDescription** | **string** | App Description | [optional] 
-**Keywords** | **List&lt;string&gt;** | Keywords | [optional] 
-**AppLogoUrl** | **string** | Logo URL | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/MobileAppsImage.md b/docs/MobileAppsImage.md
index 495d1e2c..ee83aa82 100644
--- a/docs/MobileAppsImage.md
+++ b/docs/MobileAppsImage.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MobileAppsImage
+# Flipdish.Model.MobileAppsImage
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MobileAppsStatistics.md b/docs/MobileAppsStatistics.md
index 364503ed..5304a5e2 100644
--- a/docs/MobileAppsStatistics.md
+++ b/docs/MobileAppsStatistics.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MobileAppsStatistics
+# Flipdish.Model.MobileAppsStatistics
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MobileAppsSubmission.md b/docs/MobileAppsSubmission.md
index 331a8e50..a9f7ecfa 100644
--- a/docs/MobileAppsSubmission.md
+++ b/docs/MobileAppsSubmission.md
@@ -1,8 +1,9 @@
-# IO.Swagger.Model.MobileAppsSubmission
+# Flipdish.Model.MobileAppsSubmission
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**SubmissionId** | **int?** | Mobile Apps Submission Id | [optional] 
 **AppName** | **string** | App Name | 
 **AppDescription** | **string** | App Description | 
 **AppShortDescription** | **string** | App Description | 
diff --git a/docs/MobileAppsSubmissionDetails.md b/docs/MobileAppsSubmissionDetails.md
index c63980b0..82b7816d 100644
--- a/docs/MobileAppsSubmissionDetails.md
+++ b/docs/MobileAppsSubmissionDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MobileAppsSubmissionDetails
+# Flipdish.Model.MobileAppsSubmissionDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MobileAppsSubmissionStatus.md b/docs/MobileAppsSubmissionStatus.md
index 80f9b249..ec2d7762 100644
--- a/docs/MobileAppsSubmissionStatus.md
+++ b/docs/MobileAppsSubmissionStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.MobileAppsSubmissionStatus
+# Flipdish.Model.MobileAppsSubmissionStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/MobileAppsSubmissionStatusUpdatedEvent.md b/docs/MobileAppsSubmissionStatusUpdatedEvent.md
new file mode 100644
index 00000000..5bfb3880
--- /dev/null
+++ b/docs/MobileAppsSubmissionStatusUpdatedEvent.md
@@ -0,0 +1,20 @@
+# Flipdish.Model.MobileAppsSubmissionStatusUpdatedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
+**Description** | **string** | Description | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has created the item | [optional] 
+**MobileAppsSubmissionStatus** | [**MobileAppsSubmissionStatus**](MobileAppsSubmissionStatus.md) | Mobile Apps Submission Status | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/MobileAppsSubmissionUpdatedEvent.md b/docs/MobileAppsSubmissionUpdatedEvent.md
new file mode 100644
index 00000000..d85b4a59
--- /dev/null
+++ b/docs/MobileAppsSubmissionUpdatedEvent.md
@@ -0,0 +1,19 @@
+# Flipdish.Model.MobileAppsSubmissionUpdatedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
+**Description** | **string** | Description | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has created the item | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ModelBase.md b/docs/ModelBase.md
index 2d8fb7bb..f7e1cdb1 100644
--- a/docs/ModelBase.md
+++ b/docs/ModelBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ModelBase
+# Flipdish.Model.ModelBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Modifier.md b/docs/Modifier.md
deleted file mode 100644
index ba487101..00000000
--- a/docs/Modifier.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Flipdish.Model.Modifier
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**ProductId** | **string** | Unique product id | [optional] 
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**ProductType** | **string** | Product Type (SimpleProduct, Modifier, ModifierGroup, etc) | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-**IsArchived** | **bool?** | Returns true if the product is archived | [optional] 
-**Alcohol** | **bool?** | Product contains alcohol | [optional] 
-**Discriminator** | **string** |  | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/ModifierGroup.md b/docs/ModifierGroup.md
deleted file mode 100644
index 241604b9..00000000
--- a/docs/ModifierGroup.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Flipdish.Model.ModifierGroup
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**ProductId** | **string** | Unique product id | [optional] 
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**ProductType** | **string** | Product Type (SimpleProduct, Modifier, ModifierGroup, etc) | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-**IsArchived** | **bool?** | Returns true if the product is archived | [optional] 
-**Alcohol** | **bool?** | Product contains alcohol | [optional] 
-**Discriminator** | **string** |  | 
-**subProducts** | [**List&lt;ModifierGroupSubProduct&gt;**](ModifierGroupSubProduct.md) | Collection of products associated with this product | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/ModifierGroupSubProduct.md b/docs/ModifierGroupSubProduct.md
deleted file mode 100644
index b2382936..00000000
--- a/docs/ModifierGroupSubProduct.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.ModifierGroupSubProduct
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**PreselectedQuantity** | **int?** | Quantity of the modifier that will be set when the parent product is placed in the basket | [optional] 
-**ProductId** | **string** | Identifier of the ProductId to use as SubProduct | 
-**ProductType** | **string** | Type of the SupProduct | 
-**Product** | [**Product**](Product.md) | Details of the sub product | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/NextStatusWithOrderType.md b/docs/NextStatusWithOrderType.md
index c0eb8fa8..4d27b3c9 100644
--- a/docs/NextStatusWithOrderType.md
+++ b/docs/NextStatusWithOrderType.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.NextStatusWithOrderType
+# Flipdish.Model.NextStatusWithOrderType
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/NutritionInfo.md b/docs/NutritionInfo.md
new file mode 100644
index 00000000..dff2b0e0
--- /dev/null
+++ b/docs/NutritionInfo.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.NutritionInfo
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Version** | **string** | Version of the nutrition information model | [optional] 
+**MenuItems** | [**List&lt;NutritionInfoMenuItem&gt;**](NutritionInfoMenuItem.md) | List of menu item nutrition infos | [optional] 
+**MenuItemOptionSetItems** | [**List&lt;NutritionInfoMenuOptionSetItem&gt;**](NutritionInfoMenuOptionSetItem.md) | List of menu item option set nutrition infos | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/NutritionInfoItemAddUpdateLabelModel.md b/docs/NutritionInfoItemAddUpdateLabelModel.md
new file mode 100644
index 00000000..808c9213
--- /dev/null
+++ b/docs/NutritionInfoItemAddUpdateLabelModel.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.NutritionInfoItemAddUpdateLabelModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** | Name. | [optional] 
+**Values** | **List&lt;string&gt;** | Values. | [optional] 
+**IconUrl** | **string** | IconUrl. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/NutritionInfoLabel.md b/docs/NutritionInfoLabel.md
new file mode 100644
index 00000000..024c5b5d
--- /dev/null
+++ b/docs/NutritionInfoLabel.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.NutritionInfoLabel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** | Name of the allergen / ingredient | [optional] 
+**Values** | **List&lt;string&gt;** | Optional list of values for the allergen / ingredient | [optional] 
+**IconUrl** | **string** | Url to the icon for the allergen / ingredient | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/NutritionInfoMenuItem.md b/docs/NutritionInfoMenuItem.md
new file mode 100644
index 00000000..f6457b71
--- /dev/null
+++ b/docs/NutritionInfoMenuItem.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.NutritionInfoMenuItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PublicId** | **Guid?** | Menu item public id | [optional] 
+**Labels** | [**List&lt;NutritionInfoLabel&gt;**](NutritionInfoLabel.md) | List of Nutrition Info Labels for this menu item | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/NutritionInfoMenuOptionSetItem.md b/docs/NutritionInfoMenuOptionSetItem.md
new file mode 100644
index 00000000..efbaee50
--- /dev/null
+++ b/docs/NutritionInfoMenuOptionSetItem.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.NutritionInfoMenuOptionSetItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PublicId** | **Guid?** | Menu item option set item public id | [optional] 
+**Labels** | [**List&lt;NutritionInfoLabel&gt;**](NutritionInfoLabel.md) | List of Nutrition Info Labels for this menu item option set item | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/NutritionInfoV2.md b/docs/NutritionInfoV2.md
new file mode 100644
index 00000000..68127cda
--- /dev/null
+++ b/docs/NutritionInfoV2.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.NutritionInfoV2
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**MenuItems** | [**List&lt;NutritionInfoV2Item&gt;**](NutritionInfoV2Item.md) | List of menu item nutrition infos | [optional] 
+**MenuItemOptionSetItems** | [**List&lt;NutritionInfoV2Item&gt;**](NutritionInfoV2Item.md) | List of menu item option set nutrition infos | [optional] 
+**ImageBaseUrl** | **string** | Base url for allergen images | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/NutritionInfoV2Allergen.md b/docs/NutritionInfoV2Allergen.md
new file mode 100644
index 00000000..fe6c8e6c
--- /dev/null
+++ b/docs/NutritionInfoV2Allergen.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.NutritionInfoV2Allergen
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AllergenId** | **string** | AllergenId (unique string identifier) | [optional] 
+**LocalizedName** | **string** | Localized allergen name | [optional] 
+**ImageName** | **string** | Name of the image file. Append it to ImageBaseUrl to get the full URL | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/NutritionInfoV2Item.md b/docs/NutritionInfoV2Item.md
new file mode 100644
index 00000000..66c48ac1
--- /dev/null
+++ b/docs/NutritionInfoV2Item.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.NutritionInfoV2Item
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PublicId** | **Guid?** | Menu item or menu item option set item public id | [optional] 
+**Allergens** | [**List&lt;NutritionInfoV2Allergen&gt;**](NutritionInfoV2Allergen.md) | List of allergens for this item | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/OAuthApp.md b/docs/OAuthApp.md
index 7c8893ca..2aadfa2d 100644
--- a/docs/OAuthApp.md
+++ b/docs/OAuthApp.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OAuthApp
+# Flipdish.Model.OAuthApp
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OAuthClientsApi.md b/docs/OAuthClientsApi.md
index a494159a..e48c5393 100644
--- a/docs/OAuthClientsApi.md
+++ b/docs/OAuthClientsApi.md
@@ -1,35 +1,35 @@
-# IO.Swagger.Api.OAuthClientsApi
+# Flipdish.Api.OAuthClientsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AddRedirectUri**](OAuthClientsApi.md#addredirecturi) | **POST** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis | Create OAuth App redirect uri
-[**CreateOAuthApp**](OAuthClientsApi.md#createoauthapp) | **POST** /api/v1.0/{appId}/oauthclients | Create OAuth App
-[**DeleteOAuthApp**](OAuthClientsApi.md#deleteoauthapp) | **DELETE** /api/v1.0/{appId}/oauthclients/{oauthAppId} | Delete OAuth App
-[**GetOAuthApps**](OAuthClientsApi.md#getoauthapps) | **GET** /api/v1.0/{appId}/oauthclients | Get all OAuth Apps
-[**GetOAuthClientByClientId**](OAuthClientsApi.md#getoauthclientbyclientid) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId} | Get OAuth App by identifier
-[**GetOAuthClientSecret**](OAuthClientsApi.md#getoauthclientsecret) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/secret | Get OAuth App secret key
-[**GetOauthAccessToken**](OAuthClientsApi.md#getoauthaccesstoken) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/accesstoken | Get OAuth access token for App
-[**GetRedirectUris**](OAuthClientsApi.md#getredirecturis) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis | Get OAuth App redirect uris
+[**AddRedirectUri**](OAuthClientsApi.md#addredirecturi) | **POST** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis | 
+[**CreateOAuthApp**](OAuthClientsApi.md#createoauthapp) | **POST** /api/v1.0/{appId}/oauthclients | 
+[**DeleteOAuthApp**](OAuthClientsApi.md#deleteoauthapp) | **DELETE** /api/v1.0/{appId}/oauthclients/{oauthAppId} | 
+[**GetOAuthApps**](OAuthClientsApi.md#getoauthapps) | **GET** /api/v1.0/{appId}/oauthclients | 
+[**GetOAuthClientByClientId**](OAuthClientsApi.md#getoauthclientbyclientid) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId} | 
+[**GetOAuthClientSecret**](OAuthClientsApi.md#getoauthclientsecret) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/secret | 
+[**GetOauthAccessToken**](OAuthClientsApi.md#getoauthaccesstoken) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/accesstoken | 
+[**GetRedirectUris**](OAuthClientsApi.md#getredirecturis) | **GET** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis | 
 [**OAuthClientsGetApplications**](OAuthClientsApi.md#oauthclientsgetapplications) | **GET** /api/v1.0/{appId}/oauthclients/appnames | 
-[**RemoveRedirectUri**](OAuthClientsApi.md#removeredirecturi) | **DELETE** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis/{uriId} | Delete OAuth App redirect uri
-[**UpdateOAuthApp**](OAuthClientsApi.md#updateoauthapp) | **POST** /api/v1.0/{appId}/oauthclients/{oauthAppId} | Update OAuth App
+[**RemoveRedirectUri**](OAuthClientsApi.md#removeredirecturi) | **DELETE** /api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis/{uriId} | 
+[**UpdateOAuthApp**](OAuthClientsApi.md#updateoauthapp) | **POST** /api/v1.0/{appId}/oauthclients/{oauthAppId} | 
 
 
 <a name="addredirecturi"></a>
 # **AddRedirectUri**
 > RestApiResultOauthClientRedirectUri AddRedirectUri (string oauthAppId, string uri, string appId)
 
-Create OAuth App redirect uri
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -41,13 +41,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
-            var uri = uri_example;  // string | Redirect uri
+            var oauthAppId = oauthAppId_example;  // string | 
+            var uri = uri_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Create OAuth App redirect uri
                 RestApiResultOauthClientRedirectUri result = apiInstance.AddRedirectUri(oauthAppId, uri, appId);
                 Debug.WriteLine(result);
             }
@@ -64,8 +63,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
- **uri** | **string**| Redirect uri | 
+ **oauthAppId** | **string**|  | 
+ **uri** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -87,15 +86,15 @@ Name | Type | Description  | Notes
 # **CreateOAuthApp**
 > void CreateOAuthApp (OAuthApp oAuthApp, string appId)
 
-Create OAuth App
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -107,12 +106,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oAuthApp = new OAuthApp(); // OAuthApp | OAuth App
+            var oAuthApp = new OAuthApp(); // OAuthApp | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Create OAuth App
                 apiInstance.CreateOAuthApp(oAuthApp, appId);
             }
             catch (Exception e)
@@ -128,7 +126,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oAuthApp** | [**OAuthApp**](OAuthApp.md)| OAuth App | 
+ **oAuthApp** | [**OAuthApp**](OAuthApp.md)|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -150,15 +148,15 @@ void (empty response body)
 # **DeleteOAuthApp**
 > void DeleteOAuthApp (string oauthAppId, string appId)
 
-Delete OAuth App
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -170,12 +168,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
+            var oauthAppId = oauthAppId_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Delete OAuth App
                 apiInstance.DeleteOAuthApp(oauthAppId, appId);
             }
             catch (Exception e)
@@ -191,7 +188,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
+ **oauthAppId** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -213,15 +210,15 @@ void (empty response body)
 # **GetOAuthApps**
 > RestApiArrayResultOAuthApp GetOAuthApps (string appId, string oauthAppName = null)
 
-Get all OAuth Apps
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -238,7 +235,6 @@ namespace Example
 
             try
             {
-                // Get all OAuth Apps
                 RestApiArrayResultOAuthApp result = apiInstance.GetOAuthApps(appId, oauthAppName);
                 Debug.WriteLine(result);
             }
@@ -277,15 +273,15 @@ Name | Type | Description  | Notes
 # **GetOAuthClientByClientId**
 > RestApiResultOAuthApp GetOAuthClientByClientId (string oauthAppId, string appId)
 
-Get OAuth App by identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -297,12 +293,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
+            var oauthAppId = oauthAppId_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Get OAuth App by identifier
                 RestApiResultOAuthApp result = apiInstance.GetOAuthClientByClientId(oauthAppId, appId);
                 Debug.WriteLine(result);
             }
@@ -319,7 +314,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
+ **oauthAppId** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -341,15 +336,15 @@ Name | Type | Description  | Notes
 # **GetOAuthClientSecret**
 > RestApiStringResult GetOAuthClientSecret (string oauthAppId, string appId)
 
-Get OAuth App secret key
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -361,12 +356,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
+            var oauthAppId = oauthAppId_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Get OAuth App secret key
                 RestApiStringResult result = apiInstance.GetOAuthClientSecret(oauthAppId, appId);
                 Debug.WriteLine(result);
             }
@@ -383,7 +377,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
+ **oauthAppId** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -405,15 +399,15 @@ Name | Type | Description  | Notes
 # **GetOauthAccessToken**
 > RestApiStringResult GetOauthAccessToken (string oauthAppId, string appId)
 
-Get OAuth access token for App
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -425,12 +419,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
+            var oauthAppId = oauthAppId_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Get OAuth access token for App
                 RestApiStringResult result = apiInstance.GetOauthAccessToken(oauthAppId, appId);
                 Debug.WriteLine(result);
             }
@@ -447,7 +440,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
+ **oauthAppId** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -469,15 +462,15 @@ Name | Type | Description  | Notes
 # **GetRedirectUris**
 > RestApiArrayResultOauthClientRedirectUri GetRedirectUris (string oauthAppId, string appId)
 
-Get OAuth App redirect uris
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -489,12 +482,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
+            var oauthAppId = oauthAppId_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Get OAuth App redirect uris
                 RestApiArrayResultOauthClientRedirectUri result = apiInstance.GetRedirectUris(oauthAppId, appId);
                 Debug.WriteLine(result);
             }
@@ -511,7 +503,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
+ **oauthAppId** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -539,9 +531,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -594,15 +586,15 @@ Name | Type | Description  | Notes
 # **RemoveRedirectUri**
 > void RemoveRedirectUri (string oauthAppId, int? uriId, string appId)
 
-Delete OAuth App redirect uri
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -614,13 +606,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
-            var uriId = 56;  // int? | Redirect uri identifier
+            var oauthAppId = oauthAppId_example;  // string | 
+            var uriId = 56;  // int? | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Delete OAuth App redirect uri
                 apiInstance.RemoveRedirectUri(oauthAppId, uriId, appId);
             }
             catch (Exception e)
@@ -636,8 +627,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
- **uriId** | **int?**| Redirect uri identifier | 
+ **oauthAppId** | **string**|  | 
+ **uriId** | **int?**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -659,15 +650,15 @@ void (empty response body)
 # **UpdateOAuthApp**
 > void UpdateOAuthApp (string oauthAppId, OAuthApp oAuthApp, string appId)
 
-Update OAuth App
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -679,13 +670,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OAuthClientsApi();
-            var oauthAppId = oauthAppId_example;  // string | OAuth App identifier
-            var oAuthApp = new OAuthApp(); // OAuthApp | OAuth App
+            var oauthAppId = oauthAppId_example;  // string | 
+            var oAuthApp = new OAuthApp(); // OAuthApp | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Update OAuth App
                 apiInstance.UpdateOAuthApp(oauthAppId, oAuthApp, appId);
             }
             catch (Exception e)
@@ -701,8 +691,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| OAuth App identifier | 
- **oAuthApp** | [**OAuthApp**](OAuthApp.md)| OAuth App | 
+ **oauthAppId** | **string**|  | 
+ **oAuthApp** | [**OAuthApp**](OAuthApp.md)|  | 
  **appId** | **string**|  | 
 
 ### Return type
diff --git a/docs/OAuthTokenModel.md b/docs/OAuthTokenModel.md
index 3ccc4cef..5f1b5a9f 100644
--- a/docs/OAuthTokenModel.md
+++ b/docs/OAuthTokenModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OAuthTokenModel
+# Flipdish.Model.OAuthTokenModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OauthClientRedirectUri.md b/docs/OauthClientRedirectUri.md
index a5d600c8..1844c34e 100644
--- a/docs/OauthClientRedirectUri.md
+++ b/docs/OauthClientRedirectUri.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OauthClientRedirectUri
+# Flipdish.Model.OauthClientRedirectUri
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ObjectDisplayOrder.md b/docs/ObjectDisplayOrder.md
index 270d924d..c6ba2406 100644
--- a/docs/ObjectDisplayOrder.md
+++ b/docs/ObjectDisplayOrder.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ObjectDisplayOrder
+# Flipdish.Model.ObjectDisplayOrder
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OktaPortalFeatureFlag.md b/docs/OktaPortalFeatureFlag.md
new file mode 100644
index 00000000..e917ef06
--- /dev/null
+++ b/docs/OktaPortalFeatureFlag.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.OktaPortalFeatureFlag
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**OktaPortalEnabled** | **bool?** | Feature flag backend_portal_enableOktaWebApi value | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/OnboardingApi.md b/docs/OnboardingApi.md
index 6212e583..2cce27cd 100644
--- a/docs/OnboardingApi.md
+++ b/docs/OnboardingApi.md
@@ -1,13 +1,17 @@
-# IO.Swagger.Api.OnboardingApi
+# Flipdish.Api.OnboardingApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**OnboardingGetOnboardingConfig**](OnboardingApi.md#onboardinggetonboardingconfig) | **GET** /api/v1.0/clients/{appId}/onboarding/config | 
+[**OnboardingGetOnboardingConfigs**](OnboardingApi.md#onboardinggetonboardingconfigs) | **GET** /api/v1.0/clients/{appId}/onboarding/configs | 
 [**OnboardingGetOnboardingItems**](OnboardingApi.md#onboardinggetonboardingitems) | **GET** /api/v1.0/clients/{appId}/onboarding/stores/{storeId} | 
+[**OnboardingGetOnboardingItemsV2**](OnboardingApi.md#onboardinggetonboardingitemsv2) | **GET** /api/v1.0/clients/{appId}/onboarding/stores | 
 [**OnboardingUpdateOnboardingConfig**](OnboardingApi.md#onboardingupdateonboardingconfig) | **POST** /api/v1.0/clients/{appId}/onboarding/config | 
+[**OnboardingUpdateOnboardingConfigById**](OnboardingApi.md#onboardingupdateonboardingconfigbyid) | **POST** /api/v1.0/clients/{appId}/onboarding/config/{configId} | 
 [**OnboardingUpdateOnboardingItem**](OnboardingApi.md#onboardingupdateonboardingitem) | **POST** /api/v1.0/clients/{appId}/onboarding/stores/{storeId}/items/{onboardingItemId} | 
+[**OnboardingUpdateOnboardingItemV2**](OnboardingApi.md#onboardingupdateonboardingitemv2) | **POST** /api/v1.0/clients/{appId}/onboarding/stores/items/{onboardingItemId} | 
 
 
 <a name="onboardinggetonboardingconfig"></a>
@@ -20,9 +24,9 @@ Method | HTTP request | Description
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -71,9 +75,70 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="onboardinggetonboardingconfigs"></a>
+# **OnboardingGetOnboardingConfigs**
+> Object OnboardingGetOnboardingConfigs (string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class OnboardingGetOnboardingConfigsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new OnboardingApi();
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                Object result = apiInstance.OnboardingGetOnboardingConfigs(appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling OnboardingApi.OnboardingGetOnboardingConfigs: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="onboardinggetonboardingitems"></a>
 # **OnboardingGetOnboardingItems**
-> Object OnboardingGetOnboardingItems (string appId, int? storeId)
+> Object OnboardingGetOnboardingItems (string appId, int? storeId, int? milestoneId = null)
 
 
 
@@ -81,9 +146,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -97,10 +162,11 @@ namespace Example
             var apiInstance = new OnboardingApi();
             var appId = appId_example;  // string | 
             var storeId = 56;  // int? | 
+            var milestoneId = 56;  // int? |  (optional) 
 
             try
             {
-                Object result = apiInstance.OnboardingGetOnboardingItems(appId, storeId);
+                Object result = apiInstance.OnboardingGetOnboardingItems(appId, storeId, milestoneId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -118,6 +184,72 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **appId** | **string**|  | 
  **storeId** | **int?**|  | 
+ **milestoneId** | **int?**|  | [optional] 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="onboardinggetonboardingitemsv2"></a>
+# **OnboardingGetOnboardingItemsV2**
+> Object OnboardingGetOnboardingItemsV2 (string appId, int? storeId = null, int? milestoneId = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class OnboardingGetOnboardingItemsV2Example
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new OnboardingApi();
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? |  (optional) 
+            var milestoneId = 56;  // int? |  (optional) 
+
+            try
+            {
+                Object result = apiInstance.OnboardingGetOnboardingItemsV2(appId, storeId, milestoneId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling OnboardingApi.OnboardingGetOnboardingItemsV2: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | [optional] 
+ **milestoneId** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -144,9 +276,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -197,6 +329,71 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="onboardingupdateonboardingconfigbyid"></a>
+# **OnboardingUpdateOnboardingConfigById**
+> Object OnboardingUpdateOnboardingConfigById (string appId, int? configId, OnboardingConfigUpdate configUpdate)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class OnboardingUpdateOnboardingConfigByIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new OnboardingApi();
+            var appId = appId_example;  // string | 
+            var configId = 56;  // int? | 
+            var configUpdate = new OnboardingConfigUpdate(); // OnboardingConfigUpdate | 
+
+            try
+            {
+                Object result = apiInstance.OnboardingUpdateOnboardingConfigById(appId, configId, configUpdate);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling OnboardingApi.OnboardingUpdateOnboardingConfigById: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **configId** | **int?**|  | 
+ **configUpdate** | [**OnboardingConfigUpdate**](OnboardingConfigUpdate.md)|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="onboardingupdateonboardingitem"></a>
 # **OnboardingUpdateOnboardingItem**
 > Object OnboardingUpdateOnboardingItem (string appId, int? storeId, int? onboardingItemId, OnboardingItemUpdate itemUpdate)
@@ -207,9 +404,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -264,3 +461,70 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="onboardingupdateonboardingitemv2"></a>
+# **OnboardingUpdateOnboardingItemV2**
+> Object OnboardingUpdateOnboardingItemV2 (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class OnboardingUpdateOnboardingItemV2Example
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new OnboardingApi();
+            var appId = appId_example;  // string | 
+            var onboardingItemId = 56;  // int? | 
+            var itemUpdate = new OnboardingItemUpdate(); // OnboardingItemUpdate | 
+            var storeId = 56;  // int? |  (optional) 
+
+            try
+            {
+                Object result = apiInstance.OnboardingUpdateOnboardingItemV2(appId, onboardingItemId, itemUpdate, storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling OnboardingApi.OnboardingUpdateOnboardingItemV2: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **onboardingItemId** | **int?**|  | 
+ **itemUpdate** | [**OnboardingItemUpdate**](OnboardingItemUpdate.md)|  | 
+ **storeId** | **int?**|  | [optional] 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/OnboardingConfigUpdate.md b/docs/OnboardingConfigUpdate.md
index d9c06a35..7ecd5857 100644
--- a/docs/OnboardingConfigUpdate.md
+++ b/docs/OnboardingConfigUpdate.md
@@ -1,10 +1,11 @@
-# IO.Swagger.Model.OnboardingConfigUpdate
+# Flipdish.Model.OnboardingConfigUpdate
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **IsEnabled** | **bool?** | Gets or sets whether onboarding is enabled | [optional] 
-**IsWelcomeScreenEnabled** | **bool?** |  | [optional] 
+**IsWelcomeScreenEnabled** | **bool?** | Gets or sets whether welcome screen is enabled | [optional] 
+**ConfigType** | **string** | Onboarding config type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OnboardingItemUpdate.md b/docs/OnboardingItemUpdate.md
index ce0724ec..2480be94 100644
--- a/docs/OnboardingItemUpdate.md
+++ b/docs/OnboardingItemUpdate.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OnboardingItemUpdate
+# Flipdish.Model.OnboardingItemUpdate
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Order.md b/docs/Order.md
index 7bbddab9..546310d0 100644
--- a/docs/Order.md
+++ b/docs/Order.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Order
+# Flipdish.Model.Order
 ## Properties
 
 Name | Type | Description | Notes
@@ -20,9 +20,11 @@ Name | Type | Description | Notes
 **ChannelOrderId** | **string** | ChannelOrderId from external channel | [optional] 
 **ChannelOrderDisplayId** | **string** | ChannelOrderDisplayId from external channel | [optional] 
 **Channel** | [**Channel**](Channel.md) | Channel where the Order comes from | [optional] 
-**ReceiptCode** | **string** | Generated receipt code for an order | [optional] 
 **OrderDropOffLocation** | [**OrderDropOffLocation**](OrderDropOffLocation.md) | DropOffLocation selected for this order | [optional] 
 **FulfillmentStatus** | [**OrderFulfillmentStatusBase**](OrderFulfillmentStatusBase.md) | [BETA - this is a new field in development] Fulfillment status for this order | [optional] 
+**OrderBatchInfo** | [**OrderBatchSummary**](OrderBatchSummary.md) | OrderBatch information | [optional] 
+**TaxItems** | [**List&lt;TaxItem&gt;**](TaxItem.md) | A collection of tax items on the order. | [optional] 
+**CreatedCampaignVoucherId** | **int?** | The id of the campaign voucher that was created from this order | [optional] 
 **OrderId** | **int?** | Order identifier | [optional] 
 **LocalOrderId** | **string** | Local order Id. This is used for displaying a \&quot;shorter\&quot; order ID for customers (eg. Kiosk orders) | [optional] 
 **DeliveryType** | **string** | Delivery type | [optional] 
@@ -51,6 +53,9 @@ Name | Type | Description | Notes
 **DriverId** | **int?** | Assigned driver identifier | [optional] 
 **TotalTax** | **double?** | Total tax applied to order | [optional] 
 **OrderTrackingCode** | **string** | Unique, 6 character long alpha numeric code for tracking. | [optional] 
+**DeliveryFeeAreaId** | **int?** | Delivery area identifier | [optional] 
+**ReceiptCode** | **string** | Code used to view the order&#39;s receipt | [optional] 
+**TotalDepositReturnFeeAmount** | **double?** | This contains the total deposit return fee amount for the order. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderAcceptedEvent.md b/docs/OrderAcceptedEvent.md
index 9b4ad4ad..b30be962 100644
--- a/docs/OrderAcceptedEvent.md
+++ b/docs/OrderAcceptedEvent.md
@@ -1,17 +1,21 @@
-# IO.Swagger.Model.OrderAcceptedEvent
+# Flipdish.Model.OrderAcceptedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **Description** | **string** | Description | [optional] 
 **OrderAcceptedTime** | **DateTime?** | Order Accepted Time | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has accepted the order | [optional] 
 **Order** | [**Order**](Order.md) | Order | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderBatch.md b/docs/OrderBatch.md
index d33cbb55..cd84f01c 100644
--- a/docs/OrderBatch.md
+++ b/docs/OrderBatch.md
@@ -1,13 +1,13 @@
-# IO.Swagger.Model.OrderBatch
+# Flipdish.Model.OrderBatch
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**OrderIds** | **List&lt;int?&gt;** | Orders&#39; ids on the batch | [optional] 
 **Id** | **int?** | Order batch id | [optional] 
 **DisplayCode** | **string** | Order batch 6-sign human readable code | [optional] 
 **CreateTime** | **DateTime?** | Batch creation date and time | [optional] 
 **IsPublished** | **bool?** | If the batch is already published | [optional] 
-**OrderIds** | **List&lt;int?&gt;** | Orders&#39; ids on the batch | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderBatchApi.md b/docs/OrderBatchApi.md
deleted file mode 100644
index a11a7e30..00000000
--- a/docs/OrderBatchApi.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Flipdish.Api.OrderBatchApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**GetAllOrderBatches**](OrderBatchApi.md#getallorderbatches) | **GET** /api/v1.0/{appId}/stores/{storeId}/order-batches | Returns order batches created in a given time range
-
-
-<a name="getallorderbatches"></a>
-# **GetAllOrderBatches**
-> RestApiArrayResultOrderBatchItem GetAllOrderBatches (string appId, int? storeId, DateTime? startDate, DateTime? endDate)
-
-Returns order batches created in a given time range
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class GetAllOrderBatchesExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new OrderBatchApi();
-            var appId = appId_example;  // string | App Id
-            var storeId = 56;  // int? | Store Id
-            var startDate = 2013-10-20T19:20:30+01:00;  // DateTime? | Start Date
-            var endDate = 2013-10-20T19:20:30+01:00;  // DateTime? | End Date
-
-            try
-            {
-                // Returns order batches created in a given time range
-                RestApiArrayResultOrderBatchItem result = apiInstance.GetAllOrderBatches(appId, storeId, startDate, endDate);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling OrderBatchApi.GetAllOrderBatches: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **storeId** | **int?**| Store Id | 
- **startDate** | **DateTime?**| Start Date | 
- **endDate** | **DateTime?**| End Date | 
-
-### Return type
-
-[**RestApiArrayResultOrderBatchItem**](RestApiArrayResultOrderBatchItem.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/OrderBatchItem.md b/docs/OrderBatchItem.md
deleted file mode 100644
index 7095ff67..00000000
--- a/docs/OrderBatchItem.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# IO.Swagger.Model.OrderBatchItem
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**BatchId** | **int?** | Unique identifier | [optional] 
-**CreatedAt** | **DateTime?** | Creation date | [optional] 
-**IsPublished** | **bool?** | Is dispatched | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/OrderBatchPublishedEvent.md b/docs/OrderBatchPublishedEvent.md
new file mode 100644
index 00000000..3841ec20
--- /dev/null
+++ b/docs/OrderBatchPublishedEvent.md
@@ -0,0 +1,20 @@
+# Flipdish.Model.OrderBatchPublishedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
+**OrderBatchId** | **int?** | Order Batch Id | [optional] 
+**StoreId** | **int?** | Store id the order batch belogs to | [optional] 
+**OrderIds** | **List&lt;int?&gt;** | Orders&#39; ids on the batch | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/OrderBatchSummary.md b/docs/OrderBatchSummary.md
new file mode 100644
index 00000000..cff4f916
--- /dev/null
+++ b/docs/OrderBatchSummary.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.OrderBatchSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int?** | Order batch id | [optional] 
+**DisplayCode** | **string** | Order batch 6-sign human readable code | [optional] 
+**CreateTime** | **DateTime?** | Batch creation date and time | [optional] 
+**IsPublished** | **bool?** | If the batch is already published | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/OrderBatchesApi.md b/docs/OrderBatchesApi.md
index b5dbb54f..5cc995c2 100644
--- a/docs/OrderBatchesApi.md
+++ b/docs/OrderBatchesApi.md
@@ -1,28 +1,26 @@
-# IO.Swagger.Api.OrderBatchesApi
+# Flipdish.Api.OrderBatchesApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetAllOrderBatches**](OrderBatchesApi.md#getallorderbatches) | **GET** /api/v1.0/{appId}/stores/{storeId}/order-batches | Returns order batches
-[**GetOrderBatch**](OrderBatchesApi.md#getorderbatch) | **GET** /api/v1.0/{appId}/stores/{storeId}/order-batches/{batchId} | Returns the order batch details
+[**GetAllOrderBatches**](OrderBatchesApi.md#getallorderbatches) | **GET** /api/v1.0/{appId}/order-batches | 
+[**GetOrderBatch**](OrderBatchesApi.md#getorderbatch) | **GET** /api/v1.0/{appId}/order-batches/{orderBatchId} | 
 
 
 <a name="getallorderbatches"></a>
 # **GetAllOrderBatches**
-> RestApiArrayResultOrderBatchItem GetAllOrderBatches (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null)
+> RestApiArrayResultOrderBatch GetAllOrderBatches (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null)
 
-Returns order batches
 
-Entries are sorted by date, from the most recent. At most 100 entries are returned.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -34,15 +32,14 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrderBatchesApi();
-            var appId = appId_example;  // string | App Id
-            var storeId = 56;  // int? | Store Id
-            var createdFrom = 2013-10-20T19:20:30+01:00;  // DateTime? | Start date for retrieving the entries (optional) 
-            var createdTo = 2013-10-20T19:20:30+01:00;  // DateTime? | End date for retrieving the entries (optional) 
+            var appId = appId_example;  // string | 
+            var storeIds = new List<int?>(); // List<int?> |  (optional) 
+            var createdFrom = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var createdTo = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
 
             try
             {
-                // Returns order batches
-                RestApiArrayResultOrderBatchItem result = apiInstance.GetAllOrderBatches(appId, storeId, createdFrom, createdTo);
+                RestApiArrayResultOrderBatch result = apiInstance.GetAllOrderBatches(appId, storeIds, createdFrom, createdTo);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -58,14 +55,14 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **storeId** | **int?**| Store Id | 
- **createdFrom** | **DateTime?**| Start date for retrieving the entries | [optional] 
- **createdTo** | **DateTime?**| End date for retrieving the entries | [optional] 
+ **appId** | **string**|  | 
+ **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **createdFrom** | **DateTime?**|  | [optional] 
+ **createdTo** | **DateTime?**|  | [optional] 
 
 ### Return type
 
-[**RestApiArrayResultOrderBatchItem**](RestApiArrayResultOrderBatchItem.md)
+[**RestApiArrayResultOrderBatch**](RestApiArrayResultOrderBatch.md)
 
 ### Authorization
 
@@ -80,17 +77,17 @@ Name | Type | Description  | Notes
 
 <a name="getorderbatch"></a>
 # **GetOrderBatch**
-> RestApiResultOrderBatch GetOrderBatch (string appId, int? storeId, int? batchId)
+> RestApiResultOrderBatch GetOrderBatch (string appId, int? orderBatchId)
+
 
-Returns the order batch details
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -102,14 +99,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrderBatchesApi();
-            var appId = appId_example;  // string | App Id
-            var storeId = 56;  // int? | Store Id
-            var batchId = 56;  // int? | Order Batch Id
+            var appId = appId_example;  // string | 
+            var orderBatchId = 56;  // int? | 
 
             try
             {
-                // Returns the order batch details
-                RestApiResultOrderBatch result = apiInstance.GetOrderBatch(appId, storeId, batchId);
+                RestApiResultOrderBatch result = apiInstance.GetOrderBatch(appId, orderBatchId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -125,9 +120,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **storeId** | **int?**| Store Id | 
- **batchId** | **int?**| Order Batch Id | 
+ **appId** | **string**|  | 
+ **orderBatchId** | **int?**|  | 
 
 ### Return type
 
diff --git a/docs/OrderBatchingConfiguration.md b/docs/OrderBatchingConfiguration.md
index 987230f7..84ec1c2a 100644
--- a/docs/OrderBatchingConfiguration.md
+++ b/docs/OrderBatchingConfiguration.md
@@ -1,9 +1,9 @@
-# IO.Swagger.Model.OrderBatchingConfiguration
+# Flipdish.Model.OrderBatchingConfiguration
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**BatchIntervalInMinutes** | **int?** | Batch sending interval in minutes | [optional] 
+**BatchIntervalInSeconds** | **int?** | Batch sending interval in seconds | [optional] 
 **IsEnabled** | **bool?** | OrderBatching is enabled or not | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/OrderBatchingConfigurationApi.md b/docs/OrderBatchingConfigurationApi.md
index 2b0cdddd..b4ed4a0f 100644
--- a/docs/OrderBatchingConfigurationApi.md
+++ b/docs/OrderBatchingConfigurationApi.md
@@ -1,26 +1,26 @@
-# IO.Swagger.Api.OrderBatchingConfigurationApi
+# Flipdish.Api.OrderBatchingConfigurationApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**Get**](OrderBatchingConfigurationApi.md#get) | **GET** /api/v1.0/stores/{storeId}/order-batching-configuration | Returns order batching configuration for a specific store
-[**Post**](OrderBatchingConfigurationApi.md#post) | **POST** /api/v1.0/stores/{storeId}/order-batching-configuration | Sets order batching configuration for a specific store
+[**Get**](OrderBatchingConfigurationApi.md#get) | **GET** /api/v1.0/stores/{storeId}/order-batching-configuration | 
+[**Post**](OrderBatchingConfigurationApi.md#post) | **POST** /api/v1.0/stores/{storeId}/order-batching-configuration | 
 
 
 <a name="get"></a>
 # **Get**
 > RestApiResultOrderBatchingConfiguration Get (int? storeId)
 
-Returns order batching configuration for a specific store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -32,11 +32,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrderBatchingConfigurationApi();
-            var storeId = 56;  // int? | Store Id
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Returns order batching configuration for a specific store
                 RestApiResultOrderBatchingConfiguration result = apiInstance.Get(storeId);
                 Debug.WriteLine(result);
             }
@@ -53,7 +52,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -74,15 +73,15 @@ Name | Type | Description  | Notes
 # **Post**
 > void Post (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration)
 
-Sets order batching configuration for a specific store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -94,12 +93,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrderBatchingConfigurationApi();
-            var storeId = 56;  // int? | Store Id
-            var setOrderBatchingConfiguration = new SetOrderBatchingConfiguration(); // SetOrderBatchingConfiguration | SetOrderBatchingConfiguration
+            var storeId = 56;  // int? | 
+            var setOrderBatchingConfiguration = new SetOrderBatchingConfiguration(); // SetOrderBatchingConfiguration | 
 
             try
             {
-                // Sets order batching configuration for a specific store
                 apiInstance.Post(storeId, setOrderBatchingConfiguration);
             }
             catch (Exception e)
@@ -115,8 +113,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id | 
- **setOrderBatchingConfiguration** | [**SetOrderBatchingConfiguration**](SetOrderBatchingConfiguration.md)| SetOrderBatchingConfiguration | 
+ **storeId** | **int?**|  | 
+ **setOrderBatchingConfiguration** | [**SetOrderBatchingConfiguration**](SetOrderBatchingConfiguration.md)|  | 
 
 ### Return type
 
diff --git a/docs/OrderCapacityConfigUpdatedEvent.md b/docs/OrderCapacityConfigUpdatedEvent.md
index e9fa0dda..17fe14a5 100644
--- a/docs/OrderCapacityConfigUpdatedEvent.md
+++ b/docs/OrderCapacityConfigUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderCapacityConfigUpdatedEvent
+# Flipdish.Model.OrderCapacityConfigUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderCreatedEvent.md b/docs/OrderCreatedEvent.md
index 5cbb833d..168821a2 100644
--- a/docs/OrderCreatedEvent.md
+++ b/docs/OrderCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderCreatedEvent
+# Flipdish.Model.OrderCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderCustomerTrackingCreatedEvent.md b/docs/OrderCustomerTrackingCreatedEvent.md
index 271b6143..4068e6a2 100644
--- a/docs/OrderCustomerTrackingCreatedEvent.md
+++ b/docs/OrderCustomerTrackingCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderCustomerTrackingCreatedEvent
+# Flipdish.Model.OrderCustomerTrackingCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderDeliveryInformation.md b/docs/OrderDeliveryInformation.md
index 7a983723..3208d736 100644
--- a/docs/OrderDeliveryInformation.md
+++ b/docs/OrderDeliveryInformation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderDeliveryInformation
+# Flipdish.Model.OrderDeliveryInformation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OrderDeliveryInformationBase.md b/docs/OrderDeliveryInformationBase.md
index 8068c9c3..39202adb 100644
--- a/docs/OrderDeliveryInformationBase.md
+++ b/docs/OrderDeliveryInformationBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderDeliveryInformationBase
+# Flipdish.Model.OrderDeliveryInformationBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OrderDeliveryTrackingStatusUpdatedEvent.md b/docs/OrderDeliveryTrackingStatusUpdatedEvent.md
index 56e62914..7f621bae 100644
--- a/docs/OrderDeliveryTrackingStatusUpdatedEvent.md
+++ b/docs/OrderDeliveryTrackingStatusUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderDeliveryTrackingStatusUpdatedEvent
+# Flipdish.Model.OrderDeliveryTrackingStatusUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,11 +6,16 @@ Name | Type | Description | Notes
 **EventName** | **string** | The event name | [optional] 
 **Description** | **string** | Description | [optional] 
 **Order** | [**Order**](Order.md) | Order | [optional] 
+**DeliveryIntegrationName** | **string** | Delivery integration name | [optional] 
+**DeliveryErrorMessage** | **string** | Delivery error message (optional) | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderDispatchedEvent.md b/docs/OrderDispatchedEvent.md
index 6a259114..567a1a13 100644
--- a/docs/OrderDispatchedEvent.md
+++ b/docs/OrderDispatchedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderDispatchedEvent
+# Flipdish.Model.OrderDispatchedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderDropOffLocation.md b/docs/OrderDropOffLocation.md
index 1de39a0c..d66cbfd8 100644
--- a/docs/OrderDropOffLocation.md
+++ b/docs/OrderDropOffLocation.md
@@ -1,14 +1,14 @@
-# IO.Swagger.Model.OrderDropOffLocation
+# Flipdish.Model.OrderDropOffLocation
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**OrderId** | **int?** |  | [optional] 
-**LocationName** | **string** |  | [optional] 
-**LocationAreaName** | **string** |  | [optional] 
-**LocationId** | **int?** |  | [optional] 
-**LocationAreaId** | **int?** |  | [optional] 
-**ExternalLocationId** | **string** |  | [optional] 
+**OrderId** | **int?** | OrderId. | [optional] 
+**LocationName** | **string** | LocationName. | [optional] 
+**LocationAreaName** | **string** | LocationAreaName. | [optional] 
+**LocationId** | **int?** | LocationId. | [optional] 
+**LocationAreaId** | **int?** | LocationAreaId. | [optional] 
+**ExternalLocationId** | **string** | ExternalLocationId. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderFulfillmentStatus.md b/docs/OrderFulfillmentStatus.md
index ed74a017..9403c748 100644
--- a/docs/OrderFulfillmentStatus.md
+++ b/docs/OrderFulfillmentStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderFulfillmentStatus
+# Flipdish.Model.OrderFulfillmentStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OrderFulfillmentStatusBase.md b/docs/OrderFulfillmentStatusBase.md
index f0b8f7af..7ee00d7b 100644
--- a/docs/OrderFulfillmentStatusBase.md
+++ b/docs/OrderFulfillmentStatusBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderFulfillmentStatusBase
+# Flipdish.Model.OrderFulfillmentStatusBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OrderFulfillmentStatusUpdate.md b/docs/OrderFulfillmentStatusUpdate.md
index a202e97f..2581e862 100644
--- a/docs/OrderFulfillmentStatusUpdate.md
+++ b/docs/OrderFulfillmentStatusUpdate.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderFulfillmentStatusUpdate
+# Flipdish.Model.OrderFulfillmentStatusUpdate
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OrderFulfillmentStatusUpdatedEvent.md b/docs/OrderFulfillmentStatusUpdatedEvent.md
index 62077d54..0cb0a8b3 100644
--- a/docs/OrderFulfillmentStatusUpdatedEvent.md
+++ b/docs/OrderFulfillmentStatusUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderFulfillmentStatusUpdatedEvent
+# Flipdish.Model.OrderFulfillmentStatusUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderFulfillmentStatusWithConfigurationActions.md b/docs/OrderFulfillmentStatusWithConfigurationActions.md
index 1bf2c47a..06a0879e 100644
--- a/docs/OrderFulfillmentStatusWithConfigurationActions.md
+++ b/docs/OrderFulfillmentStatusWithConfigurationActions.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderFulfillmentStatusWithConfigurationActions
+# Flipdish.Model.OrderFulfillmentStatusWithConfigurationActions
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OrderIdAndSequenceNumber.md b/docs/OrderIdAndSequenceNumber.md
deleted file mode 100644
index 76f78431..00000000
--- a/docs/OrderIdAndSequenceNumber.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.OrderIdAndSequenceNumber
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**OrderId** | **int?** | Order identifier | [optional] 
-**Sequence** | **int?** | Sequence for delivery | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/OrderIngestApi.md b/docs/OrderIngestApi.md
deleted file mode 100644
index a88f466d..00000000
--- a/docs/OrderIngestApi.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# IO.Swagger.Api.OrderIngestApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**OrderIngestSubmitNewOrder**](OrderIngestApi.md#orderingestsubmitneworder) | **POST** /api/v1.0/{appNameId}/order-ingest/submit | Provides an ability to ingest a 3rd party order into Flipdish ecosystem
-
-
-<a name="orderingestsubmitneworder"></a>
-# **OrderIngestSubmitNewOrder**
-> RestApiResultOrderIngestSubmitOrderResponse OrderIngestSubmitNewOrder (OrderIngestSubmitOrderRequest order, string appNameId)
-
-Provides an ability to ingest a 3rd party order into Flipdish ecosystem
-
-[ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class OrderIngestSubmitNewOrderExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new OrderIngestApi();
-            var order = new OrderIngestSubmitOrderRequest(); // OrderIngestSubmitOrderRequest | 
-            var appNameId = appNameId_example;  // string | 
-
-            try
-            {
-                // Provides an ability to ingest a 3rd party order into Flipdish ecosystem
-                RestApiResultOrderIngestSubmitOrderResponse result = apiInstance.OrderIngestSubmitNewOrder(order, appNameId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling OrderIngestApi.OrderIngestSubmitNewOrder: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **order** | [**OrderIngestSubmitOrderRequest**](OrderIngestSubmitOrderRequest.md)|  | 
- **appNameId** | **string**|  | 
-
-### Return type
-
-[**RestApiResultOrderIngestSubmitOrderResponse**](RestApiResultOrderIngestSubmitOrderResponse.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/OrderIngestSubmitOrderRequest.md b/docs/OrderIngestSubmitOrderRequest.md
deleted file mode 100644
index f7c23aaa..00000000
--- a/docs/OrderIngestSubmitOrderRequest.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# IO.Swagger.Model.OrderIngestSubmitOrderRequest
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**AppType** | **string** | [Required] Indicated the name from where the request is coming from | [optional] 
-**StoreId** | **int?** | [Required] Store Id | [optional] 
-**CurrencyCode** | **string** | [Required] Currency Code  These must match three letter codes ISO 4127 http://en.wikipedia.org/wiki/ISO_4217 | [optional] 
-**Cart** | [**Cart**](Cart.md) | [Required] Cart of the user | [optional] 
-**FulfillmentInfo** | [**FulfillmentInfo**](FulfillmentInfo.md) | [Required] Relevant fulfillment Information | [optional] 
-**ChannelOrderId** | **string** | [Required] Order ID in the external System | [optional] 
-**ChannelPublicOrderId** | **string** | [Optional] Public Order ID in the external System | [optional] 
-**OrderDateUtc** | **DateTime?** | Date the order was placed at in UTC  [Required] | [optional] 
-**PaymentInfo** | [**PaymentInfo**](PaymentInfo.md) | Payment Information  [Required] | [optional] 
-**Contact** | [**Contact**](Contact.md) | Contact Information  [Required] | [optional] 
-**TipAmount** | **double?** | Tip amount | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/OrderIngestSubmitOrderResponse.md b/docs/OrderIngestSubmitOrderResponse.md
deleted file mode 100644
index cd263723..00000000
--- a/docs/OrderIngestSubmitOrderResponse.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# IO.Swagger.Model.OrderIngestSubmitOrderResponse
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**OrderId** | **int?** |  | [optional] 
-**ReceiptUrl** | **string** |  | [optional] 
-**CurrencyCode** | **string** |  | [optional] 
-**TotalPrice** | [**Price**](Price.md) |  | [optional] 
-**DeliveryFee** | [**Price**](Price.md) |  | [optional] 
-**EstimatedDeliveryTime** | **DateTime?** |  | [optional] 
-**ChannelOrderId** | **string** |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/OrderItem.md b/docs/OrderItem.md
index ae0e6920..13b44593 100644
--- a/docs/OrderItem.md
+++ b/docs/OrderItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderItem
+# Flipdish.Model.OrderItem
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,10 +11,12 @@ Name | Type | Description | Notes
 **Name** | **string** | Name | [optional] 
 **Description** | **string** | Description | [optional] 
 **Price** | **double?** | Price | [optional] 
+**TaxAmount** | **double?** | Tax currency amount | [optional] 
 **PriceIncludingOptionSetItems** | **double?** | Price including option set items | [optional] 
 **MenuItemId** | **int?** | Menu item identifier | [optional] 
 **MenuItemDisplayOrder** | **int?** | Menu item display order | [optional] 
 **IsAvailable** | **bool?** | Is available | [optional] 
+**DepositReturnFee** | **double?** | Deposit return fee | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderItemOption.md b/docs/OrderItemOption.md
index a885362e..11023137 100644
--- a/docs/OrderItemOption.md
+++ b/docs/OrderItemOption.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderItemOption
+# Flipdish.Model.OrderItemOption
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,8 +9,10 @@ Name | Type | Description | Notes
 **IsMasterOptionSetItem** | **bool?** | Is master option set item | [optional] 
 **Name** | **string** | Name | [optional] 
 **Price** | **double?** | Price | [optional] 
+**TaxAmount** | **double?** | Tax currency amount | [optional] 
 **MenuItemOptionDisplayOrder** | **int?** | Menu item option display order | [optional] 
 **MenuItemOptionSetDisplayOrder** | **int?** | Menu item option set display order | [optional] 
+**DepositReturnFee** | **double?** | Deposit return fee | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderLeadTimes.md b/docs/OrderLeadTimes.md
new file mode 100644
index 00000000..e61f6741
--- /dev/null
+++ b/docs/OrderLeadTimes.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.OrderLeadTimes
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**LeadTimeMinutes** | **Dictionary&lt;string, int?&gt;** | Mapping from the type of order to, to the default lead time that will be applied to those orders.  The lead time is an integer number of minutes. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/OrderList.md b/docs/OrderList.md
new file mode 100644
index 00000000..843cb7ea
--- /dev/null
+++ b/docs/OrderList.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.OrderList
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Orders** | [**List&lt;OrderReference&gt;**](OrderReference.md) | A list of orders. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/OrderPaymentInformation.md b/docs/OrderPaymentInformation.md
index ccfc930f..1a24e733 100644
--- a/docs/OrderPaymentInformation.md
+++ b/docs/OrderPaymentInformation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderPaymentInformation
+# Flipdish.Model.OrderPaymentInformation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OrderRatingUpdatedEvent.md b/docs/OrderRatingUpdatedEvent.md
index be9deec4..5a83acfe 100644
--- a/docs/OrderRatingUpdatedEvent.md
+++ b/docs/OrderRatingUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderRatingUpdatedEvent
+# Flipdish.Model.OrderRatingUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderReference.md b/docs/OrderReference.md
new file mode 100644
index 00000000..0bd81481
--- /dev/null
+++ b/docs/OrderReference.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.OrderReference
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**OrderId** | **int?** | The ID of the order. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/OrderRefundedEvent.md b/docs/OrderRefundedEvent.md
index 23e6a70c..6b837907 100644
--- a/docs/OrderRefundedEvent.md
+++ b/docs/OrderRefundedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderRefundedEvent
+# Flipdish.Model.OrderRefundedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,12 +6,16 @@ Name | Type | Description | Notes
 **EventName** | **string** | The event name | [optional] 
 **RefundedAmount** | **double?** | The amount refunded | [optional] 
 **Description** | **string** | Description | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has refunded the order | [optional] 
 **Order** | [**Order**](Order.md) | Order | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderRejectedEvent.md b/docs/OrderRejectedEvent.md
index 3b0d5e02..7026026f 100644
--- a/docs/OrderRejectedEvent.md
+++ b/docs/OrderRejectedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderRejectedEvent
+# Flipdish.Model.OrderRejectedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -7,12 +7,16 @@ Name | Type | Description | Notes
 **Description** | **string** | Description | [optional] 
 **OrderRejectedTime** | **DateTime?** | Order Rejected Time | [optional] 
 **Reason** | **string** | Reason for Rejection | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User who has rejected the order | [optional] 
 **Order** | [**Order**](Order.md) | Order | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderSummary.md b/docs/OrderSummary.md
index 602993ad..e0151876 100644
--- a/docs/OrderSummary.md
+++ b/docs/OrderSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderSummary
+# Flipdish.Model.OrderSummary
 ## Properties
 
 Name | Type | Description | Notes
@@ -29,6 +29,8 @@ Name | Type | Description | Notes
 **ChannelOrderId** | **string** | ChannelOrderId from external channel | [optional] 
 **ChannelOrderDisplayId** | **string** | ChannelOrderDisplayId from external channel | [optional] 
 **OrderDropOffLocation** | [**OrderDropOffLocation**](OrderDropOffLocation.md) | DropOffLocation selected for this order | [optional] 
+**OrderBatchInfo** | [**OrderBatchSummary**](OrderBatchSummary.md) | OrderBatch information | [optional] 
+**DeliveryLocation** | [**DeliveryLocation**](DeliveryLocation.md) | Delivery location details | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderTerminalNotification.md b/docs/OrderTerminalNotification.md
deleted file mode 100644
index 1f0b8493..00000000
--- a/docs/OrderTerminalNotification.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Flipdish.Model.OrderTerminalNotification
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**EventName** | **string** | The event name | [optional] 
-**Notification** | **string** | Notification Sent | [optional] 
-**Order** | [**Order**](Order.md) | Order | [optional] 
-**TerminalId** | **string** | TerminalId | [optional] 
-**Description** | **string** | Description | [optional] 
-**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
-**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
-**Position** | **int?** | Position | [optional] 
-**AppId** | **string** | App id | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/OrderTipUpdatedEvent.md b/docs/OrderTipUpdatedEvent.md
index e5d3cba8..5b210912 100644
--- a/docs/OrderTipUpdatedEvent.md
+++ b/docs/OrderTipUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OrderTipUpdatedEvent
+# Flipdish.Model.OrderTipUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/OrderVoucherSummary.md b/docs/OrderVoucherSummary.md
index e6a6468b..8d232c91 100644
--- a/docs/OrderVoucherSummary.md
+++ b/docs/OrderVoucherSummary.md
@@ -1,8 +1,9 @@
-# IO.Swagger.Model.OrderVoucherSummary
+# Flipdish.Model.OrderVoucherSummary
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**VoucherId** | **int?** | Voucher ID | [optional] 
 **Name** | **string** | Voucher name | [optional] 
 **Description** | **string** | Voucher description | [optional] 
 **Code** | **string** | Voucher code | [optional] 
diff --git a/docs/OrdersApi.md b/docs/OrdersApi.md
index 5c8a2bd8..fce018bb 100644
--- a/docs/OrdersApi.md
+++ b/docs/OrdersApi.md
@@ -1,39 +1,39 @@
-# IO.Swagger.Api.OrdersApi
+# Flipdish.Api.OrdersApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AcceptOrder**](OrdersApi.md#acceptorder) | **POST** /api/v1.0/orders/{id}/accept | Accept order
-[**DispatchOrder**](OrdersApi.md#dispatchorder) | **POST** /api/v1.0/orders/{id}/dispatch | Dispatch order
-[**GetDeliveryInformation**](OrdersApi.md#getdeliveryinformation) | **GET** /api/v1.0/orders/{orderId}/deliveryinfo | Get order delivery information
-[**GetFulfillmentState**](OrdersApi.md#getfulfillmentstate) | **GET** /api/v1.0/orders/{orderId}/fulfillment/state | Get order fulfillment state
-[**GetFulfillmentStatusWithDetailsAndActions**](OrdersApi.md#getfulfillmentstatuswithdetailsandactions) | **GET** /api/v1.0/orders/{orderId}/fulfillment/state/details | Get order fulfillment state with actionable details like default next state
-[**GetOrderById**](OrdersApi.md#getorderbyid) | **GET** /api/v1.0/orders/{id} | Get order by ID
-[**GetOrders**](OrdersApi.md#getorders) | **GET** /api/v1.0/orders | Get orders by filter
-[**GetOrdersSummary**](OrdersApi.md#getorderssummary) | **GET** /api/v1.0/{appId}/orders/summaries | [PRIVATE API] Get summary of orders by filter
-[**RefundOrder**](OrdersApi.md#refundorder) | **POST** /api/v1.0/orders/{id}/refund | Refund order
-[**RejectOrder**](OrdersApi.md#rejectorder) | **POST** /api/v1.0/orders/{id}/reject | Reject order
-[**SearchFulfillmentStatuses**](OrdersApi.md#searchfulfillmentstatuses) | **GET** /api/v1.0/{appId}/orders/fulfillmentstatuses | Get fulfillment status for a list of orders
-[**UpdateDeliveryInformation**](OrdersApi.md#updatedeliveryinformation) | **POST** /api/v1.0/orders/{orderId}/deliveryinfo | Add/update delivery-related information to an order
-[**UpdateFulfillmentState**](OrdersApi.md#updatefulfillmentstate) | **POST** /api/v1.0/orders/{orderId}/fulfillment/state | Update fulfillment status information to an order
+[**AcceptOrder**](OrdersApi.md#acceptorder) | **POST** /api/v1.0/orders/{id}/accept | 
+[**DispatchOrder**](OrdersApi.md#dispatchorder) | **POST** /api/v1.0/orders/{id}/dispatch | 
+[**GetDeliveryInformation**](OrdersApi.md#getdeliveryinformation) | **GET** /api/v1.0/orders/{orderId}/deliveryinfo | 
+[**GetFulfillmentState**](OrdersApi.md#getfulfillmentstate) | **GET** /api/v1.0/orders/{orderId}/fulfillment/state | 
+[**GetFulfillmentStatusWithDetailsAndActions**](OrdersApi.md#getfulfillmentstatuswithdetailsandactions) | **GET** /api/v1.0/orders/{orderId}/fulfillment/state/details | 
+[**GetOrderById**](OrdersApi.md#getorderbyid) | **GET** /api/v1.0/orders/{id} | 
+[**GetOrders**](OrdersApi.md#getorders) | **GET** /api/v1.0/orders | 
+[**GetOrdersSummary**](OrdersApi.md#getorderssummary) | **GET** /api/v1.0/{appId}/orders/summaries | 
+[**GetOrdersSummaryNew**](OrdersApi.md#getorderssummarynew) | **GET** /api/v1.0/{appId}/orders/summariesNew | 
+[**GetReadyToProcess**](OrdersApi.md#getreadytoprocess) | **GET** /api/v1.0/{appId}/orders/ready_to_process | 
+[**RefundOrder**](OrdersApi.md#refundorder) | **POST** /api/v1.0/orders/{id}/refund | 
+[**RejectOrder**](OrdersApi.md#rejectorder) | **POST** /api/v1.0/orders/{id}/reject | 
+[**SearchFulfillmentStatuses**](OrdersApi.md#searchfulfillmentstatuses) | **GET** /api/v1.0/{appId}/orders/fulfillmentstatuses | 
+[**UpdateDeliveryInformation**](OrdersApi.md#updatedeliveryinformation) | **POST** /api/v1.0/orders/{orderId}/deliveryinfo | 
+[**UpdateFulfillmentState**](OrdersApi.md#updatefulfillmentstate) | **POST** /api/v1.0/orders/{orderId}/fulfillment/state | 
 
 
 <a name="acceptorder"></a>
 # **AcceptOrder**
 > void AcceptOrder (int? id, Accept acceptObject)
 
-Accept order
 
-To accept an order, you create an `accept` object and send it to Flipdish API using HTTP POST method. `Id` path parameter identifies the order.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -45,12 +45,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var id = 56;  // int? | Order identifier
-            var acceptObject = new Accept(); // Accept | Order accept parameters (eg: EstimatedMinutesForDelivery)
+            var id = 56;  // int? | 
+            var acceptObject = new Accept(); // Accept | 
 
             try
             {
-                // Accept order
                 apiInstance.AcceptOrder(id, acceptObject);
             }
             catch (Exception e)
@@ -66,8 +65,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **int?**| Order identifier | 
- **acceptObject** | [**Accept**](Accept.md)| Order accept parameters (eg: EstimatedMinutesForDelivery) | 
+ **id** | **int?**|  | 
+ **acceptObject** | [**Accept**](Accept.md)|  | 
 
 ### Return type
 
@@ -88,17 +87,15 @@ void (empty response body)
 # **DispatchOrder**
 > void DispatchOrder (int? id)
 
-Dispatch order
 
-To dispatch an order send a POST request with `Id` path parameter which identifies the order.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -110,11 +107,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var id = 56;  // int? | Order identifier
+            var id = 56;  // int? | 
 
             try
             {
-                // Dispatch order
                 apiInstance.DispatchOrder(id);
             }
             catch (Exception e)
@@ -130,7 +126,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **int?**| Order identifier | 
+ **id** | **int?**|  | 
 
 ### Return type
 
@@ -151,17 +147,15 @@ void (empty response body)
 # **GetDeliveryInformation**
 > RestApiResultOrderDeliveryInformation GetDeliveryInformation (int? orderId)
 
-Get order delivery information
 
-Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -173,11 +167,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var orderId = 56;  // int? | Flipdish Order Id
+            var orderId = 56;  // int? | 
 
             try
             {
-                // Get order delivery information
                 RestApiResultOrderDeliveryInformation result = apiInstance.GetDeliveryInformation(orderId);
                 Debug.WriteLine(result);
             }
@@ -194,7 +187,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **int?**| Flipdish Order Id | 
+ **orderId** | **int?**|  | 
 
 ### Return type
 
@@ -215,17 +208,15 @@ Name | Type | Description  | Notes
 # **GetFulfillmentState**
 > RestApiResultOrderFulfillmentStatus GetFulfillmentState (int? orderId)
 
-Get order fulfillment state
 
-[BETA - this endpoint is under development, do not use it in your production system] Returns an order's fulfillment state.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -237,11 +228,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var orderId = 56;  // int? | Flipdish Order Id
+            var orderId = 56;  // int? | 
 
             try
             {
-                // Get order fulfillment state
                 RestApiResultOrderFulfillmentStatus result = apiInstance.GetFulfillmentState(orderId);
                 Debug.WriteLine(result);
             }
@@ -258,7 +248,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **int?**| Flipdish Order Id | 
+ **orderId** | **int?**|  | 
 
 ### Return type
 
@@ -279,17 +269,15 @@ Name | Type | Description  | Notes
 # **GetFulfillmentStatusWithDetailsAndActions**
 > RestApiResultOrderFulfillmentStatusWithConfigurationActions GetFulfillmentStatusWithDetailsAndActions (int? orderId)
 
-Get order fulfillment state with actionable details like default next state
 
-[BETA - this endpoint is under development, do not use it in your production system] Returns an order's fulfillment status and details about possible states.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -301,11 +289,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var orderId = 56;  // int? | Flipdish Order Id
+            var orderId = 56;  // int? | 
 
             try
             {
-                // Get order fulfillment state with actionable details like default next state
                 RestApiResultOrderFulfillmentStatusWithConfigurationActions result = apiInstance.GetFulfillmentStatusWithDetailsAndActions(orderId);
                 Debug.WriteLine(result);
             }
@@ -322,7 +309,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **int?**| Flipdish Order Id | 
+ **orderId** | **int?**|  | 
 
 ### Return type
 
@@ -343,15 +330,15 @@ Name | Type | Description  | Notes
 # **GetOrderById**
 > RestApiResultOrder GetOrderById (int? id)
 
-Get order by ID
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -363,11 +350,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var id = 56;  // int? | Order identifier
+            var id = 56;  // int? | 
 
             try
             {
-                // Get order by ID
                 RestApiResultOrder result = apiInstance.GetOrderById(id);
                 Debug.WriteLine(result);
             }
@@ -384,7 +370,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **int?**| Order identifier | 
+ **id** | **int?**|  | 
 
 ### Return type
 
@@ -405,15 +391,15 @@ Name | Type | Description  | Notes
 # **GetOrders**
 > RestApiPaginationResultOrder GetOrders (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null)
 
-Get orders by filter
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -425,16 +411,15 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var physicalRestaurantId = new List<int?>(); // List<int?> | Physical restaurant identifiers (optional) 
-            var state = state_example;  // List<string> | Order states (optional) 
-            var from = 2013-10-20T19:20:30+01:00;  // DateTime? | Order has been placed after this parameter value (optional) 
-            var to = 2013-10-20T19:20:30+01:00;  // DateTime? | Order has been placed before this parameter value (optional) 
-            var page = 56;  // int? | Requested page number (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
+            var physicalRestaurantId = new List<int?>(); // List<int?> |  (optional) 
+            var state = state_example;  // List<string> |  (optional) 
+            var from = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var to = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Get orders by filter
                 RestApiPaginationResultOrder result = apiInstance.GetOrders(physicalRestaurantId, state, from, to, page, limit);
                 Debug.WriteLine(result);
             }
@@ -451,12 +436,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **physicalRestaurantId** | [**List&lt;int?&gt;**](int?.md)| Physical restaurant identifiers | [optional] 
- **state** | **List&lt;string&gt;**| Order states | [optional] 
- **from** | **DateTime?**| Order has been placed after this parameter value | [optional] 
- **to** | **DateTime?**| Order has been placed before this parameter value | [optional] 
- **page** | **int?**| Requested page number | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
+ **physicalRestaurantId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **state** | **List&lt;string&gt;**|  | [optional] 
+ **from** | **DateTime?**|  | [optional] 
+ **to** | **DateTime?**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -475,17 +460,17 @@ Name | Type | Description  | Notes
 
 <a name="getorderssummary"></a>
 # **GetOrdersSummary**
-> RestApiPaginationResultOrderSummary GetOrdersSummary (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null)
+> RestApiPaginationResultOrderSummary GetOrdersSummary (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
+
 
-[PRIVATE API] Get summary of orders by filter
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -497,19 +482,22 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var appId = appId_example;  // string | App Name Id
-            var searchQuery = searchQuery_example;  // string | Query string (optional) 
-            var physicalRestaurantId = new List<int?>(); // List<int?> | Physical restaurant identifiers (optional) 
-            var state = state_example;  // List<string> | Order states (optional) 
-            var page = 56;  // int? | Requested page number (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
+            var appId = appId_example;  // string | 
+            var searchQuery = searchQuery_example;  // string |  (optional) 
+            var physicalRestaurantId = new List<int?>(); // List<int?> |  (optional) 
+            var state = state_example;  // List<string> |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
             var orderByRequestedForTime = true;  // bool? |  (optional) 
             var channels = channels_example;  // List<string> |  (optional) 
+            var orderIds = new List<int?>(); // List<int?> |  (optional) 
+            var from = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var to = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var logSql = true;  // bool? |  (optional) 
 
             try
             {
-                // [PRIVATE API] Get summary of orders by filter
-                RestApiPaginationResultOrderSummary result = apiInstance.GetOrdersSummary(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels);
+                RestApiPaginationResultOrderSummary result = apiInstance.GetOrdersSummary(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels, orderIds, from, to, logSql);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -525,14 +513,101 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **searchQuery** | **string**| Query string | [optional] 
- **physicalRestaurantId** | [**List&lt;int?&gt;**](int?.md)| Physical restaurant identifiers | [optional] 
- **state** | **List&lt;string&gt;**| Order states | [optional] 
- **page** | **int?**| Requested page number | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
+ **appId** | **string**|  | 
+ **searchQuery** | **string**|  | [optional] 
+ **physicalRestaurantId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **state** | **List&lt;string&gt;**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
+ **orderByRequestedForTime** | **bool?**|  | [optional] 
+ **channels** | **List&lt;string&gt;**|  | [optional] 
+ **orderIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **from** | **DateTime?**|  | [optional] 
+ **to** | **DateTime?**|  | [optional] 
+ **logSql** | **bool?**|  | [optional] 
+
+### Return type
+
+[**RestApiPaginationResultOrderSummary**](RestApiPaginationResultOrderSummary.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getorderssummarynew"></a>
+# **GetOrdersSummaryNew**
+> RestApiPaginationResultOrderSummary GetOrdersSummaryNew (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetOrdersSummaryNewExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new OrdersApi();
+            var appId = appId_example;  // string | 
+            var searchQuery = searchQuery_example;  // string |  (optional) 
+            var physicalRestaurantId = new List<int?>(); // List<int?> |  (optional) 
+            var state = state_example;  // List<string> |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
+            var orderByRequestedForTime = true;  // bool? |  (optional) 
+            var channels = channels_example;  // List<string> |  (optional) 
+            var orderIds = new List<int?>(); // List<int?> |  (optional) 
+            var from = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var to = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var logSql = true;  // bool? |  (optional) 
+
+            try
+            {
+                RestApiPaginationResultOrderSummary result = apiInstance.GetOrdersSummaryNew(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels, orderIds, from, to, logSql);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling OrdersApi.GetOrdersSummaryNew: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **searchQuery** | **string**|  | [optional] 
+ **physicalRestaurantId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **state** | **List&lt;string&gt;**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
  **orderByRequestedForTime** | **bool?**|  | [optional] 
  **channels** | **List&lt;string&gt;**|  | [optional] 
+ **orderIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **from** | **DateTime?**|  | [optional] 
+ **to** | **DateTime?**|  | [optional] 
+ **logSql** | **bool?**|  | [optional] 
 
 ### Return type
 
@@ -549,21 +624,82 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getreadytoprocess"></a>
+# **GetReadyToProcess**
+> OrderList GetReadyToProcess (string appId, List<int?> storeId = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetReadyToProcessExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new OrdersApi();
+            var appId = appId_example;  // string | 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
+
+            try
+            {
+                OrderList result = apiInstance.GetReadyToProcess(appId, storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling OrdersApi.GetReadyToProcess: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+
+### Return type
+
+[**OrderList**](OrderList.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="refundorder"></a>
 # **RefundOrder**
 > void RefundOrder (int? id, Refund refundObject)
 
-Refund order
 
-To refund an order, you create a `refund` object and send it to Flipdish API using HTTP POST method. `Id` path parameter identifies the order.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -575,12 +711,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var id = 56;  // int? | Order identifier
+            var id = 56;  // int? | 
             var refundObject = new Refund(); // Refund | 
 
             try
             {
-                // Refund order
                 apiInstance.RefundOrder(id, refundObject);
             }
             catch (Exception e)
@@ -596,7 +731,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **int?**| Order identifier | 
+ **id** | **int?**|  | 
  **refundObject** | [**Refund**](Refund.md)|  | 
 
 ### Return type
@@ -618,17 +753,15 @@ void (empty response body)
 # **RejectOrder**
 > void RejectOrder (int? id, Reject rejectObject)
 
-Reject order
 
-To reject an order, you create a `reject` object and send it to Flipdish API using HTTP POST method. `Id` path parameter identifies the order.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -640,12 +773,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var id = 56;  // int? | Order identifier
+            var id = 56;  // int? | 
             var rejectObject = new Reject(); // Reject | 
 
             try
             {
-                // Reject order
                 apiInstance.RejectOrder(id, rejectObject);
             }
             catch (Exception e)
@@ -661,7 +793,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **id** | **int?**| Order identifier | 
+ **id** | **int?**|  | 
  **rejectObject** | [**Reject**](Reject.md)|  | 
 
 ### Return type
@@ -683,17 +815,15 @@ void (empty response body)
 # **SearchFulfillmentStatuses**
 > RestApiArrayResultOrderFulfillmentStatus SearchFulfillmentStatuses (string appId, string orderIds)
 
-Get fulfillment status for a list of orders
 
-[BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -705,12 +835,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var appId = appId_example;  // string | App Id
-            var orderIds = orderIds_example;  // string | Flipdish Order Id list, comma separated
+            var appId = appId_example;  // string | 
+            var orderIds = orderIds_example;  // string | 
 
             try
             {
-                // Get fulfillment status for a list of orders
                 RestApiArrayResultOrderFulfillmentStatus result = apiInstance.SearchFulfillmentStatuses(appId, orderIds);
                 Debug.WriteLine(result);
             }
@@ -727,8 +856,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Id | 
- **orderIds** | **string**| Flipdish Order Id list, comma separated | 
+ **appId** | **string**|  | 
+ **orderIds** | **string**|  | 
 
 ### Return type
 
@@ -749,17 +878,15 @@ Name | Type | Description  | Notes
 # **UpdateDeliveryInformation**
 > void UpdateDeliveryInformation (int? orderId, OrderDeliveryInformationBase deliveryInformation)
 
-Add/update delivery-related information to an order
 
-Returns an order's delivery information. This would be used to display the latest known delivery information on a screen.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -771,12 +898,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var orderId = 56;  // int? | Flipdish Order Id
-            var deliveryInformation = new OrderDeliveryInformationBase(); // OrderDeliveryInformationBase | Delivery Information
+            var orderId = 56;  // int? | 
+            var deliveryInformation = new OrderDeliveryInformationBase(); // OrderDeliveryInformationBase | 
 
             try
             {
-                // Add/update delivery-related information to an order
                 apiInstance.UpdateDeliveryInformation(orderId, deliveryInformation);
             }
             catch (Exception e)
@@ -792,8 +918,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **int?**| Flipdish Order Id | 
- **deliveryInformation** | [**OrderDeliveryInformationBase**](OrderDeliveryInformationBase.md)| Delivery Information | 
+ **orderId** | **int?**|  | 
+ **deliveryInformation** | [**OrderDeliveryInformationBase**](OrderDeliveryInformationBase.md)|  | 
 
 ### Return type
 
@@ -814,17 +940,15 @@ void (empty response body)
 # **UpdateFulfillmentState**
 > void UpdateFulfillmentState (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest)
 
-Update fulfillment status information to an order
 
-[BETA - this endpoint is under development, do not use it in your production system] Updates an order's fulfillment states.
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -836,12 +960,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new OrdersApi();
-            var orderId = 56;  // int? | Flipdish Order Id
-            var fulfillmentStatusRequest = new OrderFulfillmentStatusUpdate(); // OrderFulfillmentStatusUpdate | Fulfillment Status
+            var orderId = 56;  // int? | 
+            var fulfillmentStatusRequest = new OrderFulfillmentStatusUpdate(); // OrderFulfillmentStatusUpdate | 
 
             try
             {
-                // Update fulfillment status information to an order
                 apiInstance.UpdateFulfillmentState(orderId, fulfillmentStatusRequest);
             }
             catch (Exception e)
@@ -857,8 +980,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **int?**| Flipdish Order Id | 
- **fulfillmentStatusRequest** | [**OrderFulfillmentStatusUpdate**](OrderFulfillmentStatusUpdate.md)| Fulfillment Status | 
+ **orderId** | **int?**|  | 
+ **fulfillmentStatusRequest** | [**OrderFulfillmentStatusUpdate**](OrderFulfillmentStatusUpdate.md)|  | 
 
 ### Return type
 
diff --git a/docs/OtherChargesDetails.md b/docs/OtherChargesDetails.md
index af4a5b1a..f6e2f903 100644
--- a/docs/OtherChargesDetails.md
+++ b/docs/OtherChargesDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OtherChargesDetails
+# Flipdish.Model.OtherChargesDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OwnerEntityConfiguration.md b/docs/OwnerEntityConfiguration.md
index c65b675c..bd223ff5 100644
--- a/docs/OwnerEntityConfiguration.md
+++ b/docs/OwnerEntityConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OwnerEntityConfiguration
+# Flipdish.Model.OwnerEntityConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/OwnerEntityConfigurations.md b/docs/OwnerEntityConfigurations.md
index 5a3a616b..251beabb 100644
--- a/docs/OwnerEntityConfigurations.md
+++ b/docs/OwnerEntityConfigurations.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.OwnerEntityConfigurations
+# Flipdish.Model.OwnerEntityConfigurations
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PasswordResetModel.md b/docs/PasswordResetModel.md
index 4afe93e3..6097e780 100644
--- a/docs/PasswordResetModel.md
+++ b/docs/PasswordResetModel.md
@@ -1,8 +1,9 @@
-# IO.Swagger.Model.PasswordResetModel
+# Flipdish.Model.PasswordResetModel
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**TokenId** | **string** | Token Id | [optional] 
 **Email** | **string** | Email address | [optional] 
 **Password** | **string** | Password | 
 **PasswordConfirmation** | **string** | Password confirmation | 
diff --git a/docs/PayOrder.md b/docs/PayOrder.md
deleted file mode 100644
index abc61f53..00000000
--- a/docs/PayOrder.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Flipdish.Model.PayOrder
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**PaymentOption** | **string** | 6 digit PIN code (not starting with zero). | 
-**ChefNote** | **string** | Chef note | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/PaymentAccount.md b/docs/PaymentAccount.md
new file mode 100644
index 00000000..55878613
--- /dev/null
+++ b/docs/PaymentAccount.md
@@ -0,0 +1,17 @@
+# Flipdish.Model.PaymentAccount
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**UserId** | **int?** | The user ID associated with the payment account. | [optional] 
+**PaymentAccountId** | **int?** | Unique identifier for the payment account. | [optional] 
+**CanRemoveFromCustomerView** | **bool?** | Indicates if the payment account can be removed from the customer view. | [optional] 
+**Bin** | **string** | Bank Identification Number (BIN) of the payment method. | [optional] 
+**IsDefaultPaymentMethod** | **bool?** | Indicates if this is the default payment method. | [optional] 
+**IsVisibleToCustomer** | **bool?** | Indicates if the payment account is visible to the customer. | [optional] 
+**PaymentAccountType** | **string** | The type of payment account (e.g., card, PayPal). | [optional] 
+**Description** | **string** | Description of the payment account. | [optional] 
+**CustomerId** | **string** | The customer ID associated with the payment account. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PaymentInfo.md b/docs/PaymentInfo.md
deleted file mode 100644
index 7dfe8ee5..00000000
--- a/docs/PaymentInfo.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.PaymentInfo
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Paid** | **bool?** | Defines if the order was paid | [optional] 
-**PaymentType** | **string** | Payment Description | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/PaymentIntent.md b/docs/PaymentIntent.md
index 997db0e7..95d35e69 100644
--- a/docs/PaymentIntent.md
+++ b/docs/PaymentIntent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PaymentIntent
+# Flipdish.Model.PaymentIntent
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PaymentIntentsApi.md b/docs/PaymentIntentsApi.md
index 255729d4..4b62b305 100644
--- a/docs/PaymentIntentsApi.md
+++ b/docs/PaymentIntentsApi.md
@@ -1,25 +1,25 @@
-# IO.Swagger.Api.PaymentIntentsApi
+# Flipdish.Api.PaymentIntentsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetPaymentIntent**](PaymentIntentsApi.md#getpaymentintent) | **GET** /api/v1.0/payment_intents/{paymentIntentId} | Returns stripe payment intent for a given id
+[**GetPaymentIntent**](PaymentIntentsApi.md#getpaymentintent) | **GET** /api/v1.0/payment_intents/{paymentIntentId} | 
 
 
 <a name="getpaymentintent"></a>
 # **GetPaymentIntent**
 > RestApiResultPaymentIntent GetPaymentIntent (string paymentIntentId)
 
-Returns stripe payment intent for a given id
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -31,11 +31,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PaymentIntentsApi();
-            var paymentIntentId = paymentIntentId_example;  // string | Stripe payment intent identifier
+            var paymentIntentId = paymentIntentId_example;  // string | 
 
             try
             {
-                // Returns stripe payment intent for a given id
                 RestApiResultPaymentIntent result = apiInstance.GetPaymentIntent(paymentIntentId);
                 Debug.WriteLine(result);
             }
@@ -52,7 +51,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **paymentIntentId** | **string**| Stripe payment intent identifier | 
+ **paymentIntentId** | **string**|  | 
 
 ### Return type
 
diff --git a/docs/PaymentTerminalDetails.md b/docs/PaymentTerminalDetails.md
index e894d0ee..6ad3a00d 100644
--- a/docs/PaymentTerminalDetails.md
+++ b/docs/PaymentTerminalDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PaymentTerminalDetails
+# Flipdish.Model.PaymentTerminalDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PaymentTerminalTransactionDetails.md b/docs/PaymentTerminalTransactionDetails.md
index e9c4cf1b..57b90cc0 100644
--- a/docs/PaymentTerminalTransactionDetails.md
+++ b/docs/PaymentTerminalTransactionDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PaymentTerminalTransactionDetails
+# Flipdish.Model.PaymentTerminalTransactionDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PaymentsApi.md b/docs/PaymentsApi.md
index 75db1833..18391217 100644
--- a/docs/PaymentsApi.md
+++ b/docs/PaymentsApi.md
@@ -1,25 +1,25 @@
-# IO.Swagger.Api.PaymentsApi
+# Flipdish.Api.PaymentsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetOrderPaymentInformation**](PaymentsApi.md#getorderpaymentinformation) | **GET** /api/v1.0/payments/payment/{orderId}/refundable | Returns payment refund information related to the order with the order id
+[**GetOrderPaymentInformation**](PaymentsApi.md#getorderpaymentinformation) | **GET** /api/v1.0/payments/payment/{orderId}/refundable | 
 
 
 <a name="getorderpaymentinformation"></a>
 # **GetOrderPaymentInformation**
 > RestApiResultOrderPaymentInformation GetOrderPaymentInformation (int? orderId)
 
-Returns payment refund information related to the order with the order id
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -31,11 +31,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PaymentsApi();
-            var orderId = 56;  // int? | Order identifier
+            var orderId = 56;  // int? | 
 
             try
             {
-                // Returns payment refund information related to the order with the order id
                 RestApiResultOrderPaymentInformation result = apiInstance.GetOrderPaymentInformation(orderId);
                 Debug.WriteLine(result);
             }
@@ -52,7 +51,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **orderId** | **int?**| Order identifier | 
+ **orderId** | **int?**|  | 
 
 ### Return type
 
diff --git a/docs/Payout.md b/docs/Payout.md
index ee73aa5b..2592d475 100644
--- a/docs/Payout.md
+++ b/docs/Payout.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Payout
+# Flipdish.Model.Payout
 ## Properties
 
 Name | Type | Description | Notes
@@ -22,7 +22,9 @@ Name | Type | Description | Notes
 **OnlineSalesServiceCharges** | **double?** | Payout online sales service charges | [optional] 
 **OnlineSalesRefundedFees** | **double?** | Payout online sales refunded fees | [optional] 
 **OnlineSalesFees** | **double?** | Payout online sales fees | [optional] 
+**PosSalesFees** | **double?** | Payout online sales fees | [optional] 
 **OnlineSalesRefundedAmount** | **double?** | Payout online sales refunded amount | [optional] 
+**PosSalesRefundedAmount** | **double?** | POS Payout online sales refunded amount | [optional] 
 **OnlineSalesTax** | **double?** | Payout online sales tax | [optional] 
 **TotalOnlineRevenue** | **double?** | Payout total online revenue | [optional] 
 **CashSalesFees** | **double?** | Payout cash sales fees | [optional] 
@@ -32,11 +34,20 @@ Name | Type | Description | Notes
 **TotalFees** | **double?** | Payout total fees | [optional] 
 **TotalOnlineRevenueAdjustments** | **double?** | Payout total online revenue adjustments | [optional] 
 **ChargebackAmount** | **double?** | Payout chargeback amount | [optional] 
+**PosSalesChargebackAmount** | **double?** | POS Payout chargeback amount | [optional] 
 **ChargebackRefundedFees** | **double?** | Payout chargeback refunded fees | [optional] 
 **TotalChargebackCost** | **double?** | Payout chargebacks total cost | [optional] 
 **TotalOtherCharges** | **double?** | Payout other charges total | [optional] 
 **OpeningBalance** | **double?** | Payout opening balance | [optional] 
 **ClosingBalance** | **double?** | Payout closing balance | [optional] 
+**PayGreenSalesAmount** | **double?** | Amount of sales through PayGreen (restaurant vouchers) | [optional] 
+**DeliveryIntegrationFee** | **double?** | Third party integration delivery fee | [optional] 
+**DeliveryIntegrationTipFee** | **double?** | Third party integration delivery tip fee | [optional] 
+**TotalThirdPartyFees** | **double?** | Total third party integration fees | [optional] 
+**PosSalesAmount** | **double?** | POS sales amount | [optional] 
+**PosSalesTax** | **double?** | POS sales tax | [optional] 
+**TipsOnPosSales** | **double?** | Tips on POS sales | [optional] 
+**BankAccountHasChanged** | **bool?** | Indicates whether the bank account has changed since the previous payout | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PayoutChargeback.md b/docs/PayoutChargeback.md
index 8edddbdf..03709422 100644
--- a/docs/PayoutChargeback.md
+++ b/docs/PayoutChargeback.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PayoutChargeback
+# Flipdish.Model.PayoutChargeback
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PayoutDetail.md b/docs/PayoutDetail.md
index 92ebc48c..7531a882 100644
--- a/docs/PayoutDetail.md
+++ b/docs/PayoutDetail.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PayoutDetail
+# Flipdish.Model.PayoutDetail
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PayoutOrder.md b/docs/PayoutOrder.md
index 5b302e6c..2c4fc18f 100644
--- a/docs/PayoutOrder.md
+++ b/docs/PayoutOrder.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PayoutOrder
+# Flipdish.Model.PayoutOrder
 ## Properties
 
 Name | Type | Description | Notes
@@ -14,9 +14,10 @@ Name | Type | Description | Notes
 **Tips** | **double?** | Order tips amount | [optional] 
 **Voucher** | **double?** | Order voucher amount | [optional] 
 **FlatFeeExcludingVat** | **double?** | Order flat fee amount excluding VAT | [optional] 
-**FlatFeeExcludingVAT** | **double?** |  | [optional] 
+**FlatFeeExcludingVAT** | **double?** | Order flat fee amount excluding VAT | [optional] 
+**FlatFeeIncludingVat** | **double?** | Order flat fee amount including VAT | [optional] 
 **PercentageFeeExcludingVat** | **double?** | Order percentage fee excluding VAT | [optional] 
-**PercentageFeeExcludingVAT** | **double?** |  | [optional] 
+**PercentageFeeExcludingVAT** | **double?** | Order percentage fee excluding VAT | [optional] 
 **Vat** | **double?** | Order VAT amount | [optional] 
 **TotalFees** | **double?** | Total order fees amount | [optional] 
 **CashFeeChargedToCustomer** | **double?** | Cash fee charged to customer | [optional] 
diff --git a/docs/PayoutOtherCharge.md b/docs/PayoutOtherCharge.md
index 844c11f9..e37896a4 100644
--- a/docs/PayoutOtherCharge.md
+++ b/docs/PayoutOtherCharge.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PayoutOtherCharge
+# Flipdish.Model.PayoutOtherCharge
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PayoutRefund.md b/docs/PayoutRefund.md
index e703a36b..5c0357e7 100644
--- a/docs/PayoutRefund.md
+++ b/docs/PayoutRefund.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PayoutRefund
+# Flipdish.Model.PayoutRefund
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PayoutReport3Details.md b/docs/PayoutReport3Details.md
new file mode 100644
index 00000000..055d430f
--- /dev/null
+++ b/docs/PayoutReport3Details.md
@@ -0,0 +1,14 @@
+# Flipdish.Model.PayoutReport3Details
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Amount** | **double?** |  | [optional] 
+**Currency** | **string** |  | [optional] 
+**Summary** | [**PayoutReport3DetailsSummary**](PayoutReport3DetailsSummary.md) |  | [optional] 
+**Revenue** | [**PayoutReport3DetailsRevenue**](PayoutReport3DetailsRevenue.md) |  | [optional] 
+**FlipdishFees** | [**PayoutReport3DetailsFlipdishFees**](PayoutReport3DetailsFlipdishFees.md) |  | [optional] 
+**Adjustments** | [**PayoutReport3DetailsAdjustments**](PayoutReport3DetailsAdjustments.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3DetailsAdjustments.md b/docs/PayoutReport3DetailsAdjustments.md
new file mode 100644
index 00000000..4eb7c3ac
--- /dev/null
+++ b/docs/PayoutReport3DetailsAdjustments.md
@@ -0,0 +1,29 @@
+# Flipdish.Model.PayoutReport3DetailsAdjustments
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**OpeningBalanceDate** | **DateTime?** |  | [optional] 
+**ClosingBalanceDate** | **DateTime?** |  | [optional] 
+**OpeningBalance** | **double?** |  | [optional] 
+**RefundsOnCardOrders** | **double?** |  | [optional] 
+**RefundsOnCashOrders** | **double?** |  | [optional] 
+**CashCustomerFees** | **double?** |  | [optional] 
+**Chargebacks** | **double?** |  | [optional] 
+**OtherTransactions** | **double?** |  | [optional] 
+**ClosingBalance** | **double?** |  | [optional] 
+**BalanceRepaid** | **double?** |  | [optional] 
+**RefundsOnCardOrdersBracketsAmount** | **double?** |  | [optional] 
+**RefundsOnCardOrdersBracketsOutOfAmount** | **double?** |  | [optional] 
+**RefundsOnCashOrdersBracketsAmount** | **double?** |  | [optional] 
+**RefundsOnCashOrdersBracketsOutOfAmount** | **double?** |  | [optional] 
+**CashCustomerFeesBracketsAmount** | **double?** |  | [optional] 
+**CashCustomerFeesBracketsOutOfAmount** | **double?** |  | [optional] 
+**BalanceChange** | **double?** |  | [optional] 
+**PreviousPayoutId** | **int?** |  | [optional] 
+**NextPayoutId** | **int?** |  | [optional] 
+**RefundedFeesOnChargebacks** | **double?** |  | [optional] 
+**TotalChargebackCost** | **double?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3DetailsFlipdishFees.md b/docs/PayoutReport3DetailsFlipdishFees.md
new file mode 100644
index 00000000..45b82afc
--- /dev/null
+++ b/docs/PayoutReport3DetailsFlipdishFees.md
@@ -0,0 +1,39 @@
+# Flipdish.Model.PayoutReport3DetailsFlipdishFees
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WebAndAppCash** | **double?** |  | [optional] 
+**WebAndAppCashRevenueIncludingTips** | **double?** |  | [optional] 
+**WebAndAppCard** | **double?** |  | [optional] 
+**WebAndAppCardRevenueIncludingTips** | **double?** |  | [optional] 
+**KioskCash** | **double?** |  | [optional] 
+**KioskCashRevenue** | **double?** |  | [optional] 
+**KioskCard** | **double?** |  | [optional] 
+**KioskCardRevenue** | **double?** |  | [optional] 
+**QropCash** | **double?** |  | [optional] 
+**QropCashRevenue** | **double?** |  | [optional] 
+**QropCard** | **double?** |  | [optional] 
+**QropCardRevenue** | **double?** |  | [optional] 
+**PosCard** | **double?** |  | [optional] 
+**PosCardRevenue** | **double?** |  | [optional] 
+**PosCardOnFlipdishOrders** | **double?** |  | [optional] 
+**OtherIntegrationFees** | **double?** |  | [optional] 
+**OtherIntegrationFeesExcludingVat** | **double?** |  | [optional] 
+**OtherIntegrationFeesVatAmount** | **double?** |  | [optional] 
+**OtherIntegrationTips** | **double?** |  | [optional] 
+**RefundedFeesOnRefundedSales** | **double?** |  | [optional] 
+**Vat** | **double?** |  | [optional] 
+**RefundedFeesOnPosSales** | **double?** |  | [optional] 
+**Total** | **double?** |  | [optional] 
+**ThirdPartyIntegrationFeesAndTips** | **double?** |  | [optional] 
+**WebAndAppCardOnXOrders** | **int?** |  | [optional] 
+**WebAndAppCashOnXOrders** | **int?** |  | [optional] 
+**KioskCardOnXOrders** | **int?** |  | [optional] 
+**KioskCashOnXOrders** | **int?** |  | [optional] 
+**QropCardOnXOrders** | **int?** |  | [optional] 
+**QropCashOnXOrders** | **int?** |  | [optional] 
+**PosCardOnXOrders** | **int?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3DetailsRevenue.md b/docs/PayoutReport3DetailsRevenue.md
new file mode 100644
index 00000000..d545e670
--- /dev/null
+++ b/docs/PayoutReport3DetailsRevenue.md
@@ -0,0 +1,16 @@
+# Flipdish.Model.PayoutReport3DetailsRevenue
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**GrossSales** | [**PayoutReport3DetailsSalesLine**](PayoutReport3DetailsSalesLine.md) |  | [optional] 
+**SalesTax** | [**PayoutReport3DetailsSalesLine**](PayoutReport3DetailsSalesLine.md) |  | [optional] 
+**DeliveryCharges** | [**PayoutReport3DetailsSalesLine**](PayoutReport3DetailsSalesLine.md) |  | [optional] 
+**OtherCharges** | [**PayoutReport3DetailsSalesLine**](PayoutReport3DetailsSalesLine.md) |  | [optional] 
+**Tips** | [**PayoutReport3DetailsSalesLine**](PayoutReport3DetailsSalesLine.md) |  | [optional] 
+**TotalRevenue** | [**PayoutReport3DetailsSalesLine**](PayoutReport3DetailsSalesLine.md) |  | [optional] 
+**RevenueForFeeCalculations** | [**PayoutReport3DetailsSalesLine**](PayoutReport3DetailsSalesLine.md) |  | [optional] 
+**DrsCharges** | [**PayoutReport3DetailsSalesLine**](PayoutReport3DetailsSalesLine.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3DetailsSalesLine.md b/docs/PayoutReport3DetailsSalesLine.md
new file mode 100644
index 00000000..c691b1ad
--- /dev/null
+++ b/docs/PayoutReport3DetailsSalesLine.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.PayoutReport3DetailsSalesLine
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Online** | **double?** |  | [optional] 
+**Pos** | **double?** |  | [optional] 
+**Other** | **double?** |  | [optional] 
+**Total** | **double?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3DetailsSummary.md b/docs/PayoutReport3DetailsSummary.md
new file mode 100644
index 00000000..23dfd06c
--- /dev/null
+++ b/docs/PayoutReport3DetailsSummary.md
@@ -0,0 +1,16 @@
+# Flipdish.Model.PayoutReport3DetailsSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Revenue** | **double?** |  | [optional] 
+**RevenueOfWhichCash** | **double?** |  | [optional] 
+**UnpaidRevenue** | **double?** |  | [optional] 
+**RevenueForFeeCalculations** | **double?** |  | [optional] 
+**FlipdishFees** | **double?** |  | [optional] 
+**Adjustments** | **double?** |  | [optional] 
+**ThirdPartyIntegrationFeesAndTips** | **double?** |  | [optional] 
+**Total** | **double?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3Overview.md b/docs/PayoutReport3Overview.md
new file mode 100644
index 00000000..446521d1
--- /dev/null
+++ b/docs/PayoutReport3Overview.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.PayoutReport3Overview
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PayoutReport3OverviewHeader** | [**PayoutReport3OverviewHeader**](PayoutReport3OverviewHeader.md) |  | [optional] 
+**PayoutStores** | [**List&lt;PayoutReport3Store&gt;**](PayoutReport3Store.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3OverviewHeader.md b/docs/PayoutReport3OverviewHeader.md
new file mode 100644
index 00000000..c70f2f4f
--- /dev/null
+++ b/docs/PayoutReport3OverviewHeader.md
@@ -0,0 +1,21 @@
+# Flipdish.Model.PayoutReport3OverviewHeader
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PayoutId** | **int?** |  | [optional] 
+**BankAccountId** | **int?** |  | [optional] 
+**IsManualPayout** | **bool?** |  | [optional] 
+**AccountName** | **string** |  | [optional] 
+**PayoutStatus** | **string** |  | [optional] 
+**CreatedDate** | **DateTime?** |  | [optional] 
+**PeriodStartTime** | **DateTime?** |  | [optional] 
+**PeriodEndTime** | **DateTime?** |  | [optional] 
+**DestinationBank** | **string** |  | [optional] 
+**DestinationAccount** | **string** |  | [optional] 
+**Amount** | **double?** |  | [optional] 
+**Currency** | **string** |  | [optional] 
+**BankAccountHasChanged** | **bool?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3PropertyDetails.md b/docs/PayoutReport3PropertyDetails.md
new file mode 100644
index 00000000..f6bb7a47
--- /dev/null
+++ b/docs/PayoutReport3PropertyDetails.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.PayoutReport3PropertyDetails
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AvailableProperties** | [**List&lt;PayoutReport3PropertyFilterOption&gt;**](PayoutReport3PropertyFilterOption.md) |  | [optional] 
+**SelectedPropertyIds** | **List&lt;string&gt;** |  | [optional] 
+**MatchedStoreIds** | **List&lt;int?&gt;** |  | [optional] 
+**Details** | [**PayoutReport3Details**](PayoutReport3Details.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3PropertyFilterOption.md b/docs/PayoutReport3PropertyFilterOption.md
new file mode 100644
index 00000000..d9c0f643
--- /dev/null
+++ b/docs/PayoutReport3PropertyFilterOption.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.PayoutReport3PropertyFilterOption
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PropertyId** | **string** |  | [optional] 
+**PropertyName** | **string** |  | [optional] 
+**StoreIds** | **List&lt;int?&gt;** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3RefundedOrder.md b/docs/PayoutReport3RefundedOrder.md
new file mode 100644
index 00000000..346244c4
--- /dev/null
+++ b/docs/PayoutReport3RefundedOrder.md
@@ -0,0 +1,17 @@
+# Flipdish.Model.PayoutReport3RefundedOrder
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**OrderId** | **int?** |  | [optional] 
+**PlacedAtTime** | **DateTime?** |  | [optional] 
+**ModifiedAtTime** | **DateTime?** |  | [optional] 
+**StoreName** | **string** |  | [optional] 
+**Type** | **string** |  | [optional] 
+**RefundedAmount** | **double?** |  | [optional] 
+**RefundedFees** | **double?** |  | [optional] 
+**RefundType** | **string** |  | [optional] 
+**CashFeeRefundedToCustomer** | **double?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3Store.md b/docs/PayoutReport3Store.md
new file mode 100644
index 00000000..2611edb0
--- /dev/null
+++ b/docs/PayoutReport3Store.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.PayoutReport3Store
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StoreId** | **int?** |  | [optional] 
+**StoreName** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3StorePayout.md b/docs/PayoutReport3StorePayout.md
new file mode 100644
index 00000000..9848a7f4
--- /dev/null
+++ b/docs/PayoutReport3StorePayout.md
@@ -0,0 +1,16 @@
+# Flipdish.Model.PayoutReport3StorePayout
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StoreId** | **int?** |  | [optional] 
+**StoreName** | **string** |  | [optional] 
+**SummaryTotalPayout** | **double?** |  | [optional] 
+**SummaryRevenue** | **double?** |  | [optional] 
+**SummaryCashRevenue** | **double?** |  | [optional] 
+**SummaryTotalFlipdishFees** | **double?** |  | [optional] 
+**SummaryAdjustments** | **double?** |  | [optional] 
+**Currency** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReport3StorePayouts.md b/docs/PayoutReport3StorePayouts.md
new file mode 100644
index 00000000..4c72bbd1
--- /dev/null
+++ b/docs/PayoutReport3StorePayouts.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.PayoutReport3StorePayouts
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Stores** | [**List&lt;PayoutReport3StorePayout&gt;**](PayoutReport3StorePayout.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutReportsApi.md b/docs/PayoutReportsApi.md
new file mode 100644
index 00000000..8ff8ea3f
--- /dev/null
+++ b/docs/PayoutReportsApi.md
@@ -0,0 +1,352 @@
+# Flipdish.Api.PayoutReportsApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**GetPayoutReport3Details**](PayoutReportsApi.md#getpayoutreport3details) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/details | 
+[**GetPayoutReport3Overview**](PayoutReportsApi.md#getpayoutreport3overview) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/overview | 
+[**GetPayoutReport3PropertyDetails**](PayoutReportsApi.md#getpayoutreport3propertydetails) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/properties | 
+[**GetPayoutReport3RefundedOrders**](PayoutReportsApi.md#getpayoutreport3refundedorders) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/refundedOrders | 
+[**GetPayoutReport3Stores**](PayoutReportsApi.md#getpayoutreport3stores) | **GET** /api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/stores | 
+
+
+<a name="getpayoutreport3details"></a>
+# **GetPayoutReport3Details**
+> RestApiResultPayoutReport3Details GetPayoutReport3Details (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetPayoutReport3DetailsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PayoutReportsApi();
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var payoutId = 56;  // int? | 
+            var storeIds = new List<int?>(); // List<int?> |  (optional) 
+
+            try
+            {
+                RestApiResultPayoutReport3Details result = apiInstance.GetPayoutReport3Details(appId, bankAccountId, payoutId, storeIds);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PayoutReportsApi.GetPayoutReport3Details: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **payoutId** | **int?**|  | 
+ **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+
+### Return type
+
+[**RestApiResultPayoutReport3Details**](RestApiResultPayoutReport3Details.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getpayoutreport3overview"></a>
+# **GetPayoutReport3Overview**
+> RestApiResultPayoutReport3Overview GetPayoutReport3Overview (string appId, int? bankAccountId, int? payoutId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetPayoutReport3OverviewExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PayoutReportsApi();
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var payoutId = 56;  // int? | 
+
+            try
+            {
+                RestApiResultPayoutReport3Overview result = apiInstance.GetPayoutReport3Overview(appId, bankAccountId, payoutId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PayoutReportsApi.GetPayoutReport3Overview: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **payoutId** | **int?**|  | 
+
+### Return type
+
+[**RestApiResultPayoutReport3Overview**](RestApiResultPayoutReport3Overview.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getpayoutreport3propertydetails"></a>
+# **GetPayoutReport3PropertyDetails**
+> RestApiResultPayoutReport3PropertyDetails GetPayoutReport3PropertyDetails (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetPayoutReport3PropertyDetailsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PayoutReportsApi();
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var payoutId = 56;  // int? | 
+            var propertyIds = new List<string>(); // List<string> |  (optional) 
+            var storeIds = new List<int?>(); // List<int?> |  (optional) 
+
+            try
+            {
+                RestApiResultPayoutReport3PropertyDetails result = apiInstance.GetPayoutReport3PropertyDetails(appId, bankAccountId, payoutId, propertyIds, storeIds);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PayoutReportsApi.GetPayoutReport3PropertyDetails: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **payoutId** | **int?**|  | 
+ **propertyIds** | [**List&lt;string&gt;**](string.md)|  | [optional] 
+ **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+
+### Return type
+
+[**RestApiResultPayoutReport3PropertyDetails**](RestApiResultPayoutReport3PropertyDetails.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getpayoutreport3refundedorders"></a>
+# **GetPayoutReport3RefundedOrders**
+> RestApiPaginationResultPayoutReport3RefundedOrder GetPayoutReport3RefundedOrders (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetPayoutReport3RefundedOrdersExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PayoutReportsApi();
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var payoutId = 56;  // int? | 
+            var storeIds = new List<int?>(); // List<int?> |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
+
+            try
+            {
+                RestApiPaginationResultPayoutReport3RefundedOrder result = apiInstance.GetPayoutReport3RefundedOrders(appId, bankAccountId, payoutId, storeIds, page, limit);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PayoutReportsApi.GetPayoutReport3RefundedOrders: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **payoutId** | **int?**|  | 
+ **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
+
+### Return type
+
+[**RestApiPaginationResultPayoutReport3RefundedOrder**](RestApiPaginationResultPayoutReport3RefundedOrder.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getpayoutreport3stores"></a>
+# **GetPayoutReport3Stores**
+> RestApiResultPayoutReport3StorePayouts GetPayoutReport3Stores (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetPayoutReport3StoresExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new PayoutReportsApi();
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var payoutId = 56;  // int? | 
+            var stores = new List<int?>(); // List<int?> |  (optional) 
+
+            try
+            {
+                RestApiResultPayoutReport3StorePayouts result = apiInstance.GetPayoutReport3Stores(appId, bankAccountId, payoutId, stores);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling PayoutReportsApi.GetPayoutReport3Stores: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **payoutId** | **int?**|  | 
+ **stores** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+
+### Return type
+
+[**RestApiResultPayoutReport3StorePayouts**](RestApiResultPayoutReport3StorePayouts.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/PayoutRequestIds.md b/docs/PayoutRequestIds.md
index 1ad1fc5e..b4fa6218 100644
--- a/docs/PayoutRequestIds.md
+++ b/docs/PayoutRequestIds.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PayoutRequestIds
+# Flipdish.Model.PayoutRequestIds
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PayoutStore.md b/docs/PayoutStore.md
index e19a1a5c..392900a1 100644
--- a/docs/PayoutStore.md
+++ b/docs/PayoutStore.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PayoutStore
+# Flipdish.Model.PayoutStore
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,6 +13,8 @@ Name | Type | Description | Notes
 **Chargebacks** | [**ChargebackDetails**](ChargebackDetails.md) | Chargebacks breakdown | [optional] 
 **OtherCharges** | [**OtherChargesDetails**](OtherChargesDetails.md) | Breakdown of other charges | [optional] 
 **Balance** | [**BalanceDetails**](BalanceDetails.md) | Period opening and closing balance | [optional] 
+**PosRevenue** | [**PosRevenueDetails**](PosRevenueDetails.md) | Breakdown of POS charges | [optional] 
+**ThirdPartyFees** | [**ThirdPartyFeesDetails**](ThirdPartyFeesDetails.md) | Third party integration fees | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PayoutSummary.md b/docs/PayoutSummary.md
index ee77d7e1..ef2e8c56 100644
--- a/docs/PayoutSummary.md
+++ b/docs/PayoutSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PayoutSummary
+# Flipdish.Model.PayoutSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PayoutsApi.md b/docs/PayoutsApi.md
index 5e299563..adee5bc9 100644
--- a/docs/PayoutsApi.md
+++ b/docs/PayoutsApi.md
@@ -1,31 +1,31 @@
-# IO.Swagger.Api.PayoutsApi
+# Flipdish.Api.PayoutsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetPayout**](PayoutsApi.md#getpayout) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId} | Get Payout details broken down by Store
-[**GetPayoutChargebacks**](PayoutsApi.md#getpayoutchargebacks) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks | Get list of payout&#39;s chargebacks
-[**GetPayoutOrders**](PayoutsApi.md#getpayoutorders) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders | Get list of payout&#39;s orders
-[**GetPayoutOtherCharges**](PayoutsApi.md#getpayoutothercharges) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges | Get list of payout&#39;s other charges
-[**GetPayoutRefunds**](PayoutsApi.md#getpayoutrefunds) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds | Get list of payout&#39;s refunds
-[**GetPayoutSummaries**](PayoutsApi.md#getpayoutsummaries) | **GET** /api/v1.0/{appId}/payouts/summaries | Get list of payout summaries
-[**GetPayouts**](PayoutsApi.md#getpayouts) | **GET** /api/v1.0/{appId}/payouts | Get list of payouts
+[**GetPayout**](PayoutsApi.md#getpayout) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId} | 
+[**GetPayoutChargebacks**](PayoutsApi.md#getpayoutchargebacks) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks | 
+[**GetPayoutOrders**](PayoutsApi.md#getpayoutorders) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders | 
+[**GetPayoutOtherCharges**](PayoutsApi.md#getpayoutothercharges) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges | 
+[**GetPayoutRefunds**](PayoutsApi.md#getpayoutrefunds) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds | 
+[**GetPayoutSummaries**](PayoutsApi.md#getpayoutsummaries) | **GET** /api/v1.0/{appId}/payouts/summaries | 
+[**GetPayouts**](PayoutsApi.md#getpayouts) | **GET** /api/v1.0/{appId}/payouts | 
 
 
 <a name="getpayout"></a>
 # **GetPayout**
 > PayoutDetail GetPayout (string appId, int? bankAccountId, int? payoutId)
 
-Get Payout details broken down by Store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -43,7 +43,6 @@ namespace Example
 
             try
             {
-                // Get Payout details broken down by Store
                 PayoutDetail result = apiInstance.GetPayout(appId, bankAccountId, payoutId);
                 Debug.WriteLine(result);
             }
@@ -83,15 +82,15 @@ Name | Type | Description  | Notes
 # **GetPayoutChargebacks**
 > RestApiPaginationResultPayoutChargeback GetPayoutChargebacks (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null)
 
-Get list of payout's chargebacks
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -112,7 +111,6 @@ namespace Example
 
             try
             {
-                // Get list of payout's chargebacks
                 RestApiPaginationResultPayoutChargeback result = apiInstance.GetPayoutChargebacks(appId, bankAccountId, payoutId, page, limit, storeIds);
                 Debug.WriteLine(result);
             }
@@ -155,15 +153,15 @@ Name | Type | Description  | Notes
 # **GetPayoutOrders**
 > RestApiPaginationResultPayoutOrder GetPayoutOrders (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null)
 
-Get list of payout's orders
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -184,7 +182,6 @@ namespace Example
 
             try
             {
-                // Get list of payout's orders
                 RestApiPaginationResultPayoutOrder result = apiInstance.GetPayoutOrders(appId, bankAccountId, payoutId, page, limit, storeIds);
                 Debug.WriteLine(result);
             }
@@ -227,15 +224,15 @@ Name | Type | Description  | Notes
 # **GetPayoutOtherCharges**
 > RestApiPaginationResultPayoutOtherCharge GetPayoutOtherCharges (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null)
 
-Get list of payout's other charges
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -256,7 +253,6 @@ namespace Example
 
             try
             {
-                // Get list of payout's other charges
                 RestApiPaginationResultPayoutOtherCharge result = apiInstance.GetPayoutOtherCharges(appId, bankAccountId, payoutId, page, limit, storeIds);
                 Debug.WriteLine(result);
             }
@@ -299,15 +295,15 @@ Name | Type | Description  | Notes
 # **GetPayoutRefunds**
 > RestApiPaginationResultPayoutRefund GetPayoutRefunds (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null)
 
-Get list of payout's refunds
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -328,7 +324,6 @@ namespace Example
 
             try
             {
-                // Get list of payout's refunds
                 RestApiPaginationResultPayoutRefund result = apiInstance.GetPayoutRefunds(appId, bankAccountId, payoutId, page, limit, storeIds);
                 Debug.WriteLine(result);
             }
@@ -371,17 +366,15 @@ Name | Type | Description  | Notes
 # **GetPayoutSummaries**
 > RestApiArrayResultPayoutSummary GetPayoutSummaries (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null)
 
-Get list of payout summaries
 
-BETA - this endpoint is under development, do not use it in your production system
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -401,7 +394,6 @@ namespace Example
 
             try
             {
-                // Get list of payout summaries
                 RestApiArrayResultPayoutSummary result = apiInstance.GetPayoutSummaries(appId, startDate, endDate, payoutRequestIdsBankAccountIds, payoutRequestIdsStates);
                 Debug.WriteLine(result);
             }
@@ -443,17 +435,15 @@ Name | Type | Description  | Notes
 # **GetPayouts**
 > RestApiPaginationResultPayout GetPayouts (string appId, DateTime? startDate = null, DateTime? endDate = null, int? page = null, int? limit = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null)
 
-Get list of payouts
 
-BETA - this endpoint is under development, do not use it in your production system
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -475,7 +465,6 @@ namespace Example
 
             try
             {
-                // Get list of payouts
                 RestApiPaginationResultPayout result = apiInstance.GetPayouts(appId, startDate, endDate, page, limit, payoutRequestIdsBankAccountIds, payoutRequestIdsStates);
                 Debug.WriteLine(result);
             }
diff --git a/docs/PayoutsExportApi.md b/docs/PayoutsExportApi.md
deleted file mode 100644
index 5a450dfb..00000000
--- a/docs/PayoutsExportApi.md
+++ /dev/null
@@ -1,424 +0,0 @@
-# IO.Swagger.Api.PayoutsExportApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**ExportPayoutChargebacks**](PayoutsExportApi.md#exportpayoutchargebacks) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks/export | Export a list of payout&#39;s chargebacks as CSV
-[**ExportPayoutOrders**](PayoutsExportApi.md#exportpayoutorders) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders/export | Export a list of payout&#39;s orders as CSV
-[**ExportPayoutOtherCharges**](PayoutsExportApi.md#exportpayoutothercharges) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges/export | Export a list of payout&#39;s other charges as CSV
-[**ExportPayoutRefunds**](PayoutsExportApi.md#exportpayoutrefunds) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds/export | Export a list of payout&#39;s refunds as CSV
-[**ExportPayoutStores**](PayoutsExportApi.md#exportpayoutstores) | **GET** /api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/export | Export payout&#39;s details as CSV
-[**ExportPayouts**](PayoutsExportApi.md#exportpayouts) | **GET** /api/v1.0/{appId}/payouts/export | Export payouts as CSV
-
-
-<a name="exportpayoutchargebacks"></a>
-# **ExportPayoutChargebacks**
-> string ExportPayoutChargebacks (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-
-Export a list of payout's chargebacks as CSV
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class ExportPayoutChargebacksExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PayoutsExportApi();
-            var appId = appId_example;  // string | 
-            var bankAccountId = 56;  // int? | 
-            var payoutId = 56;  // int? | 
-            var storeIds = new List<int?>(); // List<int?> |  (optional) 
-
-            try
-            {
-                // Export a list of payout's chargebacks as CSV
-                string result = apiInstance.ExportPayoutChargebacks(appId, bankAccountId, payoutId, storeIds);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PayoutsExportApi.ExportPayoutChargebacks: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **bankAccountId** | **int?**|  | 
- **payoutId** | **int?**|  | 
- **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
-
-### Return type
-
-**string**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="exportpayoutorders"></a>
-# **ExportPayoutOrders**
-> string ExportPayoutOrders (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-
-Export a list of payout's orders as CSV
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class ExportPayoutOrdersExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PayoutsExportApi();
-            var appId = appId_example;  // string | 
-            var bankAccountId = 56;  // int? | 
-            var payoutId = 56;  // int? | 
-            var storeIds = new List<int?>(); // List<int?> |  (optional) 
-
-            try
-            {
-                // Export a list of payout's orders as CSV
-                string result = apiInstance.ExportPayoutOrders(appId, bankAccountId, payoutId, storeIds);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PayoutsExportApi.ExportPayoutOrders: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **bankAccountId** | **int?**|  | 
- **payoutId** | **int?**|  | 
- **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
-
-### Return type
-
-**string**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="exportpayoutothercharges"></a>
-# **ExportPayoutOtherCharges**
-> string ExportPayoutOtherCharges (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-
-Export a list of payout's other charges as CSV
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class ExportPayoutOtherChargesExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PayoutsExportApi();
-            var appId = appId_example;  // string | 
-            var bankAccountId = 56;  // int? | 
-            var payoutId = 56;  // int? | 
-            var storeIds = new List<int?>(); // List<int?> |  (optional) 
-
-            try
-            {
-                // Export a list of payout's other charges as CSV
-                string result = apiInstance.ExportPayoutOtherCharges(appId, bankAccountId, payoutId, storeIds);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PayoutsExportApi.ExportPayoutOtherCharges: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **bankAccountId** | **int?**|  | 
- **payoutId** | **int?**|  | 
- **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
-
-### Return type
-
-**string**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="exportpayoutrefunds"></a>
-# **ExportPayoutRefunds**
-> string ExportPayoutRefunds (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-
-Export a list of payout's refunds as CSV
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class ExportPayoutRefundsExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PayoutsExportApi();
-            var appId = appId_example;  // string | 
-            var bankAccountId = 56;  // int? | 
-            var payoutId = 56;  // int? | 
-            var storeIds = new List<int?>(); // List<int?> |  (optional) 
-
-            try
-            {
-                // Export a list of payout's refunds as CSV
-                string result = apiInstance.ExportPayoutRefunds(appId, bankAccountId, payoutId, storeIds);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PayoutsExportApi.ExportPayoutRefunds: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **bankAccountId** | **int?**|  | 
- **payoutId** | **int?**|  | 
- **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
-
-### Return type
-
-**string**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="exportpayoutstores"></a>
-# **ExportPayoutStores**
-> string ExportPayoutStores (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-
-Export payout's details as CSV
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class ExportPayoutStoresExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PayoutsExportApi();
-            var appId = appId_example;  // string | 
-            var bankAccountId = 56;  // int? | 
-            var payoutId = 56;  // int? | 
-            var storeIds = new List<int?>(); // List<int?> |  (optional) 
-
-            try
-            {
-                // Export payout's details as CSV
-                string result = apiInstance.ExportPayoutStores(appId, bankAccountId, payoutId, storeIds);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PayoutsExportApi.ExportPayoutStores: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **bankAccountId** | **int?**|  | 
- **payoutId** | **int?**|  | 
- **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
-
-### Return type
-
-**string**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="exportpayouts"></a>
-# **ExportPayouts**
-> string ExportPayouts (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null)
-
-Export payouts as CSV
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class ExportPayoutsExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PayoutsExportApi();
-            var appId = appId_example;  // string | 
-            var startDate = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
-            var endDate = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
-            var payoutRequestIdsBankAccountIds = new List<int?>(); // List<int?> | List of bank account ids to search for (optional) 
-            var payoutRequestIdsStates = payoutRequestIdsStates_example;  // List<string> | List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional) 
-
-            try
-            {
-                // Export payouts as CSV
-                string result = apiInstance.ExportPayouts(appId, startDate, endDate, payoutRequestIdsBankAccountIds, payoutRequestIdsStates);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PayoutsExportApi.ExportPayouts: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **startDate** | **DateTime?**|  | [optional] 
- **endDate** | **DateTime?**|  | [optional] 
- **payoutRequestIdsBankAccountIds** | [**List&lt;int?&gt;**](int?.md)| List of bank account ids to search for | [optional] 
- **payoutRequestIdsStates** | **List&lt;string&gt;**| List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for | [optional] 
-
-### Return type
-
-**string**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/PendingInvitation.md b/docs/PendingInvitation.md
new file mode 100644
index 00000000..00d18cef
--- /dev/null
+++ b/docs/PendingInvitation.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.PendingInvitation
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**AppName** | **string** | The name of the brand that you have been invited to join. | [optional] 
+**Email** | **string** | The email address that the invitation was sent to. | [optional] 
+**Otc** | **string** | The one-time code that can be used to accept the invitation. | [optional] 
+**CreatedAt** | **DateTime?** | The time that the invitation was created. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PendingMenuChanges.md b/docs/PendingMenuChanges.md
index 6d19cc7b..3086c946 100644
--- a/docs/PendingMenuChanges.md
+++ b/docs/PendingMenuChanges.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PendingMenuChanges
+# Flipdish.Model.PendingMenuChanges
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PendingMenuChangesApi.md b/docs/PendingMenuChangesApi.md
deleted file mode 100644
index 0cf78430..00000000
--- a/docs/PendingMenuChangesApi.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Flipdish.Api.PendingMenuChangesApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**GetPendingMenuChanges**](PendingMenuChangesApi.md#getpendingmenuchanges) | **GET** /api/v1.0/{appId}/menus/pendingmenuchanges | Get menu pending changes from Catalog groups and items
-
-
-<a name="getpendingmenuchanges"></a>
-# **GetPendingMenuChanges**
-> RestApiPaginationResultPendingMenuChanges GetPendingMenuChanges (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null)
-
-Get menu pending changes from Catalog groups and items
-
-[BETA - this endpoint is under development, do not use it in your production system]
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class GetPendingMenuChangesExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new PendingMenuChangesApi();
-            var appId = appId_example;  // string | 
-            var menuId = 56;  // int? |  (optional) 
-            var catalogElementId = catalogElementId_example;  // string |  (optional) 
-            var page = 56;  // int? |  (optional) 
-            var limit = 56;  // int? |  (optional) 
-
-            try
-            {
-                // Get menu pending changes from Catalog groups and items
-                RestApiPaginationResultPendingMenuChanges result = apiInstance.GetPendingMenuChanges(appId, menuId, catalogElementId, page, limit);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling PendingMenuChangesApi.GetPendingMenuChanges: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **menuId** | **int?**|  | [optional] 
- **catalogElementId** | **string**|  | [optional] 
- **page** | **int?**|  | [optional] 
- **limit** | **int?**|  | [optional] 
-
-### Return type
-
-[**RestApiPaginationResultPendingMenuChanges**](RestApiPaginationResultPendingMenuChanges.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/PendingMenuChangesSummaries.md b/docs/PendingMenuChangesSummaries.md
index b84df357..2e96d1e2 100644
--- a/docs/PendingMenuChangesSummaries.md
+++ b/docs/PendingMenuChangesSummaries.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PendingMenuChangesSummaries
+# Flipdish.Model.PendingMenuChangesSummaries
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PercentDiscountDetails.md b/docs/PercentDiscountDetails.md
index b9357866..464bc63e 100644
--- a/docs/PercentDiscountDetails.md
+++ b/docs/PercentDiscountDetails.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.PercentDiscountDetails
+# Flipdish.Model.PercentDiscountDetails
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **PercentageDiscount** | **int?** | Percentage discount | [optional] 
+**MaxDiscountAmount** | **double?** | The maximum amount that the percentage discount value can be.  If not set then there is no maximum.  If set to e.g. 20 euro, and the percentage discount is 25%, and the order total is 100 euro, then the discount will be 20 euro (not 25 euro). | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PhoneCall.md b/docs/PhoneCall.md
index 654073ee..7368370e 100644
--- a/docs/PhoneCall.md
+++ b/docs/PhoneCall.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.PhoneCall
+# Flipdish.Model.PhoneCall
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **PhoneCallId** | **int?** | Phone call id | [optional] 
+**CallSid** | **string** | Twilio Call SID | [optional] 
 **TimeOfCall** | **DateTime?** | Time of the call | [optional] 
 **TimeOfCallLocal** | **DateTime?** | Time of the call, local to the store to which the call was made | [optional] 
 **StoreId** | **int?** | ID of the store that the call was TO | [optional] 
diff --git a/docs/PhoneCallEndedEvent.md b/docs/PhoneCallEndedEvent.md
index 5a1a26b0..2f9952ac 100644
--- a/docs/PhoneCallEndedEvent.md
+++ b/docs/PhoneCallEndedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PhoneCallEndedEvent
+# Flipdish.Model.PhoneCallEndedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PhoneCallStartedEvent.md b/docs/PhoneCallStartedEvent.md
index 03b4f7ee..77fbd2de 100644
--- a/docs/PhoneCallStartedEvent.md
+++ b/docs/PhoneCallStartedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PhoneCallStartedEvent
+# Flipdish.Model.PhoneCallStartedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PixelPointProductCatalogue.md b/docs/PixelPointProductCatalogue.md
new file mode 100644
index 00000000..bf21c382
--- /dev/null
+++ b/docs/PixelPointProductCatalogue.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.PixelPointProductCatalogue
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Products** | **Dictionary&lt;string, string&gt;** | PixelPoint product number mapped to its display string.  Always includes the special NOT_INCLUDED sentinel entry. | 
+**Page** | **int?** | Current page index (1-based) | 
+**Limit** | **int?** | Current page size | 
+**TotalRecordCount** | **int?** | Total number of products matching the filter (excluding the sentinel entry) | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PlayStoreConfigModel.md b/docs/PlayStoreConfigModel.md
new file mode 100644
index 00000000..db157b46
--- /dev/null
+++ b/docs/PlayStoreConfigModel.md
@@ -0,0 +1,21 @@
+# Flipdish.Model.PlayStoreConfigModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelId** | **int?** | White label ID | [optional] 
+**BundleId** | **string** | Bundle ID | [optional] 
+**Description** | **string** | Description | [optional] 
+**ShortDescription** | **string** | Short description | [optional] 
+**Copyright** | **string** | Copyright | [optional] 
+**Keywords** | **string** | Keywords | [optional] 
+**MarketingUrl** | **string** | Marketing URL | [optional] 
+**PrivacyUrl** | **string** | Privacy URL | [optional] 
+**SupportUrl** | **string** | Support URL | [optional] 
+**PlayConsoleAccount** | **int?** | Play Console account: 0 &#x3D; IE, 1 &#x3D; UK, 2 &#x3D; IE2, 3 &#x3D; IE3 | [optional] 
+**ReleaseNotes** | **string** | Release notes | [optional] 
+**StoreIcon** | **string** | Store icon URL | [optional] 
+**ReadyToPublishAndroid** | **bool?** | Ready to publish Android | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PosRevenueDetails.md b/docs/PosRevenueDetails.md
new file mode 100644
index 00000000..8a8dae02
--- /dev/null
+++ b/docs/PosRevenueDetails.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.PosRevenueDetails
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PosSalesAmount** | **double?** | POS sale amount for the store | [optional] 
+**PosSalesTax** | **double?** | POS sale Tax for the store | [optional] 
+**PosSalesTips** | **double?** | POS sale tips for the store | [optional] 
+**TotalPosRevenue** | **double?** | POS Total Revenue for the store | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PreOrderConfig.md b/docs/PreOrderConfig.md
index b6a32b28..e43811dc 100644
--- a/docs/PreOrderConfig.md
+++ b/docs/PreOrderConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PreOrderConfig
+# Flipdish.Model.PreOrderConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PreOrderTime.md b/docs/PreOrderTime.md
index 44b65478..a013f371 100644
--- a/docs/PreOrderTime.md
+++ b/docs/PreOrderTime.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PreOrderTime
+# Flipdish.Model.PreOrderTime
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PredefinedAnswer.md b/docs/PredefinedAnswer.md
index fcd4b3c1..a704f4fd 100644
--- a/docs/PredefinedAnswer.md
+++ b/docs/PredefinedAnswer.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PredefinedAnswer
+# Flipdish.Model.PredefinedAnswer
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PreviousOrder.md b/docs/PreviousOrder.md
new file mode 100644
index 00000000..60a60bb7
--- /dev/null
+++ b/docs/PreviousOrder.md
@@ -0,0 +1,32 @@
+# Flipdish.Model.PreviousOrder
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeliveryType** | **string** |  | [optional] 
+**DeliveryLocationAddressString** | **string** |  | [optional] 
+**PaymentAccountType** | **string** |  | [optional] 
+**OrderId** | **int?** |  | [optional] 
+**ReceiptCode** | **string** |  | [optional] 
+**RestaurantName** | **string** |  | [optional] 
+**LocalOrderId** | **string** |  | [optional] 
+**TableServiceCategory** | **string** |  | [optional] 
+**PickupLocationOptionValue** | **string** |  | [optional] 
+**CustomerName** | **string** |  | [optional] 
+**PhoneNumberInternationalFormatString** | **string** |  | [optional] 
+**DeliveryInstructions** | **string** |  | [optional] 
+**Currency** | **string** |  | [optional] 
+**ProcessingFee** | **double?** |  | [optional] 
+**ServiceChargePercentage** | **double?** |  | [optional] 
+**ServiceChargeAmount** | **double?** |  | [optional] 
+**TipAmount** | **double?** |  | [optional] 
+**DeliveryAmount** | **double?** |  | [optional] 
+**DepositReturnFeeAmount** | **double?** |  | [optional] 
+**TotalTax** | **double?** |  | [optional] 
+**TotalAmount** | **double?** |  | [optional] 
+**Items** | [**List&lt;PreviousOrderItem&gt;**](PreviousOrderItem.md) |  | [optional] 
+**TaxRates** | [**List&lt;TaxRate&gt;**](TaxRate.md) |  | [optional] 
+**WhiteLabelId** | **int?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PreviousOrderItem.md b/docs/PreviousOrderItem.md
new file mode 100644
index 00000000..09049437
--- /dev/null
+++ b/docs/PreviousOrderItem.md
@@ -0,0 +1,15 @@
+# Flipdish.Model.PreviousOrderItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**MenuSectionDisplayOrder** | **int?** |  | [optional] 
+**MenuSectionName** | **string** |  | [optional] 
+**Name** | **string** |  | [optional] 
+**PriceIncludingOptionSetItems** | **double?** |  | [optional] 
+**DepositReturnFee** | **double?** |  | [optional] 
+**TaxAmount** | **double?** |  | [optional] 
+**PreviousOrderItemOptions** | [**List&lt;PreviousOrderItemOption&gt;**](PreviousOrderItemOption.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PreviousOrderItemOption.md b/docs/PreviousOrderItemOption.md
new file mode 100644
index 00000000..36c49472
--- /dev/null
+++ b/docs/PreviousOrderItemOption.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.PreviousOrderItemOption
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+**DepositReturnFee** | **double?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/Price.md b/docs/Price.md
deleted file mode 100644
index 0ef366ae..00000000
--- a/docs/Price.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.Price
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Amount** | **double?** | Amount (including tax) | [optional] 
-**Tax** | **double?** | Tax (only required in tax exclusive prices) | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/Printer.md b/docs/Printer.md
index 2c41548a..ff86f18b 100644
--- a/docs/Printer.md
+++ b/docs/Printer.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Printer
+# Flipdish.Model.Printer
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PrinterAssignedToStoreEvent.md b/docs/PrinterAssignedToStoreEvent.md
index 1a647816..7839d1e2 100644
--- a/docs/PrinterAssignedToStoreEvent.md
+++ b/docs/PrinterAssignedToStoreEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PrinterAssignedToStoreEvent
+# Flipdish.Model.PrinterAssignedToStoreEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PrinterTurnedOffEvent.md b/docs/PrinterTurnedOffEvent.md
index 5ce39848..0f056106 100644
--- a/docs/PrinterTurnedOffEvent.md
+++ b/docs/PrinterTurnedOffEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PrinterTurnedOffEvent
+# Flipdish.Model.PrinterTurnedOffEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PrinterTurnedOnEvent.md b/docs/PrinterTurnedOnEvent.md
index fd0bdd60..dcf7143a 100644
--- a/docs/PrinterTurnedOnEvent.md
+++ b/docs/PrinterTurnedOnEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PrinterTurnedOnEvent
+# Flipdish.Model.PrinterTurnedOnEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PrinterUnassignedFromStoreEvent.md b/docs/PrinterUnassignedFromStoreEvent.md
index 764af871..067bdf56 100644
--- a/docs/PrinterUnassignedFromStoreEvent.md
+++ b/docs/PrinterUnassignedFromStoreEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PrinterUnassignedFromStoreEvent
+# Flipdish.Model.PrinterUnassignedFromStoreEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ProcessPaymentIntentRequest.md b/docs/ProcessPaymentIntentRequest.md
index e276d4bf..e8da383c 100644
--- a/docs/ProcessPaymentIntentRequest.md
+++ b/docs/ProcessPaymentIntentRequest.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ProcessPaymentIntentRequest
+# Flipdish.Model.ProcessPaymentIntentRequest
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ProcessingFeeConfig.md b/docs/ProcessingFeeConfig.md
index a53a0265..d29c4b1f 100644
--- a/docs/ProcessingFeeConfig.md
+++ b/docs/ProcessingFeeConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ProcessingFeeConfig
+# Flipdish.Model.ProcessingFeeConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ProcessingFeeConfigsApi.md b/docs/ProcessingFeeConfigsApi.md
index b8c7b081..457406a1 100644
--- a/docs/ProcessingFeeConfigsApi.md
+++ b/docs/ProcessingFeeConfigsApi.md
@@ -1,25 +1,25 @@
-# IO.Swagger.Api.ProcessingFeeConfigsApi
+# Flipdish.Api.ProcessingFeeConfigsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetProcessingFeeConfigsByStoreIds**](ProcessingFeeConfigsApi.md#getprocessingfeeconfigsbystoreids) | **GET** /api/v1.0/processingfeeconfigs | Get processing fee configs by store identifiers
+[**GetProcessingFeeConfigsByStoreIds**](ProcessingFeeConfigsApi.md#getprocessingfeeconfigsbystoreids) | **GET** /api/v1.0/processingfeeconfigs | 
 
 
 <a name="getprocessingfeeconfigsbystoreids"></a>
 # **GetProcessingFeeConfigsByStoreIds**
 > RestApiArrayResultProcessingFeeConfig GetProcessingFeeConfigsByStoreIds (List<int?> storeIds)
 
-Get processing fee configs by store identifiers
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -31,11 +31,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new ProcessingFeeConfigsApi();
-            var storeIds = new List<int?>(); // List<int?> | Store identifiers
+            var storeIds = new List<int?>(); // List<int?> | 
 
             try
             {
-                // Get processing fee configs by store identifiers
                 RestApiArrayResultProcessingFeeConfig result = apiInstance.GetProcessingFeeConfigsByStoreIds(storeIds);
                 Debug.WriteLine(result);
             }
@@ -52,7 +51,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeIds** | [**List&lt;int?&gt;**](int?.md)| Store identifiers | 
+ **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | 
 
 ### Return type
 
diff --git a/docs/Product.md b/docs/Product.md
index d8c93fb2..e5d6d46d 100644
--- a/docs/Product.md
+++ b/docs/Product.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Product
+# Flipdish.Model.Product
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ProductItem.md b/docs/ProductItem.md
deleted file mode 100644
index 18ee1944..00000000
--- a/docs/ProductItem.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Flipdish.Model.ProductItem
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**ProductId** | **string** | Product Id to the product to add as Menu Item | 
-**CellLayoutType** | **string** | Small | Medium | Large | HiddenImage  Affects the layout of the menu. | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/ProductReference.md b/docs/ProductReference.md
index 171dfcc0..f770e8cc 100644
--- a/docs/ProductReference.md
+++ b/docs/ProductReference.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.ProductReference
+# Flipdish.Model.ProductReference
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Item** | [**Product**](Product.md) | Details of the referenced {Flipdish.PublicModels.V1.Catalog.Groups.ProductReference.Product} | [optional] 
-**Product** | [**Product**](Product.md) | Details of the referenced {Flipdish.PublicModels.V1.Catalog.Groups.ProductReference.Product} | [optional] 
+**Item** | [**Product**](Product.md) | Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Groups.ProductReference.Product} | [optional] 
+**Product** | [**Product**](Product.md) | Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Groups.ProductReference.Product} | [optional] 
 **CatalogItemId** | **string** | Identifier of the CatalogItemId to use as SubProduct | 
 **ProductType** | **string** | Type of the SupProduct | 
 **PreselectedQuantity** | **int?** | Quantity of the modifier that will be set when the parent product is placed in the basket | [optional] 
diff --git a/docs/ProductsApi.md b/docs/ProductsApi.md
deleted file mode 100644
index 1d966f4d..00000000
--- a/docs/ProductsApi.md
+++ /dev/null
@@ -1,214 +0,0 @@
-# Flipdish.Api.ProductsApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**ArchiveProduct**](ProductsApi.md#archiveproduct) | **POST** /api/v1.0/{appId}/catalog/products/{productId}/archive | Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted
-[**DuplicateProduct**](ProductsApi.md#duplicateproduct) | **POST** /api/v1.0/{appId}/catalog/products/{productId}/duplicate | Duplicate a product
-[**GetProducts**](ProductsApi.md#getproducts) | **GET** /api/v1.0/{appId}/catalog/products | Get paginated products by app name id filtered by product types
-
-
-<a name="archiveproduct"></a>
-# **ArchiveProduct**
-> void ArchiveProduct (string appId, string productId)
-
-Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted
-
-[BETA - this endpoint is under development, do not use it in your production system]
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class ArchiveProductExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new ProductsApi();
-            var appId = appId_example;  // string | 
-            var productId = productId_example;  // string | 
-
-            try
-            {
-                // Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted
-                apiInstance.ArchiveProduct(appId, productId);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling ProductsApi.ArchiveProduct: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **productId** | **string**|  | 
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="duplicateproduct"></a>
-# **DuplicateProduct**
-> RestApiResultProduct DuplicateProduct (string appId, string productId)
-
-Duplicate a product
-
-[BETA - this endpoint is under development, do not use it in your production system]
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class DuplicateProductExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new ProductsApi();
-            var appId = appId_example;  // string | 
-            var productId = productId_example;  // string | 
-
-            try
-            {
-                // Duplicate a product
-                RestApiResultProduct result = apiInstance.DuplicateProduct(appId, productId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling ProductsApi.DuplicateProduct: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **productId** | **string**|  | 
-
-### Return type
-
-[**RestApiResultProduct**](RestApiResultProduct.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="getproducts"></a>
-# **GetProducts**
-> RestApiPaginationResultProduct GetProducts (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null)
-
-Get paginated products by app name id filtered by product types
-
-[BETA - this endpoint is under development, do not use it in your production system]
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class GetProductsExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new ProductsApi();
-            var appId = appId_example;  // string | 
-            var productTypes = productTypes_example;  // List<string> | 
-            var searchTerm = searchTerm_example;  // string |  (optional) 
-            var page = 56;  // int? |  (optional) 
-            var limit = 56;  // int? |  (optional) 
-
-            try
-            {
-                // Get paginated products by app name id filtered by product types
-                RestApiPaginationResultProduct result = apiInstance.GetProducts(appId, productTypes, searchTerm, page, limit);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling ProductsApi.GetProducts: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**|  | 
- **productTypes** | **List&lt;string&gt;**|  | 
- **searchTerm** | **string**|  | [optional] 
- **page** | **int?**|  | [optional] 
- **limit** | **int?**|  | [optional] 
-
-### Return type
-
-[**RestApiPaginationResultProduct**](RestApiPaginationResultProduct.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/PromotionAward.md b/docs/PromotionAward.md
new file mode 100644
index 00000000..80eec1fb
--- /dev/null
+++ b/docs/PromotionAward.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.PromotionAward
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PromotionAwardId** | **int?** | Promotion Award Id | [optional] 
+**MenuItemPublicId** | **Guid?** | The public id of the menu item that will be awarded | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PromotionDetails.md b/docs/PromotionDetails.md
new file mode 100644
index 00000000..d3245180
--- /dev/null
+++ b/docs/PromotionDetails.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.PromotionDetails
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PromotionId** | **int?** | Promotion Id | [optional] 
+**Name** | **string** | The name of the promotion | [optional] 
+**PromotionAwards** | [**List&lt;PromotionAward&gt;**](PromotionAward.md) | The items that this promotion will award | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/PublishMenuChanges.md b/docs/PublishMenuChanges.md
index a475c2dd..b6f7b1ed 100644
--- a/docs/PublishMenuChanges.md
+++ b/docs/PublishMenuChanges.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PublishMenuChanges
+# Flipdish.Model.PublishMenuChanges
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PushNotificationDeletedEvent.md b/docs/PushNotificationDeletedEvent.md
index 3c436fa4..130b6873 100644
--- a/docs/PushNotificationDeletedEvent.md
+++ b/docs/PushNotificationDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PushNotificationDeletedEvent
+# Flipdish.Model.PushNotificationDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PushNotificationRequest.md b/docs/PushNotificationRequest.md
index 78fcc4e6..3f88b09f 100644
--- a/docs/PushNotificationRequest.md
+++ b/docs/PushNotificationRequest.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PushNotificationRequest
+# Flipdish.Model.PushNotificationRequest
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PushNotificationResponse.md b/docs/PushNotificationResponse.md
index db3d7333..5e617b97 100644
--- a/docs/PushNotificationResponse.md
+++ b/docs/PushNotificationResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PushNotificationResponse
+# Flipdish.Model.PushNotificationResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/PushNotificationScheduledEvent.md b/docs/PushNotificationScheduledEvent.md
index cc7635d4..1b931ed7 100644
--- a/docs/PushNotificationScheduledEvent.md
+++ b/docs/PushNotificationScheduledEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PushNotificationScheduledEvent
+# Flipdish.Model.PushNotificationScheduledEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PushNotificationSentEvent.md b/docs/PushNotificationSentEvent.md
index dce2da4b..f1e63124 100644
--- a/docs/PushNotificationSentEvent.md
+++ b/docs/PushNotificationSentEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.PushNotificationSentEvent
+# Flipdish.Model.PushNotificationSentEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/PushNotificationsApi.md b/docs/PushNotificationsApi.md
index 8a93be92..cbc13ebd 100644
--- a/docs/PushNotificationsApi.md
+++ b/docs/PushNotificationsApi.md
@@ -1,28 +1,28 @@
-# IO.Swagger.Api.PushNotificationsApi
+# Flipdish.Api.PushNotificationsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**DeletePushNotification**](PushNotificationsApi.md#deletepushnotification) | **DELETE** /api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId} | [PRIVATE] Push notification to cutomers
-[**GetPushNotifications**](PushNotificationsApi.md#getpushnotifications) | **GET** /api/v1.0/{appId}/pushnotifications | [PRIVATE] Push notification to cutomers
-[**SchedulePushNotification**](PushNotificationsApi.md#schedulepushnotification) | **POST** /api/v1.0/{appId}/pushnotifications | [PRIVATE] Push notification to cutomers
-[**UpdatePushNotification**](PushNotificationsApi.md#updatepushnotification) | **POST** /api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId} | [PRIVATE] Update the push notification
+[**DeletePushNotification**](PushNotificationsApi.md#deletepushnotification) | **DELETE** /api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId} | 
+[**GetPushNotifications**](PushNotificationsApi.md#getpushnotifications) | **GET** /api/v1.0/{appId}/pushnotifications | 
+[**SchedulePushNotification**](PushNotificationsApi.md#schedulepushnotification) | **POST** /api/v1.0/{appId}/pushnotifications | 
+[**UpdatePushNotification**](PushNotificationsApi.md#updatepushnotification) | **POST** /api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId} | 
 
 
 <a name="deletepushnotification"></a>
 # **DeletePushNotification**
 > void DeletePushNotification (string appId, int? scheduledPushNotificationId)
 
-[PRIVATE] Push notification to cutomers
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -35,11 +35,10 @@ namespace Example
 
             var apiInstance = new PushNotificationsApi();
             var appId = appId_example;  // string | 
-            var scheduledPushNotificationId = 56;  // int? | ID of Scheduled push notifiaction to delete
+            var scheduledPushNotificationId = 56;  // int? | 
 
             try
             {
-                // [PRIVATE] Push notification to cutomers
                 apiInstance.DeletePushNotification(appId, scheduledPushNotificationId);
             }
             catch (Exception e)
@@ -56,7 +55,7 @@ namespace Example
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **appId** | **string**|  | 
- **scheduledPushNotificationId** | **int?**| ID of Scheduled push notifiaction to delete | 
+ **scheduledPushNotificationId** | **int?**|  | 
 
 ### Return type
 
@@ -77,15 +76,15 @@ void (empty response body)
 # **GetPushNotifications**
 > RestApiPaginationResultPushNotificationResponse GetPushNotifications (string appId, int? page = null, int? limit = null)
 
-[PRIVATE] Push notification to cutomers
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -103,7 +102,6 @@ namespace Example
 
             try
             {
-                // [PRIVATE] Push notification to cutomers
                 RestApiPaginationResultPushNotificationResponse result = apiInstance.GetPushNotifications(appId, page, limit);
                 Debug.WriteLine(result);
             }
@@ -143,15 +141,15 @@ Name | Type | Description  | Notes
 # **SchedulePushNotification**
 > RestApiResultPushNotificationResponse SchedulePushNotification (string appId, PushNotificationRequest notification)
 
-[PRIVATE] Push notification to cutomers
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -163,12 +161,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PushNotificationsApi();
-            var appId = appId_example;  // string | Application Id
-            var notification = new PushNotificationRequest(); // PushNotificationRequest | Notification to send
+            var appId = appId_example;  // string | 
+            var notification = new PushNotificationRequest(); // PushNotificationRequest | 
 
             try
             {
-                // [PRIVATE] Push notification to cutomers
                 RestApiResultPushNotificationResponse result = apiInstance.SchedulePushNotification(appId, notification);
                 Debug.WriteLine(result);
             }
@@ -185,8 +182,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id | 
- **notification** | [**PushNotificationRequest**](PushNotificationRequest.md)| Notification to send | 
+ **appId** | **string**|  | 
+ **notification** | [**PushNotificationRequest**](PushNotificationRequest.md)|  | 
 
 ### Return type
 
@@ -207,15 +204,15 @@ Name | Type | Description  | Notes
 # **UpdatePushNotification**
 > RestApiResultPushNotificationResponse UpdatePushNotification (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification)
 
-[PRIVATE] Update the push notification
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -227,13 +224,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new PushNotificationsApi();
-            var appId = appId_example;  // string | Application Id
-            var scheduledPushNotificationId = 56;  // int? | Notification Id
-            var notification = new PushNotificationRequest(); // PushNotificationRequest | Notification to send
+            var appId = appId_example;  // string | 
+            var scheduledPushNotificationId = 56;  // int? | 
+            var notification = new PushNotificationRequest(); // PushNotificationRequest | 
 
             try
             {
-                // [PRIVATE] Update the push notification
                 RestApiResultPushNotificationResponse result = apiInstance.UpdatePushNotification(appId, scheduledPushNotificationId, notification);
                 Debug.WriteLine(result);
             }
@@ -250,9 +246,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id | 
- **scheduledPushNotificationId** | **int?**| Notification Id | 
- **notification** | [**PushNotificationRequest**](PushNotificationRequest.md)| Notification to send | 
+ **appId** | **string**|  | 
+ **scheduledPushNotificationId** | **int?**|  | 
+ **notification** | [**PushNotificationRequest**](PushNotificationRequest.md)|  | 
 
 ### Return type
 
diff --git a/docs/Range.md b/docs/Range.md
index 825906b7..1fd3e12c 100644
--- a/docs/Range.md
+++ b/docs/Range.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Range
+# Flipdish.Model.Range
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ReaderActionStateInfo.md b/docs/ReaderActionStateInfo.md
index 2c54ec4f..e9f3957a 100644
--- a/docs/ReaderActionStateInfo.md
+++ b/docs/ReaderActionStateInfo.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ReaderActionStateInfo
+# Flipdish.Model.ReaderActionStateInfo
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ReceiptsApi.md b/docs/ReceiptsApi.md
new file mode 100644
index 00000000..7e703c2a
--- /dev/null
+++ b/docs/ReceiptsApi.md
@@ -0,0 +1,70 @@
+# Flipdish.Api.ReceiptsApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**GetReceipt**](ReceiptsApi.md#getreceipt) | **GET** /api/v1.0/receipts/{orderId} | 
+
+
+<a name="getreceipt"></a>
+# **GetReceipt**
+> GetReceiptByOrderIdQueryResponse GetReceipt (int? orderId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetReceiptExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new ReceiptsApi();
+            var orderId = 56;  // int? | 
+
+            try
+            {
+                GetReceiptByOrderIdQueryResponse result = apiInstance.GetReceipt(orderId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling ReceiptsApi.GetReceipt: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **int?**|  | 
+
+### Return type
+
+[**GetReceiptByOrderIdQueryResponse**](GetReceiptByOrderIdQueryResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/RedeemInvitationResult.md b/docs/RedeemInvitationResult.md
index 58936d47..c8f0c61d 100644
--- a/docs/RedeemInvitationResult.md
+++ b/docs/RedeemInvitationResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RedeemInvitationResult
+# Flipdish.Model.RedeemInvitationResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Refund.md b/docs/Refund.md
index ad08819a..c91aa41d 100644
--- a/docs/Refund.md
+++ b/docs/Refund.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Refund
+# Flipdish.Model.Refund
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Reject.md b/docs/Reject.md
index 9ad6303f..53be46a9 100644
--- a/docs/Reject.md
+++ b/docs/Reject.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Reject
+# Flipdish.Model.Reject
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RequestLoginPinModel.md b/docs/RequestLoginPinModel.md
deleted file mode 100644
index a8cc96b9..00000000
--- a/docs/RequestLoginPinModel.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RequestLoginPinModel
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Email** | **string** | Email address | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RequestLoginPinResposne.md b/docs/RequestLoginPinResposne.md
deleted file mode 100644
index 512b15fd..00000000
--- a/docs/RequestLoginPinResposne.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RequestLoginPinResposne
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**LoginPinSentViaEmail** | **bool?** | Login PIN sent via email to user | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RequestPasswordResetModel.md b/docs/RequestPasswordResetModel.md
index 4385ee99..263ac8a1 100644
--- a/docs/RequestPasswordResetModel.md
+++ b/docs/RequestPasswordResetModel.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.RequestPasswordResetModel
+# Flipdish.Model.RequestPasswordResetModel
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Email** | **string** | Email address | [optional] 
+**RecaptchaToken** | **string** | Google Recaptcha Token | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RequestPasswordResetPinResponse.md b/docs/RequestPasswordResetPinResponse.md
deleted file mode 100644
index 7c56fb33..00000000
--- a/docs/RequestPasswordResetPinResponse.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RequestPasswordResetPinResponse
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**PasswordResetPinSentViaEmail** | **bool?** | Password Reset PIN sent via email to user | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/Response.md b/docs/Response.md
index 42145447..5dffa40e 100644
--- a/docs/Response.md
+++ b/docs/Response.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Response
+# Flipdish.Model.Response
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultAllMetadataResult.md b/docs/RestApiArrayResultAllMetadataResult.md
index 0ca4957d..f6736088 100644
--- a/docs/RestApiArrayResultAllMetadataResult.md
+++ b/docs/RestApiArrayResultAllMetadataResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultAllMetadataResult
+# Flipdish.Model.RestApiArrayResultAllMetadataResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultAllergen.md b/docs/RestApiArrayResultAllergen.md
new file mode 100644
index 00000000..cde3d75f
--- /dev/null
+++ b/docs/RestApiArrayResultAllergen.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultAllergen
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;Allergen&gt;**](Allergen.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultApmCurrencyDataPoint.md b/docs/RestApiArrayResultApmCurrencyDataPoint.md
index 3dac02e6..8aa2840a 100644
--- a/docs/RestApiArrayResultApmCurrencyDataPoint.md
+++ b/docs/RestApiArrayResultApmCurrencyDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultApmCurrencyDataPoint
+# Flipdish.Model.RestApiArrayResultApmCurrencyDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultApmDataPoint.md b/docs/RestApiArrayResultApmDataPoint.md
index 7fffdaf1..0e643826 100644
--- a/docs/RestApiArrayResultApmDataPoint.md
+++ b/docs/RestApiArrayResultApmDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultApmDataPoint
+# Flipdish.Model.RestApiArrayResultApmDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultApmHourlyDataPoint.md b/docs/RestApiArrayResultApmHourlyDataPoint.md
index 0bb25b4e..87363635 100644
--- a/docs/RestApiArrayResultApmHourlyDataPoint.md
+++ b/docs/RestApiArrayResultApmHourlyDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultApmHourlyDataPoint
+# Flipdish.Model.RestApiArrayResultApmHourlyDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultAppConfigurationHeader.md b/docs/RestApiArrayResultAppConfigurationHeader.md
deleted file mode 100644
index 0fb63678..00000000
--- a/docs/RestApiArrayResultAppConfigurationHeader.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiArrayResultAppConfigurationHeader
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;AppConfigurationHeader&gt;**](AppConfigurationHeader.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiArrayResultAppConfigurationSummary.md b/docs/RestApiArrayResultAppConfigurationSummary.md
deleted file mode 100644
index f0a260ec..00000000
--- a/docs/RestApiArrayResultAppConfigurationSummary.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiArrayResultAppConfigurationSummary
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;AppConfigurationSummary&gt;**](AppConfigurationSummary.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiArrayResultAppStoreAppConfigurationHeader.md b/docs/RestApiArrayResultAppStoreAppConfigurationHeader.md
deleted file mode 100644
index 415990f9..00000000
--- a/docs/RestApiArrayResultAppStoreAppConfigurationHeader.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiArrayResultAppStoreAppConfigurationHeader
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;AppStoreAppConfigurationHeader&gt;**](AppStoreAppConfigurationHeader.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiArrayResultAppStoreAppConfigurationSummary.md b/docs/RestApiArrayResultAppStoreAppConfigurationSummary.md
index 02585e26..e60bf05f 100644
--- a/docs/RestApiArrayResultAppStoreAppConfigurationSummary.md
+++ b/docs/RestApiArrayResultAppStoreAppConfigurationSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultAppStoreAppConfigurationSummary
+# Flipdish.Model.RestApiArrayResultAppStoreAppConfigurationSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultAppStoreAppSummary.md b/docs/RestApiArrayResultAppStoreAppSummary.md
new file mode 100644
index 00000000..1cde9951
--- /dev/null
+++ b/docs/RestApiArrayResultAppStoreAppSummary.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultAppStoreAppSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;AppStoreAppSummary&gt;**](AppStoreAppSummary.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultBankAccountSummary.md b/docs/RestApiArrayResultBankAccountSummary.md
index 864a32e1..c7859eef 100644
--- a/docs/RestApiArrayResultBankAccountSummary.md
+++ b/docs/RestApiArrayResultBankAccountSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultBankAccountSummary
+# Flipdish.Model.RestApiArrayResultBankAccountSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultBusinessHoursPeriod.md b/docs/RestApiArrayResultBusinessHoursPeriod.md
index 9d106a19..05d5a5ca 100644
--- a/docs/RestApiArrayResultBusinessHoursPeriod.md
+++ b/docs/RestApiArrayResultBusinessHoursPeriod.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultBusinessHoursPeriod
+# Flipdish.Model.RestApiArrayResultBusinessHoursPeriod
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultChannel.md b/docs/RestApiArrayResultChannel.md
index 68917c73..458974c1 100644
--- a/docs/RestApiArrayResultChannel.md
+++ b/docs/RestApiArrayResultChannel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultChannel
+# Flipdish.Model.RestApiArrayResultChannel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultClientDeviceSummary.md b/docs/RestApiArrayResultClientDeviceSummary.md
new file mode 100644
index 00000000..37ef9666
--- /dev/null
+++ b/docs/RestApiArrayResultClientDeviceSummary.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultClientDeviceSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;ClientDeviceSummary&gt;**](ClientDeviceSummary.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultConfiguredAppHeader.md b/docs/RestApiArrayResultConfiguredAppHeader.md
deleted file mode 100644
index 714a5114..00000000
--- a/docs/RestApiArrayResultConfiguredAppHeader.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiArrayResultConfiguredAppHeader
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;ConfiguredAppHeader&gt;**](ConfiguredAppHeader.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiArrayResultCountryWithAccountFieldsDefinitions.md b/docs/RestApiArrayResultCountryWithAccountFieldsDefinitions.md
index 897ba05e..b5f9f44d 100644
--- a/docs/RestApiArrayResultCountryWithAccountFieldsDefinitions.md
+++ b/docs/RestApiArrayResultCountryWithAccountFieldsDefinitions.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultCountryWithAccountFieldsDefinitions
+# Flipdish.Model.RestApiArrayResultCountryWithAccountFieldsDefinitions
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultDeliveryZone.md b/docs/RestApiArrayResultDeliveryZone.md
index 4d90530e..e844db9f 100644
--- a/docs/RestApiArrayResultDeliveryZone.md
+++ b/docs/RestApiArrayResultDeliveryZone.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultDeliveryZone
+# Flipdish.Model.RestApiArrayResultDeliveryZone
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultDriver.md b/docs/RestApiArrayResultDriver.md
deleted file mode 100644
index a89e0419..00000000
--- a/docs/RestApiArrayResultDriver.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiArrayResultDriver
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;Driver&gt;**](Driver.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiArrayResultDriverStore.md b/docs/RestApiArrayResultDriverStore.md
deleted file mode 100644
index 4bffcb12..00000000
--- a/docs/RestApiArrayResultDriverStore.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiArrayResultDriverStore
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;DriverStore&gt;**](DriverStore.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiArrayResultEmvTerminalWithAssignments.md b/docs/RestApiArrayResultEmvTerminalWithAssignments.md
index dafbc88d..c14bdca9 100644
--- a/docs/RestApiArrayResultEmvTerminalWithAssignments.md
+++ b/docs/RestApiArrayResultEmvTerminalWithAssignments.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultEmvTerminalWithAssignments
+# Flipdish.Model.RestApiArrayResultEmvTerminalWithAssignments
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultFlipdishAccountName.md b/docs/RestApiArrayResultFlipdishAccountName.md
new file mode 100644
index 00000000..ce607ad6
--- /dev/null
+++ b/docs/RestApiArrayResultFlipdishAccountName.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultFlipdishAccountName
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;FlipdishAccountName&gt;**](FlipdishAccountName.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultFulfillmentStatesConfigurationSummary.md b/docs/RestApiArrayResultFulfillmentStatesConfigurationSummary.md
index e2ed9e7a..0f004e1b 100644
--- a/docs/RestApiArrayResultFulfillmentStatesConfigurationSummary.md
+++ b/docs/RestApiArrayResultFulfillmentStatesConfigurationSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultFulfillmentStatesConfigurationSummary
+# Flipdish.Model.RestApiArrayResultFulfillmentStatesConfigurationSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultHomeAction.md b/docs/RestApiArrayResultHomeAction.md
index 25702df4..81d04081 100644
--- a/docs/RestApiArrayResultHomeAction.md
+++ b/docs/RestApiArrayResultHomeAction.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultHomeAction
+# Flipdish.Model.RestApiArrayResultHomeAction
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultKioskCashPaymentSettings.md b/docs/RestApiArrayResultKioskCashPaymentSettings.md
index 931b173a..acea391b 100644
--- a/docs/RestApiArrayResultKioskCashPaymentSettings.md
+++ b/docs/RestApiArrayResultKioskCashPaymentSettings.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultKioskCashPaymentSettings
+# Flipdish.Model.RestApiArrayResultKioskCashPaymentSettings
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultLocalisedTimeZone.md b/docs/RestApiArrayResultLocalisedTimeZone.md
index f842d876..75015d5b 100644
--- a/docs/RestApiArrayResultLocalisedTimeZone.md
+++ b/docs/RestApiArrayResultLocalisedTimeZone.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultLocalisedTimeZone
+# Flipdish.Model.RestApiArrayResultLocalisedTimeZone
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultLocationAreaLocation.md b/docs/RestApiArrayResultLocationAreaLocation.md
index 2afbf7cb..d8f6c270 100644
--- a/docs/RestApiArrayResultLocationAreaLocation.md
+++ b/docs/RestApiArrayResultLocationAreaLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultLocationAreaLocation
+# Flipdish.Model.RestApiArrayResultLocationAreaLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultLocationAreaWithLocations.md b/docs/RestApiArrayResultLocationAreaWithLocations.md
index 2357be71..db496e47 100644
--- a/docs/RestApiArrayResultLocationAreaWithLocations.md
+++ b/docs/RestApiArrayResultLocationAreaWithLocations.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultLocationAreaWithLocations
+# Flipdish.Model.RestApiArrayResultLocationAreaWithLocations
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultLoyaltyCampaign.md b/docs/RestApiArrayResultLoyaltyCampaign.md
index 48198956..f48c3507 100644
--- a/docs/RestApiArrayResultLoyaltyCampaign.md
+++ b/docs/RestApiArrayResultLoyaltyCampaign.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultLoyaltyCampaign
+# Flipdish.Model.RestApiArrayResultLoyaltyCampaign
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuCheckpoint.md b/docs/RestApiArrayResultMenuCheckpoint.md
index 2a3ddbf7..28f672e9 100644
--- a/docs/RestApiArrayResultMenuCheckpoint.md
+++ b/docs/RestApiArrayResultMenuCheckpoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuCheckpoint
+# Flipdish.Model.RestApiArrayResultMenuCheckpoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuElementEditResponse.md b/docs/RestApiArrayResultMenuElementEditResponse.md
index ac2ed577..8d78f3bd 100644
--- a/docs/RestApiArrayResultMenuElementEditResponse.md
+++ b/docs/RestApiArrayResultMenuElementEditResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuElementEditResponse
+# Flipdish.Model.RestApiArrayResultMenuElementEditResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuElementListResponse.md b/docs/RestApiArrayResultMenuElementListResponse.md
index 6d5f6822..6a362b7f 100644
--- a/docs/RestApiArrayResultMenuElementListResponse.md
+++ b/docs/RestApiArrayResultMenuElementListResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuElementListResponse
+# Flipdish.Model.RestApiArrayResultMenuElementListResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuItemOptionSet.md b/docs/RestApiArrayResultMenuItemOptionSet.md
index 1666e85d..741d0b0c 100644
--- a/docs/RestApiArrayResultMenuItemOptionSet.md
+++ b/docs/RestApiArrayResultMenuItemOptionSet.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuItemOptionSet
+# Flipdish.Model.RestApiArrayResultMenuItemOptionSet
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuItemOptionSetItem.md b/docs/RestApiArrayResultMenuItemOptionSetItem.md
index fcf64763..e877e341 100644
--- a/docs/RestApiArrayResultMenuItemOptionSetItem.md
+++ b/docs/RestApiArrayResultMenuItemOptionSetItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuItemOptionSetItem
+# Flipdish.Model.RestApiArrayResultMenuItemOptionSetItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuSection.md b/docs/RestApiArrayResultMenuSection.md
index 87bda69f..ae6c3c2c 100644
--- a/docs/RestApiArrayResultMenuSection.md
+++ b/docs/RestApiArrayResultMenuSection.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuSection
+# Flipdish.Model.RestApiArrayResultMenuSection
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuSectionItem.md b/docs/RestApiArrayResultMenuSectionItem.md
index 3fc7e9ce..5d864794 100644
--- a/docs/RestApiArrayResultMenuSectionItem.md
+++ b/docs/RestApiArrayResultMenuSectionItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuSectionItem
+# Flipdish.Model.RestApiArrayResultMenuSectionItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuStoreNames.md b/docs/RestApiArrayResultMenuStoreNames.md
index 02cd6a7b..0771d65e 100644
--- a/docs/RestApiArrayResultMenuStoreNames.md
+++ b/docs/RestApiArrayResultMenuStoreNames.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuStoreNames
+# Flipdish.Model.RestApiArrayResultMenuStoreNames
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuSummary.md b/docs/RestApiArrayResultMenuSummary.md
index c317fb11..13c65df1 100644
--- a/docs/RestApiArrayResultMenuSummary.md
+++ b/docs/RestApiArrayResultMenuSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuSummary
+# Flipdish.Model.RestApiArrayResultMenuSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuTaxDetails.md b/docs/RestApiArrayResultMenuTaxDetails.md
index 39e68e07..2f8e9116 100644
--- a/docs/RestApiArrayResultMenuTaxDetails.md
+++ b/docs/RestApiArrayResultMenuTaxDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMenuTaxDetails
+# Flipdish.Model.RestApiArrayResultMenuTaxDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMenuZone.md b/docs/RestApiArrayResultMenuZone.md
new file mode 100644
index 00000000..66569a82
--- /dev/null
+++ b/docs/RestApiArrayResultMenuZone.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultMenuZone
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;MenuZone&gt;**](MenuZone.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultMetadata.md b/docs/RestApiArrayResultMetadata.md
index 80c93ab4..cdf77eb9 100644
--- a/docs/RestApiArrayResultMetadata.md
+++ b/docs/RestApiArrayResultMetadata.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMetadata
+# Flipdish.Model.RestApiArrayResultMetadata
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultMobileAppsStatistics.md b/docs/RestApiArrayResultMobileAppsStatistics.md
index 8013fd90..21ec076f 100644
--- a/docs/RestApiArrayResultMobileAppsStatistics.md
+++ b/docs/RestApiArrayResultMobileAppsStatistics.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultMobileAppsStatistics
+# Flipdish.Model.RestApiArrayResultMobileAppsStatistics
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultOAuthApp.md b/docs/RestApiArrayResultOAuthApp.md
index 74817f3a..9e2b8d30 100644
--- a/docs/RestApiArrayResultOAuthApp.md
+++ b/docs/RestApiArrayResultOAuthApp.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultOAuthApp
+# Flipdish.Model.RestApiArrayResultOAuthApp
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultOauthClientRedirectUri.md b/docs/RestApiArrayResultOauthClientRedirectUri.md
index b234b97e..f2ac5e39 100644
--- a/docs/RestApiArrayResultOauthClientRedirectUri.md
+++ b/docs/RestApiArrayResultOauthClientRedirectUri.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultOauthClientRedirectUri
+# Flipdish.Model.RestApiArrayResultOauthClientRedirectUri
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultOrderBatch.md b/docs/RestApiArrayResultOrderBatch.md
new file mode 100644
index 00000000..48717901
--- /dev/null
+++ b/docs/RestApiArrayResultOrderBatch.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultOrderBatch
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;OrderBatch&gt;**](OrderBatch.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultOrderBatchItem.md b/docs/RestApiArrayResultOrderBatchItem.md
deleted file mode 100644
index 94a2ed63..00000000
--- a/docs/RestApiArrayResultOrderBatchItem.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiArrayResultOrderBatchItem
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;OrderBatchItem&gt;**](OrderBatchItem.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiArrayResultOrderFulfillmentStatus.md b/docs/RestApiArrayResultOrderFulfillmentStatus.md
index f91d80b9..99478b76 100644
--- a/docs/RestApiArrayResultOrderFulfillmentStatus.md
+++ b/docs/RestApiArrayResultOrderFulfillmentStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultOrderFulfillmentStatus
+# Flipdish.Model.RestApiArrayResultOrderFulfillmentStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultPayoutSummary.md b/docs/RestApiArrayResultPayoutSummary.md
index 76876c73..f20261da 100644
--- a/docs/RestApiArrayResultPayoutSummary.md
+++ b/docs/RestApiArrayResultPayoutSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultPayoutSummary
+# Flipdish.Model.RestApiArrayResultPayoutSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultPendingInvitation.md b/docs/RestApiArrayResultPendingInvitation.md
new file mode 100644
index 00000000..f86f9ee7
--- /dev/null
+++ b/docs/RestApiArrayResultPendingInvitation.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultPendingInvitation
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;PendingInvitation&gt;**](PendingInvitation.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultPendingMenuChangesSummaries.md b/docs/RestApiArrayResultPendingMenuChangesSummaries.md
index c9216025..ba255e44 100644
--- a/docs/RestApiArrayResultPendingMenuChangesSummaries.md
+++ b/docs/RestApiArrayResultPendingMenuChangesSummaries.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultPendingMenuChangesSummaries
+# Flipdish.Model.RestApiArrayResultPendingMenuChangesSummaries
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultPreOrderTime.md b/docs/RestApiArrayResultPreOrderTime.md
index a32d8c31..d870140a 100644
--- a/docs/RestApiArrayResultPreOrderTime.md
+++ b/docs/RestApiArrayResultPreOrderTime.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultPreOrderTime
+# Flipdish.Model.RestApiArrayResultPreOrderTime
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultProcessingFeeConfig.md b/docs/RestApiArrayResultProcessingFeeConfig.md
index 8ed9e051..39c48890 100644
--- a/docs/RestApiArrayResultProcessingFeeConfig.md
+++ b/docs/RestApiArrayResultProcessingFeeConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultProcessingFeeConfig
+# Flipdish.Model.RestApiArrayResultProcessingFeeConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultRedeemInvitationResult.md b/docs/RestApiArrayResultRedeemInvitationResult.md
new file mode 100644
index 00000000..c2f52f51
--- /dev/null
+++ b/docs/RestApiArrayResultRedeemInvitationResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultRedeemInvitationResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;RedeemInvitationResult&gt;**](RedeemInvitationResult.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultRestApiDefaultResponse.md b/docs/RestApiArrayResultRestApiDefaultResponse.md
index 89b91f8b..613e5736 100644
--- a/docs/RestApiArrayResultRestApiDefaultResponse.md
+++ b/docs/RestApiArrayResultRestApiDefaultResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultRestApiDefaultResponse
+# Flipdish.Model.RestApiArrayResultRestApiDefaultResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultRestaurantVoucherEligibleStore.md b/docs/RestApiArrayResultRestaurantVoucherEligibleStore.md
index ad7c2b54..0c216929 100644
--- a/docs/RestApiArrayResultRestaurantVoucherEligibleStore.md
+++ b/docs/RestApiArrayResultRestaurantVoucherEligibleStore.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultRestaurantVoucherEligibleStore
+# Flipdish.Model.RestApiArrayResultRestaurantVoucherEligibleStore
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultRestaurantVoucherPayGreenConfiguration.md b/docs/RestApiArrayResultRestaurantVoucherPayGreenConfiguration.md
index d2bca1ca..3fe09c8a 100644
--- a/docs/RestApiArrayResultRestaurantVoucherPayGreenConfiguration.md
+++ b/docs/RestApiArrayResultRestaurantVoucherPayGreenConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultRestaurantVoucherPayGreenConfiguration
+# Flipdish.Model.RestApiArrayResultRestaurantVoucherPayGreenConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary.md b/docs/RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary.md
index 09de0aed..bf3367ba 100644
--- a/docs/RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary.md
+++ b/docs/RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary
+# Flipdish.Model.RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultRetentionCampaign.md b/docs/RestApiArrayResultRetentionCampaign.md
index 1a0fc4b6..85fa35f9 100644
--- a/docs/RestApiArrayResultRetentionCampaign.md
+++ b/docs/RestApiArrayResultRetentionCampaign.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultRetentionCampaign
+# Flipdish.Model.RestApiArrayResultRetentionCampaign
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultSmsProviderCredential.md b/docs/RestApiArrayResultSmsProviderCredential.md
new file mode 100644
index 00000000..6b10deb5
--- /dev/null
+++ b/docs/RestApiArrayResultSmsProviderCredential.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultSmsProviderCredential
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;SmsProviderCredential&gt;**](SmsProviderCredential.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultStoreChannelAssignment.md b/docs/RestApiArrayResultStoreChannelAssignment.md
index d1daa556..70333fa5 100644
--- a/docs/RestApiArrayResultStoreChannelAssignment.md
+++ b/docs/RestApiArrayResultStoreChannelAssignment.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultStoreChannelAssignment
+# Flipdish.Model.RestApiArrayResultStoreChannelAssignment
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultStoreChannelStoreMapping.md b/docs/RestApiArrayResultStoreChannelStoreMapping.md
deleted file mode 100644
index 9b4b97eb..00000000
--- a/docs/RestApiArrayResultStoreChannelStoreMapping.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiArrayResultStoreChannelStoreMapping
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;StoreChannelStoreMapping&gt;**](StoreChannelStoreMapping.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiArrayResultStoreDeliveryZoneFeeConfig.md b/docs/RestApiArrayResultStoreDeliveryZoneFeeConfig.md
new file mode 100644
index 00000000..ba7659d3
--- /dev/null
+++ b/docs/RestApiArrayResultStoreDeliveryZoneFeeConfig.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultStoreDeliveryZoneFeeConfig
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;StoreDeliveryZoneFeeConfig&gt;**](StoreDeliveryZoneFeeConfig.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultStoreListItem.md b/docs/RestApiArrayResultStoreListItem.md
index 9e0cc2a6..6eb3edf7 100644
--- a/docs/RestApiArrayResultStoreListItem.md
+++ b/docs/RestApiArrayResultStoreListItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultStoreListItem
+# Flipdish.Model.RestApiArrayResultStoreListItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultStoreStatistics.md b/docs/RestApiArrayResultStoreStatistics.md
index 118975de..462afaa4 100644
--- a/docs/RestApiArrayResultStoreStatistics.md
+++ b/docs/RestApiArrayResultStoreStatistics.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultStoreStatistics
+# Flipdish.Model.RestApiArrayResultStoreStatistics
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultStripeCustomConnectedAccount.md b/docs/RestApiArrayResultStripeCustomConnectedAccount.md
new file mode 100644
index 00000000..86db2231
--- /dev/null
+++ b/docs/RestApiArrayResultStripeCustomConnectedAccount.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultStripeCustomConnectedAccount
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;StripeCustomConnectedAccount&gt;**](StripeCustomConnectedAccount.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultSubscriptionSummary.md b/docs/RestApiArrayResultSubscriptionSummary.md
new file mode 100644
index 00000000..6a43eaa3
--- /dev/null
+++ b/docs/RestApiArrayResultSubscriptionSummary.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultSubscriptionSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;SubscriptionSummary&gt;**](SubscriptionSummary.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultSupportedCountry.md b/docs/RestApiArrayResultSupportedCountry.md
index 153850e0..6162b304 100644
--- a/docs/RestApiArrayResultSupportedCountry.md
+++ b/docs/RestApiArrayResultSupportedCountry.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultSupportedCountry
+# Flipdish.Model.RestApiArrayResultSupportedCountry
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultTeammate.md b/docs/RestApiArrayResultTeammate.md
index 705e262b..f2f18d7e 100644
--- a/docs/RestApiArrayResultTeammate.md
+++ b/docs/RestApiArrayResultTeammate.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultTeammate
+# Flipdish.Model.RestApiArrayResultTeammate
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultUserDeliveryLocationAdmin.md b/docs/RestApiArrayResultUserDeliveryLocationAdmin.md
new file mode 100644
index 00000000..fa92de9f
--- /dev/null
+++ b/docs/RestApiArrayResultUserDeliveryLocationAdmin.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultUserDeliveryLocationAdmin
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;UserDeliveryLocationAdmin&gt;**](UserDeliveryLocationAdmin.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultUserFlipdishAccount.md b/docs/RestApiArrayResultUserFlipdishAccount.md
new file mode 100644
index 00000000..c5fd20df
--- /dev/null
+++ b/docs/RestApiArrayResultUserFlipdishAccount.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultUserFlipdishAccount
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;UserFlipdishAccount&gt;**](UserFlipdishAccount.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultUserNote.md b/docs/RestApiArrayResultUserNote.md
new file mode 100644
index 00000000..2c75f4ea
--- /dev/null
+++ b/docs/RestApiArrayResultUserNote.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultUserNote
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;UserNote&gt;**](UserNote.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultUserOrderSummary.md b/docs/RestApiArrayResultUserOrderSummary.md
new file mode 100644
index 00000000..7e3b32e5
--- /dev/null
+++ b/docs/RestApiArrayResultUserOrderSummary.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultUserOrderSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;UserOrderSummary&gt;**](UserOrderSummary.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultUserSmsChatItem.md b/docs/RestApiArrayResultUserSmsChatItem.md
new file mode 100644
index 00000000..e4ff9402
--- /dev/null
+++ b/docs/RestApiArrayResultUserSmsChatItem.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultUserSmsChatItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;UserSmsChatItem&gt;**](UserSmsChatItem.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultUserStoreInfo.md b/docs/RestApiArrayResultUserStoreInfo.md
new file mode 100644
index 00000000..4b988289
--- /dev/null
+++ b/docs/RestApiArrayResultUserStoreInfo.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultUserStoreInfo
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;UserStoreInfo&gt;**](UserStoreInfo.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultVoucherDataPoint.md b/docs/RestApiArrayResultVoucherDataPoint.md
index 3a3e8923..030dfea0 100644
--- a/docs/RestApiArrayResultVoucherDataPoint.md
+++ b/docs/RestApiArrayResultVoucherDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiArrayResultVoucherDataPoint
+# Flipdish.Model.RestApiArrayResultVoucherDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiArrayResultVoucherSummary.md b/docs/RestApiArrayResultVoucherSummary.md
new file mode 100644
index 00000000..75d8914e
--- /dev/null
+++ b/docs/RestApiArrayResultVoucherSummary.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiArrayResultVoucherSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**List&lt;VoucherSummary&gt;**](VoucherSummary.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiArrayResultWebhookSubscription.md b/docs/RestApiArrayResultWebhookSubscription.md
deleted file mode 100644
index 9355085d..00000000
--- a/docs/RestApiArrayResultWebhookSubscription.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiArrayResultWebhookSubscription
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**List&lt;WebhookSubscription&gt;**](WebhookSubscription.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiDefaultResponse.md b/docs/RestApiDefaultResponse.md
index 850af8bc..9c691c53 100644
--- a/docs/RestApiDefaultResponse.md
+++ b/docs/RestApiDefaultResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiDefaultResponse
+# Flipdish.Model.RestApiDefaultResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiErrorResult.md b/docs/RestApiErrorResult.md
index 7df83f89..5a184921 100644
--- a/docs/RestApiErrorResult.md
+++ b/docs/RestApiErrorResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiErrorResult
+# Flipdish.Model.RestApiErrorResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiEventSearchPaginationResult.md b/docs/RestApiEventSearchPaginationResult.md
index 385dcfc3..a3d5c06e 100644
--- a/docs/RestApiEventSearchPaginationResult.md
+++ b/docs/RestApiEventSearchPaginationResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiEventSearchPaginationResult
+# Flipdish.Model.RestApiEventSearchPaginationResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiFinanceSearchPaginationResultInvoice.md b/docs/RestApiFinanceSearchPaginationResultInvoice.md
new file mode 100644
index 00000000..3c35710d
--- /dev/null
+++ b/docs/RestApiFinanceSearchPaginationResultInvoice.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.RestApiFinanceSearchPaginationResultInvoice
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**NextPage** | **string** | Next page | 
+**Limit** | **int?** | Current page size | 
+**TotalRecordCount** | **int?** | Total record count | 
+**Data** | [**List&lt;Invoice&gt;**](Invoice.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiFinanceSearchPaginationResultSubscriptionInvoice.md b/docs/RestApiFinanceSearchPaginationResultSubscriptionInvoice.md
new file mode 100644
index 00000000..4ddab500
--- /dev/null
+++ b/docs/RestApiFinanceSearchPaginationResultSubscriptionInvoice.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.RestApiFinanceSearchPaginationResultSubscriptionInvoice
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**NextPage** | **string** | Next page | 
+**Limit** | **int?** | Current page size | 
+**TotalRecordCount** | **int?** | Total record count | 
+**Data** | [**List&lt;SubscriptionInvoice&gt;**](SubscriptionInvoice.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiForbiddenResult.md b/docs/RestApiForbiddenResult.md
index c027720e..b9eac401 100644
--- a/docs/RestApiForbiddenResult.md
+++ b/docs/RestApiForbiddenResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiForbiddenResult
+# Flipdish.Model.RestApiForbiddenResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiIntegerResult.md b/docs/RestApiIntegerResult.md
index 84d2e4de..a1354f65 100644
--- a/docs/RestApiIntegerResult.md
+++ b/docs/RestApiIntegerResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiIntegerResult
+# Flipdish.Model.RestApiIntegerResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultApp.md b/docs/RestApiPaginationResultApp.md
index 19ec2d91..731ca430 100644
--- a/docs/RestApiPaginationResultApp.md
+++ b/docs/RestApiPaginationResultApp.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultApp
+# Flipdish.Model.RestApiPaginationResultApp
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultAppStoreAppSummary.md b/docs/RestApiPaginationResultAppStoreAppSummary.md
index db48d6cd..31549144 100644
--- a/docs/RestApiPaginationResultAppStoreAppSummary.md
+++ b/docs/RestApiPaginationResultAppStoreAppSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultAppStoreAppSummary
+# Flipdish.Model.RestApiPaginationResultAppStoreAppSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultAppSummary.md b/docs/RestApiPaginationResultAppSummary.md
deleted file mode 100644
index c06ce0cb..00000000
--- a/docs/RestApiPaginationResultAppSummary.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.RestApiPaginationResultAppSummary
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Page** | **int?** | Current page index | 
-**Limit** | **int?** | Current page size | 
-**TotalRecordCount** | **int?** | Total record count | 
-**Data** | [**List&lt;AppSummary&gt;**](AppSummary.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiPaginationResultBusinessHoursOverride.md b/docs/RestApiPaginationResultBusinessHoursOverride.md
index 6222d16e..802dcb54 100644
--- a/docs/RestApiPaginationResultBusinessHoursOverride.md
+++ b/docs/RestApiPaginationResultBusinessHoursOverride.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultBusinessHoursOverride
+# Flipdish.Model.RestApiPaginationResultBusinessHoursOverride
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultCatalogGroup.md b/docs/RestApiPaginationResultCatalogGroup.md
deleted file mode 100644
index ac0feba6..00000000
--- a/docs/RestApiPaginationResultCatalogGroup.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.RestApiPaginationResultCatalogGroup
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Page** | **int?** | Current page index | 
-**Limit** | **int?** | Current page size | 
-**TotalRecordCount** | **int?** | Total record count | 
-**Data** | [**List&lt;CatalogGroup&gt;**](CatalogGroup.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiPaginationResultCatalogItem.md b/docs/RestApiPaginationResultCatalogItem.md
index 190fa9ba..8b12afdf 100644
--- a/docs/RestApiPaginationResultCatalogItem.md
+++ b/docs/RestApiPaginationResultCatalogItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultCatalogItem
+# Flipdish.Model.RestApiPaginationResultCatalogItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultChannel.md b/docs/RestApiPaginationResultChannel.md
deleted file mode 100644
index ffd2ea07..00000000
--- a/docs/RestApiPaginationResultChannel.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.RestApiPaginationResultChannel
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Page** | **int?** | Current page index | 
-**Limit** | **int?** | Current page size | 
-**TotalRecordCount** | **int?** | Total record count | 
-**Data** | [**List&lt;Channel&gt;**](Channel.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiPaginationResultGroup.md b/docs/RestApiPaginationResultGroup.md
index abd27b11..dc78b1ea 100644
--- a/docs/RestApiPaginationResultGroup.md
+++ b/docs/RestApiPaginationResultGroup.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultGroup
+# Flipdish.Model.RestApiPaginationResultGroup
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultHttpRequestAndResponseLog.md b/docs/RestApiPaginationResultHttpRequestAndResponseLog.md
deleted file mode 100644
index e6275183..00000000
--- a/docs/RestApiPaginationResultHttpRequestAndResponseLog.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# IO.Swagger.Model.RestApiPaginationResultHttpRequestAndResponseLog
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Page** | **int?** | Current page index | 
-**Limit** | **int?** | Current page size | 
-**TotalRecordCount** | **int?** | Total record count | 
-**Data** | [**List&lt;HttpRequestAndResponseLog&gt;**](HttpRequestAndResponseLog.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiPaginationResultHydraDeviceDetails.md b/docs/RestApiPaginationResultHydraDeviceDetails.md
index be84c7a4..0e154c00 100644
--- a/docs/RestApiPaginationResultHydraDeviceDetails.md
+++ b/docs/RestApiPaginationResultHydraDeviceDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultHydraDeviceDetails
+# Flipdish.Model.RestApiPaginationResultHydraDeviceDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultMetafieldDefinition.md b/docs/RestApiPaginationResultMetafieldDefinition.md
index e37bda02..42e656ad 100644
--- a/docs/RestApiPaginationResultMetafieldDefinition.md
+++ b/docs/RestApiPaginationResultMetafieldDefinition.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultMetafieldDefinition
+# Flipdish.Model.RestApiPaginationResultMetafieldDefinition
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultMetafieldDefinitionRecommendation.md b/docs/RestApiPaginationResultMetafieldDefinitionRecommendation.md
index 7c16cb43..70fe61e4 100644
--- a/docs/RestApiPaginationResultMetafieldDefinitionRecommendation.md
+++ b/docs/RestApiPaginationResultMetafieldDefinitionRecommendation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultMetafieldDefinitionRecommendation
+# Flipdish.Model.RestApiPaginationResultMetafieldDefinitionRecommendation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultOAuthTokenModel.md b/docs/RestApiPaginationResultOAuthTokenModel.md
index 79a09334..1ab45fe0 100644
--- a/docs/RestApiPaginationResultOAuthTokenModel.md
+++ b/docs/RestApiPaginationResultOAuthTokenModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultOAuthTokenModel
+# Flipdish.Model.RestApiPaginationResultOAuthTokenModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultOrder.md b/docs/RestApiPaginationResultOrder.md
index 2a404918..ab7edbeb 100644
--- a/docs/RestApiPaginationResultOrder.md
+++ b/docs/RestApiPaginationResultOrder.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultOrder
+# Flipdish.Model.RestApiPaginationResultOrder
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultOrderSummary.md b/docs/RestApiPaginationResultOrderSummary.md
index d81a5ff0..c1f76825 100644
--- a/docs/RestApiPaginationResultOrderSummary.md
+++ b/docs/RestApiPaginationResultOrderSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultOrderSummary
+# Flipdish.Model.RestApiPaginationResultOrderSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultOwnerEntityConfigurations.md b/docs/RestApiPaginationResultOwnerEntityConfigurations.md
deleted file mode 100644
index 95e4f6bc..00000000
--- a/docs/RestApiPaginationResultOwnerEntityConfigurations.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.RestApiPaginationResultOwnerEntityConfigurations
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Page** | **int?** | Current page index | 
-**Limit** | **int?** | Current page size | 
-**TotalRecordCount** | **int?** | Total record count | 
-**Data** | [**List&lt;OwnerEntityConfigurations&gt;**](OwnerEntityConfigurations.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiPaginationResultPayout.md b/docs/RestApiPaginationResultPayout.md
index d8d7590b..6c0e11a4 100644
--- a/docs/RestApiPaginationResultPayout.md
+++ b/docs/RestApiPaginationResultPayout.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultPayout
+# Flipdish.Model.RestApiPaginationResultPayout
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultPayoutChargeback.md b/docs/RestApiPaginationResultPayoutChargeback.md
index b0afbb81..8c98aa6d 100644
--- a/docs/RestApiPaginationResultPayoutChargeback.md
+++ b/docs/RestApiPaginationResultPayoutChargeback.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultPayoutChargeback
+# Flipdish.Model.RestApiPaginationResultPayoutChargeback
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultPayoutOrder.md b/docs/RestApiPaginationResultPayoutOrder.md
index 54a162ae..6a90b5a2 100644
--- a/docs/RestApiPaginationResultPayoutOrder.md
+++ b/docs/RestApiPaginationResultPayoutOrder.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultPayoutOrder
+# Flipdish.Model.RestApiPaginationResultPayoutOrder
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultPayoutOtherCharge.md b/docs/RestApiPaginationResultPayoutOtherCharge.md
index 0a82b6e6..02d8857d 100644
--- a/docs/RestApiPaginationResultPayoutOtherCharge.md
+++ b/docs/RestApiPaginationResultPayoutOtherCharge.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultPayoutOtherCharge
+# Flipdish.Model.RestApiPaginationResultPayoutOtherCharge
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultPayoutRefund.md b/docs/RestApiPaginationResultPayoutRefund.md
index b8ad339d..0e5295b4 100644
--- a/docs/RestApiPaginationResultPayoutRefund.md
+++ b/docs/RestApiPaginationResultPayoutRefund.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultPayoutRefund
+# Flipdish.Model.RestApiPaginationResultPayoutRefund
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultPayoutReport3RefundedOrder.md b/docs/RestApiPaginationResultPayoutReport3RefundedOrder.md
new file mode 100644
index 00000000..8ac40bc5
--- /dev/null
+++ b/docs/RestApiPaginationResultPayoutReport3RefundedOrder.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.RestApiPaginationResultPayoutReport3RefundedOrder
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Page** | **int?** | Current page index | 
+**Limit** | **int?** | Current page size | 
+**TotalRecordCount** | **int?** | Total record count | 
+**Data** | [**List&lt;PayoutReport3RefundedOrder&gt;**](PayoutReport3RefundedOrder.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiPaginationResultPendingMenuChanges.md b/docs/RestApiPaginationResultPendingMenuChanges.md
index 7d7ed38a..f12d63ab 100644
--- a/docs/RestApiPaginationResultPendingMenuChanges.md
+++ b/docs/RestApiPaginationResultPendingMenuChanges.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultPendingMenuChanges
+# Flipdish.Model.RestApiPaginationResultPendingMenuChanges
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultPhoneCall.md b/docs/RestApiPaginationResultPhoneCall.md
index 8afa89af..72f7080a 100644
--- a/docs/RestApiPaginationResultPhoneCall.md
+++ b/docs/RestApiPaginationResultPhoneCall.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultPhoneCall
+# Flipdish.Model.RestApiPaginationResultPhoneCall
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultProduct.md b/docs/RestApiPaginationResultProduct.md
index fe4f249e..d73ff224 100644
--- a/docs/RestApiPaginationResultProduct.md
+++ b/docs/RestApiPaginationResultProduct.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultProduct
+# Flipdish.Model.RestApiPaginationResultProduct
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultPushNotificationResponse.md b/docs/RestApiPaginationResultPushNotificationResponse.md
index f0b7cf8a..0f2ea02e 100644
--- a/docs/RestApiPaginationResultPushNotificationResponse.md
+++ b/docs/RestApiPaginationResultPushNotificationResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultPushNotificationResponse
+# Flipdish.Model.RestApiPaginationResultPushNotificationResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultRestaurant.md b/docs/RestApiPaginationResultRestaurant.md
new file mode 100644
index 00000000..65ba5794
--- /dev/null
+++ b/docs/RestApiPaginationResultRestaurant.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.RestApiPaginationResultRestaurant
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Page** | **int?** | Current page index | 
+**Limit** | **int?** | Current page size | 
+**TotalRecordCount** | **int?** | Total record count | 
+**Data** | [**List&lt;Restaurant&gt;**](Restaurant.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiPaginationResultStore.md b/docs/RestApiPaginationResultStore.md
index b2537a78..c0713bee 100644
--- a/docs/RestApiPaginationResultStore.md
+++ b/docs/RestApiPaginationResultStore.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultStore
+# Flipdish.Model.RestApiPaginationResultStore
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultStoreGroup.md b/docs/RestApiPaginationResultStoreGroup.md
index 4345965f..dbd1b38e 100644
--- a/docs/RestApiPaginationResultStoreGroup.md
+++ b/docs/RestApiPaginationResultStoreGroup.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultStoreGroup
+# Flipdish.Model.RestApiPaginationResultStoreGroup
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultStoreGroupExtended.md b/docs/RestApiPaginationResultStoreGroupExtended.md
index 2cfe9283..6e8f8adf 100644
--- a/docs/RestApiPaginationResultStoreGroupExtended.md
+++ b/docs/RestApiPaginationResultStoreGroupExtended.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultStoreGroupExtended
+# Flipdish.Model.RestApiPaginationResultStoreGroupExtended
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultStoreHeader.md b/docs/RestApiPaginationResultStoreHeader.md
index 470007cc..03f6bf7e 100644
--- a/docs/RestApiPaginationResultStoreHeader.md
+++ b/docs/RestApiPaginationResultStoreHeader.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultStoreHeader
+# Flipdish.Model.RestApiPaginationResultStoreHeader
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultStoreValidationConfig.md b/docs/RestApiPaginationResultStoreValidationConfig.md
index 9b0421da..49715066 100644
--- a/docs/RestApiPaginationResultStoreValidationConfig.md
+++ b/docs/RestApiPaginationResultStoreValidationConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultStoreValidationConfig
+# Flipdish.Model.RestApiPaginationResultStoreValidationConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultUserSearch.md b/docs/RestApiPaginationResultUserSearch.md
new file mode 100644
index 00000000..f00b38f5
--- /dev/null
+++ b/docs/RestApiPaginationResultUserSearch.md
@@ -0,0 +1,12 @@
+# Flipdish.Model.RestApiPaginationResultUserSearch
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Page** | **int?** | Current page index | 
+**Limit** | **int?** | Current page size | 
+**TotalRecordCount** | **int?** | Total record count | 
+**Data** | [**List&lt;UserSearch&gt;**](UserSearch.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiPaginationResultVoucherSummary.md b/docs/RestApiPaginationResultVoucherSummary.md
index 80b22bc1..771d1db7 100644
--- a/docs/RestApiPaginationResultVoucherSummary.md
+++ b/docs/RestApiPaginationResultVoucherSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultVoucherSummary
+# Flipdish.Model.RestApiPaginationResultVoucherSummary
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultWebhookLog.md b/docs/RestApiPaginationResultWebhookLog.md
index 3f677fdf..3ab9d89f 100644
--- a/docs/RestApiPaginationResultWebhookLog.md
+++ b/docs/RestApiPaginationResultWebhookLog.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultWebhookLog
+# Flipdish.Model.RestApiPaginationResultWebhookLog
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiPaginationResultWebhookSubscription.md b/docs/RestApiPaginationResultWebhookSubscription.md
index 9c090873..4bd3cf71 100644
--- a/docs/RestApiPaginationResultWebhookSubscription.md
+++ b/docs/RestApiPaginationResultWebhookSubscription.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiPaginationResultWebhookSubscription
+# Flipdish.Model.RestApiPaginationResultWebhookSubscription
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResult.md b/docs/RestApiResult.md
deleted file mode 100644
index 75a1546e..00000000
--- a/docs/RestApiResult.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Flipdish.Model.RestApiResult
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultAcceptInvitationResult.md b/docs/RestApiResultAcceptInvitationResult.md
new file mode 100644
index 00000000..8aa624da
--- /dev/null
+++ b/docs/RestApiResultAcceptInvitationResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultAcceptInvitationResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**AcceptInvitationResult**](AcceptInvitationResult.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultAccountDetail.md b/docs/RestApiResultAccountDetail.md
index 3262b388..3dad3ee0 100644
--- a/docs/RestApiResultAccountDetail.md
+++ b/docs/RestApiResultAccountDetail.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAccountDetail
+# Flipdish.Model.RestApiResultAccountDetail
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultAccountFieldsDefinitions.md b/docs/RestApiResultAccountFieldsDefinitions.md
index 69b3a20a..a953b6f1 100644
--- a/docs/RestApiResultAccountFieldsDefinitions.md
+++ b/docs/RestApiResultAccountFieldsDefinitions.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAccountFieldsDefinitions
+# Flipdish.Model.RestApiResultAccountFieldsDefinitions
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultAddressFormResponse.md b/docs/RestApiResultAddressFormResponse.md
index a971d383..07e1a2d5 100644
--- a/docs/RestApiResultAddressFormResponse.md
+++ b/docs/RestApiResultAddressFormResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAddressFormResponse
+# Flipdish.Model.RestApiResultAddressFormResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultApmStatistics.md b/docs/RestApiResultApmStatistics.md
index 433623b1..9dcef427 100644
--- a/docs/RestApiResultApmStatistics.md
+++ b/docs/RestApiResultApmStatistics.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultApmStatistics
+# Flipdish.Model.RestApiResultApmStatistics
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultApmStatus.md b/docs/RestApiResultApmStatus.md
index af0e9b19..c97cbf19 100644
--- a/docs/RestApiResultApmStatus.md
+++ b/docs/RestApiResultApmStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultApmStatus
+# Flipdish.Model.RestApiResultApmStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultApp.md b/docs/RestApiResultApp.md
index cae41fb8..d2a16b99 100644
--- a/docs/RestApiResultApp.md
+++ b/docs/RestApiResultApp.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultApp
+# Flipdish.Model.RestApiResultApp
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultAppChannelAssignment.md b/docs/RestApiResultAppChannelAssignment.md
index c98bb346..2077e9c0 100644
--- a/docs/RestApiResultAppChannelAssignment.md
+++ b/docs/RestApiResultAppChannelAssignment.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAppChannelAssignment
+# Flipdish.Model.RestApiResultAppChannelAssignment
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultAppCompliance.md b/docs/RestApiResultAppCompliance.md
index 965b7154..8bb0bcee 100644
--- a/docs/RestApiResultAppCompliance.md
+++ b/docs/RestApiResultAppCompliance.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAppCompliance
+# Flipdish.Model.RestApiResultAppCompliance
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultAppConfigSalesChannel.md b/docs/RestApiResultAppConfigSalesChannel.md
index 483a91f7..76f0b3d7 100644
--- a/docs/RestApiResultAppConfigSalesChannel.md
+++ b/docs/RestApiResultAppConfigSalesChannel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAppConfigSalesChannel
+# Flipdish.Model.RestApiResultAppConfigSalesChannel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultAppConfigurationSummary.md b/docs/RestApiResultAppConfigurationSummary.md
deleted file mode 100644
index 3e53b5ad..00000000
--- a/docs/RestApiResultAppConfigurationSummary.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiResultAppConfigurationSummary
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**AppConfigurationSummary**](AppConfigurationSummary.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultAppDetail.md b/docs/RestApiResultAppDetail.md
deleted file mode 100644
index 011dd870..00000000
--- a/docs/RestApiResultAppDetail.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiResultAppDetail
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**AppDetail**](AppDetail.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultAppGeneralConfigModel.md b/docs/RestApiResultAppGeneralConfigModel.md
new file mode 100644
index 00000000..5da9295f
--- /dev/null
+++ b/docs/RestApiResultAppGeneralConfigModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultAppGeneralConfigModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**AppGeneralConfigModel**](AppGeneralConfigModel.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultAppStoreApp.md b/docs/RestApiResultAppStoreApp.md
index 973a54ec..9fec8e5a 100644
--- a/docs/RestApiResultAppStoreApp.md
+++ b/docs/RestApiResultAppStoreApp.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAppStoreApp
+# Flipdish.Model.RestApiResultAppStoreApp
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultAppStoreAppConfiguration.md b/docs/RestApiResultAppStoreAppConfiguration.md
index 284f2cc4..d63c47eb 100644
--- a/docs/RestApiResultAppStoreAppConfiguration.md
+++ b/docs/RestApiResultAppStoreAppConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAppStoreAppConfiguration
+# Flipdish.Model.RestApiResultAppStoreAppConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultAppStoreAppEntitlements.md b/docs/RestApiResultAppStoreAppEntitlements.md
new file mode 100644
index 00000000..0cb98f1b
--- /dev/null
+++ b/docs/RestApiResultAppStoreAppEntitlements.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultAppStoreAppEntitlements
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**AppStoreAppEntitlements**](AppStoreAppEntitlements.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultAppStoreConfigModel.md b/docs/RestApiResultAppStoreConfigModel.md
new file mode 100644
index 00000000..b4c1c7bf
--- /dev/null
+++ b/docs/RestApiResultAppStoreConfigModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultAppStoreConfigModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**AppStoreConfigModel**](AppStoreConfigModel.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultAssetResultModel.md b/docs/RestApiResultAssetResultModel.md
new file mode 100644
index 00000000..dc7bcd6c
--- /dev/null
+++ b/docs/RestApiResultAssetResultModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultAssetResultModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**AssetResultModel**](AssetResultModel.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultAssignedBankAccount.md b/docs/RestApiResultAssignedBankAccount.md
index 79c188ab..08615bf8 100644
--- a/docs/RestApiResultAssignedBankAccount.md
+++ b/docs/RestApiResultAssignedBankAccount.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultAssignedBankAccount
+# Flipdish.Model.RestApiResultAssignedBankAccount
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultBankAccountDetail.md b/docs/RestApiResultBankAccountDetail.md
index 24f66182..38a03e3b 100644
--- a/docs/RestApiResultBankAccountDetail.md
+++ b/docs/RestApiResultBankAccountDetail.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultBankAccountDetail
+# Flipdish.Model.RestApiResultBankAccountDetail
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultBluetoothTerminalStatus.md b/docs/RestApiResultBluetoothTerminalStatus.md
index 12b3aec7..92afa073 100644
--- a/docs/RestApiResultBluetoothTerminalStatus.md
+++ b/docs/RestApiResultBluetoothTerminalStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultBluetoothTerminalStatus
+# Flipdish.Model.RestApiResultBluetoothTerminalStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultBuildResultModel.md b/docs/RestApiResultBuildResultModel.md
new file mode 100644
index 00000000..a7b008c8
--- /dev/null
+++ b/docs/RestApiResultBuildResultModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultBuildResultModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**BuildResultModel**](BuildResultModel.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultBusinessHoursOverride.md b/docs/RestApiResultBusinessHoursOverride.md
index a10ba6b2..74f92f55 100644
--- a/docs/RestApiResultBusinessHoursOverride.md
+++ b/docs/RestApiResultBusinessHoursOverride.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultBusinessHoursOverride
+# Flipdish.Model.RestApiResultBusinessHoursOverride
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultBusinessHoursPeriod.md b/docs/RestApiResultBusinessHoursPeriod.md
index b621753d..8990d2ee 100644
--- a/docs/RestApiResultBusinessHoursPeriod.md
+++ b/docs/RestApiResultBusinessHoursPeriod.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultBusinessHoursPeriod
+# Flipdish.Model.RestApiResultBusinessHoursPeriod
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultCard.md b/docs/RestApiResultCard.md
deleted file mode 100644
index 3cb98687..00000000
--- a/docs/RestApiResultCard.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiResultCard
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**Card**](Card.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultCardReader.md b/docs/RestApiResultCardReader.md
index c4aca1ce..48fa4790 100644
--- a/docs/RestApiResultCardReader.md
+++ b/docs/RestApiResultCardReader.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultCardReader
+# Flipdish.Model.RestApiResultCardReader
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultCatalogGroup.md b/docs/RestApiResultCatalogGroup.md
deleted file mode 100644
index a2edf663..00000000
--- a/docs/RestApiResultCatalogGroup.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiResultCatalogGroup
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**CatalogGroup**](CatalogGroup.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultCatalogItem.md b/docs/RestApiResultCatalogItem.md
index 2d1040bc..b1a12a45 100644
--- a/docs/RestApiResultCatalogItem.md
+++ b/docs/RestApiResultCatalogItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultCatalogItem
+# Flipdish.Model.RestApiResultCatalogItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultChannel.md b/docs/RestApiResultChannel.md
index 4673a2f6..384f8d47 100644
--- a/docs/RestApiResultChannel.md
+++ b/docs/RestApiResultChannel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultChannel
+# Flipdish.Model.RestApiResultChannel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultClientDevice.md b/docs/RestApiResultClientDevice.md
new file mode 100644
index 00000000..cacb3b56
--- /dev/null
+++ b/docs/RestApiResultClientDevice.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultClientDevice
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**ClientDevice**](ClientDevice.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultClientDeviceEnrollmentResult.md b/docs/RestApiResultClientDeviceEnrollmentResult.md
new file mode 100644
index 00000000..78b1adda
--- /dev/null
+++ b/docs/RestApiResultClientDeviceEnrollmentResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultClientDeviceEnrollmentResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**ClientDeviceEnrollmentResult**](ClientDeviceEnrollmentResult.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultCoordinates.md b/docs/RestApiResultCoordinates.md
index f522480f..f8cc66be 100644
--- a/docs/RestApiResultCoordinates.md
+++ b/docs/RestApiResultCoordinates.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultCoordinates
+# Flipdish.Model.RestApiResultCoordinates
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultCountryFormResponse.md b/docs/RestApiResultCountryFormResponse.md
index 1493c599..b7a35bd9 100644
--- a/docs/RestApiResultCountryFormResponse.md
+++ b/docs/RestApiResultCountryFormResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultCountryFormResponse
+# Flipdish.Model.RestApiResultCountryFormResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultCreatedMenuSectionItems.md b/docs/RestApiResultCreatedMenuSectionItems.md
index 7a643302..9b1605dd 100644
--- a/docs/RestApiResultCreatedMenuSectionItems.md
+++ b/docs/RestApiResultCreatedMenuSectionItems.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultCreatedMenuSectionItems
+# Flipdish.Model.RestApiResultCreatedMenuSectionItems
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultCrossSellMenuItems.md b/docs/RestApiResultCrossSellMenuItems.md
new file mode 100644
index 00000000..50553d90
--- /dev/null
+++ b/docs/RestApiResultCrossSellMenuItems.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultCrossSellMenuItems
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**CrossSellMenuItems**](CrossSellMenuItems.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultCustomer.md b/docs/RestApiResultCustomer.md
index 75a01c0e..10583455 100644
--- a/docs/RestApiResultCustomer.md
+++ b/docs/RestApiResultCustomer.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultCustomer
+# Flipdish.Model.RestApiResultCustomer
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultCustomers.md b/docs/RestApiResultCustomers.md
new file mode 100644
index 00000000..3ea70268
--- /dev/null
+++ b/docs/RestApiResultCustomers.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultCustomers
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**Customers**](Customers.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultDeliveryZone.md b/docs/RestApiResultDeliveryZone.md
index 430fb4e5..c320bf62 100644
--- a/docs/RestApiResultDeliveryZone.md
+++ b/docs/RestApiResultDeliveryZone.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultDeliveryZone
+# Flipdish.Model.RestApiResultDeliveryZone
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultDnsRecordInformation.md b/docs/RestApiResultDnsRecordInformation.md
index b4bc4ed9..52d5818d 100644
--- a/docs/RestApiResultDnsRecordInformation.md
+++ b/docs/RestApiResultDnsRecordInformation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultDnsRecordInformation
+# Flipdish.Model.RestApiResultDnsRecordInformation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultDriver.md b/docs/RestApiResultDriver.md
deleted file mode 100644
index 34800a10..00000000
--- a/docs/RestApiResultDriver.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiResultDriver
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**Driver**](Driver.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultEndUserFeeConfig.md b/docs/RestApiResultEndUserFeeConfig.md
new file mode 100644
index 00000000..801888bc
--- /dev/null
+++ b/docs/RestApiResultEndUserFeeConfig.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultEndUserFeeConfig
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**EndUserFeeConfig**](EndUserFeeConfig.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultExecuteConfigurationActionResult.md b/docs/RestApiResultExecuteConfigurationActionResult.md
new file mode 100644
index 00000000..88297a71
--- /dev/null
+++ b/docs/RestApiResultExecuteConfigurationActionResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultExecuteConfigurationActionResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**ExecuteConfigurationActionResult**](ExecuteConfigurationActionResult.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultFulfillmentStatesConfiguration.md b/docs/RestApiResultFulfillmentStatesConfiguration.md
index 929665cd..156ea2b4 100644
--- a/docs/RestApiResultFulfillmentStatesConfiguration.md
+++ b/docs/RestApiResultFulfillmentStatesConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultFulfillmentStatesConfiguration
+# Flipdish.Model.RestApiResultFulfillmentStatesConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultGetEndUserFeeConfigsResponse.md b/docs/RestApiResultGetEndUserFeeConfigsResponse.md
new file mode 100644
index 00000000..3dd23b6b
--- /dev/null
+++ b/docs/RestApiResultGetEndUserFeeConfigsResponse.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultGetEndUserFeeConfigsResponse
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**GetEndUserFeeConfigsResponse**](GetEndUserFeeConfigsResponse.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultGroup.md b/docs/RestApiResultGroup.md
index 14239c85..e3af2ba3 100644
--- a/docs/RestApiResultGroup.md
+++ b/docs/RestApiResultGroup.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultGroup
+# Flipdish.Model.RestApiResultGroup
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultHasPaymentMethodResponse.md b/docs/RestApiResultHasPaymentMethodResponse.md
new file mode 100644
index 00000000..ad1edfec
--- /dev/null
+++ b/docs/RestApiResultHasPaymentMethodResponse.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultHasPaymentMethodResponse
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**HasPaymentMethodResponse**](HasPaymentMethodResponse.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultHomeStatistics.md b/docs/RestApiResultHomeStatistics.md
index a9a98f32..9925ccbc 100644
--- a/docs/RestApiResultHomeStatistics.md
+++ b/docs/RestApiResultHomeStatistics.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultHomeStatistics
+# Flipdish.Model.RestApiResultHomeStatistics
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultHydraConfig.md b/docs/RestApiResultHydraConfig.md
index 29ffec06..e6e720b0 100644
--- a/docs/RestApiResultHydraConfig.md
+++ b/docs/RestApiResultHydraConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultHydraConfig
+# Flipdish.Model.RestApiResultHydraConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultHydraDeviceDetails.md b/docs/RestApiResultHydraDeviceDetails.md
index ad986e8b..3f618485 100644
--- a/docs/RestApiResultHydraDeviceDetails.md
+++ b/docs/RestApiResultHydraDeviceDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultHydraDeviceDetails
+# Flipdish.Model.RestApiResultHydraDeviceDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultHydraStatus.md b/docs/RestApiResultHydraStatus.md
index 527ea723..c011fd2d 100644
--- a/docs/RestApiResultHydraStatus.md
+++ b/docs/RestApiResultHydraStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultHydraStatus
+# Flipdish.Model.RestApiResultHydraStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultIndexPage.md b/docs/RestApiResultIndexPage.md
index 3d20d609..c4d444f2 100644
--- a/docs/RestApiResultIndexPage.md
+++ b/docs/RestApiResultIndexPage.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultIndexPage
+# Flipdish.Model.RestApiResultIndexPage
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultIndexPageBase.md b/docs/RestApiResultIndexPageBase.md
index 31e4d265..b8dcb9a6 100644
--- a/docs/RestApiResultIndexPageBase.md
+++ b/docs/RestApiResultIndexPageBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultIndexPageBase
+# Flipdish.Model.RestApiResultIndexPageBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultIntercomUserHash.md b/docs/RestApiResultIntercomUserHash.md
new file mode 100644
index 00000000..4e9282a6
--- /dev/null
+++ b/docs/RestApiResultIntercomUserHash.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultIntercomUserHash
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**IntercomUserHash**](IntercomUserHash.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultJobResponse.md b/docs/RestApiResultJobResponse.md
index 16f7b3c3..87889ab9 100644
--- a/docs/RestApiResultJobResponse.md
+++ b/docs/RestApiResultJobResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultJobResponse
+# Flipdish.Model.RestApiResultJobResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultKioskCashSetting.md b/docs/RestApiResultKioskCashSetting.md
deleted file mode 100644
index 7f72ffed..00000000
--- a/docs/RestApiResultKioskCashSetting.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiResultKioskCashSetting
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**KioskCashSetting**](KioskCashSetting.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultKioskEntitlementsResult.md b/docs/RestApiResultKioskEntitlementsResult.md
new file mode 100644
index 00000000..2e05caf7
--- /dev/null
+++ b/docs/RestApiResultKioskEntitlementsResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultKioskEntitlementsResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**KioskEntitlementsResult**](KioskEntitlementsResult.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultKioskIotConnectionParameters.md b/docs/RestApiResultKioskIotConnectionParameters.md
index d87c87a3..9a4b4935 100644
--- a/docs/RestApiResultKioskIotConnectionParameters.md
+++ b/docs/RestApiResultKioskIotConnectionParameters.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultKioskIotConnectionParameters
+# Flipdish.Model.RestApiResultKioskIotConnectionParameters
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultKioskSettings.md b/docs/RestApiResultKioskSettings.md
new file mode 100644
index 00000000..f63ccb98
--- /dev/null
+++ b/docs/RestApiResultKioskSettings.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultKioskSettings
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**KioskSettings**](KioskSettings.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultKioskStoreSettings.md b/docs/RestApiResultKioskStoreSettings.md
deleted file mode 100644
index 6e35cf7e..00000000
--- a/docs/RestApiResultKioskStoreSettings.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiResultKioskStoreSettings
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**KioskStoreSettings**](KioskStoreSettings.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultKioskStripeLocation.md b/docs/RestApiResultKioskStripeLocation.md
new file mode 100644
index 00000000..6149e225
--- /dev/null
+++ b/docs/RestApiResultKioskStripeLocation.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultKioskStripeLocation
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**KioskStripeLocation**](KioskStripeLocation.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultLightspeedSettings.md b/docs/RestApiResultLightspeedSettings.md
index 48537a9f..a45c6580 100644
--- a/docs/RestApiResultLightspeedSettings.md
+++ b/docs/RestApiResultLightspeedSettings.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultLightspeedSettings
+# Flipdish.Model.RestApiResultLightspeedSettings
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultLocationArea.md b/docs/RestApiResultLocationArea.md
index a966440c..7cae9b15 100644
--- a/docs/RestApiResultLocationArea.md
+++ b/docs/RestApiResultLocationArea.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultLocationArea
+# Flipdish.Model.RestApiResultLocationArea
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultLocationAreaLocation.md b/docs/RestApiResultLocationAreaLocation.md
index 19702280..cafee531 100644
--- a/docs/RestApiResultLocationAreaLocation.md
+++ b/docs/RestApiResultLocationAreaLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultLocationAreaLocation
+# Flipdish.Model.RestApiResultLocationAreaLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultLocationAreaWithLocations.md b/docs/RestApiResultLocationAreaWithLocations.md
index ef5ed93e..7898bfa4 100644
--- a/docs/RestApiResultLocationAreaWithLocations.md
+++ b/docs/RestApiResultLocationAreaWithLocations.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultLocationAreaWithLocations
+# Flipdish.Model.RestApiResultLocationAreaWithLocations
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultLoyaltyCampaign.md b/docs/RestApiResultLoyaltyCampaign.md
index 6fdf8937..bc2b2cb2 100644
--- a/docs/RestApiResultLoyaltyCampaign.md
+++ b/docs/RestApiResultLoyaltyCampaign.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultLoyaltyCampaign
+# Flipdish.Model.RestApiResultLoyaltyCampaign
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMappedLocation.md b/docs/RestApiResultMappedLocation.md
index 4bd18f3b..8a110a62 100644
--- a/docs/RestApiResultMappedLocation.md
+++ b/docs/RestApiResultMappedLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMappedLocation
+# Flipdish.Model.RestApiResultMappedLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMenu.md b/docs/RestApiResultMenu.md
index 2d210461..c1b555c8 100644
--- a/docs/RestApiResultMenu.md
+++ b/docs/RestApiResultMenu.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMenu
+# Flipdish.Model.RestApiResultMenu
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMenuItemOptionSet.md b/docs/RestApiResultMenuItemOptionSet.md
index bd3d24ef..484a2a9b 100644
--- a/docs/RestApiResultMenuItemOptionSet.md
+++ b/docs/RestApiResultMenuItemOptionSet.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMenuItemOptionSet
+# Flipdish.Model.RestApiResultMenuItemOptionSet
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMenuItemOptionSetItem.md b/docs/RestApiResultMenuItemOptionSetItem.md
index e3c742d3..7d7da13d 100644
--- a/docs/RestApiResultMenuItemOptionSetItem.md
+++ b/docs/RestApiResultMenuItemOptionSetItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMenuItemOptionSetItem
+# Flipdish.Model.RestApiResultMenuItemOptionSetItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMenuNutritionInfoHeader.md b/docs/RestApiResultMenuNutritionInfoHeader.md
new file mode 100644
index 00000000..f0192b5e
--- /dev/null
+++ b/docs/RestApiResultMenuNutritionInfoHeader.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultMenuNutritionInfoHeader
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**MenuNutritionInfoHeader**](MenuNutritionInfoHeader.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultMenuSection.md b/docs/RestApiResultMenuSection.md
index 420a7d30..4e5ae29f 100644
--- a/docs/RestApiResultMenuSection.md
+++ b/docs/RestApiResultMenuSection.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMenuSection
+# Flipdish.Model.RestApiResultMenuSection
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMenuSectionAvailability.md b/docs/RestApiResultMenuSectionAvailability.md
index c643bb14..b827e710 100644
--- a/docs/RestApiResultMenuSectionAvailability.md
+++ b/docs/RestApiResultMenuSectionAvailability.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMenuSectionAvailability
+# Flipdish.Model.RestApiResultMenuSectionAvailability
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMenuSectionItem.md b/docs/RestApiResultMenuSectionItem.md
index 60abb19f..6b558128 100644
--- a/docs/RestApiResultMenuSectionItem.md
+++ b/docs/RestApiResultMenuSectionItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMenuSectionItem
+# Flipdish.Model.RestApiResultMenuSectionItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMenuZone.md b/docs/RestApiResultMenuZone.md
new file mode 100644
index 00000000..b996ad41
--- /dev/null
+++ b/docs/RestApiResultMenuZone.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultMenuZone
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**MenuZone**](MenuZone.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultMetadata.md b/docs/RestApiResultMetadata.md
index 5a66f357..f6601c02 100644
--- a/docs/RestApiResultMetadata.md
+++ b/docs/RestApiResultMetadata.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMetadata
+# Flipdish.Model.RestApiResultMetadata
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMetafieldDefinition.md b/docs/RestApiResultMetafieldDefinition.md
index a2b4f986..bdf1639d 100644
--- a/docs/RestApiResultMetafieldDefinition.md
+++ b/docs/RestApiResultMetafieldDefinition.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMetafieldDefinition
+# Flipdish.Model.RestApiResultMetafieldDefinition
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMobileAppsDetails.md b/docs/RestApiResultMobileAppsDetails.md
deleted file mode 100644
index 906054de..00000000
--- a/docs/RestApiResultMobileAppsDetails.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiResultMobileAppsDetails
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**MobileAppsDetails**](MobileAppsDetails.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultMobileAppsImage.md b/docs/RestApiResultMobileAppsImage.md
index 4e45ded8..740355d2 100644
--- a/docs/RestApiResultMobileAppsImage.md
+++ b/docs/RestApiResultMobileAppsImage.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMobileAppsImage
+# Flipdish.Model.RestApiResultMobileAppsImage
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMobileAppsSubmission.md b/docs/RestApiResultMobileAppsSubmission.md
index 03908537..d479d7d2 100644
--- a/docs/RestApiResultMobileAppsSubmission.md
+++ b/docs/RestApiResultMobileAppsSubmission.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMobileAppsSubmission
+# Flipdish.Model.RestApiResultMobileAppsSubmission
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMobileAppsSubmissionDetails.md b/docs/RestApiResultMobileAppsSubmissionDetails.md
index bce3fcc4..82d4ada7 100644
--- a/docs/RestApiResultMobileAppsSubmissionDetails.md
+++ b/docs/RestApiResultMobileAppsSubmissionDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMobileAppsSubmissionDetails
+# Flipdish.Model.RestApiResultMobileAppsSubmissionDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultMobileAppsSubmissionStatus.md b/docs/RestApiResultMobileAppsSubmissionStatus.md
index f7c0f867..264b18b3 100644
--- a/docs/RestApiResultMobileAppsSubmissionStatus.md
+++ b/docs/RestApiResultMobileAppsSubmissionStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultMobileAppsSubmissionStatus
+# Flipdish.Model.RestApiResultMobileAppsSubmissionStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultModelBase.md b/docs/RestApiResultModelBase.md
index 1a56f6d7..c53df7b7 100644
--- a/docs/RestApiResultModelBase.md
+++ b/docs/RestApiResultModelBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultModelBase
+# Flipdish.Model.RestApiResultModelBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultNutritionInfo.md b/docs/RestApiResultNutritionInfo.md
new file mode 100644
index 00000000..a043e22c
--- /dev/null
+++ b/docs/RestApiResultNutritionInfo.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultNutritionInfo
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**NutritionInfo**](NutritionInfo.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultNutritionInfoV2.md b/docs/RestApiResultNutritionInfoV2.md
new file mode 100644
index 00000000..11283ab7
--- /dev/null
+++ b/docs/RestApiResultNutritionInfoV2.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultNutritionInfoV2
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**NutritionInfoV2**](NutritionInfoV2.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultOAuthApp.md b/docs/RestApiResultOAuthApp.md
index 0c254ed0..0568074c 100644
--- a/docs/RestApiResultOAuthApp.md
+++ b/docs/RestApiResultOAuthApp.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOAuthApp
+# Flipdish.Model.RestApiResultOAuthApp
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultOauthClientRedirectUri.md b/docs/RestApiResultOauthClientRedirectUri.md
index cd032b3e..083b4deb 100644
--- a/docs/RestApiResultOauthClientRedirectUri.md
+++ b/docs/RestApiResultOauthClientRedirectUri.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOauthClientRedirectUri
+# Flipdish.Model.RestApiResultOauthClientRedirectUri
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultOktaPortalFeatureFlag.md b/docs/RestApiResultOktaPortalFeatureFlag.md
new file mode 100644
index 00000000..ccd4a9a6
--- /dev/null
+++ b/docs/RestApiResultOktaPortalFeatureFlag.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultOktaPortalFeatureFlag
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**OktaPortalFeatureFlag**](OktaPortalFeatureFlag.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultOrder.md b/docs/RestApiResultOrder.md
index 572bbf56..77761fff 100644
--- a/docs/RestApiResultOrder.md
+++ b/docs/RestApiResultOrder.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOrder
+# Flipdish.Model.RestApiResultOrder
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultOrderBatch.md b/docs/RestApiResultOrderBatch.md
index 265c0dbc..8d120a34 100644
--- a/docs/RestApiResultOrderBatch.md
+++ b/docs/RestApiResultOrderBatch.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOrderBatch
+# Flipdish.Model.RestApiResultOrderBatch
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultOrderBatchingConfiguration.md b/docs/RestApiResultOrderBatchingConfiguration.md
index 0169e7bc..7ad7551e 100644
--- a/docs/RestApiResultOrderBatchingConfiguration.md
+++ b/docs/RestApiResultOrderBatchingConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOrderBatchingConfiguration
+# Flipdish.Model.RestApiResultOrderBatchingConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultOrderDeliveryInformation.md b/docs/RestApiResultOrderDeliveryInformation.md
index b0eeed9f..14517169 100644
--- a/docs/RestApiResultOrderDeliveryInformation.md
+++ b/docs/RestApiResultOrderDeliveryInformation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOrderDeliveryInformation
+# Flipdish.Model.RestApiResultOrderDeliveryInformation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultOrderFulfillmentStatus.md b/docs/RestApiResultOrderFulfillmentStatus.md
index 8559a410..64c1349b 100644
--- a/docs/RestApiResultOrderFulfillmentStatus.md
+++ b/docs/RestApiResultOrderFulfillmentStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOrderFulfillmentStatus
+# Flipdish.Model.RestApiResultOrderFulfillmentStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultOrderFulfillmentStatusWithConfigurationActions.md b/docs/RestApiResultOrderFulfillmentStatusWithConfigurationActions.md
index b8f8b7b8..19e8d73b 100644
--- a/docs/RestApiResultOrderFulfillmentStatusWithConfigurationActions.md
+++ b/docs/RestApiResultOrderFulfillmentStatusWithConfigurationActions.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOrderFulfillmentStatusWithConfigurationActions
+# Flipdish.Model.RestApiResultOrderFulfillmentStatusWithConfigurationActions
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultOrderIngestSubmitOrderResponse.md b/docs/RestApiResultOrderIngestSubmitOrderResponse.md
deleted file mode 100644
index 40b72ab9..00000000
--- a/docs/RestApiResultOrderIngestSubmitOrderResponse.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiResultOrderIngestSubmitOrderResponse
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**OrderIngestSubmitOrderResponse**](OrderIngestSubmitOrderResponse.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultOrderLeadTimes.md b/docs/RestApiResultOrderLeadTimes.md
new file mode 100644
index 00000000..102bfe26
--- /dev/null
+++ b/docs/RestApiResultOrderLeadTimes.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultOrderLeadTimes
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**OrderLeadTimes**](OrderLeadTimes.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultOrderPaymentInformation.md b/docs/RestApiResultOrderPaymentInformation.md
index 611e91ae..530750e4 100644
--- a/docs/RestApiResultOrderPaymentInformation.md
+++ b/docs/RestApiResultOrderPaymentInformation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultOrderPaymentInformation
+# Flipdish.Model.RestApiResultOrderPaymentInformation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultPaymentIntent.md b/docs/RestApiResultPaymentIntent.md
index 341572e2..d7406cea 100644
--- a/docs/RestApiResultPaymentIntent.md
+++ b/docs/RestApiResultPaymentIntent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultPaymentIntent
+# Flipdish.Model.RestApiResultPaymentIntent
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultPaymentTerminalDetails.md b/docs/RestApiResultPaymentTerminalDetails.md
index 1cec8383..5f866d7c 100644
--- a/docs/RestApiResultPaymentTerminalDetails.md
+++ b/docs/RestApiResultPaymentTerminalDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultPaymentTerminalDetails
+# Flipdish.Model.RestApiResultPaymentTerminalDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultPaymentTerminalTransactionDetails.md b/docs/RestApiResultPaymentTerminalTransactionDetails.md
index 7fa55533..04da9cfe 100644
--- a/docs/RestApiResultPaymentTerminalTransactionDetails.md
+++ b/docs/RestApiResultPaymentTerminalTransactionDetails.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultPaymentTerminalTransactionDetails
+# Flipdish.Model.RestApiResultPaymentTerminalTransactionDetails
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultPayoutReport3Details.md b/docs/RestApiResultPayoutReport3Details.md
new file mode 100644
index 00000000..2805609b
--- /dev/null
+++ b/docs/RestApiResultPayoutReport3Details.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultPayoutReport3Details
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**PayoutReport3Details**](PayoutReport3Details.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultPayoutReport3Overview.md b/docs/RestApiResultPayoutReport3Overview.md
new file mode 100644
index 00000000..08b92aee
--- /dev/null
+++ b/docs/RestApiResultPayoutReport3Overview.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultPayoutReport3Overview
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**PayoutReport3Overview**](PayoutReport3Overview.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultPayoutReport3PropertyDetails.md b/docs/RestApiResultPayoutReport3PropertyDetails.md
new file mode 100644
index 00000000..a1ce3a5c
--- /dev/null
+++ b/docs/RestApiResultPayoutReport3PropertyDetails.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultPayoutReport3PropertyDetails
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**PayoutReport3PropertyDetails**](PayoutReport3PropertyDetails.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultPayoutReport3StorePayouts.md b/docs/RestApiResultPayoutReport3StorePayouts.md
new file mode 100644
index 00000000..8a91fdf3
--- /dev/null
+++ b/docs/RestApiResultPayoutReport3StorePayouts.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultPayoutReport3StorePayouts
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**PayoutReport3StorePayouts**](PayoutReport3StorePayouts.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultPixelPointProductCatalogue.md b/docs/RestApiResultPixelPointProductCatalogue.md
new file mode 100644
index 00000000..d9f2e575
--- /dev/null
+++ b/docs/RestApiResultPixelPointProductCatalogue.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultPixelPointProductCatalogue
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**PixelPointProductCatalogue**](PixelPointProductCatalogue.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultPlayStoreConfigModel.md b/docs/RestApiResultPlayStoreConfigModel.md
new file mode 100644
index 00000000..ef035aa0
--- /dev/null
+++ b/docs/RestApiResultPlayStoreConfigModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultPlayStoreConfigModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**PlayStoreConfigModel**](PlayStoreConfigModel.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultPreOrderConfig.md b/docs/RestApiResultPreOrderConfig.md
index 2480e2ff..d99c29de 100644
--- a/docs/RestApiResultPreOrderConfig.md
+++ b/docs/RestApiResultPreOrderConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultPreOrderConfig
+# Flipdish.Model.RestApiResultPreOrderConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultProcessingFeeConfig.md b/docs/RestApiResultProcessingFeeConfig.md
index 05ed0964..ee92eeaf 100644
--- a/docs/RestApiResultProcessingFeeConfig.md
+++ b/docs/RestApiResultProcessingFeeConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultProcessingFeeConfig
+# Flipdish.Model.RestApiResultProcessingFeeConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultProduct.md b/docs/RestApiResultProduct.md
index 07628e7a..20a0a08b 100644
--- a/docs/RestApiResultProduct.md
+++ b/docs/RestApiResultProduct.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultProduct
+# Flipdish.Model.RestApiResultProduct
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultPushNotificationResponse.md b/docs/RestApiResultPushNotificationResponse.md
index e8d7190a..8da7faf6 100644
--- a/docs/RestApiResultPushNotificationResponse.md
+++ b/docs/RestApiResultPushNotificationResponse.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultPushNotificationResponse
+# Flipdish.Model.RestApiResultPushNotificationResponse
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultRedeemInvitationResult.md b/docs/RestApiResultRedeemInvitationResult.md
index e6caf6cf..c4dda397 100644
--- a/docs/RestApiResultRedeemInvitationResult.md
+++ b/docs/RestApiResultRedeemInvitationResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultRedeemInvitationResult
+# Flipdish.Model.RestApiResultRedeemInvitationResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultRestApiDefaultResponse.md b/docs/RestApiResultRestApiDefaultResponse.md
new file mode 100644
index 00000000..080b939e
--- /dev/null
+++ b/docs/RestApiResultRestApiDefaultResponse.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultRestApiDefaultResponse
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**RestApiDefaultResponse**](RestApiDefaultResponse.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultRestApiIntegerResult.md b/docs/RestApiResultRestApiIntegerResult.md
new file mode 100644
index 00000000..5f5cb308
--- /dev/null
+++ b/docs/RestApiResultRestApiIntegerResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultRestApiIntegerResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**RestApiIntegerResult**](RestApiIntegerResult.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultRestaurantVoucherPayGreenConfiguration.md b/docs/RestApiResultRestaurantVoucherPayGreenConfiguration.md
index 98792e43..7d5f605a 100644
--- a/docs/RestApiResultRestaurantVoucherPayGreenConfiguration.md
+++ b/docs/RestApiResultRestaurantVoucherPayGreenConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultRestaurantVoucherPayGreenConfiguration
+# Flipdish.Model.RestApiResultRestaurantVoucherPayGreenConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultRestaurantVoucherPayGreenStoreConfiguration.md b/docs/RestApiResultRestaurantVoucherPayGreenStoreConfiguration.md
index 78b8923a..fbf1ba72 100644
--- a/docs/RestApiResultRestaurantVoucherPayGreenStoreConfiguration.md
+++ b/docs/RestApiResultRestaurantVoucherPayGreenStoreConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultRestaurantVoucherPayGreenStoreConfiguration
+# Flipdish.Model.RestApiResultRestaurantVoucherPayGreenStoreConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultRetentionCampaign.md b/docs/RestApiResultRetentionCampaign.md
index 086c6e55..8bdffd8c 100644
--- a/docs/RestApiResultRetentionCampaign.md
+++ b/docs/RestApiResultRetentionCampaign.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultRetentionCampaign
+# Flipdish.Model.RestApiResultRetentionCampaign
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultServiceCharge.md b/docs/RestApiResultServiceCharge.md
index 5bdf80a8..0e14d4ee 100644
--- a/docs/RestApiResultServiceCharge.md
+++ b/docs/RestApiResultServiceCharge.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultServiceCharge
+# Flipdish.Model.RestApiResultServiceCharge
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultSetV2FeeCalculationRequest.md b/docs/RestApiResultSetV2FeeCalculationRequest.md
new file mode 100644
index 00000000..b485f40d
--- /dev/null
+++ b/docs/RestApiResultSetV2FeeCalculationRequest.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultSetV2FeeCalculationRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**SetV2FeeCalculationRequest**](SetV2FeeCalculationRequest.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultSmsProviderCredential.md b/docs/RestApiResultSmsProviderCredential.md
new file mode 100644
index 00000000..415a9442
--- /dev/null
+++ b/docs/RestApiResultSmsProviderCredential.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultSmsProviderCredential
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**SmsProviderCredential**](SmsProviderCredential.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultStore.md b/docs/RestApiResultStore.md
index 563de611..d347765a 100644
--- a/docs/RestApiResultStore.md
+++ b/docs/RestApiResultStore.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStore
+# Flipdish.Model.RestApiResultStore
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStoreAddress.md b/docs/RestApiResultStoreAddress.md
index da691706..40c2d37c 100644
--- a/docs/RestApiResultStoreAddress.md
+++ b/docs/RestApiResultStoreAddress.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStoreAddress
+# Flipdish.Model.RestApiResultStoreAddress
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStoreChannelAssignment.md b/docs/RestApiResultStoreChannelAssignment.md
index 11ec63a2..06217b0a 100644
--- a/docs/RestApiResultStoreChannelAssignment.md
+++ b/docs/RestApiResultStoreChannelAssignment.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStoreChannelAssignment
+# Flipdish.Model.RestApiResultStoreChannelAssignment
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStoreEndOfDayReport.md b/docs/RestApiResultStoreEndOfDayReport.md
index 5f7e6612..ea9584cf 100644
--- a/docs/RestApiResultStoreEndOfDayReport.md
+++ b/docs/RestApiResultStoreEndOfDayReport.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStoreEndOfDayReport
+# Flipdish.Model.RestApiResultStoreEndOfDayReport
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStoreGroup.md b/docs/RestApiResultStoreGroup.md
index 9456829c..374e1a00 100644
--- a/docs/RestApiResultStoreGroup.md
+++ b/docs/RestApiResultStoreGroup.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStoreGroup
+# Flipdish.Model.RestApiResultStoreGroup
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStoreGroupBase.md b/docs/RestApiResultStoreGroupBase.md
index 5a546466..92f753a2 100644
--- a/docs/RestApiResultStoreGroupBase.md
+++ b/docs/RestApiResultStoreGroupBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStoreGroupBase
+# Flipdish.Model.RestApiResultStoreGroupBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStoreKioskSettings.md b/docs/RestApiResultStoreKioskSettings.md
deleted file mode 100644
index b5f9d25c..00000000
--- a/docs/RestApiResultStoreKioskSettings.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiResultStoreKioskSettings
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**StoreKioskSettings**](StoreKioskSettings.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultStoreOrderCapacityConfig.md b/docs/RestApiResultStoreOrderCapacityConfig.md
index 29901cab..22f6587c 100644
--- a/docs/RestApiResultStoreOrderCapacityConfig.md
+++ b/docs/RestApiResultStoreOrderCapacityConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStoreOrderCapacityConfig
+# Flipdish.Model.RestApiResultStoreOrderCapacityConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStripeConnectedAccount.md b/docs/RestApiResultStripeConnectedAccount.md
index f8663298..649670ba 100644
--- a/docs/RestApiResultStripeConnectedAccount.md
+++ b/docs/RestApiResultStripeConnectedAccount.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStripeConnectedAccount
+# Flipdish.Model.RestApiResultStripeConnectedAccount
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStripeTerminalConnectionToken.md b/docs/RestApiResultStripeTerminalConnectionToken.md
index 56d95121..366580c0 100644
--- a/docs/RestApiResultStripeTerminalConnectionToken.md
+++ b/docs/RestApiResultStripeTerminalConnectionToken.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStripeTerminalConnectionToken
+# Flipdish.Model.RestApiResultStripeTerminalConnectionToken
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStripeTerminalLocation.md b/docs/RestApiResultStripeTerminalLocation.md
index 83cb7253..9476d105 100644
--- a/docs/RestApiResultStripeTerminalLocation.md
+++ b/docs/RestApiResultStripeTerminalLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStripeTerminalLocation
+# Flipdish.Model.RestApiResultStripeTerminalLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultStripeTerminalPrivateKey.md b/docs/RestApiResultStripeTerminalPrivateKey.md
deleted file mode 100644
index 8a567586..00000000
--- a/docs/RestApiResultStripeTerminalPrivateKey.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.Swagger.Model.RestApiResultStripeTerminalPrivateKey
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**StripeTerminalPrivateKey**](StripeTerminalPrivateKey.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultStuartSettings.md b/docs/RestApiResultStuartSettings.md
index c50a24ef..5869236e 100644
--- a/docs/RestApiResultStuartSettings.md
+++ b/docs/RestApiResultStuartSettings.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultStuartSettings
+# Flipdish.Model.RestApiResultStuartSettings
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultSubscriptionPlansResponse.md b/docs/RestApiResultSubscriptionPlansResponse.md
deleted file mode 100644
index 71c48e9c..00000000
--- a/docs/RestApiResultSubscriptionPlansResponse.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Flipdish.Model.RestApiResultSubscriptionPlansResponse
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Data** | [**SubscriptionPlansResponse**](SubscriptionPlansResponse.md) | Generic data object. | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/RestApiResultTeammate.md b/docs/RestApiResultTeammate.md
index e30d9e14..a6b94424 100644
--- a/docs/RestApiResultTeammate.md
+++ b/docs/RestApiResultTeammate.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultTeammate
+# Flipdish.Model.RestApiResultTeammate
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultTelemetrySeriesResult.md b/docs/RestApiResultTelemetrySeriesResult.md
index 6554d9fb..83cdeafb 100644
--- a/docs/RestApiResultTelemetrySeriesResult.md
+++ b/docs/RestApiResultTelemetrySeriesResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultTelemetrySeriesResult
+# Flipdish.Model.RestApiResultTelemetrySeriesResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultTipConfiguration.md b/docs/RestApiResultTipConfiguration.md
index 9369b4c8..b04f40b2 100644
--- a/docs/RestApiResultTipConfiguration.md
+++ b/docs/RestApiResultTipConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultTipConfiguration
+# Flipdish.Model.RestApiResultTipConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultUpdateMobileAppsSubmissionStatus.md b/docs/RestApiResultUpdateMobileAppsSubmissionStatus.md
index f852915d..588d95dd 100644
--- a/docs/RestApiResultUpdateMobileAppsSubmissionStatus.md
+++ b/docs/RestApiResultUpdateMobileAppsSubmissionStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultUpdateMobileAppsSubmissionStatus
+# Flipdish.Model.RestApiResultUpdateMobileAppsSubmissionStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultUserInfo.md b/docs/RestApiResultUserInfo.md
new file mode 100644
index 00000000..b55cf9f9
--- /dev/null
+++ b/docs/RestApiResultUserInfo.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultUserInfo
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**UserInfo**](UserInfo.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultUserPushNotificationSentResult.md b/docs/RestApiResultUserPushNotificationSentResult.md
new file mode 100644
index 00000000..449ac991
--- /dev/null
+++ b/docs/RestApiResultUserPushNotificationSentResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultUserPushNotificationSentResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**UserPushNotificationSentResult**](UserPushNotificationSentResult.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultUserRole.md b/docs/RestApiResultUserRole.md
new file mode 100644
index 00000000..3d2cdb93
--- /dev/null
+++ b/docs/RestApiResultUserRole.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultUserRole
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**UserRole**](UserRole.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultVoucher.md b/docs/RestApiResultVoucher.md
new file mode 100644
index 00000000..0114737f
--- /dev/null
+++ b/docs/RestApiResultVoucher.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultVoucher
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**Voucher**](Voucher.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiResultVoucherWithStats.md b/docs/RestApiResultVoucherWithStats.md
index 13e3d32f..d3f49254 100644
--- a/docs/RestApiResultVoucherWithStats.md
+++ b/docs/RestApiResultVoucherWithStats.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultVoucherWithStats
+# Flipdish.Model.RestApiResultVoucherWithStats
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultWebsiteImage.md b/docs/RestApiResultWebsiteImage.md
index ebb30493..0c7110f6 100644
--- a/docs/RestApiResultWebsiteImage.md
+++ b/docs/RestApiResultWebsiteImage.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultWebsiteImage
+# Flipdish.Model.RestApiResultWebsiteImage
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultWebsiteTestimonial.md b/docs/RestApiResultWebsiteTestimonial.md
index dc13ec4e..ed4b8a97 100644
--- a/docs/RestApiResultWebsiteTestimonial.md
+++ b/docs/RestApiResultWebsiteTestimonial.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiResultWebsiteTestimonial
+# Flipdish.Model.RestApiResultWebsiteTestimonial
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiResultWhiteLabelConfigModel.md b/docs/RestApiResultWhiteLabelConfigModel.md
new file mode 100644
index 00000000..699c91fa
--- /dev/null
+++ b/docs/RestApiResultWhiteLabelConfigModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.RestApiResultWhiteLabelConfigModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Data** | [**WhiteLabelConfigModel**](WhiteLabelConfigModel.md) | Generic data object. | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestApiStringArrayResult.md b/docs/RestApiStringArrayResult.md
index 669906ed..4fca07af 100644
--- a/docs/RestApiStringArrayResult.md
+++ b/docs/RestApiStringArrayResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiStringArrayResult
+# Flipdish.Model.RestApiStringArrayResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiStringResult.md b/docs/RestApiStringResult.md
index 75cae8db..ef3f4bee 100644
--- a/docs/RestApiStringResult.md
+++ b/docs/RestApiStringResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiStringResult
+# Flipdish.Model.RestApiStringResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/RestApiUnauthorizedResult.md b/docs/RestApiUnauthorizedResult.md
index 55982988..7e3e2a01 100644
--- a/docs/RestApiUnauthorizedResult.md
+++ b/docs/RestApiUnauthorizedResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RestApiUnauthorizedResult
+# Flipdish.Model.RestApiUnauthorizedResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Restaurant.md b/docs/Restaurant.md
new file mode 100644
index 00000000..d988f172
--- /dev/null
+++ b/docs/Restaurant.md
@@ -0,0 +1,19 @@
+# Flipdish.Model.Restaurant
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelConfigs** | [**List&lt;WhiteLabelConfig&gt;**](WhiteLabelConfig.md) | Collection of white label configurations | [optional] 
+**VirtualRestaurantId** | **int?** | Virtual restaurant identifier | [optional] 
+**VirtualRestaurantName** | **string** | Virtual restaurant name | [optional] 
+**VirtualRestaurantUrl** | **string** | Virtual restaurant URL | [optional] 
+**PhysicalRestaurantId** | **int?** | Physical restaurant identifier | [optional] 
+**PhysicalRestaurantName** | **string** | Physical restaurant name | [optional] 
+**PhysicalRestaurantAddress** | **string** | Physical restaurant address | [optional] 
+**MenuId** | **int?** | Menu identifier | [optional] 
+**IsArchived** | **bool?** | Indicates if the restaurant is archived | [optional] 
+**IsPublished** | **bool?** | Indicates if the restaurant is published | [optional] 
+**FlipdishStripeCustomConnectedAccounts** | **List&lt;int?&gt;** | List of Flipdish Stripe custom connected account identifiers | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/RestaurantVoucherAssignedStore.md b/docs/RestaurantVoucherAssignedStore.md
index 659885be..e042aa29 100644
--- a/docs/RestaurantVoucherAssignedStore.md
+++ b/docs/RestaurantVoucherAssignedStore.md
@@ -1,11 +1,11 @@
-# IO.Swagger.Model.RestaurantVoucherAssignedStore
+# Flipdish.Model.RestaurantVoucherAssignedStore
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StoreId** | **int?** |  | [optional] 
-**Name** | **string** |  | [optional] 
-**Active** | **bool?** |  | [optional] 
+**StoreId** | **int?** | StoreId. | [optional] 
+**Name** | **string** | Name. | [optional] 
+**Active** | **bool?** | Active. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RestaurantVoucherEligibleStore.md b/docs/RestaurantVoucherEligibleStore.md
index 7a6dc2be..145589c7 100644
--- a/docs/RestaurantVoucherEligibleStore.md
+++ b/docs/RestaurantVoucherEligibleStore.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.RestaurantVoucherEligibleStore
+# Flipdish.Model.RestaurantVoucherEligibleStore
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StoreId** | **int?** |  | [optional] 
-**Name** | **string** |  | [optional] 
+**StoreId** | **int?** | StoreId. | [optional] 
+**Name** | **string** | Name. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RestaurantVoucherPayGreenConfiguration.md b/docs/RestaurantVoucherPayGreenConfiguration.md
index b043c10f..81d1b0ac 100644
--- a/docs/RestaurantVoucherPayGreenConfiguration.md
+++ b/docs/RestaurantVoucherPayGreenConfiguration.md
@@ -1,12 +1,12 @@
-# IO.Swagger.Model.RestaurantVoucherPayGreenConfiguration
+# Flipdish.Model.RestaurantVoucherPayGreenConfiguration
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
-**PayGreenId** | **string** |  | [optional] 
-**PayGreenConfigurationId** | **int?** |  | [optional] 
-**AssignedStores** | [**List&lt;RestaurantVoucherAssignedStore&gt;**](RestaurantVoucherAssignedStore.md) |  | [optional] 
+**Name** | **string** | Name. | [optional] 
+**PayGreenId** | **string** | PayGreenId. | [optional] 
+**PayGreenConfigurationId** | **int?** | PayGreenConfigurationId. | [optional] 
+**AssignedStores** | [**List&lt;RestaurantVoucherAssignedStore&gt;**](RestaurantVoucherAssignedStore.md) | AssignedStores. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RestaurantVoucherPayGreenConfigurationSummary.md b/docs/RestaurantVoucherPayGreenConfigurationSummary.md
index 88235a9a..167057ac 100644
--- a/docs/RestaurantVoucherPayGreenConfigurationSummary.md
+++ b/docs/RestaurantVoucherPayGreenConfigurationSummary.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.RestaurantVoucherPayGreenConfigurationSummary
+# Flipdish.Model.RestaurantVoucherPayGreenConfigurationSummary
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
-**PayGreenConfigurationId** | **int?** |  | [optional] 
+**Name** | **string** | Name. | [optional] 
+**PayGreenConfigurationId** | **int?** | PayGreenConfigurationId. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RestaurantVoucherPayGreenStoreConfiguration.md b/docs/RestaurantVoucherPayGreenStoreConfiguration.md
index 0971fda8..0b3a32d7 100644
--- a/docs/RestaurantVoucherPayGreenStoreConfiguration.md
+++ b/docs/RestaurantVoucherPayGreenStoreConfiguration.md
@@ -1,12 +1,12 @@
-# IO.Swagger.Model.RestaurantVoucherPayGreenStoreConfiguration
+# Flipdish.Model.RestaurantVoucherPayGreenStoreConfiguration
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
-**Active** | **bool?** |  | [optional] 
-**PayGreenId** | **string** |  | [optional] 
-**PayGreenConfigurationId** | **int?** |  | [optional] 
+**Name** | **string** | Name. | [optional] 
+**Active** | **bool?** | Active. | [optional] 
+**PayGreenId** | **string** | PayGreenId. | [optional] 
+**PayGreenConfigurationId** | **int?** | PayGreenConfigurationId. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RestaurantVouchersPayGreenApi.md b/docs/RestaurantVouchersPayGreenApi.md
index 0386c5f3..8bfeff5e 100644
--- a/docs/RestaurantVouchersPayGreenApi.md
+++ b/docs/RestaurantVouchersPayGreenApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Api.RestaurantVouchersPayGreenApi
+# Flipdish.Api.RestaurantVouchersPayGreenApi
 
 All URIs are relative to *https://api.flipdish.co*
 
@@ -25,9 +25,9 @@ Method | HTTP request | Description
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -88,9 +88,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -151,9 +151,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -212,9 +212,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -273,9 +273,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -336,9 +336,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -399,9 +399,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -462,9 +462,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -527,9 +527,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
diff --git a/docs/RetentionCampaign.md b/docs/RetentionCampaign.md
index 9299a022..66478c37 100644
--- a/docs/RetentionCampaign.md
+++ b/docs/RetentionCampaign.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RetentionCampaign
+# Flipdish.Model.RetentionCampaign
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,8 +6,10 @@ Name | Type | Description | Notes
 **CampaignId** | **int?** | Id of campaign | [optional] 
 **Statistics** | [**CampaignStatistics**](CampaignStatistics.md) | Statistics of campaign | [optional] 
 **Stores** | [**List&lt;StoreCampaignStartTime&gt;**](StoreCampaignStartTime.md) | Stores this campaign applies to with campaign start time in Utc | [optional] 
+**PublicId** | **Guid?** | Permanent reference to the item. | [optional] 
 **NotifyCustomerAfterMinutes** | **int?** | Time in minutes, after which customer will receive retention voucher if he/she does not order | [optional] 
 **PercentDiscountAmount** | **int?** | Discount amount in percents | [optional] 
+**MaxDiscount** | **double?** | Maximum discount for percentage discounts | [optional] 
 **LumpDiscountAmount** | **double?** | Discount amount in sum of money | [optional] 
 **VoucherValidPeriodDays** | **int?** | Number of days for which the voucher will be valid. | [optional] 
 **IncludeDeliveryFee** | **bool?** | Discount will include delivery fee | [optional] 
@@ -15,6 +17,8 @@ Name | Type | Description | Notes
 **IncludeExistingOrders** | **bool?** | Campaign will apply to existing orders | [optional] 
 **IsEnabled** | **bool?** | Is campaign enabled | [optional] 
 **StoreIds** | **List&lt;int?&gt;** | Ids of stores this campaign applies to | [optional] 
+**AppId** | **string** | The app that this campaign belongs to. | [optional] 
+**ForceDiscount** | **bool?** | Controls whether the voucher generated from this campaign will override discount exclusions | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RetentionCampaignBase.md b/docs/RetentionCampaignBase.md
index 9d053b01..0447bb5c 100644
--- a/docs/RetentionCampaignBase.md
+++ b/docs/RetentionCampaignBase.md
@@ -1,10 +1,11 @@
-# IO.Swagger.Model.RetentionCampaignBase
+# Flipdish.Model.RetentionCampaignBase
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NotifyCustomerAfterMinutes** | **int?** | Time in minutes, after which customer will receive retention voucher if he/she does not order | [optional] 
 **PercentDiscountAmount** | **int?** | Discount amount in percents | [optional] 
+**MaxDiscount** | **double?** | Maximum discount for percentage discounts | [optional] 
 **LumpDiscountAmount** | **double?** | Discount amount in sum of money | [optional] 
 **VoucherValidPeriodDays** | **int?** | Number of days for which the voucher will be valid. | [optional] 
 **IncludeDeliveryFee** | **bool?** | Discount will include delivery fee | [optional] 
@@ -12,6 +13,8 @@ Name | Type | Description | Notes
 **IncludeExistingOrders** | **bool?** | Campaign will apply to existing orders | [optional] 
 **IsEnabled** | **bool?** | Is campaign enabled | [optional] 
 **StoreIds** | **List&lt;int?&gt;** | Ids of stores this campaign applies to | [optional] 
+**AppId** | **string** | The app that this campaign belongs to. | [optional] 
+**ForceDiscount** | **bool?** | Controls whether the voucher generated from this campaign will override discount exclusions | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RetentionCampaignCreatedEvent.md b/docs/RetentionCampaignCreatedEvent.md
index 0e6b62dc..4a23f77a 100644
--- a/docs/RetentionCampaignCreatedEvent.md
+++ b/docs/RetentionCampaignCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RetentionCampaignCreatedEvent
+# Flipdish.Model.RetentionCampaignCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RetentionCampaignDeletedEvent.md b/docs/RetentionCampaignDeletedEvent.md
index a4137e01..8c1b9b4d 100644
--- a/docs/RetentionCampaignDeletedEvent.md
+++ b/docs/RetentionCampaignDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RetentionCampaignDeletedEvent
+# Flipdish.Model.RetentionCampaignDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RetentionCampaignUpdatedEvent.md b/docs/RetentionCampaignUpdatedEvent.md
index 1347bd06..46d97c81 100644
--- a/docs/RetentionCampaignUpdatedEvent.md
+++ b/docs/RetentionCampaignUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RetentionCampaignUpdatedEvent
+# Flipdish.Model.RetentionCampaignUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/RevenueAdjustmentsDetails.md b/docs/RevenueAdjustmentsDetails.md
index 48101c91..131f25ae 100644
--- a/docs/RevenueAdjustmentsDetails.md
+++ b/docs/RevenueAdjustmentsDetails.md
@@ -1,12 +1,15 @@
-# IO.Swagger.Model.RevenueAdjustmentsDetails
+# Flipdish.Model.RevenueAdjustmentsDetails
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **OnlineSalesRefundedAmount** | **double?** | Online sales refunds | [optional] 
+**PosSalesRefundedAmount** | **double?** | POS Online sales refunds | [optional] 
 **CashSalesRefundedAmount** | **double?** | Cash sales refunds | [optional] 
 **CustomerCashFees** | **double?** | Customer cash fees | [optional] 
 **RefundsCount** | **int?** | Number of refunds | [optional] 
+**PayGreenSalesAmount** | **double?** | PayGreen sales | [optional] 
+**PayGreenProcessingFees** | **double?** | PayGreen processing fees charged to end-user | [optional] 
 **TotalOnlineRevenueAdjustments** | **double?** | Total revenue adjustments | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/RevenueDetail.md b/docs/RevenueDetail.md
index 30584fc8..eead07a6 100644
--- a/docs/RevenueDetail.md
+++ b/docs/RevenueDetail.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.RevenueDetail
+# Flipdish.Model.RevenueDetail
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/SafeWaitHandle.md b/docs/SafeWaitHandle.md
new file mode 100644
index 00000000..be330e86
--- /dev/null
+++ b/docs/SafeWaitHandle.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.SafeWaitHandle
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**IsInvalid** | **bool?** |  | [optional] 
+**IsClosed** | **bool?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SearchApi.md b/docs/SearchApi.md
new file mode 100644
index 00000000..acd841a2
--- /dev/null
+++ b/docs/SearchApi.md
@@ -0,0 +1,82 @@
+# Flipdish.Api.SearchApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**SearchRestaurants**](SearchApi.md#searchrestaurants) | **GET** /api/v1.0/search/restaurants | 
+
+
+<a name="searchrestaurants"></a>
+# **SearchRestaurants**
+> RestApiPaginationResultRestaurant SearchRestaurants (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SearchRestaurantsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new SearchApi();
+            var query = query_example;  // string | 
+            var countryId = countryId_example;  // string | 
+            var includeArchivedStores = includeArchivedStores_example;  // string |  (optional) 
+            var searchType = searchType_example;  // string |  (optional) 
+            var publishedStatus = publishedStatus_example;  // string |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
+
+            try
+            {
+                RestApiPaginationResultRestaurant result = apiInstance.SearchRestaurants(query, countryId, includeArchivedStores, searchType, publishedStatus, page, limit);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling SearchApi.SearchRestaurants: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **query** | **string**|  | 
+ **countryId** | **string**|  | 
+ **includeArchivedStores** | **string**|  | [optional] 
+ **searchType** | **string**|  | [optional] 
+ **publishedStatus** | **string**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
+
+### Return type
+
+[**RestApiPaginationResultRestaurant**](RestApiPaginationResultRestaurant.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/SearchCriteria.md b/docs/SearchCriteria.md
index 28e7e0ec..ceaf4743 100644
--- a/docs/SearchCriteria.md
+++ b/docs/SearchCriteria.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.SearchCriteria
+# Flipdish.Model.SearchCriteria
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,8 +9,11 @@ Name | Type | Description | Notes
 **End** | **DateTime?** | End date | [optional] 
 **OrderId** | **int?** | Events that have Order Id | [optional] 
 **StoreId** | **int?** | Events that have Store Id | [optional] 
+**StoreIdList** | **List&lt;int?&gt;** | Events that have Store Id List | [optional] 
 **StoreGroupId** | **int?** | Events that have Store Group Id | [optional] 
 **UserId** | **int?** | Events that have User Id | [optional] 
+**MenuId** | **int?** | Events that have Menu Id | [optional] 
+**CampaignId** | **int?** | Events that have Campaign Id | [optional] 
 **UserEmail** | **string** | Events that have User Email | [optional] 
 **UserName** | **string** | Events that have User Name | [optional] 
 **VoucherCode** | **string** | Events that have voucher code | [optional] 
diff --git a/docs/SendUserPushNotificationRequest.md b/docs/SendUserPushNotificationRequest.md
new file mode 100644
index 00000000..c79a3cf5
--- /dev/null
+++ b/docs/SendUserPushNotificationRequest.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.SendUserPushNotificationRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelId** | **int?** | WhiteLabelId. | [optional] 
+**Message** | **string** | Message. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SendUserSmsRequest.md b/docs/SendUserSmsRequest.md
new file mode 100644
index 00000000..42654109
--- /dev/null
+++ b/docs/SendUserSmsRequest.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.SendUserSmsRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Message** | **string** | Message. | [optional] 
+**WhiteLabelId** | **int?** | WhiteLabelId. | [optional] 
+**FromNumber** | **string** | FromNumber. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/ServiceCharge.md b/docs/ServiceCharge.md
index 9d256bba..38c997c9 100644
--- a/docs/ServiceCharge.md
+++ b/docs/ServiceCharge.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ServiceCharge
+# Flipdish.Model.ServiceCharge
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/SetOrderBatchingConfiguration.md b/docs/SetOrderBatchingConfiguration.md
index ade8e1cf..ce6c2337 100644
--- a/docs/SetOrderBatchingConfiguration.md
+++ b/docs/SetOrderBatchingConfiguration.md
@@ -1,9 +1,9 @@
-# IO.Swagger.Model.SetOrderBatchingConfiguration
+# Flipdish.Model.SetOrderBatchingConfiguration
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**BatchIntervalInMinutes** | **int?** | Batch sending interval in minutes | [optional] 
+**BatchIntervalInSeconds** | **int?** | Batch sending interval in seconds | [optional] 
 **Enabled** | **bool?** | OrderBatching is enabled or not | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/SetPasswordWithPinModel.md b/docs/SetPasswordWithPinModel.md
deleted file mode 100644
index 50c2c40a..00000000
--- a/docs/SetPasswordWithPinModel.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.SetPasswordWithPinModel
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Pin** | **int?** | PIN code (received via email) | 
-**NewPassword** | **string** | New Password | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/SetUserDeliveryLocationCoordinatesRequest.md b/docs/SetUserDeliveryLocationCoordinatesRequest.md
new file mode 100644
index 00000000..fa2bc44f
--- /dev/null
+++ b/docs/SetUserDeliveryLocationCoordinatesRequest.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.SetUserDeliveryLocationCoordinatesRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Latitude** | **double?** | Latitude. | [optional] 
+**Longitude** | **double?** | Longitude. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SetUserDeliveryLocationFieldRequest.md b/docs/SetUserDeliveryLocationFieldRequest.md
new file mode 100644
index 00000000..430fed42
--- /dev/null
+++ b/docs/SetUserDeliveryLocationFieldRequest.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.SetUserDeliveryLocationFieldRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Field** | **string** | Which field to update. Omit or set to null for a validation error. | [optional] 
+**Value** | **string** | Value. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SetV2FeeCalculationRequest.md b/docs/SetV2FeeCalculationRequest.md
new file mode 100644
index 00000000..a4564938
--- /dev/null
+++ b/docs/SetV2FeeCalculationRequest.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.SetV2FeeCalculationRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**IsEnabled** | **bool?** | Whether the V2 (tiered) fee calculation should be enabled for this Store. Required. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SetVoucherValidityPeriodsSimplifiedRequest.md b/docs/SetVoucherValidityPeriodsSimplifiedRequest.md
new file mode 100644
index 00000000..d7a46302
--- /dev/null
+++ b/docs/SetVoucherValidityPeriodsSimplifiedRequest.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.SetVoucherValidityPeriodsSimplifiedRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DaysOfWeek** | **List&lt;string&gt;** | Days of week when the voucher is valid | [optional] 
+**StartTime** | **string** | Start time of the day when the voucher is valid | [optional] 
+**EndTime** | **string** | End time of the day when the voucher is valid.  If the end time is before the start time, the end time is assumed to be the next day. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/Setting.md b/docs/Setting.md
index 2726b184..4a5946ec 100644
--- a/docs/Setting.md
+++ b/docs/Setting.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.Setting
+# Flipdish.Model.Setting
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Key** | **string** | Key | [optional] 
-**Value** | **string** | Value | [optional] 
+**Key** | **string** |  | [optional] 
+**Value** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/SignupStep.md b/docs/SignupStep.md
index 39f68cae..2175fea9 100644
--- a/docs/SignupStep.md
+++ b/docs/SignupStep.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.SignupStep
+# Flipdish.Model.SignupStep
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/SimpleProduct.md b/docs/SimpleProduct.md
deleted file mode 100644
index 36764386..00000000
--- a/docs/SimpleProduct.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Flipdish.Model.SimpleProduct
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**ProductId** | **string** | Unique product id | [optional] 
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**ProductType** | **string** | Product Type (SimpleProduct, Modifier, ModifierGroup, etc) | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-**IsArchived** | **bool?** | Returns true if the product is archived | [optional] 
-**Alcohol** | **bool?** | Product contains alcohol | [optional] 
-**Discriminator** | **string** |  | 
-**subProducts** | [**List&lt;SimpleProductSubProduct&gt;**](SimpleProductSubProduct.md) | Collection of products associated with this product | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/SimpleProductSubProduct.md b/docs/SimpleProductSubProduct.md
deleted file mode 100644
index f1c2fd63..00000000
--- a/docs/SimpleProductSubProduct.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Flipdish.Model.SimpleProductSubProduct
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**MinSelection** | **int?** | Minimum number of items that must be selected | [optional] 
-**MaxSelection** | **int?** | Maximum number of items that can be selected | [optional] 
-**ProductId** | **string** | Identifier of the ProductId to use as SubProduct | 
-**ProductType** | **string** | Type of the SupProduct | 
-**Product** | [**Product**](Product.md) | Details of the sub product | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/SmsInfo.md b/docs/SmsInfo.md
index a6032601..707aaaf1 100644
--- a/docs/SmsInfo.md
+++ b/docs/SmsInfo.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.SmsInfo
+# Flipdish.Model.SmsInfo
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/SmsProviderCredential.md b/docs/SmsProviderCredential.md
new file mode 100644
index 00000000..b9fa995e
--- /dev/null
+++ b/docs/SmsProviderCredential.md
@@ -0,0 +1,14 @@
+# Flipdish.Model.SmsProviderCredential
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**OrgId** | **string** | OrgId. | [optional] 
+**BrandId** | **string** | BrandId. | [optional] 
+**SmsServiceType** | **string** | SmsServiceType. | [optional] 
+**SenderId** | **string** | SenderId. | [optional] 
+**Username** | **string** | Username. | [optional] 
+**AuthToken** | **string** | AuthToken. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SmsProviderCredentialUpdateRequest.md b/docs/SmsProviderCredentialUpdateRequest.md
new file mode 100644
index 00000000..a4e11a50
--- /dev/null
+++ b/docs/SmsProviderCredentialUpdateRequest.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.SmsProviderCredentialUpdateRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**SenderId** | **string** | SenderId. | [optional] 
+**Username** | **string** | Username. | [optional] 
+**AuthToken** | **string** | AuthToken. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SmsProviderCredentialsApi.md b/docs/SmsProviderCredentialsApi.md
new file mode 100644
index 00000000..075a4938
--- /dev/null
+++ b/docs/SmsProviderCredentialsApi.md
@@ -0,0 +1,336 @@
+# Flipdish.Api.SmsProviderCredentialsApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**GetBrandSmsProviderCredentialByServiceType**](SmsProviderCredentialsApi.md#getbrandsmsprovidercredentialbyservicetype) | **GET** /api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType} | 
+[**GetBrandSmsProviderCredentials**](SmsProviderCredentialsApi.md#getbrandsmsprovidercredentials) | **GET** /api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials | 
+[**SmsProviderCredentialDelete**](SmsProviderCredentialsApi.md#smsprovidercredentialdelete) | **DELETE** /api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType} | 
+[**SmsProviderCredentialUpdate**](SmsProviderCredentialsApi.md#smsprovidercredentialupdate) | **POST** /api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType} | 
+[**SmsProviderCredentialsBulkUpsert**](SmsProviderCredentialsApi.md#smsprovidercredentialsbulkupsert) | **POST** /api/v1.0/sms-providers/bulk-upsert | 
+
+
+<a name="getbrandsmsprovidercredentialbyservicetype"></a>
+# **GetBrandSmsProviderCredentialByServiceType**
+> RestApiResultSmsProviderCredential GetBrandSmsProviderCredentialByServiceType (string orgId, string brandId, string serviceType, bool? withFallback = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetBrandSmsProviderCredentialByServiceTypeExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new SmsProviderCredentialsApi();
+            var orgId = orgId_example;  // string | 
+            var brandId = brandId_example;  // string | 
+            var serviceType = serviceType_example;  // string | 
+            var withFallback = true;  // bool? |  (optional) 
+
+            try
+            {
+                RestApiResultSmsProviderCredential result = apiInstance.GetBrandSmsProviderCredentialByServiceType(orgId, brandId, serviceType, withFallback);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling SmsProviderCredentialsApi.GetBrandSmsProviderCredentialByServiceType: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orgId** | **string**|  | 
+ **brandId** | **string**|  | 
+ **serviceType** | **string**|  | 
+ **withFallback** | **bool?**|  | [optional] 
+
+### Return type
+
+[**RestApiResultSmsProviderCredential**](RestApiResultSmsProviderCredential.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getbrandsmsprovidercredentials"></a>
+# **GetBrandSmsProviderCredentials**
+> RestApiArrayResultSmsProviderCredential GetBrandSmsProviderCredentials (string orgId, string brandId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetBrandSmsProviderCredentialsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new SmsProviderCredentialsApi();
+            var orgId = orgId_example;  // string | 
+            var brandId = brandId_example;  // string | 
+
+            try
+            {
+                RestApiArrayResultSmsProviderCredential result = apiInstance.GetBrandSmsProviderCredentials(orgId, brandId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling SmsProviderCredentialsApi.GetBrandSmsProviderCredentials: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orgId** | **string**|  | 
+ **brandId** | **string**|  | 
+
+### Return type
+
+[**RestApiArrayResultSmsProviderCredential**](RestApiArrayResultSmsProviderCredential.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="smsprovidercredentialdelete"></a>
+# **SmsProviderCredentialDelete**
+> RestApiResultSmsProviderCredential SmsProviderCredentialDelete (string orgId, string brandId, string serviceType)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SmsProviderCredentialDeleteExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new SmsProviderCredentialsApi();
+            var orgId = orgId_example;  // string | 
+            var brandId = brandId_example;  // string | 
+            var serviceType = serviceType_example;  // string | 
+
+            try
+            {
+                RestApiResultSmsProviderCredential result = apiInstance.SmsProviderCredentialDelete(orgId, brandId, serviceType);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling SmsProviderCredentialsApi.SmsProviderCredentialDelete: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orgId** | **string**|  | 
+ **brandId** | **string**|  | 
+ **serviceType** | **string**|  | 
+
+### Return type
+
+[**RestApiResultSmsProviderCredential**](RestApiResultSmsProviderCredential.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="smsprovidercredentialupdate"></a>
+# **SmsProviderCredentialUpdate**
+> RestApiResultSmsProviderCredential SmsProviderCredentialUpdate (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SmsProviderCredentialUpdateExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new SmsProviderCredentialsApi();
+            var orgId = orgId_example;  // string | 
+            var brandId = brandId_example;  // string | 
+            var serviceType = serviceType_example;  // string | 
+            var credential = new SmsProviderCredentialUpdateRequest(); // SmsProviderCredentialUpdateRequest | 
+
+            try
+            {
+                RestApiResultSmsProviderCredential result = apiInstance.SmsProviderCredentialUpdate(orgId, brandId, serviceType, credential);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling SmsProviderCredentialsApi.SmsProviderCredentialUpdate: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orgId** | **string**|  | 
+ **brandId** | **string**|  | 
+ **serviceType** | **string**|  | 
+ **credential** | [**SmsProviderCredentialUpdateRequest**](SmsProviderCredentialUpdateRequest.md)|  | 
+
+### Return type
+
+[**RestApiResultSmsProviderCredential**](RestApiResultSmsProviderCredential.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="smsprovidercredentialsbulkupsert"></a>
+# **SmsProviderCredentialsBulkUpsert**
+> RestApiArrayResultSmsProviderCredential SmsProviderCredentialsBulkUpsert (List<SmsProviderCredential> credentials)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SmsProviderCredentialsBulkUpsertExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new SmsProviderCredentialsApi();
+            var credentials = new List<SmsProviderCredential>(); // List<SmsProviderCredential> | 
+
+            try
+            {
+                RestApiArrayResultSmsProviderCredential result = apiInstance.SmsProviderCredentialsBulkUpsert(credentials);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling SmsProviderCredentialsApi.SmsProviderCredentialsBulkUpsert: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **credentials** | [**List&lt;SmsProviderCredential&gt;**](SmsProviderCredential.md)|  | 
+
+### Return type
+
+[**RestApiArrayResultSmsProviderCredential**](RestApiArrayResultSmsProviderCredential.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/SmsReceivedEvent.md b/docs/SmsReceivedEvent.md
index 26dbebcf..3cb44fe6 100644
--- a/docs/SmsReceivedEvent.md
+++ b/docs/SmsReceivedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.SmsReceivedEvent
+# Flipdish.Model.SmsReceivedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StatisticsCurrencyDataPoint.md b/docs/StatisticsCurrencyDataPoint.md
index affce1de..31a1244d 100644
--- a/docs/StatisticsCurrencyDataPoint.md
+++ b/docs/StatisticsCurrencyDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StatisticsCurrencyDataPoint
+# Flipdish.Model.StatisticsCurrencyDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Store.md b/docs/Store.md
index dc5e9751..aae42926 100644
--- a/docs/Store.md
+++ b/docs/Store.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Store
+# Flipdish.Model.Store
 ## Properties
 
 Name | Type | Description | Notes
@@ -22,6 +22,8 @@ Name | Type | Description | Notes
 **PreOrderPickupEnabled** | **bool?** | Is PerOrder Enabled for Pickup | [optional] 
 **LogoUrl** | **string** | Url for logo image | [optional] 
 **FraudPreventionStrategy** | **string** | Fraud Prevention Strategy | [optional] 
+**AppIds** | **List&lt;string&gt;** | Store&#39;s app ids | [optional] 
+**PropertyId** | **string** | Property Id | [optional] 
 **PhoneNumber** | **string** | Phone number | [optional] 
 **AlwaysAppearOpen** | **bool?** | True if the store always appears open | [optional] 
 **PreOrderEnabled** | **bool?** | True if the store accepts pre-orders | [optional] 
@@ -51,6 +53,8 @@ Name | Type | Description | Notes
 **Name** | **string** | Name | [optional] 
 **EmailAddress** | **string** | Email address (visible to customers) | [optional] 
 **StaffLanguage** | **string** | Staff Language (used for communication with the staff)  Emails, Printouts etc | [optional] 
+**SalesChannelTypes** | **List&lt;string&gt;** | Sales Channel Types | [optional] 
+**InheritanceConfigTypes** | **List&lt;string&gt;** | Inheritance Config Types | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreAddress.md b/docs/StoreAddress.md
index fb239f5d..30b59778 100644
--- a/docs/StoreAddress.md
+++ b/docs/StoreAddress.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreAddress
+# Flipdish.Model.StoreAddress
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreAddressBase.md b/docs/StoreAddressBase.md
index 5278763e..d3acb00a 100644
--- a/docs/StoreAddressBase.md
+++ b/docs/StoreAddressBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreAddressBase
+# Flipdish.Model.StoreAddressBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreAddressForm.md b/docs/StoreAddressForm.md
index 954777d5..4b6d31a7 100644
--- a/docs/StoreAddressForm.md
+++ b/docs/StoreAddressForm.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreAddressForm
+# Flipdish.Model.StoreAddressForm
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreAddressUpdatedEvent.md b/docs/StoreAddressUpdatedEvent.md
index b38b46d8..17065ce6 100644
--- a/docs/StoreAddressUpdatedEvent.md
+++ b/docs/StoreAddressUpdatedEvent.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.StoreAddressUpdatedEvent
+# Flipdish.Model.StoreAddressUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **StoreId** | **int?** | Store Id | [optional] 
 **StoreGroupId** | **int?** | Store group Id | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User which updated this store address | [optional] 
@@ -14,6 +15,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreArchivedEvent.md b/docs/StoreArchivedEvent.md
index be24c971..bb1b8205 100644
--- a/docs/StoreArchivedEvent.md
+++ b/docs/StoreArchivedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreArchivedEvent
+# Flipdish.Model.StoreArchivedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreBase.md b/docs/StoreBase.md
index 2533e13c..1267f209 100644
--- a/docs/StoreBase.md
+++ b/docs/StoreBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreBase
+# Flipdish.Model.StoreBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -32,6 +32,8 @@ Name | Type | Description | Notes
 **Name** | **string** | Name | [optional] 
 **EmailAddress** | **string** | Email address (visible to customers) | [optional] 
 **StaffLanguage** | **string** | Staff Language (used for communication with the staff)  Emails, Printouts etc | [optional] 
+**SalesChannelTypes** | **List&lt;string&gt;** | Sales Channel Types | [optional] 
+**InheritanceConfigTypes** | **List&lt;string&gt;** | Inheritance Config Types | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreBusinessHoursOverrideCreatedEvent.md b/docs/StoreBusinessHoursOverrideCreatedEvent.md
index 70662cfc..d03ef5d2 100644
--- a/docs/StoreBusinessHoursOverrideCreatedEvent.md
+++ b/docs/StoreBusinessHoursOverrideCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreBusinessHoursOverrideCreatedEvent
+# Flipdish.Model.StoreBusinessHoursOverrideCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreBusinessHoursOverrideDeletedEvent.md b/docs/StoreBusinessHoursOverrideDeletedEvent.md
index 075fe8c7..76f4e3e1 100644
--- a/docs/StoreBusinessHoursOverrideDeletedEvent.md
+++ b/docs/StoreBusinessHoursOverrideDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreBusinessHoursOverrideDeletedEvent
+# Flipdish.Model.StoreBusinessHoursOverrideDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreCampaignStartTime.md b/docs/StoreCampaignStartTime.md
index c8ce224d..a920e751 100644
--- a/docs/StoreCampaignStartTime.md
+++ b/docs/StoreCampaignStartTime.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreCampaignStartTime
+# Flipdish.Model.StoreCampaignStartTime
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreChannelAssignment.md b/docs/StoreChannelAssignment.md
index a08edcf0..a619b6d0 100644
--- a/docs/StoreChannelAssignment.md
+++ b/docs/StoreChannelAssignment.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreChannelAssignment
+# Flipdish.Model.StoreChannelAssignment
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreChannelStoreMapping.md b/docs/StoreChannelStoreMapping.md
deleted file mode 100644
index 45a2457c..00000000
--- a/docs/StoreChannelStoreMapping.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# IO.Swagger.Model.StoreChannelStoreMapping
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**ChannelId** | **int?** | Channel Id | [optional] 
-**StoreId** | **int?** | Store Id | [optional] 
-**ChannelStoreId** | **string** | Channel Store Id | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/StoreCloneSettings.md b/docs/StoreCloneSettings.md
index efe4c2ac..07a2717c 100644
--- a/docs/StoreCloneSettings.md
+++ b/docs/StoreCloneSettings.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreCloneSettings
+# Flipdish.Model.StoreCloneSettings
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreCollectionSettings.md b/docs/StoreCollectionSettings.md
new file mode 100644
index 00000000..3de70ddb
--- /dev/null
+++ b/docs/StoreCollectionSettings.md
@@ -0,0 +1,14 @@
+# Flipdish.Model.StoreCollectionSettings
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PickupEnabled** | **bool?** | True if the store accepts pickup orders | 
+**MinimumPickupOrderAmount** | **double?** | Minimum pickup order amount | 
+**RequireCustomerNameForPickup** | **bool?** | True if customer name required for pickup orders | 
+**CashOrdersPickupEnabled** | **bool?** | True if the store accepts cash payment for pickup orders | 
+**LeadTimeMinutes** | **int?** | Auto accept lead time for collection orders | 
+**EtaInPickupConfirmationSmsEnabled** | **bool?** | True if order confirmation sms includes estimated time when order will be ready for collection | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/StoreConfig.md b/docs/StoreConfig.md
index 48ab6893..cd954e5e 100644
--- a/docs/StoreConfig.md
+++ b/docs/StoreConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreConfig
+# Flipdish.Model.StoreConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreCreateBase.md b/docs/StoreCreateBase.md
index f25ce160..37f70f22 100644
--- a/docs/StoreCreateBase.md
+++ b/docs/StoreCreateBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreCreateBase
+# Flipdish.Model.StoreCreateBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 **Name** | **string** | Name | [optional] 
 **EmailAddress** | **string** | Email address (visible to customers) | [optional] 
 **StaffLanguage** | **string** | Staff Language (used for communication with the staff)  Emails, Printouts etc | [optional] 
+**SalesChannelType** | **string** | Sales Channel Type | [optional] 
+**PhoneNumber** | **string** | Phone Number | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreCreatedEvent.md b/docs/StoreCreatedEvent.md
index e2eaec72..460f6781 100644
--- a/docs/StoreCreatedEvent.md
+++ b/docs/StoreCreatedEvent.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.StoreCreatedEvent
+# Flipdish.Model.StoreCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **StoreId** | **int?** | Store Id | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User which created this store | [optional] 
 **Description** | **string** | Description | [optional] 
@@ -13,6 +14,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreDataPoint.md b/docs/StoreDataPoint.md
index c3eed129..3157d680 100644
--- a/docs/StoreDataPoint.md
+++ b/docs/StoreDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreDataPoint
+# Flipdish.Model.StoreDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreDeletedEvent.md b/docs/StoreDeletedEvent.md
index 638848ac..0dee68af 100644
--- a/docs/StoreDeletedEvent.md
+++ b/docs/StoreDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreDeletedEvent
+# Flipdish.Model.StoreDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreDeliveryZoneFeeConfig.md b/docs/StoreDeliveryZoneFeeConfig.md
new file mode 100644
index 00000000..abcf8747
--- /dev/null
+++ b/docs/StoreDeliveryZoneFeeConfig.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.StoreDeliveryZoneFeeConfig
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeliveryZoneId** | **int?** | ID of the delivery zone this fee corresponds to | [optional] 
+**Fee** | **double?** | Fee for delivery within this zone | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/StoreDeliveryZoneFeeConfigUpdateRequest.md b/docs/StoreDeliveryZoneFeeConfigUpdateRequest.md
new file mode 100644
index 00000000..9b7c8e57
--- /dev/null
+++ b/docs/StoreDeliveryZoneFeeConfigUpdateRequest.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.StoreDeliveryZoneFeeConfigUpdateRequest
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeliveryZoneFees** | [**List&lt;StoreDeliveryZoneFeeConfig&gt;**](StoreDeliveryZoneFeeConfig.md) | Delivery zone fees to update | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/StoreEndOfDayReport.md b/docs/StoreEndOfDayReport.md
index b56a4f47..b70024dc 100644
--- a/docs/StoreEndOfDayReport.md
+++ b/docs/StoreEndOfDayReport.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreEndOfDayReport
+# Flipdish.Model.StoreEndOfDayReport
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreFeeConfig.md b/docs/StoreFeeConfig.md
index 7487ba5c..9f65a3b9 100644
--- a/docs/StoreFeeConfig.md
+++ b/docs/StoreFeeConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreFeeConfig
+# Flipdish.Model.StoreFeeConfig
 ## Properties
 
 Name | Type | Description | Notes
@@ -25,6 +25,8 @@ Name | Type | Description | Notes
 **PercentFeeCashOrdersChargedToCustomerIncludingVat** | **double?** |  | [optional] 
 **FixedFeeCashOrdersChargedToCustomerIncludingVat** | **double?** |  | [optional] 
 **PercentFeeTips** | **double?** | Gets or sets the percent fee tips. | [optional] 
+**PercentFeeTipsCollection** | **double?** | Gets or sets the percent fee tips for collection. | [optional] 
+**PercentFeeTipsDelivery** | **double?** | Gets or sets the percent fee tips for delivery. | [optional] 
 **TaxRatePercent** | **double?** | Gets or sets the tax rate percent. | [optional] 
 **PercentFeeCardOrdersLocationService** | **double?** | Gets or sets the percent fee card orders location service. | [optional] 
 **PercentFeeCashOrdersLocationService** | **double?** | Gets or sets the percent fee cash orders location service. | [optional] 
@@ -38,6 +40,22 @@ Name | Type | Description | Notes
 **PercentFeeCashOrdersIngest** | **double?** | Gets or sets the percent fee cash orders ingest. | [optional] 
 **FixedFeeCardOrdersIngest** | **double?** | Gets or sets the fixed fee card orders ingest. | [optional] 
 **FixedFeeCashOrdersIngest** | **double?** | Gets or sets the fixed fee cash orders ingest. | [optional] 
+**PercentFeeDelivery** | **double?** | Gets or sets the percent fee for delivery orders. | [optional] 
+**FixedFeeDelivery** | **double?** | Gets or sets the fixed fee for delivery orders. | [optional] 
+**PercentFeeCardPosTransaction** | **double?** | Gets or sets the percent fee for POS transactions. | [optional] 
+**FixedFeeCardPosTransaction** | **double?** | Gets or sets the fixed fee for POS transactions. | [optional] 
+**PercentFeeOrderWithGoogle** | **double?** | Additional percentage fee charged on orders submitted through Order With Google | [optional] 
+**FixedFeeOrderWithGoogle** | **double?** | Additional fixed fee charged on orders submitted through Order With Google | [optional] 
+**ShouldNotAutoIncreaseBefore** | **DateTime?** | Should not auto increase fees before this date | [optional] 
+**Reason** | **string** | Reason for the last fee change (optional) | [optional] 
+**PercentFeeCardOrdersPhoneAgent** | **double?** | Gets or sets the percent fee card orders phone agent. | [optional] 
+**PercentFeeCashOrdersPhoneAgent** | **double?** | Gets or sets the percent fee cash orders phone agent. | [optional] 
+**FixedFeeCardOrdersPhoneAgent** | **double?** | Gets or sets the fixed fee card orders phone agent. | [optional] 
+**FixedFeeCashOrdersPhoneAgent** | **double?** | Gets or sets the fixed fee cash orders phone agent. | [optional] 
+**PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat** | **double?** | Gets or sets the percent fee card orders phone agent charged to customer including vat. | [optional] 
+**PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat** | **double?** | Gets or sets the percent fee cash orders phone agent charged to customer including vat. | [optional] 
+**FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat** | **double?** | Gets or sets the fixed fee card orders phone agent charged to customer including vat. | [optional] 
+**FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat** | **double?** | Gets or sets the fixed fee cash orders phone agent charged to customer including vat. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreFeeConfigUpdatedEvent.md b/docs/StoreFeeConfigUpdatedEvent.md
new file mode 100644
index 00000000..2930498a
--- /dev/null
+++ b/docs/StoreFeeConfigUpdatedEvent.md
@@ -0,0 +1,23 @@
+# Flipdish.Model.StoreFeeConfigUpdatedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
+**StoreId** | **int?** | Store Id | [optional] 
+**StoreGroupId** | **int?** | Store group Id | [optional] 
+**User** | [**UserEventInfo**](UserEventInfo.md) | User which updated this store address | [optional] 
+**Description** | **string** | Description | [optional] 
+**Changes** | **string** | Diff between before and after | [optional] 
+**StoreFeeConfig** | [**StoreFeeConfig**](StoreFeeConfig.md) | Store fee config | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/StoreGroup.md b/docs/StoreGroup.md
index 8a77c466..abef4942 100644
--- a/docs/StoreGroup.md
+++ b/docs/StoreGroup.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreGroup
+# Flipdish.Model.StoreGroup
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,6 +6,9 @@ Name | Type | Description | Notes
 **StoreGroupId** | **int?** | Unique Store Group Identifier | [optional] 
 **GeneralRating** | **double?** | Store Group rating | [optional] 
 **GeneralRatingCount** | **int?** | Store Group rating count | [optional] 
+**DeliveryMenuMessage** | **string** | Delivery menu message | [optional] 
+**PickupMenuMessage** | **string** | Pickup menu message | [optional] 
+**BrandIds** | **List&lt;string&gt;** | List of brand ids (AppIds) that are associated with this store group | [optional] 
 **Name** | **string** | Store Group Name | [optional] 
 **Currency** | **string** | Currency used by the stores in this group | [optional] 
 
diff --git a/docs/StoreGroupBase.md b/docs/StoreGroupBase.md
index 68696728..537fbf81 100644
--- a/docs/StoreGroupBase.md
+++ b/docs/StoreGroupBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreGroupBase
+# Flipdish.Model.StoreGroupBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreGroupCreatedEvent.md b/docs/StoreGroupCreatedEvent.md
index da96184d..8884a864 100644
--- a/docs/StoreGroupCreatedEvent.md
+++ b/docs/StoreGroupCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreGroupCreatedEvent
+# Flipdish.Model.StoreGroupCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreGroupDeletedEvent.md b/docs/StoreGroupDeletedEvent.md
index 2ca9f4ce..18a066ae 100644
--- a/docs/StoreGroupDeletedEvent.md
+++ b/docs/StoreGroupDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreGroupDeletedEvent
+# Flipdish.Model.StoreGroupDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreGroupExtended.md b/docs/StoreGroupExtended.md
index d13fa0cf..1b2fbe51 100644
--- a/docs/StoreGroupExtended.md
+++ b/docs/StoreGroupExtended.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreGroupExtended
+# Flipdish.Model.StoreGroupExtended
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,6 +9,9 @@ Name | Type | Description | Notes
 **StoreGroupId** | **int?** | Unique Store Group Identifier | [optional] 
 **GeneralRating** | **double?** | Store Group rating | [optional] 
 **GeneralRatingCount** | **int?** | Store Group rating count | [optional] 
+**DeliveryMenuMessage** | **string** | Delivery menu message | [optional] 
+**PickupMenuMessage** | **string** | Pickup menu message | [optional] 
+**BrandIds** | **List&lt;string&gt;** | List of brand ids (AppIds) that are associated with this store group | [optional] 
 **Name** | **string** | Store Group Name | [optional] 
 **Currency** | **string** | Currency used by the stores in this group | [optional] 
 
diff --git a/docs/StoreGroupUpdatedEvent.md b/docs/StoreGroupUpdatedEvent.md
index d3d5c0d1..ebdbccdc 100644
--- a/docs/StoreGroupUpdatedEvent.md
+++ b/docs/StoreGroupUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreGroupUpdatedEvent
+# Flipdish.Model.StoreGroupUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreGroupsApi.md b/docs/StoreGroupsApi.md
index eca90008..1e44dd2d 100644
--- a/docs/StoreGroupsApi.md
+++ b/docs/StoreGroupsApi.md
@@ -1,30 +1,96 @@
-# IO.Swagger.Api.StoreGroupsApi
+# Flipdish.Api.StoreGroupsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateStoreGroup**](StoreGroupsApi.md#createstoregroup) | **POST** /api/v1.0/{appNameId}/storegroups | Creates a Store Group  It will be attached to an existing App
-[**GetStoreGroup**](StoreGroupsApi.md#getstoregroup) | **GET** /api/v1.0/storegroups/{storeGroupId} | Returns a Store Groups
-[**GetStoreGroups**](StoreGroupsApi.md#getstoregroups) | **GET** /api/v1.0/{appNameId}/storegroups | Returns a paginated list of Store Groups
-[**GetStoreGroupsExtended**](StoreGroupsApi.md#getstoregroupsextended) | **GET** /api/v1.0/{appNameId}/storegroups/extended | [PRIVATE API] Returns a paginated list of Extended Store Groups
-[**RemoveStoreGroup**](StoreGroupsApi.md#removestoregroup) | **DELETE** /api/v1.0/storegroups/{storeGroupId} | Deletes a Store Group  Can only remove a store group if there is no stores attached to the group
-[**UpdateStoreGroup**](StoreGroupsApi.md#updatestoregroup) | **POST** /api/v1.0/storegroups/{storeGroupId} | Updates Store Group
+[**AssignStoresToStoreGroup**](StoreGroupsApi.md#assignstorestostoregroup) | **POST** /api/v1.0/{appId}/storegroups/{storeGroupId}/assignStores | 
+[**CreateStoreGroup**](StoreGroupsApi.md#createstoregroup) | **POST** /api/v1.0/{appNameId}/storegroups | 
+[**GetStoreGroup**](StoreGroupsApi.md#getstoregroup) | **GET** /api/v1.0/storegroups/{storeGroupId} | 
+[**GetStoreGroups**](StoreGroupsApi.md#getstoregroups) | **GET** /api/v1.0/{appNameId}/storegroups | 
+[**GetStoreGroupsExtended**](StoreGroupsApi.md#getstoregroupsextended) | **GET** /api/v1.0/{appNameId}/storegroups/extended | 
+[**RemoveStoreGroup**](StoreGroupsApi.md#removestoregroup) | **DELETE** /api/v1.0/storegroups/{storeGroupId} | 
+[**SetCustomerMessages**](StoreGroupsApi.md#setcustomermessages) | **POST** /api/v1.0/storegroups/{storeGroupId}/CustomerMessages | 
+[**UpdateStoreGroup**](StoreGroupsApi.md#updatestoregroup) | **POST** /api/v1.0/storegroups/{storeGroupId} | 
 
 
+<a name="assignstorestostoregroup"></a>
+# **AssignStoresToStoreGroup**
+> void AssignStoresToStoreGroup (string appId, int? storeGroupId, List<int?> storeIds)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AssignStoresToStoreGroupExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoreGroupsApi();
+            var appId = appId_example;  // string | 
+            var storeGroupId = 56;  // int? | 
+            var storeIds = ;  // List<int?> | 
+
+            try
+            {
+                apiInstance.AssignStoresToStoreGroup(appId, storeGroupId, storeIds);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreGroupsApi.AssignStoresToStoreGroup: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **storeGroupId** | **int?**|  | 
+ **storeIds** | **List&lt;int?&gt;**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="createstoregroup"></a>
 # **CreateStoreGroup**
 > RestApiResultStoreGroup CreateStoreGroup (string appNameId, StoreGroupBase storeGroup)
 
-Creates a Store Group  It will be attached to an existing App
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -36,12 +102,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoreGroupsApi();
-            var appNameId = appNameId_example;  // string | App Name Id
-            var storeGroup = new StoreGroupBase(); // StoreGroupBase | Store group definition
+            var appNameId = appNameId_example;  // string | 
+            var storeGroup = new StoreGroupBase(); // StoreGroupBase | 
 
             try
             {
-                // Creates a Store Group  It will be attached to an existing App
                 RestApiResultStoreGroup result = apiInstance.CreateStoreGroup(appNameId, storeGroup);
                 Debug.WriteLine(result);
             }
@@ -58,8 +123,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appNameId** | **string**| App Name Id | 
- **storeGroup** | [**StoreGroupBase**](StoreGroupBase.md)| Store group definition | 
+ **appNameId** | **string**|  | 
+ **storeGroup** | [**StoreGroupBase**](StoreGroupBase.md)|  | 
 
 ### Return type
 
@@ -80,15 +145,15 @@ Name | Type | Description  | Notes
 # **GetStoreGroup**
 > RestApiResultStoreGroup GetStoreGroup (int? storeGroupId)
 
-Returns a Store Groups
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -100,11 +165,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoreGroupsApi();
-            var storeGroupId = 56;  // int? | Store Group Id
+            var storeGroupId = 56;  // int? | 
 
             try
             {
-                // Returns a Store Groups
                 RestApiResultStoreGroup result = apiInstance.GetStoreGroup(storeGroupId);
                 Debug.WriteLine(result);
             }
@@ -121,7 +185,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeGroupId** | **int?**| Store Group Id | 
+ **storeGroupId** | **int?**|  | 
 
 ### Return type
 
@@ -142,15 +206,15 @@ Name | Type | Description  | Notes
 # **GetStoreGroups**
 > RestApiPaginationResultStoreGroup GetStoreGroups (string appNameId, string searchQuery = null, int? page = null, int? limit = null)
 
-Returns a paginated list of Store Groups
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -162,14 +226,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoreGroupsApi();
-            var appNameId = appNameId_example;  // string | App Name Id
-            var searchQuery = searchQuery_example;  // string | Search query (optional) 
-            var page = 56;  // int? | Requested page index (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
+            var appNameId = appNameId_example;  // string | 
+            var searchQuery = searchQuery_example;  // string |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Returns a paginated list of Store Groups
                 RestApiPaginationResultStoreGroup result = apiInstance.GetStoreGroups(appNameId, searchQuery, page, limit);
                 Debug.WriteLine(result);
             }
@@ -186,10 +249,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appNameId** | **string**| App Name Id | 
- **searchQuery** | **string**| Search query | [optional] 
- **page** | **int?**| Requested page index | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
+ **appNameId** | **string**|  | 
+ **searchQuery** | **string**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -210,15 +273,15 @@ Name | Type | Description  | Notes
 # **GetStoreGroupsExtended**
 > RestApiPaginationResultStoreGroupExtended GetStoreGroupsExtended (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null)
 
-[PRIVATE API] Returns a paginated list of Extended Store Groups
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -230,15 +293,14 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoreGroupsApi();
-            var appNameId = appNameId_example;  // string | App Name Id
-            var searchQuery = searchQuery_example;  // string | Search query (optional) 
-            var page = 56;  // int? | Requested page index (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
+            var appNameId = appNameId_example;  // string | 
+            var searchQuery = searchQuery_example;  // string |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
             var groupingRadius = 56;  // int? |  (optional) 
 
             try
             {
-                // [PRIVATE API] Returns a paginated list of Extended Store Groups
                 RestApiPaginationResultStoreGroupExtended result = apiInstance.GetStoreGroupsExtended(appNameId, searchQuery, page, limit, groupingRadius);
                 Debug.WriteLine(result);
             }
@@ -255,10 +317,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appNameId** | **string**| App Name Id | 
- **searchQuery** | **string**| Search query | [optional] 
- **page** | **int?**| Requested page index | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
+ **appNameId** | **string**|  | 
+ **searchQuery** | **string**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
  **groupingRadius** | **int?**|  | [optional] 
 
 ### Return type
@@ -280,15 +342,15 @@ Name | Type | Description  | Notes
 # **RemoveStoreGroup**
 > void RemoveStoreGroup (int? storeGroupId)
 
-Deletes a Store Group  Can only remove a store group if there is no stores attached to the group
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -300,11 +362,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoreGroupsApi();
-            var storeGroupId = 56;  // int? | Store Group Id
+            var storeGroupId = 56;  // int? | 
 
             try
             {
-                // Deletes a Store Group  Can only remove a store group if there is no stores attached to the group
                 apiInstance.RemoveStoreGroup(storeGroupId);
             }
             catch (Exception e)
@@ -320,7 +381,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeGroupId** | **int?**| Store Group Id | 
+ **storeGroupId** | **int?**|  | 
 
 ### Return type
 
@@ -337,19 +398,81 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="setcustomermessages"></a>
+# **SetCustomerMessages**
+> void SetCustomerMessages (int? storeGroupId, CustomerMessages customerMessages)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetCustomerMessagesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoreGroupsApi();
+            var storeGroupId = 56;  // int? | 
+            var customerMessages = new CustomerMessages(); // CustomerMessages | 
+
+            try
+            {
+                apiInstance.SetCustomerMessages(storeGroupId, customerMessages);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoreGroupsApi.SetCustomerMessages: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeGroupId** | **int?**|  | 
+ **customerMessages** | [**CustomerMessages**](CustomerMessages.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="updatestoregroup"></a>
 # **UpdateStoreGroup**
 > RestApiResultStoreGroupBase UpdateStoreGroup (int? storeGroupId, StoreGroupBase storeGroup)
 
-Updates Store Group
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -361,12 +484,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoreGroupsApi();
-            var storeGroupId = 56;  // int? | Store Group Id
-            var storeGroup = new StoreGroupBase(); // StoreGroupBase | Store Group Delta
+            var storeGroupId = 56;  // int? | 
+            var storeGroup = new StoreGroupBase(); // StoreGroupBase | 
 
             try
             {
-                // Updates Store Group
                 RestApiResultStoreGroupBase result = apiInstance.UpdateStoreGroup(storeGroupId, storeGroup);
                 Debug.WriteLine(result);
             }
@@ -383,8 +505,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeGroupId** | **int?**| Store Group Id | 
- **storeGroup** | [**StoreGroupBase**](StoreGroupBase.md)| Store Group Delta | 
+ **storeGroupId** | **int?**|  | 
+ **storeGroup** | [**StoreGroupBase**](StoreGroupBase.md)|  | 
 
 ### Return type
 
diff --git a/docs/StoreHeader.md b/docs/StoreHeader.md
index 89cee273..16d0462d 100644
--- a/docs/StoreHeader.md
+++ b/docs/StoreHeader.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreHeader
+# Flipdish.Model.StoreHeader
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreItemHeader.md b/docs/StoreItemHeader.md
index 6852f904..e19ca061 100644
--- a/docs/StoreItemHeader.md
+++ b/docs/StoreItemHeader.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreItemHeader
+# Flipdish.Model.StoreItemHeader
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreKioskSetting.md b/docs/StoreKioskSetting.md
index 09c5a3eb..7719b609 100644
--- a/docs/StoreKioskSetting.md
+++ b/docs/StoreKioskSetting.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreKioskSetting
+# Flipdish.Model.StoreKioskSetting
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreKioskSettingModel.md b/docs/StoreKioskSettingModel.md
deleted file mode 100644
index c54878dc..00000000
--- a/docs/StoreKioskSettingModel.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# IO.Swagger.Model.StoreKioskSettingModel
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**KioskName** | **string** | Name of the Kiosk | [optional] 
-**RequireCustomerName** | **bool?** | Require customer name flag | [optional] 
-**RequireCustomerPhoneNumber** | **bool?** | Require customer phone number flag | [optional] 
-**RequestTableNumber** | **bool?** | Request table number flag | [optional] 
-**OfferDineInOrTakeawayOptions** | **bool?** | Offer Dine-In/Takeaway option flag | [optional] 
-**SortOrder** | **int?** | Order in which the Kiosks should be listed | [optional] 
-**ConfigId** | **int?** | Kiosk (Hydra) config id | [optional] 
-**StoreId** | **int?** | Id of the store (Physical Restaurant) | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/StoreKioskSettingUpdatedEvent.md b/docs/StoreKioskSettingUpdatedEvent.md
index db6e6314..d27d946e 100644
--- a/docs/StoreKioskSettingUpdatedEvent.md
+++ b/docs/StoreKioskSettingUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreKioskSettingUpdatedEvent
+# Flipdish.Model.StoreKioskSettingUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreKioskSettings.md b/docs/StoreKioskSettings.md
deleted file mode 100644
index a1b7e3e3..00000000
--- a/docs/StoreKioskSettings.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.StoreKioskSettings
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**KioskStoreSettings** | [**List&lt;StoreKioskSettingModel&gt;**](StoreKioskSettingModel.md) | List of Store Kiosk Settings | [optional] 
-**StoreLogoUrl** | **string** | Store Logo Url | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/StoreListItem.md b/docs/StoreListItem.md
index 351e16b2..f85a8be3 100644
--- a/docs/StoreListItem.md
+++ b/docs/StoreListItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreListItem
+# Flipdish.Model.StoreListItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreLogoCreatedEvent.md b/docs/StoreLogoCreatedEvent.md
index 6005de6a..821604fa 100644
--- a/docs/StoreLogoCreatedEvent.md
+++ b/docs/StoreLogoCreatedEvent.md
@@ -1,10 +1,12 @@
-# IO.Swagger.Model.StoreLogoCreatedEvent
+# Flipdish.Model.StoreLogoCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **StoreId** | **int?** | ID of store that the logo has been added to | [optional] 
+**LogoUrl** | **string** | Url of logo | [optional] 
 **Description** | **string** | Description | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User who added the logo | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
@@ -12,6 +14,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreLogoDeletedEvent.md b/docs/StoreLogoDeletedEvent.md
index 04a75b2e..a11ecc36 100644
--- a/docs/StoreLogoDeletedEvent.md
+++ b/docs/StoreLogoDeletedEvent.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.StoreLogoDeletedEvent
+# Flipdish.Model.StoreLogoDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **StoreId** | **int?** | ID of store that the logo has been added to | [optional] 
 **Description** | **string** | Description | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User who removed the logo | [optional] 
@@ -12,6 +13,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreLogoUpdatedEvent.md b/docs/StoreLogoUpdatedEvent.md
index ab520506..df8e1754 100644
--- a/docs/StoreLogoUpdatedEvent.md
+++ b/docs/StoreLogoUpdatedEvent.md
@@ -1,10 +1,12 @@
-# IO.Swagger.Model.StoreLogoUpdatedEvent
+# Flipdish.Model.StoreLogoUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **StoreId** | **int?** | ID of store that the logo has been added to | [optional] 
+**LogoUrl** | **string** | Url of logo | [optional] 
 **Description** | **string** | Description | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User who updated the logo | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
@@ -12,6 +14,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreMenuAssignedEvent.md b/docs/StoreMenuAssignedEvent.md
index 074eae8b..61cf7808 100644
--- a/docs/StoreMenuAssignedEvent.md
+++ b/docs/StoreMenuAssignedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreMenuAssignedEvent
+# Flipdish.Model.StoreMenuAssignedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreNote.md b/docs/StoreNote.md
index e84b03ea..216aba0e 100644
--- a/docs/StoreNote.md
+++ b/docs/StoreNote.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreNote
+# Flipdish.Model.StoreNote
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreOpeningHoursUpdatedEvent.md b/docs/StoreOpeningHoursUpdatedEvent.md
index ce741592..0db9e800 100644
--- a/docs/StoreOpeningHoursUpdatedEvent.md
+++ b/docs/StoreOpeningHoursUpdatedEvent.md
@@ -1,13 +1,15 @@
-# IO.Swagger.Model.StoreOpeningHoursUpdatedEvent
+# Flipdish.Model.StoreOpeningHoursUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **StoreId** | **int?** | Store Id | [optional] 
 **StoreGroupId** | **int?** | Store group Id | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User which updated opening hours for this store | [optional] 
 **DeliveryType** | **string** | Type of opening hours Delivery / Pickup | [optional] 
+**DeliveryTypeString** | **string** | Type of opening hours Delivery / Pickup as a string | [optional] 
 **BusinessHoursPeriodOld** | [**BusinessHoursPeriod**](BusinessHoursPeriod.md) | The period that was updated | [optional] 
 **BusinessHoursPeriod** | [**BusinessHoursPeriod**](BusinessHoursPeriod.md) | The new values of the period | [optional] 
 **Description** | **string** | Description | [optional] 
@@ -16,6 +18,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreOrderCapacityApi.md b/docs/StoreOrderCapacityApi.md
index 4e41bdc5..8c301235 100644
--- a/docs/StoreOrderCapacityApi.md
+++ b/docs/StoreOrderCapacityApi.md
@@ -1,26 +1,26 @@
-# IO.Swagger.Api.StoreOrderCapacityApi
+# Flipdish.Api.StoreOrderCapacityApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetStoreOrderCapacity**](StoreOrderCapacityApi.md#getstoreordercapacity) | **GET** /api/v1.0/{appId}/storeordercapacity/{storeId}/{deliveryType} | Get store&#39;s order capacity configuration
-[**UpdateStoreOrderCapacityConfig**](StoreOrderCapacityApi.md#updatestoreordercapacityconfig) | **POST** /api/v1.0/{appId}/storeordercapacity/{storeId} | Create or update a store&#39;s order capacity configuration
+[**GetStoreOrderCapacity**](StoreOrderCapacityApi.md#getstoreordercapacity) | **GET** /api/v1.0/{appId}/storeordercapacity/{storeId}/{deliveryType} | 
+[**UpdateStoreOrderCapacityConfig**](StoreOrderCapacityApi.md#updatestoreordercapacityconfig) | **POST** /api/v1.0/{appId}/storeordercapacity/{storeId} | 
 
 
 <a name="getstoreordercapacity"></a>
 # **GetStoreOrderCapacity**
 > RestApiResultStoreOrderCapacityConfig GetStoreOrderCapacity (string appId, int? storeId, string deliveryType)
 
-Get store's order capacity configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -32,13 +32,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoreOrderCapacityApi();
-            var appId = appId_example;  // string | App Name Id
-            var storeId = 56;  // int? | Store Id
-            var deliveryType = deliveryType_example;  // string | Delivery / Pickup
+            var appId = appId_example;  // string | 
+            var storeId = 56;  // int? | 
+            var deliveryType = deliveryType_example;  // string | 
 
             try
             {
-                // Get store's order capacity configuration
                 RestApiResultStoreOrderCapacityConfig result = apiInstance.GetStoreOrderCapacity(appId, storeId, deliveryType);
                 Debug.WriteLine(result);
             }
@@ -55,9 +54,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **storeId** | **int?**| Store Id | 
- **deliveryType** | **string**| Delivery / Pickup | 
+ **appId** | **string**|  | 
+ **storeId** | **int?**|  | 
+ **deliveryType** | **string**|  | 
 
 ### Return type
 
@@ -78,15 +77,15 @@ Name | Type | Description  | Notes
 # **UpdateStoreOrderCapacityConfig**
 > void UpdateStoreOrderCapacityConfig (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId)
 
-Create or update a store's order capacity configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -98,14 +97,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoreOrderCapacityApi();
-            var storeId = 56;  // int? | Store identifier
-            var deliveryType = deliveryType_example;  // string | Delivery / Pickup
-            var newOrderCapacityConfig = new StoreOrderCapacityConfigEditModel(); // StoreOrderCapacityConfigEditModel | new order capacity configuration
+            var storeId = 56;  // int? | 
+            var deliveryType = deliveryType_example;  // string | 
+            var newOrderCapacityConfig = new StoreOrderCapacityConfigEditModel(); // StoreOrderCapacityConfigEditModel | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Create or update a store's order capacity configuration
                 apiInstance.UpdateStoreOrderCapacityConfig(storeId, deliveryType, newOrderCapacityConfig, appId);
             }
             catch (Exception e)
@@ -121,9 +119,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **deliveryType** | **string**| Delivery / Pickup | 
- **newOrderCapacityConfig** | [**StoreOrderCapacityConfigEditModel**](StoreOrderCapacityConfigEditModel.md)| new order capacity configuration | 
+ **storeId** | **int?**|  | 
+ **deliveryType** | **string**|  | 
+ **newOrderCapacityConfig** | [**StoreOrderCapacityConfigEditModel**](StoreOrderCapacityConfigEditModel.md)|  | 
  **appId** | **string**|  | 
 
 ### Return type
diff --git a/docs/StoreOrderCapacityConfig.md b/docs/StoreOrderCapacityConfig.md
index 08be594b..d837c201 100644
--- a/docs/StoreOrderCapacityConfig.md
+++ b/docs/StoreOrderCapacityConfig.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreOrderCapacityConfig
+# Flipdish.Model.StoreOrderCapacityConfig
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreOrderCapacityConfigEditModel.md b/docs/StoreOrderCapacityConfigEditModel.md
index b6331415..314c8fa2 100644
--- a/docs/StoreOrderCapacityConfigEditModel.md
+++ b/docs/StoreOrderCapacityConfigEditModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreOrderCapacityConfigEditModel
+# Flipdish.Model.StoreOrderCapacityConfigEditModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreOrderCapacityPeriod.md b/docs/StoreOrderCapacityPeriod.md
index d45bdedf..12f04a6b 100644
--- a/docs/StoreOrderCapacityPeriod.md
+++ b/docs/StoreOrderCapacityPeriod.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreOrderCapacityPeriod
+# Flipdish.Model.StoreOrderCapacityPeriod
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreOrderCapacityUpdatedEvent.md b/docs/StoreOrderCapacityUpdatedEvent.md
deleted file mode 100644
index 8533f06c..00000000
--- a/docs/StoreOrderCapacityUpdatedEvent.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Flipdish.Model.StoreOrderCapacityUpdatedEvent
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**EventName** | **string** | The event name | [optional] 
-**StoreId** | **int?** | Id of the store whose order capacity configuration has been updated | [optional] 
-**User** | [**UserEventInfo**](UserEventInfo.md) | User which updated order capacity configuration for this store | [optional] 
-**Description** | **string** | Description | [optional] 
-**OrderCapacityConfig** | [**StoreOrderCapacityConfigEditModel**](StoreOrderCapacityConfigEditModel.md) | Updated order capacity configuration | [optional] 
-**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
-**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
-**Position** | **int?** | Position | [optional] 
-**AppId** | **string** | App id | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/StorePreOrderConfigUpdatedEvent.md b/docs/StorePreOrderConfigUpdatedEvent.md
index 9c702ee0..4e29e481 100644
--- a/docs/StorePreOrderConfigUpdatedEvent.md
+++ b/docs/StorePreOrderConfigUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StorePreOrderConfigUpdatedEvent
+# Flipdish.Model.StorePreOrderConfigUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StorePublishedEvent.md b/docs/StorePublishedEvent.md
index b88df3c2..b1677249 100644
--- a/docs/StorePublishedEvent.md
+++ b/docs/StorePublishedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StorePublishedEvent
+# Flipdish.Model.StorePublishedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreServiceChargeUpdatedEvent.md b/docs/StoreServiceChargeUpdatedEvent.md
index 930e2d58..3c2f8fbd 100644
--- a/docs/StoreServiceChargeUpdatedEvent.md
+++ b/docs/StoreServiceChargeUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreServiceChargeUpdatedEvent
+# Flipdish.Model.StoreServiceChargeUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreStatistics.md b/docs/StoreStatistics.md
index 4fc012d5..71fb0535 100644
--- a/docs/StoreStatistics.md
+++ b/docs/StoreStatistics.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreStatistics
+# Flipdish.Model.StoreStatistics
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StoreSummary.md b/docs/StoreSummary.md
index 5d93e7b0..eb4dc9bb 100644
--- a/docs/StoreSummary.md
+++ b/docs/StoreSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreSummary
+# Flipdish.Model.StoreSummary
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,11 +6,17 @@ Name | Type | Description | Notes
 **Id** | **int?** | Store identifier | [optional] 
 **Name** | **string** | Store name | [optional] 
 **MenuId** | **int?** | Stores menu identifier | [optional] 
+**MenuPublishId** | **Guid?** | Stores menu publish GUID | [optional] 
 **Metadata** | **Dictionary&lt;string, string&gt;** | Store metadata | [optional] 
 **Currency** | **string** | Currency which used by the Store | [optional] 
 **Coordinates** | [**Coordinates**](Coordinates.md) | Latitude and longitude of the store | [optional] 
 **StoreTimezone** | **string** | Timezone of store | [optional] 
+**StoreIanaTimezone** | **string** | IANA Timezone of store | [optional] 
 **StoreGroupId** | **int?** | Store group id of store | [optional] 
+**TaxId** | **string** | VAT number or generic Tax ID of the store | [optional] 
+**PrettyAddress** | **string** | Address of the store | [optional] 
+**CountryCode** | **string** | Country code of the store address (ISO 3166-1 alpha-2) | [optional] 
+**PropertyId** | **string** | Property identifier | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreTipUpdatedEvent.md b/docs/StoreTipUpdatedEvent.md
index 57364957..df83918f 100644
--- a/docs/StoreTipUpdatedEvent.md
+++ b/docs/StoreTipUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreTipUpdatedEvent
+# Flipdish.Model.StoreTipUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreUnarchivedEvent.md b/docs/StoreUnarchivedEvent.md
index e399f132..a6125043 100644
--- a/docs/StoreUnarchivedEvent.md
+++ b/docs/StoreUnarchivedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreUnarchivedEvent
+# Flipdish.Model.StoreUnarchivedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreUnpublishedEvent.md b/docs/StoreUnpublishedEvent.md
index 00d50db9..c92923d6 100644
--- a/docs/StoreUnpublishedEvent.md
+++ b/docs/StoreUnpublishedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StoreUnpublishedEvent
+# Flipdish.Model.StoreUnpublishedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,7 +13,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreUpdatedEvent.md b/docs/StoreUpdatedEvent.md
index 89945157..86dde88a 100644
--- a/docs/StoreUpdatedEvent.md
+++ b/docs/StoreUpdatedEvent.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.StoreUpdatedEvent
+# Flipdish.Model.StoreUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **EventName** | **string** | The event name | [optional] 
+**OrgId** | **string** | Organisation Id | [optional] 
 **StoreId** | **int?** | Store Id | [optional] 
 **StoreGroupId** | **int?** | Store group Id | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User which updated this store | [optional] 
@@ -14,6 +15,8 @@ Name | Type | Description | Notes
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoreValidationConfig.md b/docs/StoreValidationConfig.md
index 3f664273..17c4ec08 100644
--- a/docs/StoreValidationConfig.md
+++ b/docs/StoreValidationConfig.md
@@ -1,13 +1,13 @@
-# IO.Swagger.Model.StoreValidationConfig
+# Flipdish.Model.StoreValidationConfig
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **StoreId** | **int?** | Store identifier | [optional] 
-**Name** | **string** |  | [optional] 
+**Name** | **string** | Name | [optional] 
 **IsValid** | **bool?** | Is Store Valid for Kiosk | [optional] 
 **StoreGroupId** | **int?** | Store group Id | [optional] 
-**ConfigValidation** | [**StoreConfig**](StoreConfig.md) |  | [optional] 
+**ConfigValidation** | [**StoreConfig**](StoreConfig.md) | Store list of validations | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StoresApi.md b/docs/StoresApi.md
index 8783bb7b..228fc35f 100644
--- a/docs/StoresApi.md
+++ b/docs/StoresApi.md
@@ -1,56 +1,64 @@
-# IO.Swagger.Api.StoresApi
+# Flipdish.Api.StoresApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**ArchiveStore**](StoresApi.md#archivestore) | **POST** /api/v1.0/stores/{storeId}/archive | Archive store
-[**AssignMenu**](StoresApi.md#assignmenu) | **POST** /api/v1.0/stores/{storeId}/menu/{menuId} | Assign Menu to Store
-[**CloneStore**](StoresApi.md#clonestore) | **POST** /api/v1.0/stores/{storeId}/clone | Clone store with store clone settings
-[**ConfigureStoreServiceCharge**](StoresApi.md#configurestoreservicecharge) | **POST** /api/v1.0/stores/{storeId}/servicecharge | Configure Store Service Charge; Idempotent Operation
-[**CreateBusinessHoursOverrideByStoreId**](StoresApi.md#createbusinesshoursoverridebystoreid) | **POST** /api/v1.0/stores/{storeId}/businesshoursoverrides | Create Business Hours Override for a store
-[**CreateStore**](StoresApi.md#createstore) | **POST** /api/v1.0/stores | Create store with Store Group identifier
-[**DeleteBusinessHoursOverride**](StoresApi.md#deletebusinesshoursoverride) | **DELETE** /api/v1.0/stores/{storeId}/businesshoursoverrides/{businessHoursOverrideId} | Delete Business Hours Override for a store
-[**GetBankAccountForStore**](StoresApi.md#getbankaccountforstore) | **GET** /api/v1.0/stores/{storeId}/bankaccount | Get Stores Bank Account Id
-[**GetBusinessHours**](StoresApi.md#getbusinesshours) | **GET** /api/v1.0/stores/{storeId}/availability/{deliveryType} | Get Business hours
-[**GetBusinessHoursOverrideByStoreId**](StoresApi.md#getbusinesshoursoverridebystoreid) | **GET** /api/v1.0/stores/{storeId}/businesshoursoverrides | Get business hours overrides by store identifier
-[**GetEndOfDayReport**](StoresApi.md#getendofdayreport) | **GET** /api/v1.0/stores/{storeId}/endofdayreport | Get store end of day report
-[**GetPreOrderConfig**](StoresApi.md#getpreorderconfig) | **GET** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType} | Get the pre order config for a store, by type
-[**GetPreOrderPreview**](StoresApi.md#getpreorderpreview) | **GET** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/preview | Get the Preview times of the pre-order configuration
-[**GetProcessingFeeConfigsByStoreId**](StoresApi.md#getprocessingfeeconfigsbystoreid) | **GET** /api/v1.0/stores/{storeId}/processingfeeconfigs | Get processing fee configs by store identifier
-[**GetProcessingFeeConfigsByStoreIdAndPaymentAccountType**](StoresApi.md#getprocessingfeeconfigsbystoreidandpaymentaccounttype) | **GET** /api/v1.0/stores/{storeId}/processingfeeconfigs/{paymentAccountType} | Get processing fee configs by store identifier
-[**GetStoreById**](StoresApi.md#getstorebyid) | **GET** /api/v1.0/stores/{storeId} | Get store by identifier
-[**GetStoreFeeConfig**](StoresApi.md#getstorefeeconfig) | **GET** /api/v1.0/stores/{storeId}/feeConfig | Retrieve Store feeConfig
-[**GetStoreHeadersByAppId**](StoresApi.md#getstoreheadersbyappid) | **GET** /api/v1.0/{appId}/stores/header | Get all stores by app name id
-[**GetStoreNetSales**](StoresApi.md#getstorenetsales) | **GET** /api/v1.0/{appId}/stores/stats | Get stores statistics by app name id and storeIds
-[**GetStoreServiceCharge**](StoresApi.md#getstoreservicecharge) | **GET** /api/v1.0/stores/{storeId}/servicecharge | Retrieve Store Service Charge
-[**GetStores**](StoresApi.md#getstores) | **GET** /api/v1.0/stores | Get all stores, excluding archived ones
-[**GetStoresByAppId**](StoresApi.md#getstoresbyappid) | **GET** /api/v1.0/{appId}/stores | Get all stores by app name id
-[**GetStoresByStoreIdWithValidations**](StoresApi.md#getstoresbystoreidwithvalidations) | **GET** /api/v1.0/{appId}/storevalidation/kiosk | Get store validation by storeIds
-[**PublishStore**](StoresApi.md#publishstore) | **POST** /api/v1.0/stores/{storeId}/publish | Publish store
-[**SetBusinessHours**](StoresApi.md#setbusinesshours) | **POST** /api/v1.0/stores/{storeId}/availability/{deliveryType} | Set Business hours
-[**SetPreOrdeEnabled**](StoresApi.md#setpreordeenabled) | **POST** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/enabled | UPDATE pre order config for a store, by type
-[**UnpublishStore**](StoresApi.md#unpublishstore) | **POST** /api/v1.0/stores/{storeId}/unpublish | Unpublish store
-[**UpdatePreOrderConfig**](StoresApi.md#updatepreorderconfig) | **POST** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType} | UPDATE pre order config for a store, by type
-[**UpdateStore**](StoresApi.md#updatestore) | **POST** /api/v1.0/stores/{storeId} | Update store by identifier
-[**UpdateStoreAddress**](StoresApi.md#updatestoreaddress) | **POST** /api/v1.0/stores/{storeId}/address | Update store address
-[**UpdateStoreAddressCoordinates**](StoresApi.md#updatestoreaddresscoordinates) | **POST** /api/v1.0/stores/{storeId}/address/coordinates | Update store address coordinates
-[**UpdateStoreAddressForm**](StoresApi.md#updatestoreaddressform) | **POST** /api/v1.0/stores/{storeId}/addressform | Update store address
+[**ArchiveStore**](StoresApi.md#archivestore) | **POST** /api/v1.0/stores/{storeId}/archive | 
+[**AssignMenu**](StoresApi.md#assignmenu) | **POST** /api/v1.0/stores/{storeId}/menu/{menuId} | 
+[**CloneStore**](StoresApi.md#clonestore) | **POST** /api/v1.0/stores/{storeId}/clone | 
+[**ConfigureStoreServiceCharge**](StoresApi.md#configurestoreservicecharge) | **POST** /api/v1.0/stores/{storeId}/servicecharge | 
+[**CreateBusinessHoursOverrideByStoreId**](StoresApi.md#createbusinesshoursoverridebystoreid) | **POST** /api/v1.0/stores/{storeId}/businesshoursoverrides | 
+[**CreateStore**](StoresApi.md#createstore) | **POST** /api/v1.0/stores | 
+[**CreateStoreInProperty**](StoresApi.md#createstoreinproperty) | **POST** /api/v1.0/properties/{propertyId}/stores | 
+[**DeleteBusinessHoursOverride**](StoresApi.md#deletebusinesshoursoverride) | **DELETE** /api/v1.0/stores/{storeId}/businesshoursoverrides/{businessHoursOverrideId} | 
+[**GetBankAccountForStore**](StoresApi.md#getbankaccountforstore) | **GET** /api/v1.0/stores/{storeId}/bankaccount | 
+[**GetBusinessHours**](StoresApi.md#getbusinesshours) | **GET** /api/v1.0/stores/{storeId}/availability/{deliveryType} | 
+[**GetBusinessHoursOverrideByStoreId**](StoresApi.md#getbusinesshoursoverridebystoreid) | **GET** /api/v1.0/stores/{storeId}/businesshoursoverrides | 
+[**GetEndOfDayReport**](StoresApi.md#getendofdayreport) | **GET** /api/v1.0/stores/{storeId}/endofdayreport | 
+[**GetPreOrderConfig**](StoresApi.md#getpreorderconfig) | **GET** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType} | 
+[**GetPreOrderPreview**](StoresApi.md#getpreorderpreview) | **GET** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/preview | 
+[**GetProcessingFeeConfigsByStoreId**](StoresApi.md#getprocessingfeeconfigsbystoreid) | **GET** /api/v1.0/stores/{storeId}/processingfeeconfigs | 
+[**GetProcessingFeeConfigsByStoreIdAndPaymentAccountType**](StoresApi.md#getprocessingfeeconfigsbystoreidandpaymentaccounttype) | **GET** /api/v1.0/stores/{storeId}/processingfeeconfigs/{paymentAccountType} | 
+[**GetStoreById**](StoresApi.md#getstorebyid) | **GET** /api/v1.0/stores/{storeId} | 
+[**GetStoreDeliveryFeeConfig**](StoresApi.md#getstoredeliveryfeeconfig) | **GET** /api/v1.0/stores/{storeId}/feeConfig/deliveryZones | 
+[**GetStoreFeeConfig**](StoresApi.md#getstorefeeconfig) | **GET** /api/v1.0/stores/{storeId}/feeConfig | 
+[**GetStoreHeadersByAppId**](StoresApi.md#getstoreheadersbyappid) | **GET** /api/v1.0/{appId}/stores/header | 
+[**GetStoreLeadTimes**](StoresApi.md#getstoreleadtimes) | **GET** /api/v1.0/stores/{storeId}/leadTimes | 
+[**GetStoreNetSales**](StoresApi.md#getstorenetsales) | **GET** /api/v1.0/{appId}/stores/stats | 
+[**GetStoreServiceCharge**](StoresApi.md#getstoreservicecharge) | **GET** /api/v1.0/stores/{storeId}/servicecharge | 
+[**GetStores**](StoresApi.md#getstores) | **GET** /api/v1.0/stores | 
+[**GetStoresByAppId**](StoresApi.md#getstoresbyappid) | **GET** /api/v1.0/{appId}/stores | 
+[**GetStoresByStoreIdWithValidations**](StoresApi.md#getstoresbystoreidwithvalidations) | **GET** /api/v1.0/{appId}/storevalidation/kiosk | 
+[**PublishStore**](StoresApi.md#publishstore) | **POST** /api/v1.0/stores/{storeId}/publish | 
+[**PutStoreDeliveryFeeConfig**](StoresApi.md#putstoredeliveryfeeconfig) | **PUT** /api/v1.0/stores/{storeId}/feeConfig/deliveryZones | 
+[**SetBusinessHours**](StoresApi.md#setbusinesshours) | **POST** /api/v1.0/stores/{storeId}/availability/{deliveryType} | 
+[**SetPreOrdeEnabled**](StoresApi.md#setpreordeenabled) | **POST** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/enabled | 
+[**SetStoreCollectionSettings**](StoresApi.md#setstorecollectionsettings) | **POST** /api/v1.0/stores/{storeId}/collectionsettings | 
+[**SetStoreLeadTimes**](StoresApi.md#setstoreleadtimes) | **POST** /api/v1.0/stores/{storeId}/leadTimes | 
+[**StoresSetPropertyId**](StoresApi.md#storessetpropertyid) | **POST** /api/v1.0/stores/{storeId}/propertyId/{propertyId} | 
+[**SupportedSalesChannelsTypes**](StoresApi.md#supportedsaleschannelstypes) | **POST** /api/v1.0/properties/{propertyId}/stores/{storeId}/supportedSalesChannels | 
+[**UnpublishStore**](StoresApi.md#unpublishstore) | **POST** /api/v1.0/stores/{storeId}/unpublish | 
+[**UpdatePreOrderConfig**](StoresApi.md#updatepreorderconfig) | **POST** /api/v1.0/stores/{storeId}/preorderconfig/{deliveryType} | 
+[**UpdateStore**](StoresApi.md#updatestore) | **POST** /api/v1.0/stores/{storeId} | 
+[**UpdateStoreAddress**](StoresApi.md#updatestoreaddress) | **POST** /api/v1.0/stores/{storeId}/address | 
+[**UpdateStoreAddressCoordinates**](StoresApi.md#updatestoreaddresscoordinates) | **POST** /api/v1.0/stores/{storeId}/address/coordinates | 
+[**UpdateStoreAddressForm**](StoresApi.md#updatestoreaddressform) | **POST** /api/v1.0/stores/{storeId}/addressform | 
 
 
 <a name="archivestore"></a>
 # **ArchiveStore**
 > void ArchiveStore (int? storeId)
 
-Archive store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -62,11 +70,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Archive store
                 apiInstance.ArchiveStore(storeId);
             }
             catch (Exception e)
@@ -82,7 +89,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -103,15 +110,15 @@ void (empty response body)
 # **AssignMenu**
 > RestApiArrayResultRestApiDefaultResponse AssignMenu (int? storeId, int? menuId)
 
-Assign Menu to Store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -123,12 +130,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var menuId = 56;  // int? | Id of Menu to assign to store
+            var storeId = 56;  // int? | 
+            var menuId = 56;  // int? | 
 
             try
             {
-                // Assign Menu to Store
                 RestApiArrayResultRestApiDefaultResponse result = apiInstance.AssignMenu(storeId, menuId);
                 Debug.WriteLine(result);
             }
@@ -145,8 +151,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **menuId** | **int?**| Id of Menu to assign to store | 
+ **storeId** | **int?**|  | 
+ **menuId** | **int?**|  | 
 
 ### Return type
 
@@ -167,15 +173,15 @@ Name | Type | Description  | Notes
 # **CloneStore**
 > RestApiResultStore CloneStore (int? storeId, StoreCloneSettings settings)
 
-Clone store with store clone settings
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -187,12 +193,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var settings = new StoreCloneSettings(); // StoreCloneSettings | Settings for cloning the store
+            var storeId = 56;  // int? | 
+            var settings = new StoreCloneSettings(); // StoreCloneSettings | 
 
             try
             {
-                // Clone store with store clone settings
                 RestApiResultStore result = apiInstance.CloneStore(storeId, settings);
                 Debug.WriteLine(result);
             }
@@ -209,8 +214,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **settings** | [**StoreCloneSettings**](StoreCloneSettings.md)| Settings for cloning the store | 
+ **storeId** | **int?**|  | 
+ **settings** | [**StoreCloneSettings**](StoreCloneSettings.md)|  | 
 
 ### Return type
 
@@ -231,15 +236,15 @@ Name | Type | Description  | Notes
 # **ConfigureStoreServiceCharge**
 > RestApiResultServiceCharge ConfigureStoreServiceCharge (int? storeId, ServiceCharge serviceCharge)
 
-Configure Store Service Charge; Idempotent Operation
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -251,12 +256,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var serviceCharge = new ServiceCharge(); // ServiceCharge | Service charge
+            var storeId = 56;  // int? | 
+            var serviceCharge = new ServiceCharge(); // ServiceCharge | 
 
             try
             {
-                // Configure Store Service Charge; Idempotent Operation
                 RestApiResultServiceCharge result = apiInstance.ConfigureStoreServiceCharge(storeId, serviceCharge);
                 Debug.WriteLine(result);
             }
@@ -273,8 +277,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **serviceCharge** | [**ServiceCharge**](ServiceCharge.md)| Service charge | 
+ **storeId** | **int?**|  | 
+ **serviceCharge** | [**ServiceCharge**](ServiceCharge.md)|  | 
 
 ### Return type
 
@@ -295,15 +299,15 @@ Name | Type | Description  | Notes
 # **CreateBusinessHoursOverrideByStoreId**
 > RestApiResultBusinessHoursOverride CreateBusinessHoursOverrideByStoreId (int? storeId, BusinessHoursOverrideBase businessHoursOverride)
 
-Create Business Hours Override for a store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -315,12 +319,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var businessHoursOverride = new BusinessHoursOverrideBase(); // BusinessHoursOverrideBase | Business Hours Override
+            var storeId = 56;  // int? | 
+            var businessHoursOverride = new BusinessHoursOverrideBase(); // BusinessHoursOverrideBase | 
 
             try
             {
-                // Create Business Hours Override for a store
                 RestApiResultBusinessHoursOverride result = apiInstance.CreateBusinessHoursOverrideByStoreId(storeId, businessHoursOverride);
                 Debug.WriteLine(result);
             }
@@ -337,8 +340,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **businessHoursOverride** | [**BusinessHoursOverrideBase**](BusinessHoursOverrideBase.md)| Business Hours Override | 
+ **storeId** | **int?**|  | 
+ **businessHoursOverride** | [**BusinessHoursOverrideBase**](BusinessHoursOverrideBase.md)|  | 
 
 ### Return type
 
@@ -359,15 +362,15 @@ Name | Type | Description  | Notes
 # **CreateStore**
 > RestApiResultStore CreateStore (int? storeGroupId, StoreCreateBase store)
 
-Create store with Store Group identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -379,12 +382,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeGroupId = 56;  // int? | Store Group identifier
-            var store = new StoreCreateBase(); // StoreCreateBase | Store
+            var storeGroupId = 56;  // int? | 
+            var store = new StoreCreateBase(); // StoreCreateBase | 
 
             try
             {
-                // Create store with Store Group identifier
                 RestApiResultStore result = apiInstance.CreateStore(storeGroupId, store);
                 Debug.WriteLine(result);
             }
@@ -401,8 +403,75 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeGroupId** | **int?**| Store Group identifier | 
- **store** | [**StoreCreateBase**](StoreCreateBase.md)| Store | 
+ **storeGroupId** | **int?**|  | 
+ **store** | [**StoreCreateBase**](StoreCreateBase.md)|  | 
+
+### Return type
+
+[**RestApiResultStore**](RestApiResultStore.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="createstoreinproperty"></a>
+# **CreateStoreInProperty**
+> RestApiResultStore CreateStoreInProperty (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class CreateStoreInPropertyExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoresApi();
+            var storeGroupId = 56;  // int? | 
+            var propertyId = propertyId_example;  // string | 
+            var store = new StoreCreateBase(); // StoreCreateBase | 
+            var autoAssignMenu = true;  // bool? |  (optional) 
+
+            try
+            {
+                RestApiResultStore result = apiInstance.CreateStoreInProperty(storeGroupId, propertyId, store, autoAssignMenu);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoresApi.CreateStoreInProperty: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeGroupId** | **int?**|  | 
+ **propertyId** | **string**|  | 
+ **store** | [**StoreCreateBase**](StoreCreateBase.md)|  | 
+ **autoAssignMenu** | **bool?**|  | [optional] 
 
 ### Return type
 
@@ -423,15 +492,15 @@ Name | Type | Description  | Notes
 # **DeleteBusinessHoursOverride**
 > RestApiArrayResultRestApiDefaultResponse DeleteBusinessHoursOverride (int? storeId, int? businessHoursOverrideId)
 
-Delete Business Hours Override for a store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -448,7 +517,6 @@ namespace Example
 
             try
             {
-                // Delete Business Hours Override for a store
                 RestApiArrayResultRestApiDefaultResponse result = apiInstance.DeleteBusinessHoursOverride(storeId, businessHoursOverrideId);
                 Debug.WriteLine(result);
             }
@@ -487,15 +555,15 @@ Name | Type | Description  | Notes
 # **GetBankAccountForStore**
 > RestApiResultAssignedBankAccount GetBankAccountForStore (int? storeId)
 
-Get Stores Bank Account Id
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -507,11 +575,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Get Stores Bank Account Id
                 RestApiResultAssignedBankAccount result = apiInstance.GetBankAccountForStore(storeId);
                 Debug.WriteLine(result);
             }
@@ -528,7 +595,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -549,15 +616,15 @@ Name | Type | Description  | Notes
 # **GetBusinessHours**
 > RestApiArrayResultBusinessHoursPeriod GetBusinessHours (int? storeId, string deliveryType)
 
-Get Business hours
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -569,12 +636,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var deliveryType = deliveryType_example;  // string | Delivery type
+            var storeId = 56;  // int? | 
+            var deliveryType = deliveryType_example;  // string | 
 
             try
             {
-                // Get Business hours
                 RestApiArrayResultBusinessHoursPeriod result = apiInstance.GetBusinessHours(storeId, deliveryType);
                 Debug.WriteLine(result);
             }
@@ -591,8 +657,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **deliveryType** | **string**| Delivery type | 
+ **storeId** | **int?**|  | 
+ **deliveryType** | **string**|  | 
 
 ### Return type
 
@@ -613,15 +679,15 @@ Name | Type | Description  | Notes
 # **GetBusinessHoursOverrideByStoreId**
 > RestApiPaginationResultBusinessHoursOverride GetBusinessHoursOverrideByStoreId (int? storeId, DateTime? after = null, int? page = null, int? limit = null)
 
-Get business hours overrides by store identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -633,14 +699,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var after = 2013-10-20T19:20:30+01:00;  // DateTime? | Return results that ended after this datetime. Default value is the current datetime. (optional) 
-            var page = 56;  // int? | Requested page index (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
+            var storeId = 56;  // int? | 
+            var after = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Get business hours overrides by store identifier
                 RestApiPaginationResultBusinessHoursOverride result = apiInstance.GetBusinessHoursOverrideByStoreId(storeId, after, page, limit);
                 Debug.WriteLine(result);
             }
@@ -657,10 +722,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **after** | **DateTime?**| Return results that ended after this datetime. Default value is the current datetime. | [optional] 
- **page** | **int?**| Requested page index | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
+ **storeId** | **int?**|  | 
+ **after** | **DateTime?**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -681,15 +746,15 @@ Name | Type | Description  | Notes
 # **GetEndOfDayReport**
 > RestApiResultStoreEndOfDayReport GetEndOfDayReport (int? storeId, DateTime? date = null)
 
-Get store end of day report
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -701,12 +766,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var date = 2013-10-20T19:20:30+01:00;  // DateTime? | Store identifier (optional) 
+            var storeId = 56;  // int? | 
+            var date = 2013-10-20T19:20:30+01:00;  // DateTime? |  (optional) 
 
             try
             {
-                // Get store end of day report
                 RestApiResultStoreEndOfDayReport result = apiInstance.GetEndOfDayReport(storeId, date);
                 Debug.WriteLine(result);
             }
@@ -723,8 +787,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **date** | **DateTime?**| Store identifier | [optional] 
+ **storeId** | **int?**|  | 
+ **date** | **DateTime?**|  | [optional] 
 
 ### Return type
 
@@ -745,15 +809,15 @@ Name | Type | Description  | Notes
 # **GetPreOrderConfig**
 > RestApiResultPreOrderConfig GetPreOrderConfig (int? storeId, string deliveryType)
 
-Get the pre order config for a store, by type
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -765,12 +829,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var deliveryType = deliveryType_example;  // string | \"delivery\" or \"pickup\"
+            var storeId = 56;  // int? | 
+            var deliveryType = deliveryType_example;  // string | 
 
             try
             {
-                // Get the pre order config for a store, by type
                 RestApiResultPreOrderConfig result = apiInstance.GetPreOrderConfig(storeId, deliveryType);
                 Debug.WriteLine(result);
             }
@@ -787,8 +850,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **deliveryType** | **string**| \&quot;delivery\&quot; or \&quot;pickup\&quot; | 
+ **storeId** | **int?**|  | 
+ **deliveryType** | **string**|  | 
 
 ### Return type
 
@@ -809,15 +872,15 @@ Name | Type | Description  | Notes
 # **GetPreOrderPreview**
 > RestApiArrayResultPreOrderTime GetPreOrderPreview (int? storeId, string deliveryType, int? preOrderConfigLeadTimeMinutes = null, int? preOrderConfigIntervalMinutes = null, int? preOrderConfigMaxOrderAheadDays = null, bool? preOrderConfigIncludeAsap = null, bool? preOrderConfigIncludeMoreGranularInitialTime = null, string preOrderConfigCutOffTimePreviousDayBasic = null, string preOrderConfigCutOffTimeCurrentDayBasic = null, string preOrderConfigPreOrderTimeDisplayType = null, bool? preOrderConfigAlwaysAppearOpen = null, bool? preOrderConfigRequireExplicitSelectAlways = null)
 
-Get the Preview times of the pre-order configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -829,8 +892,8 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var deliveryType = deliveryType_example;  // string | \"delivery\" or \"pickup\"
+            var storeId = 56;  // int? | 
+            var deliveryType = deliveryType_example;  // string | 
             var preOrderConfigLeadTimeMinutes = 56;  // int? | Lead Time in Minutes (optional) 
             var preOrderConfigIntervalMinutes = 56;  // int? | Interval in minutes (optional) 
             var preOrderConfigMaxOrderAheadDays = 56;  // int? | Max Days to order ahead (optional) 
@@ -844,7 +907,6 @@ namespace Example
 
             try
             {
-                // Get the Preview times of the pre-order configuration
                 RestApiArrayResultPreOrderTime result = apiInstance.GetPreOrderPreview(storeId, deliveryType, preOrderConfigLeadTimeMinutes, preOrderConfigIntervalMinutes, preOrderConfigMaxOrderAheadDays, preOrderConfigIncludeAsap, preOrderConfigIncludeMoreGranularInitialTime, preOrderConfigCutOffTimePreviousDayBasic, preOrderConfigCutOffTimeCurrentDayBasic, preOrderConfigPreOrderTimeDisplayType, preOrderConfigAlwaysAppearOpen, preOrderConfigRequireExplicitSelectAlways);
                 Debug.WriteLine(result);
             }
@@ -861,8 +923,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **deliveryType** | **string**| \&quot;delivery\&quot; or \&quot;pickup\&quot; | 
+ **storeId** | **int?**|  | 
+ **deliveryType** | **string**|  | 
  **preOrderConfigLeadTimeMinutes** | **int?**| Lead Time in Minutes | [optional] 
  **preOrderConfigIntervalMinutes** | **int?**| Interval in minutes | [optional] 
  **preOrderConfigMaxOrderAheadDays** | **int?**| Max Days to order ahead | [optional] 
@@ -893,15 +955,15 @@ Name | Type | Description  | Notes
 # **GetProcessingFeeConfigsByStoreId**
 > RestApiArrayResultProcessingFeeConfig GetProcessingFeeConfigsByStoreId (int? storeId, string appNameId = null)
 
-Get processing fee configs by store identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -913,12 +975,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var appNameId = appNameId_example;  // string | App Name Id(Not used, still here for compatability reasons) (optional) 
+            var storeId = 56;  // int? | 
+            var appNameId = appNameId_example;  // string |  (optional) 
 
             try
             {
-                // Get processing fee configs by store identifier
                 RestApiArrayResultProcessingFeeConfig result = apiInstance.GetProcessingFeeConfigsByStoreId(storeId, appNameId);
                 Debug.WriteLine(result);
             }
@@ -935,8 +996,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **appNameId** | **string**| App Name Id(Not used, still here for compatability reasons) | [optional] 
+ **storeId** | **int?**|  | 
+ **appNameId** | **string**|  | [optional] 
 
 ### Return type
 
@@ -957,15 +1018,15 @@ Name | Type | Description  | Notes
 # **GetProcessingFeeConfigsByStoreIdAndPaymentAccountType**
 > RestApiResultProcessingFeeConfig GetProcessingFeeConfigsByStoreIdAndPaymentAccountType (int? storeId, string paymentAccountType, string appNameId = null)
 
-Get processing fee configs by store identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -977,13 +1038,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
+            var storeId = 56;  // int? | 
             var paymentAccountType = paymentAccountType_example;  // string | 
-            var appNameId = appNameId_example;  // string | App Name Id(Not used, still here for compatability reasons) (optional) 
+            var appNameId = appNameId_example;  // string |  (optional) 
 
             try
             {
-                // Get processing fee configs by store identifier
                 RestApiResultProcessingFeeConfig result = apiInstance.GetProcessingFeeConfigsByStoreIdAndPaymentAccountType(storeId, paymentAccountType, appNameId);
                 Debug.WriteLine(result);
             }
@@ -1000,9 +1060,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
+ **storeId** | **int?**|  | 
  **paymentAccountType** | **string**|  | 
- **appNameId** | **string**| App Name Id(Not used, still here for compatability reasons) | [optional] 
+ **appNameId** | **string**|  | [optional] 
 
 ### Return type
 
@@ -1023,15 +1083,15 @@ Name | Type | Description  | Notes
 # **GetStoreById**
 > RestApiResultStore GetStoreById (int? storeId)
 
-Get store by identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1043,11 +1103,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Get store by identifier
                 RestApiResultStore result = apiInstance.GetStoreById(storeId);
                 Debug.WriteLine(result);
             }
@@ -1064,7 +1123,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -1081,19 +1140,80 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getstoredeliveryfeeconfig"></a>
+# **GetStoreDeliveryFeeConfig**
+> RestApiArrayResultStoreDeliveryZoneFeeConfig GetStoreDeliveryFeeConfig (int? storeId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetStoreDeliveryFeeConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoresApi();
+            var storeId = 56;  // int? | 
+
+            try
+            {
+                RestApiArrayResultStoreDeliveryZoneFeeConfig result = apiInstance.GetStoreDeliveryFeeConfig(storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoresApi.GetStoreDeliveryFeeConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+
+### Return type
+
+[**RestApiArrayResultStoreDeliveryZoneFeeConfig**](RestApiArrayResultStoreDeliveryZoneFeeConfig.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getstorefeeconfig"></a>
 # **GetStoreFeeConfig**
 > StoreFeeConfig GetStoreFeeConfig (int? storeId)
 
-Retrieve Store feeConfig
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1105,11 +1225,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Retrieve Store feeConfig
                 StoreFeeConfig result = apiInstance.GetStoreFeeConfig(storeId);
                 Debug.WriteLine(result);
             }
@@ -1126,7 +1245,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -1145,17 +1264,17 @@ Name | Type | Description  | Notes
 
 <a name="getstoreheadersbyappid"></a>
 # **GetStoreHeadersByAppId**
-> RestApiPaginationResultStoreHeader GetStoreHeadersByAppId (string appId, string storeNameQuery = null, int? page = null, int? limit = null)
+> RestApiPaginationResultStoreHeader GetStoreHeadersByAppId (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null)
+
 
-Get all stores by app name id
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1167,15 +1286,15 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var appId = appId_example;  // string | App Name Id
+            var appId = appId_example;  // string | 
             var storeNameQuery = storeNameQuery_example;  // string |  (optional) 
+            var salesChannelType = salesChannelType_example;  // string |  (optional) 
             var page = 56;  // int? |  (optional) 
             var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Get all stores by app name id
-                RestApiPaginationResultStoreHeader result = apiInstance.GetStoreHeadersByAppId(appId, storeNameQuery, page, limit);
+                RestApiPaginationResultStoreHeader result = apiInstance.GetStoreHeadersByAppId(appId, storeNameQuery, salesChannelType, page, limit);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -1191,8 +1310,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
+ **appId** | **string**|  | 
  **storeNameQuery** | **string**|  | [optional] 
+ **salesChannelType** | **string**|  | [optional] 
  **page** | **int?**|  | [optional] 
  **limit** | **int?**|  | [optional] 
 
@@ -1211,19 +1331,80 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getstoreleadtimes"></a>
+# **GetStoreLeadTimes**
+> RestApiResultOrderLeadTimes GetStoreLeadTimes (int? storeId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetStoreLeadTimesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoresApi();
+            var storeId = 56;  // int? | 
+
+            try
+            {
+                RestApiResultOrderLeadTimes result = apiInstance.GetStoreLeadTimes(storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoresApi.GetStoreLeadTimes: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+
+### Return type
+
+[**RestApiResultOrderLeadTimes**](RestApiResultOrderLeadTimes.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getstorenetsales"></a>
 # **GetStoreNetSales**
 > RestApiArrayResultStoreStatistics GetStoreNetSales (string appId, List<int?> storeId)
 
-Get stores statistics by app name id and storeIds
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1235,12 +1416,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var appId = appId_example;  // string | App Name Id
-            var storeId = new List<int?>(); // List<int?> | Store Ids
+            var appId = appId_example;  // string | 
+            var storeId = new List<int?>(); // List<int?> | 
 
             try
             {
-                // Get stores statistics by app name id and storeIds
                 RestApiArrayResultStoreStatistics result = apiInstance.GetStoreNetSales(appId, storeId);
                 Debug.WriteLine(result);
             }
@@ -1257,8 +1437,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **storeId** | [**List&lt;int?&gt;**](int?.md)| Store Ids | 
+ **appId** | **string**|  | 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | 
 
 ### Return type
 
@@ -1279,15 +1459,15 @@ Name | Type | Description  | Notes
 # **GetStoreServiceCharge**
 > ServiceCharge GetStoreServiceCharge (int? storeId)
 
-Retrieve Store Service Charge
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1299,11 +1479,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Retrieve Store Service Charge
                 ServiceCharge result = apiInstance.GetStoreServiceCharge(storeId);
                 Debug.WriteLine(result);
             }
@@ -1320,7 +1499,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -1341,15 +1520,15 @@ Name | Type | Description  | Notes
 # **GetStores**
 > RestApiPaginationResultStore GetStores (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
 
-Get all stores, excluding archived ones
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1361,14 +1540,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var searchQuery = searchQuery_example;  // string | Search query (optional) 
-            var page = 56;  // int? | Requested page index (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
-            var storeGroupId = 56;  // int? | Store Group Id (optional) 
+            var searchQuery = searchQuery_example;  // string |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
+            var storeGroupId = 56;  // int? |  (optional) 
 
             try
             {
-                // Get all stores, excluding archived ones
                 RestApiPaginationResultStore result = apiInstance.GetStores(searchQuery, page, limit, storeGroupId);
                 Debug.WriteLine(result);
             }
@@ -1385,10 +1563,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **searchQuery** | **string**| Search query | [optional] 
- **page** | **int?**| Requested page index | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
- **storeGroupId** | **int?**| Store Group Id | [optional] 
+ **searchQuery** | **string**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
+ **storeGroupId** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -1407,17 +1585,17 @@ Name | Type | Description  | Notes
 
 <a name="getstoresbyappid"></a>
 # **GetStoresByAppId**
-> RestApiPaginationResultStore GetStoresByAppId (string appId, string searchQuery = null, int? page = null, int? limit = null)
+> RestApiPaginationResultStore GetStoresByAppId (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null)
+
 
-Get all stores by app name id
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1429,15 +1607,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var appId = appId_example;  // string | App Name Id
-            var searchQuery = searchQuery_example;  // string | Search query (optional) 
-            var page = 56;  // int? | Requested page index (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
+            var appId = appId_example;  // string | 
+            var searchQuery = searchQuery_example;  // string |  (optional) 
+            var salesChannelType = salesChannelType_example;  // string |  (optional) 
+            var excludeUnpublished = true;  // bool? |  (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Get all stores by app name id
-                RestApiPaginationResultStore result = apiInstance.GetStoresByAppId(appId, searchQuery, page, limit);
+                RestApiPaginationResultStore result = apiInstance.GetStoresByAppId(appId, searchQuery, salesChannelType, excludeUnpublished, page, limit);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -1453,10 +1632,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **searchQuery** | **string**| Search query | [optional] 
- **page** | **int?**| Requested page index | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
+ **appId** | **string**|  | 
+ **searchQuery** | **string**|  | [optional] 
+ **salesChannelType** | **string**|  | [optional] 
+ **excludeUnpublished** | **bool?**|  | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -1477,15 +1658,15 @@ Name | Type | Description  | Notes
 # **GetStoresByStoreIdWithValidations**
 > RestApiPaginationResultStoreValidationConfig GetStoresByStoreIdWithValidations (List<int?> storeId, string appId, int? page = null, int? limit = null)
 
-Get store validation by storeIds
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1497,14 +1678,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = new List<int?>(); // List<int?> | Store identifier
+            var storeId = new List<int?>(); // List<int?> | 
             var appId = appId_example;  // string | 
-            var page = 56;  // int? | Requested page index (optional) 
-            var limit = 56;  // int? | Requested page limit (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Get store validation by storeIds
                 RestApiPaginationResultStoreValidationConfig result = apiInstance.GetStoresByStoreIdWithValidations(storeId, appId, page, limit);
                 Debug.WriteLine(result);
             }
@@ -1521,10 +1701,10 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | [**List&lt;int?&gt;**](int?.md)| Store identifier | 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | 
  **appId** | **string**|  | 
- **page** | **int?**| Requested page index | [optional] 
- **limit** | **int?**| Requested page limit | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -1545,15 +1725,15 @@ Name | Type | Description  | Notes
 # **PublishStore**
 > void PublishStore (int? storeId)
 
-Publish store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1565,11 +1745,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Publish store
                 apiInstance.PublishStore(storeId);
             }
             catch (Exception e)
@@ -1585,7 +1764,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -1602,19 +1781,81 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="putstoredeliveryfeeconfig"></a>
+# **PutStoreDeliveryFeeConfig**
+> void PutStoreDeliveryFeeConfig (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class PutStoreDeliveryFeeConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoresApi();
+            var storeId = 56;  // int? | 
+            var feeConfigUpdateRequest = new StoreDeliveryZoneFeeConfigUpdateRequest(); // StoreDeliveryZoneFeeConfigUpdateRequest | 
+
+            try
+            {
+                apiInstance.PutStoreDeliveryFeeConfig(storeId, feeConfigUpdateRequest);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoresApi.PutStoreDeliveryFeeConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+ **feeConfigUpdateRequest** | [**StoreDeliveryZoneFeeConfigUpdateRequest**](StoreDeliveryZoneFeeConfigUpdateRequest.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="setbusinesshours"></a>
 # **SetBusinessHours**
 > RestApiResultBusinessHoursPeriod SetBusinessHours (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
 
-Set Business hours
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1626,13 +1867,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var deliveryType = deliveryType_example;  // string | Delivery type
-            var businessHoursPeriod = new BusinessHoursPeriodBase(); // BusinessHoursPeriodBase | Business Hours Period
+            var storeId = 56;  // int? | 
+            var deliveryType = deliveryType_example;  // string | 
+            var businessHoursPeriod = new BusinessHoursPeriodBase(); // BusinessHoursPeriodBase | 
 
             try
             {
-                // Set Business hours
                 RestApiResultBusinessHoursPeriod result = apiInstance.SetBusinessHours(storeId, deliveryType, businessHoursPeriod);
                 Debug.WriteLine(result);
             }
@@ -1649,9 +1889,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **deliveryType** | **string**| Delivery type | 
- **businessHoursPeriod** | [**BusinessHoursPeriodBase**](BusinessHoursPeriodBase.md)| Business Hours Period | 
+ **storeId** | **int?**|  | 
+ **deliveryType** | **string**|  | 
+ **businessHoursPeriod** | [**BusinessHoursPeriodBase**](BusinessHoursPeriodBase.md)|  | 
 
 ### Return type
 
@@ -1672,15 +1912,15 @@ Name | Type | Description  | Notes
 # **SetPreOrdeEnabled**
 > RestApiArrayResultRestApiDefaultResponse SetPreOrdeEnabled (int? storeId, string deliveryType, bool? enabled)
 
-UPDATE pre order config for a store, by type
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1692,13 +1932,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var deliveryType = deliveryType_example;  // string | \"delivery\" or \"pickup\"
-            var enabled = true;  // bool? | Update pre order config values
+            var storeId = 56;  // int? | 
+            var deliveryType = deliveryType_example;  // string | 
+            var enabled = true;  // bool? | 
 
             try
             {
-                // UPDATE pre order config for a store, by type
                 RestApiArrayResultRestApiDefaultResponse result = apiInstance.SetPreOrdeEnabled(storeId, deliveryType, enabled);
                 Debug.WriteLine(result);
             }
@@ -1715,9 +1954,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **deliveryType** | **string**| \&quot;delivery\&quot; or \&quot;pickup\&quot; | 
- **enabled** | **bool?**| Update pre order config values | 
+ **storeId** | **int?**|  | 
+ **deliveryType** | **string**|  | 
+ **enabled** | **bool?**|  | 
 
 ### Return type
 
@@ -1734,19 +1973,274 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="setstorecollectionsettings"></a>
+# **SetStoreCollectionSettings**
+> RestApiResultRestApiDefaultResponse SetStoreCollectionSettings (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetStoreCollectionSettingsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoresApi();
+            var storeId = 56;  // int? | 
+            var settings = new StoreCollectionSettings(); // StoreCollectionSettings | 
+            var inheritFromProperty = true;  // bool? |  (optional) 
+
+            try
+            {
+                RestApiResultRestApiDefaultResponse result = apiInstance.SetStoreCollectionSettings(storeId, settings, inheritFromProperty);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoresApi.SetStoreCollectionSettings: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+ **settings** | [**StoreCollectionSettings**](StoreCollectionSettings.md)|  | 
+ **inheritFromProperty** | **bool?**|  | [optional] 
+
+### Return type
+
+[**RestApiResultRestApiDefaultResponse**](RestApiResultRestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setstoreleadtimes"></a>
+# **SetStoreLeadTimes**
+> RestApiResultOrderLeadTimes SetStoreLeadTimes (int? storeId, LeadTime leadTime)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetStoreLeadTimesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoresApi();
+            var storeId = 56;  // int? | 
+            var leadTime = new LeadTime(); // LeadTime | 
+
+            try
+            {
+                RestApiResultOrderLeadTimes result = apiInstance.SetStoreLeadTimes(storeId, leadTime);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoresApi.SetStoreLeadTimes: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+ **leadTime** | [**LeadTime**](LeadTime.md)|  | 
+
+### Return type
+
+[**RestApiResultOrderLeadTimes**](RestApiResultOrderLeadTimes.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="storessetpropertyid"></a>
+# **StoresSetPropertyId**
+> Object StoresSetPropertyId (int? storeId, string propertyId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class StoresSetPropertyIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoresApi();
+            var storeId = 56;  // int? | 
+            var propertyId = propertyId_example;  // string | 
+
+            try
+            {
+                Object result = apiInstance.StoresSetPropertyId(storeId, propertyId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoresApi.StoresSetPropertyId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
+ **propertyId** | **string**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="supportedsaleschannelstypes"></a>
+# **SupportedSalesChannelsTypes**
+> void SupportedSalesChannelsTypes (string propertyId, int? storeId, List<string> salesChannelTypes)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SupportedSalesChannelsTypesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new StoresApi();
+            var propertyId = propertyId_example;  // string | 
+            var storeId = 56;  // int? | 
+            var salesChannelTypes = salesChannelTypes_example;  // List<string> | 
+
+            try
+            {
+                apiInstance.SupportedSalesChannelsTypes(propertyId, storeId, salesChannelTypes);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling StoresApi.SupportedSalesChannelsTypes: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **propertyId** | **string**|  | 
+ **storeId** | **int?**|  | 
+ **salesChannelTypes** | **List&lt;string&gt;**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="unpublishstore"></a>
 # **UnpublishStore**
 > void UnpublishStore (int? storeId)
 
-Unpublish store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1758,11 +2252,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Unpublish store
                 apiInstance.UnpublishStore(storeId);
             }
             catch (Exception e)
@@ -1778,7 +2271,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -1799,15 +2292,15 @@ void (empty response body)
 # **UpdatePreOrderConfig**
 > RestApiArrayResultRestApiDefaultResponse UpdatePreOrderConfig (int? storeId, string deliveryType, PreOrderConfig preOrderConfig)
 
-UPDATE pre order config for a store, by type
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1819,13 +2312,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var deliveryType = deliveryType_example;  // string | \"delivery\" or \"pickup\"
-            var preOrderConfig = new PreOrderConfig(); // PreOrderConfig | Update pre order config values
+            var storeId = 56;  // int? | 
+            var deliveryType = deliveryType_example;  // string | 
+            var preOrderConfig = new PreOrderConfig(); // PreOrderConfig | 
 
             try
             {
-                // UPDATE pre order config for a store, by type
                 RestApiArrayResultRestApiDefaultResponse result = apiInstance.UpdatePreOrderConfig(storeId, deliveryType, preOrderConfig);
                 Debug.WriteLine(result);
             }
@@ -1842,9 +2334,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **deliveryType** | **string**| \&quot;delivery\&quot; or \&quot;pickup\&quot; | 
- **preOrderConfig** | [**PreOrderConfig**](PreOrderConfig.md)| Update pre order config values | 
+ **storeId** | **int?**|  | 
+ **deliveryType** | **string**|  | 
+ **preOrderConfig** | [**PreOrderConfig**](PreOrderConfig.md)|  | 
 
 ### Return type
 
@@ -1865,15 +2357,15 @@ Name | Type | Description  | Notes
 # **UpdateStore**
 > RestApiResultStore UpdateStore (int? storeId, StoreBase store)
 
-Update store by identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1885,12 +2377,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store Group identifier
-            var store = new StoreBase(); // StoreBase | Store
+            var storeId = 56;  // int? | 
+            var store = new StoreBase(); // StoreBase | 
 
             try
             {
-                // Update store by identifier
                 RestApiResultStore result = apiInstance.UpdateStore(storeId, store);
                 Debug.WriteLine(result);
             }
@@ -1907,8 +2398,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Group identifier | 
- **store** | [**StoreBase**](StoreBase.md)| Store | 
+ **storeId** | **int?**|  | 
+ **store** | [**StoreBase**](StoreBase.md)|  | 
 
 ### Return type
 
@@ -1929,15 +2420,15 @@ Name | Type | Description  | Notes
 # **UpdateStoreAddress**
 > RestApiResultStoreAddress UpdateStoreAddress (int? storeId, StoreAddressBase storeAddress)
 
-Update store address
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -1949,12 +2440,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var storeAddress = new StoreAddressBase(); // StoreAddressBase | Store address
+            var storeId = 56;  // int? | 
+            var storeAddress = new StoreAddressBase(); // StoreAddressBase | 
 
             try
             {
-                // Update store address
                 RestApiResultStoreAddress result = apiInstance.UpdateStoreAddress(storeId, storeAddress);
                 Debug.WriteLine(result);
             }
@@ -1971,8 +2461,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **storeAddress** | [**StoreAddressBase**](StoreAddressBase.md)| Store address | 
+ **storeId** | **int?**|  | 
+ **storeAddress** | [**StoreAddressBase**](StoreAddressBase.md)|  | 
 
 ### Return type
 
@@ -1993,15 +2483,15 @@ Name | Type | Description  | Notes
 # **UpdateStoreAddressCoordinates**
 > RestApiResultCoordinates UpdateStoreAddressCoordinates (int? storeId, Coordinates coordinates, string appNameId = null)
 
-Update store address coordinates
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -2013,13 +2503,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var coordinates = new Coordinates(); // Coordinates | Store address coordinates
-            var appNameId = appNameId_example;  // string | App Name Id(Not used, still here for compatability reasons) (optional) 
+            var storeId = 56;  // int? | 
+            var coordinates = new Coordinates(); // Coordinates | 
+            var appNameId = appNameId_example;  // string |  (optional) 
 
             try
             {
-                // Update store address coordinates
                 RestApiResultCoordinates result = apiInstance.UpdateStoreAddressCoordinates(storeId, coordinates, appNameId);
                 Debug.WriteLine(result);
             }
@@ -2036,9 +2525,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **coordinates** | [**Coordinates**](Coordinates.md)| Store address coordinates | 
- **appNameId** | **string**| App Name Id(Not used, still here for compatability reasons) | [optional] 
+ **storeId** | **int?**|  | 
+ **coordinates** | [**Coordinates**](Coordinates.md)|  | 
+ **appNameId** | **string**|  | [optional] 
 
 ### Return type
 
@@ -2059,15 +2548,15 @@ Name | Type | Description  | Notes
 # **UpdateStoreAddressForm**
 > Object UpdateStoreAddressForm (int? storeId, StoreAddressForm address)
 
-Update store address
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -2079,12 +2568,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StoresApi();
-            var storeId = 56;  // int? | Store identifier
-            var address = new StoreAddressForm(); // StoreAddressForm | Store address
+            var storeId = 56;  // int? | 
+            var address = new StoreAddressForm(); // StoreAddressForm | 
 
             try
             {
-                // Update store address
                 Object result = apiInstance.UpdateStoreAddressForm(storeId, address);
                 Debug.WriteLine(result);
             }
@@ -2101,8 +2589,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store identifier | 
- **address** | [**StoreAddressForm**](StoreAddressForm.md)| Store address | 
+ **storeId** | **int?**|  | 
+ **address** | [**StoreAddressForm**](StoreAddressForm.md)|  | 
 
 ### Return type
 
diff --git a/docs/Stream.md b/docs/Stream.md
new file mode 100644
index 00000000..cb34ebdb
--- /dev/null
+++ b/docs/Stream.md
@@ -0,0 +1,16 @@
+# Flipdish.Model.Stream
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**CanRead** | **bool?** |  | [optional] 
+**CanSeek** | **bool?** |  | [optional] 
+**CanTimeout** | **bool?** |  | [optional] 
+**CanWrite** | **bool?** |  | [optional] 
+**Length** | **long?** |  | [optional] 
+**Position** | **long?** |  | [optional] 
+**ReadTimeout** | **int?** |  | [optional] 
+**WriteTimeout** | **int?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/StripeAccountLinkRequest.md b/docs/StripeAccountLinkRequest.md
index 379a7a81..56e3a4dc 100644
--- a/docs/StripeAccountLinkRequest.md
+++ b/docs/StripeAccountLinkRequest.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StripeAccountLinkRequest
+# Flipdish.Model.StripeAccountLinkRequest
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StripeConnectedAccount.md b/docs/StripeConnectedAccount.md
index 744c16a7..40c5e756 100644
--- a/docs/StripeConnectedAccount.md
+++ b/docs/StripeConnectedAccount.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StripeConnectedAccount
+# Flipdish.Model.StripeConnectedAccount
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,6 +9,8 @@ Name | Type | Description | Notes
 **CardPaymentsStatus** | **string** | Card payments capability status (Inactive, Pending, Active, Unrequested) | [optional] 
 **TransfersStatus** | **string** | Transfers capability status (Inactive, Pending, Active, Unrequested) | [optional] 
 **AccountStatus** | **string** | Current status of the account | [optional] 
+**PayoutsEnabled** | **bool?** | Payouts Enabled status | [optional] 
+**PaymentsEnabled** | **bool?** | Payments Enabled status | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StripeConnectedAccountInfo.md b/docs/StripeConnectedAccountInfo.md
index 5c1eac71..d58e6c21 100644
--- a/docs/StripeConnectedAccountInfo.md
+++ b/docs/StripeConnectedAccountInfo.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StripeConnectedAccountInfo
+# Flipdish.Model.StripeConnectedAccountInfo
 ## Properties
 
 Name | Type | Description | Notes
@@ -7,6 +7,10 @@ Name | Type | Description | Notes
 **StripeId** | **string** | Stripe connected account id | [optional] 
 **CardPaymentStatus** | **string** | Current status of the Card Payment capability of the account | [optional] 
 **PayoutScheduleInterval** | **string** | Payouts Schedule Interval | [optional] 
+**PayoutsEnabled** | **bool?** | Payouts Enabled status | [optional] 
+**PayoutsPaused** | **bool?** | Flag indicating if payouts are paused | [optional] 
+**PaymentsEnabled** | **bool?** | Flag indicating if payments are enabled | [optional] 
+**DisabledReason** | **string** | If the Stripe connected account is disabled, this is Stripe&#39;s raw  requirements.disabled_reason describing why, as last recorded from a Stripe  connected-account webhook. Known values are requirements.fields_needed,  requirements.past_due, requirements.pending_verification,  rejected.fraud, rejected.terms_of_service, rejected.listed,  rejected.other and platform_paused, but Stripe can introduce new ones, so  the value is passed through unmapped (the same way  CapabilityRequirementsInfo.DisabledReason is). null when the account is  not disabled. Note that {Flipdish.PublicModels.V1.BankAccount.StripeConnectedAccountInfo.AccountStatus} is a deliberately lossy mapping of  this value and the two can legitimately disagree - do not derive one from the other. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/StripeCustomConnectAdminApi.md b/docs/StripeCustomConnectAdminApi.md
deleted file mode 100644
index dba76b86..00000000
--- a/docs/StripeCustomConnectAdminApi.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# IO.Swagger.Api.StripeCustomConnectAdminApi
-
-All URIs are relative to *https://api.flipdish.co*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**InitializeBankAccountConnectedAccount**](StripeCustomConnectAdminApi.md#initializebankaccountconnectedaccount) | **POST** /api/v1.0/customconnect/initialize-bank-account | Create a new Bank Account and Stripe connected account
-
-
-<a name="initializebankaccountconnectedaccount"></a>
-# **InitializeBankAccountConnectedAccount**
-> RestApiResultBankAccountDetail InitializeBankAccountConnectedAccount (List<int?> accounts)
-
-Create a new Bank Account and Stripe connected account
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
-
-namespace Example
-{
-    public class InitializeBankAccountConnectedAccountExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new StripeCustomConnectAdminApi();
-            var accounts = ;  // List<int?> | Accounts to be initialized in stripe
-
-            try
-            {
-                // Create a new Bank Account and Stripe connected account
-                RestApiResultBankAccountDetail result = apiInstance.InitializeBankAccountConnectedAccount(accounts);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling StripeCustomConnectAdminApi.InitializeBankAccountConnectedAccount: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **accounts** | **List&lt;int?&gt;**| Accounts to be initialized in stripe | 
-
-### Return type
-
-[**RestApiResultBankAccountDetail**](RestApiResultBankAccountDetail.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
diff --git a/docs/StripeCustomConnectApi.md b/docs/StripeCustomConnectApi.md
index a398487a..fe9f44fb 100644
--- a/docs/StripeCustomConnectApi.md
+++ b/docs/StripeCustomConnectApi.md
@@ -1,32 +1,32 @@
-# IO.Swagger.Api.StripeCustomConnectApi
+# Flipdish.Api.StripeCustomConnectApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateBankAccountAndConnectedAccount**](StripeCustomConnectApi.md#createbankaccountandconnectedaccount) | **POST** /api/v1.0/{appId}/customconnect/bank-account | Create a new Bank Account and Stripe connected account
-[**CreateStripeConnectedAccount**](StripeCustomConnectApi.md#createstripeconnectedaccount) | **POST** /api/v1.0/{appId}/customconnect/{bankAccountId}/create-update-account | Create or update a Stripe connected account associated with the bank account of bankAccountId
-[**CreateStripeConnectedAccountLink**](StripeCustomConnectApi.md#createstripeconnectedaccountlink) | **POST** /api/v1.0/{appId}/customconnect/{stripeConnectedAccountId}/create-account-link | Gets a single-use Stripe URL for the given account
-[**GetVerificationStatus**](StripeCustomConnectApi.md#getverificationstatus) | **GET** /api/v1.0/{appId}/customconnect/verification-status | Gets the current verification status of the given connected account
-[**SetBankAccountBusinessType**](StripeCustomConnectApi.md#setbankaccountbusinesstype) | **POST** /api/v1.0/{appId}/customconnect/bank-account/{bankAccountId}/businesstype | Update bank account&#39;s BusinessType and create a Stripe Connected Account
+[**CreateBankAccountAndConnectedAccount**](StripeCustomConnectApi.md#createbankaccountandconnectedaccount) | **POST** /api/v1.0/{appId}/customconnect/bank-account | 
+[**CreateStripeConnectedAccount**](StripeCustomConnectApi.md#createstripeconnectedaccount) | **POST** /api/v1.0/{appId}/customconnect/{bankAccountId}/create-update-account | 
+[**CreateStripeConnectedAccountLink**](StripeCustomConnectApi.md#createstripeconnectedaccountlink) | **POST** /api/v1.0/{appId}/customconnect/{stripeConnectedAccountId}/create-account-link | 
+[**GetCustomConnect**](StripeCustomConnectApi.md#getcustomconnect) | **GET** /api/v1.0/{appId}/customconnect/{storeId} | 
+[**SetBankAccountBusinessType**](StripeCustomConnectApi.md#setbankaccountbusinesstype) | **POST** /api/v1.0/{appId}/customconnect/bank-account/{bankAccountId}/businesstype | 
 [**StripeCustomConnectRefresh**](StripeCustomConnectApi.md#stripecustomconnectrefresh) | **GET** /api/v1.0/{appId}/customconnect/refresh-link | 
-[**UpdateBankAccountDetails**](StripeCustomConnectApi.md#updatebankaccountdetails) | **POST** /api/v1.0/{appId}/customconnect/{bankAccountId}/update-bank-account-details | Update bank account details
-[**UpdatePayoutSchedule**](StripeCustomConnectApi.md#updatepayoutschedule) | **POST** /api/v1.0/{appId}/customconnect/update-payout-schedule/{stripeConnectedAccountId}/{interval} | Update Stripe Connection Account&#39;s payout schedule
+[**UpdateBankAccountDetails**](StripeCustomConnectApi.md#updatebankaccountdetails) | **POST** /api/v1.0/{appId}/customconnect/{bankAccountId}/update-bank-account-details | 
+[**UpdatePayoutSchedule**](StripeCustomConnectApi.md#updatepayoutschedule) | **POST** /api/v1.0/{appId}/customconnect/update-payout-schedule/{stripeConnectedAccountId}/{interval} | 
 
 
 <a name="createbankaccountandconnectedaccount"></a>
 # **CreateBankAccountAndConnectedAccount**
 > RestApiResultBankAccountDetail CreateBankAccountAndConnectedAccount (string appId, BankAccountCreate account)
 
-Create a new Bank Account and Stripe connected account
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -38,12 +38,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StripeCustomConnectApi();
-            var appId = appId_example;  // string | App Name
-            var account = new BankAccountCreate(); // BankAccountCreate | Account to be created
+            var appId = appId_example;  // string | 
+            var account = new BankAccountCreate(); // BankAccountCreate | 
 
             try
             {
-                // Create a new Bank Account and Stripe connected account
                 RestApiResultBankAccountDetail result = apiInstance.CreateBankAccountAndConnectedAccount(appId, account);
                 Debug.WriteLine(result);
             }
@@ -60,8 +59,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
- **account** | [**BankAccountCreate**](BankAccountCreate.md)| Account to be created | 
+ **appId** | **string**|  | 
+ **account** | [**BankAccountCreate**](BankAccountCreate.md)|  | 
 
 ### Return type
 
@@ -82,15 +81,15 @@ Name | Type | Description  | Notes
 # **CreateStripeConnectedAccount**
 > RestApiResultStripeConnectedAccount CreateStripeConnectedAccount (string appId, int? bankAccountId)
 
-Create or update a Stripe connected account associated with the bank account of bankAccountId
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -102,12 +101,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StripeCustomConnectApi();
-            var appId = appId_example;  // string | App Name Id
-            var bankAccountId = 56;  // int? | Bank Account Id
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
 
             try
             {
-                // Create or update a Stripe connected account associated with the bank account of bankAccountId
                 RestApiResultStripeConnectedAccount result = apiInstance.CreateStripeConnectedAccount(appId, bankAccountId);
                 Debug.WriteLine(result);
             }
@@ -124,8 +122,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **bankAccountId** | **int?**| Bank Account Id | 
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
 
 ### Return type
 
@@ -146,15 +144,15 @@ Name | Type | Description  | Notes
 # **CreateStripeConnectedAccountLink**
 > RestApiResultStripeConnectedAccount CreateStripeConnectedAccountLink (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest)
 
-Gets a single-use Stripe URL for the given account
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -166,13 +164,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StripeCustomConnectApi();
-            var appId = appId_example;  // string | App Name
-            var stripeConnectedAccountId = stripeConnectedAccountId_example;  // string | Stripe Connected Account Id
+            var appId = appId_example;  // string | 
+            var stripeConnectedAccountId = stripeConnectedAccountId_example;  // string | 
             var stripeAccountLinkRequest = new StripeAccountLinkRequest(); // StripeAccountLinkRequest | 
 
             try
             {
-                // Gets a single-use Stripe URL for the given account
                 RestApiResultStripeConnectedAccount result = apiInstance.CreateStripeConnectedAccountLink(appId, stripeConnectedAccountId, stripeAccountLinkRequest);
                 Debug.WriteLine(result);
             }
@@ -189,8 +186,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
- **stripeConnectedAccountId** | **string**| Stripe Connected Account Id | 
+ **appId** | **string**|  | 
+ **stripeConnectedAccountId** | **string**|  | 
  **stripeAccountLinkRequest** | [**StripeAccountLinkRequest**](StripeAccountLinkRequest.md)|  | 
 
 ### Return type
@@ -208,23 +205,23 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="getverificationstatus"></a>
-# **GetVerificationStatus**
-> RestApiResultStripeConnectedAccount GetVerificationStatus (string appId, string stripeConnectedAccountId)
+<a name="getcustomconnect"></a>
+# **GetCustomConnect**
+> RestApiArrayResultStripeCustomConnectedAccount GetCustomConnect (int? storeId, string appId)
+
 
-Gets the current verification status of the given connected account
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GetVerificationStatusExample
+    public class GetCustomConnectExample
     {
         public void main()
         {
@@ -232,18 +229,17 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StripeCustomConnectApi();
+            var storeId = 56;  // int? | 
             var appId = appId_example;  // string | 
-            var stripeConnectedAccountId = stripeConnectedAccountId_example;  // string | 
 
             try
             {
-                // Gets the current verification status of the given connected account
-                RestApiResultStripeConnectedAccount result = apiInstance.GetVerificationStatus(appId, stripeConnectedAccountId);
+                RestApiArrayResultStripeCustomConnectedAccount result = apiInstance.GetCustomConnect(storeId, appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling StripeCustomConnectApi.GetVerificationStatus: " + e.Message );
+                Debug.Print("Exception when calling StripeCustomConnectApi.GetCustomConnect: " + e.Message );
             }
         }
     }
@@ -254,12 +250,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **storeId** | **int?**|  | 
  **appId** | **string**|  | 
- **stripeConnectedAccountId** | **string**|  | 
 
 ### Return type
 
-[**RestApiResultStripeConnectedAccount**](RestApiResultStripeConnectedAccount.md)
+[**RestApiArrayResultStripeCustomConnectedAccount**](RestApiArrayResultStripeCustomConnectedAccount.md)
 
 ### Authorization
 
@@ -276,15 +272,15 @@ Name | Type | Description  | Notes
 # **SetBankAccountBusinessType**
 > RestApiResultBankAccountDetail SetBankAccountBusinessType (string appId, int? bankAccountId, string businessType)
 
-Update bank account's BusinessType and create a Stripe Connected Account
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -296,13 +292,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StripeCustomConnectApi();
-            var appId = appId_example;  // string | App Name
-            var bankAccountId = 56;  // int? | Bank Account Id
-            var businessType = businessType_example;  // string | Bank Account business type
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var businessType = businessType_example;  // string | 
 
             try
             {
-                // Update bank account's BusinessType and create a Stripe Connected Account
                 RestApiResultBankAccountDetail result = apiInstance.SetBankAccountBusinessType(appId, bankAccountId, businessType);
                 Debug.WriteLine(result);
             }
@@ -319,9 +314,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name | 
- **bankAccountId** | **int?**| Bank Account Id | 
- **businessType** | **string**| Bank Account business type | 
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **businessType** | **string**|  | 
 
 ### Return type
 
@@ -348,9 +343,9 @@ Name | Type | Description  | Notes
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -405,15 +400,15 @@ Name | Type | Description  | Notes
 # **UpdateBankAccountDetails**
 > RestApiResultStripeConnectedAccount UpdateBankAccountDetails (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest)
 
-Update bank account details
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -425,13 +420,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StripeCustomConnectApi();
-            var appId = appId_example;  // string | App Name Id
-            var bankAccountId = 56;  // int? | Bank Account Id
-            var updateRequest = new BankAccountDetailsUpdateRequest(); // BankAccountDetailsUpdateRequest | fields to be updated
+            var appId = appId_example;  // string | 
+            var bankAccountId = 56;  // int? | 
+            var updateRequest = new BankAccountDetailsUpdateRequest(); // BankAccountDetailsUpdateRequest | 
 
             try
             {
-                // Update bank account details
                 RestApiResultStripeConnectedAccount result = apiInstance.UpdateBankAccountDetails(appId, bankAccountId, updateRequest);
                 Debug.WriteLine(result);
             }
@@ -448,9 +442,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **bankAccountId** | **int?**| Bank Account Id | 
- **updateRequest** | [**BankAccountDetailsUpdateRequest**](BankAccountDetailsUpdateRequest.md)| fields to be updated | 
+ **appId** | **string**|  | 
+ **bankAccountId** | **int?**|  | 
+ **updateRequest** | [**BankAccountDetailsUpdateRequest**](BankAccountDetailsUpdateRequest.md)|  | 
 
 ### Return type
 
@@ -471,15 +465,15 @@ Name | Type | Description  | Notes
 # **UpdatePayoutSchedule**
 > RestApiResultModelBase UpdatePayoutSchedule (string appId, string stripeConnectedAccountId, string interval)
 
-Update Stripe Connection Account's payout schedule
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -497,7 +491,6 @@ namespace Example
 
             try
             {
-                // Update Stripe Connection Account's payout schedule
                 RestApiResultModelBase result = apiInstance.UpdatePayoutSchedule(appId, stripeConnectedAccountId, interval);
                 Debug.WriteLine(result);
             }
diff --git a/docs/StripeCustomConnectedAccount.md b/docs/StripeCustomConnectedAccount.md
new file mode 100644
index 00000000..2661535f
--- /dev/null
+++ b/docs/StripeCustomConnectedAccount.md
@@ -0,0 +1,13 @@
+# Flipdish.Model.StripeCustomConnectedAccount
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StoreId** | **int?** | Physical Restaurant Id | [optional] 
+**StripeId** | **string** | Stripe&#39;s own connected account identifier | [optional] 
+**CardPaymentsStatus** | **string** | Card payments capability status (Inactive, Pending, Active, Unrequested) | [optional] 
+**TransfersStatus** | **string** | Transfers capability status (Inactive, Pending, Active, Unrequested) | [optional] 
+**AccountStatus** | **string** | Current status of the account | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/StripeTerminalConnectionToken.md b/docs/StripeTerminalConnectionToken.md
index 75f830f1..d9443045 100644
--- a/docs/StripeTerminalConnectionToken.md
+++ b/docs/StripeTerminalConnectionToken.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StripeTerminalConnectionToken
+# Flipdish.Model.StripeTerminalConnectionToken
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StripeTerminalLocation.md b/docs/StripeTerminalLocation.md
index 54c5d709..b53ccdd0 100644
--- a/docs/StripeTerminalLocation.md
+++ b/docs/StripeTerminalLocation.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StripeTerminalLocation
+# Flipdish.Model.StripeTerminalLocation
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StripeTerminalPrivateKey.md b/docs/StripeTerminalPrivateKey.md
deleted file mode 100644
index b5dceb34..00000000
--- a/docs/StripeTerminalPrivateKey.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# IO.Swagger.Model.StripeTerminalPrivateKey
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Location** | **string** | Registered location of the terminal | [optional] 
-**Secret** | **string** | Secret used to pass to stripe to attach terminal | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/StuartApi.md b/docs/StuartApi.md
index b03292de..5076606f 100644
--- a/docs/StuartApi.md
+++ b/docs/StuartApi.md
@@ -1,28 +1,28 @@
-# IO.Swagger.Api.StuartApi
+# Flipdish.Api.StuartApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**StuartCancelJob**](StuartApi.md#stuartcanceljob) | **DELETE** /api/v1.0/stuart/jobs/{jobId} | Cancel a stuart job
-[**StuartGetJob**](StuartApi.md#stuartgetjob) | **GET** /api/v1.0/stuart/jobs/{jobId} | Get start job details
-[**StuartGetStuartSettings**](StuartApi.md#stuartgetstuartsettings) | **GET** /api/v1.0/stuart/settings/{storeId} | Get stuart settings for a store
-[**StuartPostStuartSettings**](StuartApi.md#stuartpoststuartsettings) | **POST** /api/v1.0/stuart/settings/{storeId} | Set stuart settings for a store
+[**StuartCancelJob**](StuartApi.md#stuartcanceljob) | **DELETE** /api/v1.0/stuart/jobs/{jobId} | 
+[**StuartGetJob**](StuartApi.md#stuartgetjob) | **GET** /api/v1.0/stuart/jobs/{jobId} | 
+[**StuartGetStuartSettings**](StuartApi.md#stuartgetstuartsettings) | **GET** /api/v1.0/stuart/settings/{storeId} | 
+[**StuartPostStuartSettings**](StuartApi.md#stuartpoststuartsettings) | **POST** /api/v1.0/stuart/settings/{storeId} | 
 
 
 <a name="stuartcanceljob"></a>
 # **StuartCancelJob**
 > Object StuartCancelJob (int? jobId, int? storeId)
 
-Cancel a stuart job
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -34,12 +34,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StuartApi();
-            var jobId = 56;  // int? | Stuart job identifier
-            var storeId = 56;  // int? | Store identifier
+            var jobId = 56;  // int? | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Cancel a stuart job
                 Object result = apiInstance.StuartCancelJob(jobId, storeId);
                 Debug.WriteLine(result);
             }
@@ -56,8 +55,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **jobId** | **int?**| Stuart job identifier | 
- **storeId** | **int?**| Store identifier | 
+ **jobId** | **int?**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -78,15 +77,15 @@ Name | Type | Description  | Notes
 # **StuartGetJob**
 > RestApiResultJobResponse StuartGetJob (int? jobId, int? storeId)
 
-Get start job details
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -98,12 +97,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StuartApi();
-            var jobId = 56;  // int? | Stuart job identifier
-            var storeId = 56;  // int? | Store identifier
+            var jobId = 56;  // int? | 
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Get start job details
                 RestApiResultJobResponse result = apiInstance.StuartGetJob(jobId, storeId);
                 Debug.WriteLine(result);
             }
@@ -120,8 +118,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **jobId** | **int?**| Stuart job identifier | 
- **storeId** | **int?**| Store identifier | 
+ **jobId** | **int?**|  | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -142,15 +140,15 @@ Name | Type | Description  | Notes
 # **StuartGetStuartSettings**
 > RestApiResultStuartSettings StuartGetStuartSettings (int? storeId)
 
-Get stuart settings for a store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -162,11 +160,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StuartApi();
-            var storeId = 56;  // int? | Store Identifier
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Get stuart settings for a store
                 RestApiResultStuartSettings result = apiInstance.StuartGetStuartSettings(storeId);
                 Debug.WriteLine(result);
             }
@@ -183,7 +180,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Identifier | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -204,15 +201,15 @@ Name | Type | Description  | Notes
 # **StuartPostStuartSettings**
 > Object StuartPostStuartSettings (int? storeId, StuartSettings stuartSettings)
 
-Set stuart settings for a store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -224,12 +221,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new StuartApi();
-            var storeId = 56;  // int? | Store Identifier
-            var stuartSettings = new StuartSettings(); // StuartSettings | Stuart settings model
+            var storeId = 56;  // int? | 
+            var stuartSettings = new StuartSettings(); // StuartSettings | 
 
             try
             {
-                // Set stuart settings for a store
                 Object result = apiInstance.StuartPostStuartSettings(storeId, stuartSettings);
                 Debug.WriteLine(result);
             }
@@ -246,8 +242,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Identifier | 
- **stuartSettings** | [**StuartSettings**](StuartSettings.md)| Stuart settings model | 
+ **storeId** | **int?**|  | 
+ **stuartSettings** | [**StuartSettings**](StuartSettings.md)|  | 
 
 ### Return type
 
diff --git a/docs/StuartSettings.md b/docs/StuartSettings.md
index e31b906d..a54256cc 100644
--- a/docs/StuartSettings.md
+++ b/docs/StuartSettings.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StuartSettings
+# Flipdish.Model.StuartSettings
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/StuartSettingsTransportPrices.md b/docs/StuartSettingsTransportPrices.md
index 66fa7b0b..413741bb 100644
--- a/docs/StuartSettingsTransportPrices.md
+++ b/docs/StuartSettingsTransportPrices.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.StuartSettingsTransportPrices
+# Flipdish.Model.StuartSettingsTransportPrices
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/Subscription.md b/docs/Subscription.md
index a17a31c6..ee62dc10 100644
--- a/docs/Subscription.md
+++ b/docs/Subscription.md
@@ -3,17 +3,20 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SubscriptionId** | **int?** | The subscription identifier | [optional] 
-**StartDate** | **DateTime?** | Starting date of the subscription | [optional] 
-**Status** | **string** | Status of the subscription (TrialPeriod, Ongoing, Unpaid, Canceled) | [optional] 
-**UserId** | **int?** | Flipdish user identifier | [optional] 
-**SubscriptionPlan** | [**SubscriptionPlan**](SubscriptionPlan.md) | Subscription Plan | [optional] 
-**Card** | [**Card**](Card.md) | Card | [optional] 
-**AppId** | **string** | App name Id of the subscription | 
-**VatNumber** | **string** | Last 4 digits of the card | [optional] 
-**VatCountryCode** | **string** | Expiry date of the card | 
-**Quantity** | **int?** | Number of physical restaurants | [optional] 
-**SubscriptionPlanId** | **int?** | Subscription plan identifier | [optional] 
+**Products** | [**List&lt;SubscriptionProduct&gt;**](SubscriptionProduct.md) | Products | 
+**NextInvoiceAmount** | **double?** | Next invoice amount | [optional] 
+**NextInvoiceBillingDate** | **DateTime?** | Next invoice billing date | [optional] 
+**UpcomingInvoiceItems** | [**List&lt;InvoiceItem&gt;**](InvoiceItem.md) | Upcoming invoice items | [optional] 
+**UpcomingInvoiceDiscounts** | [**List&lt;InvoiceDiscount&gt;**](InvoiceDiscount.md) | Upcoming invoice discounts | [optional] 
+**UpcomingInvoice** | [**UpcomingInvoice**](UpcomingInvoice.md) | Upcoming invoice | [optional] 
+**SubscriptionId** | **string** | The subscription identifier | 
+**Name** | **string** | Name | 
+**Status** | **string** | Status | 
+**Currency** | **string** | Currency | 
+**User** | **string** | User | 
+**DefaultPaymentDescription** | **string** | Default payment description | [optional] 
+**CancellationRequestDate** | **DateTime?** | Cancellation Date | [optional] 
+**CancellationDate** | **DateTime?** | Cancel Date | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/SubscriptionBase.md b/docs/SubscriptionBase.md
deleted file mode 100644
index 7862b1f6..00000000
--- a/docs/SubscriptionBase.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Flipdish.Model.SubscriptionBase
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Quantity** | **int?** | Number of physical restaurants | [optional] 
-**SubscriptionPlanId** | **int?** | Subscription plan identifier | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/SubscriptionInvoice.md b/docs/SubscriptionInvoice.md
new file mode 100644
index 00000000..f5f29327
--- /dev/null
+++ b/docs/SubscriptionInvoice.md
@@ -0,0 +1,19 @@
+# Flipdish.Model.SubscriptionInvoice
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**InvoiceId** | **string** | The invoice identifier | 
+**Number** | **string** | Invoice number | 
+**Total** | **double?** | Total | [optional] 
+**Currency** | **string** | Currency | 
+**Status** | **string** | Status | 
+**SubscriptionId** | **string** | The subscription identifier | [optional] 
+**PaidAt** | **DateTime?** | Paid At | [optional] 
+**FinalisedAt** | **DateTime?** | Finalised At | [optional] 
+**PdfLink** | **string** | Pdf Link | 
+**HostedUrl** | **string** | Hosted Url | 
+**Overdue** | **bool?** | Overdue | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SubscriptionPlan.md b/docs/SubscriptionPlan.md
deleted file mode 100644
index 74f0943a..00000000
--- a/docs/SubscriptionPlan.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Flipdish.Model.SubscriptionPlan
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**SubscriptionPlanId** | **int?** | Subscription plan identifier | [optional] 
-**Name** | **string** | Name of the plan | [optional] 
-**Currency** | **string** | ISO Currency | [optional] 
-**Price** | **double?** | Price for single unit | [optional] 
-**Interval** | **string** | Interval billing for the subscription | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/SubscriptionPlansResponse.md b/docs/SubscriptionPlansResponse.md
deleted file mode 100644
index 11f62e3e..00000000
--- a/docs/SubscriptionPlansResponse.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.SubscriptionPlansResponse
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**PublishableApiKey** | **string** | Stripe publishable api key | [optional] 
-**Email** | **string** | User email | [optional] 
-**SubscriptionPlans** | [**List&lt;SubscriptionPlan&gt;**](SubscriptionPlan.md) | Available plans | [optional] 
-**AppIds** | **List&lt;string&gt;** | App ids (string name) to which the user belongs | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/SubscriptionProduct.md b/docs/SubscriptionProduct.md
new file mode 100644
index 00000000..6b341a70
--- /dev/null
+++ b/docs/SubscriptionProduct.md
@@ -0,0 +1,15 @@
+# Flipdish.Model.SubscriptionProduct
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ProductId** | **string** | Product Identifier | 
+**Name** | **string** | Name | 
+**Quantity** | **long?** | Quantity | 
+**PricePerUnit** | **double?** | Price Per Unit | [optional] 
+**PriceTotal** | **double?** | Price Total | [optional] 
+**PaymentFrequency** | **string** | Payment Frequency | 
+**Stores** | [**List&lt;SubscriptionStore&gt;**](SubscriptionStore.md) | Stores | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SubscriptionStore.md b/docs/SubscriptionStore.md
new file mode 100644
index 00000000..c965defb
--- /dev/null
+++ b/docs/SubscriptionStore.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.SubscriptionStore
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int?** | Store Id | 
+**Name** | **string** | Name | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SubscriptionSummary.md b/docs/SubscriptionSummary.md
new file mode 100644
index 00000000..ef6cf63c
--- /dev/null
+++ b/docs/SubscriptionSummary.md
@@ -0,0 +1,18 @@
+# Flipdish.Model.SubscriptionSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**NextInvoiceAmount** | **double?** | Next invoice amount | [optional] 
+**NextInvoiceBillingDate** | **DateTime?** | Next invoice billing date | [optional] 
+**SubscriptionId** | **string** | The subscription identifier | 
+**Name** | **string** | Name | 
+**Status** | **string** | Status | 
+**Currency** | **string** | Currency | 
+**User** | **string** | User | 
+**DefaultPaymentDescription** | **string** | Default payment description | [optional] 
+**CancellationRequestDate** | **DateTime?** | Cancellation Date | [optional] 
+**CancellationDate** | **DateTime?** | Cancel Date | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/SubscriptionWithToken.md b/docs/SubscriptionWithToken.md
deleted file mode 100644
index ce5da4f1..00000000
--- a/docs/SubscriptionWithToken.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Flipdish.Model.SubscriptionWithToken
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Token** | **string** | Token | 
-**Quantity** | **int?** | Number of physical restaurants | 
-**SubscriptionPlanId** | **int?** | Subscription plan identifier | 
-**AppId** | **string** | App name Id of the subscription | 
-**VatNumber** | **string** | Last 4 digits of the card | [optional] 
-**VatCountryCode** | **string** | Expiry date of the card | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/SubscriptionsApi.md b/docs/SubscriptionsApi.md
index df64c999..10f7c93d 100644
--- a/docs/SubscriptionsApi.md
+++ b/docs/SubscriptionsApi.md
@@ -4,84 +4,16 @@ All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**SubscriptionsCancelSubscription**](SubscriptionsApi.md#subscriptionscancelsubscription) | **DELETE** /api/v1.0/subscriptions/{subscriptionId} | Cancel the subscription
-[**SubscriptionsGetCard**](SubscriptionsApi.md#subscriptionsgetcard) | **GET** /api/v1.0/subscriptions/{subscriptionId}/card | Get the card linked to the subscription
-[**SubscriptionsGetPlansByCurrency**](SubscriptionsApi.md#subscriptionsgetplansbycurrency) | **GET** /api/v1.0/subscriptions/plans | Get avaialble plans for currency&#39;s user
-[**SubscriptionsGetSubscription**](SubscriptionsApi.md#subscriptionsgetsubscription) | **GET** /api/v1.0/subscriptions/{subscriptionId} | Get the subscription including the payment history
-[**SubscriptionsGetUserSubscriptionByAppId**](SubscriptionsApi.md#subscriptionsgetusersubscriptionbyappid) | **GET** /api/v1.0/subscriptions | Get subscription by appId
-[**SubscriptionsReplaceOldCardWithNewCard**](SubscriptionsApi.md#subscriptionsreplaceoldcardwithnewcard) | **POST** /api/v1.0/subscriptions/{subscriptionId}/card/new | Add a new card and replace the old one
-[**SubscriptionsSubscribe**](SubscriptionsApi.md#subscriptionssubscribe) | **POST** /api/v1.0/subscriptions | Create a new subscription
-[**SubscriptionsUpdateCardExpiringDate**](SubscriptionsApi.md#subscriptionsupdatecardexpiringdate) | **POST** /api/v1.0/subscriptions/{subscriptionId}/card | Update card expiring date
-[**SubscriptionsUpdateSubscription**](SubscriptionsApi.md#subscriptionsupdatesubscription) | **POST** /api/v1.0/subscriptions/{subscriptionId} | Update the subscription
+[**GetSubscriptionById**](SubscriptionsApi.md#getsubscriptionbyid) | **GET** /api/v1.0/{appId}/subscriptions/{subscriptionId} | 
+[**GetSubscriptionsForApp**](SubscriptionsApi.md#getsubscriptionsforapp) | **GET** /api/v1.0/{appId}/subscriptions | 
+[**HasCustomerGotPaymentMethodOnFile**](SubscriptionsApi.md#hascustomergotpaymentmethodonfile) | **GET** /api/v1.0/{appId}/subscriptions/hasPaymentMethod | 
 
 
-<a name="subscriptionscancelsubscription"></a>
-# **SubscriptionsCancelSubscription**
-> Object SubscriptionsCancelSubscription (int? subscriptionId)
+<a name="getsubscriptionbyid"></a>
+# **GetSubscriptionById**
+> RestApiResultSubscription GetSubscriptionById (string appId, string subscriptionId)
 
-Cancel the subscription
 
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class SubscriptionsCancelSubscriptionExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new SubscriptionsApi();
-            var subscriptionId = 56;  // int? | Subscription identifier
-
-            try
-            {
-                // Cancel the subscription
-                Object result = apiInstance.SubscriptionsCancelSubscription(subscriptionId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsCancelSubscription: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **subscriptionId** | **int?**| Subscription identifier | 
-
-### Return type
-
-**Object**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="subscriptionsgetcard"></a>
-# **SubscriptionsGetCard**
-> RestApiResultCard SubscriptionsGetCard (int? subscriptionId)
-
-Get the card linked to the subscription
 
 ### Example
 ```csharp
@@ -93,7 +25,7 @@ using Flipdish.Model;
 
 namespace Example
 {
-    public class SubscriptionsGetCardExample
+    public class GetSubscriptionByIdExample
     {
         public void main()
         {
@@ -101,17 +33,17 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new SubscriptionsApi();
-            var subscriptionId = 56;  // int? | Subscription identifier
+            var appId = appId_example;  // string | 
+            var subscriptionId = subscriptionId_example;  // string | 
 
             try
             {
-                // Get the card linked to the subscription
-                RestApiResultCard result = apiInstance.SubscriptionsGetCard(subscriptionId);
+                RestApiResultSubscription result = apiInstance.GetSubscriptionById(appId, subscriptionId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsGetCard: " + e.Message );
+                Debug.Print("Exception when calling SubscriptionsApi.GetSubscriptionById: " + e.Message );
             }
         }
     }
@@ -122,127 +54,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **subscriptionId** | **int?**| Subscription identifier | 
-
-### Return type
-
-[**RestApiResultCard**](RestApiResultCard.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="subscriptionsgetplansbycurrency"></a>
-# **SubscriptionsGetPlansByCurrency**
-> RestApiResultSubscriptionPlansResponse SubscriptionsGetPlansByCurrency ()
-
-Get avaialble plans for currency's user
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class SubscriptionsGetPlansByCurrencyExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new SubscriptionsApi();
-
-            try
-            {
-                // Get avaialble plans for currency's user
-                RestApiResultSubscriptionPlansResponse result = apiInstance.SubscriptionsGetPlansByCurrency();
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsGetPlansByCurrency: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**RestApiResultSubscriptionPlansResponse**](RestApiResultSubscriptionPlansResponse.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="subscriptionsgetsubscription"></a>
-# **SubscriptionsGetSubscription**
-> RestApiResultSubscription SubscriptionsGetSubscription (int? subscriptionId)
-
-Get the subscription including the payment history
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class SubscriptionsGetSubscriptionExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new SubscriptionsApi();
-            var subscriptionId = 56;  // int? | Subscription Identifier
-
-            try
-            {
-                // Get the subscription including the payment history
-                RestApiResultSubscription result = apiInstance.SubscriptionsGetSubscription(subscriptionId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsGetSubscription: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **subscriptionId** | **int?**| Subscription Identifier | 
+ **appId** | **string**|  | 
+ **subscriptionId** | **string**|  | 
 
 ### Return type
 
@@ -259,137 +72,11 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="subscriptionsgetusersubscriptionbyappid"></a>
-# **SubscriptionsGetUserSubscriptionByAppId**
-> RestApiResultSubscription SubscriptionsGetUserSubscriptionByAppId (string appId)
+<a name="getsubscriptionsforapp"></a>
+# **GetSubscriptionsForApp**
+> RestApiArrayResultSubscriptionSummary GetSubscriptionsForApp (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null)
 
-Get subscription by appId
 
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class SubscriptionsGetUserSubscriptionByAppIdExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new SubscriptionsApi();
-            var appId = appId_example;  // string | The string app identifier
-
-            try
-            {
-                // Get subscription by appId
-                RestApiResultSubscription result = apiInstance.SubscriptionsGetUserSubscriptionByAppId(appId);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsGetUserSubscriptionByAppId: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **appId** | **string**| The string app identifier | 
-
-### Return type
-
-[**RestApiResultSubscription**](RestApiResultSubscription.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="subscriptionsreplaceoldcardwithnewcard"></a>
-# **SubscriptionsReplaceOldCardWithNewCard**
-> Object SubscriptionsReplaceOldCardWithNewCard (int? subscriptionId, CardWithToken card)
-
-Add a new card and replace the old one
-
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class SubscriptionsReplaceOldCardWithNewCardExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new SubscriptionsApi();
-            var subscriptionId = 56;  // int? | Subscription identifier
-            var card = new CardWithToken(); // CardWithToken | Token Id
-
-            try
-            {
-                // Add a new card and replace the old one
-                Object result = apiInstance.SubscriptionsReplaceOldCardWithNewCard(subscriptionId, card);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsReplaceOldCardWithNewCard: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **subscriptionId** | **int?**| Subscription identifier | 
- **card** | [**CardWithToken**](CardWithToken.md)| Token Id | 
-
-### Return type
-
-**Object**
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="subscriptionssubscribe"></a>
-# **SubscriptionsSubscribe**
-> Object SubscriptionsSubscribe (SubscriptionWithToken subscription)
-
-Create a new subscription
 
 ### Example
 ```csharp
@@ -401,7 +88,7 @@ using Flipdish.Model;
 
 namespace Example
 {
-    public class SubscriptionsSubscribeExample
+    public class GetSubscriptionsForAppExample
     {
         public void main()
         {
@@ -409,17 +96,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new SubscriptionsApi();
-            var subscription = new SubscriptionWithToken(); // SubscriptionWithToken | Data necessary to create a new subscription
+            var appId = appId_example;  // string | 
+            var excludeNotOwnedSubscriptions = true;  // bool? |  (optional) 
+            var storeId = new List<int?>(); // List<int?> |  (optional) 
+            var excludeCancelledSubscriptions = true;  // bool? |  (optional) 
 
             try
             {
-                // Create a new subscription
-                Object result = apiInstance.SubscriptionsSubscribe(subscription);
+                RestApiArrayResultSubscriptionSummary result = apiInstance.GetSubscriptionsForApp(appId, excludeNotOwnedSubscriptions, storeId, excludeCancelledSubscriptions);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsSubscribe: " + e.Message );
+                Debug.Print("Exception when calling SubscriptionsApi.GetSubscriptionsForApp: " + e.Message );
             }
         }
     }
@@ -430,11 +119,14 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **subscription** | [**SubscriptionWithToken**](SubscriptionWithToken.md)| Data necessary to create a new subscription | 
+ **appId** | **string**|  | 
+ **excludeNotOwnedSubscriptions** | **bool?**|  | [optional] 
+ **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **excludeCancelledSubscriptions** | **bool?**|  | [optional] 
 
 ### Return type
 
-**Object**
+[**RestApiArrayResultSubscriptionSummary**](RestApiArrayResultSubscriptionSummary.md)
 
 ### Authorization
 
@@ -442,80 +134,16 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Content-Type**: Not defined
  - **Accept**: application/json, text/json, application/xml, text/xml
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="subscriptionsupdatecardexpiringdate"></a>
-# **SubscriptionsUpdateCardExpiringDate**
-> RestApiResultCard SubscriptionsUpdateCardExpiringDate (int? subscriptionId, CardBase card)
+<a name="hascustomergotpaymentmethodonfile"></a>
+# **HasCustomerGotPaymentMethodOnFile**
+> RestApiResultHasPaymentMethodResponse HasCustomerGotPaymentMethodOnFile (string appId, string email = null)
 
-Update card expiring date
 
-### Example
-```csharp
-using System;
-using System.Diagnostics;
-using Flipdish.Api;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Example
-{
-    public class SubscriptionsUpdateCardExpiringDateExample
-    {
-        public void main()
-        {
-            // Configure OAuth2 access token for authorization: oauth2
-            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
-
-            var apiInstance = new SubscriptionsApi();
-            var subscriptionId = 56;  // int? | Subscription identifier
-            var card = new CardBase(); // CardBase | Data to update card expiring date
-
-            try
-            {
-                // Update card expiring date
-                RestApiResultCard result = apiInstance.SubscriptionsUpdateCardExpiringDate(subscriptionId, card);
-                Debug.WriteLine(result);
-            }
-            catch (Exception e)
-            {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsUpdateCardExpiringDate: " + e.Message );
-            }
-        }
-    }
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **subscriptionId** | **int?**| Subscription identifier | 
- **card** | [**CardBase**](CardBase.md)| Data to update card expiring date | 
-
-### Return type
-
-[**RestApiResultCard**](RestApiResultCard.md)
-
-### Authorization
-
-[oauth2](../README.md#oauth2)
-
-### HTTP request headers
-
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
- - **Accept**: application/json, text/json, application/xml, text/xml
-
-[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
-
-<a name="subscriptionsupdatesubscription"></a>
-# **SubscriptionsUpdateSubscription**
-> Object SubscriptionsUpdateSubscription (int? subscriptionId, SubscriptionBase subscription)
-
-Update the subscription
 
 ### Example
 ```csharp
@@ -527,7 +155,7 @@ using Flipdish.Model;
 
 namespace Example
 {
-    public class SubscriptionsUpdateSubscriptionExample
+    public class HasCustomerGotPaymentMethodOnFileExample
     {
         public void main()
         {
@@ -535,18 +163,17 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new SubscriptionsApi();
-            var subscriptionId = 56;  // int? | Subscription identifier
-            var subscription = new SubscriptionBase(); // SubscriptionBase | Data to update the subscription
+            var appId = appId_example;  // string | 
+            var email = email_example;  // string |  (optional) 
 
             try
             {
-                // Update the subscription
-                Object result = apiInstance.SubscriptionsUpdateSubscription(subscriptionId, subscription);
+                RestApiResultHasPaymentMethodResponse result = apiInstance.HasCustomerGotPaymentMethodOnFile(appId, email);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling SubscriptionsApi.SubscriptionsUpdateSubscription: " + e.Message );
+                Debug.Print("Exception when calling SubscriptionsApi.HasCustomerGotPaymentMethodOnFile: " + e.Message );
             }
         }
     }
@@ -557,12 +184,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **subscriptionId** | **int?**| Subscription identifier | 
- **subscription** | [**SubscriptionBase**](SubscriptionBase.md)| Data to update the subscription | 
+ **appId** | **string**|  | 
+ **email** | **string**|  | [optional] 
 
 ### Return type
 
-**Object**
+[**RestApiResultHasPaymentMethodResponse**](RestApiResultHasPaymentMethodResponse.md)
 
 ### Authorization
 
@@ -570,7 +197,7 @@ Name | Type | Description  | Notes
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Content-Type**: Not defined
  - **Accept**: application/json, text/json, application/xml, text/xml
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
diff --git a/docs/SupportedCountry.md b/docs/SupportedCountry.md
index 2dd096b6..7cc18fd5 100644
--- a/docs/SupportedCountry.md
+++ b/docs/SupportedCountry.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.SupportedCountry
+# Flipdish.Model.SupportedCountry
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/TaxItem.md b/docs/TaxItem.md
new file mode 100644
index 00000000..6fc14f20
--- /dev/null
+++ b/docs/TaxItem.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.TaxItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** | The name of the tax item. | [optional] 
+**Rate** | **double?** | The tax rate applied to the item. | [optional] 
+**Amount** | **double?** | The amount of tax applied to the item. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/TaxRate.md b/docs/TaxRate.md
new file mode 100644
index 00000000..9e1de5a0
--- /dev/null
+++ b/docs/TaxRate.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.TaxRate
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+**Percentage** | **double?** |  | [optional] 
+**Total** | **double?** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/Teammate.md b/docs/Teammate.md
index 9d7b6f45..f8ca0516 100644
--- a/docs/Teammate.md
+++ b/docs/Teammate.md
@@ -1,9 +1,10 @@
-# IO.Swagger.Model.Teammate
+# Flipdish.Model.Teammate
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **TeammateId** | **string** | Unique indentifier | [optional] 
+**UserId** | **int?** | User ID of the teammate | [optional] 
 **Name** | **string** | Name | [optional] 
 **LastActivity** | **DateTime?** | Last activity | [optional] 
 **AppId** | **string** | Access level is for this App | [optional] 
@@ -12,6 +13,7 @@ Name | Type | Description | Notes
 **AppAccessLevel** | **string** | App access level | [optional] 
 **HasAccessToAllStores** | **bool?** | The user has access to all stores for the app (including new stores that added later) | [optional] 
 **StoreIds** | **List&lt;int?&gt;** | Store IDs the user has access to (if HasAccessToAllStores is false) | [optional] 
+**PropertyIds** | **List&lt;string&gt;** | Property Ids the user has access to (if HasAccessToAllStores is false) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TeammateBase.md b/docs/TeammateBase.md
index 3994a4c8..7fa11ef9 100644
--- a/docs/TeammateBase.md
+++ b/docs/TeammateBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.TeammateBase
+# Flipdish.Model.TeammateBase
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **AppAccessLevel** | **string** | App access level | [optional] 
 **HasAccessToAllStores** | **bool?** | The user has access to all stores for the app (including new stores that added later) | [optional] 
 **StoreIds** | **List&lt;int?&gt;** | Store IDs the user has access to (if HasAccessToAllStores is false) | [optional] 
+**PropertyIds** | **List&lt;string&gt;** | Property Ids the user has access to (if HasAccessToAllStores is false) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TeammateDeletedEvent.md b/docs/TeammateDeletedEvent.md
index a948dbbe..04f6e559 100644
--- a/docs/TeammateDeletedEvent.md
+++ b/docs/TeammateDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.TeammateDeletedEvent
+# Flipdish.Model.TeammateDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TeammateInviteAcceptedEvent.md b/docs/TeammateInviteAcceptedEvent.md
index 312d90a5..bde8241f 100644
--- a/docs/TeammateInviteAcceptedEvent.md
+++ b/docs/TeammateInviteAcceptedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.TeammateInviteAcceptedEvent
+# Flipdish.Model.TeammateInviteAcceptedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TeammateInviteSentEvent.md b/docs/TeammateInviteSentEvent.md
index 88dfba11..340771aa 100644
--- a/docs/TeammateInviteSentEvent.md
+++ b/docs/TeammateInviteSentEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.TeammateInviteSentEvent
+# Flipdish.Model.TeammateInviteSentEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TeammateUpdatedEvent.md b/docs/TeammateUpdatedEvent.md
index bea2c991..ba0c3b41 100644
--- a/docs/TeammateUpdatedEvent.md
+++ b/docs/TeammateUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.TeammateUpdatedEvent
+# Flipdish.Model.TeammateUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TeammatesApi.md b/docs/TeammatesApi.md
index 6c4eb483..9620d385 100644
--- a/docs/TeammatesApi.md
+++ b/docs/TeammatesApi.md
@@ -1,30 +1,35 @@
-# IO.Swagger.Api.TeammatesApi
+# Flipdish.Api.TeammatesApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateTeammate**](TeammatesApi.md#createteammate) | **POST** /api/v1.0/{appId}/teammates | Create teammate and send an invite.
-[**DeleteTeammate**](TeammatesApi.md#deleteteammate) | **DELETE** /api/v1.0/{appId}/teammates/{id} | Delete teammate
-[**GetTeammateByAppIdAndTeammateId**](TeammatesApi.md#getteammatebyappidandteammateid) | **GET** /api/v1.0/{appId}/teammates/{id} | Get a teammates by email address
-[**GetTeammatesByAppId**](TeammatesApi.md#getteammatesbyappid) | **GET** /api/v1.0/{appId}/teammates | Get all teammates
-[**RedeemInvitation**](TeammatesApi.md#redeeminvitation) | **GET** /api/v1.0/{appId}/teammates/redeem/{otc} | Redeem one-time code from invitation
-[**UpdateTeammate**](TeammatesApi.md#updateteammate) | **POST** /api/v1.0/{appId}/teammates/{id} | Update teammates (this method does not support Deltas!)
+[**CreateTeammate**](TeammatesApi.md#createteammate) | **POST** /api/v1.0/{appId}/teammates | 
+[**DeleteTeammate**](TeammatesApi.md#deleteteammate) | **DELETE** /api/v1.0/{appId}/teammates/{id} | 
+[**GetTeammateByAppIdAndTeammateId**](TeammatesApi.md#getteammatebyappidandteammateid) | **GET** /api/v1.0/{appId}/teammates/{id} | 
+[**GetTeammatesByAppId**](TeammatesApi.md#getteammatesbyappid) | **GET** /api/v1.0/{appId}/teammates | 
+[**Grantaccess**](TeammatesApi.md#grantaccess) | **POST** /api/v1.0/{appId}/teammates/grantaccess | 
+[**RedeemInvitation**](TeammatesApi.md#redeeminvitation) | **GET** /api/v1.0/{appId}/teammates/redeem/{otc} | 
+[**TeammateMobileRedirect**](TeammatesApi.md#teammatemobileredirect) | **GET** /api/v1.0/teammates/mobile-redirect | 
+[**TeammatesAcceptInvitation**](TeammatesApi.md#teammatesacceptinvitation) | **GET** /api/v1.0/{appId}/teammates/accept/{otc} | 
+[**TeammatesAcceptInvitations**](TeammatesApi.md#teammatesacceptinvitations) | **POST** /api/v1.0/teammates/acceptInvitations | 
+[**TeammatesPendingInvitations**](TeammatesApi.md#teammatespendinginvitations) | **GET** /api/v1.0/teammates/pending-invitations | 
+[**UpdateTeammate**](TeammatesApi.md#updateteammate) | **POST** /api/v1.0/{appId}/teammates/{id} | 
 
 
 <a name="createteammate"></a>
 # **CreateTeammate**
 > RestApiResultTeammate CreateTeammate (string appId, CreateTeammate teammate)
 
-Create teammate and send an invite.
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -36,12 +41,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new TeammatesApi();
-            var appId = appId_example;  // string | Application identifier
-            var teammate = new CreateTeammate(); // CreateTeammate | teammate model
+            var appId = appId_example;  // string | 
+            var teammate = new CreateTeammate(); // CreateTeammate | 
 
             try
             {
-                // Create teammate and send an invite.
                 RestApiResultTeammate result = apiInstance.CreateTeammate(appId, teammate);
                 Debug.WriteLine(result);
             }
@@ -58,8 +62,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **teammate** | [**CreateTeammate**](CreateTeammate.md)| teammate model | 
+ **appId** | **string**|  | 
+ **teammate** | [**CreateTeammate**](CreateTeammate.md)|  | 
 
 ### Return type
 
@@ -80,15 +84,15 @@ Name | Type | Description  | Notes
 # **DeleteTeammate**
 > void DeleteTeammate (string appId, string id)
 
-Delete teammate
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -105,7 +109,6 @@ namespace Example
 
             try
             {
-                // Delete teammate
                 apiInstance.DeleteTeammate(appId, id);
             }
             catch (Exception e)
@@ -143,15 +146,15 @@ void (empty response body)
 # **GetTeammateByAppIdAndTeammateId**
 > RestApiResultTeammate GetTeammateByAppIdAndTeammateId (string appId, string id)
 
-Get a teammates by email address
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -168,7 +171,6 @@ namespace Example
 
             try
             {
-                // Get a teammates by email address
                 RestApiResultTeammate result = apiInstance.GetTeammateByAppIdAndTeammateId(appId, id);
                 Debug.WriteLine(result);
             }
@@ -207,15 +209,15 @@ Name | Type | Description  | Notes
 # **GetTeammatesByAppId**
 > RestApiArrayResultTeammate GetTeammatesByAppId (string appId)
 
-Get all teammates
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -231,7 +233,6 @@ namespace Example
 
             try
             {
-                // Get all teammates
                 RestApiArrayResultTeammate result = apiInstance.GetTeammatesByAppId(appId);
                 Debug.WriteLine(result);
             }
@@ -265,19 +266,82 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="grantaccess"></a>
+# **Grantaccess**
+> Object Grantaccess (string appId, CreateTeammate teammate)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GrantaccessExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new TeammatesApi();
+            var appId = appId_example;  // string | 
+            var teammate = new CreateTeammate(); // CreateTeammate | 
+
+            try
+            {
+                Object result = apiInstance.Grantaccess(appId, teammate);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling TeammatesApi.Grantaccess: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **teammate** | [**CreateTeammate**](CreateTeammate.md)|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="redeeminvitation"></a>
 # **RedeemInvitation**
 > RestApiResultRedeemInvitationResult RedeemInvitation (string otc, string appId)
 
-Redeem one-time code from invitation
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -294,7 +358,6 @@ namespace Example
 
             try
             {
-                // Redeem one-time code from invitation
                 RestApiResultRedeemInvitationResult result = apiInstance.RedeemInvitation(otc, appId);
                 Debug.WriteLine(result);
             }
@@ -329,19 +392,257 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="teammatemobileredirect"></a>
+# **TeammateMobileRedirect**
+> Object TeammateMobileRedirect (string portalUrl)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class TeammateMobileRedirectExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new TeammatesApi();
+            var portalUrl = portalUrl_example;  // string | 
+
+            try
+            {
+                Object result = apiInstance.TeammateMobileRedirect(portalUrl);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling TeammatesApi.TeammateMobileRedirect: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **portalUrl** | **string**|  | 
+
+### Return type
+
+**Object**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="teammatesacceptinvitation"></a>
+# **TeammatesAcceptInvitation**
+> RestApiResultAcceptInvitationResult TeammatesAcceptInvitation (string otc, string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class TeammatesAcceptInvitationExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new TeammatesApi();
+            var otc = otc_example;  // string | 
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                RestApiResultAcceptInvitationResult result = apiInstance.TeammatesAcceptInvitation(otc, appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling TeammatesApi.TeammatesAcceptInvitation: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **otc** | **string**|  | 
+ **appId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultAcceptInvitationResult**](RestApiResultAcceptInvitationResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="teammatesacceptinvitations"></a>
+# **TeammatesAcceptInvitations**
+> RestApiArrayResultRedeemInvitationResult TeammatesAcceptInvitations ()
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class TeammatesAcceptInvitationsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new TeammatesApi();
+
+            try
+            {
+                RestApiArrayResultRedeemInvitationResult result = apiInstance.TeammatesAcceptInvitations();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling TeammatesApi.TeammatesAcceptInvitations: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**RestApiArrayResultRedeemInvitationResult**](RestApiArrayResultRedeemInvitationResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="teammatespendinginvitations"></a>
+# **TeammatesPendingInvitations**
+> RestApiArrayResultPendingInvitation TeammatesPendingInvitations ()
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class TeammatesPendingInvitationsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new TeammatesApi();
+
+            try
+            {
+                RestApiArrayResultPendingInvitation result = apiInstance.TeammatesPendingInvitations();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling TeammatesApi.TeammatesPendingInvitations: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**RestApiArrayResultPendingInvitation**](RestApiArrayResultPendingInvitation.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="updateteammate"></a>
 # **UpdateTeammate**
 > RestApiResultTeammate UpdateTeammate (string appId, string id, TeammateBase teammate)
 
-Update teammates (this method does not support Deltas!)
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -353,13 +654,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new TeammatesApi();
-            var appId = appId_example;  // string | Application identifier
-            var id = id_example;  // string | teammate identifier
-            var teammate = new TeammateBase(); // TeammateBase | teammate model
+            var appId = appId_example;  // string | 
+            var id = id_example;  // string | 
+            var teammate = new TeammateBase(); // TeammateBase | 
 
             try
             {
-                // Update teammates (this method does not support Deltas!)
                 RestApiResultTeammate result = apiInstance.UpdateTeammate(appId, id, teammate);
                 Debug.WriteLine(result);
             }
@@ -376,9 +676,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **id** | **string**| teammate identifier | 
- **teammate** | [**TeammateBase**](TeammateBase.md)| teammate model | 
+ **appId** | **string**|  | 
+ **id** | **string**|  | 
+ **teammate** | [**TeammateBase**](TeammateBase.md)|  | 
 
 ### Return type
 
diff --git a/docs/TelemetrySeriesProperty.md b/docs/TelemetrySeriesProperty.md
index 7dda166d..6c6c9dd3 100644
--- a/docs/TelemetrySeriesProperty.md
+++ b/docs/TelemetrySeriesProperty.md
@@ -1,13 +1,13 @@
-# IO.Swagger.Model.TelemetrySeriesProperty
+# Flipdish.Model.TelemetrySeriesProperty
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
-**Type** | **string** |  | [optional] 
-**IntValues** | **List&lt;int?&gt;** |  | [optional] 
-**StringValues** | **List&lt;string&gt;** |  | [optional] 
-**DoubleValues** | **List&lt;double?&gt;** |  | [optional] 
+**Name** | **string** | Name. | [optional] 
+**Type** | **string** | Type. | [optional] 
+**IntValues** | **List&lt;int?&gt;** | IntValues. | [optional] 
+**StringValues** | **List&lt;string&gt;** | StringValues. | [optional] 
+**DoubleValues** | **List&lt;double?&gt;** | DoubleValues. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TelemetrySeriesQueryParameters.md b/docs/TelemetrySeriesQueryParameters.md
index 0e9dad03..356dee07 100644
--- a/docs/TelemetrySeriesQueryParameters.md
+++ b/docs/TelemetrySeriesQueryParameters.md
@@ -1,12 +1,12 @@
-# IO.Swagger.Model.TelemetrySeriesQueryParameters
+# Flipdish.Model.TelemetrySeriesQueryParameters
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**KioskId** | **string** |  | [optional] 
-**Variables** | **List&lt;string&gt;** |  | [optional] 
-**StartDate** | **DateTime?** |  | [optional] 
-**EndDate** | **DateTime?** |  | [optional] 
+**KioskId** | **string** | KioskId. | [optional] 
+**Variables** | **List&lt;string&gt;** | Variables. | [optional] 
+**StartDate** | **DateTime?** | StartDate. | [optional] 
+**EndDate** | **DateTime?** | EndDate. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TelemetrySeriesResult.md b/docs/TelemetrySeriesResult.md
index 64d242a9..2cd1ac24 100644
--- a/docs/TelemetrySeriesResult.md
+++ b/docs/TelemetrySeriesResult.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.TelemetrySeriesResult
+# Flipdish.Model.TelemetrySeriesResult
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Timestamps** | **List&lt;DateTime?&gt;** |  | [optional] 
-**Properties** | [**List&lt;TelemetrySeriesProperty&gt;**](TelemetrySeriesProperty.md) |  | [optional] 
+**Timestamps** | **List&lt;DateTime?&gt;** | Timestamps. | [optional] 
+**Properties** | [**List&lt;TelemetrySeriesProperty&gt;**](TelemetrySeriesProperty.md) | Properties. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/TelephonyConfig.md b/docs/TelephonyConfig.md
new file mode 100644
index 00000000..f62ddac0
--- /dev/null
+++ b/docs/TelephonyConfig.md
@@ -0,0 +1,18 @@
+# Flipdish.Model.TelephonyConfig
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**TelephonyConfigId** | **int?** | ID of the phone call | [optional] 
+**ApmEnabled** | **bool?** | APM enabled flag | [optional] 
+**Type** | **string** | Type of telephony service | [optional] 
+**ConsentEnabled** | **bool?** | Consent enabled flag | [optional] 
+**PhoneNumber** | **string** | APM phone number of the store | [optional] 
+**SendAppLinkSms** | **bool?** | Send app link SMS flag | [optional] 
+**UseCustomAppLinkSmsMessage** | **bool?** | Use custom app link SMS message flag | [optional] 
+**UseCustomVoiceMessage** | **bool?** | Use custom voice message flag | [optional] 
+**AppLinkSmsMessage** | **string** | App link SMS message | [optional] 
+**ResendApmMessageAfterDays** | **int?** | Amount of days to resend APM message | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/TelephonyConfigUpdatedEvent.md b/docs/TelephonyConfigUpdatedEvent.md
new file mode 100644
index 00000000..72a17810
--- /dev/null
+++ b/docs/TelephonyConfigUpdatedEvent.md
@@ -0,0 +1,21 @@
+# Flipdish.Model.TelephonyConfigUpdatedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
+**Description** | **string** | Description | [optional] 
+**StoreId** | **int?** | Store Id | [optional] 
+**TelephonyConfig** | [**TelephonyConfig**](TelephonyConfig.md) | The telephony config | [optional] 
+**PropertyId** | **string** | Property Id | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/TerminalIotApi.md b/docs/TerminalIotApi.md
index 6307648a..f2c45000 100644
--- a/docs/TerminalIotApi.md
+++ b/docs/TerminalIotApi.md
@@ -1,27 +1,25 @@
-# IO.Swagger.Api.TerminalIotApi
+# Flipdish.Api.TerminalIotApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**GetTerminalIotConnection**](TerminalIotApi.md#getterminaliotconnection) | **POST** /api/v1.0/terminaliot/connect | Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+[**GetTerminalIotConnection**](TerminalIotApi.md#getterminaliotconnection) | **POST** /api/v1.0/terminaliot/connect | 
 
 
 <a name="getterminaliotconnection"></a>
 # **GetTerminalIotConnection**
 > RestApiResultKioskIotConnectionParameters GetTerminalIotConnection ()
 
-Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
 
-[BETA - this endpoint is under development, do not use it in your production system]
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -36,7 +34,6 @@ namespace Example
 
             try
             {
-                // Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
                 RestApiResultKioskIotConnectionParameters result = apiInstance.GetTerminalIotConnection();
                 Debug.WriteLine(result);
             }
diff --git a/docs/ThirdPartyFeesDetails.md b/docs/ThirdPartyFeesDetails.md
new file mode 100644
index 00000000..bdb19fd2
--- /dev/null
+++ b/docs/ThirdPartyFeesDetails.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.ThirdPartyFeesDetails
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeliveryIntegrationFee** | **double?** | Third party integration delivery fee | [optional] 
+**DeliveryTipFee** | **double?** | Third party integration delivery tip fee | [optional] 
+**TotalThirdPartyFees** | **double?** | Total third party integration fees | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/TipConfiguration.md b/docs/TipConfiguration.md
index e4f6485c..f6cefdc5 100644
--- a/docs/TipConfiguration.md
+++ b/docs/TipConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.TipConfiguration
+# Flipdish.Model.TipConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/TipsApi.md b/docs/TipsApi.md
index e2fc98f1..0bcfacd4 100644
--- a/docs/TipsApi.md
+++ b/docs/TipsApi.md
@@ -1,26 +1,26 @@
-# IO.Swagger.Api.TipsApi
+# Flipdish.Api.TipsApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**TipConfigGet**](TipsApi.md#tipconfigget) | **GET** /api/v1.0/stores/{storeId}/tipconfig | Returns current tip configuration for a store
-[**TipConfigUpsert**](TipsApi.md#tipconfigupsert) | **POST** /api/v1.0/stores/{storeId}/tipconfig | Update or insert current tip configuration for a store
+[**TipConfigGet**](TipsApi.md#tipconfigget) | **GET** /api/v1.0/stores/{storeId}/tipconfig | 
+[**TipConfigUpsert**](TipsApi.md#tipconfigupsert) | **POST** /api/v1.0/stores/{storeId}/tipconfig | 
 
 
 <a name="tipconfigget"></a>
 # **TipConfigGet**
 > RestApiResultTipConfiguration TipConfigGet (int? storeId)
 
-Returns current tip configuration for a store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -32,11 +32,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new TipsApi();
-            var storeId = 56;  // int? | Store Id
+            var storeId = 56;  // int? | 
 
             try
             {
-                // Returns current tip configuration for a store
                 RestApiResultTipConfiguration result = apiInstance.TipConfigGet(storeId);
                 Debug.WriteLine(result);
             }
@@ -53,7 +52,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id | 
+ **storeId** | **int?**|  | 
 
 ### Return type
 
@@ -74,15 +73,15 @@ Name | Type | Description  | Notes
 # **TipConfigUpsert**
 > RestApiResultTipConfiguration TipConfigUpsert (int? storeId, UpdateTipConfiguration updateConfig)
 
-Update or insert current tip configuration for a store
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -94,12 +93,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new TipsApi();
-            var storeId = 56;  // int? | Store Id
-            var updateConfig = new UpdateTipConfiguration(); // UpdateTipConfiguration | Update Configuration
+            var storeId = 56;  // int? | 
+            var updateConfig = new UpdateTipConfiguration(); // UpdateTipConfiguration | 
 
             try
             {
-                // Update or insert current tip configuration for a store
                 RestApiResultTipConfiguration result = apiInstance.TipConfigUpsert(storeId, updateConfig);
                 Debug.WriteLine(result);
             }
@@ -116,8 +114,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **storeId** | **int?**| Store Id | 
- **updateConfig** | [**UpdateTipConfiguration**](UpdateTipConfiguration.md)| Update Configuration | 
+ **storeId** | **int?**|  | 
+ **updateConfig** | [**UpdateTipConfiguration**](UpdateTipConfiguration.md)|  | 
 
 ### Return type
 
diff --git a/docs/UnRegisterCardReaderRequest.md b/docs/UnRegisterCardReaderRequest.md
index 59edc9f6..77fbefca 100644
--- a/docs/UnRegisterCardReaderRequest.md
+++ b/docs/UnRegisterCardReaderRequest.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UnRegisterCardReaderRequest
+# Flipdish.Model.UnRegisterCardReaderRequest
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpcomingInvoice.md b/docs/UpcomingInvoice.md
new file mode 100644
index 00000000..ea917432
--- /dev/null
+++ b/docs/UpcomingInvoice.md
@@ -0,0 +1,16 @@
+# Flipdish.Model.UpcomingInvoice
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Amount** | **double?** | Amount | [optional] 
+**NextBillingDate** | **DateTime?** | Next billing date | [optional] 
+**Subtotal** | **double?** | Subtotal | 
+**TotalExcludingTax** | **double?** | Total excluding tax | [optional] 
+**AmountDue** | **double?** | Amount due | 
+**Tax** | **double?** | Tax | 
+**Items** | [**List&lt;InvoiceItem&gt;**](InvoiceItem.md) | Items | [optional] 
+**Discounts** | [**List&lt;InvoiceDiscount&gt;**](InvoiceDiscount.md) | Discounts | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UpdateAppConfiguration.md b/docs/UpdateAppConfiguration.md
deleted file mode 100644
index 0faa2401..00000000
--- a/docs/UpdateAppConfiguration.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Flipdish.Model.UpdateAppConfiguration
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Id** | **string** |  | [optional] 
-**PhysicalRestaurants** | **List&lt;int?&gt;** |  | [optional] 
-**IsEnabled** | **bool?** |  | [optional] 
-**Settings** | [**List&lt;AppConfigurationSetting&gt;**](AppConfigurationSetting.md) |  | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/UpdateAppStoreApp.md b/docs/UpdateAppStoreApp.md
index fe8bed1e..ded11e5c 100644
--- a/docs/UpdateAppStoreApp.md
+++ b/docs/UpdateAppStoreApp.md
@@ -1,23 +1,26 @@
-# IO.Swagger.Model.UpdateAppStoreApp
+# Flipdish.Model.UpdateAppStoreApp
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Details** | **string** | Details | 
-**ConfigurationType** | **string** | Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt; | 
-**StoreSelectorType** | **string** | Store selector type | 
-**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) | Field groups | [optional] 
-**SetupInstructions** | **string** | Setup instructions | [optional] 
-**ExternalSetupLink** | **string** | External setup link | [optional] 
-**TeammateAppAccessLevel** | **string** | Teammate app access level | [optional] 
-**PermissionsType** | **string** | Permissions type | 
-**Support** | [**AppStoreAppSupportInfo**](AppStoreAppSupportInfo.md) | Support information | [optional] 
-**Name** | **string** | Name | 
-**Description** | **string** | Description | 
-**IsEnabled** | **bool?** | Is application enabled | [optional] 
-**Categories** | **List&lt;string&gt;** | Categories | 
-**Countries** | **List&lt;string&gt;** | Countries | 
-**DeveloperName** | **string** | Developer Name | [optional] 
+**Details** | **string** |  | 
+**ConfigurationType** | **string** |  | 
+**StoreSelectorType** | **string** |  | 
+**FieldGroups** | [**List&lt;FieldGroup&gt;**](FieldGroup.md) |  | [optional] 
+**SetupInstructions** | **string** |  | [optional] 
+**ExternalSetupLink** | **string** |  | [optional] 
+**TeammateAppAccessLevel** | **string** |  | [optional] 
+**PermissionsType** | **string** |  | 
+**Support** | [**AppStoreAppSupportInfo**](AppStoreAppSupportInfo.md) |  | [optional] 
+**ExternalFunctionActionUrl** | **string** |  | [optional] 
+**ExternalFunctionSignatureKey** | **string** |  | [optional] 
+**IsPaid** | **bool?** |  | [optional] 
+**Name** | **string** |  | 
+**Description** | **string** |  | 
+**IsEnabled** | **bool?** |  | [optional] 
+**Categories** | **List&lt;string&gt;** |  | 
+**Countries** | **List&lt;string&gt;** |  | 
+**DeveloperName** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UpdateAppStoreAppConfiguration.md b/docs/UpdateAppStoreAppConfiguration.md
index d0379234..870645bb 100644
--- a/docs/UpdateAppStoreAppConfiguration.md
+++ b/docs/UpdateAppStoreAppConfiguration.md
@@ -1,11 +1,11 @@
-# IO.Swagger.Model.UpdateAppStoreAppConfiguration
+# Flipdish.Model.UpdateAppStoreAppConfiguration
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**IsEnabled** | **bool?** | Is enabled | 
-**StoreIds** | **List&lt;int?&gt;** | Stores id&#39;s | [optional] 
-**Settings** | [**List&lt;Setting&gt;**](Setting.md) | Settings | [optional] 
+**IsEnabled** | **bool?** |  | 
+**StoreIds** | **List&lt;int?&gt;** |  | [optional] 
+**Settings** | [**List&lt;Setting&gt;**](Setting.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UpdateAppStoreAppConfigurationValuesBatch.md b/docs/UpdateAppStoreAppConfigurationValuesBatch.md
new file mode 100644
index 00000000..f94aa2de
--- /dev/null
+++ b/docs/UpdateAppStoreAppConfigurationValuesBatch.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.UpdateAppStoreAppConfigurationValuesBatch
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Settings** | [**List&lt;Setting&gt;**](Setting.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UpdateAppStoreAppConfigurationWebhookDTO.md b/docs/UpdateAppStoreAppConfigurationWebhookDTO.md
index d6102c90..7d72a549 100644
--- a/docs/UpdateAppStoreAppConfigurationWebhookDTO.md
+++ b/docs/UpdateAppStoreAppConfigurationWebhookDTO.md
@@ -1,12 +1,12 @@
-# IO.Swagger.Model.UpdateAppStoreAppConfigurationWebhookDTO
+# Flipdish.Model.UpdateAppStoreAppConfigurationWebhookDTO
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **string** | Unique App store app configuration id | 
-**IsEnabled** | **bool?** | Is enabled | 
-**StoreIds** | **List&lt;int?&gt;** | Store id&#39;s | [optional] 
-**Settings** | [**List&lt;Setting&gt;**](Setting.md) | Settings | [optional] 
+**Id** | **string** |  | 
+**IsEnabled** | **bool?** |  | 
+**StoreIds** | **List&lt;int?&gt;** |  | [optional] 
+**Settings** | [**List&lt;Setting&gt;**](Setting.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UpdateAppStoreAppExternalProduct.md b/docs/UpdateAppStoreAppExternalProduct.md
new file mode 100644
index 00000000..ee04efaf
--- /dev/null
+++ b/docs/UpdateAppStoreAppExternalProduct.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.UpdateAppStoreAppExternalProduct
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**ExternalProductId** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UpdateCatalogGroup.md b/docs/UpdateCatalogGroup.md
deleted file mode 100644
index f4780d1e..00000000
--- a/docs/UpdateCatalogGroup.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Flipdish.Model.UpdateCatalogGroup
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Group name | [optional] 
-**AutogenerateDisplayText** | **bool?** | Autogenerate display text in ordering applications | [optional] 
-**ImageFileName** | **string** | Image File Name | [optional] 
-**MinSelectCount** | **int?** | Minimum number of items that the user has to select | [optional] 
-**MaxSelectCount** | **int?** | Maximum number of items that the user has to select | [optional] 
-**Items** | [**List&lt;UpdateCatalogItemReference&gt;**](UpdateCatalogItemReference.md) | Collection of items associated with this group | [optional] 
-**Metafields** | [**List&lt;Metafield&gt;**](Metafield.md) | Collection of metafields | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/UpdateCatalogGroupReference.md b/docs/UpdateCatalogGroupReference.md
index 4d09c196..fbede304 100644
--- a/docs/UpdateCatalogGroupReference.md
+++ b/docs/UpdateCatalogGroupReference.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateCatalogGroupReference
+# Flipdish.Model.UpdateCatalogGroupReference
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateCatalogItem.md b/docs/UpdateCatalogItem.md
index f6f83c85..2cb094c0 100644
--- a/docs/UpdateCatalogItem.md
+++ b/docs/UpdateCatalogItem.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateCatalogItem
+# Flipdish.Model.UpdateCatalogItem
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateCatalogItemReference.md b/docs/UpdateCatalogItemReference.md
deleted file mode 100644
index fb5c2bbf..00000000
--- a/docs/UpdateCatalogItemReference.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Flipdish.Model.UpdateCatalogItemReference
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**CatalogItemId** | **string** | Identifier of the CatalogItemId to use as SubProduct | 
-**ItemType** | **string** | Type of the SupProduct | 
-**PreselectedQuantity** | **int?** | Quantity of the modifier that will be set when the parent product is placed in the basket | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/UpdateDriverNotificationToken.md b/docs/UpdateDriverNotificationToken.md
index ec247836..e4c8886a 100644
--- a/docs/UpdateDriverNotificationToken.md
+++ b/docs/UpdateDriverNotificationToken.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateDriverNotificationToken
+# Flipdish.Model.UpdateDriverNotificationToken
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateDriverProfileModel.md b/docs/UpdateDriverProfileModel.md
index ef9c6e18..c4a91b7a 100644
--- a/docs/UpdateDriverProfileModel.md
+++ b/docs/UpdateDriverProfileModel.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateDriverProfileModel
+# Flipdish.Model.UpdateDriverProfileModel
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateFulfillmentStatesConfiguration.md b/docs/UpdateFulfillmentStatesConfiguration.md
index 5526a11b..55e44848 100644
--- a/docs/UpdateFulfillmentStatesConfiguration.md
+++ b/docs/UpdateFulfillmentStatesConfiguration.md
@@ -1,11 +1,13 @@
-# IO.Swagger.Model.UpdateFulfillmentStatesConfiguration
+# Flipdish.Model.UpdateFulfillmentStatesConfiguration
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**OverwriteSystemTemplate** | **bool?** | Set to true if a system configuration template is to be updated (permissions also needed) | [optional] 
 **StoreIds** | **List&lt;int?&gt;** | Stores id&#39;s | [optional] 
 **StoreSelectorType** | **string** | Store Selector Type | [optional] 
 **States** | [**List&lt;FulfillmentStatusConfigurationItem&gt;**](FulfillmentStatusConfigurationItem.md) | Settings | [optional] 
+**AutomaticTransitionsEnabled** | **bool?** | Enable automatic transitions | [optional] 
 **Name** | **string** | Name | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/UpdateGroup.md b/docs/UpdateGroup.md
index 73f75b44..4cf0dcf5 100644
--- a/docs/UpdateGroup.md
+++ b/docs/UpdateGroup.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateGroup
+# Flipdish.Model.UpdateGroup
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateGroupReference.md b/docs/UpdateGroupReference.md
index e62a8484..9f4ad9cc 100644
--- a/docs/UpdateGroupReference.md
+++ b/docs/UpdateGroupReference.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateGroupReference
+# Flipdish.Model.UpdateGroupReference
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateLocationArea.md b/docs/UpdateLocationArea.md
index 93cde926..9dd59fda 100644
--- a/docs/UpdateLocationArea.md
+++ b/docs/UpdateLocationArea.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateLocationArea
+# Flipdish.Model.UpdateLocationArea
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateMetafieldDefinition.md b/docs/UpdateMetafieldDefinition.md
index dfa4829a..3b74c0de 100644
--- a/docs/UpdateMetafieldDefinition.md
+++ b/docs/UpdateMetafieldDefinition.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateMetafieldDefinition
+# Flipdish.Model.UpdateMetafieldDefinition
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateMobileAppsSubmissionStatus.md b/docs/UpdateMobileAppsSubmissionStatus.md
index 2b3378c6..6d7ade43 100644
--- a/docs/UpdateMobileAppsSubmissionStatus.md
+++ b/docs/UpdateMobileAppsSubmissionStatus.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateMobileAppsSubmissionStatus
+# Flipdish.Model.UpdateMobileAppsSubmissionStatus
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateModifier.md b/docs/UpdateModifier.md
deleted file mode 100644
index 92677c00..00000000
--- a/docs/UpdateModifier.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Flipdish.Model.UpdateModifier
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**Alcohol** | **bool?** | Product contains alcohol | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/UpdateModifierGroup.md b/docs/UpdateModifierGroup.md
deleted file mode 100644
index c61f7f18..00000000
--- a/docs/UpdateModifierGroup.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Flipdish.Model.UpdateModifierGroup
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**MinSelection** | **int?** | Minimum number of items that the user has to select | [optional] 
-**MaxSelection** | **int?** | Maximum number of items that the user has to select | [optional] 
-**SubProducts** | [**List&lt;ModifierGroupSubProduct&gt;**](ModifierGroupSubProduct.md) | Collection of products associated with this product | [optional] 
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**Alcohol** | **bool?** | Product contains alcohol | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/UpdatePayGreenConfigurationRequest.md b/docs/UpdatePayGreenConfigurationRequest.md
index 84e55f14..f2cfb0a1 100644
--- a/docs/UpdatePayGreenConfigurationRequest.md
+++ b/docs/UpdatePayGreenConfigurationRequest.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.UpdatePayGreenConfigurationRequest
+# Flipdish.Model.UpdatePayGreenConfigurationRequest
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
-**AssignedStores** | **List&lt;int?&gt;** |  | [optional] 
+**Name** | **string** | Name. | [optional] 
+**AssignedStores** | **List&lt;int?&gt;** | AssignedStores. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UpdateProduct.md b/docs/UpdateProduct.md
index 7d9a13ff..fef69dc1 100644
--- a/docs/UpdateProduct.md
+++ b/docs/UpdateProduct.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateProduct
+# Flipdish.Model.UpdateProduct
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateProductReference.md b/docs/UpdateProductReference.md
index 3f0bec5e..ccceed67 100644
--- a/docs/UpdateProductReference.md
+++ b/docs/UpdateProductReference.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateProductReference
+# Flipdish.Model.UpdateProductReference
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateSimpleProduct.md b/docs/UpdateSimpleProduct.md
deleted file mode 100644
index 5bbc4691..00000000
--- a/docs/UpdateSimpleProduct.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Flipdish.Model.UpdateSimpleProduct
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**SubProducts** | [**List&lt;SimpleProductSubProduct&gt;**](SimpleProductSubProduct.md) | Collection of products associated with this product | [optional] 
-**Sku** | **string** | Stock Keeping Unit (SKU) | [optional] 
-**Name** | **string** | Product name | [optional] 
-**Description** | **string** | Product description | [optional] 
-**Price** | **double?** | Product price | [optional] 
-**Alcohol** | **bool?** | Product contains alcohol | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/UpdateStorePayGreenConfigurationRequest.md b/docs/UpdateStorePayGreenConfigurationRequest.md
index c689e9bd..55aaada6 100644
--- a/docs/UpdateStorePayGreenConfigurationRequest.md
+++ b/docs/UpdateStorePayGreenConfigurationRequest.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.UpdateStorePayGreenConfigurationRequest
+# Flipdish.Model.UpdateStorePayGreenConfigurationRequest
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Active** | **bool?** |  | [optional] 
-**PayGreenConfigurationId** | **int?** |  | [optional] 
+**Active** | **bool?** | Active. | [optional] 
+**PayGreenConfigurationId** | **int?** | PayGreenConfigurationId. | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UpdateTipConfiguration.md b/docs/UpdateTipConfiguration.md
index 21e54e02..baddda58 100644
--- a/docs/UpdateTipConfiguration.md
+++ b/docs/UpdateTipConfiguration.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UpdateTipConfiguration
+# Flipdish.Model.UpdateTipConfiguration
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UpdateVoucher.md b/docs/UpdateVoucher.md
new file mode 100644
index 00000000..08a26a10
--- /dev/null
+++ b/docs/UpdateVoucher.md
@@ -0,0 +1,36 @@
+# Flipdish.Model.UpdateVoucher
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PromotionId** | **int?** | Promotion ID to update | [optional] 
+**PromotionName** | **string** | The updated name of the promotion | [optional] 
+**PromotionAwardMenuItemPublicIds** | **List&lt;Guid?&gt;** | The updated menu items that the promotion awards | [optional] 
+**Code** | **string** | Voucher Code | [optional] 
+**Description** | **string** | Voucher Description (Visible on printout) | [optional] 
+**Stores** | **List&lt;int?&gt;** | Stores that this voucher applies to | [optional] 
+**ValidOnOrdersOver** | **double?** | Valid on orders on or above | [optional] 
+**TakesPriority** | **bool?** | Takes priority | [optional] 
+**IsEnabled** | **bool?** | Is voucher enabled | [optional] 
+**IsAutomaticallyApplied** | **bool?** | Is voucher automatically applied | [optional] 
+**IncludeDeliveryFee** | **bool?** | Include delivery fees | [optional] 
+**IsValidForDeliveryOrders** | **bool?** | Valid for delivery orders | [optional] 
+**IsValidForPickupOrders** | **bool?** | Valid for pickup orders | [optional] 
+**IsValidForOrdersPayedOnline** | **bool?** | Valid for orders payed online | [optional] 
+**IsValidForOrdersPayedByCash** | **bool?** | Valid for orders payed in cash | [optional] 
+**IsValidForFirstOrderOnly** | **bool?** | Valid only on the first order by the customer | [optional] 
+**IsValidOncePerCustomer** | **bool?** | Valid once per customer | [optional] 
+**IsValidOnlyOnce** | **bool?** | Valid only once, by any customer (once used cannot be used again by any other customer) | [optional] 
+**IsDiscoverable** | **bool?** | Enables the voucher to be offered in the Voucher Discoverability feature | [optional] 
+**IsPromoted** | **bool?** | Marks the voucher as promoted | [optional] 
+**ForceDiscount** | **bool?** | Force the discount to be applied which bypasses some menu restrictions | [optional] 
+**StartDate** | **DateTime?** | Voucher Starts On (Time in UTC) | [optional] 
+**ExpiryDate** | **DateTime?** | Voucher Expires On (Time in UTC) | [optional] 
+**ChannelRestrictions** | **List&lt;string&gt;** | Limit the channels this voucher can be used on | [optional] 
+**ValidityPeriods** | [**List&lt;ValidityPeriod&gt;**](ValidityPeriod.md) | Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated. | [optional] 
+**VoucherSubType** | **string** | Voucher Subtype | [optional] 
+**CustomerId** | **int?** | Customer UserID | [optional] 
+**MaxRedemptions** | **int?** | Maximum number of times the voucher can be redeemed (used) | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UpdateVoucherUsage.md b/docs/UpdateVoucherUsage.md
new file mode 100644
index 00000000..591f3b29
--- /dev/null
+++ b/docs/UpdateVoucherUsage.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.UpdateVoucherUsage
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**IsUsed** | **bool?** | Flag indicating whether the voucher is used | [optional] 
+**UsedByCustomerId** | **int?** | Indicates Customer that used the voucher. | [optional] 
+**TransactionKey** | **string** | An opaque string, to ensure idempotency. This allows for safely retrying requests without accidentally performing the same stamp operation twice.   This will typically contain the the ID of the sale order. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserAnsweredSignupQuestionsEvent.md b/docs/UserAnsweredSignupQuestionsEvent.md
index c99cbe69..8d5c6389 100644
--- a/docs/UserAnsweredSignupQuestionsEvent.md
+++ b/docs/UserAnsweredSignupQuestionsEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UserAnsweredSignupQuestionsEvent
+# Flipdish.Model.UserAnsweredSignupQuestionsEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserCreatedEvent.md b/docs/UserCreatedEvent.md
index 85d75d6a..0ad10736 100644
--- a/docs/UserCreatedEvent.md
+++ b/docs/UserCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UserCreatedEvent
+# Flipdish.Model.UserCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserDeletedEvent.md b/docs/UserDeletedEvent.md
index 50ca12e5..af09e8c7 100644
--- a/docs/UserDeletedEvent.md
+++ b/docs/UserDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UserDeletedEvent
+# Flipdish.Model.UserDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserDeliveryLocationAdmin.md b/docs/UserDeliveryLocationAdmin.md
new file mode 100644
index 00000000..928015b9
--- /dev/null
+++ b/docs/UserDeliveryLocationAdmin.md
@@ -0,0 +1,18 @@
+# Flipdish.Model.UserDeliveryLocationAdmin
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DeliveryLocationId** | **int?** | DeliveryLocationId. | [optional] 
+**Building** | **string** | Building. | [optional] 
+**Street** | **string** | Street. | [optional] 
+**Town** | **string** | Town. | [optional] 
+**PostCode** | **string** | PostCode. | [optional] 
+**DeliveryInstructions** | **string** | DeliveryInstructions. | [optional] 
+**AutoSelectThisLocation** | **bool?** | AutoSelectThisLocation. | [optional] 
+**IsDisplayed** | **bool?** | IsDisplayed. | [optional] 
+**IsConfirmed** | **bool?** | IsConfirmed. | [optional] 
+**Coordinates** | [**Coordinates**](Coordinates.md) | Coordinates. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserEventInfo.md b/docs/UserEventInfo.md
index c68beb24..8bb804d8 100644
--- a/docs/UserEventInfo.md
+++ b/docs/UserEventInfo.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UserEventInfo
+# Flipdish.Model.UserEventInfo
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/UserFlipdishAccount.md b/docs/UserFlipdishAccount.md
new file mode 100644
index 00000000..5d346477
--- /dev/null
+++ b/docs/UserFlipdishAccount.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.UserFlipdishAccount
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PayeeBankAccountDataId** | **int?** | Payee Bank Account Data Id | [optional] 
+**FlipdishAccountId** | **int?** | Flipdish Account Id | [optional] 
+**Name** | **string** | Flipdish Account Name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserInfo.md b/docs/UserInfo.md
new file mode 100644
index 00000000..363b9b8f
--- /dev/null
+++ b/docs/UserInfo.md
@@ -0,0 +1,35 @@
+# Flipdish.Model.UserInfo
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PhoneNumber** | **string** | The user&#39;s phone number. | [optional] 
+**Email** | **string** | The user&#39;s email address. | [optional] 
+**EmailConfirmed** | **bool?** | Indicates if the user&#39;s email address has been confirmed. | [optional] 
+**PreventFromUsingCards** | **bool?** | Indicates if the user is prevented from using cards. | [optional] 
+**IsUserPhoneNumberBlocked** | **bool?** | Indicates if the user&#39;s phone number is blocked. | [optional] 
+**UserWhiteLabels** | [**List&lt;UserWhiteLabelInfo&gt;**](UserWhiteLabelInfo.md) | List of white label information associated with the user. | [optional] 
+**UserId** | **int?** | The unique identifier for the user. | [optional] 
+**UserName** | **string** | The user&#39;s username. | [optional] 
+**CustomerName** | **string** | The customer&#39;s name. | [optional] 
+**HasLoggedIn** | **bool?** | Indicates if the user has logged in. | [optional] 
+**DisableAppRatingControl** | **bool?** | Indicates if the app rating control is disabled for the user. | [optional] 
+**GloballyOptedOut** | **bool?** | Indicates if the user has globally opted out. | [optional] 
+**CompletedOrderCount** | **int?** | The number of completed orders by the user. | [optional] 
+**CancelledOrderCount** | **int?** | The number of cancelled orders by the user. | [optional] 
+**OrderTotalValue** | **double?** | The total value of orders placed by the user. | [optional] 
+**TsMostRecentOrder** | **DateTime?** | The timestamp of the user&#39;s most recent order. | [optional] 
+**TsFirstOrder** | **DateTime?** | The timestamp of the user&#39;s first order. | [optional] 
+**IsRestaurantUser** | **bool?** | Indicates if the user is a restaurant user. | [optional] 
+**Installs** | [**List&lt;AppInstall&gt;**](AppInstall.md) | List of app installs associated with the user. | [optional] 
+**DeliveryLocations** | [**List&lt;DeliveryLocation&gt;**](DeliveryLocation.md) | List of delivery locations associated with the user. | [optional] 
+**PaymentAccounts** | [**List&lt;PaymentAccount&gt;**](PaymentAccount.md) | List of payment accounts associated with the user. | [optional] 
+**LanguageId** | **string** | The language identifier for the user. | [optional] 
+**CurrentLanguageName** | **string** | Current language name for the user. | [optional] 
+**Languages** | [**List&lt;Language&gt;**](Language.md) | Available languages that the user can choose from. | [optional] 
+**SalesForceContactId** | **string** | The Salesforce contact ID for the user. | [optional] 
+**StripeCustomerId** | **string** | The Stripe customer ID for the user. | [optional] 
+**UserMonthlyCommissions** | [**List&lt;UserMonthlyCommission&gt;**](UserMonthlyCommission.md) | User&#39;s monthly commissions. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserLoginEvent.md b/docs/UserLoginEvent.md
index 8296efc0..de2dee6e 100644
--- a/docs/UserLoginEvent.md
+++ b/docs/UserLoginEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UserLoginEvent
+# Flipdish.Model.UserLoginEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserMonthlyCommission.md b/docs/UserMonthlyCommission.md
new file mode 100644
index 00000000..9c6bcc90
--- /dev/null
+++ b/docs/UserMonthlyCommission.md
@@ -0,0 +1,13 @@
+# Flipdish.Model.UserMonthlyCommission
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**UserId** | **int?** | The unique identifier of the user. | [optional] 
+**MonthStart** | **DateTime?** | The start date of the month for which the commission is calculated. | [optional] 
+**CommissionAmount** | **double?** | The total commission amount for the user in the specified month. | [optional] 
+**Currency** | **string** | The currency in which the commission is paid. | [optional] 
+**IsoCurrency** | **string** | The ISO currency code for the commission currency. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserNote.md b/docs/UserNote.md
new file mode 100644
index 00000000..6d28ff9e
--- /dev/null
+++ b/docs/UserNote.md
@@ -0,0 +1,15 @@
+# Flipdish.Model.UserNote
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**UserNoteId** | **int?** | Identifier for the user note. | [optional] 
+**UserId** | **int?** | User identifier associated with the note. | [optional] 
+**Note** | **string** | Note content. | [optional] 
+**TsCreate** | **DateTime?** | Creation timestamp of the note. | [optional] 
+**CreatedByUserId** | **int?** | Identifier of the user who created the note. | [optional] 
+**CreatedByUserName** | **string** | Name of the user who created the note. | [optional] 
+**CreatedByUserEmail** | **string** | Email of the user who created the note. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserOrderSummary.md b/docs/UserOrderSummary.md
new file mode 100644
index 00000000..ef82f99d
--- /dev/null
+++ b/docs/UserOrderSummary.md
@@ -0,0 +1,19 @@
+# Flipdish.Model.UserOrderSummary
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**OrderId** | **int?** | OrderId. | [optional] 
+**TsOrderPlacedUtc** | **DateTime?** | TsOrderPlacedUtc. | [optional] 
+**TsUpdateUtc** | **DateTime?** | TsUpdateUtc. | [optional] 
+**RestaurantName** | **string** | RestaurantName. | [optional] 
+**FoodAmount** | **double?** | FoodAmount. | [optional] 
+**TipAmount** | **double?** | TipAmount. | [optional] 
+**TotalRestaurantAmount** | **double?** | TotalRestaurantAmount. | [optional] 
+**IsoCurrency** | **string** | IsoCurrency. | [optional] 
+**DeliveryType** | **string** | DeliveryType. | [optional] 
+**OrderState** | **string** | OrderState. | [optional] 
+**PaymentAccountDescription** | **string** | PaymentAccountDescription. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserPasswordCreatedEvent.md b/docs/UserPasswordCreatedEvent.md
index 3ea0f9f9..3f651663 100644
--- a/docs/UserPasswordCreatedEvent.md
+++ b/docs/UserPasswordCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UserPasswordCreatedEvent
+# Flipdish.Model.UserPasswordCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserPushNotificationSentResult.md b/docs/UserPushNotificationSentResult.md
new file mode 100644
index 00000000..d5d77715
--- /dev/null
+++ b/docs/UserPushNotificationSentResult.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.UserPushNotificationSentResult
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**TokenCount** | **int?** | TokenCount. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserRole.md b/docs/UserRole.md
new file mode 100644
index 00000000..fb6d87e5
--- /dev/null
+++ b/docs/UserRole.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.UserRole
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**RolesUserIn** | **List&lt;string&gt;** | Roles the user is in | [optional] 
+**RolesUserNotIn** | **List&lt;string&gt;** | Roles the user is not in | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserSearch.md b/docs/UserSearch.md
new file mode 100644
index 00000000..205cd071
--- /dev/null
+++ b/docs/UserSearch.md
@@ -0,0 +1,17 @@
+# Flipdish.Model.UserSearch
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int?** | User Id | [optional] 
+**PhoneNumber** | **string** | Phone Number | [optional] 
+**Email** | **string** | Email | [optional] 
+**CustomerName** | **string** | Customer Name | [optional] 
+**HasLoggedIn** | **bool?** | Has Logged In | [optional] 
+**UserDiscriminator** | **string** | User Discriminator | [optional] 
+**TsCreate** | **DateTime?** | Timestamp Created | [optional] 
+**WhiteLabelConfigs** | [**List&lt;UserWhiteLabelConfig&gt;**](UserWhiteLabelConfig.md) | WhiteLabel Configs | [optional] 
+**UserType** | **string** | User Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserSmsChatItem.md b/docs/UserSmsChatItem.md
new file mode 100644
index 00000000..5f79bfc6
--- /dev/null
+++ b/docs/UserSmsChatItem.md
@@ -0,0 +1,13 @@
+# Flipdish.Model.UserSmsChatItem
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**SmsConversationItemId** | **int?** | SmsConversationItemId. | [optional] 
+**Direction** | **string** | Direction. | [optional] 
+**From** | **string** | From. | [optional] 
+**Text** | **string** | Text. | [optional] 
+**TsSentReceivedUtc** | **DateTime?** | TsSentReceivedUtc. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserStoreInfo.md b/docs/UserStoreInfo.md
new file mode 100644
index 00000000..1a84f727
--- /dev/null
+++ b/docs/UserStoreInfo.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.UserStoreInfo
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**PropertyId** | **string** | Property Id | [optional] 
+**StoreId** | **int?** | Store Id | [optional] 
+**StoreName** | **string** | Store Name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserUpdatedEvent.md b/docs/UserUpdatedEvent.md
index edf03af2..98b9b218 100644
--- a/docs/UserUpdatedEvent.md
+++ b/docs/UserUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.UserUpdatedEvent
+# Flipdish.Model.UserUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,7 +10,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/UserWhiteLabelConfig.md b/docs/UserWhiteLabelConfig.md
new file mode 100644
index 00000000..30560698
--- /dev/null
+++ b/docs/UserWhiteLabelConfig.md
@@ -0,0 +1,13 @@
+# Flipdish.Model.UserWhiteLabelConfig
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Id** | **int?** | Identifier | [optional] 
+**ConfigId** | **int?** | WlConfigId | [optional] 
+**AppId** | **string** | Brand Id | [optional] 
+**Name** | **string** | WhiteLabel Name | [optional] 
+**Level** | **string** | WhiteLabel Access Level | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UserWhiteLabelInfo.md b/docs/UserWhiteLabelInfo.md
new file mode 100644
index 00000000..01f71a4f
--- /dev/null
+++ b/docs/UserWhiteLabelInfo.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.UserWhiteLabelInfo
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WlConfigId** | **int?** | WhiteLabelConfig Id | [optional] 
+**AppId** | **string** | Brand Id (AppId) | [optional] 
+**WhiteLabelName** | **string** | WhiteLabel Name | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/UsersApi.md b/docs/UsersApi.md
index 8e02bbed..57745a8d 100644
--- a/docs/UsersApi.md
+++ b/docs/UsersApi.md
@@ -1,13 +1,354 @@
-# IO.Swagger.Api.UsersApi
+# Flipdish.Api.UsersApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**AddUserNote**](UsersApi.md#addusernote) | **POST** /api/v1.0/users/{userId}/AddUserNote | 
+[**AddUserToRole**](UsersApi.md#addusertorole) | **POST** /api/v1.0/users/{userId}/AddUserToRole/{roleName} | 
+[**AnonymizeUser**](UsersApi.md#anonymizeuser) | **POST** /api/v1.0/users/{userId}/AnonymizeUser | 
+[**BlockUserPhoneNumber**](UsersApi.md#blockuserphonenumber) | **POST** /api/v1.0/users/{userId}/BlockUserPhoneNumber | 
+[**CreateUserDeliveryLocation**](UsersApi.md#createuserdeliverylocation) | **POST** /api/v1.0/users/{userId}/deliveryLocations | 
 [**GetPreviousOrderCountForStore**](UsersApi.md#getpreviousordercountforstore) | **GET** /api/v1.0/users/{userId}/previousordercount/{storeId} | 
-[**GetRoles**](UsersApi.md#getroles) | **GET** /api/v1.0/users/roles | Get role names
+[**GetRestaurantUserAccounts**](UsersApi.md#getrestaurantuseraccounts) | **GET** /api/v1.0/users/{userId}/RestaurantUserAccounts | 
+[**GetRestaurantUserStores**](UsersApi.md#getrestaurantuserstores) | **GET** /api/v1.0/users/{userId}/RestaurantUserStores | 
+[**GetRoles**](UsersApi.md#getroles) | **GET** /api/v1.0/users/roles | 
+[**GetRolesAndUnassignedRoles**](UsersApi.md#getrolesandunassignedroles) | **GET** /api/v1.0/users/{userId}/roles | 
+[**GetUserById**](UsersApi.md#getuserbyid) | **GET** /api/v1.0/users/{userId} | 
+[**GetUserDeliveryLocationsForAdmin**](UsersApi.md#getuserdeliverylocationsforadmin) | **GET** /api/v1.0/users/{userId}/deliveryLocations | 
+[**GetUserNotes**](UsersApi.md#getusernotes) | **GET** /api/v1.0/users/{userId}/UserNotes | 
+[**GetUserOrderByIdForAdmin**](UsersApi.md#getuserorderbyidforadmin) | **GET** /api/v1.0/users/{userId}/orders/{orderId} | 
+[**GetUserOrdersForAdmin**](UsersApi.md#getuserordersforadmin) | **GET** /api/v1.0/users/{userId}/orders | 
+[**GetUserSmsConversationItems**](UsersApi.md#getusersmsconversationitems) | **GET** /api/v1.0/users/{userId}/smsConversationItems | 
+[**HideUserDeliveryLocation**](UsersApi.md#hideuserdeliverylocation) | **POST** /api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/hide | 
+[**MarkUserAsFraudulent**](UsersApi.md#markuserasfraudulent) | **POST** /api/v1.0/users/{userId}/MarkUserAsFraudulent | 
+[**MarkUserAsSuspicious**](UsersApi.md#markuserassuspicious) | **POST** /api/v1.0/users/{userId}/MarkUserAsSuspicious | 
+[**RemoveFlipdishAccountIdForUser**](UsersApi.md#removeflipdishaccountidforuser) | **POST** /api/v1.0/users/{userId}/RemoveFlipdishAccountId/{accountId} | 
+[**RemoveUserFromRole**](UsersApi.md#removeuserfromrole) | **POST** /api/v1.0/users/{userId}/RemoveUserFromRole/{roleName} | 
+[**ResetMfa**](UsersApi.md#resetmfa) | **POST** /api/v1.0/users/{userId}/ResetMfa | 
+[**SearchFlipdishAccounts**](UsersApi.md#searchflipdishaccounts) | **GET** /api/v1.0/users/searchFlipdishAccounts | 
+[**SearchUsers**](UsersApi.md#searchusers) | **GET** /api/v1.0/users/search | 
+[**SendUserPushNotification**](UsersApi.md#senduserpushnotification) | **POST** /api/v1.0/users/{userId}/pushNotifications | 
+[**SendUserSms**](UsersApi.md#sendusersms) | **POST** /api/v1.0/users/{userId}/sms | 
+[**SetCustomerName**](UsersApi.md#setcustomername) | **POST** /api/v1.0/users/{userId}/SetCustomerName | 
+[**SetFlipdishAccountIdForUser**](UsersApi.md#setflipdishaccountidforuser) | **POST** /api/v1.0/users/{userId}/SetFlipdishAccountId/{accountId} | 
+[**SetUserDeliveryLocationCoordinates**](UsersApi.md#setuserdeliverylocationcoordinates) | **POST** /api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/coordinates | 
+[**SetUserDeliveryLocationField**](UsersApi.md#setuserdeliverylocationfield) | **POST** /api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/fields | 
+[**SetUserLanguage**](UsersApi.md#setuserlanguage) | **POST** /api/v1.0/users/{userId}/SetLanguage/{languageId} | 
+[**UnblockUserPhoneNumber**](UsersApi.md#unblockuserphonenumber) | **POST** /api/v1.0/users/{userId}/UnblockUserPhoneNumber | 
 
 
+<a name="addusernote"></a>
+# **AddUserNote**
+> RestApiDefaultResponse AddUserNote (int? userId, string note)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddUserNoteExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var note = note_example;  // string | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.AddUserNote(userId, note);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.AddUserNote: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **note** | **string**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="addusertorole"></a>
+# **AddUserToRole**
+> RestApiResultUserRole AddUserToRole (int? userId, string roleName)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AddUserToRoleExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var roleName = roleName_example;  // string | 
+
+            try
+            {
+                RestApiResultUserRole result = apiInstance.AddUserToRole(userId, roleName);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.AddUserToRole: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **roleName** | **string**|  | 
+
+### Return type
+
+[**RestApiResultUserRole**](RestApiResultUserRole.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="anonymizeuser"></a>
+# **AnonymizeUser**
+> RestApiDefaultResponse AnonymizeUser (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class AnonymizeUserExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.AnonymizeUser(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.AnonymizeUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="blockuserphonenumber"></a>
+# **BlockUserPhoneNumber**
+> RestApiDefaultResponse BlockUserPhoneNumber (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class BlockUserPhoneNumberExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.BlockUserPhoneNumber(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.BlockUserPhoneNumber: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="createuserdeliverylocation"></a>
+# **CreateUserDeliveryLocation**
+> RestApiDefaultResponse CreateUserDeliveryLocation (int? userId, CreateUserDeliveryLocationRequest request)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class CreateUserDeliveryLocationExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var request = new CreateUserDeliveryLocationRequest(); // CreateUserDeliveryLocationRequest | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.CreateUserDeliveryLocation(userId, request);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.CreateUserDeliveryLocation: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **request** | [**CreateUserDeliveryLocationRequest**](CreateUserDeliveryLocationRequest.md)|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getpreviousordercountforstore"></a>
 # **GetPreviousOrderCountForStore**
 > RestApiStringResult GetPreviousOrderCountForStore (int? userId, int? storeId)
@@ -18,13 +359,1324 @@ Method | HTTP request | Description
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetPreviousOrderCountForStoreExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var storeId = 56;  // int? | 
+
+            try
+            {
+                RestApiStringResult result = apiInstance.GetPreviousOrderCountForStore(userId, storeId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetPreviousOrderCountForStore: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **storeId** | **int?**|  | 
+
+### Return type
+
+[**RestApiStringResult**](RestApiStringResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getrestaurantuseraccounts"></a>
+# **GetRestaurantUserAccounts**
+> RestApiArrayResultUserFlipdishAccount GetRestaurantUserAccounts (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetRestaurantUserAccountsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiArrayResultUserFlipdishAccount result = apiInstance.GetRestaurantUserAccounts(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetRestaurantUserAccounts: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiArrayResultUserFlipdishAccount**](RestApiArrayResultUserFlipdishAccount.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getrestaurantuserstores"></a>
+# **GetRestaurantUserStores**
+> RestApiArrayResultUserStoreInfo GetRestaurantUserStores (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetRestaurantUserStoresExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiArrayResultUserStoreInfo result = apiInstance.GetRestaurantUserStores(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetRestaurantUserStores: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiArrayResultUserStoreInfo**](RestApiArrayResultUserStoreInfo.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getroles"></a>
+# **GetRoles**
+> RestApiStringArrayResult GetRoles ()
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetRolesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+
+            try
+            {
+                RestApiStringArrayResult result = apiInstance.GetRoles();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetRoles: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**RestApiStringArrayResult**](RestApiStringArrayResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getrolesandunassignedroles"></a>
+# **GetRolesAndUnassignedRoles**
+> RestApiResultUserRole GetRolesAndUnassignedRoles (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetRolesAndUnassignedRolesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiResultUserRole result = apiInstance.GetRolesAndUnassignedRoles(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetRolesAndUnassignedRoles: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiResultUserRole**](RestApiResultUserRole.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getuserbyid"></a>
+# **GetUserById**
+> RestApiResultUserInfo GetUserById (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetUserByIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiResultUserInfo result = apiInstance.GetUserById(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetUserById: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiResultUserInfo**](RestApiResultUserInfo.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getuserdeliverylocationsforadmin"></a>
+# **GetUserDeliveryLocationsForAdmin**
+> RestApiArrayResultUserDeliveryLocationAdmin GetUserDeliveryLocationsForAdmin (int? userId, int? whiteLabelId = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetUserDeliveryLocationsForAdminExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var whiteLabelId = 56;  // int? |  (optional) 
+
+            try
+            {
+                RestApiArrayResultUserDeliveryLocationAdmin result = apiInstance.GetUserDeliveryLocationsForAdmin(userId, whiteLabelId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetUserDeliveryLocationsForAdmin: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **whiteLabelId** | **int?**|  | [optional] 
+
+### Return type
+
+[**RestApiArrayResultUserDeliveryLocationAdmin**](RestApiArrayResultUserDeliveryLocationAdmin.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getusernotes"></a>
+# **GetUserNotes**
+> RestApiArrayResultUserNote GetUserNotes (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetUserNotesExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiArrayResultUserNote result = apiInstance.GetUserNotes(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetUserNotes: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiArrayResultUserNote**](RestApiArrayResultUserNote.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getuserorderbyidforadmin"></a>
+# **GetUserOrderByIdForAdmin**
+> RestApiResultOrder GetUserOrderByIdForAdmin (int? userId, int? orderId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetUserOrderByIdForAdminExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var orderId = 56;  // int? | 
+
+            try
+            {
+                RestApiResultOrder result = apiInstance.GetUserOrderByIdForAdmin(userId, orderId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetUserOrderByIdForAdmin: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **orderId** | **int?**|  | 
+
+### Return type
+
+[**RestApiResultOrder**](RestApiResultOrder.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getuserordersforadmin"></a>
+# **GetUserOrdersForAdmin**
+> RestApiArrayResultUserOrderSummary GetUserOrdersForAdmin (int? userId, int? skip = null, int? take = null, string brandId = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetUserOrdersForAdminExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var skip = 56;  // int? |  (optional) 
+            var take = 56;  // int? |  (optional) 
+            var brandId = brandId_example;  // string |  (optional) 
+
+            try
+            {
+                RestApiArrayResultUserOrderSummary result = apiInstance.GetUserOrdersForAdmin(userId, skip, take, brandId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetUserOrdersForAdmin: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **skip** | **int?**|  | [optional] 
+ **take** | **int?**|  | [optional] 
+ **brandId** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiArrayResultUserOrderSummary**](RestApiArrayResultUserOrderSummary.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getusersmsconversationitems"></a>
+# **GetUserSmsConversationItems**
+> RestApiArrayResultUserSmsChatItem GetUserSmsConversationItems (int? userId, int? mostRecentCount = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetUserSmsConversationItemsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var mostRecentCount = 56;  // int? |  (optional) 
+
+            try
+            {
+                RestApiArrayResultUserSmsChatItem result = apiInstance.GetUserSmsConversationItems(userId, mostRecentCount);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.GetUserSmsConversationItems: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **mostRecentCount** | **int?**|  | [optional] 
+
+### Return type
+
+[**RestApiArrayResultUserSmsChatItem**](RestApiArrayResultUserSmsChatItem.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="hideuserdeliverylocation"></a>
+# **HideUserDeliveryLocation**
+> RestApiDefaultResponse HideUserDeliveryLocation (int? userId, int? deliveryLocationId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class HideUserDeliveryLocationExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var deliveryLocationId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.HideUserDeliveryLocation(userId, deliveryLocationId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.HideUserDeliveryLocation: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **deliveryLocationId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="markuserasfraudulent"></a>
+# **MarkUserAsFraudulent**
+> RestApiDefaultResponse MarkUserAsFraudulent (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class MarkUserAsFraudulentExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.MarkUserAsFraudulent(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.MarkUserAsFraudulent: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="markuserassuspicious"></a>
+# **MarkUserAsSuspicious**
+> RestApiDefaultResponse MarkUserAsSuspicious (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class MarkUserAsSuspiciousExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.MarkUserAsSuspicious(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.MarkUserAsSuspicious: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="removeflipdishaccountidforuser"></a>
+# **RemoveFlipdishAccountIdForUser**
+> RestApiDefaultResponse RemoveFlipdishAccountIdForUser (int? userId, int? accountId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class RemoveFlipdishAccountIdForUserExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var accountId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.RemoveFlipdishAccountIdForUser(userId, accountId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.RemoveFlipdishAccountIdForUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **accountId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="removeuserfromrole"></a>
+# **RemoveUserFromRole**
+> RestApiResultUserRole RemoveUserFromRole (int? userId, string roleName)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class RemoveUserFromRoleExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var roleName = roleName_example;  // string | 
+
+            try
+            {
+                RestApiResultUserRole result = apiInstance.RemoveUserFromRole(userId, roleName);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.RemoveUserFromRole: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **roleName** | **string**|  | 
+
+### Return type
+
+[**RestApiResultUserRole**](RestApiResultUserRole.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="resetmfa"></a>
+# **ResetMfa**
+> RestApiDefaultResponse ResetMfa (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class ResetMfaExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.ResetMfa(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.ResetMfa: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="searchflipdishaccounts"></a>
+# **SearchFlipdishAccounts**
+> RestApiArrayResultFlipdishAccountName SearchFlipdishAccounts (string searchPattern)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SearchFlipdishAccountsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var searchPattern = searchPattern_example;  // string | 
+
+            try
+            {
+                RestApiArrayResultFlipdishAccountName result = apiInstance.SearchFlipdishAccounts(searchPattern);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.SearchFlipdishAccounts: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **searchPattern** | **string**|  | 
+
+### Return type
+
+[**RestApiArrayResultFlipdishAccountName**](RestApiArrayResultFlipdishAccountName.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="searchusers"></a>
+# **SearchUsers**
+> RestApiPaginationResultUserSearch SearchUsers (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SearchUsersExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var searchQuery = searchQuery_example;  // string | 
+            var hasUserLoggedIn = true;  // bool? |  (optional) 
+            var userDiscriminator = userDiscriminator_example;  // string |  (optional) 
+            var searchIn = searchIn_example;  // string |  (optional) 
+            var pageIndex = 56;  // int? |  (optional) 
+            var pageSize = 56;  // int? |  (optional) 
+
+            try
+            {
+                RestApiPaginationResultUserSearch result = apiInstance.SearchUsers(searchQuery, hasUserLoggedIn, userDiscriminator, searchIn, pageIndex, pageSize);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.SearchUsers: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **searchQuery** | **string**|  | 
+ **hasUserLoggedIn** | **bool?**|  | [optional] 
+ **userDiscriminator** | **string**|  | [optional] 
+ **searchIn** | **string**|  | [optional] 
+ **pageIndex** | **int?**|  | [optional] 
+ **pageSize** | **int?**|  | [optional] 
+
+### Return type
+
+[**RestApiPaginationResultUserSearch**](RestApiPaginationResultUserSearch.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="senduserpushnotification"></a>
+# **SendUserPushNotification**
+> RestApiResultUserPushNotificationSentResult SendUserPushNotification (int? userId, SendUserPushNotificationRequest request)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SendUserPushNotificationExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var request = new SendUserPushNotificationRequest(); // SendUserPushNotificationRequest | 
+
+            try
+            {
+                RestApiResultUserPushNotificationSentResult result = apiInstance.SendUserPushNotification(userId, request);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.SendUserPushNotification: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **request** | [**SendUserPushNotificationRequest**](SendUserPushNotificationRequest.md)|  | 
+
+### Return type
+
+[**RestApiResultUserPushNotificationSentResult**](RestApiResultUserPushNotificationSentResult.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="sendusersms"></a>
+# **SendUserSms**
+> RestApiDefaultResponse SendUserSms (int? userId, SendUserSmsRequest request)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SendUserSmsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var request = new SendUserSmsRequest(); // SendUserSmsRequest | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.SendUserSms(userId, request);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.SendUserSms: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **request** | [**SendUserSmsRequest**](SendUserSmsRequest.md)|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setcustomername"></a>
+# **SetCustomerName**
+> RestApiDefaultResponse SetCustomerName (int? userId, string customerName)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GetPreviousOrderCountForStoreExample
+    public class SetCustomerNameExample
     {
         public void main()
         {
@@ -33,16 +1685,16 @@ namespace Example
 
             var apiInstance = new UsersApi();
             var userId = 56;  // int? | 
-            var storeId = 56;  // int? | 
+            var customerName = customerName_example;  // string | 
 
             try
             {
-                RestApiStringResult result = apiInstance.GetPreviousOrderCountForStore(userId, storeId);
+                RestApiDefaultResponse result = apiInstance.SetCustomerName(userId, customerName);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling UsersApi.GetPreviousOrderCountForStore: " + e.Message );
+                Debug.Print("Exception when calling UsersApi.SetCustomerName: " + e.Message );
             }
         }
     }
@@ -54,11 +1706,74 @@ namespace Example
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **userId** | **int?**|  | 
- **storeId** | **int?**|  | 
+ **customerName** | **string**|  | 
 
 ### Return type
 
-[**RestApiStringResult**](RestApiStringResult.md)
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setflipdishaccountidforuser"></a>
+# **SetFlipdishAccountIdForUser**
+> RestApiDefaultResponse SetFlipdishAccountIdForUser (int? userId, int? accountId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetFlipdishAccountIdForUserExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var accountId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.SetFlipdishAccountIdForUser(userId, accountId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.SetFlipdishAccountIdForUser: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **accountId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
 
 ### Authorization
 
@@ -71,23 +1786,23 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-<a name="getroles"></a>
-# **GetRoles**
-> RestApiStringArrayResult GetRoles ()
+<a name="setuserdeliverylocationcoordinates"></a>
+# **SetUserDeliveryLocationCoordinates**
+> RestApiDefaultResponse SetUserDeliveryLocationCoordinates (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request)
+
 
-Get role names
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class GetRolesExample
+    public class SetUserDeliveryLocationCoordinatesExample
     {
         public void main()
         {
@@ -95,16 +1810,18 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var deliveryLocationId = 56;  // int? | 
+            var request = new SetUserDeliveryLocationCoordinatesRequest(); // SetUserDeliveryLocationCoordinatesRequest | 
 
             try
             {
-                // Get role names
-                RestApiStringArrayResult result = apiInstance.GetRoles();
+                RestApiDefaultResponse result = apiInstance.SetUserDeliveryLocationCoordinates(userId, deliveryLocationId, request);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling UsersApi.GetRoles: " + e.Message );
+                Debug.Print("Exception when calling UsersApi.SetUserDeliveryLocationCoordinates: " + e.Message );
             }
         }
     }
@@ -112,11 +1829,205 @@ namespace Example
 ```
 
 ### Parameters
-This endpoint does not need any parameter.
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **deliveryLocationId** | **int?**|  | 
+ **request** | [**SetUserDeliveryLocationCoordinatesRequest**](SetUserDeliveryLocationCoordinatesRequest.md)|  | 
 
 ### Return type
 
-[**RestApiStringArrayResult**](RestApiStringArrayResult.md)
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setuserdeliverylocationfield"></a>
+# **SetUserDeliveryLocationField**
+> RestApiDefaultResponse SetUserDeliveryLocationField (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetUserDeliveryLocationFieldExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var deliveryLocationId = 56;  // int? | 
+            var request = new SetUserDeliveryLocationFieldRequest(); // SetUserDeliveryLocationFieldRequest | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.SetUserDeliveryLocationField(userId, deliveryLocationId, request);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.SetUserDeliveryLocationField: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **deliveryLocationId** | **int?**|  | 
+ **request** | [**SetUserDeliveryLocationFieldRequest**](SetUserDeliveryLocationFieldRequest.md)|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setuserlanguage"></a>
+# **SetUserLanguage**
+> RestApiDefaultResponse SetUserLanguage (int? userId, string languageId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetUserLanguageExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+            var languageId = languageId_example;  // string | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.SetUserLanguage(userId, languageId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.SetUserLanguage: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+ **languageId** | **string**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="unblockuserphonenumber"></a>
+# **UnblockUserPhoneNumber**
+> RestApiDefaultResponse UnblockUserPhoneNumber (int? userId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UnblockUserPhoneNumberExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new UsersApi();
+            var userId = 56;  // int? | 
+
+            try
+            {
+                RestApiDefaultResponse result = apiInstance.UnblockUserPhoneNumber(userId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling UsersApi.UnblockUserPhoneNumber: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **userId** | **int?**|  | 
+
+### Return type
+
+[**RestApiDefaultResponse**](RestApiDefaultResponse.md)
 
 ### Authorization
 
diff --git a/docs/ValidValue.md b/docs/ValidValue.md
index 08375979..bb770351 100644
--- a/docs/ValidValue.md
+++ b/docs/ValidValue.md
@@ -1,10 +1,10 @@
-# IO.Swagger.Model.ValidValue
+# Flipdish.Model.ValidValue
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Code** | **string** | Code | 
-**Name** | **string** | Name | 
+**Code** | **string** |  | 
+**Name** | **string** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/ValidationErrorResult.md b/docs/ValidationErrorResult.md
index b1a4102f..d91f08bb 100644
--- a/docs/ValidationErrorResult.md
+++ b/docs/ValidationErrorResult.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.ValidationErrorResult
+# Flipdish.Model.ValidationErrorResult
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/ValidityPeriod.md b/docs/ValidityPeriod.md
new file mode 100644
index 00000000..43fc9cbd
--- /dev/null
+++ b/docs/ValidityPeriod.md
@@ -0,0 +1,11 @@
+# Flipdish.Model.ValidityPeriod
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**DayOfWeek** | **string** | DayOfWeek. | [optional] 
+**StartTime** | **string** | StartTime. | [optional] 
+**EndTime** | **string** | EndTime. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/Voucher.md b/docs/Voucher.md
index cf57b199..90fd082a 100644
--- a/docs/Voucher.md
+++ b/docs/Voucher.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.Voucher
+# Flipdish.Model.Voucher
 ## Properties
 
 Name | Type | Description | Notes
@@ -6,16 +6,15 @@ Name | Type | Description | Notes
 **VoucherId** | **int?** | Voucher Id | [optional] 
 **Status** | **string** | Voucher Status | [optional] 
 **VoucherType** | **string** | Voucher Type | [optional] 
-**VoucherSubType** | **string** | Voucher Sub Type | [optional] 
 **Currency** | **string** | Currency of the voucher | [optional] 
-**Stores** | **List&lt;int?&gt;** | Stores that this voucher applies to | [optional] 
 **StoreNames** | **List&lt;string&gt;** | Stores that this voucher applies to | [optional] 
-**AddItemDetails** | [**AddItemDetails**](AddItemDetails.md) | Add item details | [optional] 
+**PromotionDetails** | [**PromotionDetails**](PromotionDetails.md) | Promotion details | [optional] 
 **CreditNoteDetails** | [**CreditNoteDetails**](CreditNoteDetails.md) | Credit note details | [optional] 
 **LumpDiscountDetails** | [**LumpDiscountDetails**](LumpDiscountDetails.md) | Lump discount details | [optional] 
 **PercentDiscountDetails** | [**PercentDiscountDetails**](PercentDiscountDetails.md) | Percent discount details | [optional] 
 **Code** | **string** | Voucher Code | [optional] 
 **Description** | **string** | Voucher Description (Visible on printout) | [optional] 
+**Stores** | **List&lt;int?&gt;** | Stores that this voucher applies to | [optional] 
 **ValidOnOrdersOver** | **double?** | Valid on orders on or above | [optional] 
 **TakesPriority** | **bool?** | Takes priority | [optional] 
 **IsEnabled** | **bool?** | Is voucher enabled | [optional] 
@@ -28,8 +27,16 @@ Name | Type | Description | Notes
 **IsValidForFirstOrderOnly** | **bool?** | Valid only on the first order by the customer | [optional] 
 **IsValidOncePerCustomer** | **bool?** | Valid once per customer | [optional] 
 **IsValidOnlyOnce** | **bool?** | Valid only once, by any customer (once used cannot be used again by any other customer) | [optional] 
+**IsDiscoverable** | **bool?** | Enables the voucher to be offered in the Voucher Discoverability feature | [optional] 
+**IsPromoted** | **bool?** | Marks the voucher as promoted | [optional] 
+**ForceDiscount** | **bool?** | Force the discount to be applied which bypasses some menu restrictions | [optional] 
 **StartDate** | **DateTime?** | Voucher Starts On (Time in UTC) | [optional] 
 **ExpiryDate** | **DateTime?** | Voucher Expires On (Time in UTC) | [optional] 
+**ChannelRestrictions** | **List&lt;string&gt;** | Limit the channels this voucher can be used on | [optional] 
+**ValidityPeriods** | [**List&lt;ValidityPeriod&gt;**](ValidityPeriod.md) | Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated. | [optional] 
+**VoucherSubType** | **string** | Voucher Subtype | [optional] 
+**CustomerId** | **int?** | Customer UserID | [optional] 
+**MaxRedemptions** | **int?** | Maximum number of times the voucher can be redeemed (used) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/VoucherAppliedEvent.md b/docs/VoucherAppliedEvent.md
new file mode 100644
index 00000000..884ca858
--- /dev/null
+++ b/docs/VoucherAppliedEvent.md
@@ -0,0 +1,19 @@
+# Flipdish.Model.VoucherAppliedEvent
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**VoucherId** | **int?** | Voucher Id | [optional] 
+**EventName** | **string** | The event name | [optional] 
+**OrderId** | **int?** | Order id | [optional] 
+**FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
+**CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
+**Position** | **int?** | Position | [optional] 
+**AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
+**IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/VoucherBase.md b/docs/VoucherBase.md
deleted file mode 100644
index 1a9c1bd6..00000000
--- a/docs/VoucherBase.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# IO.Swagger.Model.VoucherBase
-## Properties
-
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**Code** | **string** | Voucher Code | [optional] 
-**Description** | **string** | Voucher Description (Visible on printout) | [optional] 
-**ValidOnOrdersOver** | **double?** | Valid on orders on or above | [optional] 
-**TakesPriority** | **bool?** | Takes priority | [optional] 
-**IsEnabled** | **bool?** | Is voucher enabled | [optional] 
-**IsAutomaticallyApplied** | **bool?** | Is voucher automatically applied | [optional] 
-**IncludeDeliveryFee** | **bool?** | Include delivery fees | [optional] 
-**IsValidForDeliveryOrders** | **bool?** | Valid for delivery orders | [optional] 
-**IsValidForPickupOrders** | **bool?** | Valid for pickup orders | [optional] 
-**IsValidForOrdersPayedOnline** | **bool?** | Valid for orders payed online | [optional] 
-**IsValidForOrdersPayedByCash** | **bool?** | Valid for orders payed in cash | [optional] 
-**IsValidForFirstOrderOnly** | **bool?** | Valid only on the first order by the customer | [optional] 
-**IsValidOncePerCustomer** | **bool?** | Valid once per customer | [optional] 
-**IsValidOnlyOnce** | **bool?** | Valid only once, by any customer (once used cannot be used again by any other customer) | [optional] 
-**StartDate** | **DateTime?** | Voucher Starts On (Time in UTC) | [optional] 
-**ExpiryDate** | **DateTime?** | Voucher Expires On (Time in UTC) | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
diff --git a/docs/VoucherCreatedEvent.md b/docs/VoucherCreatedEvent.md
index e01887c8..f2ca1081 100644
--- a/docs/VoucherCreatedEvent.md
+++ b/docs/VoucherCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.VoucherCreatedEvent
+# Flipdish.Model.VoucherCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/VoucherDataPoint.md b/docs/VoucherDataPoint.md
index ae044d34..5a22eca9 100644
--- a/docs/VoucherDataPoint.md
+++ b/docs/VoucherDataPoint.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.VoucherDataPoint
+# Flipdish.Model.VoucherDataPoint
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/VoucherDeletedEvent.md b/docs/VoucherDeletedEvent.md
index a4e2aa54..10c86004 100644
--- a/docs/VoucherDeletedEvent.md
+++ b/docs/VoucherDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.VoucherDeletedEvent
+# Flipdish.Model.VoucherDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/VoucherSummary.md b/docs/VoucherSummary.md
index 7fe2f598..d597a41f 100644
--- a/docs/VoucherSummary.md
+++ b/docs/VoucherSummary.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.VoucherSummary
+# Flipdish.Model.VoucherSummary
 ## Properties
 
 Name | Type | Description | Notes
@@ -10,6 +10,10 @@ Name | Type | Description | Notes
 **VoucherSubType** | **string** | Voucher Sub Type | [optional] 
 **Description** | **string** | Voucher Description (Visible on printout) | [optional] 
 **IsEnabled** | **bool?** | Is voucher enabled | [optional] 
+**IsPromoted** | **bool?** | Marks the voucher as promoted | [optional] 
+**StoreNames** | **List&lt;string&gt;** | Store names associated with this voucher | [optional] 
+**IsAvailableOnAllStores** | **bool?** | True if the voucher is available on all active stores in the app | [optional] 
+**ChannelRestrictions** | **List&lt;string&gt;** | Channels the voucher is restricted to | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/VoucherUpdatedEvent.md b/docs/VoucherUpdatedEvent.md
index cd0cd077..4324a388 100644
--- a/docs/VoucherUpdatedEvent.md
+++ b/docs/VoucherUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.VoucherUpdatedEvent
+# Flipdish.Model.VoucherUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -12,7 +12,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/VoucherWithStats.md b/docs/VoucherWithStats.md
index c1adacfa..c8e0d26e 100644
--- a/docs/VoucherWithStats.md
+++ b/docs/VoucherWithStats.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.VoucherWithStats
+# Flipdish.Model.VoucherWithStats
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,16 +11,15 @@ Name | Type | Description | Notes
 **VoucherId** | **int?** | Voucher Id | [optional] 
 **Status** | **string** | Voucher Status | [optional] 
 **VoucherType** | **string** | Voucher Type | [optional] 
-**VoucherSubType** | **string** | Voucher Sub Type | [optional] 
 **Currency** | **string** | Currency of the voucher | [optional] 
-**Stores** | **List&lt;int?&gt;** | Stores that this voucher applies to | [optional] 
 **StoreNames** | **List&lt;string&gt;** | Stores that this voucher applies to | [optional] 
-**AddItemDetails** | [**AddItemDetails**](AddItemDetails.md) | Add item details | [optional] 
+**PromotionDetails** | [**PromotionDetails**](PromotionDetails.md) | Promotion details | [optional] 
 **CreditNoteDetails** | [**CreditNoteDetails**](CreditNoteDetails.md) | Credit note details | [optional] 
 **LumpDiscountDetails** | [**LumpDiscountDetails**](LumpDiscountDetails.md) | Lump discount details | [optional] 
 **PercentDiscountDetails** | [**PercentDiscountDetails**](PercentDiscountDetails.md) | Percent discount details | [optional] 
 **Code** | **string** | Voucher Code | [optional] 
 **Description** | **string** | Voucher Description (Visible on printout) | [optional] 
+**Stores** | **List&lt;int?&gt;** | Stores that this voucher applies to | [optional] 
 **ValidOnOrdersOver** | **double?** | Valid on orders on or above | [optional] 
 **TakesPriority** | **bool?** | Takes priority | [optional] 
 **IsEnabled** | **bool?** | Is voucher enabled | [optional] 
@@ -33,8 +32,16 @@ Name | Type | Description | Notes
 **IsValidForFirstOrderOnly** | **bool?** | Valid only on the first order by the customer | [optional] 
 **IsValidOncePerCustomer** | **bool?** | Valid once per customer | [optional] 
 **IsValidOnlyOnce** | **bool?** | Valid only once, by any customer (once used cannot be used again by any other customer) | [optional] 
+**IsDiscoverable** | **bool?** | Enables the voucher to be offered in the Voucher Discoverability feature | [optional] 
+**IsPromoted** | **bool?** | Marks the voucher as promoted | [optional] 
+**ForceDiscount** | **bool?** | Force the discount to be applied which bypasses some menu restrictions | [optional] 
 **StartDate** | **DateTime?** | Voucher Starts On (Time in UTC) | [optional] 
 **ExpiryDate** | **DateTime?** | Voucher Expires On (Time in UTC) | [optional] 
+**ChannelRestrictions** | **List&lt;string&gt;** | Limit the channels this voucher can be used on | [optional] 
+**ValidityPeriods** | [**List&lt;ValidityPeriod&gt;**](ValidityPeriod.md) | Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated. | [optional] 
+**VoucherSubType** | **string** | Voucher Subtype | [optional] 
+**CustomerId** | **int?** | Customer UserID | [optional] 
+**MaxRedemptions** | **int?** | Maximum number of times the voucher can be redeemed (used) | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/VouchersApi.md b/docs/VouchersApi.md
index ad471291..887749a2 100644
--- a/docs/VouchersApi.md
+++ b/docs/VouchersApi.md
@@ -1,29 +1,34 @@
-# IO.Swagger.Api.VouchersApi
+# Flipdish.Api.VouchersApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CreateVoucher**](VouchersApi.md#createvoucher) | **POST** /api/v1.0/vouchers/{appId} | [PRIVATE API] Create voucher
-[**GetVoucherById**](VouchersApi.md#getvoucherbyid) | **GET** /api/v1.0/vouchers/{voucherId} | [PRIVATE API] Get voucher by identifier
-[**GetVoucherStatsById**](VouchersApi.md#getvoucherstatsbyid) | **GET** /api/v1.0/vouchers/stats/{voucherId} | [PRIVATE API] Get voucher stats by identifier
-[**GetVouchers**](VouchersApi.md#getvouchers) | **GET** /api/v1.0/{appId}/vouchers/summaries | [PRIVATE API] Get vouchers summaries for App Id
-[**UpdateVoucher**](VouchersApi.md#updatevoucher) | **POST** /api/v1.0/vouchers/{voucherId} | [PRIVATE API] Updates voucher
+[**CreateVoucher**](VouchersApi.md#createvoucher) | **POST** /api/v1.0/vouchers/{appId} | 
+[**GetVoucherByCode**](VouchersApi.md#getvoucherbycode) | **GET** /api/v1.0/{appId}/vouchers/code/{code} | 
+[**GetVoucherById**](VouchersApi.md#getvoucherbyid) | **GET** /api/v1.0/vouchers/{voucherId} | 
+[**GetVoucherStatsById**](VouchersApi.md#getvoucherstatsbyid) | **GET** /api/v1.0/vouchers/stats/{voucherId} | 
+[**GetVoucherValidityPeriods**](VouchersApi.md#getvouchervalidityperiods) | **GET** /api/v1.0/{appId}/vouchers/{voucherId}/validity-periods | 
+[**GetVouchers**](VouchersApi.md#getvouchers) | **GET** /api/v1.0/{appId}/vouchers/summaries | 
+[**GetVouchersByCustomerForApp**](VouchersApi.md#getvouchersbycustomerforapp) | **GET** /api/v1.0/vouchers/{appId}/customer/{customerId} | 
+[**SetVoucherValidityPeriodsSimplified**](VouchersApi.md#setvouchervalidityperiodssimplified) | **POST** /api/v1.0/{appId}/vouchers/{voucherId}/validity-periods-simplified | 
+[**UpdateVoucher**](VouchersApi.md#updatevoucher) | **POST** /api/v1.0/vouchers/{voucherId} | 
+[**UpdateVoucherUsage**](VouchersApi.md#updatevoucherusage) | **POST** /api/v1.0/{appId}/vouchers/{voucherId}/usage | 
 
 
 <a name="createvoucher"></a>
 # **CreateVoucher**
 > RestApiResultVoucherWithStats CreateVoucher (string appId, CreateVoucher voucher)
 
-[PRIVATE API] Create voucher
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -35,12 +40,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new VouchersApi();
-            var appId = appId_example;  // string | App Name Id
-            var voucher = new CreateVoucher(); // CreateVoucher | Voucher Details
+            var appId = appId_example;  // string | 
+            var voucher = new CreateVoucher(); // CreateVoucher | 
 
             try
             {
-                // [PRIVATE API] Create voucher
                 RestApiResultVoucherWithStats result = apiInstance.CreateVoucher(appId, voucher);
                 Debug.WriteLine(result);
             }
@@ -57,8 +61,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| App Name Id | 
- **voucher** | [**CreateVoucher**](CreateVoucher.md)| Voucher Details | 
+ **appId** | **string**|  | 
+ **voucher** | [**CreateVoucher**](CreateVoucher.md)|  | 
 
 ### Return type
 
@@ -75,19 +79,82 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getvoucherbycode"></a>
+# **GetVoucherByCode**
+> RestApiResultVoucher GetVoucherByCode (string appId, string code)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetVoucherByCodeExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new VouchersApi();
+            var appId = appId_example;  // string | 
+            var code = code_example;  // string | 
+
+            try
+            {
+                RestApiResultVoucher result = apiInstance.GetVoucherByCode(appId, code);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling VouchersApi.GetVoucherByCode: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **code** | **string**|  | 
+
+### Return type
+
+[**RestApiResultVoucher**](RestApiResultVoucher.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getvoucherbyid"></a>
 # **GetVoucherById**
 > RestApiResultVoucherWithStats GetVoucherById (int? voucherId)
 
-[PRIVATE API] Get voucher by identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -99,11 +166,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new VouchersApi();
-            var voucherId = 56;  // int? | Id of the voucher
+            var voucherId = 56;  // int? | 
 
             try
             {
-                // [PRIVATE API] Get voucher by identifier
                 RestApiResultVoucherWithStats result = apiInstance.GetVoucherById(voucherId);
                 Debug.WriteLine(result);
             }
@@ -120,7 +186,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **voucherId** | **int?**| Id of the voucher | 
+ **voucherId** | **int?**|  | 
 
 ### Return type
 
@@ -141,15 +207,15 @@ Name | Type | Description  | Notes
 # **GetVoucherStatsById**
 > RestApiArrayResultVoucherDataPoint GetVoucherStatsById (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
 
-[PRIVATE API] Get voucher stats by identifier
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -161,13 +227,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new VouchersApi();
-            var voucherId = 56;  // int? | Id of the voucher
-            var aggregateDataBy = aggregateDataBy_example;  // string | Aggregate data by day \\ week \\ month
-            var dataPointLimit = 56;  // int? | Amount of data points per request (optional) 
+            var voucherId = 56;  // int? | 
+            var aggregateDataBy = aggregateDataBy_example;  // string | 
+            var dataPointLimit = 56;  // int? |  (optional) 
 
             try
             {
-                // [PRIVATE API] Get voucher stats by identifier
                 RestApiArrayResultVoucherDataPoint result = apiInstance.GetVoucherStatsById(voucherId, aggregateDataBy, dataPointLimit);
                 Debug.WriteLine(result);
             }
@@ -184,9 +249,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **voucherId** | **int?**| Id of the voucher | 
- **aggregateDataBy** | **string**| Aggregate data by day \\ week \\ month | 
- **dataPointLimit** | **int?**| Amount of data points per request | [optional] 
+ **voucherId** | **int?**|  | 
+ **aggregateDataBy** | **string**|  | 
+ **dataPointLimit** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -203,19 +268,81 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getvouchervalidityperiods"></a>
+# **GetVoucherValidityPeriods**
+> void GetVoucherValidityPeriods (string appId, int? voucherId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetVoucherValidityPeriodsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new VouchersApi();
+            var appId = appId_example;  // string | 
+            var voucherId = 56;  // int? | 
+
+            try
+            {
+                apiInstance.GetVoucherValidityPeriods(appId, voucherId);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling VouchersApi.GetVoucherValidityPeriods: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **voucherId** | **int?**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="getvouchers"></a>
 # **GetVouchers**
-> RestApiPaginationResultVoucherSummary GetVouchers (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null)
+> RestApiPaginationResultVoucherSummary GetVouchers (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null)
+
 
-[PRIVATE API] Get vouchers summaries for App Id
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -227,19 +354,19 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new VouchersApi();
-            var appId = appId_example;  // string | Application Id
-            var pageIndex = 56;  // int? | Page Number (optional) 
-            var pageSize = 56;  // int? | Page Size (optional) 
-            var searchCodes = new List<string>(); // List<string> | Search by Voucher Code\\s (optional) 
-            var statusSearch = statusSearch_example;  // List<string> | Search by Status (optional) 
-            var typeSearch = typeSearch_example;  // List<string> | Search by Type (optional) 
-            var subTypeSearch = subTypeSearch_example;  // List<string> | Search by Sub Type (optional) 
-            var storeIds = new List<int?>(); // List<int?> | Search by Store Ids (optional) 
+            var appId = appId_example;  // string | 
+            var pageIndex = 56;  // int? |  (optional) 
+            var pageSize = 56;  // int? |  (optional) 
+            var searchCodes = new List<string>(); // List<string> |  (optional) 
+            var statusSearch = statusSearch_example;  // List<string> |  (optional) 
+            var typeSearch = typeSearch_example;  // List<string> |  (optional) 
+            var subTypeSearch = subTypeSearch_example;  // List<string> |  (optional) 
+            var storeIds = new List<int?>(); // List<int?> |  (optional) 
+            var channelRestrictions = channelRestrictions_example;  // List<string> |  (optional) 
 
             try
             {
-                // [PRIVATE API] Get vouchers summaries for App Id
-                RestApiPaginationResultVoucherSummary result = apiInstance.GetVouchers(appId, pageIndex, pageSize, searchCodes, statusSearch, typeSearch, subTypeSearch, storeIds);
+                RestApiPaginationResultVoucherSummary result = apiInstance.GetVouchers(appId, pageIndex, pageSize, searchCodes, statusSearch, typeSearch, subTypeSearch, storeIds, channelRestrictions);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -255,14 +382,15 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application Id | 
- **pageIndex** | **int?**| Page Number | [optional] 
- **pageSize** | **int?**| Page Size | [optional] 
- **searchCodes** | [**List&lt;string&gt;**](string.md)| Search by Voucher Code\\s | [optional] 
- **statusSearch** | **List&lt;string&gt;**| Search by Status | [optional] 
- **typeSearch** | **List&lt;string&gt;**| Search by Type | [optional] 
- **subTypeSearch** | **List&lt;string&gt;**| Search by Sub Type | [optional] 
- **storeIds** | [**List&lt;int?&gt;**](int?.md)| Search by Store Ids | [optional] 
+ **appId** | **string**|  | 
+ **pageIndex** | **int?**|  | [optional] 
+ **pageSize** | **int?**|  | [optional] 
+ **searchCodes** | [**List&lt;string&gt;**](string.md)|  | [optional] 
+ **statusSearch** | **List&lt;string&gt;**|  | [optional] 
+ **typeSearch** | **List&lt;string&gt;**|  | [optional] 
+ **subTypeSearch** | **List&lt;string&gt;**|  | [optional] 
+ **storeIds** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
+ **channelRestrictions** | **List&lt;string&gt;**|  | [optional] 
 
 ### Return type
 
@@ -279,19 +407,146 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="getvouchersbycustomerforapp"></a>
+# **GetVouchersByCustomerForApp**
+> RestApiArrayResultVoucherSummary GetVouchersByCustomerForApp (string appId, int? customerId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetVouchersByCustomerForAppExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new VouchersApi();
+            var appId = appId_example;  // string | 
+            var customerId = 56;  // int? | 
+
+            try
+            {
+                RestApiArrayResultVoucherSummary result = apiInstance.GetVouchersByCustomerForApp(appId, customerId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling VouchersApi.GetVouchersByCustomerForApp: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **customerId** | **int?**|  | 
+
+### Return type
+
+[**RestApiArrayResultVoucherSummary**](RestApiArrayResultVoucherSummary.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="setvouchervalidityperiodssimplified"></a>
+# **SetVoucherValidityPeriodsSimplified**
+> void SetVoucherValidityPeriodsSimplified (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SetVoucherValidityPeriodsSimplifiedExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new VouchersApi();
+            var appId = appId_example;  // string | 
+            var voucherId = 56;  // int? | 
+            var request = new SetVoucherValidityPeriodsSimplifiedRequest(); // SetVoucherValidityPeriodsSimplifiedRequest | 
+
+            try
+            {
+                apiInstance.SetVoucherValidityPeriodsSimplified(appId, voucherId, request);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling VouchersApi.SetVoucherValidityPeriodsSimplified: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **voucherId** | **int?**|  | 
+ **request** | [**SetVoucherValidityPeriodsSimplifiedRequest**](SetVoucherValidityPeriodsSimplifiedRequest.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 <a name="updatevoucher"></a>
 # **UpdateVoucher**
-> RestApiResultVoucherWithStats UpdateVoucher (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null)
+> RestApiResultVoucherWithStats UpdateVoucher (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null)
+
 
-[PRIVATE API] Updates voucher
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -303,17 +558,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new VouchersApi();
-            var voucherId = 56;  // int? | Id of the voucher
-            var voucher = new VoucherBase(); // VoucherBase | Updated details for the voucher
+            var voucherId = 56;  // int? | 
+            var voucher = new UpdateVoucher(); // UpdateVoucher | 
             var storeId = new List<int?>(); // List<int?> |  (optional) 
-            var percentValue = 56;  // int? | Percent voucher value (can have 1 of 3) (optional) 
-            var lumpValue = 1.2;  // double? | Lump voucher value (can have 1 of 3) (optional) 
-            var freeItemId = 56;  // int? | Free Item Id (can have 1 of 3) (optional) 
+            var percentValue = 56;  // int? |  (optional) 
+            var lumpValue = 1.2;  // double? |  (optional) 
+            var maxDiscountAmount = 1.2;  // double? |  (optional) 
 
             try
             {
-                // [PRIVATE API] Updates voucher
-                RestApiResultVoucherWithStats result = apiInstance.UpdateVoucher(voucherId, voucher, storeId, percentValue, lumpValue, freeItemId);
+                RestApiResultVoucherWithStats result = apiInstance.UpdateVoucher(voucherId, voucher, storeId, percentValue, lumpValue, maxDiscountAmount);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
@@ -329,12 +583,12 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **voucherId** | **int?**| Id of the voucher | 
- **voucher** | [**VoucherBase**](VoucherBase.md)| Updated details for the voucher | 
+ **voucherId** | **int?**|  | 
+ **voucher** | [**UpdateVoucher**](UpdateVoucher.md)|  | 
  **storeId** | [**List&lt;int?&gt;**](int?.md)|  | [optional] 
- **percentValue** | **int?**| Percent voucher value (can have 1 of 3) | [optional] 
- **lumpValue** | **double?**| Lump voucher value (can have 1 of 3) | [optional] 
- **freeItemId** | **int?**| Free Item Id (can have 1 of 3) | [optional] 
+ **percentValue** | **int?**|  | [optional] 
+ **lumpValue** | **double?**|  | [optional] 
+ **maxDiscountAmount** | **double?**|  | [optional] 
 
 ### Return type
 
@@ -351,3 +605,67 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+<a name="updatevoucherusage"></a>
+# **UpdateVoucherUsage**
+> void UpdateVoucherUsage (string appId, int? voucherId, UpdateVoucherUsage voucherUsage)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UpdateVoucherUsageExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new VouchersApi();
+            var appId = appId_example;  // string | 
+            var voucherId = 56;  // int? | 
+            var voucherUsage = new UpdateVoucherUsage(); // UpdateVoucherUsage | 
+
+            try
+            {
+                apiInstance.UpdateVoucherUsage(appId, voucherId, voucherUsage);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling VouchersApi.UpdateVoucherUsage: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **voucherId** | **int?**|  | 
+ **voucherUsage** | [**UpdateVoucherUsage**](UpdateVoucherUsage.md)|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/WaitHandle.md b/docs/WaitHandle.md
new file mode 100644
index 00000000..258602b9
--- /dev/null
+++ b/docs/WaitHandle.md
@@ -0,0 +1,10 @@
+# Flipdish.Model.WaitHandle
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Handle** | **Object** |  | [optional] 
+**SafeWaitHandle** | [**SafeWaitHandle**](SafeWaitHandle.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/WebhookEventSample.md b/docs/WebhookEventSample.md
index bb0396f6..269c2d2c 100644
--- a/docs/WebhookEventSample.md
+++ b/docs/WebhookEventSample.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebhookEventSample
+# Flipdish.Model.WebhookEventSample
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/WebhookLog.md b/docs/WebhookLog.md
index 4045f4af..df373dce 100644
--- a/docs/WebhookLog.md
+++ b/docs/WebhookLog.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebhookLog
+# Flipdish.Model.WebhookLog
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/WebhookSubscription.md b/docs/WebhookSubscription.md
index fbe559e6..60bd3775 100644
--- a/docs/WebhookSubscription.md
+++ b/docs/WebhookSubscription.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebhookSubscription
+# Flipdish.Model.WebhookSubscription
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/WebhookSubscriptionCreatedEvent.md b/docs/WebhookSubscriptionCreatedEvent.md
index 626c37a0..86369e91 100644
--- a/docs/WebhookSubscriptionCreatedEvent.md
+++ b/docs/WebhookSubscriptionCreatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebhookSubscriptionCreatedEvent
+# Flipdish.Model.WebhookSubscriptionCreatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,7 +9,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/WebhookSubscriptionDeletedEvent.md b/docs/WebhookSubscriptionDeletedEvent.md
index 0504a315..8743f89c 100644
--- a/docs/WebhookSubscriptionDeletedEvent.md
+++ b/docs/WebhookSubscriptionDeletedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebhookSubscriptionDeletedEvent
+# Flipdish.Model.WebhookSubscriptionDeletedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,7 +9,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/WebhookSubscriptionEventInfo.md b/docs/WebhookSubscriptionEventInfo.md
index 7af01f2c..592be9b5 100644
--- a/docs/WebhookSubscriptionEventInfo.md
+++ b/docs/WebhookSubscriptionEventInfo.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebhookSubscriptionEventInfo
+# Flipdish.Model.WebhookSubscriptionEventInfo
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/WebhookSubscriptionUpdatedEvent.md b/docs/WebhookSubscriptionUpdatedEvent.md
index ec4f2cb3..f818f2dc 100644
--- a/docs/WebhookSubscriptionUpdatedEvent.md
+++ b/docs/WebhookSubscriptionUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebhookSubscriptionUpdatedEvent
+# Flipdish.Model.WebhookSubscriptionUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -9,7 +9,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/WebhooksApi.md b/docs/WebhooksApi.md
index 119c61a1..5f1deede 100644
--- a/docs/WebhooksApi.md
+++ b/docs/WebhooksApi.md
@@ -1,38 +1,38 @@
-# IO.Swagger.Api.WebhooksApi
+# Flipdish.Api.WebhooksApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**CraeteWebhookSubscription**](WebhooksApi.md#craetewebhooksubscription) | **POST** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions | Create a webhook subscription for you Oauth App
-[**CreateWebhookSubscriptionEventNames**](WebhooksApi.md#createwebhooksubscriptioneventnames) | **POST** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName} | Add event name to your webhook subscription
-[**DeleteWebhookSubscription**](WebhooksApi.md#deletewebhooksubscription) | **DELETE** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId} | Delete you webhook subscription
-[**DeleteWebhookSubscriptionEventName**](WebhooksApi.md#deletewebhooksubscriptioneventname) | **DELETE** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName} | Remove event name to your webhook subscription
-[**GetWebhookEventNames**](WebhooksApi.md#getwebhookeventnames) | **GET** /api/v1.0/{appId}/webhooks/events | Get all webhook subscription event names
-[**GetWebhookEventNamesBySubscriptionId**](WebhooksApi.md#getwebhookeventnamesbysubscriptionid) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events | Get your webhook subscriptions selected event names
-[**GetWebhookEventSample**](WebhooksApi.md#getwebhookeventsample) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}/test | Get a sample event from a webhook subscription
-[**GetWebhookLogs**](WebhooksApi.md#getwebhooklogs) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/logs | Get logs for your webhook subscription
-[**GetWebhookSubscriptions**](WebhooksApi.md#getwebhooksubscriptions) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions | Get all webhook subscriptions by your Oauth App id
-[**UpdateWebhookSubscription**](WebhooksApi.md#updatewebhooksubscription) | **PUT** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId} | Update a webhook subscription object
+[**CreateWebhookSubscription**](WebhooksApi.md#createwebhooksubscription) | **POST** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions | 
+[**CreateWebhookSubscriptionEventNames**](WebhooksApi.md#createwebhooksubscriptioneventnames) | **POST** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName} | 
+[**DeleteWebhookSubscription**](WebhooksApi.md#deletewebhooksubscription) | **DELETE** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId} | 
+[**DeleteWebhookSubscriptionEventName**](WebhooksApi.md#deletewebhooksubscriptioneventname) | **DELETE** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName} | 
+[**GetWebhookEventNames**](WebhooksApi.md#getwebhookeventnames) | **GET** /api/v1.0/{appId}/webhooks/events | 
+[**GetWebhookEventNamesBySubscriptionId**](WebhooksApi.md#getwebhookeventnamesbysubscriptionid) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events | 
+[**GetWebhookEventSample**](WebhooksApi.md#getwebhookeventsample) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}/test | 
+[**GetWebhookLogs**](WebhooksApi.md#getwebhooklogs) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/logs | 
+[**GetWebhookSubscriptions**](WebhooksApi.md#getwebhooksubscriptions) | **GET** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions | 
+[**UpdateWebhookSubscription**](WebhooksApi.md#updatewebhooksubscription) | **PUT** /api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId} | 
 
 
-<a name="craetewebhooksubscription"></a>
-# **CraeteWebhookSubscription**
-> RestApiIntegerResult CraeteWebhookSubscription (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
+<a name="createwebhooksubscription"></a>
+# **CreateWebhookSubscription**
+> RestApiIntegerResult CreateWebhookSubscription (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
+
 
-Create a webhook subscription for you Oauth App
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
-    public class CraeteWebhookSubscriptionExample
+    public class CreateWebhookSubscriptionExample
     {
         public void main()
         {
@@ -40,19 +40,18 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebhooksApi();
-            var oauthAppId = oauthAppId_example;  // string | Oauth App identifier
-            var webhookSubscription = new WebhookSubscription(); // WebhookSubscription | Webhook subscription object
+            var oauthAppId = oauthAppId_example;  // string | 
+            var webhookSubscription = new WebhookSubscription(); // WebhookSubscription | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Create a webhook subscription for you Oauth App
-                RestApiIntegerResult result = apiInstance.CraeteWebhookSubscription(oauthAppId, webhookSubscription, appId);
+                RestApiIntegerResult result = apiInstance.CreateWebhookSubscription(oauthAppId, webhookSubscription, appId);
                 Debug.WriteLine(result);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling WebhooksApi.CraeteWebhookSubscription: " + e.Message );
+                Debug.Print("Exception when calling WebhooksApi.CreateWebhookSubscription: " + e.Message );
             }
         }
     }
@@ -63,8 +62,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Oauth App identifier | 
- **webhookSubscription** | [**WebhookSubscription**](WebhookSubscription.md)| Webhook subscription object | 
+ **oauthAppId** | **string**|  | 
+ **webhookSubscription** | [**WebhookSubscription**](WebhookSubscription.md)|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -86,15 +85,15 @@ Name | Type | Description  | Notes
 # **CreateWebhookSubscriptionEventNames**
 > void CreateWebhookSubscriptionEventNames (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
 
-Add event name to your webhook subscription
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -106,14 +105,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebhooksApi();
-            var oauthAppId = oauthAppId_example;  // string | Oauth App identifier
-            var webhookSubscriptionId = 56;  // int? | Webhook subscription identifier
-            var eventName = eventName_example;  // string | Webhook subscription event name
+            var oauthAppId = oauthAppId_example;  // string | 
+            var webhookSubscriptionId = 56;  // int? | 
+            var eventName = eventName_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Add event name to your webhook subscription
                 apiInstance.CreateWebhookSubscriptionEventNames(oauthAppId, webhookSubscriptionId, eventName, appId);
             }
             catch (Exception e)
@@ -129,9 +127,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Oauth App identifier | 
- **webhookSubscriptionId** | **int?**| Webhook subscription identifier | 
- **eventName** | **string**| Webhook subscription event name | 
+ **oauthAppId** | **string**|  | 
+ **webhookSubscriptionId** | **int?**|  | 
+ **eventName** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -153,15 +151,15 @@ void (empty response body)
 # **DeleteWebhookSubscription**
 > void DeleteWebhookSubscription (string oauthAppId, int? webhookSubscriptionId, string appId)
 
-Delete you webhook subscription
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -173,13 +171,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebhooksApi();
-            var oauthAppId = oauthAppId_example;  // string | Oauth App identifier
-            var webhookSubscriptionId = 56;  // int? | Webhook subscription identifier
+            var oauthAppId = oauthAppId_example;  // string | 
+            var webhookSubscriptionId = 56;  // int? | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Delete you webhook subscription
                 apiInstance.DeleteWebhookSubscription(oauthAppId, webhookSubscriptionId, appId);
             }
             catch (Exception e)
@@ -195,8 +192,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Oauth App identifier | 
- **webhookSubscriptionId** | **int?**| Webhook subscription identifier | 
+ **oauthAppId** | **string**|  | 
+ **webhookSubscriptionId** | **int?**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -218,15 +215,15 @@ void (empty response body)
 # **DeleteWebhookSubscriptionEventName**
 > void DeleteWebhookSubscriptionEventName (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
 
-Remove event name to your webhook subscription
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -238,14 +235,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebhooksApi();
-            var oauthAppId = oauthAppId_example;  // string | Oauth App identifier
-            var webhookSubscriptionId = 56;  // int? | Webhook subscription identifier
-            var eventName = eventName_example;  // string | Webhook subscription event name
+            var oauthAppId = oauthAppId_example;  // string | 
+            var webhookSubscriptionId = 56;  // int? | 
+            var eventName = eventName_example;  // string | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Remove event name to your webhook subscription
                 apiInstance.DeleteWebhookSubscriptionEventName(oauthAppId, webhookSubscriptionId, eventName, appId);
             }
             catch (Exception e)
@@ -261,9 +257,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Oauth App identifier | 
- **webhookSubscriptionId** | **int?**| Webhook subscription identifier | 
- **eventName** | **string**| Webhook subscription event name | 
+ **oauthAppId** | **string**|  | 
+ **webhookSubscriptionId** | **int?**|  | 
+ **eventName** | **string**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -285,15 +281,15 @@ void (empty response body)
 # **GetWebhookEventNames**
 > RestApiStringArrayResult GetWebhookEventNames (string appId)
 
-Get all webhook subscription event names
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -309,7 +305,6 @@ namespace Example
 
             try
             {
-                // Get all webhook subscription event names
                 RestApiStringArrayResult result = apiInstance.GetWebhookEventNames(appId);
                 Debug.WriteLine(result);
             }
@@ -347,15 +342,15 @@ Name | Type | Description  | Notes
 # **GetWebhookEventNamesBySubscriptionId**
 > RestApiStringArrayResult GetWebhookEventNamesBySubscriptionId (string oauthAppId, int? webhookSubscriptionId, string appId)
 
-Get your webhook subscriptions selected event names
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -367,13 +362,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebhooksApi();
-            var oauthAppId = oauthAppId_example;  // string | Oauth App identifier
-            var webhookSubscriptionId = 56;  // int? | Webhook subscription identifier
+            var oauthAppId = oauthAppId_example;  // string | 
+            var webhookSubscriptionId = 56;  // int? | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Get your webhook subscriptions selected event names
                 RestApiStringArrayResult result = apiInstance.GetWebhookEventNamesBySubscriptionId(oauthAppId, webhookSubscriptionId, appId);
                 Debug.WriteLine(result);
             }
@@ -390,8 +384,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Oauth App identifier | 
- **webhookSubscriptionId** | **int?**| Webhook subscription identifier | 
+ **oauthAppId** | **string**|  | 
+ **webhookSubscriptionId** | **int?**|  | 
  **appId** | **string**|  | 
 
 ### Return type
@@ -413,15 +407,15 @@ Name | Type | Description  | Notes
 # **GetWebhookEventSample**
 > WebhookEventSample GetWebhookEventSample (string eventName, string appId, string oauthAppId, string webhookSubscriptionId, string version = null)
 
-Get a sample event from a webhook subscription
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -441,7 +435,6 @@ namespace Example
 
             try
             {
-                // Get a sample event from a webhook subscription
                 WebhookEventSample result = apiInstance.GetWebhookEventSample(eventName, appId, oauthAppId, webhookSubscriptionId, version);
                 Debug.WriteLine(result);
             }
@@ -483,15 +476,15 @@ Name | Type | Description  | Notes
 # **GetWebhookLogs**
 > RestApiPaginationResultWebhookLog GetWebhookLogs (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null)
 
-Get logs for your webhook subscription
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -503,17 +496,16 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebhooksApi();
-            var oauthAppId = oauthAppId_example;  // string | Oauth App identifier
-            var webhookSubscriptionId = 56;  // int? | Webhook subscription identifier
-            var start = 2013-10-20T19:20:30+01:00;  // DateTime? | Start time
-            var end = 2013-10-20T19:20:30+01:00;  // DateTime? | End time
+            var oauthAppId = oauthAppId_example;  // string | 
+            var webhookSubscriptionId = 56;  // int? | 
+            var start = 2013-10-20T19:20:30+01:00;  // DateTime? | 
+            var end = 2013-10-20T19:20:30+01:00;  // DateTime? | 
             var appId = appId_example;  // string | 
-            var page = 56;  // int? | Page number (optional) 
-            var limit = 56;  // int? | Page size (optional) 
+            var page = 56;  // int? |  (optional) 
+            var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Get logs for your webhook subscription
                 RestApiPaginationResultWebhookLog result = apiInstance.GetWebhookLogs(oauthAppId, webhookSubscriptionId, start, end, appId, page, limit);
                 Debug.WriteLine(result);
             }
@@ -530,13 +522,13 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Oauth App identifier | 
- **webhookSubscriptionId** | **int?**| Webhook subscription identifier | 
- **start** | **DateTime?**| Start time | 
- **end** | **DateTime?**| End time | 
+ **oauthAppId** | **string**|  | 
+ **webhookSubscriptionId** | **int?**|  | 
+ **start** | **DateTime?**|  | 
+ **end** | **DateTime?**|  | 
  **appId** | **string**|  | 
- **page** | **int?**| Page number | [optional] 
- **limit** | **int?**| Page size | [optional] 
+ **page** | **int?**|  | [optional] 
+ **limit** | **int?**|  | [optional] 
 
 ### Return type
 
@@ -557,15 +549,15 @@ Name | Type | Description  | Notes
 # **GetWebhookSubscriptions**
 > RestApiPaginationResultWebhookSubscription GetWebhookSubscriptions (string oauthAppId, string appId, int? page = null, int? limit = null)
 
-Get all webhook subscriptions by your Oauth App id
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -577,14 +569,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebhooksApi();
-            var oauthAppId = oauthAppId_example;  // string | Oauth App identifier
+            var oauthAppId = oauthAppId_example;  // string | 
             var appId = appId_example;  // string | 
             var page = 56;  // int? |  (optional) 
             var limit = 56;  // int? |  (optional) 
 
             try
             {
-                // Get all webhook subscriptions by your Oauth App id
                 RestApiPaginationResultWebhookSubscription result = apiInstance.GetWebhookSubscriptions(oauthAppId, appId, page, limit);
                 Debug.WriteLine(result);
             }
@@ -601,7 +592,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Oauth App identifier | 
+ **oauthAppId** | **string**|  | 
  **appId** | **string**|  | 
  **page** | **int?**|  | [optional] 
  **limit** | **int?**|  | [optional] 
@@ -625,15 +616,15 @@ Name | Type | Description  | Notes
 # **UpdateWebhookSubscription**
 > void UpdateWebhookSubscription (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId)
 
-Update a webhook subscription object
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -645,14 +636,13 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebhooksApi();
-            var oauthAppId = oauthAppId_example;  // string | Oauth App identifier
-            var webhookSubscriptionId = 56;  // int? | Webhook subscription identifier
-            var webhookSubscription = new WebhookSubscription(); // WebhookSubscription | Webhook subscription object
+            var oauthAppId = oauthAppId_example;  // string | 
+            var webhookSubscriptionId = 56;  // int? | 
+            var webhookSubscription = new WebhookSubscription(); // WebhookSubscription | 
             var appId = appId_example;  // string | 
 
             try
             {
-                // Update a webhook subscription object
                 apiInstance.UpdateWebhookSubscription(oauthAppId, webhookSubscriptionId, webhookSubscription, appId);
             }
             catch (Exception e)
@@ -668,9 +658,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **oauthAppId** | **string**| Oauth App identifier | 
- **webhookSubscriptionId** | **int?**| Webhook subscription identifier | 
- **webhookSubscription** | [**WebhookSubscription**](WebhookSubscription.md)| Webhook subscription object | 
+ **oauthAppId** | **string**|  | 
+ **webhookSubscriptionId** | **int?**|  | 
+ **webhookSubscription** | [**WebhookSubscription**](WebhookSubscription.md)|  | 
  **appId** | **string**|  | 
 
 ### Return type
diff --git a/docs/WebsiteApi.md b/docs/WebsiteApi.md
index 03672e6c..ff31378d 100644
--- a/docs/WebsiteApi.md
+++ b/docs/WebsiteApi.md
@@ -1,32 +1,32 @@
-# IO.Swagger.Api.WebsiteApi
+# Flipdish.Api.WebsiteApi
 
 All URIs are relative to *https://api.flipdish.co*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**AddTestimonial**](WebsiteApi.md#addtestimonial) | **POST** /api/v1.0/{appId}/website/testimonial | Add a testimonial
-[**DeleteTestimonial**](WebsiteApi.md#deletetestimonial) | **DELETE** /api/v1.0/{appId}/website/testimonial/{testimonialId} | Delete a testimonial
-[**DeleteWebsiteImage**](WebsiteApi.md#deletewebsiteimage) | **DELETE** /api/v1.0/{appId}/website/image/{imageId} | Delete Website Image
-[**EditTestimonial**](WebsiteApi.md#edittestimonial) | **POST** /api/v1.0/{appId}/website/testimonial/{testimonialId} | Edit a testimonial
-[**GetIndexConfiguration**](WebsiteApi.md#getindexconfiguration) | **GET** /api/v1.0/{appId}/website/index | Get Index Configuration
-[**SetIndexConfiguration**](WebsiteApi.md#setindexconfiguration) | **POST** /api/v1.0/{appId}/website/index | Set Index Configuration
-[**UploadWebsiteImage**](WebsiteApi.md#uploadwebsiteimage) | **POST** /api/v1.0/{appId}/website/image/{imageLocation} | Upload Website Image
-[**WebsiteCheckNow**](WebsiteApi.md#websitechecknow) | **GET** /api/v1.0/{appId}/website/dnscheck | Triggers a Check DNS Process
+[**AddTestimonial**](WebsiteApi.md#addtestimonial) | **POST** /api/v1.0/{appId}/website/testimonial | 
+[**DeleteTestimonial**](WebsiteApi.md#deletetestimonial) | **DELETE** /api/v1.0/{appId}/website/testimonial/{testimonialId} | 
+[**DeleteWebsiteImage**](WebsiteApi.md#deletewebsiteimage) | **DELETE** /api/v1.0/{appId}/website/image/{imageId} | 
+[**EditTestimonial**](WebsiteApi.md#edittestimonial) | **POST** /api/v1.0/{appId}/website/testimonial/{testimonialId} | 
+[**GetIndexConfiguration**](WebsiteApi.md#getindexconfiguration) | **GET** /api/v1.0/{appId}/website/index | 
+[**SetIndexConfiguration**](WebsiteApi.md#setindexconfiguration) | **POST** /api/v1.0/{appId}/website/index | 
+[**UploadWebsiteImage**](WebsiteApi.md#uploadwebsiteimage) | **POST** /api/v1.0/{appId}/website/image/{imageLocation} | 
+[**WebsiteCheckNow**](WebsiteApi.md#websitechecknow) | **GET** /api/v1.0/{appId}/website/dnscheck | 
 
 
 <a name="addtestimonial"></a>
 # **AddTestimonial**
 > RestApiResultWebsiteTestimonial AddTestimonial (string appId, WebsiteTestimonialBase testimonial)
 
-Add a testimonial
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -38,12 +38,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebsiteApi();
-            var appId = appId_example;  // string | Application identifier
-            var testimonial = new WebsiteTestimonialBase(); // WebsiteTestimonialBase | Testimonial to be added
+            var appId = appId_example;  // string | 
+            var testimonial = new WebsiteTestimonialBase(); // WebsiteTestimonialBase | 
 
             try
             {
-                // Add a testimonial
                 RestApiResultWebsiteTestimonial result = apiInstance.AddTestimonial(appId, testimonial);
                 Debug.WriteLine(result);
             }
@@ -60,8 +59,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **testimonial** | [**WebsiteTestimonialBase**](WebsiteTestimonialBase.md)| Testimonial to be added | 
+ **appId** | **string**|  | 
+ **testimonial** | [**WebsiteTestimonialBase**](WebsiteTestimonialBase.md)|  | 
 
 ### Return type
 
@@ -82,15 +81,15 @@ Name | Type | Description  | Notes
 # **DeleteTestimonial**
 > void DeleteTestimonial (string appId, int? testimonialId)
 
-Delete a testimonial
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -102,12 +101,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebsiteApi();
-            var appId = appId_example;  // string | Application identifier
-            var testimonialId = 56;  // int? | Id of the testimonial to delete
+            var appId = appId_example;  // string | 
+            var testimonialId = 56;  // int? | 
 
             try
             {
-                // Delete a testimonial
                 apiInstance.DeleteTestimonial(appId, testimonialId);
             }
             catch (Exception e)
@@ -123,8 +121,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **testimonialId** | **int?**| Id of the testimonial to delete | 
+ **appId** | **string**|  | 
+ **testimonialId** | **int?**|  | 
 
 ### Return type
 
@@ -145,15 +143,15 @@ void (empty response body)
 # **DeleteWebsiteImage**
 > void DeleteWebsiteImage (string appId, int? imageId)
 
-Delete Website Image
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -165,12 +163,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebsiteApi();
-            var appId = appId_example;  // string | Application identifier
-            var imageId = 56;  // int? | Id of the image
+            var appId = appId_example;  // string | 
+            var imageId = 56;  // int? | 
 
             try
             {
-                // Delete Website Image
                 apiInstance.DeleteWebsiteImage(appId, imageId);
             }
             catch (Exception e)
@@ -186,8 +183,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **imageId** | **int?**| Id of the image | 
+ **appId** | **string**|  | 
+ **imageId** | **int?**|  | 
 
 ### Return type
 
@@ -208,15 +205,15 @@ void (empty response body)
 # **EditTestimonial**
 > RestApiResultWebsiteTestimonial EditTestimonial (string appId, int? testimonialId, WebsiteTestimonialBase testimonial)
 
-Edit a testimonial
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -228,13 +225,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebsiteApi();
-            var appId = appId_example;  // string | Application identifier
-            var testimonialId = 56;  // int? | Id of the testimonial to edit
-            var testimonial = new WebsiteTestimonialBase(); // WebsiteTestimonialBase | New values of the testimonial
+            var appId = appId_example;  // string | 
+            var testimonialId = 56;  // int? | 
+            var testimonial = new WebsiteTestimonialBase(); // WebsiteTestimonialBase | 
 
             try
             {
-                // Edit a testimonial
                 RestApiResultWebsiteTestimonial result = apiInstance.EditTestimonial(appId, testimonialId, testimonial);
                 Debug.WriteLine(result);
             }
@@ -251,9 +247,9 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **testimonialId** | **int?**| Id of the testimonial to edit | 
- **testimonial** | [**WebsiteTestimonialBase**](WebsiteTestimonialBase.md)| New values of the testimonial | 
+ **appId** | **string**|  | 
+ **testimonialId** | **int?**|  | 
+ **testimonial** | [**WebsiteTestimonialBase**](WebsiteTestimonialBase.md)|  | 
 
 ### Return type
 
@@ -274,15 +270,15 @@ Name | Type | Description  | Notes
 # **GetIndexConfiguration**
 > RestApiResultIndexPage GetIndexConfiguration (string appId)
 
-Get Index Configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -294,11 +290,10 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebsiteApi();
-            var appId = appId_example;  // string | Application identifier
+            var appId = appId_example;  // string | 
 
             try
             {
-                // Get Index Configuration
                 RestApiResultIndexPage result = apiInstance.GetIndexConfiguration(appId);
                 Debug.WriteLine(result);
             }
@@ -315,7 +310,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
+ **appId** | **string**|  | 
 
 ### Return type
 
@@ -336,15 +331,15 @@ Name | Type | Description  | Notes
 # **SetIndexConfiguration**
 > RestApiResultIndexPageBase SetIndexConfiguration (string appId, IndexPageBase indexPage)
 
-Set Index Configuration
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -356,12 +351,11 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebsiteApi();
-            var appId = appId_example;  // string | Application identifier
-            var indexPage = new IndexPageBase(); // IndexPageBase | New index page definition
+            var appId = appId_example;  // string | 
+            var indexPage = new IndexPageBase(); // IndexPageBase | 
 
             try
             {
-                // Set Index Configuration
                 RestApiResultIndexPageBase result = apiInstance.SetIndexConfiguration(appId, indexPage);
                 Debug.WriteLine(result);
             }
@@ -378,8 +372,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **indexPage** | [**IndexPageBase**](IndexPageBase.md)| New index page definition | 
+ **appId** | **string**|  | 
+ **indexPage** | [**IndexPageBase**](IndexPageBase.md)|  | 
 
 ### Return type
 
@@ -400,15 +394,15 @@ Name | Type | Description  | Notes
 # **UploadWebsiteImage**
 > RestApiResultWebsiteImage UploadWebsiteImage (string appId, string imageLocation, System.IO.Stream image)
 
-Upload Website Image
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -420,13 +414,12 @@ namespace Example
             Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
 
             var apiInstance = new WebsiteApi();
-            var appId = appId_example;  // string | Application identifier
-            var imageLocation = imageLocation_example;  // string | Section for which to upload the image
+            var appId = appId_example;  // string | 
+            var imageLocation = imageLocation_example;  // string | 
             var image = new System.IO.Stream(); // System.IO.Stream | App Logo
 
             try
             {
-                // Upload Website Image
                 RestApiResultWebsiteImage result = apiInstance.UploadWebsiteImage(appId, imageLocation, image);
                 Debug.WriteLine(result);
             }
@@ -443,8 +436,8 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **appId** | **string**| Application identifier | 
- **imageLocation** | **string**| Section for which to upload the image | 
+ **appId** | **string**|  | 
+ **imageLocation** | **string**|  | 
  **image** | **System.IO.Stream**| App Logo | 
 
 ### Return type
@@ -466,15 +459,15 @@ Name | Type | Description  | Notes
 # **WebsiteCheckNow**
 > void WebsiteCheckNow (string appId)
 
-Triggers a Check DNS Process
+
 
 ### Example
 ```csharp
 using System;
 using System.Diagnostics;
-using IO.Swagger.Api;
-using IO.Swagger.Client;
-using IO.Swagger.Model;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
 
 namespace Example
 {
@@ -490,7 +483,6 @@ namespace Example
 
             try
             {
-                // Triggers a Check DNS Process
                 apiInstance.WebsiteCheckNow(appId);
             }
             catch (Exception e)
diff --git a/docs/WebsiteImage.md b/docs/WebsiteImage.md
index b7a1098e..a83911c6 100644
--- a/docs/WebsiteImage.md
+++ b/docs/WebsiteImage.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebsiteImage
+# Flipdish.Model.WebsiteImage
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/WebsiteTestimonial.md b/docs/WebsiteTestimonial.md
index 3a6011dc..e97a0fbe 100644
--- a/docs/WebsiteTestimonial.md
+++ b/docs/WebsiteTestimonial.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebsiteTestimonial
+# Flipdish.Model.WebsiteTestimonial
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/WebsiteTestimonialBase.md b/docs/WebsiteTestimonialBase.md
index af77a95e..cc01ea71 100644
--- a/docs/WebsiteTestimonialBase.md
+++ b/docs/WebsiteTestimonialBase.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebsiteTestimonialBase
+# Flipdish.Model.WebsiteTestimonialBase
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/docs/WebsiteUpdatedEvent.md b/docs/WebsiteUpdatedEvent.md
index 1b2f5510..792f0766 100644
--- a/docs/WebsiteUpdatedEvent.md
+++ b/docs/WebsiteUpdatedEvent.md
@@ -1,4 +1,4 @@
-# IO.Swagger.Model.WebsiteUpdatedEvent
+# Flipdish.Model.WebsiteUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
@@ -11,7 +11,10 @@ Name | Type | Description | Notes
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/WebsiteVanityUrlUpdatedEvent.md b/docs/WebsiteVanityUrlUpdatedEvent.md
index 03f30f7e..cf08c4d7 100644
--- a/docs/WebsiteVanityUrlUpdatedEvent.md
+++ b/docs/WebsiteVanityUrlUpdatedEvent.md
@@ -1,17 +1,20 @@
-# IO.Swagger.Model.WebsiteVanityUrlUpdatedEvent
+# Flipdish.Model.WebsiteVanityUrlUpdatedEvent
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**EventName** | **string** | The event name | [optional] 
 **Description** | **string** | Description | [optional] 
 **User** | [**UserEventInfo**](UserEventInfo.md) | User who has updated the url | [optional] 
 **VanityUrl** | **string** | New vanity url | [optional] 
-**EventName** | **string** | The event name | [optional] 
 **FlipdishEventId** | **Guid?** | The identitfier of the event | [optional] 
 **CreateTime** | **DateTime?** | The time of creation of the event | [optional] 
 **Position** | **int?** | Position | [optional] 
 **AppId** | **string** | App id | [optional] 
+**OrgId** | **string** | Org id | [optional] 
 **IpAddress** | **string** | Ip Address | [optional] 
+**ActivityId** | **string** | Activity Id | [optional] 
+**ActivityType** | **string** | Activity Type | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/WhiteLabelAssetModel.md b/docs/WhiteLabelAssetModel.md
new file mode 100644
index 00000000..74d947ba
--- /dev/null
+++ b/docs/WhiteLabelAssetModel.md
@@ -0,0 +1,13 @@
+# Flipdish.Model.WhiteLabelAssetModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelAssetId** | **int?** | White label asset ID | [optional] 
+**WhiteLabelConfigId** | **int?** | White label configuration ID | [optional] 
+**FilePath** | **string** | File path | [optional] 
+**Url** | **string** | Asset URL | [optional] 
+**TsUpdate** | **DateTime?** | Timestamp update | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/WhiteLabelBuildsApi.md b/docs/WhiteLabelBuildsApi.md
new file mode 100644
index 00000000..dce981f5
--- /dev/null
+++ b/docs/WhiteLabelBuildsApi.md
@@ -0,0 +1,334 @@
+# Flipdish.Api.WhiteLabelBuildsApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**HealthCheck**](WhiteLabelBuildsApi.md#healthcheck) | **GET** /api/v1.0/whitelabelbuilds/health | 
+[**SubmitAndroidApps**](WhiteLabelBuildsApi.md#submitandroidapps) | **POST** /api/v1.0/whitelabelbuilds/android/multiple | 
+[**SubmitAndroidBuild**](WhiteLabelBuildsApi.md#submitandroidbuild) | **POST** /api/v1.0/whitelabelbuilds/{appId}/android | 
+[**SubmitIosApps**](WhiteLabelBuildsApi.md#submitiosapps) | **POST** /api/v1.0/whitelabelbuilds/ios/multiple | 
+[**SubmitIosBuild**](WhiteLabelBuildsApi.md#submitiosbuild) | **POST** /api/v1.0/whitelabelbuilds/{appId}/ios | 
+
+
+<a name="healthcheck"></a>
+# **HealthCheck**
+> string HealthCheck ()
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class HealthCheckExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelBuildsApi();
+
+            try
+            {
+                string result = apiInstance.HealthCheck();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelBuildsApi.HealthCheck: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**string**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="submitandroidapps"></a>
+# **SubmitAndroidApps**
+> RestApiResultBuildResultModel SubmitAndroidApps (string whiteLabelIds, string branch = null, string buildType = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SubmitAndroidAppsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelBuildsApi();
+            var whiteLabelIds = whiteLabelIds_example;  // string | 
+            var branch = branch_example;  // string |  (optional) 
+            var buildType = buildType_example;  // string |  (optional) 
+
+            try
+            {
+                RestApiResultBuildResultModel result = apiInstance.SubmitAndroidApps(whiteLabelIds, branch, buildType);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelBuildsApi.SubmitAndroidApps: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **whiteLabelIds** | **string**|  | 
+ **branch** | **string**|  | [optional] 
+ **buildType** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiResultBuildResultModel**](RestApiResultBuildResultModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="submitandroidbuild"></a>
+# **SubmitAndroidBuild**
+> RestApiResultBuildResultModel SubmitAndroidBuild (string appId, string branch, string lane, string buildType)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SubmitAndroidBuildExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelBuildsApi();
+            var appId = appId_example;  // string | 
+            var branch = branch_example;  // string | 
+            var lane = lane_example;  // string | 
+            var buildType = buildType_example;  // string | 
+
+            try
+            {
+                RestApiResultBuildResultModel result = apiInstance.SubmitAndroidBuild(appId, branch, lane, buildType);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelBuildsApi.SubmitAndroidBuild: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **branch** | **string**|  | 
+ **lane** | **string**|  | 
+ **buildType** | **string**|  | 
+
+### Return type
+
+[**RestApiResultBuildResultModel**](RestApiResultBuildResultModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="submitiosapps"></a>
+# **SubmitIosApps**
+> RestApiResultBuildResultModel SubmitIosApps (string whiteLabelIds, string branch = null, string buildType = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SubmitIosAppsExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelBuildsApi();
+            var whiteLabelIds = whiteLabelIds_example;  // string | 
+            var branch = branch_example;  // string |  (optional) 
+            var buildType = buildType_example;  // string |  (optional) 
+
+            try
+            {
+                RestApiResultBuildResultModel result = apiInstance.SubmitIosApps(whiteLabelIds, branch, buildType);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelBuildsApi.SubmitIosApps: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **whiteLabelIds** | **string**|  | 
+ **branch** | **string**|  | [optional] 
+ **buildType** | **string**|  | [optional] 
+
+### Return type
+
+[**RestApiResultBuildResultModel**](RestApiResultBuildResultModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="submitiosbuild"></a>
+# **SubmitIosBuild**
+> RestApiResultBuildResultModel SubmitIosBuild (string appId, string buildType, string branch, bool? submitForReview = null)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class SubmitIosBuildExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelBuildsApi();
+            var appId = appId_example;  // string | 
+            var buildType = buildType_example;  // string | 
+            var branch = branch_example;  // string | 
+            var submitForReview = true;  // bool? |  (optional) 
+
+            try
+            {
+                RestApiResultBuildResultModel result = apiInstance.SubmitIosBuild(appId, buildType, branch, submitForReview);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelBuildsApi.SubmitIosBuild: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **buildType** | **string**|  | 
+ **branch** | **string**|  | 
+ **submitForReview** | **bool?**|  | [optional] 
+
+### Return type
+
+[**RestApiResultBuildResultModel**](RestApiResultBuildResultModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/WhiteLabelColorSchemeModel.md b/docs/WhiteLabelColorSchemeModel.md
new file mode 100644
index 00000000..7bf5de93
--- /dev/null
+++ b/docs/WhiteLabelColorSchemeModel.md
@@ -0,0 +1,22 @@
+# Flipdish.Model.WhiteLabelColorSchemeModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelColorSchemeId** | **int?** | White label color scheme ID | [optional] 
+**Font** | **string** | Font | [optional] 
+**Color** | **string** | Color | [optional] 
+**Color2** | **string** | Color 2 | [optional] 
+**Color3** | **string** | Color 3 | [optional] 
+**Color4** | **string** | Color 4 | [optional] 
+**Color5** | **string** | Color 5 | [optional] 
+**Color6** | **string** | Color 6 | [optional] 
+**Color7** | **string** | Color 7 | [optional] 
+**Color8** | **string** | Color 8 | [optional] 
+**Color9** | **string** | Color 9 | [optional] 
+**Color10** | **string** | Color 10 | [optional] 
+**Color11** | **string** | Color 11 | [optional] 
+**Color12** | **string** | Color 12 (Kiosk Primary Colour) | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/WhiteLabelConfig.md b/docs/WhiteLabelConfig.md
new file mode 100644
index 00000000..2b71234b
--- /dev/null
+++ b/docs/WhiteLabelConfig.md
@@ -0,0 +1,14 @@
+# Flipdish.Model.WhiteLabelConfig
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelId** | **int?** | White label identifier | [optional] 
+**WhiteLabelName** | **string** | White label name | [optional] 
+**CountryId** | **string** | Country identifier | [optional] 
+**AppNameId** | **string** | App id | [optional] 
+**Website** | **string** | Website URL | [optional] 
+**PanaceaVanityUrl** | **string** | Panacea vanity URL | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/WhiteLabelConfigApi.md b/docs/WhiteLabelConfigApi.md
new file mode 100644
index 00000000..74d0371c
--- /dev/null
+++ b/docs/WhiteLabelConfigApi.md
@@ -0,0 +1,632 @@
+# Flipdish.Api.WhiteLabelConfigApi
+
+All URIs are relative to *https://api.flipdish.co*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**GetAppGeneralConfig**](WhiteLabelConfigApi.md#getappgeneralconfig) | **GET** /api/v1.0/whitelabelconfig/{appId}/general | 
+[**GetAppStoreConfig**](WhiteLabelConfigApi.md#getappstoreconfig) | **GET** /api/v1.0/whitelabelconfig/{appId}/appstore | 
+[**GetPlayStoreConfig**](WhiteLabelConfigApi.md#getplaystoreconfig) | **GET** /api/v1.0/whitelabelconfig/{appId}/playstore | 
+[**GetWhiteLabelConfig**](WhiteLabelConfigApi.md#getwhitelabelconfig) | **GET** /api/v1.0/whitelabelconfig/id/{wlid} | 
+[**GetWhiteLabelConfigByAppNameId**](WhiteLabelConfigApi.md#getwhitelabelconfigbyappnameid) | **GET** /api/v1.0/whitelabelconfig/name/{appId} | 
+[**HealthCheck**](WhiteLabelConfigApi.md#healthcheck) | **GET** /api/v1.0/whitelabelconfig/health | 
+[**UpdateAppGeneralConfig**](WhiteLabelConfigApi.md#updateappgeneralconfig) | **POST** /api/v1.0/whitelabelconfig/{appId}/general | 
+[**UpdateAppStoreConfig**](WhiteLabelConfigApi.md#updateappstoreconfig) | **POST** /api/v1.0/whitelabelconfig/{appId}/appstore | 
+[**UpdatePlayStoreConfig**](WhiteLabelConfigApi.md#updateplaystoreconfig) | **POST** /api/v1.0/whitelabelconfig/{appId}/playstore | 
+[**UploadAppStoreIcon**](WhiteLabelConfigApi.md#uploadappstoreicon) | **POST** /api/v1.0/whitelabelconfig/{appId}/app-store-icon | 
+
+
+<a name="getappgeneralconfig"></a>
+# **GetAppGeneralConfig**
+> RestApiResultAppGeneralConfigModel GetAppGeneralConfig (string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetAppGeneralConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                RestApiResultAppGeneralConfigModel result = apiInstance.GetAppGeneralConfig(appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.GetAppGeneralConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultAppGeneralConfigModel**](RestApiResultAppGeneralConfigModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getappstoreconfig"></a>
+# **GetAppStoreConfig**
+> RestApiResultAppStoreConfigModel GetAppStoreConfig (string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetAppStoreConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                RestApiResultAppStoreConfigModel result = apiInstance.GetAppStoreConfig(appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.GetAppStoreConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultAppStoreConfigModel**](RestApiResultAppStoreConfigModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getplaystoreconfig"></a>
+# **GetPlayStoreConfig**
+> RestApiResultPlayStoreConfigModel GetPlayStoreConfig (string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetPlayStoreConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                RestApiResultPlayStoreConfigModel result = apiInstance.GetPlayStoreConfig(appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.GetPlayStoreConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultPlayStoreConfigModel**](RestApiResultPlayStoreConfigModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getwhitelabelconfig"></a>
+# **GetWhiteLabelConfig**
+> RestApiResultWhiteLabelConfigModel GetWhiteLabelConfig (int? wlid)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetWhiteLabelConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var wlid = 56;  // int? | 
+
+            try
+            {
+                RestApiResultWhiteLabelConfigModel result = apiInstance.GetWhiteLabelConfig(wlid);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.GetWhiteLabelConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **wlid** | **int?**|  | 
+
+### Return type
+
+[**RestApiResultWhiteLabelConfigModel**](RestApiResultWhiteLabelConfigModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="getwhitelabelconfigbyappnameid"></a>
+# **GetWhiteLabelConfigByAppNameId**
+> RestApiResultWhiteLabelConfigModel GetWhiteLabelConfigByAppNameId (string appId)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class GetWhiteLabelConfigByAppNameIdExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var appId = appId_example;  // string | 
+
+            try
+            {
+                RestApiResultWhiteLabelConfigModel result = apiInstance.GetWhiteLabelConfigByAppNameId(appId);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.GetWhiteLabelConfigByAppNameId: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+
+### Return type
+
+[**RestApiResultWhiteLabelConfigModel**](RestApiResultWhiteLabelConfigModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="healthcheck"></a>
+# **HealthCheck**
+> string HealthCheck ()
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class HealthCheckExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+
+            try
+            {
+                string result = apiInstance.HealthCheck();
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.HealthCheck: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**string**
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="updateappgeneralconfig"></a>
+# **UpdateAppGeneralConfig**
+> RestApiResultAppGeneralConfigModel UpdateAppGeneralConfig (string appId, AppGeneralConfigModel appGeneralConfig)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UpdateAppGeneralConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var appId = appId_example;  // string | 
+            var appGeneralConfig = new AppGeneralConfigModel(); // AppGeneralConfigModel | 
+
+            try
+            {
+                RestApiResultAppGeneralConfigModel result = apiInstance.UpdateAppGeneralConfig(appId, appGeneralConfig);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.UpdateAppGeneralConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **appGeneralConfig** | [**AppGeneralConfigModel**](AppGeneralConfigModel.md)|  | 
+
+### Return type
+
+[**RestApiResultAppGeneralConfigModel**](RestApiResultAppGeneralConfigModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="updateappstoreconfig"></a>
+# **UpdateAppStoreConfig**
+> RestApiResultAppStoreConfigModel UpdateAppStoreConfig (string appId, AppStoreConfigModel appStoreConfig)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UpdateAppStoreConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var appId = appId_example;  // string | 
+            var appStoreConfig = new AppStoreConfigModel(); // AppStoreConfigModel | 
+
+            try
+            {
+                RestApiResultAppStoreConfigModel result = apiInstance.UpdateAppStoreConfig(appId, appStoreConfig);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.UpdateAppStoreConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **appStoreConfig** | [**AppStoreConfigModel**](AppStoreConfigModel.md)|  | 
+
+### Return type
+
+[**RestApiResultAppStoreConfigModel**](RestApiResultAppStoreConfigModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="updateplaystoreconfig"></a>
+# **UpdatePlayStoreConfig**
+> RestApiResultPlayStoreConfigModel UpdatePlayStoreConfig (string appId, PlayStoreConfigModel playStoreConfig)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UpdatePlayStoreConfigExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var appId = appId_example;  // string | 
+            var playStoreConfig = new PlayStoreConfigModel(); // PlayStoreConfigModel | 
+
+            try
+            {
+                RestApiResultPlayStoreConfigModel result = apiInstance.UpdatePlayStoreConfig(appId, playStoreConfig);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.UpdatePlayStoreConfig: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **playStoreConfig** | [**PlayStoreConfigModel**](PlayStoreConfigModel.md)|  | 
+
+### Return type
+
+[**RestApiResultPlayStoreConfigModel**](RestApiResultPlayStoreConfigModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+<a name="uploadappstoreicon"></a>
+# **UploadAppStoreIcon**
+> RestApiResultAssetResultModel UploadAppStoreIcon (string appId, HttpPostedFileBase _file)
+
+
+
+### Example
+```csharp
+using System;
+using System.Diagnostics;
+using Flipdish.Api;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Example
+{
+    public class UploadAppStoreIconExample
+    {
+        public void main()
+        {
+            // Configure OAuth2 access token for authorization: oauth2
+            Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN";
+
+            var apiInstance = new WhiteLabelConfigApi();
+            var appId = appId_example;  // string | 
+            var _file = new HttpPostedFileBase(); // HttpPostedFileBase | 
+
+            try
+            {
+                RestApiResultAssetResultModel result = apiInstance.UploadAppStoreIcon(appId, _file);
+                Debug.WriteLine(result);
+            }
+            catch (Exception e)
+            {
+                Debug.Print("Exception when calling WhiteLabelConfigApi.UploadAppStoreIcon: " + e.Message );
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appId** | **string**|  | 
+ **_file** | [**HttpPostedFileBase**](HttpPostedFileBase.md)|  | 
+
+### Return type
+
+[**RestApiResultAssetResultModel**](RestApiResultAssetResultModel.md)
+
+### Authorization
+
+[oauth2](../README.md#oauth2)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, text/json, application/xml, text/xml, application/x-www-form-urlencoded
+ - **Accept**: application/json, text/json, application/xml, text/xml
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/docs/WhiteLabelConfigModel.md b/docs/WhiteLabelConfigModel.md
new file mode 100644
index 00000000..c416475d
--- /dev/null
+++ b/docs/WhiteLabelConfigModel.md
@@ -0,0 +1,116 @@
+# Flipdish.Model.WhiteLabelConfigModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**WhiteLabelLanguages** | [**List&lt;WhiteLabelLanguageModel&gt;**](WhiteLabelLanguageModel.md) | White label languages | [optional] 
+**WhiteLabelAssets** | [**List&lt;WhiteLabelAssetModel&gt;**](WhiteLabelAssetModel.md) | White label assets | [optional] 
+**ColorScheme** | [**WhiteLabelColorSchemeModel**](WhiteLabelColorSchemeModel.md) | White label color scheme | [optional] 
+**WhiteLabelConfigId** | **int?** | White label configuration ID | [optional] 
+**WhiteLabelId** | **int?** | White label ID | [optional] 
+**WhiteLabelName** | **string** | White label name | [optional] 
+**AppNameId** | **string** | App name ID (Bundle ID Suffix) | [optional] 
+**OrgId** | **string** | Organization ID | [optional] 
+**SmsRestaurantName** | **string** | SMS restaurant name | [optional] 
+**DeepLinkUrlScheme** | **string** | Deep link URL scheme | [optional] 
+**HostName** | **string** | Host name | [optional] 
+**NexmoSupportSmsNumber** | **string** | Nexmo support SMS number | [optional] 
+**TwilioSupportSmsNumber** | **string** | Twilio support SMS number | [optional] 
+**MixpanelToken** | **string** | Mixpanel token | [optional] 
+**IntercomAppId** | **string** | Intercom app ID | [optional] 
+**ShareMessageEmailSubject** | **string** | Share message email subject | [optional] 
+**ShareMessageEmailMessage** | **string** | Share message email message | [optional] 
+**ShareMessageSmsMessage** | **string** | Share message SMS message | [optional] 
+**ShareMessageWhatsAppMessage** | **string** | Share message WhatsApp message | [optional] 
+**ShareMessageFacebookMessage** | **string** | Share message Facebook message | [optional] 
+**ShareMessageTwitterMessage** | **string** | Share message Twitter message | [optional] 
+**ShareMessageGenericMessage** | **string** | Share message generic message | [optional] 
+**DisplayDeliveryRestaurantListScreen** | **bool?** | Display delivery restaurant list screen | [optional] 
+**ContactFormType** | **int?** | Contact form type | [optional] 
+**ContactPhoneNumber** | **string** | Contact phone number | [optional] 
+**DisplayBumpSideMenuItem** | **bool?** | Display bump side menu item | [optional] 
+**DisplayFreeCokeSideMenuItem** | **bool?** | Display free coke side menu item | [optional] 
+**AppStoreUrl** | **string** | App store URL | [optional] 
+**DeliveryEnabled** | **bool?** | Delivery enabled | [optional] 
+**PickupEnabled** | **bool?** | Pickup enabled | [optional] 
+**DisplayPickupRestaurantListScreen** | **bool?** | Display pickup restaurant list screen | [optional] 
+**DisplayCuisineTypeListAndRestaurantSearchBar** | **bool?** | Display cuisine type list and restaurant search bar | [optional] 
+**DisplayUserRestaurantRatings** | **bool?** | Display user restaurant ratings | [optional] 
+**ReadyToPublishWeb** | **bool?** | Ready to publish web | [optional] 
+**ReadyToPublishIos** | **bool?** | Ready to publish iOS | [optional] 
+**ReadyToPublishAndroid** | **bool?** | Ready to publish Android | [optional] 
+**DisplayFooterLinksToOtherSites** | **bool?** | Display footer links to other sites | [optional] 
+**DisplayOnlineOrderingMenu** | **bool?** | Display online ordering menu | [optional] 
+**HideAppConfigFromAdminList** | **bool?** | Hide app config from admin list | [optional] 
+**ComplianceType** | **string** | Compliance type | [optional] 
+**IsMenuMigratedToRms** | **bool?** | Is menu migrated to RMS | [optional] 
+**MapBoundryMaxLongitude** | **double?** | Map boundary max longitude | [optional] 
+**MapBoundryMinLongitude** | **double?** | Map boundary min longitude | [optional] 
+**MapBoundryMaxLatitude** | **double?** | Map boundary max latitude | [optional] 
+**MapBoundryMinLatitude** | **double?** | Map boundary min latitude | [optional] 
+**AppStoreAppleId** | **string** | App store Apple ID | [optional] 
+**AppStoreToken** | **string** | App store token | [optional] 
+**WebsiteDisplayStaticMenuPage** | **bool?** | Website display static menu page | [optional] 
+**IsEmbed** | **bool?** | Is embed | [optional] 
+**DisplayTipOptionToUsersByDefault** | **bool?** | Display tip option to users by default | [optional] 
+**EmailRequestMode** | **int?** | Email request mode | [optional] 
+**AddressEntryType** | **int?** | Address entry type | [optional] 
+**AddressLayout** | **int?** | Address layout | [optional] 
+**Category** | **int?** | Category | [optional] 
+**MapCenterLatitude** | **double?** | Map center latitude | [optional] 
+**MapCenterLongitude** | **double?** | Map center longitude | [optional] 
+**IntercomTokenIos** | **string** | Intercom token iOS | [optional] 
+**IntercomTokenAndroid** | **string** | Intercom token Android | [optional] 
+**GoogleAnalyticsTokensCsv** | **string** | Google Analytics tokens CSV | [optional] 
+**FacebookTokensCsv** | **string** | Facebook tokens CSV | [optional] 
+**ShareMessageGenericUrl** | **string** | Share message generic URL | [optional] 
+**PrivateSupportEmailAddress** | **string** | Private support email address | [optional] 
+**AppStoreId** | **string** | App store ID | [optional] 
+**PlayConsoleAccount** | **int?** | Play console account | [optional] 
+**ApnCertificateValidAfter** | **DateTime?** | APN certificate valid after | [optional] 
+**ApnCertificateValidBefore** | **DateTime?** | APN certificate valid before | [optional] 
+**DineInEnabled** | **bool?** | Dine in enabled | [optional] 
+**AppFont** | **string** | App font | [optional] 
+**WhiteLabelColorSchemeId** | **int?** | White label color scheme ID | [optional] 
+**WhiteLabelImagesId** | **int?** | White label images ID | [optional] 
+**AppStoreCopyright** | **string** | App store copyright | [optional] 
+**AppStoreDescription** | **string** | App store description | [optional] 
+**AppStoreShortDescription** | **string** | App store short description | [optional] 
+**AppStoreKeywords** | **string** | App store keywords | [optional] 
+**AppStoreMarketingUrl** | **string** | App store marketing URL | [optional] 
+**AppStoreName** | **string** | App store name | [optional] 
+**AppStorePrivacyUrl** | **string** | App store privacy URL | [optional] 
+**AppStoreSupportUrl** | **string** | App store support URL | [optional] 
+**AppStoreReleaseNotes** | **string** | App store release notes | [optional] 
+**AppStoreIconUrl** | **string** | App store icon URL | [optional] 
+**AppStoreIconThumbnail100Url** | **string** | App store icon thumbnail 100 URL | [optional] 
+**TransparentLogoUrl** | **string** | Transparent logo URL | [optional] 
+**LogoImageName** | **string** | Logo image name | [optional] 
+**KioskNameScreenImage** | **string** | Kiosk name screen image | [optional] 
+**WebToAppRedirect** | **int?** | Web to app redirect | [optional] 
+**FeaturesCsv** | **string** | Features CSV | [optional] 
+**AppStorePassword** | **string** | App store password | [optional] 
+**AppStoreTeamId** | **string** | App store team ID | [optional] 
+**AppStoreAppGroup** | **string** | App store app group | [optional] 
+**AppStoreSigningIdentity** | **string** | App store signing identity | [optional] 
+**AppStoreItcTeamId** | **string** | App store ITC team ID | [optional] 
+**HeadHtml** | **string** | Head HTML | [optional] 
+**SocialTwitterUrl** | **string** | Social Twitter URL | [optional] 
+**SocialFacebookUrl** | **string** | Social Facebook URL | [optional] 
+**SocialInstagramUrl** | **string** | Social Instagram URL | [optional] 
+**SocialPintrestUrl** | **string** | Social Pinterest URL | [optional] 
+**SocialTripAdvisorUrl** | **string** | Social TripAdvisor URL | [optional] 
+**SocialGooglePlusUrl** | **string** | Social Google Plus URL | [optional] 
+**SocialFourSquareUrl** | **string** | Social FourSquare URL | [optional] 
+**SocialYelpUrl** | **string** | Social Yelp URL | [optional] 
+**WebsiteType** | **int?** | Website type | [optional] 
+**ExternalOrderingPageUrl** | **string** | External ordering page URL | [optional] 
+**PanaceaEnabled** | **bool?** | Panacea enabled | [optional] 
+**CookieConsentPromptEnabled** | **bool?** | Cookie consent prompt enabled | [optional] 
+**PanaceaVanityUrl** | **string** | Panacea vanity URL | [optional] 
+**CountryId** | **string** | Country ID | [optional] 
+**ReferralUserId** | **int?** | Referral user ID | [optional] 
+**ReferralCampaignId** | **string** | Referral campaign ID | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/docs/WhiteLabelLanguageModel.md b/docs/WhiteLabelLanguageModel.md
new file mode 100644
index 00000000..1ecb389b
--- /dev/null
+++ b/docs/WhiteLabelLanguageModel.md
@@ -0,0 +1,9 @@
+# Flipdish.Model.WhiteLabelLanguageModel
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**LanguageId** | **string** | Language ID | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/src/Flipdish.Test/Api/AccountsApiTests.cs b/src/Flipdish.Test/Api/AccountsApiTests.cs
deleted file mode 100644
index c3460778..00000000
--- a/src/Flipdish.Test/Api/AccountsApiTests.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AccountsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class AccountsApiTests
-    {
-        private AccountsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new AccountsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AccountsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' AccountsApi
-            //Assert.IsInstanceOfType(typeof(AccountsApi), instance, "instance is a AccountsApi");
-        }
-
-        
-        /// <summary>
-        /// Test AnswerSignUpQuestion
-        /// </summary>
-        [Test]
-        public void AnswerSignUpQuestionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string signupStepAction = null;
-            //int? answerId = null;
-            //instance.AnswerSignUpQuestion(signupStepAction, answerId);
-            
-        }
-        
-        /// <summary>
-        /// Test ChangePassword
-        /// </summary>
-        [Test]
-        public void ChangePasswordTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //ChangePasswordModel changePasswordModel = null;
-            //instance.ChangePassword(changePasswordModel);
-            
-        }
-        
-        /// <summary>
-        /// Test ChangePasswordWithPin
-        /// </summary>
-        [Test]
-        public void ChangePasswordWithPinTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //SetPasswordWithPinModel changePasswordModel = null;
-            //instance.ChangePasswordWithPin(changePasswordModel);
-            
-        }
-        
-        /// <summary>
-        /// Test CreateAccount
-        /// </summary>
-        [Test]
-        public void CreateAccountTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //CreateAccountModel createAccountModel = null;
-            //instance.CreateAccount(createAccountModel);
-            
-        }
-        
-        /// <summary>
-        /// Test GetAccountDetails
-        /// </summary>
-        [Test]
-        public void GetAccountDetailsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetAccountDetails();
-            //Assert.IsInstanceOf<RestApiResultAccountDetail> (response, "response is RestApiResultAccountDetail");
-        }
-        
-        /// <summary>
-        /// Test GetLocalisedTimeZones
-        /// </summary>
-        [Test]
-        public void GetLocalisedTimeZonesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetLocalisedTimeZones();
-            //Assert.IsInstanceOf<RestApiArrayResultLocalisedTimeZone> (response, "response is RestApiArrayResultLocalisedTimeZone");
-        }
-        
-        /// <summary>
-        /// Test Login
-        /// </summary>
-        [Test]
-        public void LoginTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //LoginModel loginModel = null;
-            //instance.Login(loginModel);
-            
-        }
-        
-        /// <summary>
-        /// Test LoginWithPin
-        /// </summary>
-        [Test]
-        public void LoginWithPinTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //LoginWithPinModel loginModel = null;
-            //instance.LoginWithPin(loginModel);
-            
-        }
-        
-        /// <summary>
-        /// Test Logout
-        /// </summary>
-        [Test]
-        public void LogoutTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //instance.Logout();
-            
-        }
-        
-        /// <summary>
-        /// Test PasswordResetWithToken
-        /// </summary>
-        [Test]
-        public void PasswordResetWithTokenTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //PasswordResetModel passwordResetModel = null;
-            //instance.PasswordResetWithToken(passwordResetModel);
-            
-        }
-        
-        /// <summary>
-        /// Test RequestLoginPin
-        /// </summary>
-        [Test]
-        public void RequestLoginPinTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //RequestLoginPinModel requestLoginPinRequest = null;
-            //var response = instance.RequestLoginPin(requestLoginPinRequest);
-            //Assert.IsInstanceOf<RequestLoginPinResposne> (response, "response is RequestLoginPinResposne");
-        }
-        
-        /// <summary>
-        /// Test RequestPasswordReset
-        /// </summary>
-        [Test]
-        public void RequestPasswordResetTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //RequestPasswordResetModel requestPasswordResetModel = null;
-            //instance.RequestPasswordReset(requestPasswordResetModel);
-            
-        }
-        
-        /// <summary>
-        /// Test SkipSignupStep
-        /// </summary>
-        [Test]
-        public void SkipSignupStepTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string signupStepAction = null;
-            //instance.SkipSignupStep(signupStepAction);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateAccount
-        /// </summary>
-        [Test]
-        public void UpdateAccountTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //AccountDetailBase updateAccountModel = null;
-            //instance.UpdateAccount(updateAccountModel);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/AddressApiTests.cs b/src/Flipdish.Test/Api/AddressApiTests.cs
deleted file mode 100644
index abbe4d30..00000000
--- a/src/Flipdish.Test/Api/AddressApiTests.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AddressApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class AddressApiTests
-    {
-        private AddressApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new AddressApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AddressApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' AddressApi
-            //Assert.IsInstanceOfType(typeof(AddressApi), instance, "instance is a AddressApi");
-        }
-
-        
-        /// <summary>
-        /// Test FormByApp
-        /// </summary>
-        [Test]
-        public void FormByAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string language = null;
-            //var response = instance.FormByApp(appId, language);
-            //Assert.IsInstanceOf<RestApiResultAddressFormResponse> (response, "response is RestApiResultAddressFormResponse");
-        }
-        
-        /// <summary>
-        /// Test FormByCountry
-        /// </summary>
-        [Test]
-        public void FormByCountryTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string countryCode = null;
-            //string language = null;
-            //var response = instance.FormByCountry(countryCode, language);
-            //Assert.IsInstanceOf<RestApiResultAddressFormResponse> (response, "response is RestApiResultAddressFormResponse");
-        }
-        
-        /// <summary>
-        /// Test FormatGoogleAddress
-        /// </summary>
-        [Test]
-        public void FormatGoogleAddressTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //GoogleAddress googleAddress = null;
-            //var response = instance.FormatGoogleAddress(googleAddress);
-            //Assert.IsInstanceOf<RestApiResultAddressFormResponse> (response, "response is RestApiResultAddressFormResponse");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/ApmApiTests.cs b/src/Flipdish.Test/Api/ApmApiTests.cs
deleted file mode 100644
index 8ae8e347..00000000
--- a/src/Flipdish.Test/Api/ApmApiTests.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ApmApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class ApmApiTests
-    {
-        private ApmApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new ApmApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ApmApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' ApmApi
-            //Assert.IsInstanceOfType(typeof(ApmApi), instance, "instance is a ApmApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetBasicStatistics
-        /// </summary>
-        [Test]
-        public void GetBasicStatisticsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //List<int?> storeId = null;
-            //var response = instance.GetBasicStatistics(appId, storeId);
-            //Assert.IsInstanceOf<RestApiResultApmStatistics> (response, "response is RestApiResultApmStatistics");
-        }
-        
-        /// <summary>
-        /// Test GetCalendarWeekStatistics
-        /// </summary>
-        [Test]
-        public void GetCalendarWeekStatisticsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //List<int?> storeId = null;
-            //var response = instance.GetCalendarWeekStatistics(appId, storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultApmHourlyDataPoint> (response, "response is RestApiArrayResultApmHourlyDataPoint");
-        }
-        
-        /// <summary>
-        /// Test GetCallsStatistics
-        /// </summary>
-        [Test]
-        public void GetCallsStatisticsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string aggregateDataBy = null;
-            //int? dataPointLimit = null;
-            //List<int?> storeId = null;
-            //var response = instance.GetCallsStatistics(appId, aggregateDataBy, dataPointLimit, storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultApmDataPoint> (response, "response is RestApiArrayResultApmDataPoint");
-        }
-        
-        /// <summary>
-        /// Test GetOrderStatistics
-        /// </summary>
-        [Test]
-        public void GetOrderStatisticsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string aggregateDataBy = null;
-            //int? dataPointLimit = null;
-            //List<int?> storeId = null;
-            //var response = instance.GetOrderStatistics(appId, aggregateDataBy, dataPointLimit, storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultApmCurrencyDataPoint> (response, "response is RestApiArrayResultApmCurrencyDataPoint");
-        }
-        
-        /// <summary>
-        /// Test GetPaginatedCallList
-        /// </summary>
-        [Test]
-        public void GetPaginatedCallListTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? page = null;
-            //int? limit = null;
-            //List<int?> storeId = null;
-            //var response = instance.GetPaginatedCallList(appId, page, limit, storeId);
-            //Assert.IsInstanceOf<RestApiPaginationResultPhoneCall> (response, "response is RestApiPaginationResultPhoneCall");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/AppStoreApiTests.cs b/src/Flipdish.Test/Api/AppStoreApiTests.cs
deleted file mode 100644
index 66ac3cb3..00000000
--- a/src/Flipdish.Test/Api/AppStoreApiTests.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreApiTests
-    {
-        private AppStoreApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new AppStoreApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' AppStoreApi
-            //Assert.IsInstanceOfType(typeof(AppStoreApi), instance, "instance is a AppStoreApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateAppStoreApp
-        /// </summary>
-        [Test]
-        public void CreateAppStoreAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //AppDetailBase appDetailBase = null;
-            //var response = instance.CreateAppStoreApp(appDetailBase);
-            //Assert.IsInstanceOf<RestApiResultAppDetail> (response, "response is RestApiResultAppDetail");
-        }
-        
-        /// <summary>
-        /// Test DeleteAppStoreApp
-        /// </summary>
-        [Test]
-        public void DeleteAppStoreAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appStoreAppId = null;
-            //var response = instance.DeleteAppStoreApp(appStoreAppId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test GetAppStoreApp
-        /// </summary>
-        [Test]
-        public void GetAppStoreAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appStoreAppId = null;
-            //var response = instance.GetAppStoreApp(appStoreAppId);
-            //Assert.IsInstanceOf<AppDetail> (response, "response is AppDetail");
-        }
-        
-        /// <summary>
-        /// Test GetAppStoreApps
-        /// </summary>
-        [Test]
-        public void GetAppStoreAppsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string search = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetAppStoreApps(search, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultAppSummary> (response, "response is RestApiPaginationResultAppSummary");
-        }
-        
-        /// <summary>
-        /// Test UpdateAppStoreApp
-        /// </summary>
-        [Test]
-        public void UpdateAppStoreAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appStoreAppId = null;
-            //AppDetail appDetail = null;
-            //var response = instance.UpdateAppStoreApp(appStoreAppId, appDetail);
-            //Assert.IsInstanceOf<AppDetail> (response, "response is AppDetail");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/AppStoreConfigurationsApiTests.cs b/src/Flipdish.Test/Api/AppStoreConfigurationsApiTests.cs
deleted file mode 100644
index b412ebf6..00000000
--- a/src/Flipdish.Test/Api/AppStoreConfigurationsApiTests.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreConfigurationsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreConfigurationsApiTests
-    {
-        private AppStoreConfigurationsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new AppStoreConfigurationsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreConfigurationsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' AppStoreConfigurationsApi
-            //Assert.IsInstanceOfType(typeof(AppStoreConfigurationsApi), instance, "instance is a AppStoreConfigurationsApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateAppStoreConfig
-        /// </summary>
-        [Test]
-        public void CreateAppStoreConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string appStoreAppId = null;
-            //var response = instance.CreateAppStoreConfig(appId, appStoreAppId);
-            //Assert.IsInstanceOf<RestApiResultAppConfigurationSummary> (response, "response is RestApiResultAppConfigurationSummary");
-        }
-        
-        /// <summary>
-        /// Test DeleteAppStoreConfig
-        /// </summary>
-        [Test]
-        public void DeleteAppStoreConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string appStoreAppId = null;
-            //string configId = null;
-            //var response = instance.DeleteAppStoreConfig(appId, appStoreAppId, configId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test GetAppStoreConfig
-        /// </summary>
-        [Test]
-        public void GetAppStoreConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string appStoreAppId = null;
-            //string configId = null;
-            //var response = instance.GetAppStoreConfig(appId, appStoreAppId, configId);
-            //Assert.IsInstanceOf<AppConfigurationDetail> (response, "response is AppConfigurationDetail");
-        }
-        
-        /// <summary>
-        /// Test GetConfiguredAppSingleApp
-        /// </summary>
-        [Test]
-        public void GetConfiguredAppSingleAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string appStoreAppId = null;
-            //var response = instance.GetConfiguredAppSingleApp(appId, appStoreAppId);
-            //Assert.IsInstanceOf<RestApiArrayResultAppConfigurationSummary> (response, "response is RestApiArrayResultAppConfigurationSummary");
-        }
-        
-        /// <summary>
-        /// Test GetConfiguredApps
-        /// </summary>
-        [Test]
-        public void GetConfiguredAppsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetConfiguredApps(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultConfiguredAppHeader> (response, "response is RestApiArrayResultConfiguredAppHeader");
-        }
-        
-        /// <summary>
-        /// Test UpdateAppStoreConfig
-        /// </summary>
-        [Test]
-        public void UpdateAppStoreConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string appStoreAppId = null;
-            //string configId = null;
-            //AppConfigurationBase appConfigurationBase = null;
-            //instance.UpdateAppStoreConfig(appId, appStoreAppId, configId, appConfigurationBase);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/AppStoreDeveloperApiTests.cs b/src/Flipdish.Test/Api/AppStoreDeveloperApiTests.cs
deleted file mode 100644
index 4c9c66ea..00000000
--- a/src/Flipdish.Test/Api/AppStoreDeveloperApiTests.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreDeveloperApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreDeveloperApiTests
-    {
-        private AppStoreDeveloperApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new AppStoreDeveloperApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreDeveloperApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' AppStoreDeveloperApi
-            //Assert.IsInstanceOfType(typeof(AppStoreDeveloperApi), instance, "instance is a AppStoreDeveloperApi");
-        }
-
-        
-        /// <summary>
-        /// Test AppVerificationUpdate
-        /// </summary>
-        [Test]
-        public void AppVerificationUpdateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appStoreAppId = null;
-            //string verificationStatus = null;
-            //instance.AppVerificationUpdate(oauthAppId, appStoreAppId, verificationStatus);
-            
-        }
-        
-        /// <summary>
-        /// Test CreateAppStoreApp
-        /// </summary>
-        [Test]
-        public void CreateAppStoreAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //CreateAppStoreApp createAppStoreApp = null;
-            //var response = instance.CreateAppStoreApp(oauthAppId, createAppStoreApp);
-            //Assert.IsInstanceOf<RestApiResultAppStoreApp> (response, "response is RestApiResultAppStoreApp");
-        }
-        
-        /// <summary>
-        /// Test DeleteAppStoreApp
-        /// </summary>
-        [Test]
-        public void DeleteAppStoreAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appStoreAppId = null;
-            //var response = instance.DeleteAppStoreApp(oauthAppId, appStoreAppId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test GetAppStoreApp
-        /// </summary>
-        [Test]
-        public void GetAppStoreAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appStoreAppId = null;
-            //var response = instance.GetAppStoreApp(oauthAppId, appStoreAppId);
-            //Assert.IsInstanceOf<AppStoreApp> (response, "response is AppStoreApp");
-        }
-        
-        /// <summary>
-        /// Test UpdateAppStoreApp
-        /// </summary>
-        [Test]
-        public void UpdateAppStoreAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appStoreAppId = null;
-            //UpdateAppStoreApp appStoreApp = null;
-            //instance.UpdateAppStoreApp(oauthAppId, appStoreAppId, appStoreApp);
-            
-        }
-        
-        /// <summary>
-        /// Test UploadAppStoreAppLogo
-        /// </summary>
-        [Test]
-        public void UploadAppStoreAppLogoTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appStoreAppId = null;
-            //System.IO.Stream image = null;
-            //instance.UploadAppStoreAppLogo(oauthAppId, appStoreAppId, image);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/AppsApiTests.cs b/src/Flipdish.Test/Api/AppsApiTests.cs
deleted file mode 100644
index 258a2610..00000000
--- a/src/Flipdish.Test/Api/AppsApiTests.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class AppsApiTests
-    {
-        private AppsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new AppsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' AppsApi
-            //Assert.IsInstanceOfType(typeof(AppsApi), instance, "instance is a AppsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetApp
-        /// </summary>
-        [Test]
-        public void GetAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetApp(appId);
-            //Assert.IsInstanceOf<RestApiResultApp> (response, "response is RestApiResultApp");
-        }
-        
-        /// <summary>
-        /// Test GetAppHostnameStatus
-        /// </summary>
-        [Test]
-        public void GetAppHostnameStatusTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetAppHostnameStatus(appId);
-            //Assert.IsInstanceOf<RestApiResultDnsRecordInformation> (response, "response is RestApiResultDnsRecordInformation");
-        }
-        
-        /// <summary>
-        /// Test GetApps
-        /// </summary>
-        [Test]
-        public void GetAppsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string nameFilter = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetApps(nameFilter, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultApp> (response, "response is RestApiPaginationResultApp");
-        }
-        
-        /// <summary>
-        /// Test GetPanaceaVanityUrl
-        /// </summary>
-        [Test]
-        public void GetPanaceaVanityUrlTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetPanaceaVanityUrl(appId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test GetSupportedCountries
-        /// </summary>
-        [Test]
-        public void GetSupportedCountriesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetSupportedCountries();
-            //Assert.IsInstanceOf<RestApiArrayResultSupportedCountry> (response, "response is RestApiArrayResultSupportedCountry");
-        }
-        
-        /// <summary>
-        /// Test IsPanaceaVanityUrlAvailable
-        /// </summary>
-        [Test]
-        public void IsPanaceaVanityUrlAvailableTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string vanityUrl = null;
-            //string appId = null;
-            //var response = instance.IsPanaceaVanityUrlAvailable(vanityUrl, appId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test SetAppConfig
-        /// </summary>
-        [Test]
-        public void SetAppConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //AppConfigUpdateModel appConfigUpdate = null;
-            //var response = instance.SetAppConfig(appId, appConfigUpdate);
-            //Assert.IsInstanceOf<RestApiResultApp> (response, "response is RestApiResultApp");
-        }
-        
-        /// <summary>
-        /// Test SetAppHostname
-        /// </summary>
-        [Test]
-        public void SetAppHostnameTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string hostname = null;
-            //bool? isEmbed = null;
-            //var response = instance.SetAppHostname(appId, hostname, isEmbed);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test SetAppLanguages
-        /// </summary>
-        [Test]
-        public void SetAppLanguagesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //List<Language> languages = null;
-            //var response = instance.SetAppLanguages(appId, languages);
-            //Assert.IsInstanceOf<RestApiResultApp> (response, "response is RestApiResultApp");
-        }
-        
-        /// <summary>
-        /// Test SetPanaceaVanityUrl
-        /// </summary>
-        [Test]
-        public void SetPanaceaVanityUrlTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string vanityUrl = null;
-            //var response = instance.SetPanaceaVanityUrl(appId, vanityUrl);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test UploadAppLogo
-        /// </summary>
-        [Test]
-        public void UploadAppLogoTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //System.IO.Stream image = null;
-            //instance.UploadAppLogo(appId, image);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/AuditLogsApiTests.cs b/src/Flipdish.Test/Api/AuditLogsApiTests.cs
deleted file mode 100644
index 9b3596f7..00000000
--- a/src/Flipdish.Test/Api/AuditLogsApiTests.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AuditLogsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class AuditLogsApiTests
-    {
-        private AuditLogsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new AuditLogsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AuditLogsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' AuditLogsApi
-            //Assert.IsInstanceOfType(typeof(AuditLogsApi), instance, "instance is a AuditLogsApi");
-        }
-
-        
-        /// <summary>
-        /// Test AddOrderAuditLog
-        /// </summary>
-        [Test]
-        public void AddOrderAuditLogTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? orderId = null;
-            //List<ExternalStoreAuditLog> externalEventCreate = null;
-            //instance.AddOrderAuditLog(orderId, externalEventCreate);
-            
-        }
-        
-        /// <summary>
-        /// Test AddStoreAuditLogEvent
-        /// </summary>
-        [Test]
-        public void AddStoreAuditLogEventTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //List<ExternalStoreAuditLog> externalEventCreate = null;
-            //instance.AddStoreAuditLogEvent(storeId, externalEventCreate);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/AuthorizationTokensApiTests.cs b/src/Flipdish.Test/Api/AuthorizationTokensApiTests.cs
deleted file mode 100644
index 95ccd573..00000000
--- a/src/Flipdish.Test/Api/AuthorizationTokensApiTests.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AuthorizationTokensApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class AuthorizationTokensApiTests
-    {
-        private AuthorizationTokensApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new AuthorizationTokensApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AuthorizationTokensApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' AuthorizationTokensApi
-            //Assert.IsInstanceOfType(typeof(AuthorizationTokensApi), instance, "instance is a AuthorizationTokensApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetAuthorizationTokens
-        /// </summary>
-        [Test]
-        public void GetAuthorizationTokensTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appId = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetAuthorizationTokens(oauthAppId, appId, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultOAuthTokenModel> (response, "response is RestApiPaginationResultOAuthTokenModel");
-        }
-        
-        /// <summary>
-        /// Test RevokeToken
-        /// </summary>
-        [Test]
-        public void RevokeTokenTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string key = null;
-            //string appId = null;
-            //instance.RevokeToken(key, appId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/BankAccountApiTests.cs b/src/Flipdish.Test/Api/BankAccountApiTests.cs
deleted file mode 100644
index 21158a3c..00000000
--- a/src/Flipdish.Test/Api/BankAccountApiTests.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccountApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountApiTests
-    {
-        private BankAccountApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new BankAccountApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccountApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' BankAccountApi
-            //Assert.IsInstanceOfType(typeof(BankAccountApi), instance, "instance is a BankAccountApi");
-        }
-
-        
-        /// <summary>
-        /// Test AttachBankAccountToStore
-        /// </summary>
-        [Test]
-        public void AttachBankAccountToStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? accountId = null;
-            //int? storeId = null;
-            //instance.AttachBankAccountToStore(appId, accountId, storeId);
-            
-        }
-        
-        /// <summary>
-        /// Test CreateBankAccount
-        /// </summary>
-        [Test]
-        public void CreateBankAccountTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //BankAccountCreate account = null;
-            //var response = instance.CreateBankAccount(appId, account);
-            //Assert.IsInstanceOf<RestApiResultBankAccountDetail> (response, "response is RestApiResultBankAccountDetail");
-        }
-        
-        /// <summary>
-        /// Test DeleteBankAccount
-        /// </summary>
-        [Test]
-        public void DeleteBankAccountTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? id = null;
-            //instance.DeleteBankAccount(appId, id);
-            
-        }
-        
-        /// <summary>
-        /// Test GetBankAccountById
-        /// </summary>
-        [Test]
-        public void GetBankAccountByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? id = null;
-            //string appId = null;
-            //var response = instance.GetBankAccountById(id, appId);
-            //Assert.IsInstanceOf<RestApiResultBankAccountDetail> (response, "response is RestApiResultBankAccountDetail");
-        }
-        
-        /// <summary>
-        /// Test GetBankAccounts
-        /// </summary>
-        [Test]
-        public void GetBankAccountsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetBankAccounts(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultBankAccountSummary> (response, "response is RestApiArrayResultBankAccountSummary");
-        }
-        
-        /// <summary>
-        /// Test GetFieldDefinitions
-        /// </summary>
-        [Test]
-        public void GetFieldDefinitionsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetFieldDefinitions(appId);
-            //Assert.IsInstanceOf<RestApiResultAccountFieldsDefinitions> (response, "response is RestApiResultAccountFieldsDefinitions");
-        }
-        
-        /// <summary>
-        /// Test UpdateBankAccount
-        /// </summary>
-        [Test]
-        public void UpdateBankAccountTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? id = null;
-            //BankAccountCreate account = null;
-            //instance.UpdateBankAccount(appId, id, account);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateBankAccountState
-        /// </summary>
-        [Test]
-        public void UpdateBankAccountStateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? accountId = null;
-            //string state = null;
-            //string reason = null;
-            //instance.UpdateBankAccountState(appId, accountId, state, reason);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/CampaignsApiTests.cs b/src/Flipdish.Test/Api/CampaignsApiTests.cs
deleted file mode 100644
index 78df058e..00000000
--- a/src/Flipdish.Test/Api/CampaignsApiTests.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CampaignsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class CampaignsApiTests
-    {
-        private CampaignsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new CampaignsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CampaignsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' CampaignsApi
-            //Assert.IsInstanceOfType(typeof(CampaignsApi), instance, "instance is a CampaignsApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateLoyaltyCampaign
-        /// </summary>
-        [Test]
-        public void CreateLoyaltyCampaignTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //LoyaltyCampaignBase campaign = null;
-            //var response = instance.CreateLoyaltyCampaign(appId, campaign);
-            //Assert.IsInstanceOf<RestApiResultLoyaltyCampaign> (response, "response is RestApiResultLoyaltyCampaign");
-        }
-        
-        /// <summary>
-        /// Test CreateRetentionCampaign
-        /// </summary>
-        [Test]
-        public void CreateRetentionCampaignTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //RetentionCampaignBase campaign = null;
-            //var response = instance.CreateRetentionCampaign(appId, campaign);
-            //Assert.IsInstanceOf<RestApiResultRetentionCampaign> (response, "response is RestApiResultRetentionCampaign");
-        }
-        
-        /// <summary>
-        /// Test GetLoyaltyCampaignsForApp
-        /// </summary>
-        [Test]
-        public void GetLoyaltyCampaignsForAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetLoyaltyCampaignsForApp(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultLoyaltyCampaign> (response, "response is RestApiArrayResultLoyaltyCampaign");
-        }
-        
-        /// <summary>
-        /// Test GetLoyaltyCampaignsForStore
-        /// </summary>
-        [Test]
-        public void GetLoyaltyCampaignsForStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //var response = instance.GetLoyaltyCampaignsForStore(appId, storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultLoyaltyCampaign> (response, "response is RestApiArrayResultLoyaltyCampaign");
-        }
-        
-        /// <summary>
-        /// Test GetRetentionCampaignsForApp
-        /// </summary>
-        [Test]
-        public void GetRetentionCampaignsForAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetRetentionCampaignsForApp(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultRetentionCampaign> (response, "response is RestApiArrayResultRetentionCampaign");
-        }
-        
-        /// <summary>
-        /// Test GetRetentionCampaignsForStore
-        /// </summary>
-        [Test]
-        public void GetRetentionCampaignsForStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //var response = instance.GetRetentionCampaignsForStore(appId, storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultRetentionCampaign> (response, "response is RestApiArrayResultRetentionCampaign");
-        }
-        
-        /// <summary>
-        /// Test GetStoreList
-        /// </summary>
-        [Test]
-        public void GetStoreListTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetStoreList(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultStoreListItem> (response, "response is RestApiArrayResultStoreListItem");
-        }
-        
-        /// <summary>
-        /// Test RemoveCampaign
-        /// </summary>
-        [Test]
-        public void RemoveCampaignTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? campaignId = null;
-            //instance.RemoveCampaign(appId, campaignId);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateLoyaltyCampaign
-        /// </summary>
-        [Test]
-        public void UpdateLoyaltyCampaignTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? campaignId = null;
-            //LoyaltyCampaignBase campaign = null;
-            //var response = instance.UpdateLoyaltyCampaign(appId, campaignId, campaign);
-            //Assert.IsInstanceOf<RestApiResultLoyaltyCampaign> (response, "response is RestApiResultLoyaltyCampaign");
-        }
-        
-        /// <summary>
-        /// Test UpdateRetentionCampaign
-        /// </summary>
-        [Test]
-        public void UpdateRetentionCampaignTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? campaignId = null;
-            //RetentionCampaignBase campaign = null;
-            //var response = instance.UpdateRetentionCampaign(appId, campaignId, campaign);
-            //Assert.IsInstanceOf<RestApiResultRetentionCampaign> (response, "response is RestApiResultRetentionCampaign");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/CardReadersApiTests.cs b/src/Flipdish.Test/Api/CardReadersApiTests.cs
deleted file mode 100644
index e4e567c2..00000000
--- a/src/Flipdish.Test/Api/CardReadersApiTests.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CardReadersApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class CardReadersApiTests
-    {
-        private CardReadersApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new CardReadersApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CardReadersApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' CardReadersApi
-            //Assert.IsInstanceOfType(typeof(CardReadersApi), instance, "instance is a CardReadersApi");
-        }
-
-        
-        /// <summary>
-        /// Test AuthorizeStripeTerminal
-        /// </summary>
-        [Test]
-        public void AuthorizeStripeTerminalTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.AuthorizeStripeTerminal(appId);
-            //Assert.IsInstanceOf<RestApiResultStripeTerminalPrivateKey> (response, "response is RestApiResultStripeTerminalPrivateKey");
-        }
-        
-        /// <summary>
-        /// Test CancelCurrentlyInitiatedBluetoothDeviceUpdate
-        /// </summary>
-        [Test]
-        public void CancelCurrentlyInitiatedBluetoothDeviceUpdateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceId = null;
-            //string terminalType = null;
-            //instance.CancelCurrentlyInitiatedBluetoothDeviceUpdate(appId, deviceId, terminalType);
-            
-        }
-        
-        /// <summary>
-        /// Test GetBluetoothTerminalStatus
-        /// </summary>
-        [Test]
-        public void GetBluetoothTerminalStatusTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceId = null;
-            //var response = instance.GetBluetoothTerminalStatus(appId, deviceId);
-            //Assert.IsInstanceOf<RestApiResultBluetoothTerminalStatus> (response, "response is RestApiResultBluetoothTerminalStatus");
-        }
-        
-        /// <summary>
-        /// Test InitiateBluetoothTerminalDeviceUpdateCheck
-        /// </summary>
-        [Test]
-        public void InitiateBluetoothTerminalDeviceUpdateCheckTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceId = null;
-            //string terminalType = null;
-            //instance.InitiateBluetoothTerminalDeviceUpdateCheck(appId, deviceId, terminalType);
-            
-        }
-        
-        /// <summary>
-        /// Test InitiateKioskBluetoothPairingMode
-        /// </summary>
-        [Test]
-        public void InitiateKioskBluetoothPairingModeTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceId = null;
-            //string terminalType = null;
-            //instance.InitiateKioskBluetoothPairingMode(appId, deviceId, terminalType);
-            
-        }
-        
-        /// <summary>
-        /// Test InitiateKioskBluetoothUpdateInstall
-        /// </summary>
-        [Test]
-        public void InitiateKioskBluetoothUpdateInstallTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceId = null;
-            //string terminalType = null;
-            //instance.InitiateKioskBluetoothUpdateInstall(appId, deviceId, terminalType);
-            
-        }
-        
-        /// <summary>
-        /// Test UnpairCurrentlyPairedBluetoothDevice
-        /// </summary>
-        [Test]
-        public void UnpairCurrentlyPairedBluetoothDeviceTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceId = null;
-            //instance.UnpairCurrentlyPairedBluetoothDevice(appId, deviceId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/CatalogChangesApiTests.cs b/src/Flipdish.Test/Api/CatalogChangesApiTests.cs
deleted file mode 100644
index 88e7a48b..00000000
--- a/src/Flipdish.Test/Api/CatalogChangesApiTests.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogChangesApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogChangesApiTests
-    {
-        private CatalogChangesApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new CatalogChangesApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogChangesApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' CatalogChangesApi
-            //Assert.IsInstanceOfType(typeof(CatalogChangesApi), instance, "instance is a CatalogChangesApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetPendingMenuChanges
-        /// </summary>
-        [Test]
-        public void GetPendingMenuChangesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? menuId = null;
-            //string catalogElementId = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetPendingMenuChanges(appId, menuId, catalogElementId, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultPendingMenuChanges> (response, "response is RestApiPaginationResultPendingMenuChanges");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/CatalogGroupsApiTests.cs b/src/Flipdish.Test/Api/CatalogGroupsApiTests.cs
deleted file mode 100644
index 2941843c..00000000
--- a/src/Flipdish.Test/Api/CatalogGroupsApiTests.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogGroupsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogGroupsApiTests
-    {
-        private CatalogGroupsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new CatalogGroupsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogGroupsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' CatalogGroupsApi
-            //Assert.IsInstanceOfType(typeof(CatalogGroupsApi), instance, "instance is a CatalogGroupsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetById
-        /// </summary>
-        [Test]
-        public void GetByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string catalogGroupId = null;
-            //var response = instance.GetById(appId, catalogGroupId);
-            //Assert.IsInstanceOf<CatalogGroup> (response, "response is CatalogGroup");
-        }
-        
-        /// <summary>
-        /// Test GetGroups
-        /// </summary>
-        [Test]
-        public void GetGroupsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //List<string> groupTypes = null;
-            //string searchTerm = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetGroups(appId, groupTypes, searchTerm, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultCatalogGroup> (response, "response is RestApiPaginationResultCatalogGroup");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/CatalogImagesApiTests.cs b/src/Flipdish.Test/Api/CatalogImagesApiTests.cs
deleted file mode 100644
index 729adfeb..00000000
--- a/src/Flipdish.Test/Api/CatalogImagesApiTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogImagesApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogImagesApiTests
-    {
-        private CatalogImagesApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new CatalogImagesApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogImagesApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' CatalogImagesApi
-            //Assert.IsInstanceOfType(typeof(CatalogImagesApi), instance, "instance is a CatalogImagesApi");
-        }
-
-        
-        /// <summary>
-        /// Test UploadCatalogImage
-        /// </summary>
-        [Test]
-        public void UploadCatalogImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //System.IO.Stream image = null;
-            //var response = instance.UploadCatalogImage(appId, image);
-            //Assert.IsInstanceOf<CatalogImage> (response, "response is CatalogImage");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/CatalogItemsApiTests.cs b/src/Flipdish.Test/Api/CatalogItemsApiTests.cs
deleted file mode 100644
index 834dd72b..00000000
--- a/src/Flipdish.Test/Api/CatalogItemsApiTests.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogItemsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogItemsApiTests
-    {
-        private CatalogItemsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new CatalogItemsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogItemsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' CatalogItemsApi
-            //Assert.IsInstanceOfType(typeof(CatalogItemsApi), instance, "instance is a CatalogItemsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetById
-        /// </summary>
-        [Test]
-        public void GetByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string catalogItemId = null;
-            //var response = instance.GetById(appId, catalogItemId);
-            //Assert.IsInstanceOf<CatalogItem> (response, "response is CatalogItem");
-        }
-        
-        /// <summary>
-        /// Test GetItems
-        /// </summary>
-        [Test]
-        public void GetItemsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //List<string> itemTypes = null;
-            //string searchTerm = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetItems(appId, itemTypes, searchTerm, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultCatalogItem> (response, "response is RestApiPaginationResultCatalogItem");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/CatalogProductsApiTests.cs b/src/Flipdish.Test/Api/CatalogProductsApiTests.cs
deleted file mode 100644
index a41d68db..00000000
--- a/src/Flipdish.Test/Api/CatalogProductsApiTests.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogProductsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogProductsApiTests
-    {
-        private CatalogProductsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new CatalogProductsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogProductsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' CatalogProductsApi
-            //Assert.IsInstanceOfType(typeof(CatalogProductsApi), instance, "instance is a CatalogProductsApi");
-        }
-
-        
-        /// <summary>
-        /// Test ArchiveProduct
-        /// </summary>
-        [Test]
-        public void ArchiveProductTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string catalogItemId = null;
-            //instance.ArchiveProduct(appId, catalogItemId);
-            
-        }
-        
-        /// <summary>
-        /// Test CreateProduct
-        /// </summary>
-        [Test]
-        public void CreateProductTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //CreateProduct createProduct = null;
-            //var response = instance.CreateProduct(appId, createProduct);
-            //Assert.IsInstanceOf<RestApiResultProduct> (response, "response is RestApiResultProduct");
-        }
-        
-        /// <summary>
-        /// Test DuplicateProduct
-        /// </summary>
-        [Test]
-        public void DuplicateProductTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string catalogItemId = null;
-            //instance.DuplicateProduct(appId, catalogItemId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetProductById
-        /// </summary>
-        [Test]
-        public void GetProductByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string catalogItemId = null;
-            //var response = instance.GetProductById(appId, catalogItemId);
-            //Assert.IsInstanceOf<Product> (response, "response is Product");
-        }
-        
-        /// <summary>
-        /// Test GetProducts
-        /// </summary>
-        [Test]
-        public void GetProductsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //List<string> itemTypes = null;
-            //string searchTerm = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetProducts(appId, itemTypes, searchTerm, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultCatalogItem> (response, "response is RestApiPaginationResultCatalogItem");
-        }
-        
-        /// <summary>
-        /// Test UpdateProduct
-        /// </summary>
-        [Test]
-        public void UpdateProductTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string catalogItemId = null;
-            //UpdateProduct updateProduct = null;
-            //instance.UpdateProduct(appId, catalogItemId, updateProduct);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/ChannelsApiTests.cs b/src/Flipdish.Test/Api/ChannelsApiTests.cs
deleted file mode 100644
index b66b210d..00000000
--- a/src/Flipdish.Test/Api/ChannelsApiTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ChannelsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class ChannelsApiTests
-    {
-        private ChannelsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new ChannelsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ChannelsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' ChannelsApi
-            //Assert.IsInstanceOfType(typeof(ChannelsApi), instance, "instance is a ChannelsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetChannel
-        /// </summary>
-        [Test]
-        public void GetChannelTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? id = null;
-            //string appId = null;
-            //var response = instance.GetChannel(id, appId);
-            //Assert.IsInstanceOf<RestApiPaginationResultChannel> (response, "response is RestApiPaginationResultChannel");
-        }
-        
-        /// <summary>
-        /// Test GetChannels
-        /// </summary>
-        [Test]
-        public void GetChannelsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetChannels(appId);
-            //Assert.IsInstanceOf<RestApiPaginationResultChannel> (response, "response is RestApiPaginationResultChannel");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/ChannelsStoreMappingApiTests.cs b/src/Flipdish.Test/Api/ChannelsStoreMappingApiTests.cs
deleted file mode 100644
index 4f3c7f07..00000000
--- a/src/Flipdish.Test/Api/ChannelsStoreMappingApiTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ChannelsStoreMappingApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class ChannelsStoreMappingApiTests
-    {
-        private ChannelsStoreMappingApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new ChannelsStoreMappingApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ChannelsStoreMappingApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' ChannelsStoreMappingApi
-            //Assert.IsInstanceOfType(typeof(ChannelsStoreMappingApi), instance, "instance is a ChannelsStoreMappingApi");
-        }
-
-        
-        /// <summary>
-        /// Test ChannelsGetStoreChannelStoreMapping
-        /// </summary>
-        [Test]
-        public void ChannelsGetStoreChannelStoreMappingTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? channelId = null;
-            //var response = instance.ChannelsGetStoreChannelStoreMapping(appId, channelId);
-            //Assert.IsInstanceOf<RestApiArrayResultStoreChannelStoreMapping> (response, "response is RestApiArrayResultStoreChannelStoreMapping");
-        }
-        
-        /// <summary>
-        /// Test ChannelsSetStoreChannelStoreMapping
-        /// </summary>
-        [Test]
-        public void ChannelsSetStoreChannelStoreMappingTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? channelId = null;
-            //List<ChannelStoreMapping> stores = null;
-            //var response = instance.ChannelsSetStoreChannelStoreMapping(appId, channelId, stores);
-            //Assert.IsInstanceOf<RestApiArrayResultStoreChannelStoreMapping> (response, "response is RestApiArrayResultStoreChannelStoreMapping");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/ContentSecurityPolicyApiTests.cs b/src/Flipdish.Test/Api/ContentSecurityPolicyApiTests.cs
deleted file mode 100644
index 39d67862..00000000
--- a/src/Flipdish.Test/Api/ContentSecurityPolicyApiTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ContentSecurityPolicyApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class ContentSecurityPolicyApiTests
-    {
-        private ContentSecurityPolicyApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new ContentSecurityPolicyApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ContentSecurityPolicyApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' ContentSecurityPolicyApi
-            //Assert.IsInstanceOfType(typeof(ContentSecurityPolicyApi), instance, "instance is a ContentSecurityPolicyApi");
-        }
-
-        
-        /// <summary>
-        /// Test ContentSecurityPolicyReport
-        /// </summary>
-        [Test]
-        public void ContentSecurityPolicyReportTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //CspReportRequest request = null;
-            //var response = instance.ContentSecurityPolicyReport(request);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/CustomersApiTests.cs b/src/Flipdish.Test/Api/CustomersApiTests.cs
deleted file mode 100644
index 36d16775..00000000
--- a/src/Flipdish.Test/Api/CustomersApiTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CustomersApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class CustomersApiTests
-    {
-        private CustomersApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new CustomersApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CustomersApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' CustomersApi
-            //Assert.IsInstanceOfType(typeof(CustomersApi), instance, "instance is a CustomersApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetCustomerById
-        /// </summary>
-        [Test]
-        public void GetCustomerByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? customerId = null;
-            //var response = instance.GetCustomerById(appId, customerId);
-            //Assert.IsInstanceOf<RestApiResultCustomer> (response, "response is RestApiResultCustomer");
-        }
-        
-        /// <summary>
-        /// Test UpdateCustomerById
-        /// </summary>
-        [Test]
-        public void UpdateCustomerByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? customerId = null;
-            //CustomerUpdateModel updateCustomer = null;
-            //var response = instance.UpdateCustomerById(appId, customerId, updateCustomer);
-            //Assert.IsInstanceOf<RestApiResultCustomer> (response, "response is RestApiResultCustomer");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/DeliveryTrackingApiTests.cs b/src/Flipdish.Test/Api/DeliveryTrackingApiTests.cs
deleted file mode 100644
index 2fde26a2..00000000
--- a/src/Flipdish.Test/Api/DeliveryTrackingApiTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeliveryTrackingApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class DeliveryTrackingApiTests
-    {
-        private DeliveryTrackingApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new DeliveryTrackingApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeliveryTrackingApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' DeliveryTrackingApi
-            //Assert.IsInstanceOfType(typeof(DeliveryTrackingApi), instance, "instance is a DeliveryTrackingApi");
-        }
-
-        
-        /// <summary>
-        /// Test AssignDriverToOrder
-        /// </summary>
-        [Test]
-        public void AssignDriverToOrderTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? orderId = null;
-            //int? driverId = null;
-            //instance.AssignDriverToOrder(appId, orderId, driverId);
-            
-        }
-        
-        /// <summary>
-        /// Test AssignDriverToOrders
-        /// </summary>
-        [Test]
-        public void AssignDriverToOrdersTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? driverId = null;
-            //List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers = null;
-            //instance.AssignDriverToOrders(appId, driverId, orderIdAndSequenceNumbers);
-            
-        }
-        
-        /// <summary>
-        /// Test GetDrivers
-        /// </summary>
-        [Test]
-        public void GetDriversTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string name = null;
-            //string phoneNumber = null;
-            //int? storeId = null;
-            //string presence = null;
-            //var response = instance.GetDrivers(appId, name, phoneNumber, storeId, presence);
-            //Assert.IsInstanceOf<RestApiArrayResultDriver> (response, "response is RestApiArrayResultDriver");
-        }
-        
-        /// <summary>
-        /// Test InviteDriverToApp
-        /// </summary>
-        [Test]
-        public void InviteDriverToAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //DriverInvitation driverInvitation = null;
-            //var response = instance.InviteDriverToApp(appId, driverInvitation);
-            //Assert.IsInstanceOf<RestApiResultDriver> (response, "response is RestApiResultDriver");
-        }
-        
-        /// <summary>
-        /// Test RemoveDriverFromApp
-        /// </summary>
-        [Test]
-        public void RemoveDriverFromAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? driverId = null;
-            //instance.RemoveDriverFromApp(appId, driverId);
-            
-        }
-        
-        /// <summary>
-        /// Test UnassignDriverFromOrder
-        /// </summary>
-        [Test]
-        public void UnassignDriverFromOrderTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? orderId = null;
-            //instance.UnassignDriverFromOrder(appId, orderId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/DeliveryZoneApiTests.cs b/src/Flipdish.Test/Api/DeliveryZoneApiTests.cs
deleted file mode 100644
index 5849492b..00000000
--- a/src/Flipdish.Test/Api/DeliveryZoneApiTests.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeliveryZoneApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class DeliveryZoneApiTests
-    {
-        private DeliveryZoneApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new DeliveryZoneApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeliveryZoneApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' DeliveryZoneApi
-            //Assert.IsInstanceOfType(typeof(DeliveryZoneApi), instance, "instance is a DeliveryZoneApi");
-        }
-
-        
-        /// <summary>
-        /// Test AddDeliveryZone
-        /// </summary>
-        [Test]
-        public void AddDeliveryZoneTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //DeliveryZoneBase deliveryZoneBase = null;
-            //var response = instance.AddDeliveryZone(storeId, deliveryZoneBase);
-            //Assert.IsInstanceOf<RestApiResultDeliveryZone> (response, "response is RestApiResultDeliveryZone");
-        }
-        
-        /// <summary>
-        /// Test GetDeliveryZones
-        /// </summary>
-        [Test]
-        public void GetDeliveryZonesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //var response = instance.GetDeliveryZones(storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultDeliveryZone> (response, "response is RestApiArrayResultDeliveryZone");
-        }
-        
-        /// <summary>
-        /// Test RemoveDeliveryZone
-        /// </summary>
-        [Test]
-        public void RemoveDeliveryZoneTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //int? deliveryZoneId = null;
-            //instance.RemoveDeliveryZone(storeId, deliveryZoneId);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateDeliveryZone
-        /// </summary>
-        [Test]
-        public void UpdateDeliveryZoneTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //int? deliveryZoneId = null;
-            //DeliveryZoneBase deliveryZone = null;
-            //var response = instance.UpdateDeliveryZone(storeId, deliveryZoneId, deliveryZone);
-            //Assert.IsInstanceOf<RestApiResultDeliveryZone> (response, "response is RestApiResultDeliveryZone");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/DriversApiTests.cs b/src/Flipdish.Test/Api/DriversApiTests.cs
deleted file mode 100644
index bf06bd6b..00000000
--- a/src/Flipdish.Test/Api/DriversApiTests.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DriversApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class DriversApiTests
-    {
-        private DriversApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new DriversApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DriversApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' DriversApi
-            //Assert.IsInstanceOfType(typeof(DriversApi), instance, "instance is a DriversApi");
-        }
-
-        
-        /// <summary>
-        /// Test AddDriverNotificationToken
-        /// </summary>
-        [Test]
-        public void AddDriverNotificationTokenTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //UpdateDriverNotificationToken updateDriverToken = null;
-            //instance.AddDriverNotificationToken(updateDriverToken);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteDriverProfileImage
-        /// </summary>
-        [Test]
-        public void DeleteDriverProfileImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //instance.DeleteDriverProfileImage();
-            
-        }
-        
-        /// <summary>
-        /// Test DriverLogin
-        /// </summary>
-        [Test]
-        public void DriverLoginTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //DriverLoginModel driverLoginModel = null;
-            //instance.DriverLogin(driverLoginModel);
-            
-        }
-        
-        /// <summary>
-        /// Test DriverRequestLoginCodeSms
-        /// </summary>
-        [Test]
-        public void DriverRequestLoginCodeSmsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //DriverRequestLoginPinModel driverRequestLoginPinModel = null;
-            //instance.DriverRequestLoginCodeSms(driverRequestLoginPinModel);
-            
-        }
-        
-        /// <summary>
-        /// Test GetDriverProfile
-        /// </summary>
-        [Test]
-        public void GetDriverProfileTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetDriverProfile();
-            //Assert.IsInstanceOf<RestApiResultDriver> (response, "response is RestApiResultDriver");
-        }
-        
-        /// <summary>
-        /// Test GetStoresForDriver
-        /// </summary>
-        [Test]
-        public void GetStoresForDriverTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetStoresForDriver();
-            //Assert.IsInstanceOf<RestApiArrayResultDriverStore> (response, "response is RestApiArrayResultDriverStore");
-        }
-        
-        /// <summary>
-        /// Test RemoveDriverNotificationToken
-        /// </summary>
-        [Test]
-        public void RemoveDriverNotificationTokenTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //UpdateDriverNotificationToken removeDriverToken = null;
-            //instance.RemoveDriverNotificationToken(removeDriverToken);
-            
-        }
-        
-        /// <summary>
-        /// Test SetDriverPresenceForStore
-        /// </summary>
-        [Test]
-        public void SetDriverPresenceForStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string presence = null;
-            //instance.SetDriverPresenceForStore(storeId, presence);
-            
-        }
-        
-        /// <summary>
-        /// Test SetDriverProfileImage
-        /// </summary>
-        [Test]
-        public void SetDriverProfileImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.SetDriverProfileImage();
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test UpdateDeliveryTrackingStatus
-        /// </summary>
-        [Test]
-        public void UpdateDeliveryTrackingStatusTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? orderId = null;
-            //string deliveryTrackingStatus = null;
-            //var response = instance.UpdateDeliveryTrackingStatus(orderId, deliveryTrackingStatus);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test UpdateDriverProfile
-        /// </summary>
-        [Test]
-        public void UpdateDriverProfileTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //UpdateDriverProfileModel updateDriverProfile = null;
-            //instance.UpdateDriverProfile(updateDriverProfile);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/EventsApiTests.cs b/src/Flipdish.Test/Api/EventsApiTests.cs
deleted file mode 100644
index 6aec9633..00000000
--- a/src/Flipdish.Test/Api/EventsApiTests.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing EventsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class EventsApiTests
-    {
-        private EventsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new EventsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of EventsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' EventsApi
-            //Assert.IsInstanceOfType(typeof(EventsApi), instance, "instance is a EventsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetCustomerEvents
-        /// </summary>
-        [Test]
-        public void GetCustomerEventsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? customerId = null;
-            //int? limit = null;
-            //int? page = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //int? orderId = null;
-            //int? storeId = null;
-            //int? storeGroupId = null;
-            //int? userId = null;
-            //string userEmail = null;
-            //string userName = null;
-            //string voucherCode = null;
-            //List<string> eventType = null;
-            //string flipdishEventId = null;
-            //var response = instance.GetCustomerEvents(customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
-            //Assert.IsInstanceOf<RestApiEventSearchPaginationResult> (response, "response is RestApiEventSearchPaginationResult");
-        }
-        
-        /// <summary>
-        /// Test GetEvents
-        /// </summary>
-        [Test]
-        public void GetEventsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? whiteLabelId = null;
-            //int? customerId = null;
-            //int? limit = null;
-            //int? page = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //int? orderId = null;
-            //int? storeId = null;
-            //int? storeGroupId = null;
-            //int? userId = null;
-            //string userEmail = null;
-            //string userName = null;
-            //string voucherCode = null;
-            //List<string> eventType = null;
-            //string flipdishEventId = null;
-            //var response = instance.GetEvents(whiteLabelId, customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
-            //Assert.IsInstanceOf<RestApiEventSearchPaginationResult> (response, "response is RestApiEventSearchPaginationResult");
-        }
-        
-        /// <summary>
-        /// Test GetEventsById
-        /// </summary>
-        [Test]
-        public void GetEventsByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //Guid? eventId = null;
-            //var response = instance.GetEventsById(eventId);
-            //Assert.IsInstanceOf<EventSearchResult> (response, "response is EventSearchResult");
-        }
-        
-        /// <summary>
-        /// Test GetMenuEvents
-        /// </summary>
-        [Test]
-        public void GetMenuEventsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? limit = null;
-            //int? page = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //int? orderId = null;
-            //int? storeId = null;
-            //int? storeGroupId = null;
-            //int? userId = null;
-            //string userEmail = null;
-            //string userName = null;
-            //string voucherCode = null;
-            //List<string> eventType = null;
-            //string flipdishEventId = null;
-            //var response = instance.GetMenuEvents(menuId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
-            //Assert.IsInstanceOf<RestApiEventSearchPaginationResult> (response, "response is RestApiEventSearchPaginationResult");
-        }
-        
-        /// <summary>
-        /// Test GetOrderEvents
-        /// </summary>
-        [Test]
-        public void GetOrderEventsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? orderId = null;
-            //int? limit = null;
-            //int? page = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //int? orderId2 = null;
-            //int? storeId = null;
-            //int? storeGroupId = null;
-            //int? userId = null;
-            //string userEmail = null;
-            //string userName = null;
-            //string voucherCode = null;
-            //List<string> eventType = null;
-            //string flipdishEventId = null;
-            //var response = instance.GetOrderEvents(orderId, limit, page, start, end, orderId2, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
-            //Assert.IsInstanceOf<RestApiEventSearchPaginationResult> (response, "response is RestApiEventSearchPaginationResult");
-        }
-        
-        /// <summary>
-        /// Test GetOrderEventsByCustomer
-        /// </summary>
-        [Test]
-        public void GetOrderEventsByCustomerTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? customerId = null;
-            //int? limit = null;
-            //int? page = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //int? orderId = null;
-            //int? storeId = null;
-            //int? storeGroupId = null;
-            //int? userId = null;
-            //string userEmail = null;
-            //string userName = null;
-            //string voucherCode = null;
-            //List<string> eventType = null;
-            //string flipdishEventId = null;
-            //var response = instance.GetOrderEventsByCustomer(customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
-            //Assert.IsInstanceOf<RestApiEventSearchPaginationResult> (response, "response is RestApiEventSearchPaginationResult");
-        }
-        
-        /// <summary>
-        /// Test GetStoreEvents
-        /// </summary>
-        [Test]
-        public void GetStoreEventsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //int? limit = null;
-            //int? page = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //int? orderId = null;
-            //int? storeId2 = null;
-            //int? storeGroupId = null;
-            //int? userId = null;
-            //string userEmail = null;
-            //string userName = null;
-            //string voucherCode = null;
-            //List<string> eventType = null;
-            //string flipdishEventId = null;
-            //var response = instance.GetStoreEvents(storeId, limit, page, start, end, orderId, storeId2, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
-            //Assert.IsInstanceOf<RestApiEventSearchPaginationResult> (response, "response is RestApiEventSearchPaginationResult");
-        }
-        
-        /// <summary>
-        /// Test GetUserEvents
-        /// </summary>
-        [Test]
-        public void GetUserEventsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? userId = null;
-            //int? limit = null;
-            //int? page = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //int? orderId = null;
-            //int? storeId = null;
-            //int? storeGroupId = null;
-            //int? userId2 = null;
-            //string userEmail = null;
-            //string userName = null;
-            //string voucherCode = null;
-            //List<string> eventType = null;
-            //string flipdishEventId = null;
-            //var response = instance.GetUserEvents(userId, limit, page, start, end, orderId, storeId, storeGroupId, userId2, userEmail, userName, voucherCode, eventType, flipdishEventId);
-            //Assert.IsInstanceOf<RestApiEventSearchPaginationResult> (response, "response is RestApiEventSearchPaginationResult");
-        }
-        
-        /// <summary>
-        /// Test GetWhiteLabelEvents
-        /// </summary>
-        [Test]
-        public void GetWhiteLabelEventsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? whitelabelId = null;
-            //int? limit = null;
-            //int? page = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //int? orderId = null;
-            //int? storeId = null;
-            //int? storeGroupId = null;
-            //int? userId = null;
-            //string userEmail = null;
-            //string userName = null;
-            //string voucherCode = null;
-            //List<string> eventType = null;
-            //string flipdishEventId = null;
-            //var response = instance.GetWhiteLabelEvents(whitelabelId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
-            //Assert.IsInstanceOf<RestApiEventSearchPaginationResult> (response, "response is RestApiEventSearchPaginationResult");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/FilesApiTests.cs b/src/Flipdish.Test/Api/FilesApiTests.cs
deleted file mode 100644
index e0e0fa11..00000000
--- a/src/Flipdish.Test/Api/FilesApiTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FilesApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class FilesApiTests
-    {
-        private FilesApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new FilesApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FilesApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' FilesApi
-            //Assert.IsInstanceOfType(typeof(FilesApi), instance, "instance is a FilesApi");
-        }
-
-        
-        /// <summary>
-        /// Test DownloadFile
-        /// </summary>
-        [Test]
-        public void DownloadFileTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string fileId = null;
-            //var response = instance.DownloadFile(appId, fileId);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/FulfillmentStateConfigurationApiTests.cs b/src/Flipdish.Test/Api/FulfillmentStateConfigurationApiTests.cs
deleted file mode 100644
index 5df69bf0..00000000
--- a/src/Flipdish.Test/Api/FulfillmentStateConfigurationApiTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FulfillmentStateConfigurationApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class FulfillmentStateConfigurationApiTests
-    {
-        private FulfillmentStateConfigurationApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new FulfillmentStateConfigurationApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FulfillmentStateConfigurationApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' FulfillmentStateConfigurationApi
-            //Assert.IsInstanceOfType(typeof(FulfillmentStateConfigurationApi), instance, "instance is a FulfillmentStateConfigurationApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateFulfillmentStatesConfig
-        /// </summary>
-        [Test]
-        public void CreateFulfillmentStatesConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.CreateFulfillmentStatesConfig(appId);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test DeleteFulfillmentStatesConfig
-        /// </summary>
-        [Test]
-        public void DeleteFulfillmentStatesConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string configId = null;
-            //var response = instance.DeleteFulfillmentStatesConfig(appId, configId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test GetFulfillmentStatesConfiguration
-        /// </summary>
-        [Test]
-        public void GetFulfillmentStatesConfigurationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string configId = null;
-            //var response = instance.GetFulfillmentStatesConfiguration(appId, configId);
-            //Assert.IsInstanceOf<FulfillmentStatesConfiguration> (response, "response is FulfillmentStatesConfiguration");
-        }
-        
-        /// <summary>
-        /// Test SearchFulfillmentStatesConfigurations
-        /// </summary>
-        [Test]
-        public void SearchFulfillmentStatesConfigurationsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.SearchFulfillmentStatesConfigurations(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultFulfillmentStatesConfigurationSummary> (response, "response is RestApiArrayResultFulfillmentStatesConfigurationSummary");
-        }
-        
-        /// <summary>
-        /// Test UpdateFulfillmentStatesConfig
-        /// </summary>
-        [Test]
-        public void UpdateFulfillmentStatesConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string configId = null;
-            //UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration = null;
-            //instance.UpdateFulfillmentStatesConfig(appId, configId, updateFulfillmentStatesConfiguration);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/HealthApiTests.cs b/src/Flipdish.Test/Api/HealthApiTests.cs
deleted file mode 100644
index 95cc13cb..00000000
--- a/src/Flipdish.Test/Api/HealthApiTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HealthApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class HealthApiTests
-    {
-        private HealthApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new HealthApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HealthApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' HealthApi
-            //Assert.IsInstanceOfType(typeof(HealthApi), instance, "instance is a HealthApi");
-        }
-
-        
-        /// <summary>
-        /// Test HealthCheck
-        /// </summary>
-        [Test]
-        public void HealthCheckTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.HealthCheck();
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/HeartbeatApiTests.cs b/src/Flipdish.Test/Api/HeartbeatApiTests.cs
deleted file mode 100644
index f849c5e1..00000000
--- a/src/Flipdish.Test/Api/HeartbeatApiTests.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HeartbeatApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class HeartbeatApiTests
-    {
-        private HeartbeatApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new HeartbeatApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HeartbeatApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' HeartbeatApi
-            //Assert.IsInstanceOfType(typeof(HeartbeatApi), instance, "instance is a HeartbeatApi");
-        }
-
-        
-        /// <summary>
-        /// Test HeadHostname
-        /// </summary>
-        [Test]
-        public void HeadHostnameTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.HeadHostname();
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test HeadPing
-        /// </summary>
-        [Test]
-        public void HeadPingTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.HeadPing();
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test Hostname
-        /// </summary>
-        [Test]
-        public void HostnameTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.Hostname();
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test Ping
-        /// </summary>
-        [Test]
-        public void PingTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.Ping();
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/HomeApiTests.cs b/src/Flipdish.Test/Api/HomeApiTests.cs
deleted file mode 100644
index ef7625f4..00000000
--- a/src/Flipdish.Test/Api/HomeApiTests.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HomeApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class HomeApiTests
-    {
-        private HomeApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new HomeApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HomeApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' HomeApi
-            //Assert.IsInstanceOfType(typeof(HomeApi), instance, "instance is a HomeApi");
-        }
-
-        
-        /// <summary>
-        /// Test CompleteHomeAction
-        /// </summary>
-        [Test]
-        public void CompleteHomeActionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? homeActionId = null;
-            //bool? isDismissed = null;
-            //var response = instance.CompleteHomeAction(appId, homeActionId, isDismissed);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test DismissOldPortalAction
-        /// </summary>
-        [Test]
-        public void DismissOldPortalActionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.DismissOldPortalAction();
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test GetHomeActions
-        /// </summary>
-        [Test]
-        public void GetHomeActionsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetHomeActions(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultHomeAction> (response, "response is RestApiArrayResultHomeAction");
-        }
-        
-        /// <summary>
-        /// Test GetHomeStatistics
-        /// </summary>
-        [Test]
-        public void GetHomeStatisticsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetHomeStatistics(appId);
-            //Assert.IsInstanceOf<RestApiResultHomeStatistics> (response, "response is RestApiResultHomeStatistics");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/HttpRequestResponseLogsApiTests.cs b/src/Flipdish.Test/Api/HttpRequestResponseLogsApiTests.cs
deleted file mode 100644
index 317eea10..00000000
--- a/src/Flipdish.Test/Api/HttpRequestResponseLogsApiTests.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HttpRequestResponseLogsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class HttpRequestResponseLogsApiTests
-    {
-        private HttpRequestResponseLogsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new HttpRequestResponseLogsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HttpRequestResponseLogsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' HttpRequestResponseLogsApi
-            //Assert.IsInstanceOfType(typeof(HttpRequestResponseLogsApi), instance, "instance is a HttpRequestResponseLogsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetLogs
-        /// </summary>
-        [Test]
-        public void GetLogsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //string appId = null;
-            //int? filterByUserId = null;
-            //string guid = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetLogs(start, end, appId, filterByUserId, guid, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultHttpRequestAndResponseLog> (response, "response is RestApiPaginationResultHttpRequestAndResponseLog");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/HydraApiTests.cs b/src/Flipdish.Test/Api/HydraApiTests.cs
deleted file mode 100644
index 1e0b69d8..00000000
--- a/src/Flipdish.Test/Api/HydraApiTests.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class HydraApiTests
-    {
-        private HydraApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new HydraApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' HydraApi
-            //Assert.IsInstanceOfType(typeof(HydraApi), instance, "instance is a HydraApi");
-        }
-
-        
-        /// <summary>
-        /// Test AssignEmv
-        /// </summary>
-        [Test]
-        public void AssignEmvTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? hydraConfigId = null;
-            //int? emvTerminalId = null;
-            //instance.AssignEmv(appId, hydraConfigId, emvTerminalId);
-            
-        }
-        
-        /// <summary>
-        /// Test CancelEmvPayment
-        /// </summary>
-        [Test]
-        public void CancelEmvPaymentTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? orderId = null;
-            //string appId = null;
-            //instance.CancelEmvPayment(orderId, appId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetAttachedDevices
-        /// </summary>
-        [Test]
-        public void GetAttachedDevicesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceType = null;
-            //int? pageIndex = null;
-            //int? pageSize = null;
-            //int? storeId = null;
-            //string deviceName = null;
-            //string deviceSerial = null;
-            //var response = instance.GetAttachedDevices(appId, deviceType, pageIndex, pageSize, storeId, deviceName, deviceSerial);
-            //Assert.IsInstanceOf<RestApiPaginationResultHydraDeviceDetails> (response, "response is RestApiPaginationResultHydraDeviceDetails");
-        }
-        
-        /// <summary>
-        /// Test GetEMVTerminalDetails
-        /// </summary>
-        [Test]
-        public void GetEMVTerminalDetailsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetEMVTerminalDetails(appId);
-            //Assert.IsInstanceOf<RestApiResultPaymentTerminalDetails> (response, "response is RestApiResultPaymentTerminalDetails");
-        }
-        
-        /// <summary>
-        /// Test GetEmvOrderState
-        /// </summary>
-        [Test]
-        public void GetEmvOrderStateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? orderId = null;
-            //string appId = null;
-            //var response = instance.GetEmvOrderState(orderId, appId);
-            //Assert.IsInstanceOf<RestApiResultPaymentTerminalTransactionDetails> (response, "response is RestApiResultPaymentTerminalTransactionDetails");
-        }
-        
-        /// <summary>
-        /// Test GetRegistration
-        /// </summary>
-        [Test]
-        public void GetRegistrationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetRegistration();
-            //Assert.IsInstanceOf<RestApiResultHydraStatus> (response, "response is RestApiResultHydraStatus");
-        }
-        
-        /// <summary>
-        /// Test GetSettings
-        /// </summary>
-        [Test]
-        public void GetSettingsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetSettings();
-            //Assert.IsInstanceOf<RestApiResultHydraConfig> (response, "response is RestApiResultHydraConfig");
-        }
-        
-        /// <summary>
-        /// Test HydraCreateEmv
-        /// </summary>
-        [Test]
-        public void HydraCreateEmvTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //EmvTerminal emv = null;
-            //var response = instance.HydraCreateEmv(appId, emv);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test HydraDeleteEmv
-        /// </summary>
-        [Test]
-        public void HydraDeleteEmvTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? id = null;
-            //var response = instance.HydraDeleteEmv(appId, id);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test HydraGetEmvsForAppId
-        /// </summary>
-        [Test]
-        public void HydraGetEmvsForAppIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.HydraGetEmvsForAppId(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultEmvTerminalWithAssignments> (response, "response is RestApiArrayResultEmvTerminalWithAssignments");
-        }
-        
-        /// <summary>
-        /// Test LoginWithDeviceId
-        /// </summary>
-        [Test]
-        public void LoginWithDeviceIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string deviceId = null;
-            //string hydraUserType = null;
-            //string serialNumber = null;
-            //instance.LoginWithDeviceId(deviceId, hydraUserType, serialNumber);
-            
-        }
-        
-        /// <summary>
-        /// Test Register
-        /// </summary>
-        [Test]
-        public void RegisterTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //HydraRegistrationRequest hydraRegistration = null;
-            //var response = instance.Register(appId, hydraRegistration);
-            //Assert.IsInstanceOf<RestApiResultHydraStatus> (response, "response is RestApiResultHydraStatus");
-        }
-        
-        /// <summary>
-        /// Test UnAssign
-        /// </summary>
-        [Test]
-        public void UnAssignTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceId = null;
-            //instance.UnAssign(appId, deviceId);
-            
-        }
-        
-        /// <summary>
-        /// Test UnassignEmv
-        /// </summary>
-        [Test]
-        public void UnassignEmvTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? hydraConfigId = null;
-            //instance.UnassignEmv(appId, hydraConfigId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/KioskIotApiTests.cs b/src/Flipdish.Test/Api/KioskIotApiTests.cs
deleted file mode 100644
index 11f3d74a..00000000
--- a/src/Flipdish.Test/Api/KioskIotApiTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskIotApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class KioskIotApiTests
-    {
-        private KioskIotApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new KioskIotApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskIotApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' KioskIotApi
-            //Assert.IsInstanceOfType(typeof(KioskIotApi), instance, "instance is a KioskIotApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetKioskIotConnection
-        /// </summary>
-        [Test]
-        public void GetKioskIotConnectionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetKioskIotConnection();
-            //Assert.IsInstanceOf<RestApiResultKioskIotConnectionParameters> (response, "response is RestApiResultKioskIotConnectionParameters");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/KioskStoreSettingsApiTests.cs b/src/Flipdish.Test/Api/KioskStoreSettingsApiTests.cs
deleted file mode 100644
index c705e862..00000000
--- a/src/Flipdish.Test/Api/KioskStoreSettingsApiTests.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskStoreSettingsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class KioskStoreSettingsApiTests
-    {
-        private KioskStoreSettingsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new KioskStoreSettingsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskStoreSettingsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' KioskStoreSettingsApi
-            //Assert.IsInstanceOfType(typeof(KioskStoreSettingsApi), instance, "instance is a KioskStoreSettingsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetAllKioskSettingsForStore
-        /// </summary>
-        [Test]
-        public void GetAllKioskSettingsForStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string appId = null;
-            //var response = instance.GetAllKioskSettingsForStore(storeId, appId);
-            //Assert.IsInstanceOf<RestApiResultStoreKioskSettings> (response, "response is RestApiResultStoreKioskSettings");
-        }
-        
-        /// <summary>
-        /// Test GetAllStoreSettingsForKioskHydra
-        /// </summary>
-        [Test]
-        public void GetAllStoreSettingsForKioskHydraTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetAllStoreSettingsForKioskHydra();
-            //Assert.IsInstanceOf<RestApiResultKioskStoreSettings> (response, "response is RestApiResultKioskStoreSettings");
-        }
-        
-        /// <summary>
-        /// Test UpdateCashSettingForKiosk
-        /// </summary>
-        [Test]
-        public void UpdateCashSettingForKioskTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string deviceId = null;
-            //bool? enableCash = null;
-            //string enable = null;
-            //var response = instance.UpdateCashSettingForKiosk(appId, deviceId, enableCash, enable);
-            //Assert.IsInstanceOf<RestApiResultKioskCashSetting> (response, "response is RestApiResultKioskCashSetting");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/LightspeedApiTests.cs b/src/Flipdish.Test/Api/LightspeedApiTests.cs
deleted file mode 100644
index f199e7ec..00000000
--- a/src/Flipdish.Test/Api/LightspeedApiTests.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LightspeedApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class LightspeedApiTests
-    {
-        private LightspeedApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new LightspeedApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LightspeedApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' LightspeedApi
-            //Assert.IsInstanceOfType(typeof(LightspeedApi), instance, "instance is a LightspeedApi");
-        }
-
-        
-        /// <summary>
-        /// Test LightspeedGenerateMenu
-        /// </summary>
-        [Test]
-        public void LightspeedGenerateMenuTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //var response = instance.LightspeedGenerateMenu(storeId);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test LightspeedGetStoreSettings
-        /// </summary>
-        [Test]
-        public void LightspeedGetStoreSettingsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //var response = instance.LightspeedGetStoreSettings(storeId);
-            //Assert.IsInstanceOf<RestApiResultLightspeedSettings> (response, "response is RestApiResultLightspeedSettings");
-        }
-        
-        /// <summary>
-        /// Test LightspeedSaveStoreSettings
-        /// </summary>
-        [Test]
-        public void LightspeedSaveStoreSettingsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //LightspeedSettings lightspeedSettings = null;
-            //var response = instance.LightspeedSaveStoreSettings(storeId, lightspeedSettings);
-            //Assert.IsInstanceOf<RestApiResultLightspeedSettings> (response, "response is RestApiResultLightspeedSettings");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/LocationApiTests.cs b/src/Flipdish.Test/Api/LocationApiTests.cs
deleted file mode 100644
index bd996cf9..00000000
--- a/src/Flipdish.Test/Api/LocationApiTests.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class LocationApiTests
-    {
-        private LocationApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new LocationApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' LocationApi
-            //Assert.IsInstanceOfType(typeof(LocationApi), instance, "instance is a LocationApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateLocation
-        /// </summary>
-        [Test]
-        public void CreateLocationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //CreateLocation createLocationInput = null;
-            //int? locationAreaId = null;
-            //string appId = null;
-            //int? storeId = null;
-            //var response = instance.CreateLocation(createLocationInput, locationAreaId, appId, storeId);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/LocationAreasApiTests.cs b/src/Flipdish.Test/Api/LocationAreasApiTests.cs
deleted file mode 100644
index 29a42b47..00000000
--- a/src/Flipdish.Test/Api/LocationAreasApiTests.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationAreasApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class LocationAreasApiTests
-    {
-        private LocationAreasApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new LocationAreasApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationAreasApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' LocationAreasApi
-            //Assert.IsInstanceOfType(typeof(LocationAreasApi), instance, "instance is a LocationAreasApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateLocationArea
-        /// </summary>
-        [Test]
-        public void CreateLocationAreaTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //CreateLocationArea locationAreaInput = null;
-            //string appId = null;
-            //int? storeId = null;
-            //var response = instance.CreateLocationArea(locationAreaInput, appId, storeId);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test GetLocationArea
-        /// </summary>
-        [Test]
-        public void GetLocationAreaTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? locationAreaId = null;
-            //string appId = null;
-            //int? storeId = null;
-            //var response = instance.GetLocationArea(locationAreaId, appId, storeId);
-            //Assert.IsInstanceOf<LocationAreaWithLocations> (response, "response is LocationAreaWithLocations");
-        }
-        
-        /// <summary>
-        /// Test GetLocationsForStore
-        /// </summary>
-        [Test]
-        public void GetLocationsForStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //var response = instance.GetLocationsForStore(appId, storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultLocationAreaWithLocations> (response, "response is RestApiArrayResultLocationAreaWithLocations");
-        }
-        
-        /// <summary>
-        /// Test UpdateLocationArea
-        /// </summary>
-        [Test]
-        public void UpdateLocationAreaTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //UpdateLocationArea locationAreaInput = null;
-            //string appId = null;
-            //int? storeId = null;
-            //string locationAreaId = null;
-            //var response = instance.UpdateLocationArea(locationAreaInput, appId, storeId, locationAreaId);
-            //Assert.IsInstanceOf<LocationArea> (response, "response is LocationArea");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/LookerDashboardApiTests.cs b/src/Flipdish.Test/Api/LookerDashboardApiTests.cs
deleted file mode 100644
index ddcfe97c..00000000
--- a/src/Flipdish.Test/Api/LookerDashboardApiTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LookerDashboardApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class LookerDashboardApiTests
-    {
-        private LookerDashboardApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new LookerDashboardApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LookerDashboardApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' LookerDashboardApi
-            //Assert.IsInstanceOfType(typeof(LookerDashboardApi), instance, "instance is a LookerDashboardApi");
-        }
-
-        
-        /// <summary>
-        /// Test LookerDashboardGetAll
-        /// </summary>
-        [Test]
-        public void LookerDashboardGetAllTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //instance.LookerDashboardGetAll(appId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/LookerSingleSignOnApiTests.cs b/src/Flipdish.Test/Api/LookerSingleSignOnApiTests.cs
deleted file mode 100644
index 31d6db8e..00000000
--- a/src/Flipdish.Test/Api/LookerSingleSignOnApiTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LookerSingleSignOnApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class LookerSingleSignOnApiTests
-    {
-        private LookerSingleSignOnApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new LookerSingleSignOnApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LookerSingleSignOnApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' LookerSingleSignOnApi
-            //Assert.IsInstanceOfType(typeof(LookerSingleSignOnApi), instance, "instance is a LookerSingleSignOnApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetLookerCustomerReportingEmbedUrl
-        /// </summary>
-        [Test]
-        public void GetLookerCustomerReportingEmbedUrlTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string embedPath = null;
-            //var response = instance.GetLookerCustomerReportingEmbedUrl(appId, embedPath);
-            //Assert.IsInstanceOf<DashboardEmbed> (response, "response is DashboardEmbed");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/MenuOptionSetItemsApiTests.cs b/src/Flipdish.Test/Api/MenuOptionSetItemsApiTests.cs
deleted file mode 100644
index a324ff02..00000000
--- a/src/Flipdish.Test/Api/MenuOptionSetItemsApiTests.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuOptionSetItemsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class MenuOptionSetItemsApiTests
-    {
-        private MenuOptionSetItemsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new MenuOptionSetItemsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuOptionSetItemsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' MenuOptionSetItemsApi
-            //Assert.IsInstanceOfType(typeof(MenuOptionSetItemsApi), instance, "instance is a MenuOptionSetItemsApi");
-        }
-
-        
-        /// <summary>
-        /// Test AddMenuItemOptionSetItem
-        /// </summary>
-        [Test]
-        public void AddMenuItemOptionSetItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //MenuItemOptionSetItemBase menuItemOptionSetItem = null;
-            //var response = instance.AddMenuItemOptionSetItem(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSetItem);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test DeleteOptionSetItemImage
-        /// </summary>
-        [Test]
-        public void DeleteOptionSetItemImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //int? menuItemOptionSetItemId = null;
-            //instance.DeleteOptionSetItemImage(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSetItemId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetMenuItemOptionSetItemById
-        /// </summary>
-        [Test]
-        public void GetMenuItemOptionSetItemByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //int? menuItemOptionSetItemId = null;
-            //var response = instance.GetMenuItemOptionSetItemById(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSetItemId);
-            //Assert.IsInstanceOf<RestApiResultMenuItemOptionSetItem> (response, "response is RestApiResultMenuItemOptionSetItem");
-        }
-        
-        /// <summary>
-        /// Test GetMenuItemOptionSetItems
-        /// </summary>
-        [Test]
-        public void GetMenuItemOptionSetItemsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //var response = instance.GetMenuItemOptionSetItems(menuId, menuSectionId, menuSectionItemId, optionSetId);
-            //Assert.IsInstanceOf<RestApiArrayResultMenuItemOptionSetItem> (response, "response is RestApiArrayResultMenuItemOptionSetItem");
-        }
-        
-        /// <summary>
-        /// Test RemoveMenuItemOptionSetItem
-        /// </summary>
-        [Test]
-        public void RemoveMenuItemOptionSetItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //int? menuItemOptionSetItemId = null;
-            //instance.RemoveMenuItemOptionSetItem(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSetItemId);
-            
-        }
-        
-        /// <summary>
-        /// Test SetOptionSetItemTax
-        /// </summary>
-        [Test]
-        public void SetOptionSetItemTaxTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //int? menuItemOptionSetItemId = null;
-            //int? taxRateId = null;
-            //instance.SetOptionSetItemTax(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSetItemId, taxRateId);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateMenuItemOptionSetItem
-        /// </summary>
-        [Test]
-        public void UpdateMenuItemOptionSetItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //int? menuItemOptionSetItemId = null;
-            //MenuItemOptionSetItemBase menuItemOptionSetItem = null;
-            //double? undoAfter = null;
-            //instance.UpdateMenuItemOptionSetItem(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSetItemId, menuItemOptionSetItem, undoAfter);
-            
-        }
-        
-        /// <summary>
-        /// Test UploadOptionSetItemImage
-        /// </summary>
-        [Test]
-        public void UploadOptionSetItemImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //int? menuItemOptionSetItemId = null;
-            //System.IO.Stream image = null;
-            //var response = instance.UploadOptionSetItemImage(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSetItemId, image);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/MenuOptionSetsApiTests.cs b/src/Flipdish.Test/Api/MenuOptionSetsApiTests.cs
deleted file mode 100644
index 1f109a43..00000000
--- a/src/Flipdish.Test/Api/MenuOptionSetsApiTests.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuOptionSetsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class MenuOptionSetsApiTests
-    {
-        private MenuOptionSetsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new MenuOptionSetsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuOptionSetsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' MenuOptionSetsApi
-            //Assert.IsInstanceOfType(typeof(MenuOptionSetsApi), instance, "instance is a MenuOptionSetsApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateMenuItemOptionSet
-        /// </summary>
-        [Test]
-        public void CreateMenuItemOptionSetTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //MenuItemOptionSetBase menuItemOptionSet = null;
-            //var response = instance.CreateMenuItemOptionSet(menuId, menuSectionId, menuSectionItemId, menuItemOptionSet);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test DeleteMenuItemOptionSet
-        /// </summary>
-        [Test]
-        public void DeleteMenuItemOptionSetTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionItemId = null;
-            //int? menuSectionId = null;
-            //int? optionSetId = null;
-            //instance.DeleteMenuItemOptionSet(menuId, menuSectionItemId, menuSectionId, optionSetId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteOptionSetImage
-        /// </summary>
-        [Test]
-        public void DeleteOptionSetImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //instance.DeleteOptionSetImage(menuId, menuSectionId, menuSectionItemId, optionSetId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetMenuItemOptionSetById
-        /// </summary>
-        [Test]
-        public void GetMenuItemOptionSetByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //var response = instance.GetMenuItemOptionSetById(menuId, menuSectionId, menuSectionItemId, optionSetId);
-            //Assert.IsInstanceOf<RestApiResultMenuItemOptionSet> (response, "response is RestApiResultMenuItemOptionSet");
-        }
-        
-        /// <summary>
-        /// Test GetMenuItemOptionSets
-        /// </summary>
-        [Test]
-        public void GetMenuItemOptionSetsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //var response = instance.GetMenuItemOptionSets(menuId, menuSectionId, menuSectionItemId);
-            //Assert.IsInstanceOf<RestApiArrayResultMenuItemOptionSet> (response, "response is RestApiArrayResultMenuItemOptionSet");
-        }
-        
-        /// <summary>
-        /// Test UpdateMenuItemOptionSet
-        /// </summary>
-        [Test]
-        public void UpdateMenuItemOptionSetTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //MenuItemOptionSetBase menuItemOptionSet = null;
-            //instance.UpdateMenuItemOptionSet(menuId, menuSectionId, menuSectionItemId, optionSetId, menuItemOptionSet);
-            
-        }
-        
-        /// <summary>
-        /// Test UploadOptionSetImage
-        /// </summary>
-        [Test]
-        public void UploadOptionSetImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? optionSetId = null;
-            //System.IO.Stream image = null;
-            //var response = instance.UploadOptionSetImage(menuId, menuSectionId, menuSectionItemId, optionSetId, image);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/MenuSectionItemsApiTests.cs b/src/Flipdish.Test/Api/MenuSectionItemsApiTests.cs
deleted file mode 100644
index 2c59714b..00000000
--- a/src/Flipdish.Test/Api/MenuSectionItemsApiTests.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionItemsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionItemsApiTests
-    {
-        private MenuSectionItemsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new MenuSectionItemsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionItemsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' MenuSectionItemsApi
-            //Assert.IsInstanceOfType(typeof(MenuSectionItemsApi), instance, "instance is a MenuSectionItemsApi");
-        }
-
-        
-        /// <summary>
-        /// Test CloneMenuSectionItem
-        /// </summary>
-        [Test]
-        public void CloneMenuSectionItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //var response = instance.CloneMenuSectionItem(menuId, menuSectionId, menuSectionItemId);
-            //Assert.IsInstanceOf<RestApiResultMenuSectionItem> (response, "response is RestApiResultMenuSectionItem");
-        }
-        
-        /// <summary>
-        /// Test CreateMenuSectionItem
-        /// </summary>
-        [Test]
-        public void CreateMenuSectionItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //MenuSectionItemBase menuSectionItem = null;
-            //var response = instance.CreateMenuSectionItem(menuId, menuSectionId, menuSectionItem);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test DeleteMenuSectionItem
-        /// </summary>
-        [Test]
-        public void DeleteMenuSectionItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //instance.DeleteMenuSectionItem(menuId, menuSectionId, menuSectionItemId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteMenuSectionItemImage
-        /// </summary>
-        [Test]
-        public void DeleteMenuSectionItemImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //instance.DeleteMenuSectionItemImage(menuId, menuSectionId, menuSectionItemId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetMenuItemById
-        /// </summary>
-        [Test]
-        public void GetMenuItemByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //var response = instance.GetMenuItemById(menuId, menuSectionId, menuSectionItemId);
-            //Assert.IsInstanceOf<RestApiResultMenuSectionItem> (response, "response is RestApiResultMenuSectionItem");
-        }
-        
-        /// <summary>
-        /// Test GetMenuItems
-        /// </summary>
-        [Test]
-        public void GetMenuItemsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //var response = instance.GetMenuItems(menuId, menuSectionId);
-            //Assert.IsInstanceOf<RestApiArrayResultMenuSectionItem> (response, "response is RestApiArrayResultMenuSectionItem");
-        }
-        
-        /// <summary>
-        /// Test MoveMenuItem
-        /// </summary>
-        [Test]
-        public void MoveMenuItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? destinationDisplayOrder = null;
-            //instance.MoveMenuItem(menuId, menuSectionId, menuSectionItemId, destinationDisplayOrder);
-            
-        }
-        
-        /// <summary>
-        /// Test SetSectionItemTax
-        /// </summary>
-        [Test]
-        public void SetSectionItemTaxTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //int? taxRateId = null;
-            //instance.SetSectionItemTax(menuId, menuSectionId, menuSectionItemId, taxRateId);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateMenuSectionItem
-        /// </summary>
-        [Test]
-        public void UpdateMenuSectionItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //MenuSectionItemBase menuSectionItem = null;
-            //double? undoAfter = null;
-            //instance.UpdateMenuSectionItem(menuId, menuSectionId, menuSectionItemId, menuSectionItem, undoAfter);
-            
-        }
-        
-        /// <summary>
-        /// Test UploadMenuSectionItemImage
-        /// </summary>
-        [Test]
-        public void UploadMenuSectionItemImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //int? menuSectionItemId = null;
-            //System.IO.Stream image = null;
-            //var response = instance.UploadMenuSectionItemImage(menuId, menuSectionId, menuSectionItemId, image);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/MenuSectionsApiTests.cs b/src/Flipdish.Test/Api/MenuSectionsApiTests.cs
deleted file mode 100644
index bab0ab91..00000000
--- a/src/Flipdish.Test/Api/MenuSectionsApiTests.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionsApiTests
-    {
-        private MenuSectionsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new MenuSectionsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' MenuSectionsApi
-            //Assert.IsInstanceOfType(typeof(MenuSectionsApi), instance, "instance is a MenuSectionsApi");
-        }
-
-        
-        /// <summary>
-        /// Test CloneMenuSection
-        /// </summary>
-        [Test]
-        public void CloneMenuSectionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //var response = instance.CloneMenuSection(menuId, menuSectionId);
-            //Assert.IsInstanceOf<RestApiResultMenuSection> (response, "response is RestApiResultMenuSection");
-        }
-        
-        /// <summary>
-        /// Test CreateMenuAvailabilityForDay
-        /// </summary>
-        [Test]
-        public void CreateMenuAvailabilityForDayTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //string dayOfWeek = null;
-            //BusinessHoursPeriodBase businessHoursPeriod = null;
-            //var response = instance.CreateMenuAvailabilityForDay(menuId, menuSectionId, dayOfWeek, businessHoursPeriod);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test CreateMenuSection
-        /// </summary>
-        [Test]
-        public void CreateMenuSectionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //MenuSectionBase menuSection = null;
-            //var response = instance.CreateMenuSection(menuId, menuSection);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test CreateMenuSectionAvailability
-        /// </summary>
-        [Test]
-        public void CreateMenuSectionAvailabilityTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //MenuSectionAvailabilityBase menuSectionAvailability = null;
-            //var response = instance.CreateMenuSectionAvailability(menuId, menuSectionId, menuSectionAvailability);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test DeleteMenuSection
-        /// </summary>
-        [Test]
-        public void DeleteMenuSectionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //instance.DeleteMenuSection(menuId, menuSectionId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteMenuSectionImage
-        /// </summary>
-        [Test]
-        public void DeleteMenuSectionImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //instance.DeleteMenuSectionImage(menuId, menuSectionId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetMenuSectionById
-        /// </summary>
-        [Test]
-        public void GetMenuSectionByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //var response = instance.GetMenuSectionById(menuId, menuSectionId);
-            //Assert.IsInstanceOf<RestApiResultMenuSection> (response, "response is RestApiResultMenuSection");
-        }
-        
-        /// <summary>
-        /// Test GetMenuSections
-        /// </summary>
-        [Test]
-        public void GetMenuSectionsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //var response = instance.GetMenuSections(menuId);
-            //Assert.IsInstanceOf<RestApiArrayResultMenuSection> (response, "response is RestApiArrayResultMenuSection");
-        }
-        
-        /// <summary>
-        /// Test MenuSectionsSetItemDisplayOrders
-        /// </summary>
-        [Test]
-        public void MenuSectionsSetItemDisplayOrdersTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //MenuObjectDisplayOrders displayOrders = null;
-            //instance.MenuSectionsSetItemDisplayOrders(menuId, menuSectionId, displayOrders);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateMenuSection
-        /// </summary>
-        [Test]
-        public void UpdateMenuSectionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //MenuSectionBase menuSection = null;
-            //double? undoAfter = null;
-            //instance.UpdateMenuSection(menuId, menuSectionId, menuSection, undoAfter);
-            
-        }
-        
-        /// <summary>
-        /// Test UploadMenuSectionImage
-        /// </summary>
-        [Test]
-        public void UploadMenuSectionImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? menuSectionId = null;
-            //System.IO.Stream image = null;
-            //var response = instance.UploadMenuSectionImage(menuId, menuSectionId, image);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/MenusApiTests.cs b/src/Flipdish.Test/Api/MenusApiTests.cs
deleted file mode 100644
index 1d847f8d..00000000
--- a/src/Flipdish.Test/Api/MenusApiTests.cs
+++ /dev/null
@@ -1,423 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenusApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class MenusApiTests
-    {
-        private MenusApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new MenusApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenusApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' MenusApi
-            //Assert.IsInstanceOfType(typeof(MenusApi), instance, "instance is a MenusApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateDraftMenuFromExistingMenu
-        /// </summary>
-        [Test]
-        public void CreateDraftMenuFromExistingMenuTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //string newName = null;
-            //var response = instance.CreateDraftMenuFromExistingMenu(menuId, newName);
-            //Assert.IsInstanceOf<RestApiResultMenu> (response, "response is RestApiResultMenu");
-        }
-        
-        /// <summary>
-        /// Test CreateNewMenuForApp
-        /// </summary>
-        [Test]
-        public void CreateNewMenuForAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //CreateFullMenu menu = null;
-            //var response = instance.CreateNewMenuForApp(appId, menu);
-            //Assert.IsInstanceOf<int?> (response, "response is int?");
-        }
-        
-        /// <summary>
-        /// Test DeleteMenu
-        /// </summary>
-        [Test]
-        public void DeleteMenuTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //instance.DeleteMenu(menuId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteMenuImage
-        /// </summary>
-        [Test]
-        public void DeleteMenuImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //instance.DeleteMenuImage(menuId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteMenuItemMetadata
-        /// </summary>
-        [Test]
-        public void DeleteMenuItemMetadataTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? storeId = null;
-            //int? menuItemId = null;
-            //string key = null;
-            //instance.DeleteMenuItemMetadata(menuId, storeId, menuItemId, key);
-            
-        }
-        
-        /// <summary>
-        /// Test GetAllMenuMetadataByMenuIdAndStoreId
-        /// </summary>
-        [Test]
-        public void GetAllMenuMetadataByMenuIdAndStoreIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? storeId = null;
-            //var response = instance.GetAllMenuMetadataByMenuIdAndStoreId(menuId, storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultAllMetadataResult> (response, "response is RestApiArrayResultAllMetadataResult");
-        }
-        
-        /// <summary>
-        /// Test GetMenuById
-        /// </summary>
-        [Test]
-        public void GetMenuByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //var response = instance.GetMenuById(menuId);
-            //Assert.IsInstanceOf<RestApiResultMenu> (response, "response is RestApiResultMenu");
-        }
-        
-        /// <summary>
-        /// Test GetMenuItemMetadata
-        /// </summary>
-        [Test]
-        public void GetMenuItemMetadataTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? storeId = null;
-            //int? menuItemId = null;
-            //var response = instance.GetMenuItemMetadata(menuId, storeId, menuItemId);
-            //Assert.IsInstanceOf<RestApiArrayResultMetadata> (response, "response is RestApiArrayResultMetadata");
-        }
-        
-        /// <summary>
-        /// Test GetMenuItemMetadataByKey
-        /// </summary>
-        [Test]
-        public void GetMenuItemMetadataByKeyTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? storeId = null;
-            //int? menuItemId = null;
-            //string key = null;
-            //instance.GetMenuItemMetadataByKey(menuId, storeId, menuItemId, key);
-            
-        }
-        
-        /// <summary>
-        /// Test GetMenuItemOptionSetItemMetadata
-        /// </summary>
-        [Test]
-        public void GetMenuItemOptionSetItemMetadataTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? storeId = null;
-            //int? optionSetItemId = null;
-            //var response = instance.GetMenuItemOptionSetItemMetadata(menuId, storeId, optionSetItemId);
-            //Assert.IsInstanceOf<RestApiResultMetadata> (response, "response is RestApiResultMetadata");
-        }
-        
-        /// <summary>
-        /// Test GetMenuStoreNames
-        /// </summary>
-        [Test]
-        public void GetMenuStoreNamesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //var response = instance.GetMenuStoreNames(menuId);
-            //Assert.IsInstanceOf<RestApiArrayResultMenuStoreNames> (response, "response is RestApiArrayResultMenuStoreNames");
-        }
-        
-        /// <summary>
-        /// Test GetMenuTaxDetails
-        /// </summary>
-        [Test]
-        public void GetMenuTaxDetailsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //var response = instance.GetMenuTaxDetails(menuId);
-            //Assert.IsInstanceOf<RestApiArrayResultMenuTaxDetails> (response, "response is RestApiArrayResultMenuTaxDetails");
-        }
-        
-        /// <summary>
-        /// Test GetMenusByAppId
-        /// </summary>
-        [Test]
-        public void GetMenusByAppIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetMenusByAppId(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultMenuSummary> (response, "response is RestApiArrayResultMenuSummary");
-        }
-        
-        /// <summary>
-        /// Test GetMenusCheckpoints
-        /// </summary>
-        [Test]
-        public void GetMenusCheckpointsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //var response = instance.GetMenusCheckpoints(menuId);
-            //Assert.IsInstanceOf<RestApiArrayResultMenuCheckpoint> (response, "response is RestApiArrayResultMenuCheckpoint");
-        }
-        
-        /// <summary>
-        /// Test MenusDeleteTaxRate
-        /// </summary>
-        [Test]
-        public void MenusDeleteTaxRateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? taxId = null;
-            //instance.MenusDeleteTaxRate(menuId, taxId);
-            
-        }
-        
-        /// <summary>
-        /// Test MenusSetDisplayOnMenuTax
-        /// </summary>
-        [Test]
-        public void MenusSetDisplayOnMenuTaxTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //bool? show = null;
-            //instance.MenusSetDisplayOnMenuTax(menuId, show);
-            
-        }
-        
-        /// <summary>
-        /// Test MenusSetItemDisplayOrders
-        /// </summary>
-        [Test]
-        public void MenusSetItemDisplayOrdersTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //MenuObjectDisplayOrders displayOrders = null;
-            //instance.MenusSetItemDisplayOrders(menuId, displayOrders);
-            
-        }
-        
-        /// <summary>
-        /// Test MenusUpdateTaxType
-        /// </summary>
-        [Test]
-        public void MenusUpdateTaxTypeTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //string type = null;
-            //instance.MenusUpdateTaxType(menuId, type);
-            
-        }
-        
-        /// <summary>
-        /// Test MenusUpsertTaxRate
-        /// </summary>
-        [Test]
-        public void MenusUpsertTaxRateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //MenuTaxRate taxRate = null;
-            //var response = instance.MenusUpsertTaxRate(menuId, taxRate);
-            //Assert.IsInstanceOf<MenuTaxRate> (response, "response is MenuTaxRate");
-        }
-        
-        /// <summary>
-        /// Test RestoreAMenuCheckpoint
-        /// </summary>
-        [Test]
-        public void RestoreAMenuCheckpointTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? checkpointId = null;
-            //instance.RestoreAMenuCheckpoint(menuId, checkpointId);
-            
-        }
-        
-        /// <summary>
-        /// Test SetMenuItemMetadata
-        /// </summary>
-        [Test]
-        public void SetMenuItemMetadataTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? storeId = null;
-            //int? menuItemId = null;
-            //Metadata metadata = null;
-            //instance.SetMenuItemMetadata(menuId, storeId, menuItemId, metadata);
-            
-        }
-        
-        /// <summary>
-        /// Test SetMenuItemOptionSetItemMetadata
-        /// </summary>
-        [Test]
-        public void SetMenuItemOptionSetItemMetadataTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //int? storeId = null;
-            //int? optionSetItemId = null;
-            //Metadata metadata = null;
-            //instance.SetMenuItemOptionSetItemMetadata(menuId, storeId, optionSetItemId, metadata);
-            
-        }
-        
-        /// <summary>
-        /// Test SetMenuLock
-        /// </summary>
-        [Test]
-        public void SetMenuLockTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //bool? locked = null;
-            //instance.SetMenuLock(menuId, locked);
-            
-        }
-        
-        /// <summary>
-        /// Test SetMenuName
-        /// </summary>
-        [Test]
-        public void SetMenuNameTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //string name = null;
-            //instance.SetMenuName(menuId, name);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateMenu
-        /// </summary>
-        [Test]
-        public void UpdateMenuTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //MenuBase menu = null;
-            //instance.UpdateMenu(menuId, menu);
-            
-        }
-        
-        /// <summary>
-        /// Test UploadMenuImage
-        /// </summary>
-        [Test]
-        public void UploadMenuImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? menuId = null;
-            //System.IO.Stream image = null;
-            //var response = instance.UploadMenuImage(menuId, image);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test UploadNewMenuForApp
-        /// </summary>
-        [Test]
-        public void UploadNewMenuForAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //System.IO.Stream menu = null;
-            //var response = instance.UploadNewMenuForApp(appId, menu);
-            //Assert.IsInstanceOf<int?> (response, "response is int?");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/MetafieldDefinitionsApiTests.cs b/src/Flipdish.Test/Api/MetafieldDefinitionsApiTests.cs
deleted file mode 100644
index 9a957109..00000000
--- a/src/Flipdish.Test/Api/MetafieldDefinitionsApiTests.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MetafieldDefinitionsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class MetafieldDefinitionsApiTests
-    {
-        private MetafieldDefinitionsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new MetafieldDefinitionsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MetafieldDefinitionsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' MetafieldDefinitionsApi
-            //Assert.IsInstanceOfType(typeof(MetafieldDefinitionsApi), instance, "instance is a MetafieldDefinitionsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetMetafieldDefinitions
-        /// </summary>
-        [Test]
-        public void GetMetafieldDefinitionsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string ownerEntity = null;
-            //string searchTerm = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetMetafieldDefinitions(appId, ownerEntity, searchTerm, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultMetafieldDefinition> (response, "response is RestApiPaginationResultMetafieldDefinition");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/MobileAppsApiTests.cs b/src/Flipdish.Test/Api/MobileAppsApiTests.cs
deleted file mode 100644
index 80415e0c..00000000
--- a/src/Flipdish.Test/Api/MobileAppsApiTests.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MobileAppsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class MobileAppsApiTests
-    {
-        private MobileAppsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new MobileAppsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MobileAppsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' MobileAppsApi
-            //Assert.IsInstanceOfType(typeof(MobileAppsApi), instance, "instance is a MobileAppsApi");
-        }
-
-        
-        /// <summary>
-        /// Test EditAppConfigSalesChannel
-        /// </summary>
-        [Test]
-        public void EditAppConfigSalesChannelTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //MobileAppsSubmission mobileAppsSubmission = null;
-            //var response = instance.EditAppConfigSalesChannel(appId, mobileAppsSubmission);
-            //Assert.IsInstanceOf<RestApiResultAppConfigSalesChannel> (response, "response is RestApiResultAppConfigSalesChannel");
-        }
-        
-        /// <summary>
-        /// Test EditAppConfigSalesChannel_0
-        /// </summary>
-        [Test]
-        public void EditAppConfigSalesChannel_0Test()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //AppConfigSalesChannel appConfigSalesChannel = null;
-            //var response = instance.EditAppConfigSalesChannel_0(appId, appConfigSalesChannel);
-            //Assert.IsInstanceOf<RestApiResultAppConfigSalesChannel> (response, "response is RestApiResultAppConfigSalesChannel");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/OAuthClientsApiTests.cs b/src/Flipdish.Test/Api/OAuthClientsApiTests.cs
deleted file mode 100644
index 4eb600ac..00000000
--- a/src/Flipdish.Test/Api/OAuthClientsApiTests.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OAuthClientsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class OAuthClientsApiTests
-    {
-        private OAuthClientsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new OAuthClientsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OAuthClientsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' OAuthClientsApi
-            //Assert.IsInstanceOfType(typeof(OAuthClientsApi), instance, "instance is a OAuthClientsApi");
-        }
-
-        
-        /// <summary>
-        /// Test AddRedirectUri
-        /// </summary>
-        [Test]
-        public void AddRedirectUriTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string uri = null;
-            //string appId = null;
-            //var response = instance.AddRedirectUri(oauthAppId, uri, appId);
-            //Assert.IsInstanceOf<RestApiResultOauthClientRedirectUri> (response, "response is RestApiResultOauthClientRedirectUri");
-        }
-        
-        /// <summary>
-        /// Test CreateOAuthApp
-        /// </summary>
-        [Test]
-        public void CreateOAuthAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //OAuthApp oAuthApp = null;
-            //string appId = null;
-            //instance.CreateOAuthApp(oAuthApp, appId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteOAuthApp
-        /// </summary>
-        [Test]
-        public void DeleteOAuthAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appId = null;
-            //instance.DeleteOAuthApp(oauthAppId, appId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetOAuthApps
-        /// </summary>
-        [Test]
-        public void GetOAuthAppsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string oauthAppName = null;
-            //var response = instance.GetOAuthApps(appId, oauthAppName);
-            //Assert.IsInstanceOf<RestApiArrayResultOAuthApp> (response, "response is RestApiArrayResultOAuthApp");
-        }
-        
-        /// <summary>
-        /// Test GetOAuthClientByClientId
-        /// </summary>
-        [Test]
-        public void GetOAuthClientByClientIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appId = null;
-            //var response = instance.GetOAuthClientByClientId(oauthAppId, appId);
-            //Assert.IsInstanceOf<RestApiResultOAuthApp> (response, "response is RestApiResultOAuthApp");
-        }
-        
-        /// <summary>
-        /// Test GetOAuthClientSecret
-        /// </summary>
-        [Test]
-        public void GetOAuthClientSecretTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appId = null;
-            //var response = instance.GetOAuthClientSecret(oauthAppId, appId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test GetOauthAccessToken
-        /// </summary>
-        [Test]
-        public void GetOauthAccessTokenTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appId = null;
-            //var response = instance.GetOauthAccessToken(oauthAppId, appId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test GetRedirectUris
-        /// </summary>
-        [Test]
-        public void GetRedirectUrisTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appId = null;
-            //var response = instance.GetRedirectUris(oauthAppId, appId);
-            //Assert.IsInstanceOf<RestApiArrayResultOauthClientRedirectUri> (response, "response is RestApiArrayResultOauthClientRedirectUri");
-        }
-        
-        /// <summary>
-        /// Test OAuthClientsGetApplications
-        /// </summary>
-        [Test]
-        public void OAuthClientsGetApplicationsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.OAuthClientsGetApplications(appId);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test RemoveRedirectUri
-        /// </summary>
-        [Test]
-        public void RemoveRedirectUriTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //int? uriId = null;
-            //string appId = null;
-            //instance.RemoveRedirectUri(oauthAppId, uriId, appId);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateOAuthApp
-        /// </summary>
-        [Test]
-        public void UpdateOAuthAppTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //OAuthApp oAuthApp = null;
-            //string appId = null;
-            //instance.UpdateOAuthApp(oauthAppId, oAuthApp, appId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/OnboardingApiTests.cs b/src/Flipdish.Test/Api/OnboardingApiTests.cs
deleted file mode 100644
index 95a29ee6..00000000
--- a/src/Flipdish.Test/Api/OnboardingApiTests.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OnboardingApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class OnboardingApiTests
-    {
-        private OnboardingApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new OnboardingApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OnboardingApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' OnboardingApi
-            //Assert.IsInstanceOfType(typeof(OnboardingApi), instance, "instance is a OnboardingApi");
-        }
-
-        
-        /// <summary>
-        /// Test OnboardingGetOnboardingItems
-        /// </summary>
-        [Test]
-        public void OnboardingGetOnboardingItemsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //var response = instance.OnboardingGetOnboardingItems(appId, storeId);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test OnboardingUpdateOnboardingItem
-        /// </summary>
-        [Test]
-        public void OnboardingUpdateOnboardingItemTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //int? onboardingItemId = null;
-            //OnboardingItemUpdate itemUpdate = null;
-            //var response = instance.OnboardingUpdateOnboardingItem(appId, storeId, onboardingItemId, itemUpdate);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/OrderBatchApiTests.cs b/src/Flipdish.Test/Api/OrderBatchApiTests.cs
deleted file mode 100644
index 99ddd719..00000000
--- a/src/Flipdish.Test/Api/OrderBatchApiTests.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderBatchApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class OrderBatchApiTests
-    {
-        private OrderBatchApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new OrderBatchApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderBatchApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' OrderBatchApi
-            //Assert.IsInstanceOfType(typeof(OrderBatchApi), instance, "instance is a OrderBatchApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetAllOrderBatches
-        /// </summary>
-        [Test]
-        public void GetAllOrderBatchesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //DateTime? startDate = null;
-            //DateTime? endDate = null;
-            //var response = instance.GetAllOrderBatches(appId, storeId, startDate, endDate);
-            //Assert.IsInstanceOf<RestApiArrayResultOrderBatchItem> (response, "response is RestApiArrayResultOrderBatchItem");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/OrderBatchesApiTests.cs b/src/Flipdish.Test/Api/OrderBatchesApiTests.cs
deleted file mode 100644
index b4230ba6..00000000
--- a/src/Flipdish.Test/Api/OrderBatchesApiTests.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderBatchesApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class OrderBatchesApiTests
-    {
-        private OrderBatchesApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new OrderBatchesApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderBatchesApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' OrderBatchesApi
-            //Assert.IsInstanceOfType(typeof(OrderBatchesApi), instance, "instance is a OrderBatchesApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetAllOrderBatches
-        /// </summary>
-        [Test]
-        public void GetAllOrderBatchesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //DateTime? createdFrom = null;
-            //DateTime? createdTo = null;
-            //var response = instance.GetAllOrderBatches(appId, storeId, createdFrom, createdTo);
-            //Assert.IsInstanceOf<RestApiArrayResultOrderBatchItem> (response, "response is RestApiArrayResultOrderBatchItem");
-        }
-        
-        /// <summary>
-        /// Test GetOrderBatch
-        /// </summary>
-        [Test]
-        public void GetOrderBatchTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //int? batchId = null;
-            //var response = instance.GetOrderBatch(appId, storeId, batchId);
-            //Assert.IsInstanceOf<RestApiResultOrderBatch> (response, "response is RestApiResultOrderBatch");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/OrderBatchingConfigurationApiTests.cs b/src/Flipdish.Test/Api/OrderBatchingConfigurationApiTests.cs
deleted file mode 100644
index cbd832ae..00000000
--- a/src/Flipdish.Test/Api/OrderBatchingConfigurationApiTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderBatchingConfigurationApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class OrderBatchingConfigurationApiTests
-    {
-        private OrderBatchingConfigurationApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new OrderBatchingConfigurationApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderBatchingConfigurationApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' OrderBatchingConfigurationApi
-            //Assert.IsInstanceOfType(typeof(OrderBatchingConfigurationApi), instance, "instance is a OrderBatchingConfigurationApi");
-        }
-
-        
-        /// <summary>
-        /// Test Get
-        /// </summary>
-        [Test]
-        public void GetTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //var response = instance.Get(storeId);
-            //Assert.IsInstanceOf<RestApiResultOrderBatchingConfiguration> (response, "response is RestApiResultOrderBatchingConfiguration");
-        }
-        
-        /// <summary>
-        /// Test Post
-        /// </summary>
-        [Test]
-        public void PostTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //SetOrderBatchingConfiguration setOrderBatchingConfiguration = null;
-            //instance.Post(storeId, setOrderBatchingConfiguration);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/OrderIngestApiTests.cs b/src/Flipdish.Test/Api/OrderIngestApiTests.cs
deleted file mode 100644
index 80e9f710..00000000
--- a/src/Flipdish.Test/Api/OrderIngestApiTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderIngestApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class OrderIngestApiTests
-    {
-        private OrderIngestApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new OrderIngestApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderIngestApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' OrderIngestApi
-            //Assert.IsInstanceOfType(typeof(OrderIngestApi), instance, "instance is a OrderIngestApi");
-        }
-
-        
-        /// <summary>
-        /// Test OrderIngestSubmitNewOrder
-        /// </summary>
-        [Test]
-        public void OrderIngestSubmitNewOrderTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //OrderIngestSubmitOrderRequest order = null;
-            //string appNameId = null;
-            //var response = instance.OrderIngestSubmitNewOrder(order, appNameId);
-            //Assert.IsInstanceOf<RestApiResultOrderIngestSubmitOrderResponse> (response, "response is RestApiResultOrderIngestSubmitOrderResponse");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/OrdersApiTests.cs b/src/Flipdish.Test/Api/OrdersApiTests.cs
deleted file mode 100644
index 5daea18f..00000000
--- a/src/Flipdish.Test/Api/OrdersApiTests.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrdersApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class OrdersApiTests
-    {
-        private OrdersApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new OrdersApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrdersApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' OrdersApi
-            //Assert.IsInstanceOfType(typeof(OrdersApi), instance, "instance is a OrdersApi");
-        }
-
-        
-        /// <summary>
-        /// Test AcceptOrder
-        /// </summary>
-        [Test]
-        public void AcceptOrderTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? id = null;
-            //Accept acceptObject = null;
-            //instance.AcceptOrder(id, acceptObject);
-            
-        }
-        
-        /// <summary>
-        /// Test DispatchOrder
-        /// </summary>
-        [Test]
-        public void DispatchOrderTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? id = null;
-            //instance.DispatchOrder(id);
-            
-        }
-        
-        /// <summary>
-        /// Test GetOrderById
-        /// </summary>
-        [Test]
-        public void GetOrderByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? id = null;
-            //var response = instance.GetOrderById(id);
-            //Assert.IsInstanceOf<RestApiResultOrder> (response, "response is RestApiResultOrder");
-        }
-        
-        /// <summary>
-        /// Test GetOrders
-        /// </summary>
-        [Test]
-        public void GetOrdersTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //List<int?> physicalRestaurantId = null;
-            //List<string> state = null;
-            //DateTime? from = null;
-            //DateTime? to = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetOrders(physicalRestaurantId, state, from, to, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultOrder> (response, "response is RestApiPaginationResultOrder");
-        }
-        
-        /// <summary>
-        /// Test GetOrdersSummary
-        /// </summary>
-        [Test]
-        public void GetOrdersSummaryTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string searchQuery = null;
-            //List<int?> physicalRestaurantId = null;
-            //List<string> state = null;
-            //int? page = null;
-            //int? limit = null;
-            //bool? orderByRequestedForTime = null;
-            //var response = instance.GetOrdersSummary(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime);
-            //Assert.IsInstanceOf<RestApiPaginationResultOrderSummary> (response, "response is RestApiPaginationResultOrderSummary");
-        }
-        
-        /// <summary>
-        /// Test RefundOrder
-        /// </summary>
-        [Test]
-        public void RefundOrderTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? id = null;
-            //Refund refundObject = null;
-            //instance.RefundOrder(id, refundObject);
-            
-        }
-        
-        /// <summary>
-        /// Test RejectOrder
-        /// </summary>
-        [Test]
-        public void RejectOrderTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? id = null;
-            //Reject rejectObject = null;
-            //instance.RejectOrder(id, rejectObject);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/PaymentIntentsApiTests.cs b/src/Flipdish.Test/Api/PaymentIntentsApiTests.cs
deleted file mode 100644
index 851d4b2e..00000000
--- a/src/Flipdish.Test/Api/PaymentIntentsApiTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PaymentIntentsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class PaymentIntentsApiTests
-    {
-        private PaymentIntentsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new PaymentIntentsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PaymentIntentsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' PaymentIntentsApi
-            //Assert.IsInstanceOfType(typeof(PaymentIntentsApi), instance, "instance is a PaymentIntentsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetPaymentIntent
-        /// </summary>
-        [Test]
-        public void GetPaymentIntentTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string paymentIntentId = null;
-            //var response = instance.GetPaymentIntent(paymentIntentId);
-            //Assert.IsInstanceOf<RestApiResultPaymentIntent> (response, "response is RestApiResultPaymentIntent");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/PaymentsApiTests.cs b/src/Flipdish.Test/Api/PaymentsApiTests.cs
deleted file mode 100644
index cf009148..00000000
--- a/src/Flipdish.Test/Api/PaymentsApiTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PaymentsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class PaymentsApiTests
-    {
-        private PaymentsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new PaymentsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PaymentsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' PaymentsApi
-            //Assert.IsInstanceOfType(typeof(PaymentsApi), instance, "instance is a PaymentsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetOrderPaymentInformation
-        /// </summary>
-        [Test]
-        public void GetOrderPaymentInformationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? orderId = null;
-            //var response = instance.GetOrderPaymentInformation(orderId);
-            //Assert.IsInstanceOf<RestApiResultOrderPaymentInformation> (response, "response is RestApiResultOrderPaymentInformation");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/PayoutsApiTests.cs b/src/Flipdish.Test/Api/PayoutsApiTests.cs
deleted file mode 100644
index d4bcdab2..00000000
--- a/src/Flipdish.Test/Api/PayoutsApiTests.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutsApiTests
-    {
-        private PayoutsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new PayoutsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' PayoutsApi
-            //Assert.IsInstanceOfType(typeof(PayoutsApi), instance, "instance is a PayoutsApi");
-        }
-
-        
-        /// <summary>
-        /// Test ExportPayoutChargebacks
-        /// </summary>
-        [Test]
-        public void ExportPayoutChargebacksTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutChargebacks(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutOrders
-        /// </summary>
-        [Test]
-        public void ExportPayoutOrdersTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutOrders(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutOtherCharges
-        /// </summary>
-        [Test]
-        public void ExportPayoutOtherChargesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutOtherCharges(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutRefunds
-        /// </summary>
-        [Test]
-        public void ExportPayoutRefundsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutRefunds(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutStores
-        /// </summary>
-        [Test]
-        public void ExportPayoutStoresTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutStores(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test GetPayout
-        /// </summary>
-        [Test]
-        public void GetPayoutTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //var response = instance.GetPayout(appId, bankAccountId, payoutId);
-            //Assert.IsInstanceOf<PayoutDetail> (response, "response is PayoutDetail");
-        }
-        
-        /// <summary>
-        /// Test GetPayoutChargebacks
-        /// </summary>
-        [Test]
-        public void GetPayoutChargebacksTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //int? page = null;
-            //int? limit = null;
-            //List<int?> storeIds = null;
-            //var response = instance.GetPayoutChargebacks(appId, bankAccountId, payoutId, page, limit, storeIds);
-            //Assert.IsInstanceOf<RestApiPaginationResultPayoutChargeback> (response, "response is RestApiPaginationResultPayoutChargeback");
-        }
-        
-        /// <summary>
-        /// Test GetPayoutOrders
-        /// </summary>
-        [Test]
-        public void GetPayoutOrdersTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //int? page = null;
-            //int? limit = null;
-            //List<int?> storeIds = null;
-            //var response = instance.GetPayoutOrders(appId, bankAccountId, payoutId, page, limit, storeIds);
-            //Assert.IsInstanceOf<RestApiPaginationResultPayoutOrder> (response, "response is RestApiPaginationResultPayoutOrder");
-        }
-        
-        /// <summary>
-        /// Test GetPayoutOtherCharges
-        /// </summary>
-        [Test]
-        public void GetPayoutOtherChargesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //int? page = null;
-            //int? limit = null;
-            //List<int?> storeIds = null;
-            //var response = instance.GetPayoutOtherCharges(appId, bankAccountId, payoutId, page, limit, storeIds);
-            //Assert.IsInstanceOf<RestApiPaginationResultPayoutOtherCharge> (response, "response is RestApiPaginationResultPayoutOtherCharge");
-        }
-        
-        /// <summary>
-        /// Test GetPayoutRefunds
-        /// </summary>
-        [Test]
-        public void GetPayoutRefundsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //int? page = null;
-            //int? limit = null;
-            //List<int?> storeIds = null;
-            //var response = instance.GetPayoutRefunds(appId, bankAccountId, payoutId, page, limit, storeIds);
-            //Assert.IsInstanceOf<RestApiPaginationResultPayoutRefund> (response, "response is RestApiPaginationResultPayoutRefund");
-        }
-        
-        /// <summary>
-        /// Test GetPayoutSummaries
-        /// </summary>
-        [Test]
-        public void GetPayoutSummariesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payeeBankAccountDataId = null;
-            //DateTime? startDate = null;
-            //DateTime? endDate = null;
-            //string status = null;
-            //List<int?> payoutRequestIdsBankAccountIds = null;
-            //List<string> payoutRequestIdsStates = null;
-            //var response = instance.GetPayoutSummaries(appId, bankAccountId, payeeBankAccountDataId, startDate, endDate, status, payoutRequestIdsBankAccountIds, payoutRequestIdsStates);
-            //Assert.IsInstanceOf<RestApiArrayResultPayoutSummary> (response, "response is RestApiArrayResultPayoutSummary");
-        }
-        
-        /// <summary>
-        /// Test GetPayouts
-        /// </summary>
-        [Test]
-        public void GetPayoutsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payeeBankAccountDataId = null;
-            //DateTime? startDate = null;
-            //DateTime? endDate = null;
-            //string status = null;
-            //int? page = null;
-            //int? limit = null;
-            //List<int?> payoutRequestIdsBankAccountIds = null;
-            //List<string> payoutRequestIdsStates = null;
-            //var response = instance.GetPayouts(appId, bankAccountId, payeeBankAccountDataId, startDate, endDate, status, page, limit, payoutRequestIdsBankAccountIds, payoutRequestIdsStates);
-            //Assert.IsInstanceOf<RestApiPaginationResultPayout> (response, "response is RestApiPaginationResultPayout");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/PayoutsExportApiTests.cs b/src/Flipdish.Test/Api/PayoutsExportApiTests.cs
deleted file mode 100644
index fe44f841..00000000
--- a/src/Flipdish.Test/Api/PayoutsExportApiTests.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutsExportApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutsExportApiTests
-    {
-        private PayoutsExportApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new PayoutsExportApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutsExportApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' PayoutsExportApi
-            //Assert.IsInstanceOfType(typeof(PayoutsExportApi), instance, "instance is a PayoutsExportApi");
-        }
-
-        
-        /// <summary>
-        /// Test ExportPayoutChargebacks
-        /// </summary>
-        [Test]
-        public void ExportPayoutChargebacksTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutChargebacks(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutOrders
-        /// </summary>
-        [Test]
-        public void ExportPayoutOrdersTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutOrders(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutOtherCharges
-        /// </summary>
-        [Test]
-        public void ExportPayoutOtherChargesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutOtherCharges(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutRefunds
-        /// </summary>
-        [Test]
-        public void ExportPayoutRefundsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutRefunds(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutStores
-        /// </summary>
-        [Test]
-        public void ExportPayoutStoresTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payoutId = null;
-            //List<int?> storeIds = null;
-            //var response = instance.ExportPayoutStores(appId, bankAccountId, payoutId, storeIds);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-        /// <summary>
-        /// Test ExportPayoutSummaries
-        /// </summary>
-        [Test]
-        public void ExportPayoutSummariesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //int? payeeBankAccountDataId = null;
-            //DateTime? startDate = null;
-            //DateTime? endDate = null;
-            //string status = null;
-            //List<int?> payoutRequestIdsBankAccountIds = null;
-            //List<string> payoutRequestIdsStates = null;
-            //var response = instance.ExportPayoutSummaries(appId, bankAccountId, payeeBankAccountDataId, startDate, endDate, status, payoutRequestIdsBankAccountIds, payoutRequestIdsStates);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/PendingMenuChangesApiTests.cs b/src/Flipdish.Test/Api/PendingMenuChangesApiTests.cs
deleted file mode 100644
index 2d11c842..00000000
--- a/src/Flipdish.Test/Api/PendingMenuChangesApiTests.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PendingMenuChangesApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class PendingMenuChangesApiTests
-    {
-        private PendingMenuChangesApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new PendingMenuChangesApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PendingMenuChangesApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' PendingMenuChangesApi
-            //Assert.IsInstanceOfType(typeof(PendingMenuChangesApi), instance, "instance is a PendingMenuChangesApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetPendingMenuChanges
-        /// </summary>
-        [Test]
-        public void GetPendingMenuChangesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? menuId = null;
-            //string catalogElementId = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetPendingMenuChanges(appId, menuId, catalogElementId, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultPendingMenuChanges> (response, "response is RestApiPaginationResultPendingMenuChanges");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/ProcessingFeeConfigsApiTests.cs b/src/Flipdish.Test/Api/ProcessingFeeConfigsApiTests.cs
deleted file mode 100644
index 065726d6..00000000
--- a/src/Flipdish.Test/Api/ProcessingFeeConfigsApiTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ProcessingFeeConfigsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class ProcessingFeeConfigsApiTests
-    {
-        private ProcessingFeeConfigsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new ProcessingFeeConfigsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ProcessingFeeConfigsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' ProcessingFeeConfigsApi
-            //Assert.IsInstanceOfType(typeof(ProcessingFeeConfigsApi), instance, "instance is a ProcessingFeeConfigsApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetProcessingFeeConfigsByStoreIds
-        /// </summary>
-        [Test]
-        public void GetProcessingFeeConfigsByStoreIdsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //List<int?> storeIds = null;
-            //var response = instance.GetProcessingFeeConfigsByStoreIds(storeIds);
-            //Assert.IsInstanceOf<RestApiArrayResultProcessingFeeConfig> (response, "response is RestApiArrayResultProcessingFeeConfig");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/ProductsApiTests.cs b/src/Flipdish.Test/Api/ProductsApiTests.cs
deleted file mode 100644
index af662d95..00000000
--- a/src/Flipdish.Test/Api/ProductsApiTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ProductsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class ProductsApiTests
-    {
-        private ProductsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new ProductsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ProductsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' ProductsApi
-            //Assert.IsInstanceOfType(typeof(ProductsApi), instance, "instance is a ProductsApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateProduct
-        /// </summary>
-        [Test]
-        public void CreateProductTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //CreateProduct product = null;
-            //var response = instance.CreateProduct(appId, product);
-            //Assert.IsInstanceOf<string> (response, "response is string");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/PushNotificationsApiTests.cs b/src/Flipdish.Test/Api/PushNotificationsApiTests.cs
deleted file mode 100644
index dff779a5..00000000
--- a/src/Flipdish.Test/Api/PushNotificationsApiTests.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PushNotificationsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class PushNotificationsApiTests
-    {
-        private PushNotificationsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new PushNotificationsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PushNotificationsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' PushNotificationsApi
-            //Assert.IsInstanceOfType(typeof(PushNotificationsApi), instance, "instance is a PushNotificationsApi");
-        }
-
-        
-        /// <summary>
-        /// Test DeletePushNotification
-        /// </summary>
-        [Test]
-        public void DeletePushNotificationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? scheduledPushNotificationId = null;
-            //instance.DeletePushNotification(appId, scheduledPushNotificationId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetPushNotifications
-        /// </summary>
-        [Test]
-        public void GetPushNotificationsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetPushNotifications(appId, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultPushNotificationResponse> (response, "response is RestApiPaginationResultPushNotificationResponse");
-        }
-        
-        /// <summary>
-        /// Test SchedulePushNotification
-        /// </summary>
-        [Test]
-        public void SchedulePushNotificationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //PushNotificationRequest notification = null;
-            //var response = instance.SchedulePushNotification(appId, notification);
-            //Assert.IsInstanceOf<RestApiResultPushNotificationResponse> (response, "response is RestApiResultPushNotificationResponse");
-        }
-        
-        /// <summary>
-        /// Test UpdatePushNotification
-        /// </summary>
-        [Test]
-        public void UpdatePushNotificationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? scheduledPushNotificationId = null;
-            //PushNotificationRequest notification = null;
-            //var response = instance.UpdatePushNotification(appId, scheduledPushNotificationId, notification);
-            //Assert.IsInstanceOf<RestApiResultPushNotificationResponse> (response, "response is RestApiResultPushNotificationResponse");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/StoreGroupsApiTests.cs b/src/Flipdish.Test/Api/StoreGroupsApiTests.cs
deleted file mode 100644
index 6a4c1764..00000000
--- a/src/Flipdish.Test/Api/StoreGroupsApiTests.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreGroupsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class StoreGroupsApiTests
-    {
-        private StoreGroupsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new StoreGroupsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreGroupsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' StoreGroupsApi
-            //Assert.IsInstanceOfType(typeof(StoreGroupsApi), instance, "instance is a StoreGroupsApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateStoreGroup
-        /// </summary>
-        [Test]
-        public void CreateStoreGroupTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appNameId = null;
-            //StoreGroupBase storeGroup = null;
-            //var response = instance.CreateStoreGroup(appNameId, storeGroup);
-            //Assert.IsInstanceOf<RestApiResultStoreGroup> (response, "response is RestApiResultStoreGroup");
-        }
-        
-        /// <summary>
-        /// Test GetStoreGroup
-        /// </summary>
-        [Test]
-        public void GetStoreGroupTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeGroupId = null;
-            //var response = instance.GetStoreGroup(storeGroupId);
-            //Assert.IsInstanceOf<RestApiResultStoreGroup> (response, "response is RestApiResultStoreGroup");
-        }
-        
-        /// <summary>
-        /// Test GetStoreGroups
-        /// </summary>
-        [Test]
-        public void GetStoreGroupsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appNameId = null;
-            //string searchQuery = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetStoreGroups(appNameId, searchQuery, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultStoreGroup> (response, "response is RestApiPaginationResultStoreGroup");
-        }
-        
-        /// <summary>
-        /// Test GetStoreGroupsExtended
-        /// </summary>
-        [Test]
-        public void GetStoreGroupsExtendedTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appNameId = null;
-            //string searchQuery = null;
-            //int? page = null;
-            //int? limit = null;
-            //int? groupingRadius = null;
-            //var response = instance.GetStoreGroupsExtended(appNameId, searchQuery, page, limit, groupingRadius);
-            //Assert.IsInstanceOf<RestApiPaginationResultStoreGroupExtended> (response, "response is RestApiPaginationResultStoreGroupExtended");
-        }
-        
-        /// <summary>
-        /// Test RemoveStoreGroup
-        /// </summary>
-        [Test]
-        public void RemoveStoreGroupTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeGroupId = null;
-            //instance.RemoveStoreGroup(storeGroupId);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdateStoreGroup
-        /// </summary>
-        [Test]
-        public void UpdateStoreGroupTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeGroupId = null;
-            //StoreGroupBase storeGroup = null;
-            //var response = instance.UpdateStoreGroup(storeGroupId, storeGroup);
-            //Assert.IsInstanceOf<RestApiResultStoreGroupBase> (response, "response is RestApiResultStoreGroupBase");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/StoreOrderCapacityApiTests.cs b/src/Flipdish.Test/Api/StoreOrderCapacityApiTests.cs
deleted file mode 100644
index 38248c17..00000000
--- a/src/Flipdish.Test/Api/StoreOrderCapacityApiTests.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreOrderCapacityApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class StoreOrderCapacityApiTests
-    {
-        private StoreOrderCapacityApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new StoreOrderCapacityApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreOrderCapacityApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' StoreOrderCapacityApi
-            //Assert.IsInstanceOfType(typeof(StoreOrderCapacityApi), instance, "instance is a StoreOrderCapacityApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetStoreOrderCapacity
-        /// </summary>
-        [Test]
-        public void GetStoreOrderCapacityTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? storeId = null;
-            //string deliveryType = null;
-            //var response = instance.GetStoreOrderCapacity(appId, storeId, deliveryType);
-            //Assert.IsInstanceOf<RestApiResultStoreOrderCapacityConfig> (response, "response is RestApiResultStoreOrderCapacityConfig");
-        }
-        
-        /// <summary>
-        /// Test UpdateStoreOrderCapacityConfig
-        /// </summary>
-        [Test]
-        public void UpdateStoreOrderCapacityConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string deliveryType = null;
-            //StoreOrderCapacityConfigEditModel newOrderCapacityConfig = null;
-            //string appId = null;
-            //instance.UpdateStoreOrderCapacityConfig(storeId, deliveryType, newOrderCapacityConfig, appId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/StoresApiTests.cs b/src/Flipdish.Test/Api/StoresApiTests.cs
deleted file mode 100644
index 8a6a7ba5..00000000
--- a/src/Flipdish.Test/Api/StoresApiTests.cs
+++ /dev/null
@@ -1,438 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoresApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class StoresApiTests
-    {
-        private StoresApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new StoresApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoresApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' StoresApi
-            //Assert.IsInstanceOfType(typeof(StoresApi), instance, "instance is a StoresApi");
-        }
-
-        
-        /// <summary>
-        /// Test ArchiveStore
-        /// </summary>
-        [Test]
-        public void ArchiveStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //instance.ArchiveStore(storeId);
-            
-        }
-        
-        /// <summary>
-        /// Test AssignMenu
-        /// </summary>
-        [Test]
-        public void AssignMenuTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //int? menuId = null;
-            //var response = instance.AssignMenu(storeId, menuId);
-            //Assert.IsInstanceOf<RestApiArrayResultRestApiDefaultResponse> (response, "response is RestApiArrayResultRestApiDefaultResponse");
-        }
-        
-        /// <summary>
-        /// Test CloneStore
-        /// </summary>
-        [Test]
-        public void CloneStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //StoreCloneSettings settings = null;
-            //var response = instance.CloneStore(storeId, settings);
-            //Assert.IsInstanceOf<RestApiResultStore> (response, "response is RestApiResultStore");
-        }
-        
-        /// <summary>
-        /// Test CreateBusinessHoursOverrideByStoreId
-        /// </summary>
-        [Test]
-        public void CreateBusinessHoursOverrideByStoreIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //BusinessHoursOverrideBase businessHoursOverride = null;
-            //var response = instance.CreateBusinessHoursOverrideByStoreId(storeId, businessHoursOverride);
-            //Assert.IsInstanceOf<RestApiResultBusinessHoursOverride> (response, "response is RestApiResultBusinessHoursOverride");
-        }
-        
-        /// <summary>
-        /// Test CreateStore
-        /// </summary>
-        [Test]
-        public void CreateStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeGroupId = null;
-            //StoreCreateBase store = null;
-            //var response = instance.CreateStore(storeGroupId, store);
-            //Assert.IsInstanceOf<RestApiResultStore> (response, "response is RestApiResultStore");
-        }
-        
-        /// <summary>
-        /// Test DeleteBusinessHoursOverride
-        /// </summary>
-        [Test]
-        public void DeleteBusinessHoursOverrideTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //int? businessHoursOverrideId = null;
-            //var response = instance.DeleteBusinessHoursOverride(storeId, businessHoursOverrideId);
-            //Assert.IsInstanceOf<RestApiArrayResultRestApiDefaultResponse> (response, "response is RestApiArrayResultRestApiDefaultResponse");
-        }
-        
-        /// <summary>
-        /// Test GetBankAccountForStore
-        /// </summary>
-        [Test]
-        public void GetBankAccountForStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //var response = instance.GetBankAccountForStore(storeId);
-            //Assert.IsInstanceOf<RestApiResultAssignedBankAccount> (response, "response is RestApiResultAssignedBankAccount");
-        }
-        
-        /// <summary>
-        /// Test GetBusinessHours
-        /// </summary>
-        [Test]
-        public void GetBusinessHoursTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string deliveryType = null;
-            //var response = instance.GetBusinessHours(storeId, deliveryType);
-            //Assert.IsInstanceOf<RestApiArrayResultBusinessHoursPeriod> (response, "response is RestApiArrayResultBusinessHoursPeriod");
-        }
-        
-        /// <summary>
-        /// Test GetBusinessHoursOverrideByStoreId
-        /// </summary>
-        [Test]
-        public void GetBusinessHoursOverrideByStoreIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //DateTime? after = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetBusinessHoursOverrideByStoreId(storeId, after, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultBusinessHoursOverride> (response, "response is RestApiPaginationResultBusinessHoursOverride");
-        }
-        
-        /// <summary>
-        /// Test GetEndOfDayReport
-        /// </summary>
-        [Test]
-        public void GetEndOfDayReportTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //DateTime? date = null;
-            //var response = instance.GetEndOfDayReport(storeId, date);
-            //Assert.IsInstanceOf<RestApiResultStoreEndOfDayReport> (response, "response is RestApiResultStoreEndOfDayReport");
-        }
-        
-        /// <summary>
-        /// Test GetPreOrderConfig
-        /// </summary>
-        [Test]
-        public void GetPreOrderConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string deliveryType = null;
-            //var response = instance.GetPreOrderConfig(storeId, deliveryType);
-            //Assert.IsInstanceOf<RestApiResultPreOrderConfig> (response, "response is RestApiResultPreOrderConfig");
-        }
-        
-        /// <summary>
-        /// Test GetPreOrderPreview
-        /// </summary>
-        [Test]
-        public void GetPreOrderPreviewTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string deliveryType = null;
-            //int? preOrderConfigLeadTimeMinutes = null;
-            //int? preOrderConfigIntervalMinutes = null;
-            //int? preOrderConfigMaxOrderAheadDays = null;
-            //bool? preOrderConfigIncludeAsap = null;
-            //bool? preOrderConfigIncludeMoreGranularInitialTime = null;
-            //string preOrderConfigCutOffTimePreviousDayBasic = null;
-            //string preOrderConfigCutOffTimeCurrentDayBasic = null;
-            //string preOrderConfigPreOrderTimeDisplayType = null;
-            //bool? preOrderConfigAlwaysAppearOpen = null;
-            //bool? preOrderConfigRequireExplicitSelectAlways = null;
-            //var response = instance.GetPreOrderPreview(storeId, deliveryType, preOrderConfigLeadTimeMinutes, preOrderConfigIntervalMinutes, preOrderConfigMaxOrderAheadDays, preOrderConfigIncludeAsap, preOrderConfigIncludeMoreGranularInitialTime, preOrderConfigCutOffTimePreviousDayBasic, preOrderConfigCutOffTimeCurrentDayBasic, preOrderConfigPreOrderTimeDisplayType, preOrderConfigAlwaysAppearOpen, preOrderConfigRequireExplicitSelectAlways);
-            //Assert.IsInstanceOf<RestApiArrayResultPreOrderTime> (response, "response is RestApiArrayResultPreOrderTime");
-        }
-        
-        /// <summary>
-        /// Test GetProcessingFeeConfigsByStoreId
-        /// </summary>
-        [Test]
-        public void GetProcessingFeeConfigsByStoreIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string appNameId = null;
-            //var response = instance.GetProcessingFeeConfigsByStoreId(storeId, appNameId);
-            //Assert.IsInstanceOf<RestApiArrayResultProcessingFeeConfig> (response, "response is RestApiArrayResultProcessingFeeConfig");
-        }
-        
-        /// <summary>
-        /// Test GetProcessingFeeConfigsByStoreIdAndPaymentAccountType
-        /// </summary>
-        [Test]
-        public void GetProcessingFeeConfigsByStoreIdAndPaymentAccountTypeTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string paymentAccountType = null;
-            //string appNameId = null;
-            //var response = instance.GetProcessingFeeConfigsByStoreIdAndPaymentAccountType(storeId, paymentAccountType, appNameId);
-            //Assert.IsInstanceOf<RestApiResultProcessingFeeConfig> (response, "response is RestApiResultProcessingFeeConfig");
-        }
-        
-        /// <summary>
-        /// Test GetStoreById
-        /// </summary>
-        [Test]
-        public void GetStoreByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //var response = instance.GetStoreById(storeId);
-            //Assert.IsInstanceOf<RestApiResultStore> (response, "response is RestApiResultStore");
-        }
-        
-        /// <summary>
-        /// Test GetStoreHeadersByAppId
-        /// </summary>
-        [Test]
-        public void GetStoreHeadersByAppIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string storeNameQuery = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetStoreHeadersByAppId(appId, storeNameQuery, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultStoreHeader> (response, "response is RestApiPaginationResultStoreHeader");
-        }
-        
-        /// <summary>
-        /// Test GetStoreNetSales
-        /// </summary>
-        [Test]
-        public void GetStoreNetSalesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //List<int?> storeId = null;
-            //var response = instance.GetStoreNetSales(appId, storeId);
-            //Assert.IsInstanceOf<RestApiArrayResultStoreStatistics> (response, "response is RestApiArrayResultStoreStatistics");
-        }
-        
-        /// <summary>
-        /// Test GetStores
-        /// </summary>
-        [Test]
-        public void GetStoresTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string searchQuery = null;
-            //int? page = null;
-            //int? limit = null;
-            //int? storeGroupId = null;
-            //var response = instance.GetStores(searchQuery, page, limit, storeGroupId);
-            //Assert.IsInstanceOf<RestApiPaginationResultStore> (response, "response is RestApiPaginationResultStore");
-        }
-        
-        /// <summary>
-        /// Test GetStoresByAppId
-        /// </summary>
-        [Test]
-        public void GetStoresByAppIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string searchQuery = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetStoresByAppId(appId, searchQuery, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultStore> (response, "response is RestApiPaginationResultStore");
-        }
-        
-        /// <summary>
-        /// Test PublishStore
-        /// </summary>
-        [Test]
-        public void PublishStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //instance.PublishStore(storeId);
-            
-        }
-        
-        /// <summary>
-        /// Test SetBusinessHours
-        /// </summary>
-        [Test]
-        public void SetBusinessHoursTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string deliveryType = null;
-            //BusinessHoursPeriodBase businessHoursPeriod = null;
-            //var response = instance.SetBusinessHours(storeId, deliveryType, businessHoursPeriod);
-            //Assert.IsInstanceOf<RestApiResultBusinessHoursPeriod> (response, "response is RestApiResultBusinessHoursPeriod");
-        }
-        
-        /// <summary>
-        /// Test SetPreOrdeEnabled
-        /// </summary>
-        [Test]
-        public void SetPreOrdeEnabledTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string deliveryType = null;
-            //bool? enabled = null;
-            //var response = instance.SetPreOrdeEnabled(storeId, deliveryType, enabled);
-            //Assert.IsInstanceOf<RestApiArrayResultRestApiDefaultResponse> (response, "response is RestApiArrayResultRestApiDefaultResponse");
-        }
-        
-        /// <summary>
-        /// Test UnpublishStore
-        /// </summary>
-        [Test]
-        public void UnpublishStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //instance.UnpublishStore(storeId);
-            
-        }
-        
-        /// <summary>
-        /// Test UpdatePreOrderConfig
-        /// </summary>
-        [Test]
-        public void UpdatePreOrderConfigTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //string deliveryType = null;
-            //PreOrderConfig preOrderConfig = null;
-            //var response = instance.UpdatePreOrderConfig(storeId, deliveryType, preOrderConfig);
-            //Assert.IsInstanceOf<RestApiArrayResultRestApiDefaultResponse> (response, "response is RestApiArrayResultRestApiDefaultResponse");
-        }
-        
-        /// <summary>
-        /// Test UpdateStore
-        /// </summary>
-        [Test]
-        public void UpdateStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //StoreBase store = null;
-            //var response = instance.UpdateStore(storeId, store);
-            //Assert.IsInstanceOf<RestApiResultStore> (response, "response is RestApiResultStore");
-        }
-        
-        /// <summary>
-        /// Test UpdateStoreAddress
-        /// </summary>
-        [Test]
-        public void UpdateStoreAddressTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //StoreAddressBase storeAddress = null;
-            //var response = instance.UpdateStoreAddress(storeId, storeAddress);
-            //Assert.IsInstanceOf<RestApiResultStoreAddress> (response, "response is RestApiResultStoreAddress");
-        }
-        
-        /// <summary>
-        /// Test UpdateStoreAddressCoordinates
-        /// </summary>
-        [Test]
-        public void UpdateStoreAddressCoordinatesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //Coordinates coordinates = null;
-            //string appNameId = null;
-            //var response = instance.UpdateStoreAddressCoordinates(storeId, coordinates, appNameId);
-            //Assert.IsInstanceOf<RestApiResultCoordinates> (response, "response is RestApiResultCoordinates");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/StripeCustomConnectAdminApiTests.cs b/src/Flipdish.Test/Api/StripeCustomConnectAdminApiTests.cs
deleted file mode 100644
index 2db0b5e1..00000000
--- a/src/Flipdish.Test/Api/StripeCustomConnectAdminApiTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StripeCustomConnectAdminApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class StripeCustomConnectAdminApiTests
-    {
-        private StripeCustomConnectAdminApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new StripeCustomConnectAdminApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StripeCustomConnectAdminApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' StripeCustomConnectAdminApi
-            //Assert.IsInstanceOfType(typeof(StripeCustomConnectAdminApi), instance, "instance is a StripeCustomConnectAdminApi");
-        }
-
-        
-        /// <summary>
-        /// Test InitializeBankAccountConnectedAccount
-        /// </summary>
-        [Test]
-        public void InitializeBankAccountConnectedAccountTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //List<int?> accounts = null;
-            //var response = instance.InitializeBankAccountConnectedAccount(accounts);
-            //Assert.IsInstanceOf<RestApiResultBankAccountDetail> (response, "response is RestApiResultBankAccountDetail");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/StripeCustomConnectApiTests.cs b/src/Flipdish.Test/Api/StripeCustomConnectApiTests.cs
deleted file mode 100644
index a7e04dc8..00000000
--- a/src/Flipdish.Test/Api/StripeCustomConnectApiTests.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StripeCustomConnectApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class StripeCustomConnectApiTests
-    {
-        private StripeCustomConnectApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new StripeCustomConnectApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StripeCustomConnectApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' StripeCustomConnectApi
-            //Assert.IsInstanceOfType(typeof(StripeCustomConnectApi), instance, "instance is a StripeCustomConnectApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateStripeConnectedAccount
-        /// </summary>
-        [Test]
-        public void CreateStripeConnectedAccountTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //var response = instance.CreateStripeConnectedAccount(appId, bankAccountId);
-            //Assert.IsInstanceOf<RestApiResultStripeConnectedAccount> (response, "response is RestApiResultStripeConnectedAccount");
-        }
-        
-        /// <summary>
-        /// Test CreateStripeConnectedAccountLink
-        /// </summary>
-        [Test]
-        public void CreateStripeConnectedAccountLinkTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //StripeAccountLinkRequest stripeAccountLinkRequest = null;
-            //var response = instance.CreateStripeConnectedAccountLink(appId, stripeAccountLinkRequest);
-            //Assert.IsInstanceOf<RestApiResultStripeConnectedAccount> (response, "response is RestApiResultStripeConnectedAccount");
-        }
-        
-        /// <summary>
-        /// Test GetCustomConnectAccount
-        /// </summary>
-        [Test]
-        public void GetCustomConnectAccountTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? bankAccountId = null;
-            //var response = instance.GetCustomConnectAccount(appId, bankAccountId);
-            //Assert.IsInstanceOf<RestApiResultStripeConnectedAccount> (response, "response is RestApiResultStripeConnectedAccount");
-        }
-        
-        /// <summary>
-        /// Test GetVerificationStatus
-        /// </summary>
-        [Test]
-        public void GetVerificationStatusTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string stripeId = null;
-            //var response = instance.GetVerificationStatus(appId, stripeId);
-            //Assert.IsInstanceOf<RestApiResultStripeConnectedAccount> (response, "response is RestApiResultStripeConnectedAccount");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/StuartApiTests.cs b/src/Flipdish.Test/Api/StuartApiTests.cs
deleted file mode 100644
index baa402b4..00000000
--- a/src/Flipdish.Test/Api/StuartApiTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StuartApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class StuartApiTests
-    {
-        private StuartApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new StuartApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StuartApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' StuartApi
-            //Assert.IsInstanceOfType(typeof(StuartApi), instance, "instance is a StuartApi");
-        }
-
-        
-        /// <summary>
-        /// Test StuartCancelJob
-        /// </summary>
-        [Test]
-        public void StuartCancelJobTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? jobId = null;
-            //int? storeId = null;
-            //var response = instance.StuartCancelJob(jobId, storeId);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test StuartGetJob
-        /// </summary>
-        [Test]
-        public void StuartGetJobTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? jobId = null;
-            //int? storeId = null;
-            //var response = instance.StuartGetJob(jobId, storeId);
-            //Assert.IsInstanceOf<RestApiResultJobResponse> (response, "response is RestApiResultJobResponse");
-        }
-        
-        /// <summary>
-        /// Test StuartGetStuartSettings
-        /// </summary>
-        [Test]
-        public void StuartGetStuartSettingsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //var response = instance.StuartGetStuartSettings(storeId);
-            //Assert.IsInstanceOf<RestApiResultStuartSettings> (response, "response is RestApiResultStuartSettings");
-        }
-        
-        /// <summary>
-        /// Test StuartPostStuartSettings
-        /// </summary>
-        [Test]
-        public void StuartPostStuartSettingsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //StuartSettings stuartSettings = null;
-            //var response = instance.StuartPostStuartSettings(storeId, stuartSettings);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/SubscriptionsApiTests.cs b/src/Flipdish.Test/Api/SubscriptionsApiTests.cs
deleted file mode 100644
index 60ab144b..00000000
--- a/src/Flipdish.Test/Api/SubscriptionsApiTests.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SubscriptionsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class SubscriptionsApiTests
-    {
-        private SubscriptionsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new SubscriptionsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SubscriptionsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' SubscriptionsApi
-            //Assert.IsInstanceOfType(typeof(SubscriptionsApi), instance, "instance is a SubscriptionsApi");
-        }
-
-        
-        /// <summary>
-        /// Test SubscriptionsCancelSubscription
-        /// </summary>
-        [Test]
-        public void SubscriptionsCancelSubscriptionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? subscriptionId = null;
-            //var response = instance.SubscriptionsCancelSubscription(subscriptionId);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test SubscriptionsGetCard
-        /// </summary>
-        [Test]
-        public void SubscriptionsGetCardTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? subscriptionId = null;
-            //var response = instance.SubscriptionsGetCard(subscriptionId);
-            //Assert.IsInstanceOf<RestApiResultCard> (response, "response is RestApiResultCard");
-        }
-        
-        /// <summary>
-        /// Test SubscriptionsGetPlansByCurrency
-        /// </summary>
-        [Test]
-        public void SubscriptionsGetPlansByCurrencyTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.SubscriptionsGetPlansByCurrency();
-            //Assert.IsInstanceOf<RestApiResultSubscriptionPlansResponse> (response, "response is RestApiResultSubscriptionPlansResponse");
-        }
-        
-        /// <summary>
-        /// Test SubscriptionsGetSubscription
-        /// </summary>
-        [Test]
-        public void SubscriptionsGetSubscriptionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? subscriptionId = null;
-            //var response = instance.SubscriptionsGetSubscription(subscriptionId);
-            //Assert.IsInstanceOf<RestApiResultSubscription> (response, "response is RestApiResultSubscription");
-        }
-        
-        /// <summary>
-        /// Test SubscriptionsGetUserSubscriptionByAppId
-        /// </summary>
-        [Test]
-        public void SubscriptionsGetUserSubscriptionByAppIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.SubscriptionsGetUserSubscriptionByAppId(appId);
-            //Assert.IsInstanceOf<RestApiResultSubscription> (response, "response is RestApiResultSubscription");
-        }
-        
-        /// <summary>
-        /// Test SubscriptionsReplaceOldCardWithNewCard
-        /// </summary>
-        [Test]
-        public void SubscriptionsReplaceOldCardWithNewCardTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? subscriptionId = null;
-            //CardWithToken card = null;
-            //var response = instance.SubscriptionsReplaceOldCardWithNewCard(subscriptionId, card);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test SubscriptionsSubscribe
-        /// </summary>
-        [Test]
-        public void SubscriptionsSubscribeTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //SubscriptionWithToken subscription = null;
-            //var response = instance.SubscriptionsSubscribe(subscription);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-        /// <summary>
-        /// Test SubscriptionsUpdateCardExpiringDate
-        /// </summary>
-        [Test]
-        public void SubscriptionsUpdateCardExpiringDateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? subscriptionId = null;
-            //CardBase card = null;
-            //var response = instance.SubscriptionsUpdateCardExpiringDate(subscriptionId, card);
-            //Assert.IsInstanceOf<RestApiResultCard> (response, "response is RestApiResultCard");
-        }
-        
-        /// <summary>
-        /// Test SubscriptionsUpdateSubscription
-        /// </summary>
-        [Test]
-        public void SubscriptionsUpdateSubscriptionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? subscriptionId = null;
-            //SubscriptionBase subscription = null;
-            //var response = instance.SubscriptionsUpdateSubscription(subscriptionId, subscription);
-            //Assert.IsInstanceOf<Object> (response, "response is Object");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/TeammatesApiTests.cs b/src/Flipdish.Test/Api/TeammatesApiTests.cs
deleted file mode 100644
index e1178b03..00000000
--- a/src/Flipdish.Test/Api/TeammatesApiTests.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TeammatesApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class TeammatesApiTests
-    {
-        private TeammatesApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new TeammatesApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TeammatesApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' TeammatesApi
-            //Assert.IsInstanceOfType(typeof(TeammatesApi), instance, "instance is a TeammatesApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateTeammate
-        /// </summary>
-        [Test]
-        public void CreateTeammateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //CreateTeammate teammate = null;
-            //var response = instance.CreateTeammate(appId, teammate);
-            //Assert.IsInstanceOf<RestApiResultTeammate> (response, "response is RestApiResultTeammate");
-        }
-        
-        /// <summary>
-        /// Test DeleteTeammate
-        /// </summary>
-        [Test]
-        public void DeleteTeammateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string id = null;
-            //instance.DeleteTeammate(appId, id);
-            
-        }
-        
-        /// <summary>
-        /// Test GetTeammateByAppIdAndTeammateId
-        /// </summary>
-        [Test]
-        public void GetTeammateByAppIdAndTeammateIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string id = null;
-            //var response = instance.GetTeammateByAppIdAndTeammateId(appId, id);
-            //Assert.IsInstanceOf<RestApiResultTeammate> (response, "response is RestApiResultTeammate");
-        }
-        
-        /// <summary>
-        /// Test GetTeammatesByAppId
-        /// </summary>
-        [Test]
-        public void GetTeammatesByAppIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetTeammatesByAppId(appId);
-            //Assert.IsInstanceOf<RestApiArrayResultTeammate> (response, "response is RestApiArrayResultTeammate");
-        }
-        
-        /// <summary>
-        /// Test RedeemInvitation
-        /// </summary>
-        [Test]
-        public void RedeemInvitationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string otc = null;
-            //string appId = null;
-            //var response = instance.RedeemInvitation(otc, appId);
-            //Assert.IsInstanceOf<RestApiResultRedeemInvitationResult> (response, "response is RestApiResultRedeemInvitationResult");
-        }
-        
-        /// <summary>
-        /// Test UpdateTeammate
-        /// </summary>
-        [Test]
-        public void UpdateTeammateTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string id = null;
-            //TeammateBase teammate = null;
-            //var response = instance.UpdateTeammate(appId, id, teammate);
-            //Assert.IsInstanceOf<RestApiResultTeammate> (response, "response is RestApiResultTeammate");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/TerminalIotApiTests.cs b/src/Flipdish.Test/Api/TerminalIotApiTests.cs
deleted file mode 100644
index 004f563b..00000000
--- a/src/Flipdish.Test/Api/TerminalIotApiTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TerminalIotApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class TerminalIotApiTests
-    {
-        private TerminalIotApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new TerminalIotApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TerminalIotApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' TerminalIotApi
-            //Assert.IsInstanceOfType(typeof(TerminalIotApi), instance, "instance is a TerminalIotApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetTerminalIotConnection
-        /// </summary>
-        [Test]
-        public void GetTerminalIotConnectionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetTerminalIotConnection();
-            //Assert.IsInstanceOf<RestApiResultKioskIotConnectionParameters> (response, "response is RestApiResultKioskIotConnectionParameters");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/TipsApiTests.cs b/src/Flipdish.Test/Api/TipsApiTests.cs
deleted file mode 100644
index ba175393..00000000
--- a/src/Flipdish.Test/Api/TipsApiTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TipsApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class TipsApiTests
-    {
-        private TipsApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new TipsApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TipsApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' TipsApi
-            //Assert.IsInstanceOfType(typeof(TipsApi), instance, "instance is a TipsApi");
-        }
-
-        
-        /// <summary>
-        /// Test TipConfigGet
-        /// </summary>
-        [Test]
-        public void TipConfigGetTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //var response = instance.TipConfigGet(storeId);
-            //Assert.IsInstanceOf<RestApiResultTipConfiguration> (response, "response is RestApiResultTipConfiguration");
-        }
-        
-        /// <summary>
-        /// Test TipConfigUpsert
-        /// </summary>
-        [Test]
-        public void TipConfigUpsertTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? storeId = null;
-            //UpdateTipConfiguration updateConfig = null;
-            //var response = instance.TipConfigUpsert(storeId, updateConfig);
-            //Assert.IsInstanceOf<RestApiResultTipConfiguration> (response, "response is RestApiResultTipConfiguration");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/UsersApiTests.cs b/src/Flipdish.Test/Api/UsersApiTests.cs
deleted file mode 100644
index fa22df0f..00000000
--- a/src/Flipdish.Test/Api/UsersApiTests.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UsersApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class UsersApiTests
-    {
-        private UsersApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new UsersApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UsersApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' UsersApi
-            //Assert.IsInstanceOfType(typeof(UsersApi), instance, "instance is a UsersApi");
-        }
-
-        
-        /// <summary>
-        /// Test GetPreviousOrderCountForStore
-        /// </summary>
-        [Test]
-        public void GetPreviousOrderCountForStoreTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? userId = null;
-            //int? storeId = null;
-            //var response = instance.GetPreviousOrderCountForStore(userId, storeId);
-            //Assert.IsInstanceOf<RestApiStringResult> (response, "response is RestApiStringResult");
-        }
-        
-        /// <summary>
-        /// Test GetRoles
-        /// </summary>
-        [Test]
-        public void GetRolesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //var response = instance.GetRoles();
-            //Assert.IsInstanceOf<RestApiStringArrayResult> (response, "response is RestApiStringArrayResult");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/VouchersApiTests.cs b/src/Flipdish.Test/Api/VouchersApiTests.cs
deleted file mode 100644
index f815b59d..00000000
--- a/src/Flipdish.Test/Api/VouchersApiTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing VouchersApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class VouchersApiTests
-    {
-        private VouchersApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new VouchersApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of VouchersApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' VouchersApi
-            //Assert.IsInstanceOfType(typeof(VouchersApi), instance, "instance is a VouchersApi");
-        }
-
-        
-        /// <summary>
-        /// Test CreateVoucher
-        /// </summary>
-        [Test]
-        public void CreateVoucherTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //CreateVoucher voucher = null;
-            //var response = instance.CreateVoucher(appId, voucher);
-            //Assert.IsInstanceOf<RestApiResultVoucherWithStats> (response, "response is RestApiResultVoucherWithStats");
-        }
-        
-        /// <summary>
-        /// Test GetVoucherById
-        /// </summary>
-        [Test]
-        public void GetVoucherByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? voucherId = null;
-            //var response = instance.GetVoucherById(voucherId);
-            //Assert.IsInstanceOf<RestApiResultVoucherWithStats> (response, "response is RestApiResultVoucherWithStats");
-        }
-        
-        /// <summary>
-        /// Test GetVoucherStatsById
-        /// </summary>
-        [Test]
-        public void GetVoucherStatsByIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? voucherId = null;
-            //string aggregateDataBy = null;
-            //int? dataPointLimit = null;
-            //var response = instance.GetVoucherStatsById(voucherId, aggregateDataBy, dataPointLimit);
-            //Assert.IsInstanceOf<RestApiArrayResultVoucherDataPoint> (response, "response is RestApiArrayResultVoucherDataPoint");
-        }
-        
-        /// <summary>
-        /// Test GetVouchers
-        /// </summary>
-        [Test]
-        public void GetVouchersTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? pageIndex = null;
-            //int? pageSize = null;
-            //List<string> searchCodes = null;
-            //List<string> statusSearch = null;
-            //List<string> typeSearch = null;
-            //List<string> subTypeSearch = null;
-            //List<int?> storeIds = null;
-            //var response = instance.GetVouchers(appId, pageIndex, pageSize, searchCodes, statusSearch, typeSearch, subTypeSearch, storeIds);
-            //Assert.IsInstanceOf<RestApiPaginationResultVoucherSummary> (response, "response is RestApiPaginationResultVoucherSummary");
-        }
-        
-        /// <summary>
-        /// Test UpdateVoucher
-        /// </summary>
-        [Test]
-        public void UpdateVoucherTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //int? voucherId = null;
-            //VoucherBase voucher = null;
-            //List<int?> storeId = null;
-            //int? percentValue = null;
-            //double? lumpValue = null;
-            //int? freeItemId = null;
-            //var response = instance.UpdateVoucher(voucherId, voucher, storeId, percentValue, lumpValue, freeItemId);
-            //Assert.IsInstanceOf<RestApiResultVoucherWithStats> (response, "response is RestApiResultVoucherWithStats");
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/WebhooksApiTests.cs b/src/Flipdish.Test/Api/WebhooksApiTests.cs
deleted file mode 100644
index ddf76387..00000000
--- a/src/Flipdish.Test/Api/WebhooksApiTests.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebhooksApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class WebhooksApiTests
-    {
-        private WebhooksApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new WebhooksApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebhooksApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' WebhooksApi
-            //Assert.IsInstanceOfType(typeof(WebhooksApi), instance, "instance is a WebhooksApi");
-        }
-
-        
-        /// <summary>
-        /// Test CraeteWebhookSubscription
-        /// </summary>
-        [Test]
-        public void CraeteWebhookSubscriptionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //WebhookSubscription webhookSubscription = null;
-            //string appId = null;
-            //var response = instance.CraeteWebhookSubscription(oauthAppId, webhookSubscription, appId);
-            //Assert.IsInstanceOf<RestApiIntegerResult> (response, "response is RestApiIntegerResult");
-        }
-        
-        /// <summary>
-        /// Test CreateWebhookSubscriptionEventNames
-        /// </summary>
-        [Test]
-        public void CreateWebhookSubscriptionEventNamesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //int? webhookSubscriptionId = null;
-            //string eventName = null;
-            //string appId = null;
-            //instance.CreateWebhookSubscriptionEventNames(oauthAppId, webhookSubscriptionId, eventName, appId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteWebhookSubscription
-        /// </summary>
-        [Test]
-        public void DeleteWebhookSubscriptionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //int? webhookSubscriptionId = null;
-            //string appId = null;
-            //instance.DeleteWebhookSubscription(oauthAppId, webhookSubscriptionId, appId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteWebhookSubscriptionEventName
-        /// </summary>
-        [Test]
-        public void DeleteWebhookSubscriptionEventNameTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //int? webhookSubscriptionId = null;
-            //string eventName = null;
-            //string appId = null;
-            //instance.DeleteWebhookSubscriptionEventName(oauthAppId, webhookSubscriptionId, eventName, appId);
-            
-        }
-        
-        /// <summary>
-        /// Test GetWebhookEventNames
-        /// </summary>
-        [Test]
-        public void GetWebhookEventNamesTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetWebhookEventNames(appId);
-            //Assert.IsInstanceOf<RestApiStringArrayResult> (response, "response is RestApiStringArrayResult");
-        }
-        
-        /// <summary>
-        /// Test GetWebhookEventNamesBySubscriptionId
-        /// </summary>
-        [Test]
-        public void GetWebhookEventNamesBySubscriptionIdTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //int? webhookSubscriptionId = null;
-            //string appId = null;
-            //var response = instance.GetWebhookEventNamesBySubscriptionId(oauthAppId, webhookSubscriptionId, appId);
-            //Assert.IsInstanceOf<RestApiStringArrayResult> (response, "response is RestApiStringArrayResult");
-        }
-        
-        /// <summary>
-        /// Test GetWebhookLogs
-        /// </summary>
-        [Test]
-        public void GetWebhookLogsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //int? webhookSubscriptionId = null;
-            //DateTime? start = null;
-            //DateTime? end = null;
-            //string appId = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetWebhookLogs(oauthAppId, webhookSubscriptionId, start, end, appId, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultWebhookLog> (response, "response is RestApiPaginationResultWebhookLog");
-        }
-        
-        /// <summary>
-        /// Test GetWebhookSubscriptions
-        /// </summary>
-        [Test]
-        public void GetWebhookSubscriptionsTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //string appId = null;
-            //int? page = null;
-            //int? limit = null;
-            //var response = instance.GetWebhookSubscriptions(oauthAppId, appId, page, limit);
-            //Assert.IsInstanceOf<RestApiPaginationResultWebhookSubscription> (response, "response is RestApiPaginationResultWebhookSubscription");
-        }
-        
-        /// <summary>
-        /// Test UpdateWebhookSubscription
-        /// </summary>
-        [Test]
-        public void UpdateWebhookSubscriptionTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string oauthAppId = null;
-            //int? webhookSubscriptionId = null;
-            //WebhookSubscription webhookSubscription = null;
-            //string appId = null;
-            //instance.UpdateWebhookSubscription(oauthAppId, webhookSubscriptionId, webhookSubscription, appId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Api/WebsiteApiTests.cs b/src/Flipdish.Test/Api/WebsiteApiTests.cs
deleted file mode 100644
index 66272a36..00000000
--- a/src/Flipdish.Test/Api/WebsiteApiTests.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using RestSharp;
-using NUnit.Framework;
-
-using Flipdish.Client;
-using Flipdish.Api;
-using Flipdish.Model;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebsiteApi
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the API endpoint.
-    /// </remarks>
-    [TestFixture]
-    public class WebsiteApiTests
-    {
-        private WebsiteApi instance;
-
-        /// <summary>
-        /// Setup before each unit test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            instance = new WebsiteApi();
-        }
-
-        /// <summary>
-        /// Clean up after each unit test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebsiteApi
-        /// </summary>
-        [Test]
-        public void InstanceTest()
-        {
-            // TODO uncomment below to test 'IsInstanceOfType' WebsiteApi
-            //Assert.IsInstanceOfType(typeof(WebsiteApi), instance, "instance is a WebsiteApi");
-        }
-
-        
-        /// <summary>
-        /// Test AddTestimonial
-        /// </summary>
-        [Test]
-        public void AddTestimonialTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //WebsiteTestimonialBase testimonial = null;
-            //var response = instance.AddTestimonial(appId, testimonial);
-            //Assert.IsInstanceOf<RestApiResultWebsiteTestimonial> (response, "response is RestApiResultWebsiteTestimonial");
-        }
-        
-        /// <summary>
-        /// Test DeleteTestimonial
-        /// </summary>
-        [Test]
-        public void DeleteTestimonialTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? testimonialId = null;
-            //instance.DeleteTestimonial(appId, testimonialId);
-            
-        }
-        
-        /// <summary>
-        /// Test DeleteWebsiteImage
-        /// </summary>
-        [Test]
-        public void DeleteWebsiteImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? imageId = null;
-            //instance.DeleteWebsiteImage(appId, imageId);
-            
-        }
-        
-        /// <summary>
-        /// Test EditTestimonial
-        /// </summary>
-        [Test]
-        public void EditTestimonialTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //int? testimonialId = null;
-            //WebsiteTestimonialBase testimonial = null;
-            //var response = instance.EditTestimonial(appId, testimonialId, testimonial);
-            //Assert.IsInstanceOf<RestApiResultWebsiteTestimonial> (response, "response is RestApiResultWebsiteTestimonial");
-        }
-        
-        /// <summary>
-        /// Test GetIndexConfiguration
-        /// </summary>
-        [Test]
-        public void GetIndexConfigurationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //var response = instance.GetIndexConfiguration(appId);
-            //Assert.IsInstanceOf<RestApiResultIndexPage> (response, "response is RestApiResultIndexPage");
-        }
-        
-        /// <summary>
-        /// Test SetIndexConfiguration
-        /// </summary>
-        [Test]
-        public void SetIndexConfigurationTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //IndexPageBase indexPage = null;
-            //var response = instance.SetIndexConfiguration(appId, indexPage);
-            //Assert.IsInstanceOf<RestApiResultIndexPageBase> (response, "response is RestApiResultIndexPageBase");
-        }
-        
-        /// <summary>
-        /// Test UploadWebsiteImage
-        /// </summary>
-        [Test]
-        public void UploadWebsiteImageTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //string imageLocation = null;
-            //System.IO.Stream image = null;
-            //var response = instance.UploadWebsiteImage(appId, imageLocation, image);
-            //Assert.IsInstanceOf<RestApiResultWebsiteImage> (response, "response is RestApiResultWebsiteImage");
-        }
-        
-        /// <summary>
-        /// Test WebsiteCheckNow
-        /// </summary>
-        [Test]
-        public void WebsiteCheckNowTest()
-        {
-            // TODO uncomment below to test the method and replace null with proper value
-            //string appId = null;
-            //instance.WebsiteCheckNow(appId);
-            
-        }
-        
-    }
-
-}
diff --git a/src/Flipdish.Test/Flipdish.Test.csproj b/src/Flipdish.Test/Flipdish.Test.csproj
deleted file mode 100644
index 8d6e4ac7..00000000
--- a/src/Flipdish.Test/Flipdish.Test.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Flipdish Open API v1.0
-
-No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
-
-OpenAPI spec version: v1.0
-
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{19F1DEBC-DE5E-4517-8062-F000CD499087}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Flipdish.Test</RootNamespace>
-    <AssemblyName>Flipdish.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Newtonsoft.Json">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="JsonSubTypes">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs"
-             Exclude="obj\**"/>
-  </ItemGroup>
-  <ItemGroup>
-      <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-      <ProjectReference Include="..\Flipdish\Flipdish.csproj">
-          <Project>{4BF29234-5C39-4B57-9AB7-A80BB4210A51}</Project>
-          <Name>Flipdish</Name>
-      </ProjectReference>
-  </ItemGroup>
-</Project>
-
diff --git a/src/Flipdish.Test/Model/AcceptTests.cs b/src/Flipdish.Test/Model/AcceptTests.cs
deleted file mode 100644
index ace5c138..00000000
--- a/src/Flipdish.Test/Model/AcceptTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Accept
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AcceptTests
-    {
-        // TODO uncomment below to declare an instance variable for Accept
-        //private Accept instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Accept
-            //instance = new Accept();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Accept
-        /// </summary>
-        [Test]
-        public void AcceptInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Accept
-            //Assert.IsInstanceOfType<Accept> (instance, "variable 'instance' is a Accept");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EstimatedMinutesForDelivery'
-        /// </summary>
-        [Test]
-        public void EstimatedMinutesForDeliveryTest()
-        {
-            // TODO unit test for the property 'EstimatedMinutesForDelivery'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AccountDetailBaseTests.cs b/src/Flipdish.Test/Model/AccountDetailBaseTests.cs
deleted file mode 100644
index 75d91219..00000000
--- a/src/Flipdish.Test/Model/AccountDetailBaseTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AccountDetailBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AccountDetailBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for AccountDetailBase
-        //private AccountDetailBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AccountDetailBase
-            //instance = new AccountDetailBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AccountDetailBase
-        /// </summary>
-        [Test]
-        public void AccountDetailBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AccountDetailBase
-            //Assert.IsInstanceOfType<AccountDetailBase> (instance, "variable 'instance' is a AccountDetailBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Language'
-        /// </summary>
-        [Test]
-        public void LanguageTest()
-        {
-            // TODO unit test for the property 'Language'
-        }
-        /// <summary>
-        /// Test the property 'TimeZoneInfoId'
-        /// </summary>
-        [Test]
-        public void TimeZoneInfoIdTest()
-        {
-            // TODO unit test for the property 'TimeZoneInfoId'
-        }
-        /// <summary>
-        /// Test the property 'DisplayTimesInUserLocalTimeZone'
-        /// </summary>
-        [Test]
-        public void DisplayTimesInUserLocalTimeZoneTest()
-        {
-            // TODO unit test for the property 'DisplayTimesInUserLocalTimeZone'
-        }
-        /// <summary>
-        /// Test the property 'ShowHiddenFeatures'
-        /// </summary>
-        [Test]
-        public void ShowHiddenFeaturesTest()
-        {
-            // TODO unit test for the property 'ShowHiddenFeatures'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AccountDetailTests.cs b/src/Flipdish.Test/Model/AccountDetailTests.cs
deleted file mode 100644
index d95e052b..00000000
--- a/src/Flipdish.Test/Model/AccountDetailTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AccountDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AccountDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for AccountDetail
-        //private AccountDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AccountDetail
-            //instance = new AccountDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AccountDetail
-        /// </summary>
-        [Test]
-        public void AccountDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AccountDetail
-            //Assert.IsInstanceOfType<AccountDetail> (instance, "variable 'instance' is a AccountDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'SignupSteps'
-        /// </summary>
-        [Test]
-        public void SignupStepsTest()
-        {
-            // TODO unit test for the property 'SignupSteps'
-        }
-        /// <summary>
-        /// Test the property 'IsVerified'
-        /// </summary>
-        [Test]
-        public void IsVerifiedTest()
-        {
-            // TODO unit test for the property 'IsVerified'
-        }
-        /// <summary>
-        /// Test the property 'IsSelfServeUser'
-        /// </summary>
-        [Test]
-        public void IsSelfServeUserTest()
-        {
-            // TODO unit test for the property 'IsSelfServeUser'
-        }
-        /// <summary>
-        /// Test the property 'AccountId'
-        /// </summary>
-        [Test]
-        public void AccountIdTest()
-        {
-            // TODO unit test for the property 'AccountId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Language'
-        /// </summary>
-        [Test]
-        public void LanguageTest()
-        {
-            // TODO unit test for the property 'Language'
-        }
-        /// <summary>
-        /// Test the property 'TimeZoneInfoId'
-        /// </summary>
-        [Test]
-        public void TimeZoneInfoIdTest()
-        {
-            // TODO unit test for the property 'TimeZoneInfoId'
-        }
-        /// <summary>
-        /// Test the property 'DisplayTimesInUserLocalTimeZone'
-        /// </summary>
-        [Test]
-        public void DisplayTimesInUserLocalTimeZoneTest()
-        {
-            // TODO unit test for the property 'DisplayTimesInUserLocalTimeZone'
-        }
-        /// <summary>
-        /// Test the property 'ShowHiddenFeatures'
-        /// </summary>
-        [Test]
-        public void ShowHiddenFeaturesTest()
-        {
-            // TODO unit test for the property 'ShowHiddenFeatures'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AccountFieldDefinitionTests.cs b/src/Flipdish.Test/Model/AccountFieldDefinitionTests.cs
deleted file mode 100644
index cbf85bed..00000000
--- a/src/Flipdish.Test/Model/AccountFieldDefinitionTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AccountFieldDefinition
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AccountFieldDefinitionTests
-    {
-        // TODO uncomment below to declare an instance variable for AccountFieldDefinition
-        //private AccountFieldDefinition instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AccountFieldDefinition
-            //instance = new AccountFieldDefinition();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AccountFieldDefinition
-        /// </summary>
-        [Test]
-        public void AccountFieldDefinitionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AccountFieldDefinition
-            //Assert.IsInstanceOfType<AccountFieldDefinition> (instance, "variable 'instance' is a AccountFieldDefinition");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'DisplayName'
-        /// </summary>
-        [Test]
-        public void DisplayNameTest()
-        {
-            // TODO unit test for the property 'DisplayName'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'MinLength'
-        /// </summary>
-        [Test]
-        public void MinLengthTest()
-        {
-            // TODO unit test for the property 'MinLength'
-        }
-        /// <summary>
-        /// Test the property 'MaxLength'
-        /// </summary>
-        [Test]
-        public void MaxLengthTest()
-        {
-            // TODO unit test for the property 'MaxLength'
-        }
-        /// <summary>
-        /// Test the property 'DigitsOnly'
-        /// </summary>
-        [Test]
-        public void DigitsOnlyTest()
-        {
-            // TODO unit test for the property 'DigitsOnly'
-        }
-        /// <summary>
-        /// Test the property 'Regex'
-        /// </summary>
-        [Test]
-        public void RegexTest()
-        {
-            // TODO unit test for the property 'Regex'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AccountFieldKeyValuePairTests.cs b/src/Flipdish.Test/Model/AccountFieldKeyValuePairTests.cs
deleted file mode 100644
index 0ffc53b0..00000000
--- a/src/Flipdish.Test/Model/AccountFieldKeyValuePairTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AccountFieldKeyValuePair
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AccountFieldKeyValuePairTests
-    {
-        // TODO uncomment below to declare an instance variable for AccountFieldKeyValuePair
-        //private AccountFieldKeyValuePair instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AccountFieldKeyValuePair
-            //instance = new AccountFieldKeyValuePair();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AccountFieldKeyValuePair
-        /// </summary>
-        [Test]
-        public void AccountFieldKeyValuePairInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AccountFieldKeyValuePair
-            //Assert.IsInstanceOfType<AccountFieldKeyValuePair> (instance, "variable 'instance' is a AccountFieldKeyValuePair");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AccountFieldsDefinitionsTests.cs b/src/Flipdish.Test/Model/AccountFieldsDefinitionsTests.cs
deleted file mode 100644
index afd1e7c7..00000000
--- a/src/Flipdish.Test/Model/AccountFieldsDefinitionsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AccountFieldsDefinitions
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AccountFieldsDefinitionsTests
-    {
-        // TODO uncomment below to declare an instance variable for AccountFieldsDefinitions
-        //private AccountFieldsDefinitions instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AccountFieldsDefinitions
-            //instance = new AccountFieldsDefinitions();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AccountFieldsDefinitions
-        /// </summary>
-        [Test]
-        public void AccountFieldsDefinitionsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AccountFieldsDefinitions
-            //Assert.IsInstanceOfType<AccountFieldsDefinitions> (instance, "variable 'instance' is a AccountFieldsDefinitions");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DefinitionsPerCountry'
-        /// </summary>
-        [Test]
-        public void DefinitionsPerCountryTest()
-        {
-            // TODO unit test for the property 'DefinitionsPerCountry'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AddItemDetailsTests.cs b/src/Flipdish.Test/Model/AddItemDetailsTests.cs
deleted file mode 100644
index db354e8e..00000000
--- a/src/Flipdish.Test/Model/AddItemDetailsTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AddItemDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AddItemDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for AddItemDetails
-        //private AddItemDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AddItemDetails
-            //instance = new AddItemDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AddItemDetails
-        /// </summary>
-        [Test]
-        public void AddItemDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AddItemDetails
-            //Assert.IsInstanceOfType<AddItemDetails> (instance, "variable 'instance' is a AddItemDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PromotionalItemId'
-        /// </summary>
-        [Test]
-        public void PromotionalItemIdTest()
-        {
-            // TODO unit test for the property 'PromotionalItemId'
-        }
-        /// <summary>
-        /// Test the property 'PromotionalItemName'
-        /// </summary>
-        [Test]
-        public void PromotionalItemNameTest()
-        {
-            // TODO unit test for the property 'PromotionalItemName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AddressFormDisplayFormatTests.cs b/src/Flipdish.Test/Model/AddressFormDisplayFormatTests.cs
deleted file mode 100644
index e009bd5f..00000000
--- a/src/Flipdish.Test/Model/AddressFormDisplayFormatTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AddressFormDisplayFormat
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AddressFormDisplayFormatTests
-    {
-        // TODO uncomment below to declare an instance variable for AddressFormDisplayFormat
-        //private AddressFormDisplayFormat instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AddressFormDisplayFormat
-            //instance = new AddressFormDisplayFormat();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AddressFormDisplayFormat
-        /// </summary>
-        [Test]
-        public void AddressFormDisplayFormatInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AddressFormDisplayFormat
-            //Assert.IsInstanceOfType<AddressFormDisplayFormat> (instance, "variable 'instance' is a AddressFormDisplayFormat");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OneLine'
-        /// </summary>
-        [Test]
-        public void OneLineTest()
-        {
-            // TODO unit test for the property 'OneLine'
-        }
-        /// <summary>
-        /// Test the property 'TwoLines'
-        /// </summary>
-        [Test]
-        public void TwoLinesTest()
-        {
-            // TODO unit test for the property 'TwoLines'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AddressFormResponseTests.cs b/src/Flipdish.Test/Model/AddressFormResponseTests.cs
deleted file mode 100644
index 48406702..00000000
--- a/src/Flipdish.Test/Model/AddressFormResponseTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AddressFormResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AddressFormResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for AddressFormResponse
-        //private AddressFormResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AddressFormResponse
-            //instance = new AddressFormResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AddressFormResponse
-        /// </summary>
-        [Test]
-        public void AddressFormResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AddressFormResponse
-            //Assert.IsInstanceOfType<AddressFormResponse> (instance, "variable 'instance' is a AddressFormResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'FormData'
-        /// </summary>
-        [Test]
-        public void FormDataTest()
-        {
-            // TODO unit test for the property 'FormData'
-        }
-        /// <summary>
-        /// Test the property 'CountryCode'
-        /// </summary>
-        [Test]
-        public void CountryCodeTest()
-        {
-            // TODO unit test for the property 'CountryCode'
-        }
-        /// <summary>
-        /// Test the property 'Language'
-        /// </summary>
-        [Test]
-        public void LanguageTest()
-        {
-            // TODO unit test for the property 'Language'
-        }
-        /// <summary>
-        /// Test the property 'DisplayFormat'
-        /// </summary>
-        [Test]
-        public void DisplayFormatTest()
-        {
-            // TODO unit test for the property 'DisplayFormat'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AllMetadataResultTests.cs b/src/Flipdish.Test/Model/AllMetadataResultTests.cs
deleted file mode 100644
index eacef501..00000000
--- a/src/Flipdish.Test/Model/AllMetadataResultTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AllMetadataResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AllMetadataResultTests
-    {
-        // TODO uncomment below to declare an instance variable for AllMetadataResult
-        //private AllMetadataResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AllMetadataResult
-            //instance = new AllMetadataResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AllMetadataResult
-        /// </summary>
-        [Test]
-        public void AllMetadataResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AllMetadataResult
-            //Assert.IsInstanceOfType<AllMetadataResult> (instance, "variable 'instance' is a AllMetadataResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuItemMetadata'
-        /// </summary>
-        [Test]
-        public void MenuItemMetadataTest()
-        {
-            // TODO unit test for the property 'MenuItemMetadata'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItemMetadata'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemMetadataTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItemMetadata'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AnalyticsClientEventTests.cs b/src/Flipdish.Test/Model/AnalyticsClientEventTests.cs
deleted file mode 100644
index 8c55b8f9..00000000
--- a/src/Flipdish.Test/Model/AnalyticsClientEventTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AnalyticsClientEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AnalyticsClientEventTests
-    {
-        // TODO uncomment below to declare an instance variable for AnalyticsClientEvent
-        //private AnalyticsClientEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AnalyticsClientEvent
-            //instance = new AnalyticsClientEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AnalyticsClientEvent
-        /// </summary>
-        [Test]
-        public void AnalyticsClientEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AnalyticsClientEvent
-            //Assert.IsInstanceOfType<AnalyticsClientEvent> (instance, "variable 'instance' is a AnalyticsClientEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'EventType'
-        /// </summary>
-        [Test]
-        public void EventTypeTest()
-        {
-            // TODO unit test for the property 'EventType'
-        }
-        /// <summary>
-        /// Test the property 'AppType'
-        /// </summary>
-        [Test]
-        public void AppTypeTest()
-        {
-            // TODO unit test for the property 'AppType'
-        }
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-        /// <summary>
-        /// Test the property 'UserId'
-        /// </summary>
-        [Test]
-        public void UserIdTest()
-        {
-            // TODO unit test for the property 'UserId'
-        }
-        /// <summary>
-        /// Test the property 'Latitude'
-        /// </summary>
-        [Test]
-        public void LatitudeTest()
-        {
-            // TODO unit test for the property 'Latitude'
-        }
-        /// <summary>
-        /// Test the property 'Longitude'
-        /// </summary>
-        [Test]
-        public void LongitudeTest()
-        {
-            // TODO unit test for the property 'Longitude'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ApmCurrencyDataPointTests.cs b/src/Flipdish.Test/Model/ApmCurrencyDataPointTests.cs
deleted file mode 100644
index a3476ab2..00000000
--- a/src/Flipdish.Test/Model/ApmCurrencyDataPointTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ApmCurrencyDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ApmCurrencyDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for ApmCurrencyDataPoint
-        //private ApmCurrencyDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ApmCurrencyDataPoint
-            //instance = new ApmCurrencyDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ApmCurrencyDataPoint
-        /// </summary>
-        [Test]
-        public void ApmCurrencyDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ApmCurrencyDataPoint
-            //Assert.IsInstanceOfType<ApmCurrencyDataPoint> (instance, "variable 'instance' is a ApmCurrencyDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PeriodStart'
-        /// </summary>
-        [Test]
-        public void PeriodStartTest()
-        {
-            // TODO unit test for the property 'PeriodStart'
-        }
-        /// <summary>
-        /// Test the property 'PeriodLengthInDays'
-        /// </summary>
-        [Test]
-        public void PeriodLengthInDaysTest()
-        {
-            // TODO unit test for the property 'PeriodLengthInDays'
-        }
-        /// <summary>
-        /// Test the property 'CurrencyData'
-        /// </summary>
-        [Test]
-        public void CurrencyDataTest()
-        {
-            // TODO unit test for the property 'CurrencyData'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ApmDataPointTests.cs b/src/Flipdish.Test/Model/ApmDataPointTests.cs
deleted file mode 100644
index 4d167f5d..00000000
--- a/src/Flipdish.Test/Model/ApmDataPointTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ApmDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ApmDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for ApmDataPoint
-        //private ApmDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ApmDataPoint
-            //instance = new ApmDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ApmDataPoint
-        /// </summary>
-        [Test]
-        public void ApmDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ApmDataPoint
-            //Assert.IsInstanceOfType<ApmDataPoint> (instance, "variable 'instance' is a ApmDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PeriodStart'
-        /// </summary>
-        [Test]
-        public void PeriodStartTest()
-        {
-            // TODO unit test for the property 'PeriodStart'
-        }
-        /// <summary>
-        /// Test the property 'PeriodLengthInDays'
-        /// </summary>
-        [Test]
-        public void PeriodLengthInDaysTest()
-        {
-            // TODO unit test for the property 'PeriodLengthInDays'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ApmHourlyDataPointTests.cs b/src/Flipdish.Test/Model/ApmHourlyDataPointTests.cs
deleted file mode 100644
index acbd8147..00000000
--- a/src/Flipdish.Test/Model/ApmHourlyDataPointTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ApmHourlyDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ApmHourlyDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for ApmHourlyDataPoint
-        //private ApmHourlyDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ApmHourlyDataPoint
-            //instance = new ApmHourlyDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ApmHourlyDataPoint
-        /// </summary>
-        [Test]
-        public void ApmHourlyDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ApmHourlyDataPoint
-            //Assert.IsInstanceOfType<ApmHourlyDataPoint> (instance, "variable 'instance' is a ApmHourlyDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Day'
-        /// </summary>
-        [Test]
-        public void DayTest()
-        {
-            // TODO unit test for the property 'Day'
-        }
-        /// <summary>
-        /// Test the property 'Hour'
-        /// </summary>
-        [Test]
-        public void HourTest()
-        {
-            // TODO unit test for the property 'Hour'
-        }
-        /// <summary>
-        /// Test the property 'TotalValue'
-        /// </summary>
-        [Test]
-        public void TotalValueTest()
-        {
-            // TODO unit test for the property 'TotalValue'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ApmStatisticsTests.cs b/src/Flipdish.Test/Model/ApmStatisticsTests.cs
deleted file mode 100644
index 98164200..00000000
--- a/src/Flipdish.Test/Model/ApmStatisticsTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ApmStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ApmStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for ApmStatistics
-        //private ApmStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ApmStatistics
-            //instance = new ApmStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ApmStatistics
-        /// </summary>
-        [Test]
-        public void ApmStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ApmStatistics
-            //Assert.IsInstanceOfType<ApmStatistics> (instance, "variable 'instance' is a ApmStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EstimatedMinutesSaved'
-        /// </summary>
-        [Test]
-        public void EstimatedMinutesSavedTest()
-        {
-            // TODO unit test for the property 'EstimatedMinutesSaved'
-        }
-        /// <summary>
-        /// Test the property 'EstimatedMinutesCouldSaved'
-        /// </summary>
-        [Test]
-        public void EstimatedMinutesCouldSavedTest()
-        {
-            // TODO unit test for the property 'EstimatedMinutesCouldSaved'
-        }
-        /// <summary>
-        /// Test the property 'CurrencyData'
-        /// </summary>
-        [Test]
-        public void CurrencyDataTest()
-        {
-            // TODO unit test for the property 'CurrencyData'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ApmStatusTests.cs b/src/Flipdish.Test/Model/ApmStatusTests.cs
deleted file mode 100644
index ed02ab01..00000000
--- a/src/Flipdish.Test/Model/ApmStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ApmStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ApmStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for ApmStatus
-        //private ApmStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ApmStatus
-            //instance = new ApmStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ApmStatus
-        /// </summary>
-        [Test]
-        public void ApmStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ApmStatus
-            //Assert.IsInstanceOfType<ApmStatus> (instance, "variable 'instance' is a ApmStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'IsApmEnabled'
-        /// </summary>
-        [Test]
-        public void IsApmEnabledTest()
-        {
-            // TODO unit test for the property 'IsApmEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppChannelAssignmentTests.cs b/src/Flipdish.Test/Model/AppChannelAssignmentTests.cs
deleted file mode 100644
index c581a566..00000000
--- a/src/Flipdish.Test/Model/AppChannelAssignmentTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppChannelAssignment
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppChannelAssignmentTests
-    {
-        // TODO uncomment below to declare an instance variable for AppChannelAssignment
-        //private AppChannelAssignment instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppChannelAssignment
-            //instance = new AppChannelAssignment();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppChannelAssignment
-        /// </summary>
-        [Test]
-        public void AppChannelAssignmentInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppChannelAssignment
-            //Assert.IsInstanceOfType<AppChannelAssignment> (instance, "variable 'instance' is a AppChannelAssignment");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ChannelId'
-        /// </summary>
-        [Test]
-        public void ChannelIdTest()
-        {
-            // TODO unit test for the property 'ChannelId'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppComplianceTests.cs b/src/Flipdish.Test/Model/AppComplianceTests.cs
deleted file mode 100644
index 0f2d3b6b..00000000
--- a/src/Flipdish.Test/Model/AppComplianceTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppCompliance
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppComplianceTests
-    {
-        // TODO uncomment below to declare an instance variable for AppCompliance
-        //private AppCompliance instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppCompliance
-            //instance = new AppCompliance();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppCompliance
-        /// </summary>
-        [Test]
-        public void AppComplianceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppCompliance
-            //Assert.IsInstanceOfType<AppCompliance> (instance, "variable 'instance' is a AppCompliance");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'ComplianceType'
-        /// </summary>
-        [Test]
-        public void ComplianceTypeTest()
-        {
-            // TODO unit test for the property 'ComplianceType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppConfigSalesChannelTests.cs b/src/Flipdish.Test/Model/AppConfigSalesChannelTests.cs
deleted file mode 100644
index 803d32c7..00000000
--- a/src/Flipdish.Test/Model/AppConfigSalesChannelTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppConfigSalesChannel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppConfigSalesChannelTests
-    {
-        // TODO uncomment below to declare an instance variable for AppConfigSalesChannel
-        //private AppConfigSalesChannel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppConfigSalesChannel
-            //instance = new AppConfigSalesChannel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppConfigSalesChannel
-        /// </summary>
-        [Test]
-        public void AppConfigSalesChannelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppConfigSalesChannel
-            //Assert.IsInstanceOfType<AppConfigSalesChannel> (instance, "variable 'instance' is a AppConfigSalesChannel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EmailRequestMode'
-        /// </summary>
-        [Test]
-        public void EmailRequestModeTest()
-        {
-            // TODO unit test for the property 'EmailRequestMode'
-        }
-        /// <summary>
-        /// Test the property 'WebToAppRedirect'
-        /// </summary>
-        [Test]
-        public void WebToAppRedirectTest()
-        {
-            // TODO unit test for the property 'WebToAppRedirect'
-        }
-        /// <summary>
-        /// Test the property 'DisplayDeliveryRestaurantListScreen'
-        /// </summary>
-        [Test]
-        public void DisplayDeliveryRestaurantListScreenTest()
-        {
-            // TODO unit test for the property 'DisplayDeliveryRestaurantListScreen'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppConfigUpdateModelTests.cs b/src/Flipdish.Test/Model/AppConfigUpdateModelTests.cs
deleted file mode 100644
index ad3df96d..00000000
--- a/src/Flipdish.Test/Model/AppConfigUpdateModelTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppConfigUpdateModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppConfigUpdateModelTests
-    {
-        // TODO uncomment below to declare an instance variable for AppConfigUpdateModel
-        //private AppConfigUpdateModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppConfigUpdateModel
-            //instance = new AppConfigUpdateModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppConfigUpdateModel
-        /// </summary>
-        [Test]
-        public void AppConfigUpdateModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppConfigUpdateModel
-            //Assert.IsInstanceOfType<AppConfigUpdateModel> (instance, "variable 'instance' is a AppConfigUpdateModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'HostName'
-        /// </summary>
-        [Test]
-        public void HostNameTest()
-        {
-            // TODO unit test for the property 'HostName'
-        }
-        /// <summary>
-        /// Test the property 'MainColor'
-        /// </summary>
-        [Test]
-        public void MainColorTest()
-        {
-            // TODO unit test for the property 'MainColor'
-        }
-        /// <summary>
-        /// Test the property 'ApplicationCategory'
-        /// </summary>
-        [Test]
-        public void ApplicationCategoryTest()
-        {
-            // TODO unit test for the property 'ApplicationCategory'
-        }
-        /// <summary>
-        /// Test the property 'IsPanaceaEnabled'
-        /// </summary>
-        [Test]
-        public void IsPanaceaEnabledTest()
-        {
-            // TODO unit test for the property 'IsPanaceaEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CookieConsentPromptEnabled'
-        /// </summary>
-        [Test]
-        public void CookieConsentPromptEnabledTest()
-        {
-            // TODO unit test for the property 'CookieConsentPromptEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppConfigurationBaseTests.cs b/src/Flipdish.Test/Model/AppConfigurationBaseTests.cs
deleted file mode 100644
index 5576ebd0..00000000
--- a/src/Flipdish.Test/Model/AppConfigurationBaseTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppConfigurationBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppConfigurationBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for AppConfigurationBase
-        //private AppConfigurationBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppConfigurationBase
-            //instance = new AppConfigurationBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppConfigurationBase
-        /// </summary>
-        [Test]
-        public void AppConfigurationBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppConfigurationBase
-            //Assert.IsInstanceOfType<AppConfigurationBase> (instance, "variable 'instance' is a AppConfigurationBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-        /// <summary>
-        /// Test the property 'Settings'
-        /// </summary>
-        [Test]
-        public void SettingsTest()
-        {
-            // TODO unit test for the property 'Settings'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppConfigurationDetailTests.cs b/src/Flipdish.Test/Model/AppConfigurationDetailTests.cs
deleted file mode 100644
index ee2fc595..00000000
--- a/src/Flipdish.Test/Model/AppConfigurationDetailTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppConfigurationDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppConfigurationDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for AppConfigurationDetail
-        //private AppConfigurationDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppConfigurationDetail
-            //instance = new AppConfigurationDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppConfigurationDetail
-        /// </summary>
-        [Test]
-        public void AppConfigurationDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppConfigurationDetail
-            //Assert.IsInstanceOfType<AppConfigurationDetail> (instance, "variable 'instance' is a AppConfigurationDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-        /// <summary>
-        /// Test the property 'Settings'
-        /// </summary>
-        [Test]
-        public void SettingsTest()
-        {
-            // TODO unit test for the property 'Settings'
-        }
-        /// <summary>
-        /// Test the property 'ConfigurationType'
-        /// </summary>
-        [Test]
-        public void ConfigurationTypeTest()
-        {
-            // TODO unit test for the property 'ConfigurationType'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'FieldGroups'
-        /// </summary>
-        [Test]
-        public void FieldGroupsTest()
-        {
-            // TODO unit test for the property 'FieldGroups'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsVerified'
-        /// </summary>
-        [Test]
-        public void IsVerifiedTest()
-        {
-            // TODO unit test for the property 'IsVerified'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppConfigurationHeaderTests.cs b/src/Flipdish.Test/Model/AppConfigurationHeaderTests.cs
deleted file mode 100644
index ddb71079..00000000
--- a/src/Flipdish.Test/Model/AppConfigurationHeaderTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppConfigurationHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppConfigurationHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for AppConfigurationHeader
-        //private AppConfigurationHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppConfigurationHeader
-            //instance = new AppConfigurationHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppConfigurationHeader
-        /// </summary>
-        [Test]
-        public void AppConfigurationHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppConfigurationHeader
-            //Assert.IsInstanceOfType<AppConfigurationHeader> (instance, "variable 'instance' is a AppConfigurationHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Logo'
-        /// </summary>
-        [Test]
-        public void LogoTest()
-        {
-            // TODO unit test for the property 'Logo'
-        }
-        /// <summary>
-        /// Test the property 'DeveloperName'
-        /// </summary>
-        [Test]
-        public void DeveloperNameTest()
-        {
-            // TODO unit test for the property 'DeveloperName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppConfigurationSettingTests.cs b/src/Flipdish.Test/Model/AppConfigurationSettingTests.cs
deleted file mode 100644
index aeb2c6bd..00000000
--- a/src/Flipdish.Test/Model/AppConfigurationSettingTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppConfigurationSetting
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppConfigurationSettingTests
-    {
-        // TODO uncomment below to declare an instance variable for AppConfigurationSetting
-        //private AppConfigurationSetting instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppConfigurationSetting
-            //instance = new AppConfigurationSetting();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppConfigurationSetting
-        /// </summary>
-        [Test]
-        public void AppConfigurationSettingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppConfigurationSetting
-            //Assert.IsInstanceOfType<AppConfigurationSetting> (instance, "variable 'instance' is a AppConfigurationSetting");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppConfigurationSummaryTests.cs b/src/Flipdish.Test/Model/AppConfigurationSummaryTests.cs
deleted file mode 100644
index 3d3587a1..00000000
--- a/src/Flipdish.Test/Model/AppConfigurationSummaryTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppConfigurationSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppConfigurationSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for AppConfigurationSummary
-        //private AppConfigurationSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppConfigurationSummary
-            //instance = new AppConfigurationSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppConfigurationSummary
-        /// </summary>
-        [Test]
-        public void AppConfigurationSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppConfigurationSummary
-            //Assert.IsInstanceOfType<AppConfigurationSummary> (instance, "variable 'instance' is a AppConfigurationSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppConfigurationTests.cs b/src/Flipdish.Test/Model/AppConfigurationTests.cs
deleted file mode 100644
index a229c8dd..00000000
--- a/src/Flipdish.Test/Model/AppConfigurationTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for AppConfiguration
-        //private AppConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppConfiguration
-            //instance = new AppConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppConfiguration
-        /// </summary>
-        [Test]
-        public void AppConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppConfiguration
-            //Assert.IsInstanceOfType<AppConfiguration> (instance, "variable 'instance' is a AppConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'Settings'
-        /// </summary>
-        [Test]
-        public void SettingsTest()
-        {
-            // TODO unit test for the property 'Settings'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppCreatedEventTests.cs b/src/Flipdish.Test/Model/AppCreatedEventTests.cs
deleted file mode 100644
index ca021ffc..00000000
--- a/src/Flipdish.Test/Model/AppCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for AppCreatedEvent
-        //private AppCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppCreatedEvent
-            //instance = new AppCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppCreatedEvent
-        /// </summary>
-        [Test]
-        public void AppCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppCreatedEvent
-            //Assert.IsInstanceOfType<AppCreatedEvent> (instance, "variable 'instance' is a AppCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'AppName'
-        /// </summary>
-        [Test]
-        public void AppNameTest()
-        {
-            // TODO unit test for the property 'AppName'
-        }
-        /// <summary>
-        /// Test the property 'CountryId'
-        /// </summary>
-        [Test]
-        public void CountryIdTest()
-        {
-            // TODO unit test for the property 'CountryId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppDetailBaseTests.cs b/src/Flipdish.Test/Model/AppDetailBaseTests.cs
deleted file mode 100644
index d4db10c3..00000000
--- a/src/Flipdish.Test/Model/AppDetailBaseTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppDetailBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppDetailBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for AppDetailBase
-        //private AppDetailBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppDetailBase
-            //instance = new AppDetailBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppDetailBase
-        /// </summary>
-        [Test]
-        public void AppDetailBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppDetailBase
-            //Assert.IsInstanceOfType<AppDetailBase> (instance, "variable 'instance' is a AppDetailBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ConfigurationType'
-        /// </summary>
-        [Test]
-        public void ConfigurationTypeTest()
-        {
-            // TODO unit test for the property 'ConfigurationType'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'FieldGroups'
-        /// </summary>
-        [Test]
-        public void FieldGroupsTest()
-        {
-            // TODO unit test for the property 'FieldGroups'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsVerified'
-        /// </summary>
-        [Test]
-        public void IsVerifiedTest()
-        {
-            // TODO unit test for the property 'IsVerified'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppDetailTests.cs b/src/Flipdish.Test/Model/AppDetailTests.cs
deleted file mode 100644
index 6b6e7e3c..00000000
--- a/src/Flipdish.Test/Model/AppDetailTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for AppDetail
-        //private AppDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppDetail
-            //instance = new AppDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppDetail
-        /// </summary>
-        [Test]
-        public void AppDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppDetail
-            //Assert.IsInstanceOfType<AppDetail> (instance, "variable 'instance' is a AppDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'ConfigurationType'
-        /// </summary>
-        [Test]
-        public void ConfigurationTypeTest()
-        {
-            // TODO unit test for the property 'ConfigurationType'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'FieldGroups'
-        /// </summary>
-        [Test]
-        public void FieldGroupsTest()
-        {
-            // TODO unit test for the property 'FieldGroups'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsVerified'
-        /// </summary>
-        [Test]
-        public void IsVerifiedTest()
-        {
-            // TODO unit test for the property 'IsVerified'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreAppConfigurationHeaderTests.cs b/src/Flipdish.Test/Model/AppStoreAppConfigurationHeaderTests.cs
deleted file mode 100644
index d837d846..00000000
--- a/src/Flipdish.Test/Model/AppStoreAppConfigurationHeaderTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreAppConfigurationHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreAppConfigurationHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreAppConfigurationHeader
-        //private AppStoreAppConfigurationHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreAppConfigurationHeader
-            //instance = new AppStoreAppConfigurationHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreAppConfigurationHeader
-        /// </summary>
-        [Test]
-        public void AppStoreAppConfigurationHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreAppConfigurationHeader
-            //Assert.IsInstanceOfType<AppStoreAppConfigurationHeader> (instance, "variable 'instance' is a AppStoreAppConfigurationHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Logo'
-        /// </summary>
-        [Test]
-        public void LogoTest()
-        {
-            // TODO unit test for the property 'Logo'
-        }
-        /// <summary>
-        /// Test the property 'DeveloperName'
-        /// </summary>
-        [Test]
-        public void DeveloperNameTest()
-        {
-            // TODO unit test for the property 'DeveloperName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreAppConfigurationSummaryTests.cs b/src/Flipdish.Test/Model/AppStoreAppConfigurationSummaryTests.cs
deleted file mode 100644
index ec32a982..00000000
--- a/src/Flipdish.Test/Model/AppStoreAppConfigurationSummaryTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreAppConfigurationSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreAppConfigurationSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreAppConfigurationSummary
-        //private AppStoreAppConfigurationSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreAppConfigurationSummary
-            //instance = new AppStoreAppConfigurationSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreAppConfigurationSummary
-        /// </summary>
-        [Test]
-        public void AppStoreAppConfigurationSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreAppConfigurationSummary
-            //Assert.IsInstanceOfType<AppStoreAppConfigurationSummary> (instance, "variable 'instance' is a AppStoreAppConfigurationSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-        /// <summary>
-        /// Test the property 'ConfigurationType'
-        /// </summary>
-        [Test]
-        public void ConfigurationTypeTest()
-        {
-            // TODO unit test for the property 'ConfigurationType'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Logo'
-        /// </summary>
-        [Test]
-        public void LogoTest()
-        {
-            // TODO unit test for the property 'Logo'
-        }
-        /// <summary>
-        /// Test the property 'DeveloperName'
-        /// </summary>
-        [Test]
-        public void DeveloperNameTest()
-        {
-            // TODO unit test for the property 'DeveloperName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreAppConfigurationTests.cs b/src/Flipdish.Test/Model/AppStoreAppConfigurationTests.cs
deleted file mode 100644
index 1a4e116f..00000000
--- a/src/Flipdish.Test/Model/AppStoreAppConfigurationTests.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreAppConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreAppConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreAppConfiguration
-        //private AppStoreAppConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreAppConfiguration
-            //instance = new AppStoreAppConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreAppConfiguration
-        /// </summary>
-        [Test]
-        public void AppStoreAppConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreAppConfiguration
-            //Assert.IsInstanceOfType<AppStoreAppConfiguration> (instance, "variable 'instance' is a AppStoreAppConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-        /// <summary>
-        /// Test the property 'Settings'
-        /// </summary>
-        [Test]
-        public void SettingsTest()
-        {
-            // TODO unit test for the property 'Settings'
-        }
-        /// <summary>
-        /// Test the property 'VerificationStatus'
-        /// </summary>
-        [Test]
-        public void VerificationStatusTest()
-        {
-            // TODO unit test for the property 'VerificationStatus'
-        }
-        /// <summary>
-        /// Test the property 'Logo'
-        /// </summary>
-        [Test]
-        public void LogoTest()
-        {
-            // TODO unit test for the property 'Logo'
-        }
-        /// <summary>
-        /// Test the property 'ConfigurationType'
-        /// </summary>
-        [Test]
-        public void ConfigurationTypeTest()
-        {
-            // TODO unit test for the property 'ConfigurationType'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'FieldGroups'
-        /// </summary>
-        [Test]
-        public void FieldGroupsTest()
-        {
-            // TODO unit test for the property 'FieldGroups'
-        }
-        /// <summary>
-        /// Test the property 'SetupInstructions'
-        /// </summary>
-        [Test]
-        public void SetupInstructionsTest()
-        {
-            // TODO unit test for the property 'SetupInstructions'
-        }
-        /// <summary>
-        /// Test the property 'ExternalSetupLink'
-        /// </summary>
-        [Test]
-        public void ExternalSetupLinkTest()
-        {
-            // TODO unit test for the property 'ExternalSetupLink'
-        }
-        /// <summary>
-        /// Test the property 'OAuthAppId'
-        /// </summary>
-        [Test]
-        public void OAuthAppIdTest()
-        {
-            // TODO unit test for the property 'OAuthAppId'
-        }
-        /// <summary>
-        /// Test the property 'TeammateAppAccessLevel'
-        /// </summary>
-        [Test]
-        public void TeammateAppAccessLevelTest()
-        {
-            // TODO unit test for the property 'TeammateAppAccessLevel'
-        }
-        /// <summary>
-        /// Test the property 'PermissionsType'
-        /// </summary>
-        [Test]
-        public void PermissionsTypeTest()
-        {
-            // TODO unit test for the property 'PermissionsType'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-        /// <summary>
-        /// Test the property 'DeveloperName'
-        /// </summary>
-        [Test]
-        public void DeveloperNameTest()
-        {
-            // TODO unit test for the property 'DeveloperName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreAppSummaryTests.cs b/src/Flipdish.Test/Model/AppStoreAppSummaryTests.cs
deleted file mode 100644
index 34ab0ef2..00000000
--- a/src/Flipdish.Test/Model/AppStoreAppSummaryTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreAppSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreAppSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreAppSummary
-        //private AppStoreAppSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreAppSummary
-            //instance = new AppStoreAppSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreAppSummary
-        /// </summary>
-        [Test]
-        public void AppStoreAppSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreAppSummary
-            //Assert.IsInstanceOfType<AppStoreAppSummary> (instance, "variable 'instance' is a AppStoreAppSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'VerificationStatus'
-        /// </summary>
-        [Test]
-        public void VerificationStatusTest()
-        {
-            // TODO unit test for the property 'VerificationStatus'
-        }
-        /// <summary>
-        /// Test the property 'Logo'
-        /// </summary>
-        [Test]
-        public void LogoTest()
-        {
-            // TODO unit test for the property 'Logo'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-        /// <summary>
-        /// Test the property 'DeveloperName'
-        /// </summary>
-        [Test]
-        public void DeveloperNameTest()
-        {
-            // TODO unit test for the property 'DeveloperName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreAppSupportInfoTests.cs b/src/Flipdish.Test/Model/AppStoreAppSupportInfoTests.cs
deleted file mode 100644
index 14b69ab0..00000000
--- a/src/Flipdish.Test/Model/AppStoreAppSupportInfoTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreAppSupportInfo
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreAppSupportInfoTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreAppSupportInfo
-        //private AppStoreAppSupportInfo instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreAppSupportInfo
-            //instance = new AppStoreAppSupportInfo();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreAppSupportInfo
-        /// </summary>
-        [Test]
-        public void AppStoreAppSupportInfoInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreAppSupportInfo
-            //Assert.IsInstanceOfType<AppStoreAppSupportInfo> (instance, "variable 'instance' is a AppStoreAppSupportInfo");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PrivacyPolicy'
-        /// </summary>
-        [Test]
-        public void PrivacyPolicyTest()
-        {
-            // TODO unit test for the property 'PrivacyPolicy'
-        }
-        /// <summary>
-        /// Test the property 'TermsOfUse'
-        /// </summary>
-        [Test]
-        public void TermsOfUseTest()
-        {
-            // TODO unit test for the property 'TermsOfUse'
-        }
-        /// <summary>
-        /// Test the property 'CompanyWebsite'
-        /// </summary>
-        [Test]
-        public void CompanyWebsiteTest()
-        {
-            // TODO unit test for the property 'CompanyWebsite'
-        }
-        /// <summary>
-        /// Test the property 'LearnMore'
-        /// </summary>
-        [Test]
-        public void LearnMoreTest()
-        {
-            // TODO unit test for the property 'LearnMore'
-        }
-        /// <summary>
-        /// Test the property 'InstallationMessage'
-        /// </summary>
-        [Test]
-        public void InstallationMessageTest()
-        {
-            // TODO unit test for the property 'InstallationMessage'
-        }
-        /// <summary>
-        /// Test the property 'SupportEmail'
-        /// </summary>
-        [Test]
-        public void SupportEmailTest()
-        {
-            // TODO unit test for the property 'SupportEmail'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreAppTests.cs b/src/Flipdish.Test/Model/AppStoreAppTests.cs
deleted file mode 100644
index 9e1b1124..00000000
--- a/src/Flipdish.Test/Model/AppStoreAppTests.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreAppTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreApp
-        //private AppStoreApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreApp
-            //instance = new AppStoreApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreApp
-        /// </summary>
-        [Test]
-        public void AppStoreAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreApp
-            //Assert.IsInstanceOfType<AppStoreApp> (instance, "variable 'instance' is a AppStoreApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'VerificationStatus'
-        /// </summary>
-        [Test]
-        public void VerificationStatusTest()
-        {
-            // TODO unit test for the property 'VerificationStatus'
-        }
-        /// <summary>
-        /// Test the property 'Logo'
-        /// </summary>
-        [Test]
-        public void LogoTest()
-        {
-            // TODO unit test for the property 'Logo'
-        }
-        /// <summary>
-        /// Test the property 'ConfigurationType'
-        /// </summary>
-        [Test]
-        public void ConfigurationTypeTest()
-        {
-            // TODO unit test for the property 'ConfigurationType'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'FieldGroups'
-        /// </summary>
-        [Test]
-        public void FieldGroupsTest()
-        {
-            // TODO unit test for the property 'FieldGroups'
-        }
-        /// <summary>
-        /// Test the property 'SetupInstructions'
-        /// </summary>
-        [Test]
-        public void SetupInstructionsTest()
-        {
-            // TODO unit test for the property 'SetupInstructions'
-        }
-        /// <summary>
-        /// Test the property 'ExternalSetupLink'
-        /// </summary>
-        [Test]
-        public void ExternalSetupLinkTest()
-        {
-            // TODO unit test for the property 'ExternalSetupLink'
-        }
-        /// <summary>
-        /// Test the property 'OAuthAppId'
-        /// </summary>
-        [Test]
-        public void OAuthAppIdTest()
-        {
-            // TODO unit test for the property 'OAuthAppId'
-        }
-        /// <summary>
-        /// Test the property 'TeammateAppAccessLevel'
-        /// </summary>
-        [Test]
-        public void TeammateAppAccessLevelTest()
-        {
-            // TODO unit test for the property 'TeammateAppAccessLevel'
-        }
-        /// <summary>
-        /// Test the property 'PermissionsType'
-        /// </summary>
-        [Test]
-        public void PermissionsTypeTest()
-        {
-            // TODO unit test for the property 'PermissionsType'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-        /// <summary>
-        /// Test the property 'DeveloperName'
-        /// </summary>
-        [Test]
-        public void DeveloperNameTest()
-        {
-            // TODO unit test for the property 'DeveloperName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreConfigCreatedEventTests.cs b/src/Flipdish.Test/Model/AppStoreConfigCreatedEventTests.cs
deleted file mode 100644
index fc3ee11c..00000000
--- a/src/Flipdish.Test/Model/AppStoreConfigCreatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreConfigCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreConfigCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreConfigCreatedEvent
-        //private AppStoreConfigCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreConfigCreatedEvent
-            //instance = new AppStoreConfigCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreConfigCreatedEvent
-        /// </summary>
-        [Test]
-        public void AppStoreConfigCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreConfigCreatedEvent
-            //Assert.IsInstanceOfType<AppStoreConfigCreatedEvent> (instance, "variable 'instance' is a AppStoreConfigCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppConfigurationId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppConfigurationIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppConfigurationId'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreConfigDeletedEventTests.cs b/src/Flipdish.Test/Model/AppStoreConfigDeletedEventTests.cs
deleted file mode 100644
index d9295574..00000000
--- a/src/Flipdish.Test/Model/AppStoreConfigDeletedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreConfigDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreConfigDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreConfigDeletedEvent
-        //private AppStoreConfigDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreConfigDeletedEvent
-            //instance = new AppStoreConfigDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreConfigDeletedEvent
-        /// </summary>
-        [Test]
-        public void AppStoreConfigDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreConfigDeletedEvent
-            //Assert.IsInstanceOfType<AppStoreConfigDeletedEvent> (instance, "variable 'instance' is a AppStoreConfigDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppConfigurationId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppConfigurationIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppConfigurationId'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppStoreConfigUpdatedEventTests.cs b/src/Flipdish.Test/Model/AppStoreConfigUpdatedEventTests.cs
deleted file mode 100644
index ac585b88..00000000
--- a/src/Flipdish.Test/Model/AppStoreConfigUpdatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppStoreConfigUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppStoreConfigUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for AppStoreConfigUpdatedEvent
-        //private AppStoreConfigUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppStoreConfigUpdatedEvent
-            //instance = new AppStoreConfigUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppStoreConfigUpdatedEvent
-        /// </summary>
-        [Test]
-        public void AppStoreConfigUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppStoreConfigUpdatedEvent
-            //Assert.IsInstanceOfType<AppStoreConfigUpdatedEvent> (instance, "variable 'instance' is a AppStoreConfigUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppConfiguration'
-        /// </summary>
-        [Test]
-        public void AppStoreAppConfigurationTest()
-        {
-            // TODO unit test for the property 'AppStoreAppConfiguration'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppSummaryTests.cs b/src/Flipdish.Test/Model/AppSummaryTests.cs
deleted file mode 100644
index b8414fe7..00000000
--- a/src/Flipdish.Test/Model/AppSummaryTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for AppSummary
-        //private AppSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppSummary
-            //instance = new AppSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppSummary
-        /// </summary>
-        [Test]
-        public void AppSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppSummary
-            //Assert.IsInstanceOfType<AppSummary> (instance, "variable 'instance' is a AppSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsVerified'
-        /// </summary>
-        [Test]
-        public void IsVerifiedTest()
-        {
-            // TODO unit test for the property 'IsVerified'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppTests.cs b/src/Flipdish.Test/Model/AppTests.cs
deleted file mode 100644
index 7e9ee3b4..00000000
--- a/src/Flipdish.Test/Model/AppTests.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing App
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppTests
-    {
-        // TODO uncomment below to declare an instance variable for App
-        //private App instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of App
-            //instance = new App();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of App
-        /// </summary>
-        [Test]
-        public void AppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" App
-            //Assert.IsInstanceOfType<App> (instance, "variable 'instance' is a App");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'HasIosApp'
-        /// </summary>
-        [Test]
-        public void HasIosAppTest()
-        {
-            // TODO unit test for the property 'HasIosApp'
-        }
-        /// <summary>
-        /// Test the property 'HasAndroidApp'
-        /// </summary>
-        [Test]
-        public void HasAndroidAppTest()
-        {
-            // TODO unit test for the property 'HasAndroidApp'
-        }
-        /// <summary>
-        /// Test the property 'CountryId'
-        /// </summary>
-        [Test]
-        public void CountryIdTest()
-        {
-            // TODO unit test for the property 'CountryId'
-        }
-        /// <summary>
-        /// Test the property 'LogoImageUrl'
-        /// </summary>
-        [Test]
-        public void LogoImageUrlTest()
-        {
-            // TODO unit test for the property 'LogoImageUrl'
-        }
-        /// <summary>
-        /// Test the property 'Languages'
-        /// </summary>
-        [Test]
-        public void LanguagesTest()
-        {
-            // TODO unit test for the property 'Languages'
-        }
-        /// <summary>
-        /// Test the property 'AvailableAppLanguages'
-        /// </summary>
-        [Test]
-        public void AvailableAppLanguagesTest()
-        {
-            // TODO unit test for the property 'AvailableAppLanguages'
-        }
-        /// <summary>
-        /// Test the property 'AppAccessLevel'
-        /// </summary>
-        [Test]
-        public void AppAccessLevelTest()
-        {
-            // TODO unit test for the property 'AppAccessLevel'
-        }
-        /// <summary>
-        /// Test the property 'AppResourceSet'
-        /// </summary>
-        [Test]
-        public void AppResourceSetTest()
-        {
-            // TODO unit test for the property 'AppResourceSet'
-        }
-        /// <summary>
-        /// Test the property 'Features'
-        /// </summary>
-        [Test]
-        public void FeaturesTest()
-        {
-            // TODO unit test for the property 'Features'
-        }
-        /// <summary>
-        /// Test the property 'MapCenter'
-        /// </summary>
-        [Test]
-        public void MapCenterTest()
-        {
-            // TODO unit test for the property 'MapCenter'
-        }
-        /// <summary>
-        /// Test the property 'MapNorthEast'
-        /// </summary>
-        [Test]
-        public void MapNorthEastTest()
-        {
-            // TODO unit test for the property 'MapNorthEast'
-        }
-        /// <summary>
-        /// Test the property 'MapSouthWest'
-        /// </summary>
-        [Test]
-        public void MapSouthWestTest()
-        {
-            // TODO unit test for the property 'MapSouthWest'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'HostName'
-        /// </summary>
-        [Test]
-        public void HostNameTest()
-        {
-            // TODO unit test for the property 'HostName'
-        }
-        /// <summary>
-        /// Test the property 'MainColor'
-        /// </summary>
-        [Test]
-        public void MainColorTest()
-        {
-            // TODO unit test for the property 'MainColor'
-        }
-        /// <summary>
-        /// Test the property 'ApplicationCategory'
-        /// </summary>
-        [Test]
-        public void ApplicationCategoryTest()
-        {
-            // TODO unit test for the property 'ApplicationCategory'
-        }
-        /// <summary>
-        /// Test the property 'IsPanaceaEnabled'
-        /// </summary>
-        [Test]
-        public void IsPanaceaEnabledTest()
-        {
-            // TODO unit test for the property 'IsPanaceaEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CookieConsentPromptEnabled'
-        /// </summary>
-        [Test]
-        public void CookieConsentPromptEnabledTest()
-        {
-            // TODO unit test for the property 'CookieConsentPromptEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AppUpdatedEventTests.cs b/src/Flipdish.Test/Model/AppUpdatedEventTests.cs
deleted file mode 100644
index 057ca54b..00000000
--- a/src/Flipdish.Test/Model/AppUpdatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AppUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AppUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for AppUpdatedEvent
-        //private AppUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AppUpdatedEvent
-            //instance = new AppUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AppUpdatedEvent
-        /// </summary>
-        [Test]
-        public void AppUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AppUpdatedEvent
-            //Assert.IsInstanceOfType<AppUpdatedEvent> (instance, "variable 'instance' is a AppUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Changes'
-        /// </summary>
-        [Test]
-        public void ChangesTest()
-        {
-            // TODO unit test for the property 'Changes'
-        }
-        /// <summary>
-        /// Test the property 'AppName'
-        /// </summary>
-        [Test]
-        public void AppNameTest()
-        {
-            // TODO unit test for the property 'AppName'
-        }
-        /// <summary>
-        /// Test the property 'CountryId'
-        /// </summary>
-        [Test]
-        public void CountryIdTest()
-        {
-            // TODO unit test for the property 'CountryId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AssignedBankAccountTests.cs b/src/Flipdish.Test/Model/AssignedBankAccountTests.cs
deleted file mode 100644
index 36dde9b2..00000000
--- a/src/Flipdish.Test/Model/AssignedBankAccountTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AssignedBankAccount
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AssignedBankAccountTests
-    {
-        // TODO uncomment below to declare an instance variable for AssignedBankAccount
-        //private AssignedBankAccount instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AssignedBankAccount
-            //instance = new AssignedBankAccount();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AssignedBankAccount
-        /// </summary>
-        [Test]
-        public void AssignedBankAccountInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AssignedBankAccount
-            //Assert.IsInstanceOfType<AssignedBankAccount> (instance, "variable 'instance' is a AssignedBankAccount");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'BankAccountName'
-        /// </summary>
-        [Test]
-        public void BankAccountNameTest()
-        {
-            // TODO unit test for the property 'BankAccountName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/AuditLogFieldChangeInformationTests.cs b/src/Flipdish.Test/Model/AuditLogFieldChangeInformationTests.cs
deleted file mode 100644
index a1031558..00000000
--- a/src/Flipdish.Test/Model/AuditLogFieldChangeInformationTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing AuditLogFieldChangeInformation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class AuditLogFieldChangeInformationTests
-    {
-        // TODO uncomment below to declare an instance variable for AuditLogFieldChangeInformation
-        //private AuditLogFieldChangeInformation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of AuditLogFieldChangeInformation
-            //instance = new AuditLogFieldChangeInformation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of AuditLogFieldChangeInformation
-        /// </summary>
-        [Test]
-        public void AuditLogFieldChangeInformationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" AuditLogFieldChangeInformation
-            //Assert.IsInstanceOfType<AuditLogFieldChangeInformation> (instance, "variable 'instance' is a AuditLogFieldChangeInformation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Path'
-        /// </summary>
-        [Test]
-        public void PathTest()
-        {
-            // TODO unit test for the property 'Path'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'OldValue'
-        /// </summary>
-        [Test]
-        public void OldValueTest()
-        {
-            // TODO unit test for the property 'OldValue'
-        }
-        /// <summary>
-        /// Test the property 'NewValue'
-        /// </summary>
-        [Test]
-        public void NewValueTest()
-        {
-            // TODO unit test for the property 'NewValue'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BalanceDetailsTests.cs b/src/Flipdish.Test/Model/BalanceDetailsTests.cs
deleted file mode 100644
index 4156429b..00000000
--- a/src/Flipdish.Test/Model/BalanceDetailsTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BalanceDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BalanceDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for BalanceDetails
-        //private BalanceDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BalanceDetails
-            //instance = new BalanceDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BalanceDetails
-        /// </summary>
-        [Test]
-        public void BalanceDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BalanceDetails
-            //Assert.IsInstanceOfType<BalanceDetails> (instance, "variable 'instance' is a BalanceDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OpeningBalance'
-        /// </summary>
-        [Test]
-        public void OpeningBalanceTest()
-        {
-            // TODO unit test for the property 'OpeningBalance'
-        }
-        /// <summary>
-        /// Test the property 'ClosingBalance'
-        /// </summary>
-        [Test]
-        public void ClosingBalanceTest()
-        {
-            // TODO unit test for the property 'ClosingBalance'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BankAccountCreateTests.cs b/src/Flipdish.Test/Model/BankAccountCreateTests.cs
deleted file mode 100644
index b385e728..00000000
--- a/src/Flipdish.Test/Model/BankAccountCreateTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccountCreate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountCreateTests
-    {
-        // TODO uncomment below to declare an instance variable for BankAccountCreate
-        //private BankAccountCreate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BankAccountCreate
-            //instance = new BankAccountCreate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccountCreate
-        /// </summary>
-        [Test]
-        public void BankAccountCreateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BankAccountCreate
-            //Assert.IsInstanceOfType<BankAccountCreate> (instance, "variable 'instance' is a BankAccountCreate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BankAddress'
-        /// </summary>
-        [Test]
-        public void BankAddressTest()
-        {
-            // TODO unit test for the property 'BankAddress'
-        }
-        /// <summary>
-        /// Test the property 'BankCountryCode'
-        /// </summary>
-        [Test]
-        public void BankCountryCodeTest()
-        {
-            // TODO unit test for the property 'BankCountryCode'
-        }
-        /// <summary>
-        /// Test the property 'AccountHolderAddress'
-        /// </summary>
-        [Test]
-        public void AccountHolderAddressTest()
-        {
-            // TODO unit test for the property 'AccountHolderAddress'
-        }
-        /// <summary>
-        /// Test the property 'AccountHolderCountryCode'
-        /// </summary>
-        [Test]
-        public void AccountHolderCountryCodeTest()
-        {
-            // TODO unit test for the property 'AccountHolderCountryCode'
-        }
-        /// <summary>
-        /// Test the property 'VatNumber'
-        /// </summary>
-        [Test]
-        public void VatNumberTest()
-        {
-            // TODO unit test for the property 'VatNumber'
-        }
-        /// <summary>
-        /// Test the property 'CurrencyCode'
-        /// </summary>
-        [Test]
-        public void CurrencyCodeTest()
-        {
-            // TODO unit test for the property 'CurrencyCode'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-        /// <summary>
-        /// Test the property 'BankName'
-        /// </summary>
-        [Test]
-        public void BankNameTest()
-        {
-            // TODO unit test for the property 'BankName'
-        }
-        /// <summary>
-        /// Test the property 'BusinessType'
-        /// </summary>
-        [Test]
-        public void BusinessTypeTest()
-        {
-            // TODO unit test for the property 'BusinessType'
-        }
-        /// <summary>
-        /// Test the property 'AccountName'
-        /// </summary>
-        [Test]
-        public void AccountNameTest()
-        {
-            // TODO unit test for the property 'AccountName'
-        }
-        /// <summary>
-        /// Test the property 'Iban'
-        /// </summary>
-        [Test]
-        public void IbanTest()
-        {
-            // TODO unit test for the property 'Iban'
-        }
-        /// <summary>
-        /// Test the property 'Swift'
-        /// </summary>
-        [Test]
-        public void SwiftTest()
-        {
-            // TODO unit test for the property 'Swift'
-        }
-        /// <summary>
-        /// Test the property 'NationalClearingCode'
-        /// </summary>
-        [Test]
-        public void NationalClearingCodeTest()
-        {
-            // TODO unit test for the property 'NationalClearingCode'
-        }
-        /// <summary>
-        /// Test the property 'RejectionReason'
-        /// </summary>
-        [Test]
-        public void RejectionReasonTest()
-        {
-            // TODO unit test for the property 'RejectionReason'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BankAccountCreatedEventTests.cs b/src/Flipdish.Test/Model/BankAccountCreatedEventTests.cs
deleted file mode 100644
index 5df41eda..00000000
--- a/src/Flipdish.Test/Model/BankAccountCreatedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccountCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for BankAccountCreatedEvent
-        //private BankAccountCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BankAccountCreatedEvent
-            //instance = new BankAccountCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccountCreatedEvent
-        /// </summary>
-        [Test]
-        public void BankAccountCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BankAccountCreatedEvent
-            //Assert.IsInstanceOfType<BankAccountCreatedEvent> (instance, "variable 'instance' is a BankAccountCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BankAccount'
-        /// </summary>
-        [Test]
-        public void BankAccountTest()
-        {
-            // TODO unit test for the property 'BankAccount'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BankAccountDeletedEventTests.cs b/src/Flipdish.Test/Model/BankAccountDeletedEventTests.cs
deleted file mode 100644
index 55d4e578..00000000
--- a/src/Flipdish.Test/Model/BankAccountDeletedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccountDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for BankAccountDeletedEvent
-        //private BankAccountDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BankAccountDeletedEvent
-            //instance = new BankAccountDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccountDeletedEvent
-        /// </summary>
-        [Test]
-        public void BankAccountDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BankAccountDeletedEvent
-            //Assert.IsInstanceOfType<BankAccountDeletedEvent> (instance, "variable 'instance' is a BankAccountDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BankAccount'
-        /// </summary>
-        [Test]
-        public void BankAccountTest()
-        {
-            // TODO unit test for the property 'BankAccount'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BankAccountDetailTests.cs b/src/Flipdish.Test/Model/BankAccountDetailTests.cs
deleted file mode 100644
index e65c8f28..00000000
--- a/src/Flipdish.Test/Model/BankAccountDetailTests.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccountDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for BankAccountDetail
-        //private BankAccountDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BankAccountDetail
-            //instance = new BankAccountDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccountDetail
-        /// </summary>
-        [Test]
-        public void BankAccountDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BankAccountDetail
-            //Assert.IsInstanceOfType<BankAccountDetail> (instance, "variable 'instance' is a BankAccountDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'StoreNames'
-        /// </summary>
-        [Test]
-        public void StoreNamesTest()
-        {
-            // TODO unit test for the property 'StoreNames'
-        }
-        /// <summary>
-        /// Test the property 'AccountState'
-        /// </summary>
-        [Test]
-        public void AccountStateTest()
-        {
-            // TODO unit test for the property 'AccountState'
-        }
-        /// <summary>
-        /// Test the property 'StripeConnectedAccountInfo'
-        /// </summary>
-        [Test]
-        public void StripeConnectedAccountInfoTest()
-        {
-            // TODO unit test for the property 'StripeConnectedAccountInfo'
-        }
-        /// <summary>
-        /// Test the property 'BankAddress'
-        /// </summary>
-        [Test]
-        public void BankAddressTest()
-        {
-            // TODO unit test for the property 'BankAddress'
-        }
-        /// <summary>
-        /// Test the property 'BankCountryCode'
-        /// </summary>
-        [Test]
-        public void BankCountryCodeTest()
-        {
-            // TODO unit test for the property 'BankCountryCode'
-        }
-        /// <summary>
-        /// Test the property 'AccountHolderAddress'
-        /// </summary>
-        [Test]
-        public void AccountHolderAddressTest()
-        {
-            // TODO unit test for the property 'AccountHolderAddress'
-        }
-        /// <summary>
-        /// Test the property 'AccountHolderCountryCode'
-        /// </summary>
-        [Test]
-        public void AccountHolderCountryCodeTest()
-        {
-            // TODO unit test for the property 'AccountHolderCountryCode'
-        }
-        /// <summary>
-        /// Test the property 'VatNumber'
-        /// </summary>
-        [Test]
-        public void VatNumberTest()
-        {
-            // TODO unit test for the property 'VatNumber'
-        }
-        /// <summary>
-        /// Test the property 'CurrencyCode'
-        /// </summary>
-        [Test]
-        public void CurrencyCodeTest()
-        {
-            // TODO unit test for the property 'CurrencyCode'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-        /// <summary>
-        /// Test the property 'BankName'
-        /// </summary>
-        [Test]
-        public void BankNameTest()
-        {
-            // TODO unit test for the property 'BankName'
-        }
-        /// <summary>
-        /// Test the property 'BusinessType'
-        /// </summary>
-        [Test]
-        public void BusinessTypeTest()
-        {
-            // TODO unit test for the property 'BusinessType'
-        }
-        /// <summary>
-        /// Test the property 'AccountName'
-        /// </summary>
-        [Test]
-        public void AccountNameTest()
-        {
-            // TODO unit test for the property 'AccountName'
-        }
-        /// <summary>
-        /// Test the property 'Iban'
-        /// </summary>
-        [Test]
-        public void IbanTest()
-        {
-            // TODO unit test for the property 'Iban'
-        }
-        /// <summary>
-        /// Test the property 'Swift'
-        /// </summary>
-        [Test]
-        public void SwiftTest()
-        {
-            // TODO unit test for the property 'Swift'
-        }
-        /// <summary>
-        /// Test the property 'NationalClearingCode'
-        /// </summary>
-        [Test]
-        public void NationalClearingCodeTest()
-        {
-            // TODO unit test for the property 'NationalClearingCode'
-        }
-        /// <summary>
-        /// Test the property 'RejectionReason'
-        /// </summary>
-        [Test]
-        public void RejectionReasonTest()
-        {
-            // TODO unit test for the property 'RejectionReason'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BankAccountDetailsUpdateRequestTests.cs b/src/Flipdish.Test/Model/BankAccountDetailsUpdateRequestTests.cs
deleted file mode 100644
index b9074994..00000000
--- a/src/Flipdish.Test/Model/BankAccountDetailsUpdateRequestTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccountDetailsUpdateRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountDetailsUpdateRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for BankAccountDetailsUpdateRequest
-        //private BankAccountDetailsUpdateRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BankAccountDetailsUpdateRequest
-            //instance = new BankAccountDetailsUpdateRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccountDetailsUpdateRequest
-        /// </summary>
-        [Test]
-        public void BankAccountDetailsUpdateRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BankAccountDetailsUpdateRequest
-            //Assert.IsInstanceOfType<BankAccountDetailsUpdateRequest> (instance, "variable 'instance' is a BankAccountDetailsUpdateRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BankAddress'
-        /// </summary>
-        [Test]
-        public void BankAddressTest()
-        {
-            // TODO unit test for the property 'BankAddress'
-        }
-        /// <summary>
-        /// Test the property 'AccountHolderAddress'
-        /// </summary>
-        [Test]
-        public void AccountHolderAddressTest()
-        {
-            // TODO unit test for the property 'AccountHolderAddress'
-        }
-        /// <summary>
-        /// Test the property 'VatNumber'
-        /// </summary>
-        [Test]
-        public void VatNumberTest()
-        {
-            // TODO unit test for the property 'VatNumber'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-        /// <summary>
-        /// Test the property 'BankName'
-        /// </summary>
-        [Test]
-        public void BankNameTest()
-        {
-            // TODO unit test for the property 'BankName'
-        }
-        /// <summary>
-        /// Test the property 'AccountName'
-        /// </summary>
-        [Test]
-        public void AccountNameTest()
-        {
-            // TODO unit test for the property 'AccountName'
-        }
-        /// <summary>
-        /// Test the property 'Iban'
-        /// </summary>
-        [Test]
-        public void IbanTest()
-        {
-            // TODO unit test for the property 'Iban'
-        }
-        /// <summary>
-        /// Test the property 'Swift'
-        /// </summary>
-        [Test]
-        public void SwiftTest()
-        {
-            // TODO unit test for the property 'Swift'
-        }
-        /// <summary>
-        /// Test the property 'NationalClearingCode'
-        /// </summary>
-        [Test]
-        public void NationalClearingCodeTest()
-        {
-            // TODO unit test for the property 'NationalClearingCode'
-        }
-        /// <summary>
-        /// Test the property 'PopulatedAccountFields'
-        /// </summary>
-        [Test]
-        public void PopulatedAccountFieldsTest()
-        {
-            // TODO unit test for the property 'PopulatedAccountFields'
-        }
-        /// <summary>
-        /// Test the property 'RejectionReason'
-        /// </summary>
-        [Test]
-        public void RejectionReasonTest()
-        {
-            // TODO unit test for the property 'RejectionReason'
-        }
-        /// <summary>
-        /// Test the property 'BusinessType'
-        /// </summary>
-        [Test]
-        public void BusinessTypeTest()
-        {
-            // TODO unit test for the property 'BusinessType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BankAccountSummaryTests.cs b/src/Flipdish.Test/Model/BankAccountSummaryTests.cs
deleted file mode 100644
index 27b6c408..00000000
--- a/src/Flipdish.Test/Model/BankAccountSummaryTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccountSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for BankAccountSummary
-        //private BankAccountSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BankAccountSummary
-            //instance = new BankAccountSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccountSummary
-        /// </summary>
-        [Test]
-        public void BankAccountSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BankAccountSummary
-            //Assert.IsInstanceOfType<BankAccountSummary> (instance, "variable 'instance' is a BankAccountSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'StoreNames'
-        /// </summary>
-        [Test]
-        public void StoreNamesTest()
-        {
-            // TODO unit test for the property 'StoreNames'
-        }
-        /// <summary>
-        /// Test the property 'AccountState'
-        /// </summary>
-        [Test]
-        public void AccountStateTest()
-        {
-            // TODO unit test for the property 'AccountState'
-        }
-        /// <summary>
-        /// Test the property 'CurrencyCode'
-        /// </summary>
-        [Test]
-        public void CurrencyCodeTest()
-        {
-            // TODO unit test for the property 'CurrencyCode'
-        }
-        /// <summary>
-        /// Test the property 'StripeConnectedAccountInfo'
-        /// </summary>
-        [Test]
-        public void StripeConnectedAccountInfoTest()
-        {
-            // TODO unit test for the property 'StripeConnectedAccountInfo'
-        }
-        /// <summary>
-        /// Test the property 'AccountName'
-        /// </summary>
-        [Test]
-        public void AccountNameTest()
-        {
-            // TODO unit test for the property 'AccountName'
-        }
-        /// <summary>
-        /// Test the property 'Iban'
-        /// </summary>
-        [Test]
-        public void IbanTest()
-        {
-            // TODO unit test for the property 'Iban'
-        }
-        /// <summary>
-        /// Test the property 'Swift'
-        /// </summary>
-        [Test]
-        public void SwiftTest()
-        {
-            // TODO unit test for the property 'Swift'
-        }
-        /// <summary>
-        /// Test the property 'NationalClearingCode'
-        /// </summary>
-        [Test]
-        public void NationalClearingCodeTest()
-        {
-            // TODO unit test for the property 'NationalClearingCode'
-        }
-        /// <summary>
-        /// Test the property 'RejectionReason'
-        /// </summary>
-        [Test]
-        public void RejectionReasonTest()
-        {
-            // TODO unit test for the property 'RejectionReason'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BankAccountTests.cs b/src/Flipdish.Test/Model/BankAccountTests.cs
deleted file mode 100644
index e50a79f6..00000000
--- a/src/Flipdish.Test/Model/BankAccountTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccount
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountTests
-    {
-        // TODO uncomment below to declare an instance variable for BankAccount
-        //private BankAccount instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BankAccount
-            //instance = new BankAccount();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccount
-        /// </summary>
-        [Test]
-        public void BankAccountInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BankAccount
-            //Assert.IsInstanceOfType<BankAccount> (instance, "variable 'instance' is a BankAccount");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'AccountName'
-        /// </summary>
-        [Test]
-        public void AccountNameTest()
-        {
-            // TODO unit test for the property 'AccountName'
-        }
-        /// <summary>
-        /// Test the property 'Iban'
-        /// </summary>
-        [Test]
-        public void IbanTest()
-        {
-            // TODO unit test for the property 'Iban'
-        }
-        /// <summary>
-        /// Test the property 'Swift'
-        /// </summary>
-        [Test]
-        public void SwiftTest()
-        {
-            // TODO unit test for the property 'Swift'
-        }
-        /// <summary>
-        /// Test the property 'AccountState'
-        /// </summary>
-        [Test]
-        public void AccountStateTest()
-        {
-            // TODO unit test for the property 'AccountState'
-        }
-        /// <summary>
-        /// Test the property 'StoreNames'
-        /// </summary>
-        [Test]
-        public void StoreNamesTest()
-        {
-            // TODO unit test for the property 'StoreNames'
-        }
-        /// <summary>
-        /// Test the property 'BankAddress'
-        /// </summary>
-        [Test]
-        public void BankAddressTest()
-        {
-            // TODO unit test for the property 'BankAddress'
-        }
-        /// <summary>
-        /// Test the property 'BankCountryCode'
-        /// </summary>
-        [Test]
-        public void BankCountryCodeTest()
-        {
-            // TODO unit test for the property 'BankCountryCode'
-        }
-        /// <summary>
-        /// Test the property 'AccountHolderAddress'
-        /// </summary>
-        [Test]
-        public void AccountHolderAddressTest()
-        {
-            // TODO unit test for the property 'AccountHolderAddress'
-        }
-        /// <summary>
-        /// Test the property 'AccountHolderCountryCode'
-        /// </summary>
-        [Test]
-        public void AccountHolderCountryCodeTest()
-        {
-            // TODO unit test for the property 'AccountHolderCountryCode'
-        }
-        /// <summary>
-        /// Test the property 'VatNumber'
-        /// </summary>
-        [Test]
-        public void VatNumberTest()
-        {
-            // TODO unit test for the property 'VatNumber'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BankAccountUpdatedEventTests.cs b/src/Flipdish.Test/Model/BankAccountUpdatedEventTests.cs
deleted file mode 100644
index e82a6438..00000000
--- a/src/Flipdish.Test/Model/BankAccountUpdatedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BankAccountUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BankAccountUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for BankAccountUpdatedEvent
-        //private BankAccountUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BankAccountUpdatedEvent
-            //instance = new BankAccountUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BankAccountUpdatedEvent
-        /// </summary>
-        [Test]
-        public void BankAccountUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BankAccountUpdatedEvent
-            //Assert.IsInstanceOfType<BankAccountUpdatedEvent> (instance, "variable 'instance' is a BankAccountUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BankAccount'
-        /// </summary>
-        [Test]
-        public void BankAccountTest()
-        {
-            // TODO unit test for the property 'BankAccount'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BluetoothTerminalStatusTests.cs b/src/Flipdish.Test/Model/BluetoothTerminalStatusTests.cs
deleted file mode 100644
index d1aa23a8..00000000
--- a/src/Flipdish.Test/Model/BluetoothTerminalStatusTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BluetoothTerminalStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BluetoothTerminalStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for BluetoothTerminalStatus
-        //private BluetoothTerminalStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BluetoothTerminalStatus
-            //instance = new BluetoothTerminalStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BluetoothTerminalStatus
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BluetoothTerminalStatus
-            //Assert.IsInstanceOfType<BluetoothTerminalStatus> (instance, "variable 'instance' is a BluetoothTerminalStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'SerialNumber'
-        /// </summary>
-        [Test]
-        public void SerialNumberTest()
-        {
-            // TODO unit test for the property 'SerialNumber'
-        }
-        /// <summary>
-        /// Test the property 'SoftwareVersion'
-        /// </summary>
-        [Test]
-        public void SoftwareVersionTest()
-        {
-            // TODO unit test for the property 'SoftwareVersion'
-        }
-        /// <summary>
-        /// Test the property 'DeviceType'
-        /// </summary>
-        [Test]
-        public void DeviceTypeTest()
-        {
-            // TODO unit test for the property 'DeviceType'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'BatteryLevel'
-        /// </summary>
-        [Test]
-        public void BatteryLevelTest()
-        {
-            // TODO unit test for the property 'BatteryLevel'
-        }
-        /// <summary>
-        /// Test the property 'UpdateTime'
-        /// </summary>
-        [Test]
-        public void UpdateTimeTest()
-        {
-            // TODO unit test for the property 'UpdateTime'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BusinessHoursOverrideBaseTests.cs b/src/Flipdish.Test/Model/BusinessHoursOverrideBaseTests.cs
deleted file mode 100644
index e0a3522b..00000000
--- a/src/Flipdish.Test/Model/BusinessHoursOverrideBaseTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BusinessHoursOverrideBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BusinessHoursOverrideBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for BusinessHoursOverrideBase
-        //private BusinessHoursOverrideBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BusinessHoursOverrideBase
-            //instance = new BusinessHoursOverrideBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BusinessHoursOverrideBase
-        /// </summary>
-        [Test]
-        public void BusinessHoursOverrideBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BusinessHoursOverrideBase
-            //Assert.IsInstanceOfType<BusinessHoursOverrideBase> (instance, "variable 'instance' is a BusinessHoursOverrideBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeliveryType'
-        /// </summary>
-        [Test]
-        public void DeliveryTypeTest()
-        {
-            // TODO unit test for the property 'DeliveryType'
-        }
-        /// <summary>
-        /// Test the property 'StartTime'
-        /// </summary>
-        [Test]
-        public void StartTimeTest()
-        {
-            // TODO unit test for the property 'StartTime'
-        }
-        /// <summary>
-        /// Test the property 'EndTime'
-        /// </summary>
-        [Test]
-        public void EndTimeTest()
-        {
-            // TODO unit test for the property 'EndTime'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BusinessHoursOverrideTests.cs b/src/Flipdish.Test/Model/BusinessHoursOverrideTests.cs
deleted file mode 100644
index bbd2475b..00000000
--- a/src/Flipdish.Test/Model/BusinessHoursOverrideTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BusinessHoursOverride
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BusinessHoursOverrideTests
-    {
-        // TODO uncomment below to declare an instance variable for BusinessHoursOverride
-        //private BusinessHoursOverride instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BusinessHoursOverride
-            //instance = new BusinessHoursOverride();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BusinessHoursOverride
-        /// </summary>
-        [Test]
-        public void BusinessHoursOverrideInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BusinessHoursOverride
-            //Assert.IsInstanceOfType<BusinessHoursOverride> (instance, "variable 'instance' is a BusinessHoursOverride");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BusinessHoursOverrideId'
-        /// </summary>
-        [Test]
-        public void BusinessHoursOverrideIdTest()
-        {
-            // TODO unit test for the property 'BusinessHoursOverrideId'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryType'
-        /// </summary>
-        [Test]
-        public void DeliveryTypeTest()
-        {
-            // TODO unit test for the property 'DeliveryType'
-        }
-        /// <summary>
-        /// Test the property 'StartTime'
-        /// </summary>
-        [Test]
-        public void StartTimeTest()
-        {
-            // TODO unit test for the property 'StartTime'
-        }
-        /// <summary>
-        /// Test the property 'EndTime'
-        /// </summary>
-        [Test]
-        public void EndTimeTest()
-        {
-            // TODO unit test for the property 'EndTime'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BusinessHoursPeriodBaseTests.cs b/src/Flipdish.Test/Model/BusinessHoursPeriodBaseTests.cs
deleted file mode 100644
index b44d962b..00000000
--- a/src/Flipdish.Test/Model/BusinessHoursPeriodBaseTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BusinessHoursPeriodBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BusinessHoursPeriodBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for BusinessHoursPeriodBase
-        //private BusinessHoursPeriodBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BusinessHoursPeriodBase
-            //instance = new BusinessHoursPeriodBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BusinessHoursPeriodBase
-        /// </summary>
-        [Test]
-        public void BusinessHoursPeriodBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BusinessHoursPeriodBase
-            //Assert.IsInstanceOfType<BusinessHoursPeriodBase> (instance, "variable 'instance' is a BusinessHoursPeriodBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DayOfWeek'
-        /// </summary>
-        [Test]
-        public void DayOfWeekTest()
-        {
-            // TODO unit test for the property 'DayOfWeek'
-        }
-        /// <summary>
-        /// Test the property 'StartTime'
-        /// </summary>
-        [Test]
-        public void StartTimeTest()
-        {
-            // TODO unit test for the property 'StartTime'
-        }
-        /// <summary>
-        /// Test the property 'Period'
-        /// </summary>
-        [Test]
-        public void PeriodTest()
-        {
-            // TODO unit test for the property 'Period'
-        }
-        /// <summary>
-        /// Test the property 'StartTimeEarly'
-        /// </summary>
-        [Test]
-        public void StartTimeEarlyTest()
-        {
-            // TODO unit test for the property 'StartTimeEarly'
-        }
-        /// <summary>
-        /// Test the property 'PeriodEarly'
-        /// </summary>
-        [Test]
-        public void PeriodEarlyTest()
-        {
-            // TODO unit test for the property 'PeriodEarly'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/BusinessHoursPeriodTests.cs b/src/Flipdish.Test/Model/BusinessHoursPeriodTests.cs
deleted file mode 100644
index 12b7c501..00000000
--- a/src/Flipdish.Test/Model/BusinessHoursPeriodTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing BusinessHoursPeriod
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class BusinessHoursPeriodTests
-    {
-        // TODO uncomment below to declare an instance variable for BusinessHoursPeriod
-        //private BusinessHoursPeriod instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of BusinessHoursPeriod
-            //instance = new BusinessHoursPeriod();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of BusinessHoursPeriod
-        /// </summary>
-        [Test]
-        public void BusinessHoursPeriodInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" BusinessHoursPeriod
-            //Assert.IsInstanceOfType<BusinessHoursPeriod> (instance, "variable 'instance' is a BusinessHoursPeriod");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Early'
-        /// </summary>
-        [Test]
-        public void EarlyTest()
-        {
-            // TODO unit test for the property 'Early'
-        }
-        /// <summary>
-        /// Test the property 'Late'
-        /// </summary>
-        [Test]
-        public void LateTest()
-        {
-            // TODO unit test for the property 'Late'
-        }
-        /// <summary>
-        /// Test the property 'Ranges'
-        /// </summary>
-        [Test]
-        public void RangesTest()
-        {
-            // TODO unit test for the property 'Ranges'
-        }
-        /// <summary>
-        /// Test the property 'DayOfWeek'
-        /// </summary>
-        [Test]
-        public void DayOfWeekTest()
-        {
-            // TODO unit test for the property 'DayOfWeek'
-        }
-        /// <summary>
-        /// Test the property 'StartTime'
-        /// </summary>
-        [Test]
-        public void StartTimeTest()
-        {
-            // TODO unit test for the property 'StartTime'
-        }
-        /// <summary>
-        /// Test the property 'Period'
-        /// </summary>
-        [Test]
-        public void PeriodTest()
-        {
-            // TODO unit test for the property 'Period'
-        }
-        /// <summary>
-        /// Test the property 'StartTimeEarly'
-        /// </summary>
-        [Test]
-        public void StartTimeEarlyTest()
-        {
-            // TODO unit test for the property 'StartTimeEarly'
-        }
-        /// <summary>
-        /// Test the property 'PeriodEarly'
-        /// </summary>
-        [Test]
-        public void PeriodEarlyTest()
-        {
-            // TODO unit test for the property 'PeriodEarly'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CampaignStatisticsTests.cs b/src/Flipdish.Test/Model/CampaignStatisticsTests.cs
deleted file mode 100644
index a7fc2047..00000000
--- a/src/Flipdish.Test/Model/CampaignStatisticsTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CampaignStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CampaignStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for CampaignStatistics
-        //private CampaignStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CampaignStatistics
-            //instance = new CampaignStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CampaignStatistics
-        /// </summary>
-        [Test]
-        public void CampaignStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CampaignStatistics
-            //Assert.IsInstanceOfType<CampaignStatistics> (instance, "variable 'instance' is a CampaignStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'VouchersIssued'
-        /// </summary>
-        [Test]
-        public void VouchersIssuedTest()
-        {
-            // TODO unit test for the property 'VouchersIssued'
-        }
-        /// <summary>
-        /// Test the property 'VouchersRedeemed'
-        /// </summary>
-        [Test]
-        public void VouchersRedeemedTest()
-        {
-            // TODO unit test for the property 'VouchersRedeemed'
-        }
-        /// <summary>
-        /// Test the property 'Conversion'
-        /// </summary>
-        [Test]
-        public void ConversionTest()
-        {
-            // TODO unit test for the property 'Conversion'
-        }
-        /// <summary>
-        /// Test the property 'SalesGenerated'
-        /// </summary>
-        [Test]
-        public void SalesGeneratedTest()
-        {
-            // TODO unit test for the property 'SalesGenerated'
-        }
-        /// <summary>
-        /// Test the property 'ReturnOfInvestment'
-        /// </summary>
-        [Test]
-        public void ReturnOfInvestmentTest()
-        {
-            // TODO unit test for the property 'ReturnOfInvestment'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CardBaseTests.cs b/src/Flipdish.Test/Model/CardBaseTests.cs
deleted file mode 100644
index d2f43561..00000000
--- a/src/Flipdish.Test/Model/CardBaseTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CardBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CardBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for CardBase
-        //private CardBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CardBase
-            //instance = new CardBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CardBase
-        /// </summary>
-        [Test]
-        public void CardBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CardBase
-            //Assert.IsInstanceOfType<CardBase> (instance, "variable 'instance' is a CardBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ExpiryMonth'
-        /// </summary>
-        [Test]
-        public void ExpiryMonthTest()
-        {
-            // TODO unit test for the property 'ExpiryMonth'
-        }
-        /// <summary>
-        /// Test the property 'ExpiryYear'
-        /// </summary>
-        [Test]
-        public void ExpiryYearTest()
-        {
-            // TODO unit test for the property 'ExpiryYear'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CardReaderRegistrationRequestTests.cs b/src/Flipdish.Test/Model/CardReaderRegistrationRequestTests.cs
deleted file mode 100644
index b9036b46..00000000
--- a/src/Flipdish.Test/Model/CardReaderRegistrationRequestTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CardReaderRegistrationRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CardReaderRegistrationRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for CardReaderRegistrationRequest
-        //private CardReaderRegistrationRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CardReaderRegistrationRequest
-            //instance = new CardReaderRegistrationRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CardReaderRegistrationRequest
-        /// </summary>
-        [Test]
-        public void CardReaderRegistrationRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CardReaderRegistrationRequest
-            //Assert.IsInstanceOfType<CardReaderRegistrationRequest> (instance, "variable 'instance' is a CardReaderRegistrationRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'RegistrationCode'
-        /// </summary>
-        [Test]
-        public void RegistrationCodeTest()
-        {
-            // TODO unit test for the property 'RegistrationCode'
-        }
-        /// <summary>
-        /// Test the property 'KioskDeviceId'
-        /// </summary>
-        [Test]
-        public void KioskDeviceIdTest()
-        {
-            // TODO unit test for the property 'KioskDeviceId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CardReaderTests.cs b/src/Flipdish.Test/Model/CardReaderTests.cs
deleted file mode 100644
index 57f7c956..00000000
--- a/src/Flipdish.Test/Model/CardReaderTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CardReader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CardReaderTests
-    {
-        // TODO uncomment below to declare an instance variable for CardReader
-        //private CardReader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CardReader
-            //instance = new CardReader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CardReader
-        /// </summary>
-        [Test]
-        public void CardReaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CardReader
-            //Assert.IsInstanceOfType<CardReader> (instance, "variable 'instance' is a CardReader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'DeviceSoftwareVersion'
-        /// </summary>
-        [Test]
-        public void DeviceSoftwareVersionTest()
-        {
-            // TODO unit test for the property 'DeviceSoftwareVersion'
-        }
-        /// <summary>
-        /// Test the property 'SerialNumber'
-        /// </summary>
-        [Test]
-        public void SerialNumberTest()
-        {
-            // TODO unit test for the property 'SerialNumber'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'RegistrationCode'
-        /// </summary>
-        [Test]
-        public void RegistrationCodeTest()
-        {
-            // TODO unit test for the property 'RegistrationCode'
-        }
-        /// <summary>
-        /// Test the property 'DeviceType'
-        /// </summary>
-        [Test]
-        public void DeviceTypeTest()
-        {
-            // TODO unit test for the property 'DeviceType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CardTests.cs b/src/Flipdish.Test/Model/CardTests.cs
deleted file mode 100644
index f0fb44cc..00000000
--- a/src/Flipdish.Test/Model/CardTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Card
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CardTests
-    {
-        // TODO uncomment below to declare an instance variable for Card
-        //private Card instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Card
-            //instance = new Card();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Card
-        /// </summary>
-        [Test]
-        public void CardInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Card
-            //Assert.IsInstanceOfType<Card> (instance, "variable 'instance' is a Card");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Last4Digit'
-        /// </summary>
-        [Test]
-        public void Last4DigitTest()
-        {
-            // TODO unit test for the property 'Last4Digit'
-        }
-        /// <summary>
-        /// Test the property 'ExpiryMonth'
-        /// </summary>
-        [Test]
-        public void ExpiryMonthTest()
-        {
-            // TODO unit test for the property 'ExpiryMonth'
-        }
-        /// <summary>
-        /// Test the property 'ExpiryYear'
-        /// </summary>
-        [Test]
-        public void ExpiryYearTest()
-        {
-            // TODO unit test for the property 'ExpiryYear'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CardWithTokenTests.cs b/src/Flipdish.Test/Model/CardWithTokenTests.cs
deleted file mode 100644
index ceff1975..00000000
--- a/src/Flipdish.Test/Model/CardWithTokenTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CardWithToken
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CardWithTokenTests
-    {
-        // TODO uncomment below to declare an instance variable for CardWithToken
-        //private CardWithToken instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CardWithToken
-            //instance = new CardWithToken();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CardWithToken
-        /// </summary>
-        [Test]
-        public void CardWithTokenInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CardWithToken
-            //Assert.IsInstanceOfType<CardWithToken> (instance, "variable 'instance' is a CardWithToken");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Token'
-        /// </summary>
-        [Test]
-        public void TokenTest()
-        {
-            // TODO unit test for the property 'Token'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CartTests.cs b/src/Flipdish.Test/Model/CartTests.cs
deleted file mode 100644
index 78ee5b41..00000000
--- a/src/Flipdish.Test/Model/CartTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Cart
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CartTests
-    {
-        // TODO uncomment below to declare an instance variable for Cart
-        //private Cart instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Cart
-            //instance = new Cart();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Cart
-        /// </summary>
-        [Test]
-        public void CartInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Cart
-            //Assert.IsInstanceOfType<Cart> (instance, "variable 'instance' is a Cart");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LineItems'
-        /// </summary>
-        [Test]
-        public void LineItemsTest()
-        {
-            // TODO unit test for the property 'LineItems'
-        }
-        /// <summary>
-        /// Test the property 'CartAmount'
-        /// </summary>
-        [Test]
-        public void CartAmountTest()
-        {
-            // TODO unit test for the property 'CartAmount'
-        }
-        /// <summary>
-        /// Test the property 'Tip'
-        /// </summary>
-        [Test]
-        public void TipTest()
-        {
-            // TODO unit test for the property 'Tip'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogGroupArchivedEventTests.cs b/src/Flipdish.Test/Model/CatalogGroupArchivedEventTests.cs
deleted file mode 100644
index e9e4bae6..00000000
--- a/src/Flipdish.Test/Model/CatalogGroupArchivedEventTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogGroupArchivedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogGroupArchivedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogGroupArchivedEvent
-        //private CatalogGroupArchivedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogGroupArchivedEvent
-            //instance = new CatalogGroupArchivedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogGroupArchivedEvent
-        /// </summary>
-        [Test]
-        public void CatalogGroupArchivedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogGroupArchivedEvent
-            //Assert.IsInstanceOfType<CatalogGroupArchivedEvent> (instance, "variable 'instance' is a CatalogGroupArchivedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogGroupCreatedEventTests.cs b/src/Flipdish.Test/Model/CatalogGroupCreatedEventTests.cs
deleted file mode 100644
index f922f7a2..00000000
--- a/src/Flipdish.Test/Model/CatalogGroupCreatedEventTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogGroupCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogGroupCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogGroupCreatedEvent
-        //private CatalogGroupCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogGroupCreatedEvent
-            //instance = new CatalogGroupCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogGroupCreatedEvent
-        /// </summary>
-        [Test]
-        public void CatalogGroupCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogGroupCreatedEvent
-            //Assert.IsInstanceOfType<CatalogGroupCreatedEvent> (instance, "variable 'instance' is a CatalogGroupCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogGroupReferenceTests.cs b/src/Flipdish.Test/Model/CatalogGroupReferenceTests.cs
deleted file mode 100644
index 619edc38..00000000
--- a/src/Flipdish.Test/Model/CatalogGroupReferenceTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogGroupReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogGroupReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogGroupReference
-        //private CatalogGroupReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogGroupReference
-            //instance = new CatalogGroupReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogGroupReference
-        /// </summary>
-        [Test]
-        public void CatalogGroupReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogGroupReference
-            //Assert.IsInstanceOfType<CatalogGroupReference> (instance, "variable 'instance' is a CatalogGroupReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogGroupId'
-        /// </summary>
-        [Test]
-        public void CatalogGroupIdTest()
-        {
-            // TODO unit test for the property 'CatalogGroupId'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'Group'
-        /// </summary>
-        [Test]
-        public void GroupTest()
-        {
-            // TODO unit test for the property 'Group'
-        }
-        /// <summary>
-        /// Test the property 'MinSelection'
-        /// </summary>
-        [Test]
-        public void MinSelectionTest()
-        {
-            // TODO unit test for the property 'MinSelection'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelection'
-        /// </summary>
-        [Test]
-        public void MaxSelectionTest()
-        {
-            // TODO unit test for the property 'MaxSelection'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogGroupTests.cs b/src/Flipdish.Test/Model/CatalogGroupTests.cs
deleted file mode 100644
index 90c75cf8..00000000
--- a/src/Flipdish.Test/Model/CatalogGroupTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogGroup
-        //private CatalogGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogGroup
-            //instance = new CatalogGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogGroup
-        /// </summary>
-        [Test]
-        public void CatalogGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogGroup
-            //Assert.IsInstanceOfType<CatalogGroup> (instance, "variable 'instance' is a CatalogGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogGroupId'
-        /// </summary>
-        [Test]
-        public void CatalogGroupIdTest()
-        {
-            // TODO unit test for the property 'CatalogGroupId'
-        }
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'IsArchived'
-        /// </summary>
-        [Test]
-        public void IsArchivedTest()
-        {
-            // TODO unit test for the property 'IsArchived'
-        }
-        /// <summary>
-        /// Test the property 'MinSelection'
-        /// </summary>
-        [Test]
-        public void MinSelectionTest()
-        {
-            // TODO unit test for the property 'MinSelection'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelection'
-        /// </summary>
-        [Test]
-        public void MaxSelectionTest()
-        {
-            // TODO unit test for the property 'MaxSelection'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'Items'
-        /// </summary>
-        [Test]
-        public void ItemsTest()
-        {
-            // TODO unit test for the property 'Items'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogGroupUpdatedEventTests.cs b/src/Flipdish.Test/Model/CatalogGroupUpdatedEventTests.cs
deleted file mode 100644
index 5f212e0d..00000000
--- a/src/Flipdish.Test/Model/CatalogGroupUpdatedEventTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogGroupUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogGroupUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogGroupUpdatedEvent
-        //private CatalogGroupUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogGroupUpdatedEvent
-            //instance = new CatalogGroupUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogGroupUpdatedEvent
-        /// </summary>
-        [Test]
-        public void CatalogGroupUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogGroupUpdatedEvent
-            //Assert.IsInstanceOfType<CatalogGroupUpdatedEvent> (instance, "variable 'instance' is a CatalogGroupUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogImageTests.cs b/src/Flipdish.Test/Model/CatalogImageTests.cs
deleted file mode 100644
index 6f528dcd..00000000
--- a/src/Flipdish.Test/Model/CatalogImageTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogImage
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogImageTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogImage
-        //private CatalogImage instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogImage
-            //instance = new CatalogImage();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogImage
-        /// </summary>
-        [Test]
-        public void CatalogImageInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogImage
-            //Assert.IsInstanceOfType<CatalogImage> (instance, "variable 'instance' is a CatalogImage");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ImageUri'
-        /// </summary>
-        [Test]
-        public void ImageUriTest()
-        {
-            // TODO unit test for the property 'ImageUri'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogItemArchivedEventTests.cs b/src/Flipdish.Test/Model/CatalogItemArchivedEventTests.cs
deleted file mode 100644
index 1b0fb18b..00000000
--- a/src/Flipdish.Test/Model/CatalogItemArchivedEventTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogItemArchivedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogItemArchivedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogItemArchivedEvent
-        //private CatalogItemArchivedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogItemArchivedEvent
-            //instance = new CatalogItemArchivedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogItemArchivedEvent
-        /// </summary>
-        [Test]
-        public void CatalogItemArchivedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogItemArchivedEvent
-            //Assert.IsInstanceOfType<CatalogItemArchivedEvent> (instance, "variable 'instance' is a CatalogItemArchivedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogItemCreatedEventTests.cs b/src/Flipdish.Test/Model/CatalogItemCreatedEventTests.cs
deleted file mode 100644
index 80ad4e75..00000000
--- a/src/Flipdish.Test/Model/CatalogItemCreatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogItemCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogItemCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogItemCreatedEvent
-        //private CatalogItemCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogItemCreatedEvent
-            //instance = new CatalogItemCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogItemCreatedEvent
-        /// </summary>
-        [Test]
-        public void CatalogItemCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogItemCreatedEvent
-            //Assert.IsInstanceOfType<CatalogItemCreatedEvent> (instance, "variable 'instance' is a CatalogItemCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'CatalogItem'
-        /// </summary>
-        [Test]
-        public void CatalogItemTest()
-        {
-            // TODO unit test for the property 'CatalogItem'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogItemReferenceTests.cs b/src/Flipdish.Test/Model/CatalogItemReferenceTests.cs
deleted file mode 100644
index a3a23bad..00000000
--- a/src/Flipdish.Test/Model/CatalogItemReferenceTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogItemReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogItemReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogItemReference
-        //private CatalogItemReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogItemReference
-            //instance = new CatalogItemReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogItemReference
-        /// </summary>
-        [Test]
-        public void CatalogItemReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogItemReference
-            //Assert.IsInstanceOfType<CatalogItemReference> (instance, "variable 'instance' is a CatalogItemReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'Item'
-        /// </summary>
-        [Test]
-        public void ItemTest()
-        {
-            // TODO unit test for the property 'Item'
-        }
-        /// <summary>
-        /// Test the property 'PreselectedQuantity'
-        /// </summary>
-        [Test]
-        public void PreselectedQuantityTest()
-        {
-            // TODO unit test for the property 'PreselectedQuantity'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogItemTests.cs b/src/Flipdish.Test/Model/CatalogItemTests.cs
deleted file mode 100644
index ca251a61..00000000
--- a/src/Flipdish.Test/Model/CatalogItemTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogItemTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogItem
-        //private CatalogItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogItem
-            //instance = new CatalogItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogItem
-        /// </summary>
-        [Test]
-        public void CatalogItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogItem
-            //Assert.IsInstanceOfType<CatalogItem> (instance, "variable 'instance' is a CatalogItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'ImageFileName'
-        /// </summary>
-        [Test]
-        public void ImageFileNameTest()
-        {
-            // TODO unit test for the property 'ImageFileName'
-        }
-        /// <summary>
-        /// Test the property 'IsArchived'
-        /// </summary>
-        [Test]
-        public void IsArchivedTest()
-        {
-            // TODO unit test for the property 'IsArchived'
-        }
-        /// <summary>
-        /// Test the property 'Alcohol'
-        /// </summary>
-        [Test]
-        public void AlcoholTest()
-        {
-            // TODO unit test for the property 'Alcohol'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'Groups'
-        /// </summary>
-        [Test]
-        public void GroupsTest()
-        {
-            // TODO unit test for the property 'Groups'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CatalogItemUpdatedEventTests.cs b/src/Flipdish.Test/Model/CatalogItemUpdatedEventTests.cs
deleted file mode 100644
index 0f951f20..00000000
--- a/src/Flipdish.Test/Model/CatalogItemUpdatedEventTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CatalogItemUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CatalogItemUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CatalogItemUpdatedEvent
-        //private CatalogItemUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CatalogItemUpdatedEvent
-            //instance = new CatalogItemUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CatalogItemUpdatedEvent
-        /// </summary>
-        [Test]
-        public void CatalogItemUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CatalogItemUpdatedEvent
-            //Assert.IsInstanceOfType<CatalogItemUpdatedEvent> (instance, "variable 'instance' is a CatalogItemUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CertificateCreatedEventTests.cs b/src/Flipdish.Test/Model/CertificateCreatedEventTests.cs
deleted file mode 100644
index c0f5f0d4..00000000
--- a/src/Flipdish.Test/Model/CertificateCreatedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CertificateCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CertificateCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CertificateCreatedEvent
-        //private CertificateCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CertificateCreatedEvent
-            //instance = new CertificateCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CertificateCreatedEvent
-        /// </summary>
-        [Test]
-        public void CertificateCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CertificateCreatedEvent
-            //Assert.IsInstanceOfType<CertificateCreatedEvent> (instance, "variable 'instance' is a CertificateCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Hostname'
-        /// </summary>
-        [Test]
-        public void HostnameTest()
-        {
-            // TODO unit test for the property 'Hostname'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CertificateRenewedEventTests.cs b/src/Flipdish.Test/Model/CertificateRenewedEventTests.cs
deleted file mode 100644
index 3b07c323..00000000
--- a/src/Flipdish.Test/Model/CertificateRenewedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CertificateRenewedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CertificateRenewedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CertificateRenewedEvent
-        //private CertificateRenewedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CertificateRenewedEvent
-            //instance = new CertificateRenewedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CertificateRenewedEvent
-        /// </summary>
-        [Test]
-        public void CertificateRenewedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CertificateRenewedEvent
-            //Assert.IsInstanceOfType<CertificateRenewedEvent> (instance, "variable 'instance' is a CertificateRenewedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Hostname'
-        /// </summary>
-        [Test]
-        public void HostnameTest()
-        {
-            // TODO unit test for the property 'Hostname'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ChangePasswordModelTests.cs b/src/Flipdish.Test/Model/ChangePasswordModelTests.cs
deleted file mode 100644
index 2911a3a6..00000000
--- a/src/Flipdish.Test/Model/ChangePasswordModelTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ChangePasswordModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ChangePasswordModelTests
-    {
-        // TODO uncomment below to declare an instance variable for ChangePasswordModel
-        //private ChangePasswordModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ChangePasswordModel
-            //instance = new ChangePasswordModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ChangePasswordModel
-        /// </summary>
-        [Test]
-        public void ChangePasswordModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ChangePasswordModel
-            //Assert.IsInstanceOfType<ChangePasswordModel> (instance, "variable 'instance' is a ChangePasswordModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OldPassword'
-        /// </summary>
-        [Test]
-        public void OldPasswordTest()
-        {
-            // TODO unit test for the property 'OldPassword'
-        }
-        /// <summary>
-        /// Test the property 'NewPassword'
-        /// </summary>
-        [Test]
-        public void NewPasswordTest()
-        {
-            // TODO unit test for the property 'NewPassword'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ChannelStoreMappingTests.cs b/src/Flipdish.Test/Model/ChannelStoreMappingTests.cs
deleted file mode 100644
index bc15a9f5..00000000
--- a/src/Flipdish.Test/Model/ChannelStoreMappingTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ChannelStoreMapping
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ChannelStoreMappingTests
-    {
-        // TODO uncomment below to declare an instance variable for ChannelStoreMapping
-        //private ChannelStoreMapping instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ChannelStoreMapping
-            //instance = new ChannelStoreMapping();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ChannelStoreMapping
-        /// </summary>
-        [Test]
-        public void ChannelStoreMappingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ChannelStoreMapping
-            //Assert.IsInstanceOfType<ChannelStoreMapping> (instance, "variable 'instance' is a ChannelStoreMapping");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'ChannelStoreId'
-        /// </summary>
-        [Test]
-        public void ChannelStoreIdTest()
-        {
-            // TODO unit test for the property 'ChannelStoreId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ChannelTests.cs b/src/Flipdish.Test/Model/ChannelTests.cs
deleted file mode 100644
index 44008be1..00000000
--- a/src/Flipdish.Test/Model/ChannelTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Channel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ChannelTests
-    {
-        // TODO uncomment below to declare an instance variable for Channel
-        //private Channel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Channel
-            //instance = new Channel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Channel
-        /// </summary>
-        [Test]
-        public void ChannelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Channel
-            //Assert.IsInstanceOfType<Channel> (instance, "variable 'instance' is a Channel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ChannelId'
-        /// </summary>
-        [Test]
-        public void ChannelIdTest()
-        {
-            // TODO unit test for the property 'ChannelId'
-        }
-        /// <summary>
-        /// Test the property 'TranslationKey'
-        /// </summary>
-        [Test]
-        public void TranslationKeyTest()
-        {
-            // TODO unit test for the property 'TranslationKey'
-        }
-        /// <summary>
-        /// Test the property 'Source'
-        /// </summary>
-        [Test]
-        public void SourceTest()
-        {
-            // TODO unit test for the property 'Source'
-        }
-        /// <summary>
-        /// Test the property 'LogoUri'
-        /// </summary>
-        [Test]
-        public void LogoUriTest()
-        {
-            // TODO unit test for the property 'LogoUri'
-        }
-        /// <summary>
-        /// Test the property 'Available'
-        /// </summary>
-        [Test]
-        public void AvailableTest()
-        {
-            // TODO unit test for the property 'Available'
-        }
-        /// <summary>
-        /// Test the property 'MaintainedExternally'
-        /// </summary>
-        [Test]
-        public void MaintainedExternallyTest()
-        {
-            // TODO unit test for the property 'MaintainedExternally'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ChargebackDetailsTests.cs b/src/Flipdish.Test/Model/ChargebackDetailsTests.cs
deleted file mode 100644
index 888142bf..00000000
--- a/src/Flipdish.Test/Model/ChargebackDetailsTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ChargebackDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ChargebackDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for ChargebackDetails
-        //private ChargebackDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ChargebackDetails
-            //instance = new ChargebackDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ChargebackDetails
-        /// </summary>
-        [Test]
-        public void ChargebackDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ChargebackDetails
-            //Assert.IsInstanceOfType<ChargebackDetails> (instance, "variable 'instance' is a ChargebackDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ChargebackAmount'
-        /// </summary>
-        [Test]
-        public void ChargebackAmountTest()
-        {
-            // TODO unit test for the property 'ChargebackAmount'
-        }
-        /// <summary>
-        /// Test the property 'ChargebackRefundedFees'
-        /// </summary>
-        [Test]
-        public void ChargebackRefundedFeesTest()
-        {
-            // TODO unit test for the property 'ChargebackRefundedFees'
-        }
-        /// <summary>
-        /// Test the property 'ChargebacksCount'
-        /// </summary>
-        [Test]
-        public void ChargebacksCountTest()
-        {
-            // TODO unit test for the property 'ChargebacksCount'
-        }
-        /// <summary>
-        /// Test the property 'TotalChargebackCost'
-        /// </summary>
-        [Test]
-        public void TotalChargebackCostTest()
-        {
-            // TODO unit test for the property 'TotalChargebackCost'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ConfiguredAppHeaderTests.cs b/src/Flipdish.Test/Model/ConfiguredAppHeaderTests.cs
deleted file mode 100644
index 179d87a3..00000000
--- a/src/Flipdish.Test/Model/ConfiguredAppHeaderTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ConfiguredAppHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ConfiguredAppHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for ConfiguredAppHeader
-        //private ConfiguredAppHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ConfiguredAppHeader
-            //instance = new ConfiguredAppHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ConfiguredAppHeader
-        /// </summary>
-        [Test]
-        public void ConfiguredAppHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ConfiguredAppHeader
-            //Assert.IsInstanceOfType<ConfiguredAppHeader> (instance, "variable 'instance' is a ConfiguredAppHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'AppStoreAppId'
-        /// </summary>
-        [Test]
-        public void AppStoreAppIdTest()
-        {
-            // TODO unit test for the property 'AppStoreAppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ConfiguredPhysicalRestaurantTests.cs b/src/Flipdish.Test/Model/ConfiguredPhysicalRestaurantTests.cs
deleted file mode 100644
index 0a357abf..00000000
--- a/src/Flipdish.Test/Model/ConfiguredPhysicalRestaurantTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ConfiguredPhysicalRestaurant
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ConfiguredPhysicalRestaurantTests
-    {
-        // TODO uncomment below to declare an instance variable for ConfiguredPhysicalRestaurant
-        //private ConfiguredPhysicalRestaurant instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ConfiguredPhysicalRestaurant
-            //instance = new ConfiguredPhysicalRestaurant();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ConfiguredPhysicalRestaurant
-        /// </summary>
-        [Test]
-        public void ConfiguredPhysicalRestaurantInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ConfiguredPhysicalRestaurant
-            //Assert.IsInstanceOfType<ConfiguredPhysicalRestaurant> (instance, "variable 'instance' is a ConfiguredPhysicalRestaurant");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ConfiguredStoreTests.cs b/src/Flipdish.Test/Model/ConfiguredStoreTests.cs
deleted file mode 100644
index 561052a3..00000000
--- a/src/Flipdish.Test/Model/ConfiguredStoreTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ConfiguredStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ConfiguredStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for ConfiguredStore
-        //private ConfiguredStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ConfiguredStore
-            //instance = new ConfiguredStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ConfiguredStore
-        /// </summary>
-        [Test]
-        public void ConfiguredStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ConfiguredStore
-            //Assert.IsInstanceOfType<ConfiguredStore> (instance, "variable 'instance' is a ConfiguredStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ContactTests.cs b/src/Flipdish.Test/Model/ContactTests.cs
deleted file mode 100644
index 4ba76e86..00000000
--- a/src/Flipdish.Test/Model/ContactTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Contact
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ContactTests
-    {
-        // TODO uncomment below to declare an instance variable for Contact
-        //private Contact instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Contact
-            //instance = new Contact();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Contact
-        /// </summary>
-        [Test]
-        public void ContactInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Contact
-            //Assert.IsInstanceOfType<Contact> (instance, "variable 'instance' is a Contact");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'PhoneNumber'
-        /// </summary>
-        [Test]
-        public void PhoneNumberTest()
-        {
-            // TODO unit test for the property 'PhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'FirstName'
-        /// </summary>
-        [Test]
-        public void FirstNameTest()
-        {
-            // TODO unit test for the property 'FirstName'
-        }
-        /// <summary>
-        /// Test the property 'LastName'
-        /// </summary>
-        [Test]
-        public void LastNameTest()
-        {
-            // TODO unit test for the property 'LastName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CoordinatesTests.cs b/src/Flipdish.Test/Model/CoordinatesTests.cs
deleted file mode 100644
index b9b4f275..00000000
--- a/src/Flipdish.Test/Model/CoordinatesTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Coordinates
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CoordinatesTests
-    {
-        // TODO uncomment below to declare an instance variable for Coordinates
-        //private Coordinates instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Coordinates
-            //instance = new Coordinates();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Coordinates
-        /// </summary>
-        [Test]
-        public void CoordinatesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Coordinates
-            //Assert.IsInstanceOfType<Coordinates> (instance, "variable 'instance' is a Coordinates");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Latitude'
-        /// </summary>
-        [Test]
-        public void LatitudeTest()
-        {
-            // TODO unit test for the property 'Latitude'
-        }
-        /// <summary>
-        /// Test the property 'Longitude'
-        /// </summary>
-        [Test]
-        public void LongitudeTest()
-        {
-            // TODO unit test for the property 'Longitude'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CountryFormResponseTests.cs b/src/Flipdish.Test/Model/CountryFormResponseTests.cs
deleted file mode 100644
index 73032928..00000000
--- a/src/Flipdish.Test/Model/CountryFormResponseTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CountryFormResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CountryFormResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for CountryFormResponse
-        //private CountryFormResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CountryFormResponse
-            //instance = new CountryFormResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CountryFormResponse
-        /// </summary>
-        [Test]
-        public void CountryFormResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CountryFormResponse
-            //Assert.IsInstanceOfType<CountryFormResponse> (instance, "variable 'instance' is a CountryFormResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-        /// <summary>
-        /// Test the property 'Label'
-        /// </summary>
-        [Test]
-        public void LabelTest()
-        {
-            // TODO unit test for the property 'Label'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CountryWithAccountFieldsDefinitionsTests.cs b/src/Flipdish.Test/Model/CountryWithAccountFieldsDefinitionsTests.cs
deleted file mode 100644
index e897577d..00000000
--- a/src/Flipdish.Test/Model/CountryWithAccountFieldsDefinitionsTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CountryWithAccountFieldsDefinitions
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CountryWithAccountFieldsDefinitionsTests
-    {
-        // TODO uncomment below to declare an instance variable for CountryWithAccountFieldsDefinitions
-        //private CountryWithAccountFieldsDefinitions instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CountryWithAccountFieldsDefinitions
-            //instance = new CountryWithAccountFieldsDefinitions();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CountryWithAccountFieldsDefinitions
-        /// </summary>
-        [Test]
-        public void CountryWithAccountFieldsDefinitionsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CountryWithAccountFieldsDefinitions
-            //Assert.IsInstanceOfType<CountryWithAccountFieldsDefinitions> (instance, "variable 'instance' is a CountryWithAccountFieldsDefinitions");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CountryCode'
-        /// </summary>
-        [Test]
-        public void CountryCodeTest()
-        {
-            // TODO unit test for the property 'CountryCode'
-        }
-        /// <summary>
-        /// Test the property 'DisplayName'
-        /// </summary>
-        [Test]
-        public void DisplayNameTest()
-        {
-            // TODO unit test for the property 'DisplayName'
-        }
-        /// <summary>
-        /// Test the property 'SupportType'
-        /// </summary>
-        [Test]
-        public void SupportTypeTest()
-        {
-            // TODO unit test for the property 'SupportType'
-        }
-        /// <summary>
-        /// Test the property 'FieldDefinitions'
-        /// </summary>
-        [Test]
-        public void FieldDefinitionsTest()
-        {
-            // TODO unit test for the property 'FieldDefinitions'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateAccountModelTests.cs b/src/Flipdish.Test/Model/CreateAccountModelTests.cs
deleted file mode 100644
index 3404716a..00000000
--- a/src/Flipdish.Test/Model/CreateAccountModelTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateAccountModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateAccountModelTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateAccountModel
-        //private CreateAccountModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateAccountModel
-            //instance = new CreateAccountModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateAccountModel
-        /// </summary>
-        [Test]
-        public void CreateAccountModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateAccountModel
-            //Assert.IsInstanceOfType<CreateAccountModel> (instance, "variable 'instance' is a CreateAccountModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-        /// <summary>
-        /// Test the property 'LanguageId'
-        /// </summary>
-        [Test]
-        public void LanguageIdTest()
-        {
-            // TODO unit test for the property 'LanguageId'
-        }
-        /// <summary>
-        /// Test the property 'Rid'
-        /// </summary>
-        [Test]
-        public void RidTest()
-        {
-            // TODO unit test for the property 'Rid'
-        }
-        /// <summary>
-        /// Test the property 'Cid'
-        /// </summary>
-        [Test]
-        public void CidTest()
-        {
-            // TODO unit test for the property 'Cid'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateAppStoreAppTests.cs b/src/Flipdish.Test/Model/CreateAppStoreAppTests.cs
deleted file mode 100644
index b62f3122..00000000
--- a/src/Flipdish.Test/Model/CreateAppStoreAppTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateAppStoreApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateAppStoreAppTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateAppStoreApp
-        //private CreateAppStoreApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateAppStoreApp
-            //instance = new CreateAppStoreApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateAppStoreApp
-        /// </summary>
-        [Test]
-        public void CreateAppStoreAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateAppStoreApp
-            //Assert.IsInstanceOfType<CreateAppStoreApp> (instance, "variable 'instance' is a CreateAppStoreApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ConfigurationType'
-        /// </summary>
-        [Test]
-        public void ConfigurationTypeTest()
-        {
-            // TODO unit test for the property 'ConfigurationType'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'FieldGroups'
-        /// </summary>
-        [Test]
-        public void FieldGroupsTest()
-        {
-            // TODO unit test for the property 'FieldGroups'
-        }
-        /// <summary>
-        /// Test the property 'SetupInstructions'
-        /// </summary>
-        [Test]
-        public void SetupInstructionsTest()
-        {
-            // TODO unit test for the property 'SetupInstructions'
-        }
-        /// <summary>
-        /// Test the property 'ExternalSetupLink'
-        /// </summary>
-        [Test]
-        public void ExternalSetupLinkTest()
-        {
-            // TODO unit test for the property 'ExternalSetupLink'
-        }
-        /// <summary>
-        /// Test the property 'OAuthAppId'
-        /// </summary>
-        [Test]
-        public void OAuthAppIdTest()
-        {
-            // TODO unit test for the property 'OAuthAppId'
-        }
-        /// <summary>
-        /// Test the property 'TeammateAppAccessLevel'
-        /// </summary>
-        [Test]
-        public void TeammateAppAccessLevelTest()
-        {
-            // TODO unit test for the property 'TeammateAppAccessLevel'
-        }
-        /// <summary>
-        /// Test the property 'PermissionsType'
-        /// </summary>
-        [Test]
-        public void PermissionsTypeTest()
-        {
-            // TODO unit test for the property 'PermissionsType'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-        /// <summary>
-        /// Test the property 'DeveloperName'
-        /// </summary>
-        [Test]
-        public void DeveloperNameTest()
-        {
-            // TODO unit test for the property 'DeveloperName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateCatalogGroupReferenceTests.cs b/src/Flipdish.Test/Model/CreateCatalogGroupReferenceTests.cs
deleted file mode 100644
index 5305a25b..00000000
--- a/src/Flipdish.Test/Model/CreateCatalogGroupReferenceTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateCatalogGroupReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateCatalogGroupReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateCatalogGroupReference
-        //private CreateCatalogGroupReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateCatalogGroupReference
-            //instance = new CreateCatalogGroupReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateCatalogGroupReference
-        /// </summary>
-        [Test]
-        public void CreateCatalogGroupReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateCatalogGroupReference
-            //Assert.IsInstanceOfType<CreateCatalogGroupReference> (instance, "variable 'instance' is a CreateCatalogGroupReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogGroupId'
-        /// </summary>
-        [Test]
-        public void CatalogGroupIdTest()
-        {
-            // TODO unit test for the property 'CatalogGroupId'
-        }
-        /// <summary>
-        /// Test the property 'GroupType'
-        /// </summary>
-        [Test]
-        public void GroupTypeTest()
-        {
-            // TODO unit test for the property 'GroupType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateCatalogGroupTests.cs b/src/Flipdish.Test/Model/CreateCatalogGroupTests.cs
deleted file mode 100644
index f7e74cb5..00000000
--- a/src/Flipdish.Test/Model/CreateCatalogGroupTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateCatalogGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateCatalogGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateCatalogGroup
-        //private CreateCatalogGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateCatalogGroup
-            //instance = new CreateCatalogGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateCatalogGroup
-        /// </summary>
-        [Test]
-        public void CreateCatalogGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateCatalogGroup
-            //Assert.IsInstanceOfType<CreateCatalogGroup> (instance, "variable 'instance' is a CreateCatalogGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MinSelectCount'
-        /// </summary>
-        [Test]
-        public void MinSelectCountTest()
-        {
-            // TODO unit test for the property 'MinSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelectCount'
-        /// </summary>
-        [Test]
-        public void MaxSelectCountTest()
-        {
-            // TODO unit test for the property 'MaxSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'Items'
-        /// </summary>
-        [Test]
-        public void ItemsTest()
-        {
-            // TODO unit test for the property 'Items'
-        }
-        /// <summary>
-        /// Test the property 'GroupType'
-        /// </summary>
-        [Test]
-        public void GroupTypeTest()
-        {
-            // TODO unit test for the property 'GroupType'
-        }
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateCatalogItemReferenceTests.cs b/src/Flipdish.Test/Model/CreateCatalogItemReferenceTests.cs
deleted file mode 100644
index a19c4ed3..00000000
--- a/src/Flipdish.Test/Model/CreateCatalogItemReferenceTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateCatalogItemReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateCatalogItemReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateCatalogItemReference
-        //private CreateCatalogItemReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateCatalogItemReference
-            //instance = new CreateCatalogItemReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateCatalogItemReference
-        /// </summary>
-        [Test]
-        public void CreateCatalogItemReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateCatalogItemReference
-            //Assert.IsInstanceOfType<CreateCatalogItemReference> (instance, "variable 'instance' is a CreateCatalogItemReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'ItemType'
-        /// </summary>
-        [Test]
-        public void ItemTypeTest()
-        {
-            // TODO unit test for the property 'ItemType'
-        }
-        /// <summary>
-        /// Test the property 'PreselectedQuantity'
-        /// </summary>
-        [Test]
-        public void PreselectedQuantityTest()
-        {
-            // TODO unit test for the property 'PreselectedQuantity'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateCatalogItemTests.cs b/src/Flipdish.Test/Model/CreateCatalogItemTests.cs
deleted file mode 100644
index e7c03936..00000000
--- a/src/Flipdish.Test/Model/CreateCatalogItemTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateCatalogItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateCatalogItemTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateCatalogItem
-        //private CreateCatalogItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateCatalogItem
-            //instance = new CreateCatalogItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateCatalogItem
-        /// </summary>
-        [Test]
-        public void CreateCatalogItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateCatalogItem
-            //Assert.IsInstanceOfType<CreateCatalogItem> (instance, "variable 'instance' is a CreateCatalogItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Groups'
-        /// </summary>
-        [Test]
-        public void GroupsTest()
-        {
-            // TODO unit test for the property 'Groups'
-        }
-        /// <summary>
-        /// Test the property 'ItemType'
-        /// </summary>
-        [Test]
-        public void ItemTypeTest()
-        {
-            // TODO unit test for the property 'ItemType'
-        }
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'ImageFileName'
-        /// </summary>
-        [Test]
-        public void ImageFileNameTest()
-        {
-            // TODO unit test for the property 'ImageFileName'
-        }
-        /// <summary>
-        /// Test the property 'Alcohol'
-        /// </summary>
-        [Test]
-        public void AlcoholTest()
-        {
-            // TODO unit test for the property 'Alcohol'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateFullMenuItemOptionSetItemTests.cs b/src/Flipdish.Test/Model/CreateFullMenuItemOptionSetItemTests.cs
deleted file mode 100644
index 28d020f0..00000000
--- a/src/Flipdish.Test/Model/CreateFullMenuItemOptionSetItemTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateFullMenuItemOptionSetItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateFullMenuItemOptionSetItemTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateFullMenuItemOptionSetItem
-        //private CreateFullMenuItemOptionSetItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateFullMenuItemOptionSetItem
-            //instance = new CreateFullMenuItemOptionSetItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateFullMenuItemOptionSetItem
-        /// </summary>
-        [Test]
-        public void CreateFullMenuItemOptionSetItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateFullMenuItemOptionSetItem
-            //Assert.IsInstanceOfType<CreateFullMenuItemOptionSetItem> (instance, "variable 'instance' is a CreateFullMenuItemOptionSetItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-        /// <summary>
-        /// Test the property 'TaxRateName'
-        /// </summary>
-        [Test]
-        public void TaxRateNameTest()
-        {
-            // TODO unit test for the property 'TaxRateName'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateFullMenuItemOptionSetTests.cs b/src/Flipdish.Test/Model/CreateFullMenuItemOptionSetTests.cs
deleted file mode 100644
index 24884dc3..00000000
--- a/src/Flipdish.Test/Model/CreateFullMenuItemOptionSetTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateFullMenuItemOptionSet
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateFullMenuItemOptionSetTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateFullMenuItemOptionSet
-        //private CreateFullMenuItemOptionSet instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateFullMenuItemOptionSet
-            //instance = new CreateFullMenuItemOptionSet();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateFullMenuItemOptionSet
-        /// </summary>
-        [Test]
-        public void CreateFullMenuItemOptionSetInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateFullMenuItemOptionSet
-            //Assert.IsInstanceOfType<CreateFullMenuItemOptionSet> (instance, "variable 'instance' is a CreateFullMenuItemOptionSet");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItems'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemsTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItems'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'IsMasterOptionSet'
-        /// </summary>
-        [Test]
-        public void IsMasterOptionSetTest()
-        {
-            // TODO unit test for the property 'IsMasterOptionSet'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'MinSelectCount'
-        /// </summary>
-        [Test]
-        public void MinSelectCountTest()
-        {
-            // TODO unit test for the property 'MinSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelectCount'
-        /// </summary>
-        [Test]
-        public void MaxSelectCountTest()
-        {
-            // TODO unit test for the property 'MaxSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateFullMenuSectionItemTests.cs b/src/Flipdish.Test/Model/CreateFullMenuSectionItemTests.cs
deleted file mode 100644
index ac67191d..00000000
--- a/src/Flipdish.Test/Model/CreateFullMenuSectionItemTests.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateFullMenuSectionItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateFullMenuSectionItemTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateFullMenuSectionItem
-        //private CreateFullMenuSectionItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateFullMenuSectionItem
-            //instance = new CreateFullMenuSectionItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateFullMenuSectionItem
-        /// </summary>
-        [Test]
-        public void CreateFullMenuSectionItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateFullMenuSectionItem
-            //Assert.IsInstanceOfType<CreateFullMenuSectionItem> (instance, "variable 'instance' is a CreateFullMenuSectionItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuItemOptionSets'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetsTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSets'
-        }
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-        /// <summary>
-        /// Test the property 'TaxRateName'
-        /// </summary>
-        [Test]
-        public void TaxRateNameTest()
-        {
-            // TODO unit test for the property 'TaxRateName'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'SpicinessRating'
-        /// </summary>
-        [Test]
-        public void SpicinessRatingTest()
-        {
-            // TODO unit test for the property 'SpicinessRating'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'Alcohol'
-        /// </summary>
-        [Test]
-        public void AlcoholTest()
-        {
-            // TODO unit test for the property 'Alcohol'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-        /// <summary>
-        /// Test the property 'DisableVouchers'
-        /// </summary>
-        [Test]
-        public void DisableVouchersTest()
-        {
-            // TODO unit test for the property 'DisableVouchers'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateFullMenuSectionTests.cs b/src/Flipdish.Test/Model/CreateFullMenuSectionTests.cs
deleted file mode 100644
index 6ce80e10..00000000
--- a/src/Flipdish.Test/Model/CreateFullMenuSectionTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateFullMenuSection
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateFullMenuSectionTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateFullMenuSection
-        //private CreateFullMenuSection instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateFullMenuSection
-            //instance = new CreateFullMenuSection();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateFullMenuSection
-        /// </summary>
-        [Test]
-        public void CreateFullMenuSectionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateFullMenuSection
-            //Assert.IsInstanceOfType<CreateFullMenuSection> (instance, "variable 'instance' is a CreateFullMenuSection");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuSectionAvailability'
-        /// </summary>
-        [Test]
-        public void MenuSectionAvailabilityTest()
-        {
-            // TODO unit test for the property 'MenuSectionAvailability'
-        }
-        /// <summary>
-        /// Test the property 'MenuItems'
-        /// </summary>
-        [Test]
-        public void MenuItemsTest()
-        {
-            // TODO unit test for the property 'MenuItems'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'IsHiddenFromCustomers'
-        /// </summary>
-        [Test]
-        public void IsHiddenFromCustomersTest()
-        {
-            // TODO unit test for the property 'IsHiddenFromCustomers'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateFullMenuTests.cs b/src/Flipdish.Test/Model/CreateFullMenuTests.cs
deleted file mode 100644
index d1a9bc84..00000000
--- a/src/Flipdish.Test/Model/CreateFullMenuTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateFullMenu
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateFullMenuTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateFullMenu
-        //private CreateFullMenu instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateFullMenu
-            //instance = new CreateFullMenu();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateFullMenu
-        /// </summary>
-        [Test]
-        public void CreateFullMenuInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateFullMenu
-            //Assert.IsInstanceOfType<CreateFullMenu> (instance, "variable 'instance' is a CreateFullMenu");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-        /// <summary>
-        /// Test the property 'MenuSections'
-        /// </summary>
-        [Test]
-        public void MenuSectionsTest()
-        {
-            // TODO unit test for the property 'MenuSections'
-        }
-        /// <summary>
-        /// Test the property 'TaxRates'
-        /// </summary>
-        [Test]
-        public void TaxRatesTest()
-        {
-            // TODO unit test for the property 'TaxRates'
-        }
-        /// <summary>
-        /// Test the property 'DisplaySectionLinks'
-        /// </summary>
-        [Test]
-        public void DisplaySectionLinksTest()
-        {
-            // TODO unit test for the property 'DisplaySectionLinks'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionBehaviour'
-        /// </summary>
-        [Test]
-        public void MenuSectionBehaviourTest()
-        {
-            // TODO unit test for the property 'MenuSectionBehaviour'
-        }
-        /// <summary>
-        /// Test the property 'TaxType'
-        /// </summary>
-        [Test]
-        public void TaxTypeTest()
-        {
-            // TODO unit test for the property 'TaxType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateGroupReferenceTests.cs b/src/Flipdish.Test/Model/CreateGroupReferenceTests.cs
deleted file mode 100644
index 87426552..00000000
--- a/src/Flipdish.Test/Model/CreateGroupReferenceTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateGroupReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateGroupReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateGroupReference
-        //private CreateGroupReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateGroupReference
-            //instance = new CreateGroupReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateGroupReference
-        /// </summary>
-        [Test]
-        public void CreateGroupReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateGroupReference
-            //Assert.IsInstanceOfType<CreateGroupReference> (instance, "variable 'instance' is a CreateGroupReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogGroupId'
-        /// </summary>
-        [Test]
-        public void CatalogGroupIdTest()
-        {
-            // TODO unit test for the property 'CatalogGroupId'
-        }
-        /// <summary>
-        /// Test the property 'GroupType'
-        /// </summary>
-        [Test]
-        public void GroupTypeTest()
-        {
-            // TODO unit test for the property 'GroupType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateGroupTests.cs b/src/Flipdish.Test/Model/CreateGroupTests.cs
deleted file mode 100644
index 6e0dcda2..00000000
--- a/src/Flipdish.Test/Model/CreateGroupTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateGroup
-        //private CreateGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateGroup
-            //instance = new CreateGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateGroup
-        /// </summary>
-        [Test]
-        public void CreateGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateGroup
-            //Assert.IsInstanceOfType<CreateGroup> (instance, "variable 'instance' is a CreateGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MinSelectCount'
-        /// </summary>
-        [Test]
-        public void MinSelectCountTest()
-        {
-            // TODO unit test for the property 'MinSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelectCount'
-        /// </summary>
-        [Test]
-        public void MaxSelectCountTest()
-        {
-            // TODO unit test for the property 'MaxSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'Products'
-        /// </summary>
-        [Test]
-        public void ProductsTest()
-        {
-            // TODO unit test for the property 'Products'
-        }
-        /// <summary>
-        /// Test the property 'Metafields'
-        /// </summary>
-        [Test]
-        public void MetafieldsTest()
-        {
-            // TODO unit test for the property 'Metafields'
-        }
-        /// <summary>
-        /// Test the property 'GroupType'
-        /// </summary>
-        [Test]
-        public void GroupTypeTest()
-        {
-            // TODO unit test for the property 'GroupType'
-        }
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'AutogenerateDisplayText'
-        /// </summary>
-        [Test]
-        public void AutogenerateDisplayTextTest()
-        {
-            // TODO unit test for the property 'AutogenerateDisplayText'
-        }
-        /// <summary>
-        /// Test the property 'ImageFileName'
-        /// </summary>
-        [Test]
-        public void ImageFileNameTest()
-        {
-            // TODO unit test for the property 'ImageFileName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateLocationAreaTests.cs b/src/Flipdish.Test/Model/CreateLocationAreaTests.cs
deleted file mode 100644
index 9991f7ed..00000000
--- a/src/Flipdish.Test/Model/CreateLocationAreaTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateLocationArea
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateLocationAreaTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateLocationArea
-        //private CreateLocationArea instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateLocationArea
-            //instance = new CreateLocationArea();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateLocationArea
-        /// </summary>
-        [Test]
-        public void CreateLocationAreaInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateLocationArea
-            //Assert.IsInstanceOfType<CreateLocationArea> (instance, "variable 'instance' is a CreateLocationArea");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationAreaName'
-        /// </summary>
-        [Test]
-        public void LocationAreaNameTest()
-        {
-            // TODO unit test for the property 'LocationAreaName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateLocationTests.cs b/src/Flipdish.Test/Model/CreateLocationTests.cs
deleted file mode 100644
index 6b480e75..00000000
--- a/src/Flipdish.Test/Model/CreateLocationTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateLocation
-        //private CreateLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateLocation
-            //instance = new CreateLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateLocation
-        /// </summary>
-        [Test]
-        public void CreateLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateLocation
-            //Assert.IsInstanceOfType<CreateLocation> (instance, "variable 'instance' is a CreateLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationName'
-        /// </summary>
-        [Test]
-        public void LocationNameTest()
-        {
-            // TODO unit test for the property 'LocationName'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'ExternalLocationId'
-        /// </summary>
-        [Test]
-        public void ExternalLocationIdTest()
-        {
-            // TODO unit test for the property 'ExternalLocationId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateMenuSectionItemFromCatalogItemsTests.cs b/src/Flipdish.Test/Model/CreateMenuSectionItemFromCatalogItemsTests.cs
deleted file mode 100644
index 0f146bc7..00000000
--- a/src/Flipdish.Test/Model/CreateMenuSectionItemFromCatalogItemsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateMenuSectionItemFromCatalogItems
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateMenuSectionItemFromCatalogItemsTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateMenuSectionItemFromCatalogItems
-        //private CreateMenuSectionItemFromCatalogItems instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateMenuSectionItemFromCatalogItems
-            //instance = new CreateMenuSectionItemFromCatalogItems();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateMenuSectionItemFromCatalogItems
-        /// </summary>
-        [Test]
-        public void CreateMenuSectionItemFromCatalogItemsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateMenuSectionItemFromCatalogItems
-            //Assert.IsInstanceOfType<CreateMenuSectionItemFromCatalogItems> (instance, "variable 'instance' is a CreateMenuSectionItemFromCatalogItems");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuCatalogItems'
-        /// </summary>
-        [Test]
-        public void MenuCatalogItemsTest()
-        {
-            // TODO unit test for the property 'MenuCatalogItems'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateMenuSectionItemFromProductsTests.cs b/src/Flipdish.Test/Model/CreateMenuSectionItemFromProductsTests.cs
deleted file mode 100644
index dcdf5a1d..00000000
--- a/src/Flipdish.Test/Model/CreateMenuSectionItemFromProductsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateMenuSectionItemFromProducts
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateMenuSectionItemFromProductsTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateMenuSectionItemFromProducts
-        //private CreateMenuSectionItemFromProducts instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateMenuSectionItemFromProducts
-            //instance = new CreateMenuSectionItemFromProducts();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateMenuSectionItemFromProducts
-        /// </summary>
-        [Test]
-        public void CreateMenuSectionItemFromProductsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateMenuSectionItemFromProducts
-            //Assert.IsInstanceOfType<CreateMenuSectionItemFromProducts> (instance, "variable 'instance' is a CreateMenuSectionItemFromProducts");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ProductItems'
-        /// </summary>
-        [Test]
-        public void ProductItemsTest()
-        {
-            // TODO unit test for the property 'ProductItems'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateMenuTaxRateTests.cs b/src/Flipdish.Test/Model/CreateMenuTaxRateTests.cs
deleted file mode 100644
index 33fae370..00000000
--- a/src/Flipdish.Test/Model/CreateMenuTaxRateTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateMenuTaxRate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateMenuTaxRateTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateMenuTaxRate
-        //private CreateMenuTaxRate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateMenuTaxRate
-            //instance = new CreateMenuTaxRate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateMenuTaxRate
-        /// </summary>
-        [Test]
-        public void CreateMenuTaxRateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateMenuTaxRate
-            //Assert.IsInstanceOfType<CreateMenuTaxRate> (instance, "variable 'instance' is a CreateMenuTaxRate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Rate'
-        /// </summary>
-        [Test]
-        public void RateTest()
-        {
-            // TODO unit test for the property 'Rate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateMetadataTests.cs b/src/Flipdish.Test/Model/CreateMetadataTests.cs
deleted file mode 100644
index 2e67a6a7..00000000
--- a/src/Flipdish.Test/Model/CreateMetadataTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateMetadata
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateMetadataTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateMetadata
-        //private CreateMetadata instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateMetadata
-            //instance = new CreateMetadata();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateMetadata
-        /// </summary>
-        [Test]
-        public void CreateMetadataInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateMetadata
-            //Assert.IsInstanceOfType<CreateMetadata> (instance, "variable 'instance' is a CreateMetadata");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateMetafieldDefinitionTests.cs b/src/Flipdish.Test/Model/CreateMetafieldDefinitionTests.cs
deleted file mode 100644
index 7901b704..00000000
--- a/src/Flipdish.Test/Model/CreateMetafieldDefinitionTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateMetafieldDefinition
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateMetafieldDefinitionTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateMetafieldDefinition
-        //private CreateMetafieldDefinition instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateMetafieldDefinition
-            //instance = new CreateMetafieldDefinition();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateMetafieldDefinition
-        /// </summary>
-        [Test]
-        public void CreateMetafieldDefinitionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateMetafieldDefinition
-            //Assert.IsInstanceOfType<CreateMetafieldDefinition> (instance, "variable 'instance' is a CreateMetafieldDefinition");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OwnerEntity'
-        /// </summary>
-        [Test]
-        public void OwnerEntityTest()
-        {
-            // TODO unit test for the property 'OwnerEntity'
-        }
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'IsReadOnly'
-        /// </summary>
-        [Test]
-        public void IsReadOnlyTest()
-        {
-            // TODO unit test for the property 'IsReadOnly'
-        }
-        /// <summary>
-        /// Test the property 'ValueType'
-        /// </summary>
-        [Test]
-        public void ValueTypeTest()
-        {
-            // TODO unit test for the property 'ValueType'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Behaviors'
-        /// </summary>
-        [Test]
-        public void BehaviorsTest()
-        {
-            // TODO unit test for the property 'Behaviors'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateModifierGroupTests.cs b/src/Flipdish.Test/Model/CreateModifierGroupTests.cs
deleted file mode 100644
index b372eac6..00000000
--- a/src/Flipdish.Test/Model/CreateModifierGroupTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateModifierGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateModifierGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateModifierGroup
-        //private CreateModifierGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateModifierGroup
-            //instance = new CreateModifierGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateModifierGroup
-        /// </summary>
-        [Test]
-        public void CreateModifierGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateModifierGroup
-            //Assert.IsInstanceOfType<CreateModifierGroup> (instance, "variable 'instance' is a CreateModifierGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateModifierTests.cs b/src/Flipdish.Test/Model/CreateModifierTests.cs
deleted file mode 100644
index e0d8b676..00000000
--- a/src/Flipdish.Test/Model/CreateModifierTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateModifier
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateModifierTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateModifier
-        //private CreateModifier instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateModifier
-            //instance = new CreateModifier();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateModifier
-        /// </summary>
-        [Test]
-        public void CreateModifierInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateModifier
-            //Assert.IsInstanceOfType<CreateModifier> (instance, "variable 'instance' is a CreateModifier");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateProductReferenceTests.cs b/src/Flipdish.Test/Model/CreateProductReferenceTests.cs
deleted file mode 100644
index 18f8ad1a..00000000
--- a/src/Flipdish.Test/Model/CreateProductReferenceTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateProductReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateProductReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateProductReference
-        //private CreateProductReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateProductReference
-            //instance = new CreateProductReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateProductReference
-        /// </summary>
-        [Test]
-        public void CreateProductReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateProductReference
-            //Assert.IsInstanceOfType<CreateProductReference> (instance, "variable 'instance' is a CreateProductReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'ProductType'
-        /// </summary>
-        [Test]
-        public void ProductTypeTest()
-        {
-            // TODO unit test for the property 'ProductType'
-        }
-        /// <summary>
-        /// Test the property 'PreselectedQuantity'
-        /// </summary>
-        [Test]
-        public void PreselectedQuantityTest()
-        {
-            // TODO unit test for the property 'PreselectedQuantity'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateProductTests.cs b/src/Flipdish.Test/Model/CreateProductTests.cs
deleted file mode 100644
index 3c10540e..00000000
--- a/src/Flipdish.Test/Model/CreateProductTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateProductTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateProduct
-        //private CreateProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateProduct
-            //instance = new CreateProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateProduct
-        /// </summary>
-        [Test]
-        public void CreateProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateProduct
-            //Assert.IsInstanceOfType<CreateProduct> (instance, "variable 'instance' is a CreateProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateSimpleProductTests.cs b/src/Flipdish.Test/Model/CreateSimpleProductTests.cs
deleted file mode 100644
index 9cbf3bf4..00000000
--- a/src/Flipdish.Test/Model/CreateSimpleProductTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateSimpleProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateSimpleProductTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateSimpleProduct
-        //private CreateSimpleProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateSimpleProduct
-            //instance = new CreateSimpleProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateSimpleProduct
-        /// </summary>
-        [Test]
-        public void CreateSimpleProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateSimpleProduct
-            //Assert.IsInstanceOfType<CreateSimpleProduct> (instance, "variable 'instance' is a CreateSimpleProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateTeammateTests.cs b/src/Flipdish.Test/Model/CreateTeammateTests.cs
deleted file mode 100644
index 60862357..00000000
--- a/src/Flipdish.Test/Model/CreateTeammateTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateTeammate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateTeammateTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateTeammate
-        //private CreateTeammate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateTeammate
-            //instance = new CreateTeammate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateTeammate
-        /// </summary>
-        [Test]
-        public void CreateTeammateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateTeammate
-            //Assert.IsInstanceOfType<CreateTeammate> (instance, "variable 'instance' is a CreateTeammate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'AppAccessLevel'
-        /// </summary>
-        [Test]
-        public void AppAccessLevelTest()
-        {
-            // TODO unit test for the property 'AppAccessLevel'
-        }
-        /// <summary>
-        /// Test the property 'HasAccessToAllStores'
-        /// </summary>
-        [Test]
-        public void HasAccessToAllStoresTest()
-        {
-            // TODO unit test for the property 'HasAccessToAllStores'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreateVoucherTests.cs b/src/Flipdish.Test/Model/CreateVoucherTests.cs
deleted file mode 100644
index 7a5ac2eb..00000000
--- a/src/Flipdish.Test/Model/CreateVoucherTests.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreateVoucher
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreateVoucherTests
-    {
-        // TODO uncomment below to declare an instance variable for CreateVoucher
-        //private CreateVoucher instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreateVoucher
-            //instance = new CreateVoucher();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreateVoucher
-        /// </summary>
-        [Test]
-        public void CreateVoucherInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreateVoucher
-            //Assert.IsInstanceOfType<CreateVoucher> (instance, "variable 'instance' is a CreateVoucher");
-        }
-
-
-        /// <summary>
-        /// Test the property 'VoucherType'
-        /// </summary>
-        [Test]
-        public void VoucherTypeTest()
-        {
-            // TODO unit test for the property 'VoucherType'
-        }
-        /// <summary>
-        /// Test the property 'Stores'
-        /// </summary>
-        [Test]
-        public void StoresTest()
-        {
-            // TODO unit test for the property 'Stores'
-        }
-        /// <summary>
-        /// Test the property 'AddItemDetails'
-        /// </summary>
-        [Test]
-        public void AddItemDetailsTest()
-        {
-            // TODO unit test for the property 'AddItemDetails'
-        }
-        /// <summary>
-        /// Test the property 'CreditNoteDetails'
-        /// </summary>
-        [Test]
-        public void CreditNoteDetailsTest()
-        {
-            // TODO unit test for the property 'CreditNoteDetails'
-        }
-        /// <summary>
-        /// Test the property 'LumpDiscountDetails'
-        /// </summary>
-        [Test]
-        public void LumpDiscountDetailsTest()
-        {
-            // TODO unit test for the property 'LumpDiscountDetails'
-        }
-        /// <summary>
-        /// Test the property 'PercentDiscountDetails'
-        /// </summary>
-        [Test]
-        public void PercentDiscountDetailsTest()
-        {
-            // TODO unit test for the property 'PercentDiscountDetails'
-        }
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'ValidOnOrdersOver'
-        /// </summary>
-        [Test]
-        public void ValidOnOrdersOverTest()
-        {
-            // TODO unit test for the property 'ValidOnOrdersOver'
-        }
-        /// <summary>
-        /// Test the property 'TakesPriority'
-        /// </summary>
-        [Test]
-        public void TakesPriorityTest()
-        {
-            // TODO unit test for the property 'TakesPriority'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsAutomaticallyApplied'
-        /// </summary>
-        [Test]
-        public void IsAutomaticallyAppliedTest()
-        {
-            // TODO unit test for the property 'IsAutomaticallyApplied'
-        }
-        /// <summary>
-        /// Test the property 'IncludeDeliveryFee'
-        /// </summary>
-        [Test]
-        public void IncludeDeliveryFeeTest()
-        {
-            // TODO unit test for the property 'IncludeDeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForDeliveryOrders'
-        /// </summary>
-        [Test]
-        public void IsValidForDeliveryOrdersTest()
-        {
-            // TODO unit test for the property 'IsValidForDeliveryOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForPickupOrders'
-        /// </summary>
-        [Test]
-        public void IsValidForPickupOrdersTest()
-        {
-            // TODO unit test for the property 'IsValidForPickupOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForOrdersPayedOnline'
-        /// </summary>
-        [Test]
-        public void IsValidForOrdersPayedOnlineTest()
-        {
-            // TODO unit test for the property 'IsValidForOrdersPayedOnline'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForOrdersPayedByCash'
-        /// </summary>
-        [Test]
-        public void IsValidForOrdersPayedByCashTest()
-        {
-            // TODO unit test for the property 'IsValidForOrdersPayedByCash'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForFirstOrderOnly'
-        /// </summary>
-        [Test]
-        public void IsValidForFirstOrderOnlyTest()
-        {
-            // TODO unit test for the property 'IsValidForFirstOrderOnly'
-        }
-        /// <summary>
-        /// Test the property 'IsValidOncePerCustomer'
-        /// </summary>
-        [Test]
-        public void IsValidOncePerCustomerTest()
-        {
-            // TODO unit test for the property 'IsValidOncePerCustomer'
-        }
-        /// <summary>
-        /// Test the property 'IsValidOnlyOnce'
-        /// </summary>
-        [Test]
-        public void IsValidOnlyOnceTest()
-        {
-            // TODO unit test for the property 'IsValidOnlyOnce'
-        }
-        /// <summary>
-        /// Test the property 'StartDate'
-        /// </summary>
-        [Test]
-        public void StartDateTest()
-        {
-            // TODO unit test for the property 'StartDate'
-        }
-        /// <summary>
-        /// Test the property 'ExpiryDate'
-        /// </summary>
-        [Test]
-        public void ExpiryDateTest()
-        {
-            // TODO unit test for the property 'ExpiryDate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreatedMenuSectionItemsTests.cs b/src/Flipdish.Test/Model/CreatedMenuSectionItemsTests.cs
deleted file mode 100644
index 46ca7e9c..00000000
--- a/src/Flipdish.Test/Model/CreatedMenuSectionItemsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreatedMenuSectionItems
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreatedMenuSectionItemsTests
-    {
-        // TODO uncomment below to declare an instance variable for CreatedMenuSectionItems
-        //private CreatedMenuSectionItems instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreatedMenuSectionItems
-            //instance = new CreatedMenuSectionItems();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreatedMenuSectionItems
-        /// </summary>
-        [Test]
-        public void CreatedMenuSectionItemsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreatedMenuSectionItems
-            //Assert.IsInstanceOfType<CreatedMenuSectionItems> (instance, "variable 'instance' is a CreatedMenuSectionItems");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuSectionItems'
-        /// </summary>
-        [Test]
-        public void MenuSectionItemsTest()
-        {
-            // TODO unit test for the property 'MenuSectionItems'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CreditNoteDetailsTests.cs b/src/Flipdish.Test/Model/CreditNoteDetailsTests.cs
deleted file mode 100644
index 6e108702..00000000
--- a/src/Flipdish.Test/Model/CreditNoteDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CreditNoteDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CreditNoteDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for CreditNoteDetails
-        //private CreditNoteDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CreditNoteDetails
-            //instance = new CreditNoteDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CreditNoteDetails
-        /// </summary>
-        [Test]
-        public void CreditNoteDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CreditNoteDetails
-            //Assert.IsInstanceOfType<CreditNoteDetails> (instance, "variable 'instance' is a CreditNoteDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'RemainingCredit'
-        /// </summary>
-        [Test]
-        public void RemainingCreditTest()
-        {
-            // TODO unit test for the property 'RemainingCredit'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CspReportRequestTests.cs b/src/Flipdish.Test/Model/CspReportRequestTests.cs
deleted file mode 100644
index 2c42255f..00000000
--- a/src/Flipdish.Test/Model/CspReportRequestTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CspReportRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CspReportRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for CspReportRequest
-        //private CspReportRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CspReportRequest
-            //instance = new CspReportRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CspReportRequest
-        /// </summary>
-        [Test]
-        public void CspReportRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CspReportRequest
-            //Assert.IsInstanceOfType<CspReportRequest> (instance, "variable 'instance' is a CspReportRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Csp_report'
-        /// </summary>
-        [Test]
-        public void Csp_reportTest()
-        {
-            // TODO unit test for the property 'Csp_report'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CspReportTests.cs b/src/Flipdish.Test/Model/CspReportTests.cs
deleted file mode 100644
index e9ce0cbb..00000000
--- a/src/Flipdish.Test/Model/CspReportTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CspReport
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CspReportTests
-    {
-        // TODO uncomment below to declare an instance variable for CspReport
-        //private CspReport instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CspReport
-            //instance = new CspReport();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CspReport
-        /// </summary>
-        [Test]
-        public void CspReportInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CspReport
-            //Assert.IsInstanceOfType<CspReport> (instance, "variable 'instance' is a CspReport");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Document_uri'
-        /// </summary>
-        [Test]
-        public void Document_uriTest()
-        {
-            // TODO unit test for the property 'Document_uri'
-        }
-        /// <summary>
-        /// Test the property 'Referrer'
-        /// </summary>
-        [Test]
-        public void ReferrerTest()
-        {
-            // TODO unit test for the property 'Referrer'
-        }
-        /// <summary>
-        /// Test the property 'Violated_directive'
-        /// </summary>
-        [Test]
-        public void Violated_directiveTest()
-        {
-            // TODO unit test for the property 'Violated_directive'
-        }
-        /// <summary>
-        /// Test the property 'Effective_directive'
-        /// </summary>
-        [Test]
-        public void Effective_directiveTest()
-        {
-            // TODO unit test for the property 'Effective_directive'
-        }
-        /// <summary>
-        /// Test the property 'Original_policy'
-        /// </summary>
-        [Test]
-        public void Original_policyTest()
-        {
-            // TODO unit test for the property 'Original_policy'
-        }
-        /// <summary>
-        /// Test the property 'Blocked_uri'
-        /// </summary>
-        [Test]
-        public void Blocked_uriTest()
-        {
-            // TODO unit test for the property 'Blocked_uri'
-        }
-        /// <summary>
-        /// Test the property 'Status_code'
-        /// </summary>
-        [Test]
-        public void Status_codeTest()
-        {
-            // TODO unit test for the property 'Status_code'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CurrencyDataTests.cs b/src/Flipdish.Test/Model/CurrencyDataTests.cs
deleted file mode 100644
index 24450376..00000000
--- a/src/Flipdish.Test/Model/CurrencyDataTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CurrencyData
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CurrencyDataTests
-    {
-        // TODO uncomment below to declare an instance variable for CurrencyData
-        //private CurrencyData instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CurrencyData
-            //instance = new CurrencyData();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CurrencyData
-        /// </summary>
-        [Test]
-        public void CurrencyDataInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CurrencyData
-            //Assert.IsInstanceOfType<CurrencyData> (instance, "variable 'instance' is a CurrencyData");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CustomerConsentUpdatedEventTests.cs b/src/Flipdish.Test/Model/CustomerConsentUpdatedEventTests.cs
deleted file mode 100644
index 63f0eb78..00000000
--- a/src/Flipdish.Test/Model/CustomerConsentUpdatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CustomerConsentUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CustomerConsentUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CustomerConsentUpdatedEvent
-        //private CustomerConsentUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CustomerConsentUpdatedEvent
-            //instance = new CustomerConsentUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CustomerConsentUpdatedEvent
-        /// </summary>
-        [Test]
-        public void CustomerConsentUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CustomerConsentUpdatedEvent
-            //Assert.IsInstanceOfType<CustomerConsentUpdatedEvent> (instance, "variable 'instance' is a CustomerConsentUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Enabled'
-        /// </summary>
-        [Test]
-        public void EnabledTest()
-        {
-            // TODO unit test for the property 'Enabled'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CustomerCreatedEventTests.cs b/src/Flipdish.Test/Model/CustomerCreatedEventTests.cs
deleted file mode 100644
index 0c354659..00000000
--- a/src/Flipdish.Test/Model/CustomerCreatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CustomerCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CustomerCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CustomerCreatedEvent
-        //private CustomerCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CustomerCreatedEvent
-            //instance = new CustomerCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CustomerCreatedEvent
-        /// </summary>
-        [Test]
-        public void CustomerCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CustomerCreatedEvent
-            //Assert.IsInstanceOfType<CustomerCreatedEvent> (instance, "variable 'instance' is a CustomerCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CustomerDeliveryTrackingOrderLineTests.cs b/src/Flipdish.Test/Model/CustomerDeliveryTrackingOrderLineTests.cs
deleted file mode 100644
index 9ace6e66..00000000
--- a/src/Flipdish.Test/Model/CustomerDeliveryTrackingOrderLineTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CustomerDeliveryTrackingOrderLine
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CustomerDeliveryTrackingOrderLineTests
-    {
-        // TODO uncomment below to declare an instance variable for CustomerDeliveryTrackingOrderLine
-        //private CustomerDeliveryTrackingOrderLine instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CustomerDeliveryTrackingOrderLine
-            //instance = new CustomerDeliveryTrackingOrderLine();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CustomerDeliveryTrackingOrderLine
-        /// </summary>
-        [Test]
-        public void CustomerDeliveryTrackingOrderLineInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CustomerDeliveryTrackingOrderLine
-            //Assert.IsInstanceOfType<CustomerDeliveryTrackingOrderLine> (instance, "variable 'instance' is a CustomerDeliveryTrackingOrderLine");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ItemName'
-        /// </summary>
-        [Test]
-        public void ItemNameTest()
-        {
-            // TODO unit test for the property 'ItemName'
-        }
-        /// <summary>
-        /// Test the property 'SelectedOptions'
-        /// </summary>
-        [Test]
-        public void SelectedOptionsTest()
-        {
-            // TODO unit test for the property 'SelectedOptions'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CustomerDeliveryTrackingOrderTests.cs b/src/Flipdish.Test/Model/CustomerDeliveryTrackingOrderTests.cs
deleted file mode 100644
index 286dc9e4..00000000
--- a/src/Flipdish.Test/Model/CustomerDeliveryTrackingOrderTests.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CustomerDeliveryTrackingOrder
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CustomerDeliveryTrackingOrderTests
-    {
-        // TODO uncomment below to declare an instance variable for CustomerDeliveryTrackingOrder
-        //private CustomerDeliveryTrackingOrder instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CustomerDeliveryTrackingOrder
-            //instance = new CustomerDeliveryTrackingOrder();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CustomerDeliveryTrackingOrder
-        /// </summary>
-        [Test]
-        public void CustomerDeliveryTrackingOrderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CustomerDeliveryTrackingOrder
-            //Assert.IsInstanceOfType<CustomerDeliveryTrackingOrder> (instance, "variable 'instance' is a CustomerDeliveryTrackingOrder");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'Address'
-        /// </summary>
-        [Test]
-        public void AddressTest()
-        {
-            // TODO unit test for the property 'Address'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryNotes'
-        /// </summary>
-        [Test]
-        public void DeliveryNotesTest()
-        {
-            // TODO unit test for the property 'DeliveryNotes'
-        }
-        /// <summary>
-        /// Test the property 'StorePhoneNumber'
-        /// </summary>
-        [Test]
-        public void StorePhoneNumberTest()
-        {
-            // TODO unit test for the property 'StorePhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'AppIconUrl'
-        /// </summary>
-        [Test]
-        public void AppIconUrlTest()
-        {
-            // TODO unit test for the property 'AppIconUrl'
-        }
-        /// <summary>
-        /// Test the property 'OrderTrackingCode'
-        /// </summary>
-        [Test]
-        public void OrderTrackingCodeTest()
-        {
-            // TODO unit test for the property 'OrderTrackingCode'
-        }
-        /// <summary>
-        /// Test the property 'PaymentMethodDescription'
-        /// </summary>
-        [Test]
-        public void PaymentMethodDescriptionTest()
-        {
-            // TODO unit test for the property 'PaymentMethodDescription'
-        }
-        /// <summary>
-        /// Test the property 'LastFourDigits'
-        /// </summary>
-        [Test]
-        public void LastFourDigitsTest()
-        {
-            // TODO unit test for the property 'LastFourDigits'
-        }
-        /// <summary>
-        /// Test the property 'OrderLines'
-        /// </summary>
-        [Test]
-        public void OrderLinesTest()
-        {
-            // TODO unit test for the property 'OrderLines'
-        }
-        /// <summary>
-        /// Test the property 'TotalAmount'
-        /// </summary>
-        [Test]
-        public void TotalAmountTest()
-        {
-            // TODO unit test for the property 'TotalAmount'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'Latitude'
-        /// </summary>
-        [Test]
-        public void LatitudeTest()
-        {
-            // TODO unit test for the property 'Latitude'
-        }
-        /// <summary>
-        /// Test the property 'Longitude'
-        /// </summary>
-        [Test]
-        public void LongitudeTest()
-        {
-            // TODO unit test for the property 'Longitude'
-        }
-        /// <summary>
-        /// Test the property 'Placed'
-        /// </summary>
-        [Test]
-        public void PlacedTest()
-        {
-            // TODO unit test for the property 'Placed'
-        }
-        /// <summary>
-        /// Test the property 'RequestedFor'
-        /// </summary>
-        [Test]
-        public void RequestedForTest()
-        {
-            // TODO unit test for the property 'RequestedFor'
-        }
-        /// <summary>
-        /// Test the property 'DriverId'
-        /// </summary>
-        [Test]
-        public void DriverIdTest()
-        {
-            // TODO unit test for the property 'DriverId'
-        }
-        /// <summary>
-        /// Test the property 'DriverName'
-        /// </summary>
-        [Test]
-        public void DriverNameTest()
-        {
-            // TODO unit test for the property 'DriverName'
-        }
-        /// <summary>
-        /// Test the property 'DriverImage'
-        /// </summary>
-        [Test]
-        public void DriverImageTest()
-        {
-            // TODO unit test for the property 'DriverImage'
-        }
-        /// <summary>
-        /// Test the property 'EstimatedMinutesForDelivery'
-        /// </summary>
-        [Test]
-        public void EstimatedMinutesForDeliveryTest()
-        {
-            // TODO unit test for the property 'EstimatedMinutesForDelivery'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CustomerSummaryTests.cs b/src/Flipdish.Test/Model/CustomerSummaryTests.cs
deleted file mode 100644
index 78c9d610..00000000
--- a/src/Flipdish.Test/Model/CustomerSummaryTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CustomerSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CustomerSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for CustomerSummary
-        //private CustomerSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CustomerSummary
-            //instance = new CustomerSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CustomerSummary
-        /// </summary>
-        [Test]
-        public void CustomerSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CustomerSummary
-            //Assert.IsInstanceOfType<CustomerSummary> (instance, "variable 'instance' is a CustomerSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'EmailAddress'
-        /// </summary>
-        [Test]
-        public void EmailAddressTest()
-        {
-            // TODO unit test for the property 'EmailAddress'
-        }
-        /// <summary>
-        /// Test the property 'PhoneNumberLocalFormat'
-        /// </summary>
-        [Test]
-        public void PhoneNumberLocalFormatTest()
-        {
-            // TODO unit test for the property 'PhoneNumberLocalFormat'
-        }
-        /// <summary>
-        /// Test the property 'PhoneNumber'
-        /// </summary>
-        [Test]
-        public void PhoneNumberTest()
-        {
-            // TODO unit test for the property 'PhoneNumber'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CustomerTests.cs b/src/Flipdish.Test/Model/CustomerTests.cs
deleted file mode 100644
index b6e4b8b9..00000000
--- a/src/Flipdish.Test/Model/CustomerTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Customer
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CustomerTests
-    {
-        // TODO uncomment below to declare an instance variable for Customer
-        //private Customer instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Customer
-            //instance = new Customer();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Customer
-        /// </summary>
-        [Test]
-        public void CustomerInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Customer
-            //Assert.IsInstanceOfType<Customer> (instance, "variable 'instance' is a Customer");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CustomerId'
-        /// </summary>
-        [Test]
-        public void CustomerIdTest()
-        {
-            // TODO unit test for the property 'CustomerId'
-        }
-        /// <summary>
-        /// Test the property 'RegistrationDate'
-        /// </summary>
-        [Test]
-        public void RegistrationDateTest()
-        {
-            // TODO unit test for the property 'RegistrationDate'
-        }
-        /// <summary>
-        /// Test the property 'CashOrdersEnabled'
-        /// </summary>
-        [Test]
-        public void CashOrdersEnabledTest()
-        {
-            // TODO unit test for the property 'CashOrdersEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CardOrdersEnabled'
-        /// </summary>
-        [Test]
-        public void CardOrdersEnabledTest()
-        {
-            // TODO unit test for the property 'CardOrdersEnabled'
-        }
-        /// <summary>
-        /// Test the property 'MarketingEnabled'
-        /// </summary>
-        [Test]
-        public void MarketingEnabledTest()
-        {
-            // TODO unit test for the property 'MarketingEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CustomerUpdateModelTests.cs b/src/Flipdish.Test/Model/CustomerUpdateModelTests.cs
deleted file mode 100644
index e5b6a126..00000000
--- a/src/Flipdish.Test/Model/CustomerUpdateModelTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CustomerUpdateModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CustomerUpdateModelTests
-    {
-        // TODO uncomment below to declare an instance variable for CustomerUpdateModel
-        //private CustomerUpdateModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CustomerUpdateModel
-            //instance = new CustomerUpdateModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CustomerUpdateModel
-        /// </summary>
-        [Test]
-        public void CustomerUpdateModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CustomerUpdateModel
-            //Assert.IsInstanceOfType<CustomerUpdateModel> (instance, "variable 'instance' is a CustomerUpdateModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CashOrdersEnabled'
-        /// </summary>
-        [Test]
-        public void CashOrdersEnabledTest()
-        {
-            // TODO unit test for the property 'CashOrdersEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CardOrdersEnabled'
-        /// </summary>
-        [Test]
-        public void CardOrdersEnabledTest()
-        {
-            // TODO unit test for the property 'CardOrdersEnabled'
-        }
-        /// <summary>
-        /// Test the property 'MarketingEnabled'
-        /// </summary>
-        [Test]
-        public void MarketingEnabledTest()
-        {
-            // TODO unit test for the property 'MarketingEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/CustomerUpdatedEventTests.cs b/src/Flipdish.Test/Model/CustomerUpdatedEventTests.cs
deleted file mode 100644
index 86422aa0..00000000
--- a/src/Flipdish.Test/Model/CustomerUpdatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing CustomerUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class CustomerUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for CustomerUpdatedEvent
-        //private CustomerUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of CustomerUpdatedEvent
-            //instance = new CustomerUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of CustomerUpdatedEvent
-        /// </summary>
-        [Test]
-        public void CustomerUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" CustomerUpdatedEvent
-            //Assert.IsInstanceOfType<CustomerUpdatedEvent> (instance, "variable 'instance' is a CustomerUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DashboardEmbedTests.cs b/src/Flipdish.Test/Model/DashboardEmbedTests.cs
deleted file mode 100644
index efa8a739..00000000
--- a/src/Flipdish.Test/Model/DashboardEmbedTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DashboardEmbed
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DashboardEmbedTests
-    {
-        // TODO uncomment below to declare an instance variable for DashboardEmbed
-        //private DashboardEmbed instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DashboardEmbed
-            //instance = new DashboardEmbed();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DashboardEmbed
-        /// </summary>
-        [Test]
-        public void DashboardEmbedInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DashboardEmbed
-            //Assert.IsInstanceOfType<DashboardEmbed> (instance, "variable 'instance' is a DashboardEmbed");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EmbedUrl'
-        /// </summary>
-        [Test]
-        public void EmbedUrlTest()
-        {
-            // TODO unit test for the property 'EmbedUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DeliveryLocationTests.cs b/src/Flipdish.Test/Model/DeliveryLocationTests.cs
deleted file mode 100644
index 2d99dea2..00000000
--- a/src/Flipdish.Test/Model/DeliveryLocationTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeliveryLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DeliveryLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for DeliveryLocation
-        //private DeliveryLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DeliveryLocation
-            //instance = new DeliveryLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeliveryLocation
-        /// </summary>
-        [Test]
-        public void DeliveryLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DeliveryLocation
-            //Assert.IsInstanceOfType<DeliveryLocation> (instance, "variable 'instance' is a DeliveryLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Coordinates'
-        /// </summary>
-        [Test]
-        public void CoordinatesTest()
-        {
-            // TODO unit test for the property 'Coordinates'
-        }
-        /// <summary>
-        /// Test the property 'Building'
-        /// </summary>
-        [Test]
-        public void BuildingTest()
-        {
-            // TODO unit test for the property 'Building'
-        }
-        /// <summary>
-        /// Test the property 'Street'
-        /// </summary>
-        [Test]
-        public void StreetTest()
-        {
-            // TODO unit test for the property 'Street'
-        }
-        /// <summary>
-        /// Test the property 'Town'
-        /// </summary>
-        [Test]
-        public void TownTest()
-        {
-            // TODO unit test for the property 'Town'
-        }
-        /// <summary>
-        /// Test the property 'PostCode'
-        /// </summary>
-        [Test]
-        public void PostCodeTest()
-        {
-            // TODO unit test for the property 'PostCode'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryInstructions'
-        /// </summary>
-        [Test]
-        public void DeliveryInstructionsTest()
-        {
-            // TODO unit test for the property 'DeliveryInstructions'
-        }
-        /// <summary>
-        /// Test the property 'PrettyAddressString'
-        /// </summary>
-        [Test]
-        public void PrettyAddressStringTest()
-        {
-            // TODO unit test for the property 'PrettyAddressString'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DeliveryZoneBaseTests.cs b/src/Flipdish.Test/Model/DeliveryZoneBaseTests.cs
deleted file mode 100644
index b9acc797..00000000
--- a/src/Flipdish.Test/Model/DeliveryZoneBaseTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeliveryZoneBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DeliveryZoneBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for DeliveryZoneBase
-        //private DeliveryZoneBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DeliveryZoneBase
-            //instance = new DeliveryZoneBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeliveryZoneBase
-        /// </summary>
-        [Test]
-        public void DeliveryZoneBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DeliveryZoneBase
-            //Assert.IsInstanceOfType<DeliveryZoneBase> (instance, "variable 'instance' is a DeliveryZoneBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeliveryFee'
-        /// </summary>
-        [Test]
-        public void DeliveryFeeTest()
-        {
-            // TODO unit test for the property 'DeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'MinimumDeliveryOrderAmount'
-        /// </summary>
-        [Test]
-        public void MinimumDeliveryOrderAmountTest()
-        {
-            // TODO unit test for the property 'MinimumDeliveryOrderAmount'
-        }
-        /// <summary>
-        /// Test the property 'WellKnownText'
-        /// </summary>
-        [Test]
-        public void WellKnownTextTest()
-        {
-            // TODO unit test for the property 'WellKnownText'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DeliveryZoneCreatedEventTests.cs b/src/Flipdish.Test/Model/DeliveryZoneCreatedEventTests.cs
deleted file mode 100644
index 3d0d3565..00000000
--- a/src/Flipdish.Test/Model/DeliveryZoneCreatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeliveryZoneCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DeliveryZoneCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for DeliveryZoneCreatedEvent
-        //private DeliveryZoneCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DeliveryZoneCreatedEvent
-            //instance = new DeliveryZoneCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeliveryZoneCreatedEvent
-        /// </summary>
-        [Test]
-        public void DeliveryZoneCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DeliveryZoneCreatedEvent
-            //Assert.IsInstanceOfType<DeliveryZoneCreatedEvent> (instance, "variable 'instance' is a DeliveryZoneCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryZone'
-        /// </summary>
-        [Test]
-        public void DeliveryZoneTest()
-        {
-            // TODO unit test for the property 'DeliveryZone'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DeliveryZoneDeletedEventTests.cs b/src/Flipdish.Test/Model/DeliveryZoneDeletedEventTests.cs
deleted file mode 100644
index f504dc31..00000000
--- a/src/Flipdish.Test/Model/DeliveryZoneDeletedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeliveryZoneDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DeliveryZoneDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for DeliveryZoneDeletedEvent
-        //private DeliveryZoneDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DeliveryZoneDeletedEvent
-            //instance = new DeliveryZoneDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeliveryZoneDeletedEvent
-        /// </summary>
-        [Test]
-        public void DeliveryZoneDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DeliveryZoneDeletedEvent
-            //Assert.IsInstanceOfType<DeliveryZoneDeletedEvent> (instance, "variable 'instance' is a DeliveryZoneDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryZone'
-        /// </summary>
-        [Test]
-        public void DeliveryZoneTest()
-        {
-            // TODO unit test for the property 'DeliveryZone'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DeliveryZoneTests.cs b/src/Flipdish.Test/Model/DeliveryZoneTests.cs
deleted file mode 100644
index d9210d6a..00000000
--- a/src/Flipdish.Test/Model/DeliveryZoneTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeliveryZone
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DeliveryZoneTests
-    {
-        // TODO uncomment below to declare an instance variable for DeliveryZone
-        //private DeliveryZone instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DeliveryZone
-            //instance = new DeliveryZone();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeliveryZone
-        /// </summary>
-        [Test]
-        public void DeliveryZoneInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DeliveryZone
-            //Assert.IsInstanceOfType<DeliveryZone> (instance, "variable 'instance' is a DeliveryZone");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryFee'
-        /// </summary>
-        [Test]
-        public void DeliveryFeeTest()
-        {
-            // TODO unit test for the property 'DeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'MinimumDeliveryOrderAmount'
-        /// </summary>
-        [Test]
-        public void MinimumDeliveryOrderAmountTest()
-        {
-            // TODO unit test for the property 'MinimumDeliveryOrderAmount'
-        }
-        /// <summary>
-        /// Test the property 'WellKnownText'
-        /// </summary>
-        [Test]
-        public void WellKnownTextTest()
-        {
-            // TODO unit test for the property 'WellKnownText'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DeliveryZoneUpdatedEventTests.cs b/src/Flipdish.Test/Model/DeliveryZoneUpdatedEventTests.cs
deleted file mode 100644
index bf1ca7db..00000000
--- a/src/Flipdish.Test/Model/DeliveryZoneUpdatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeliveryZoneUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DeliveryZoneUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for DeliveryZoneUpdatedEvent
-        //private DeliveryZoneUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DeliveryZoneUpdatedEvent
-            //instance = new DeliveryZoneUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeliveryZoneUpdatedEvent
-        /// </summary>
-        [Test]
-        public void DeliveryZoneUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DeliveryZoneUpdatedEvent
-            //Assert.IsInstanceOfType<DeliveryZoneUpdatedEvent> (instance, "variable 'instance' is a DeliveryZoneUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryZone'
-        /// </summary>
-        [Test]
-        public void DeliveryZoneTest()
-        {
-            // TODO unit test for the property 'DeliveryZone'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DeviceSettingsTests.cs b/src/Flipdish.Test/Model/DeviceSettingsTests.cs
deleted file mode 100644
index 90c01f65..00000000
--- a/src/Flipdish.Test/Model/DeviceSettingsTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DeviceSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DeviceSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for DeviceSettings
-        //private DeviceSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DeviceSettings
-            //instance = new DeviceSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DeviceSettings
-        /// </summary>
-        [Test]
-        public void DeviceSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DeviceSettings
-            //Assert.IsInstanceOfType<DeviceSettings> (instance, "variable 'instance' is a DeviceSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Volume'
-        /// </summary>
-        [Test]
-        public void VolumeTest()
-        {
-            // TODO unit test for the property 'Volume'
-        }
-        /// <summary>
-        /// Test the property 'FontSize'
-        /// </summary>
-        [Test]
-        public void FontSizeTest()
-        {
-            // TODO unit test for the property 'FontSize'
-        }
-        /// <summary>
-        /// Test the property 'Brightness'
-        /// </summary>
-        [Test]
-        public void BrightnessTest()
-        {
-            // TODO unit test for the property 'Brightness'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DnsRecordInformationTests.cs b/src/Flipdish.Test/Model/DnsRecordInformationTests.cs
deleted file mode 100644
index 7d767730..00000000
--- a/src/Flipdish.Test/Model/DnsRecordInformationTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DnsRecordInformation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DnsRecordInformationTests
-    {
-        // TODO uncomment below to declare an instance variable for DnsRecordInformation
-        //private DnsRecordInformation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DnsRecordInformation
-            //instance = new DnsRecordInformation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DnsRecordInformation
-        /// </summary>
-        [Test]
-        public void DnsRecordInformationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DnsRecordInformation
-            //Assert.IsInstanceOfType<DnsRecordInformation> (instance, "variable 'instance' is a DnsRecordInformation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'IsCNameReady'
-        /// </summary>
-        [Test]
-        public void IsCNameReadyTest()
-        {
-            // TODO unit test for the property 'IsCNameReady'
-        }
-        /// <summary>
-        /// Test the property 'IsAReady'
-        /// </summary>
-        [Test]
-        public void IsAReadyTest()
-        {
-            // TODO unit test for the property 'IsAReady'
-        }
-        /// <summary>
-        /// Test the property 'IsApiCNameReady'
-        /// </summary>
-        [Test]
-        public void IsApiCNameReadyTest()
-        {
-            // TODO unit test for the property 'IsApiCNameReady'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DnsVerifiedEventTests.cs b/src/Flipdish.Test/Model/DnsVerifiedEventTests.cs
deleted file mode 100644
index 67cb200f..00000000
--- a/src/Flipdish.Test/Model/DnsVerifiedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DnsVerifiedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DnsVerifiedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for DnsVerifiedEvent
-        //private DnsVerifiedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DnsVerifiedEvent
-            //instance = new DnsVerifiedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DnsVerifiedEvent
-        /// </summary>
-        [Test]
-        public void DnsVerifiedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DnsVerifiedEvent
-            //Assert.IsInstanceOfType<DnsVerifiedEvent> (instance, "variable 'instance' is a DnsVerifiedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Hostname'
-        /// </summary>
-        [Test]
-        public void HostnameTest()
-        {
-            // TODO unit test for the property 'Hostname'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DriverInvitationTests.cs b/src/Flipdish.Test/Model/DriverInvitationTests.cs
deleted file mode 100644
index 456d57c7..00000000
--- a/src/Flipdish.Test/Model/DriverInvitationTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DriverInvitation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DriverInvitationTests
-    {
-        // TODO uncomment below to declare an instance variable for DriverInvitation
-        //private DriverInvitation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DriverInvitation
-            //instance = new DriverInvitation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DriverInvitation
-        /// </summary>
-        [Test]
-        public void DriverInvitationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DriverInvitation
-            //Assert.IsInstanceOfType<DriverInvitation> (instance, "variable 'instance' is a DriverInvitation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PhoneNumber'
-        /// </summary>
-        [Test]
-        public void PhoneNumberTest()
-        {
-            // TODO unit test for the property 'PhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DriverLoginModelTests.cs b/src/Flipdish.Test/Model/DriverLoginModelTests.cs
deleted file mode 100644
index aadebf00..00000000
--- a/src/Flipdish.Test/Model/DriverLoginModelTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DriverLoginModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DriverLoginModelTests
-    {
-        // TODO uncomment below to declare an instance variable for DriverLoginModel
-        //private DriverLoginModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DriverLoginModel
-            //instance = new DriverLoginModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DriverLoginModel
-        /// </summary>
-        [Test]
-        public void DriverLoginModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DriverLoginModel
-            //Assert.IsInstanceOfType<DriverLoginModel> (instance, "variable 'instance' is a DriverLoginModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PhoneNumber'
-        /// </summary>
-        [Test]
-        public void PhoneNumberTest()
-        {
-            // TODO unit test for the property 'PhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DriverRequestLoginPinModelTests.cs b/src/Flipdish.Test/Model/DriverRequestLoginPinModelTests.cs
deleted file mode 100644
index 2cbf2646..00000000
--- a/src/Flipdish.Test/Model/DriverRequestLoginPinModelTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DriverRequestLoginPinModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DriverRequestLoginPinModelTests
-    {
-        // TODO uncomment below to declare an instance variable for DriverRequestLoginPinModel
-        //private DriverRequestLoginPinModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DriverRequestLoginPinModel
-            //instance = new DriverRequestLoginPinModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DriverRequestLoginPinModel
-        /// </summary>
-        [Test]
-        public void DriverRequestLoginPinModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DriverRequestLoginPinModel
-            //Assert.IsInstanceOfType<DriverRequestLoginPinModel> (instance, "variable 'instance' is a DriverRequestLoginPinModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PhoneNumber'
-        /// </summary>
-        [Test]
-        public void PhoneNumberTest()
-        {
-            // TODO unit test for the property 'PhoneNumber'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DriverStoreTests.cs b/src/Flipdish.Test/Model/DriverStoreTests.cs
deleted file mode 100644
index 0b0434d6..00000000
--- a/src/Flipdish.Test/Model/DriverStoreTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DriverStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DriverStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for DriverStore
-        //private DriverStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DriverStore
-            //instance = new DriverStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DriverStore
-        /// </summary>
-        [Test]
-        public void DriverStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DriverStore
-            //Assert.IsInstanceOfType<DriverStore> (instance, "variable 'instance' is a DriverStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-        /// <summary>
-        /// Test the property 'Presence'
-        /// </summary>
-        [Test]
-        public void PresenceTest()
-        {
-            // TODO unit test for the property 'Presence'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DriverTests.cs b/src/Flipdish.Test/Model/DriverTests.cs
deleted file mode 100644
index fb367c81..00000000
--- a/src/Flipdish.Test/Model/DriverTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Driver
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DriverTests
-    {
-        // TODO uncomment below to declare an instance variable for Driver
-        //private Driver instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Driver
-            //instance = new Driver();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Driver
-        /// </summary>
-        [Test]
-        public void DriverInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Driver
-            //Assert.IsInstanceOfType<Driver> (instance, "variable 'instance' is a Driver");
-        }
-
-
-        /// <summary>
-        /// Test the property 'UserId'
-        /// </summary>
-        [Test]
-        public void UserIdTest()
-        {
-            // TODO unit test for the property 'UserId'
-        }
-        /// <summary>
-        /// Test the property 'UserName'
-        /// </summary>
-        [Test]
-        public void UserNameTest()
-        {
-            // TODO unit test for the property 'UserName'
-        }
-        /// <summary>
-        /// Test the property 'UserPhoneNumber'
-        /// </summary>
-        [Test]
-        public void UserPhoneNumberTest()
-        {
-            // TODO unit test for the property 'UserPhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'Stores'
-        /// </summary>
-        [Test]
-        public void StoresTest()
-        {
-            // TODO unit test for the property 'Stores'
-        }
-        /// <summary>
-        /// Test the property 'ProfileImageUrl'
-        /// </summary>
-        [Test]
-        public void ProfileImageUrlTest()
-        {
-            // TODO unit test for the property 'ProfileImageUrl'
-        }
-        /// <summary>
-        /// Test the property 'DriverKey'
-        /// </summary>
-        [Test]
-        public void DriverKeyTest()
-        {
-            // TODO unit test for the property 'DriverKey'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DynamicFormFieldMappingTests.cs b/src/Flipdish.Test/Model/DynamicFormFieldMappingTests.cs
deleted file mode 100644
index 78cd34cf..00000000
--- a/src/Flipdish.Test/Model/DynamicFormFieldMappingTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DynamicFormFieldMapping
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DynamicFormFieldMappingTests
-    {
-        // TODO uncomment below to declare an instance variable for DynamicFormFieldMapping
-        //private DynamicFormFieldMapping instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DynamicFormFieldMapping
-            //instance = new DynamicFormFieldMapping();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DynamicFormFieldMapping
-        /// </summary>
-        [Test]
-        public void DynamicFormFieldMappingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DynamicFormFieldMapping
-            //Assert.IsInstanceOfType<DynamicFormFieldMapping> (instance, "variable 'instance' is a DynamicFormFieldMapping");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Source'
-        /// </summary>
-        [Test]
-        public void SourceTest()
-        {
-            // TODO unit test for the property 'Source'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DynamicFormFieldOptionTests.cs b/src/Flipdish.Test/Model/DynamicFormFieldOptionTests.cs
deleted file mode 100644
index 87ace111..00000000
--- a/src/Flipdish.Test/Model/DynamicFormFieldOptionTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DynamicFormFieldOption
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DynamicFormFieldOptionTests
-    {
-        // TODO uncomment below to declare an instance variable for DynamicFormFieldOption
-        //private DynamicFormFieldOption instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DynamicFormFieldOption
-            //instance = new DynamicFormFieldOption();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DynamicFormFieldOption
-        /// </summary>
-        [Test]
-        public void DynamicFormFieldOptionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DynamicFormFieldOption
-            //Assert.IsInstanceOfType<DynamicFormFieldOption> (instance, "variable 'instance' is a DynamicFormFieldOption");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Display'
-        /// </summary>
-        [Test]
-        public void DisplayTest()
-        {
-            // TODO unit test for the property 'Display'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DynamicFormFieldTests.cs b/src/Flipdish.Test/Model/DynamicFormFieldTests.cs
deleted file mode 100644
index da34772c..00000000
--- a/src/Flipdish.Test/Model/DynamicFormFieldTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DynamicFormField
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DynamicFormFieldTests
-    {
-        // TODO uncomment below to declare an instance variable for DynamicFormField
-        //private DynamicFormField instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DynamicFormField
-            //instance = new DynamicFormField();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DynamicFormField
-        /// </summary>
-        [Test]
-        public void DynamicFormFieldInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DynamicFormField
-            //Assert.IsInstanceOfType<DynamicFormField> (instance, "variable 'instance' is a DynamicFormField");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Identifier'
-        /// </summary>
-        [Test]
-        public void IdentifierTest()
-        {
-            // TODO unit test for the property 'Identifier'
-        }
-        /// <summary>
-        /// Test the property 'Label'
-        /// </summary>
-        [Test]
-        public void LabelTest()
-        {
-            // TODO unit test for the property 'Label'
-        }
-        /// <summary>
-        /// Test the property 'Placeholder'
-        /// </summary>
-        [Test]
-        public void PlaceholderTest()
-        {
-            // TODO unit test for the property 'Placeholder'
-        }
-        /// <summary>
-        /// Test the property 'Rules'
-        /// </summary>
-        [Test]
-        public void RulesTest()
-        {
-            // TODO unit test for the property 'Rules'
-        }
-        /// <summary>
-        /// Test the property 'Mapping'
-        /// </summary>
-        [Test]
-        public void MappingTest()
-        {
-            // TODO unit test for the property 'Mapping'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DynamicFormRuleTests.cs b/src/Flipdish.Test/Model/DynamicFormRuleTests.cs
deleted file mode 100644
index 125bd583..00000000
--- a/src/Flipdish.Test/Model/DynamicFormRuleTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DynamicFormRule
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DynamicFormRuleTests
-    {
-        // TODO uncomment below to declare an instance variable for DynamicFormRule
-        //private DynamicFormRule instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DynamicFormRule
-            //instance = new DynamicFormRule();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DynamicFormRule
-        /// </summary>
-        [Test]
-        public void DynamicFormRuleInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DynamicFormRule
-            //Assert.IsInstanceOfType<DynamicFormRule> (instance, "variable 'instance' is a DynamicFormRule");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/DynamicFormRulesTests.cs b/src/Flipdish.Test/Model/DynamicFormRulesTests.cs
deleted file mode 100644
index a9aa2d96..00000000
--- a/src/Flipdish.Test/Model/DynamicFormRulesTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing DynamicFormRules
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class DynamicFormRulesTests
-    {
-        // TODO uncomment below to declare an instance variable for DynamicFormRules
-        //private DynamicFormRules instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of DynamicFormRules
-            //instance = new DynamicFormRules();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of DynamicFormRules
-        /// </summary>
-        [Test]
-        public void DynamicFormRulesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" DynamicFormRules
-            //Assert.IsInstanceOfType<DynamicFormRules> (instance, "variable 'instance' is a DynamicFormRules");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MaxLength'
-        /// </summary>
-        [Test]
-        public void MaxLengthTest()
-        {
-            // TODO unit test for the property 'MaxLength'
-        }
-        /// <summary>
-        /// Test the property 'MinLength'
-        /// </summary>
-        [Test]
-        public void MinLengthTest()
-        {
-            // TODO unit test for the property 'MinLength'
-        }
-        /// <summary>
-        /// Test the property 'Required'
-        /// </summary>
-        [Test]
-        public void RequiredTest()
-        {
-            // TODO unit test for the property 'Required'
-        }
-        /// <summary>
-        /// Test the property 'Pattern'
-        /// </summary>
-        [Test]
-        public void PatternTest()
-        {
-            // TODO unit test for the property 'Pattern'
-        }
-        /// <summary>
-        /// Test the property 'Predefined'
-        /// </summary>
-        [Test]
-        public void PredefinedTest()
-        {
-            // TODO unit test for the property 'Predefined'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/EmvNotificationEventTests.cs b/src/Flipdish.Test/Model/EmvNotificationEventTests.cs
deleted file mode 100644
index 15f63e67..00000000
--- a/src/Flipdish.Test/Model/EmvNotificationEventTests.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing EmvNotificationEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class EmvNotificationEventTests
-    {
-        // TODO uncomment below to declare an instance variable for EmvNotificationEvent
-        //private EmvNotificationEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of EmvNotificationEvent
-            //instance = new EmvNotificationEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of EmvNotificationEvent
-        /// </summary>
-        [Test]
-        public void EmvNotificationEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" EmvNotificationEvent
-            //Assert.IsInstanceOfType<EmvNotificationEvent> (instance, "variable 'instance' is a EmvNotificationEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Notification'
-        /// </summary>
-        [Test]
-        public void NotificationTest()
-        {
-            // TODO unit test for the property 'Notification'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'TerminalId'
-        /// </summary>
-        [Test]
-        public void TerminalIdTest()
-        {
-            // TODO unit test for the property 'TerminalId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'ExpDate'
-        /// </summary>
-        [Test]
-        public void ExpDateTest()
-        {
-            // TODO unit test for the property 'ExpDate'
-        }
-        /// <summary>
-        /// Test the property 'CardType'
-        /// </summary>
-        [Test]
-        public void CardTypeTest()
-        {
-            // TODO unit test for the property 'CardType'
-        }
-        /// <summary>
-        /// Test the property 'PaymentMethod'
-        /// </summary>
-        [Test]
-        public void PaymentMethodTest()
-        {
-            // TODO unit test for the property 'PaymentMethod'
-        }
-        /// <summary>
-        /// Test the property 'AccountNumber'
-        /// </summary>
-        [Test]
-        public void AccountNumberTest()
-        {
-            // TODO unit test for the property 'AccountNumber'
-        }
-        /// <summary>
-        /// Test the property 'AuthCode'
-        /// </summary>
-        [Test]
-        public void AuthCodeTest()
-        {
-            // TODO unit test for the property 'AuthCode'
-        }
-        /// <summary>
-        /// Test the property 'ProviderMessage'
-        /// </summary>
-        [Test]
-        public void ProviderMessageTest()
-        {
-            // TODO unit test for the property 'ProviderMessage'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/EmvTerminalTests.cs b/src/Flipdish.Test/Model/EmvTerminalTests.cs
deleted file mode 100644
index a96dcdfb..00000000
--- a/src/Flipdish.Test/Model/EmvTerminalTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing EmvTerminal
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class EmvTerminalTests
-    {
-        // TODO uncomment below to declare an instance variable for EmvTerminal
-        //private EmvTerminal instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of EmvTerminal
-            //instance = new EmvTerminal();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of EmvTerminal
-        /// </summary>
-        [Test]
-        public void EmvTerminalInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" EmvTerminal
-            //Assert.IsInstanceOfType<EmvTerminal> (instance, "variable 'instance' is a EmvTerminal");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EmvTerminalId'
-        /// </summary>
-        [Test]
-        public void EmvTerminalIdTest()
-        {
-            // TODO unit test for the property 'EmvTerminalId'
-        }
-        /// <summary>
-        /// Test the property 'TerminalId'
-        /// </summary>
-        [Test]
-        public void TerminalIdTest()
-        {
-            // TODO unit test for the property 'TerminalId'
-        }
-        /// <summary>
-        /// Test the property 'Url'
-        /// </summary>
-        [Test]
-        public void UrlTest()
-        {
-            // TODO unit test for the property 'Url'
-        }
-        /// <summary>
-        /// Test the property 'Token'
-        /// </summary>
-        [Test]
-        public void TokenTest()
-        {
-            // TODO unit test for the property 'Token'
-        }
-        /// <summary>
-        /// Test the property 'SoftwareHouseId'
-        /// </summary>
-        [Test]
-        public void SoftwareHouseIdTest()
-        {
-            // TODO unit test for the property 'SoftwareHouseId'
-        }
-        /// <summary>
-        /// Test the property 'InstallerId'
-        /// </summary>
-        [Test]
-        public void InstallerIdTest()
-        {
-            // TODO unit test for the property 'InstallerId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/EmvTerminalWithAssignmentsTests.cs b/src/Flipdish.Test/Model/EmvTerminalWithAssignmentsTests.cs
deleted file mode 100644
index ef126749..00000000
--- a/src/Flipdish.Test/Model/EmvTerminalWithAssignmentsTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing EmvTerminalWithAssignments
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class EmvTerminalWithAssignmentsTests
-    {
-        // TODO uncomment below to declare an instance variable for EmvTerminalWithAssignments
-        //private EmvTerminalWithAssignments instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of EmvTerminalWithAssignments
-            //instance = new EmvTerminalWithAssignments();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of EmvTerminalWithAssignments
-        /// </summary>
-        [Test]
-        public void EmvTerminalWithAssignmentsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" EmvTerminalWithAssignments
-            //Assert.IsInstanceOfType<EmvTerminalWithAssignments> (instance, "variable 'instance' is a EmvTerminalWithAssignments");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EmvTerminalId'
-        /// </summary>
-        [Test]
-        public void EmvTerminalIdTest()
-        {
-            // TODO unit test for the property 'EmvTerminalId'
-        }
-        /// <summary>
-        /// Test the property 'TerminalId'
-        /// </summary>
-        [Test]
-        public void TerminalIdTest()
-        {
-            // TODO unit test for the property 'TerminalId'
-        }
-        /// <summary>
-        /// Test the property 'IsAssignedToHydraDevice'
-        /// </summary>
-        [Test]
-        public void IsAssignedToHydraDeviceTest()
-        {
-            // TODO unit test for the property 'IsAssignedToHydraDevice'
-        }
-        /// <summary>
-        /// Test the property 'HydraConfigId'
-        /// </summary>
-        [Test]
-        public void HydraConfigIdTest()
-        {
-            // TODO unit test for the property 'HydraConfigId'
-        }
-        /// <summary>
-        /// Test the property 'HydraDeviceId'
-        /// </summary>
-        [Test]
-        public void HydraDeviceIdTest()
-        {
-            // TODO unit test for the property 'HydraDeviceId'
-        }
-        /// <summary>
-        /// Test the property 'HydraName'
-        /// </summary>
-        [Test]
-        public void HydraNameTest()
-        {
-            // TODO unit test for the property 'HydraName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/EventSearchResultTests.cs b/src/Flipdish.Test/Model/EventSearchResultTests.cs
deleted file mode 100644
index 8dafedda..00000000
--- a/src/Flipdish.Test/Model/EventSearchResultTests.cs
+++ /dev/null
@@ -1,880 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing EventSearchResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class EventSearchResultTests
-    {
-        // TODO uncomment below to declare an instance variable for EventSearchResult
-        //private EventSearchResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of EventSearchResult
-            //instance = new EventSearchResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of EventSearchResult
-        /// </summary>
-        [Test]
-        public void EventSearchResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" EventSearchResult
-            //Assert.IsInstanceOfType<EventSearchResult> (instance, "variable 'instance' is a EventSearchResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppCreatedEvent'
-        /// </summary>
-        [Test]
-        public void AppCreatedEventTest()
-        {
-            // TODO unit test for the property 'AppCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'AppUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void AppUpdatedEventTest()
-        {
-            // TODO unit test for the property 'AppUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'AnalyticsClientEvent'
-        /// </summary>
-        [Test]
-        public void AnalyticsClientEventTest()
-        {
-            // TODO unit test for the property 'AnalyticsClientEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderAcceptedEvent'
-        /// </summary>
-        [Test]
-        public void OrderAcceptedEventTest()
-        {
-            // TODO unit test for the property 'OrderAcceptedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderDispatchedEvent'
-        /// </summary>
-        [Test]
-        public void OrderDispatchedEventTest()
-        {
-            // TODO unit test for the property 'OrderDispatchedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderCustomerTrackingCreatedEvent'
-        /// </summary>
-        [Test]
-        public void OrderCustomerTrackingCreatedEventTest()
-        {
-            // TODO unit test for the property 'OrderCustomerTrackingCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderDeliveryTrackingStatusUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void OrderDeliveryTrackingStatusUpdatedEventTest()
-        {
-            // TODO unit test for the property 'OrderDeliveryTrackingStatusUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderCreatedEvent'
-        /// </summary>
-        [Test]
-        public void OrderCreatedEventTest()
-        {
-            // TODO unit test for the property 'OrderCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderRatingUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void OrderRatingUpdatedEventTest()
-        {
-            // TODO unit test for the property 'OrderRatingUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderRefundedEvent'
-        /// </summary>
-        [Test]
-        public void OrderRefundedEventTest()
-        {
-            // TODO unit test for the property 'OrderRefundedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderRejectedEvent'
-        /// </summary>
-        [Test]
-        public void OrderRejectedEventTest()
-        {
-            // TODO unit test for the property 'OrderRejectedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderTipUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void OrderTipUpdatedEventTest()
-        {
-            // TODO unit test for the property 'OrderTipUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'OrderTerminalNotifications'
-        /// </summary>
-        [Test]
-        public void OrderTerminalNotificationsTest()
-        {
-            // TODO unit test for the property 'OrderTerminalNotifications'
-        }
-        /// <summary>
-        /// Test the property 'StoreCreatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreCreatedEventTest()
-        {
-            // TODO unit test for the property 'StoreCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreDeletedEvent'
-        /// </summary>
-        [Test]
-        public void StoreDeletedEventTest()
-        {
-            // TODO unit test for the property 'StoreDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreAddressUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreAddressUpdatedEventTest()
-        {
-            // TODO unit test for the property 'StoreAddressUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreKioskSettingUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreKioskSettingUpdatedEventTest()
-        {
-            // TODO unit test for the property 'StoreKioskSettingUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryZoneCreatedEvent'
-        /// </summary>
-        [Test]
-        public void DeliveryZoneCreatedEventTest()
-        {
-            // TODO unit test for the property 'DeliveryZoneCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryZoneUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void DeliveryZoneUpdatedEventTest()
-        {
-            // TODO unit test for the property 'DeliveryZoneUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryZoneDeletedEvent'
-        /// </summary>
-        [Test]
-        public void DeliveryZoneDeletedEventTest()
-        {
-            // TODO unit test for the property 'DeliveryZoneDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreOpeningHoursUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreOpeningHoursUpdatedEventTest()
-        {
-            // TODO unit test for the property 'StoreOpeningHoursUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreMenuAssignedEvent'
-        /// </summary>
-        [Test]
-        public void StoreMenuAssignedEventTest()
-        {
-            // TODO unit test for the property 'StoreMenuAssignedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreBusinessHoursOverrideCreatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreBusinessHoursOverrideCreatedEventTest()
-        {
-            // TODO unit test for the property 'StoreBusinessHoursOverrideCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreBusinessHoursOverrideDeletedEvent'
-        /// </summary>
-        [Test]
-        public void StoreBusinessHoursOverrideDeletedEventTest()
-        {
-            // TODO unit test for the property 'StoreBusinessHoursOverrideDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreArchivedEvent'
-        /// </summary>
-        [Test]
-        public void StoreArchivedEventTest()
-        {
-            // TODO unit test for the property 'StoreArchivedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreUnarchivedEvent'
-        /// </summary>
-        [Test]
-        public void StoreUnarchivedEventTest()
-        {
-            // TODO unit test for the property 'StoreUnarchivedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StorePublishedEvent'
-        /// </summary>
-        [Test]
-        public void StorePublishedEventTest()
-        {
-            // TODO unit test for the property 'StorePublishedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreUnpublishedEvent'
-        /// </summary>
-        [Test]
-        public void StoreUnpublishedEventTest()
-        {
-            // TODO unit test for the property 'StoreUnpublishedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreUpdatedEventTest()
-        {
-            // TODO unit test for the property 'StoreUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StorePreOrderConfigUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void StorePreOrderConfigUpdatedEventTest()
-        {
-            // TODO unit test for the property 'StorePreOrderConfigUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreLogoCreatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreLogoCreatedEventTest()
-        {
-            // TODO unit test for the property 'StoreLogoCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreLogoUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreLogoUpdatedEventTest()
-        {
-            // TODO unit test for the property 'StoreLogoUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreLogoDeletedEvent'
-        /// </summary>
-        [Test]
-        public void StoreLogoDeletedEventTest()
-        {
-            // TODO unit test for the property 'StoreLogoDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuCreatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuCreatedEventTest()
-        {
-            // TODO unit test for the property 'MenuCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuUpdatedEventTest()
-        {
-            // TODO unit test for the property 'MenuUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuUploadedEvent'
-        /// </summary>
-        [Test]
-        public void MenuUploadedEventTest()
-        {
-            // TODO unit test for the property 'MenuUploadedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionCreatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuSectionCreatedEventTest()
-        {
-            // TODO unit test for the property 'MenuSectionCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuSectionUpdatedEventTest()
-        {
-            // TODO unit test for the property 'MenuSectionUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionDeletedEvent'
-        /// </summary>
-        [Test]
-        public void MenuSectionDeletedEventTest()
-        {
-            // TODO unit test for the property 'MenuSectionDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionItemCreatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuSectionItemCreatedEventTest()
-        {
-            // TODO unit test for the property 'MenuSectionItemCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionItemUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuSectionItemUpdatedEventTest()
-        {
-            // TODO unit test for the property 'MenuSectionItemUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionItemDeletedEvent'
-        /// </summary>
-        [Test]
-        public void MenuSectionItemDeletedEventTest()
-        {
-            // TODO unit test for the property 'MenuSectionItemDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetCreatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetCreatedEventTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetUpdatedEventTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetDeletedEvent'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetDeletedEventTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItemCreatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemCreatedEventTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItemCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItemUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemUpdatedEventTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItemUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItemDeletedEvent'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemDeletedEventTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItemDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'MenuCheckpointCreatedEvent'
-        /// </summary>
-        [Test]
-        public void MenuCheckpointCreatedEventTest()
-        {
-            // TODO unit test for the property 'MenuCheckpointCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupCreatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreGroupCreatedEventTest()
-        {
-            // TODO unit test for the property 'StoreGroupCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreGroupUpdatedEventTest()
-        {
-            // TODO unit test for the property 'StoreGroupUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupDeletedEvent'
-        /// </summary>
-        [Test]
-        public void StoreGroupDeletedEventTest()
-        {
-            // TODO unit test for the property 'StoreGroupDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'CustomerCreatedEvent'
-        /// </summary>
-        [Test]
-        public void CustomerCreatedEventTest()
-        {
-            // TODO unit test for the property 'CustomerCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'CustomerUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void CustomerUpdatedEventTest()
-        {
-            // TODO unit test for the property 'CustomerUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'CustomerConsentUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void CustomerConsentUpdatedEventTest()
-        {
-            // TODO unit test for the property 'CustomerConsentUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionCreatedEvent'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionCreatedEventTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionUpdatedEventTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionDeletedEvent'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionDeletedEventTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'PrinterTurnedOnEvent'
-        /// </summary>
-        [Test]
-        public void PrinterTurnedOnEventTest()
-        {
-            // TODO unit test for the property 'PrinterTurnedOnEvent'
-        }
-        /// <summary>
-        /// Test the property 'PrinterTurnedOffEvent'
-        /// </summary>
-        [Test]
-        public void PrinterTurnedOffEventTest()
-        {
-            // TODO unit test for the property 'PrinterTurnedOffEvent'
-        }
-        /// <summary>
-        /// Test the property 'PrinterAssignedToStoreEvent'
-        /// </summary>
-        [Test]
-        public void PrinterAssignedToStoreEventTest()
-        {
-            // TODO unit test for the property 'PrinterAssignedToStoreEvent'
-        }
-        /// <summary>
-        /// Test the property 'PrinterUnassignedFromStoreEvent'
-        /// </summary>
-        [Test]
-        public void PrinterUnassignedFromStoreEventTest()
-        {
-            // TODO unit test for the property 'PrinterUnassignedFromStoreEvent'
-        }
-        /// <summary>
-        /// Test the property 'PhoneCallStartedEvent'
-        /// </summary>
-        [Test]
-        public void PhoneCallStartedEventTest()
-        {
-            // TODO unit test for the property 'PhoneCallStartedEvent'
-        }
-        /// <summary>
-        /// Test the property 'PhoneCallEndedEvent'
-        /// </summary>
-        [Test]
-        public void PhoneCallEndedEventTest()
-        {
-            // TODO unit test for the property 'PhoneCallEndedEvent'
-        }
-        /// <summary>
-        /// Test the property 'LoyaltyCampaignCreatedEvent'
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignCreatedEventTest()
-        {
-            // TODO unit test for the property 'LoyaltyCampaignCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'LoyaltyCampaignDeletedEvent'
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignDeletedEventTest()
-        {
-            // TODO unit test for the property 'LoyaltyCampaignDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'LoyaltyCampaignUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignUpdatedEventTest()
-        {
-            // TODO unit test for the property 'LoyaltyCampaignUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'RetentionCampaignCreatedEvent'
-        /// </summary>
-        [Test]
-        public void RetentionCampaignCreatedEventTest()
-        {
-            // TODO unit test for the property 'RetentionCampaignCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'RetentionCampaignDeletedEvent'
-        /// </summary>
-        [Test]
-        public void RetentionCampaignDeletedEventTest()
-        {
-            // TODO unit test for the property 'RetentionCampaignDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'RetentionCampaignUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void RetentionCampaignUpdatedEventTest()
-        {
-            // TODO unit test for the property 'RetentionCampaignUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'SmsReceivedEvent'
-        /// </summary>
-        [Test]
-        public void SmsReceivedEventTest()
-        {
-            // TODO unit test for the property 'SmsReceivedEvent'
-        }
-        /// <summary>
-        /// Test the property 'UserLoginEvent'
-        /// </summary>
-        [Test]
-        public void UserLoginEventTest()
-        {
-            // TODO unit test for the property 'UserLoginEvent'
-        }
-        /// <summary>
-        /// Test the property 'UserCreatedEvent'
-        /// </summary>
-        [Test]
-        public void UserCreatedEventTest()
-        {
-            // TODO unit test for the property 'UserCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'UserUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void UserUpdatedEventTest()
-        {
-            // TODO unit test for the property 'UserUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'UserDeletedEvent'
-        /// </summary>
-        [Test]
-        public void UserDeletedEventTest()
-        {
-            // TODO unit test for the property 'UserDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'UserCreatedPasswordEvent'
-        /// </summary>
-        [Test]
-        public void UserCreatedPasswordEventTest()
-        {
-            // TODO unit test for the property 'UserCreatedPasswordEvent'
-        }
-        /// <summary>
-        /// Test the property 'UserAnsweredSignupQuestionsEvent'
-        /// </summary>
-        [Test]
-        public void UserAnsweredSignupQuestionsEventTest()
-        {
-            // TODO unit test for the property 'UserAnsweredSignupQuestionsEvent'
-        }
-        /// <summary>
-        /// Test the property 'VoucherCreatedEvent'
-        /// </summary>
-        [Test]
-        public void VoucherCreatedEventTest()
-        {
-            // TODO unit test for the property 'VoucherCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'VoucherUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void VoucherUpdatedEventTest()
-        {
-            // TODO unit test for the property 'VoucherUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'VoucherDeletedEvent'
-        /// </summary>
-        [Test]
-        public void VoucherDeletedEventTest()
-        {
-            // TODO unit test for the property 'VoucherDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'TeammateInviteSentEvent'
-        /// </summary>
-        [Test]
-        public void TeammateInviteSentEventTest()
-        {
-            // TODO unit test for the property 'TeammateInviteSentEvent'
-        }
-        /// <summary>
-        /// Test the property 'TeammateInviteAcceptedEvent'
-        /// </summary>
-        [Test]
-        public void TeammateInviteAcceptedEventTest()
-        {
-            // TODO unit test for the property 'TeammateInviteAcceptedEvent'
-        }
-        /// <summary>
-        /// Test the property 'TeammateUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void TeammateUpdatedEventTest()
-        {
-            // TODO unit test for the property 'TeammateUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'TeammateDeletedEvent'
-        /// </summary>
-        [Test]
-        public void TeammateDeletedEventTest()
-        {
-            // TODO unit test for the property 'TeammateDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'BankAccountCreatedEvent'
-        /// </summary>
-        [Test]
-        public void BankAccountCreatedEventTest()
-        {
-            // TODO unit test for the property 'BankAccountCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'BankAccountUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void BankAccountUpdatedEventTest()
-        {
-            // TODO unit test for the property 'BankAccountUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'BankAccountDeletedEvent'
-        /// </summary>
-        [Test]
-        public void BankAccountDeletedEventTest()
-        {
-            // TODO unit test for the property 'BankAccountDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'HydraAssignedEvent'
-        /// </summary>
-        [Test]
-        public void HydraAssignedEventTest()
-        {
-            // TODO unit test for the property 'HydraAssignedEvent'
-        }
-        /// <summary>
-        /// Test the property 'HydraRequestResetEvent'
-        /// </summary>
-        [Test]
-        public void HydraRequestResetEventTest()
-        {
-            // TODO unit test for the property 'HydraRequestResetEvent'
-        }
-        /// <summary>
-        /// Test the property 'HydraSettingChangedEvent'
-        /// </summary>
-        [Test]
-        public void HydraSettingChangedEventTest()
-        {
-            // TODO unit test for the property 'HydraSettingChangedEvent'
-        }
-        /// <summary>
-        /// Test the property 'HydraUnAssignedEvent'
-        /// </summary>
-        [Test]
-        public void HydraUnAssignedEventTest()
-        {
-            // TODO unit test for the property 'HydraUnAssignedEvent'
-        }
-        /// <summary>
-        /// Test the property 'HydraConnectionStatusChangedEvent'
-        /// </summary>
-        [Test]
-        public void HydraConnectionStatusChangedEventTest()
-        {
-            // TODO unit test for the property 'HydraConnectionStatusChangedEvent'
-        }
-        /// <summary>
-        /// Test the property 'PushNotificationScheduledEvent'
-        /// </summary>
-        [Test]
-        public void PushNotificationScheduledEventTest()
-        {
-            // TODO unit test for the property 'PushNotificationScheduledEvent'
-        }
-        /// <summary>
-        /// Test the property 'PushNotificationSentEvent'
-        /// </summary>
-        [Test]
-        public void PushNotificationSentEventTest()
-        {
-            // TODO unit test for the property 'PushNotificationSentEvent'
-        }
-        /// <summary>
-        /// Test the property 'PushNotificationDeletedEvent'
-        /// </summary>
-        [Test]
-        public void PushNotificationDeletedEventTest()
-        {
-            // TODO unit test for the property 'PushNotificationDeletedEvent'
-        }
-        /// <summary>
-        /// Test the property 'DnsVerifiedEvent'
-        /// </summary>
-        [Test]
-        public void DnsVerifiedEventTest()
-        {
-            // TODO unit test for the property 'DnsVerifiedEvent'
-        }
-        /// <summary>
-        /// Test the property 'CertificateCreatedEvent'
-        /// </summary>
-        [Test]
-        public void CertificateCreatedEventTest()
-        {
-            // TODO unit test for the property 'CertificateCreatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'CertificateRenewedEvent'
-        /// </summary>
-        [Test]
-        public void CertificateRenewedEventTest()
-        {
-            // TODO unit test for the property 'CertificateRenewedEvent'
-        }
-        /// <summary>
-        /// Test the property 'WebsiteVanityUrlUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void WebsiteVanityUrlUpdatedEventTest()
-        {
-            // TODO unit test for the property 'WebsiteVanityUrlUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'WebsiteUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void WebsiteUpdatedEventTest()
-        {
-            // TODO unit test for the property 'WebsiteUpdatedEvent'
-        }
-        /// <summary>
-        /// Test the property 'StoreOrderCapacityUpdatedEvent'
-        /// </summary>
-        [Test]
-        public void StoreOrderCapacityUpdatedEventTest()
-        {
-            // TODO unit test for the property 'StoreOrderCapacityUpdatedEvent'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ExternalStoreAuditLogTests.cs b/src/Flipdish.Test/Model/ExternalStoreAuditLogTests.cs
deleted file mode 100644
index 6694832f..00000000
--- a/src/Flipdish.Test/Model/ExternalStoreAuditLogTests.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ExternalStoreAuditLog
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ExternalStoreAuditLogTests
-    {
-        // TODO uncomment below to declare an instance variable for ExternalStoreAuditLog
-        //private ExternalStoreAuditLog instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ExternalStoreAuditLog
-            //instance = new ExternalStoreAuditLog();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ExternalStoreAuditLog
-        /// </summary>
-        [Test]
-        public void ExternalStoreAuditLogInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ExternalStoreAuditLog
-            //Assert.IsInstanceOfType<ExternalStoreAuditLog> (instance, "variable 'instance' is a ExternalStoreAuditLog");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ExternalCreateTime'
-        /// </summary>
-        [Test]
-        public void ExternalCreateTimeTest()
-        {
-            // TODO unit test for the property 'ExternalCreateTime'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Source'
-        /// </summary>
-        [Test]
-        public void SourceTest()
-        {
-            // TODO unit test for the property 'Source'
-        }
-        /// <summary>
-        /// Test the property 'Version'
-        /// </summary>
-        [Test]
-        public void VersionTest()
-        {
-            // TODO unit test for the property 'Version'
-        }
-        /// <summary>
-        /// Test the property 'DescriptionFormat'
-        /// </summary>
-        [Test]
-        public void DescriptionFormatTest()
-        {
-            // TODO unit test for the property 'DescriptionFormat'
-        }
-        /// <summary>
-        /// Test the property 'DescriptionFields'
-        /// </summary>
-        [Test]
-        public void DescriptionFieldsTest()
-        {
-            // TODO unit test for the property 'DescriptionFields'
-        }
-        /// <summary>
-        /// Test the property 'DescriptionId'
-        /// </summary>
-        [Test]
-        public void DescriptionIdTest()
-        {
-            // TODO unit test for the property 'DescriptionId'
-        }
-        /// <summary>
-        /// Test the property 'Ref1'
-        /// </summary>
-        [Test]
-        public void Ref1Test()
-        {
-            // TODO unit test for the property 'Ref1'
-        }
-        /// <summary>
-        /// Test the property 'Ref2'
-        /// </summary>
-        [Test]
-        public void Ref2Test()
-        {
-            // TODO unit test for the property 'Ref2'
-        }
-        /// <summary>
-        /// Test the property 'Ref3'
-        /// </summary>
-        [Test]
-        public void Ref3Test()
-        {
-            // TODO unit test for the property 'Ref3'
-        }
-        /// <summary>
-        /// Test the property 'Ref4'
-        /// </summary>
-        [Test]
-        public void Ref4Test()
-        {
-            // TODO unit test for the property 'Ref4'
-        }
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'FieldChanges'
-        /// </summary>
-        [Test]
-        public void FieldChangesTest()
-        {
-            // TODO unit test for the property 'FieldChanges'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ExternalStoreEventTests.cs b/src/Flipdish.Test/Model/ExternalStoreEventTests.cs
deleted file mode 100644
index 50372e73..00000000
--- a/src/Flipdish.Test/Model/ExternalStoreEventTests.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ExternalStoreEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ExternalStoreEventTests
-    {
-        // TODO uncomment below to declare an instance variable for ExternalStoreEvent
-        //private ExternalStoreEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ExternalStoreEvent
-            //instance = new ExternalStoreEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ExternalStoreEvent
-        /// </summary>
-        [Test]
-        public void ExternalStoreEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ExternalStoreEvent
-            //Assert.IsInstanceOfType<ExternalStoreEvent> (instance, "variable 'instance' is a ExternalStoreEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'DescriptionFormat'
-        /// </summary>
-        [Test]
-        public void DescriptionFormatTest()
-        {
-            // TODO unit test for the property 'DescriptionFormat'
-        }
-        /// <summary>
-        /// Test the property 'DescriptionFields'
-        /// </summary>
-        [Test]
-        public void DescriptionFieldsTest()
-        {
-            // TODO unit test for the property 'DescriptionFields'
-        }
-        /// <summary>
-        /// Test the property 'DescriptionId'
-        /// </summary>
-        [Test]
-        public void DescriptionIdTest()
-        {
-            // TODO unit test for the property 'DescriptionId'
-        }
-        /// <summary>
-        /// Test the property 'Ref1'
-        /// </summary>
-        [Test]
-        public void Ref1Test()
-        {
-            // TODO unit test for the property 'Ref1'
-        }
-        /// <summary>
-        /// Test the property 'Ref2'
-        /// </summary>
-        [Test]
-        public void Ref2Test()
-        {
-            // TODO unit test for the property 'Ref2'
-        }
-        /// <summary>
-        /// Test the property 'Ref3'
-        /// </summary>
-        [Test]
-        public void Ref3Test()
-        {
-            // TODO unit test for the property 'Ref3'
-        }
-        /// <summary>
-        /// Test the property 'Ref4'
-        /// </summary>
-        [Test]
-        public void Ref4Test()
-        {
-            // TODO unit test for the property 'Ref4'
-        }
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'FieldChanges'
-        /// </summary>
-        [Test]
-        public void FieldChangesTest()
-        {
-            // TODO unit test for the property 'FieldChanges'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FeeSummaryTests.cs b/src/Flipdish.Test/Model/FeeSummaryTests.cs
deleted file mode 100644
index d8daac9d..00000000
--- a/src/Flipdish.Test/Model/FeeSummaryTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FeeSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FeeSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for FeeSummary
-        //private FeeSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FeeSummary
-            //instance = new FeeSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FeeSummary
-        /// </summary>
-        [Test]
-        public void FeeSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FeeSummary
-            //Assert.IsInstanceOfType<FeeSummary> (instance, "variable 'instance' is a FeeSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'FeeAmount'
-        /// </summary>
-        [Test]
-        public void FeeAmountTest()
-        {
-            // TODO unit test for the property 'FeeAmount'
-        }
-        /// <summary>
-        /// Test the property 'PercentageRate'
-        /// </summary>
-        [Test]
-        public void PercentageRateTest()
-        {
-            // TODO unit test for the property 'PercentageRate'
-        }
-        /// <summary>
-        /// Test the property 'PerTransactionFee'
-        /// </summary>
-        [Test]
-        public void PerTransactionFeeTest()
-        {
-            // TODO unit test for the property 'PerTransactionFee'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FieldChangeInformationTests.cs b/src/Flipdish.Test/Model/FieldChangeInformationTests.cs
deleted file mode 100644
index a1901c3d..00000000
--- a/src/Flipdish.Test/Model/FieldChangeInformationTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FieldChangeInformation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FieldChangeInformationTests
-    {
-        // TODO uncomment below to declare an instance variable for FieldChangeInformation
-        //private FieldChangeInformation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FieldChangeInformation
-            //instance = new FieldChangeInformation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FieldChangeInformation
-        /// </summary>
-        [Test]
-        public void FieldChangeInformationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FieldChangeInformation
-            //Assert.IsInstanceOfType<FieldChangeInformation> (instance, "variable 'instance' is a FieldChangeInformation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Path'
-        /// </summary>
-        [Test]
-        public void PathTest()
-        {
-            // TODO unit test for the property 'Path'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'OldValue'
-        /// </summary>
-        [Test]
-        public void OldValueTest()
-        {
-            // TODO unit test for the property 'OldValue'
-        }
-        /// <summary>
-        /// Test the property 'NewValue'
-        /// </summary>
-        [Test]
-        public void NewValueTest()
-        {
-            // TODO unit test for the property 'NewValue'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FieldGroupTests.cs b/src/Flipdish.Test/Model/FieldGroupTests.cs
deleted file mode 100644
index 05f75ff5..00000000
--- a/src/Flipdish.Test/Model/FieldGroupTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FieldGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FieldGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for FieldGroup
-        //private FieldGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FieldGroup
-            //instance = new FieldGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FieldGroup
-        /// </summary>
-        [Test]
-        public void FieldGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FieldGroup
-            //Assert.IsInstanceOfType<FieldGroup> (instance, "variable 'instance' is a FieldGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Tooltip'
-        /// </summary>
-        [Test]
-        public void TooltipTest()
-        {
-            // TODO unit test for the property 'Tooltip'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'Fields'
-        /// </summary>
-        [Test]
-        public void FieldsTest()
-        {
-            // TODO unit test for the property 'Fields'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FieldTests.cs b/src/Flipdish.Test/Model/FieldTests.cs
deleted file mode 100644
index b7462f3b..00000000
--- a/src/Flipdish.Test/Model/FieldTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Field
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FieldTests
-    {
-        // TODO uncomment below to declare an instance variable for Field
-        //private Field instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Field
-            //instance = new Field();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Field
-        /// </summary>
-        [Test]
-        public void FieldInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Field
-            //Assert.IsInstanceOfType<Field> (instance, "variable 'instance' is a Field");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'Tooltip'
-        /// </summary>
-        [Test]
-        public void TooltipTest()
-        {
-            // TODO unit test for the property 'Tooltip'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'DefaultValue'
-        /// </summary>
-        [Test]
-        public void DefaultValueTest()
-        {
-            // TODO unit test for the property 'DefaultValue'
-        }
-        /// <summary>
-        /// Test the property 'ValidValues'
-        /// </summary>
-        [Test]
-        public void ValidValuesTest()
-        {
-            // TODO unit test for the property 'ValidValues'
-        }
-        /// <summary>
-        /// Test the property 'ValidationRegex'
-        /// </summary>
-        [Test]
-        public void ValidationRegexTest()
-        {
-            // TODO unit test for the property 'ValidationRegex'
-        }
-        /// <summary>
-        /// Test the property 'FieldType'
-        /// </summary>
-        [Test]
-        public void FieldTypeTest()
-        {
-            // TODO unit test for the property 'FieldType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FlipdishEventBaseTests.cs b/src/Flipdish.Test/Model/FlipdishEventBaseTests.cs
deleted file mode 100644
index 37a46e25..00000000
--- a/src/Flipdish.Test/Model/FlipdishEventBaseTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FlipdishEventBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FlipdishEventBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for FlipdishEventBase
-        //private FlipdishEventBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FlipdishEventBase
-            //instance = new FlipdishEventBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FlipdishEventBase
-        /// </summary>
-        [Test]
-        public void FlipdishEventBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FlipdishEventBase
-            //Assert.IsInstanceOfType<FlipdishEventBase> (instance, "variable 'instance' is a FlipdishEventBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FlipdishFeesDetailsTests.cs b/src/Flipdish.Test/Model/FlipdishFeesDetailsTests.cs
deleted file mode 100644
index 058f9204..00000000
--- a/src/Flipdish.Test/Model/FlipdishFeesDetailsTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FlipdishFeesDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FlipdishFeesDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for FlipdishFeesDetails
-        //private FlipdishFeesDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FlipdishFeesDetails
-            //instance = new FlipdishFeesDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FlipdishFeesDetails
-        /// </summary>
-        [Test]
-        public void FlipdishFeesDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FlipdishFeesDetails
-            //Assert.IsInstanceOfType<FlipdishFeesDetails> (instance, "variable 'instance' is a FlipdishFeesDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OnlineSalesFees'
-        /// </summary>
-        [Test]
-        public void OnlineSalesFeesTest()
-        {
-            // TODO unit test for the property 'OnlineSalesFees'
-        }
-        /// <summary>
-        /// Test the property 'CashSalesFees'
-        /// </summary>
-        [Test]
-        public void CashSalesFeesTest()
-        {
-            // TODO unit test for the property 'CashSalesFees'
-        }
-        /// <summary>
-        /// Test the property 'TotalSalesFees'
-        /// </summary>
-        [Test]
-        public void TotalSalesFeesTest()
-        {
-            // TODO unit test for the property 'TotalSalesFees'
-        }
-        /// <summary>
-        /// Test the property 'OnlineSalesRefundedFees'
-        /// </summary>
-        [Test]
-        public void OnlineSalesRefundedFeesTest()
-        {
-            // TODO unit test for the property 'OnlineSalesRefundedFees'
-        }
-        /// <summary>
-        /// Test the property 'CashSalesRefundedFees'
-        /// </summary>
-        [Test]
-        public void CashSalesRefundedFeesTest()
-        {
-            // TODO unit test for the property 'CashSalesRefundedFees'
-        }
-        /// <summary>
-        /// Test the property 'SalesFeesVat'
-        /// </summary>
-        [Test]
-        public void SalesFeesVatTest()
-        {
-            // TODO unit test for the property 'SalesFeesVat'
-        }
-        /// <summary>
-        /// Test the property 'TotalFees'
-        /// </summary>
-        [Test]
-        public void TotalFeesTest()
-        {
-            // TODO unit test for the property 'TotalFees'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FulfillentStatusActionItemTests.cs b/src/Flipdish.Test/Model/FulfillentStatusActionItemTests.cs
deleted file mode 100644
index a9ad3e4f..00000000
--- a/src/Flipdish.Test/Model/FulfillentStatusActionItemTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FulfillentStatusActionItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FulfillentStatusActionItemTests
-    {
-        // TODO uncomment below to declare an instance variable for FulfillentStatusActionItem
-        //private FulfillentStatusActionItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FulfillentStatusActionItem
-            //instance = new FulfillentStatusActionItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FulfillentStatusActionItem
-        /// </summary>
-        [Test]
-        public void FulfillentStatusActionItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FulfillentStatusActionItem
-            //Assert.IsInstanceOfType<FulfillentStatusActionItem> (instance, "variable 'instance' is a FulfillentStatusActionItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FulfillmentInfoTests.cs b/src/Flipdish.Test/Model/FulfillmentInfoTests.cs
deleted file mode 100644
index 835f3252..00000000
--- a/src/Flipdish.Test/Model/FulfillmentInfoTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FulfillmentInfo
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FulfillmentInfoTests
-    {
-        // TODO uncomment below to declare an instance variable for FulfillmentInfo
-        //private FulfillmentInfo instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FulfillmentInfo
-            //instance = new FulfillmentInfo();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FulfillmentInfo
-        /// </summary>
-        [Test]
-        public void FulfillmentInfoInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FulfillmentInfo
-            //Assert.IsInstanceOfType<FulfillmentInfo> (instance, "variable 'instance' is a FulfillmentInfo");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DispatchType'
-        /// </summary>
-        [Test]
-        public void DispatchTypeTest()
-        {
-            // TODO unit test for the property 'DispatchType'
-        }
-        /// <summary>
-        /// Test the property 'RequestedForUtc'
-        /// </summary>
-        [Test]
-        public void RequestedForUtcTest()
-        {
-            // TODO unit test for the property 'RequestedForUtc'
-        }
-        /// <summary>
-        /// Test the property 'Location'
-        /// </summary>
-        [Test]
-        public void LocationTest()
-        {
-            // TODO unit test for the property 'Location'
-        }
-        /// <summary>
-        /// Test the property 'DispatchAmount'
-        /// </summary>
-        [Test]
-        public void DispatchAmountTest()
-        {
-            // TODO unit test for the property 'DispatchAmount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FulfillmentStatesConfigurationCreateBaseTests.cs b/src/Flipdish.Test/Model/FulfillmentStatesConfigurationCreateBaseTests.cs
deleted file mode 100644
index 7eddda48..00000000
--- a/src/Flipdish.Test/Model/FulfillmentStatesConfigurationCreateBaseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FulfillmentStatesConfigurationCreateBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FulfillmentStatesConfigurationCreateBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for FulfillmentStatesConfigurationCreateBase
-        //private FulfillmentStatesConfigurationCreateBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FulfillmentStatesConfigurationCreateBase
-            //instance = new FulfillmentStatesConfigurationCreateBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FulfillmentStatesConfigurationCreateBase
-        /// </summary>
-        [Test]
-        public void FulfillmentStatesConfigurationCreateBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FulfillmentStatesConfigurationCreateBase
-            //Assert.IsInstanceOfType<FulfillmentStatesConfigurationCreateBase> (instance, "variable 'instance' is a FulfillmentStatesConfigurationCreateBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FulfillmentStatesConfigurationSummaryTests.cs b/src/Flipdish.Test/Model/FulfillmentStatesConfigurationSummaryTests.cs
deleted file mode 100644
index 89f31613..00000000
--- a/src/Flipdish.Test/Model/FulfillmentStatesConfigurationSummaryTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FulfillmentStatesConfigurationSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FulfillmentStatesConfigurationSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for FulfillmentStatesConfigurationSummary
-        //private FulfillmentStatesConfigurationSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FulfillmentStatesConfigurationSummary
-            //instance = new FulfillmentStatesConfigurationSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FulfillmentStatesConfigurationSummary
-        /// </summary>
-        [Test]
-        public void FulfillmentStatesConfigurationSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FulfillmentStatesConfigurationSummary
-            //Assert.IsInstanceOfType<FulfillmentStatesConfigurationSummary> (instance, "variable 'instance' is a FulfillmentStatesConfigurationSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'ConfigurationUid'
-        /// </summary>
-        [Test]
-        public void ConfigurationUidTest()
-        {
-            // TODO unit test for the property 'ConfigurationUid'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'Stores'
-        /// </summary>
-        [Test]
-        public void StoresTest()
-        {
-            // TODO unit test for the property 'Stores'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FulfillmentStatesConfigurationTests.cs b/src/Flipdish.Test/Model/FulfillmentStatesConfigurationTests.cs
deleted file mode 100644
index fae31d3b..00000000
--- a/src/Flipdish.Test/Model/FulfillmentStatesConfigurationTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FulfillmentStatesConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FulfillmentStatesConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for FulfillmentStatesConfiguration
-        //private FulfillmentStatesConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FulfillmentStatesConfiguration
-            //instance = new FulfillmentStatesConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FulfillmentStatesConfiguration
-        /// </summary>
-        [Test]
-        public void FulfillmentStatesConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FulfillmentStatesConfiguration
-            //Assert.IsInstanceOfType<FulfillmentStatesConfiguration> (instance, "variable 'instance' is a FulfillmentStatesConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'States'
-        /// </summary>
-        [Test]
-        public void StatesTest()
-        {
-            // TODO unit test for the property 'States'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'ConfigurationUid'
-        /// </summary>
-        [Test]
-        public void ConfigurationUidTest()
-        {
-            // TODO unit test for the property 'ConfigurationUid'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FulfillmentStatesConfiguredStoreTests.cs b/src/Flipdish.Test/Model/FulfillmentStatesConfiguredStoreTests.cs
deleted file mode 100644
index 7f37c1ee..00000000
--- a/src/Flipdish.Test/Model/FulfillmentStatesConfiguredStoreTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FulfillmentStatesConfiguredStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FulfillmentStatesConfiguredStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for FulfillmentStatesConfiguredStore
-        //private FulfillmentStatesConfiguredStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FulfillmentStatesConfiguredStore
-            //instance = new FulfillmentStatesConfiguredStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FulfillmentStatesConfiguredStore
-        /// </summary>
-        [Test]
-        public void FulfillmentStatesConfiguredStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FulfillmentStatesConfiguredStore
-            //Assert.IsInstanceOfType<FulfillmentStatesConfiguredStore> (instance, "variable 'instance' is a FulfillmentStatesConfiguredStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/FulfillmentStatusConfigurationItemTests.cs b/src/Flipdish.Test/Model/FulfillmentStatusConfigurationItemTests.cs
deleted file mode 100644
index e99293a8..00000000
--- a/src/Flipdish.Test/Model/FulfillmentStatusConfigurationItemTests.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing FulfillmentStatusConfigurationItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class FulfillmentStatusConfigurationItemTests
-    {
-        // TODO uncomment below to declare an instance variable for FulfillmentStatusConfigurationItem
-        //private FulfillmentStatusConfigurationItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of FulfillmentStatusConfigurationItem
-            //instance = new FulfillmentStatusConfigurationItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of FulfillmentStatusConfigurationItem
-        /// </summary>
-        [Test]
-        public void FulfillmentStatusConfigurationItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" FulfillmentStatusConfigurationItem
-            //Assert.IsInstanceOfType<FulfillmentStatusConfigurationItem> (instance, "variable 'instance' is a FulfillmentStatusConfigurationItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StatusId'
-        /// </summary>
-        [Test]
-        public void StatusIdTest()
-        {
-            // TODO unit test for the property 'StatusId'
-        }
-        /// <summary>
-        /// Test the property 'StatusName'
-        /// </summary>
-        [Test]
-        public void StatusNameTest()
-        {
-            // TODO unit test for the property 'StatusName'
-        }
-        /// <summary>
-        /// Test the property 'Enabled'
-        /// </summary>
-        [Test]
-        public void EnabledTest()
-        {
-            // TODO unit test for the property 'Enabled'
-        }
-        /// <summary>
-        /// Test the property 'DisplayName'
-        /// </summary>
-        [Test]
-        public void DisplayNameTest()
-        {
-            // TODO unit test for the property 'DisplayName'
-        }
-        /// <summary>
-        /// Test the property 'Icon'
-        /// </summary>
-        [Test]
-        public void IconTest()
-        {
-            // TODO unit test for the property 'Icon'
-        }
-        /// <summary>
-        /// Test the property 'PublicDescription'
-        /// </summary>
-        [Test]
-        public void PublicDescriptionTest()
-        {
-            // TODO unit test for the property 'PublicDescription'
-        }
-        /// <summary>
-        /// Test the property 'Internal'
-        /// </summary>
-        [Test]
-        public void InternalTest()
-        {
-            // TODO unit test for the property 'Internal'
-        }
-        /// <summary>
-        /// Test the property 'NextStatuses'
-        /// </summary>
-        [Test]
-        public void NextStatusesTest()
-        {
-            // TODO unit test for the property 'NextStatuses'
-        }
-        /// <summary>
-        /// Test the property 'DefaultNextStatus'
-        /// </summary>
-        [Test]
-        public void DefaultNextStatusTest()
-        {
-            // TODO unit test for the property 'DefaultNextStatus'
-        }
-        /// <summary>
-        /// Test the property 'ChangeType'
-        /// </summary>
-        [Test]
-        public void ChangeTypeTest()
-        {
-            // TODO unit test for the property 'ChangeType'
-        }
-        /// <summary>
-        /// Test the property 'IncludeInReports'
-        /// </summary>
-        [Test]
-        public void IncludeInReportsTest()
-        {
-            // TODO unit test for the property 'IncludeInReports'
-        }
-        /// <summary>
-        /// Test the property 'IsCustom'
-        /// </summary>
-        [Test]
-        public void IsCustomTest()
-        {
-            // TODO unit test for the property 'IsCustom'
-        }
-        /// <summary>
-        /// Test the property 'OrderTypes'
-        /// </summary>
-        [Test]
-        public void OrderTypesTest()
-        {
-            // TODO unit test for the property 'OrderTypes'
-        }
-        /// <summary>
-        /// Test the property 'Communication'
-        /// </summary>
-        [Test]
-        public void CommunicationTest()
-        {
-            // TODO unit test for the property 'Communication'
-        }
-        /// <summary>
-        /// Test the property 'VisualOrder'
-        /// </summary>
-        [Test]
-        public void VisualOrderTest()
-        {
-            // TODO unit test for the property 'VisualOrder'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GeoPointRequestTests.cs b/src/Flipdish.Test/Model/GeoPointRequestTests.cs
deleted file mode 100644
index 19d5a1a6..00000000
--- a/src/Flipdish.Test/Model/GeoPointRequestTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GeoPointRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GeoPointRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for GeoPointRequest
-        //private GeoPointRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GeoPointRequest
-            //instance = new GeoPointRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GeoPointRequest
-        /// </summary>
-        [Test]
-        public void GeoPointRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GeoPointRequest
-            //Assert.IsInstanceOfType<GeoPointRequest> (instance, "variable 'instance' is a GeoPointRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Latitude'
-        /// </summary>
-        [Test]
-        public void LatitudeTest()
-        {
-            // TODO unit test for the property 'Latitude'
-        }
-        /// <summary>
-        /// Test the property 'Longitude'
-        /// </summary>
-        [Test]
-        public void LongitudeTest()
-        {
-            // TODO unit test for the property 'Longitude'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GoogleAddressComponentTests.cs b/src/Flipdish.Test/Model/GoogleAddressComponentTests.cs
deleted file mode 100644
index cc8ab268..00000000
--- a/src/Flipdish.Test/Model/GoogleAddressComponentTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GoogleAddressComponent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GoogleAddressComponentTests
-    {
-        // TODO uncomment below to declare an instance variable for GoogleAddressComponent
-        //private GoogleAddressComponent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GoogleAddressComponent
-            //instance = new GoogleAddressComponent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GoogleAddressComponent
-        /// </summary>
-        [Test]
-        public void GoogleAddressComponentInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GoogleAddressComponent
-            //Assert.IsInstanceOfType<GoogleAddressComponent> (instance, "variable 'instance' is a GoogleAddressComponent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Long_name'
-        /// </summary>
-        [Test]
-        public void Long_nameTest()
-        {
-            // TODO unit test for the property 'Long_name'
-        }
-        /// <summary>
-        /// Test the property 'Short_name'
-        /// </summary>
-        [Test]
-        public void Short_nameTest()
-        {
-            // TODO unit test for the property 'Short_name'
-        }
-        /// <summary>
-        /// Test the property 'Types'
-        /// </summary>
-        [Test]
-        public void TypesTest()
-        {
-            // TODO unit test for the property 'Types'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GoogleAddressResultTests.cs b/src/Flipdish.Test/Model/GoogleAddressResultTests.cs
deleted file mode 100644
index 5e41750c..00000000
--- a/src/Flipdish.Test/Model/GoogleAddressResultTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GoogleAddressResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GoogleAddressResultTests
-    {
-        // TODO uncomment below to declare an instance variable for GoogleAddressResult
-        //private GoogleAddressResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GoogleAddressResult
-            //instance = new GoogleAddressResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GoogleAddressResult
-        /// </summary>
-        [Test]
-        public void GoogleAddressResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GoogleAddressResult
-            //Assert.IsInstanceOfType<GoogleAddressResult> (instance, "variable 'instance' is a GoogleAddressResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Address_components'
-        /// </summary>
-        [Test]
-        public void Address_componentsTest()
-        {
-            // TODO unit test for the property 'Address_components'
-        }
-        /// <summary>
-        /// Test the property 'Formatted_address'
-        /// </summary>
-        [Test]
-        public void Formatted_addressTest()
-        {
-            // TODO unit test for the property 'Formatted_address'
-        }
-        /// <summary>
-        /// Test the property 'Geometry'
-        /// </summary>
-        [Test]
-        public void GeometryTest()
-        {
-            // TODO unit test for the property 'Geometry'
-        }
-        /// <summary>
-        /// Test the property 'Place_id'
-        /// </summary>
-        [Test]
-        public void Place_idTest()
-        {
-            // TODO unit test for the property 'Place_id'
-        }
-        /// <summary>
-        /// Test the property 'Types'
-        /// </summary>
-        [Test]
-        public void TypesTest()
-        {
-            // TODO unit test for the property 'Types'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GoogleAddressTests.cs b/src/Flipdish.Test/Model/GoogleAddressTests.cs
deleted file mode 100644
index a14a862c..00000000
--- a/src/Flipdish.Test/Model/GoogleAddressTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GoogleAddress
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GoogleAddressTests
-    {
-        // TODO uncomment below to declare an instance variable for GoogleAddress
-        //private GoogleAddress instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GoogleAddress
-            //instance = new GoogleAddress();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GoogleAddress
-        /// </summary>
-        [Test]
-        public void GoogleAddressInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GoogleAddress
-            //Assert.IsInstanceOfType<GoogleAddress> (instance, "variable 'instance' is a GoogleAddress");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Results'
-        /// </summary>
-        [Test]
-        public void ResultsTest()
-        {
-            // TODO unit test for the property 'Results'
-        }
-        /// <summary>
-        /// Test the property 'Result'
-        /// </summary>
-        [Test]
-        public void ResultTest()
-        {
-            // TODO unit test for the property 'Result'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GoogleCoordinatesTests.cs b/src/Flipdish.Test/Model/GoogleCoordinatesTests.cs
deleted file mode 100644
index 7e50b566..00000000
--- a/src/Flipdish.Test/Model/GoogleCoordinatesTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GoogleCoordinates
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GoogleCoordinatesTests
-    {
-        // TODO uncomment below to declare an instance variable for GoogleCoordinates
-        //private GoogleCoordinates instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GoogleCoordinates
-            //instance = new GoogleCoordinates();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GoogleCoordinates
-        /// </summary>
-        [Test]
-        public void GoogleCoordinatesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GoogleCoordinates
-            //Assert.IsInstanceOfType<GoogleCoordinates> (instance, "variable 'instance' is a GoogleCoordinates");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Lat'
-        /// </summary>
-        [Test]
-        public void LatTest()
-        {
-            // TODO unit test for the property 'Lat'
-        }
-        /// <summary>
-        /// Test the property 'Lng'
-        /// </summary>
-        [Test]
-        public void LngTest()
-        {
-            // TODO unit test for the property 'Lng'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GoogleGeometryTests.cs b/src/Flipdish.Test/Model/GoogleGeometryTests.cs
deleted file mode 100644
index c8dacf27..00000000
--- a/src/Flipdish.Test/Model/GoogleGeometryTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GoogleGeometry
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GoogleGeometryTests
-    {
-        // TODO uncomment below to declare an instance variable for GoogleGeometry
-        //private GoogleGeometry instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GoogleGeometry
-            //instance = new GoogleGeometry();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GoogleGeometry
-        /// </summary>
-        [Test]
-        public void GoogleGeometryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GoogleGeometry
-            //Assert.IsInstanceOfType<GoogleGeometry> (instance, "variable 'instance' is a GoogleGeometry");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Location'
-        /// </summary>
-        [Test]
-        public void LocationTest()
-        {
-            // TODO unit test for the property 'Location'
-        }
-        /// <summary>
-        /// Test the property 'Location_type'
-        /// </summary>
-        [Test]
-        public void Location_typeTest()
-        {
-            // TODO unit test for the property 'Location_type'
-        }
-        /// <summary>
-        /// Test the property 'Viewport'
-        /// </summary>
-        [Test]
-        public void ViewportTest()
-        {
-            // TODO unit test for the property 'Viewport'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GoogleLocationTests.cs b/src/Flipdish.Test/Model/GoogleLocationTests.cs
deleted file mode 100644
index 758e25c6..00000000
--- a/src/Flipdish.Test/Model/GoogleLocationTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GoogleLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GoogleLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for GoogleLocation
-        //private GoogleLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GoogleLocation
-            //instance = new GoogleLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GoogleLocation
-        /// </summary>
-        [Test]
-        public void GoogleLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GoogleLocation
-            //Assert.IsInstanceOfType<GoogleLocation> (instance, "variable 'instance' is a GoogleLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Lat'
-        /// </summary>
-        [Test]
-        public void LatTest()
-        {
-            // TODO unit test for the property 'Lat'
-        }
-        /// <summary>
-        /// Test the property 'Lng'
-        /// </summary>
-        [Test]
-        public void LngTest()
-        {
-            // TODO unit test for the property 'Lng'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GoogleViewportTests.cs b/src/Flipdish.Test/Model/GoogleViewportTests.cs
deleted file mode 100644
index 558ac649..00000000
--- a/src/Flipdish.Test/Model/GoogleViewportTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GoogleViewport
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GoogleViewportTests
-    {
-        // TODO uncomment below to declare an instance variable for GoogleViewport
-        //private GoogleViewport instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GoogleViewport
-            //instance = new GoogleViewport();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GoogleViewport
-        /// </summary>
-        [Test]
-        public void GoogleViewportInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GoogleViewport
-            //Assert.IsInstanceOfType<GoogleViewport> (instance, "variable 'instance' is a GoogleViewport");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Northeast'
-        /// </summary>
-        [Test]
-        public void NortheastTest()
-        {
-            // TODO unit test for the property 'Northeast'
-        }
-        /// <summary>
-        /// Test the property 'Southwest'
-        /// </summary>
-        [Test]
-        public void SouthwestTest()
-        {
-            // TODO unit test for the property 'Southwest'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GroupReferenceTests.cs b/src/Flipdish.Test/Model/GroupReferenceTests.cs
deleted file mode 100644
index 66948691..00000000
--- a/src/Flipdish.Test/Model/GroupReferenceTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GroupReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GroupReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for GroupReference
-        //private GroupReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GroupReference
-            //instance = new GroupReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GroupReference
-        /// </summary>
-        [Test]
-        public void GroupReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GroupReference
-            //Assert.IsInstanceOfType<GroupReference> (instance, "variable 'instance' is a GroupReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Group'
-        /// </summary>
-        [Test]
-        public void GroupTest()
-        {
-            // TODO unit test for the property 'Group'
-        }
-        /// <summary>
-        /// Test the property 'CatalogGroupId'
-        /// </summary>
-        [Test]
-        public void CatalogGroupIdTest()
-        {
-            // TODO unit test for the property 'CatalogGroupId'
-        }
-        /// <summary>
-        /// Test the property 'GroupType'
-        /// </summary>
-        [Test]
-        public void GroupTypeTest()
-        {
-            // TODO unit test for the property 'GroupType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GroupTests.cs b/src/Flipdish.Test/Model/GroupTests.cs
deleted file mode 100644
index 2d9e2f69..00000000
--- a/src/Flipdish.Test/Model/GroupTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Group
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GroupTests
-    {
-        // TODO uncomment below to declare an instance variable for Group
-        //private Group instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Group
-            //instance = new Group();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Group
-        /// </summary>
-        [Test]
-        public void GroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Group
-            //Assert.IsInstanceOfType<Group> (instance, "variable 'instance' is a Group");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogGroupId'
-        /// </summary>
-        [Test]
-        public void CatalogGroupIdTest()
-        {
-            // TODO unit test for the property 'CatalogGroupId'
-        }
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'IsArchived'
-        /// </summary>
-        [Test]
-        public void IsArchivedTest()
-        {
-            // TODO unit test for the property 'IsArchived'
-        }
-        /// <summary>
-        /// Test the property 'MinSelectCount'
-        /// </summary>
-        [Test]
-        public void MinSelectCountTest()
-        {
-            // TODO unit test for the property 'MinSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelectCount'
-        /// </summary>
-        [Test]
-        public void MaxSelectCountTest()
-        {
-            // TODO unit test for the property 'MaxSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'Products'
-        /// </summary>
-        [Test]
-        public void ProductsTest()
-        {
-            // TODO unit test for the property 'Products'
-        }
-        /// <summary>
-        /// Test the property 'Metafields'
-        /// </summary>
-        [Test]
-        public void MetafieldsTest()
-        {
-            // TODO unit test for the property 'Metafields'
-        }
-        /// <summary>
-        /// Test the property 'GroupType'
-        /// </summary>
-        [Test]
-        public void GroupTypeTest()
-        {
-            // TODO unit test for the property 'GroupType'
-        }
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'AutogenerateDisplayText'
-        /// </summary>
-        [Test]
-        public void AutogenerateDisplayTextTest()
-        {
-            // TODO unit test for the property 'AutogenerateDisplayText'
-        }
-        /// <summary>
-        /// Test the property 'ImageFileName'
-        /// </summary>
-        [Test]
-        public void ImageFileNameTest()
-        {
-            // TODO unit test for the property 'ImageFileName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/GroupedCoordinatesTests.cs b/src/Flipdish.Test/Model/GroupedCoordinatesTests.cs
deleted file mode 100644
index f138ccc7..00000000
--- a/src/Flipdish.Test/Model/GroupedCoordinatesTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing GroupedCoordinates
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class GroupedCoordinatesTests
-    {
-        // TODO uncomment below to declare an instance variable for GroupedCoordinates
-        //private GroupedCoordinates instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of GroupedCoordinates
-            //instance = new GroupedCoordinates();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of GroupedCoordinates
-        /// </summary>
-        [Test]
-        public void GroupedCoordinatesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" GroupedCoordinates
-            //Assert.IsInstanceOfType<GroupedCoordinates> (instance, "variable 'instance' is a GroupedCoordinates");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Latitude'
-        /// </summary>
-        [Test]
-        public void LatitudeTest()
-        {
-            // TODO unit test for the property 'Latitude'
-        }
-        /// <summary>
-        /// Test the property 'Longitude'
-        /// </summary>
-        [Test]
-        public void LongitudeTest()
-        {
-            // TODO unit test for the property 'Longitude'
-        }
-        /// <summary>
-        /// Test the property 'Count'
-        /// </summary>
-        [Test]
-        public void CountTest()
-        {
-            // TODO unit test for the property 'Count'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HomeActionTests.cs b/src/Flipdish.Test/Model/HomeActionTests.cs
deleted file mode 100644
index 12c28f71..00000000
--- a/src/Flipdish.Test/Model/HomeActionTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HomeAction
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HomeActionTests
-    {
-        // TODO uncomment below to declare an instance variable for HomeAction
-        //private HomeAction instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HomeAction
-            //instance = new HomeAction();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HomeAction
-        /// </summary>
-        [Test]
-        public void HomeActionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HomeAction
-            //Assert.IsInstanceOfType<HomeAction> (instance, "variable 'instance' is a HomeAction");
-        }
-
-
-        /// <summary>
-        /// Test the property 'HomeActionId'
-        /// </summary>
-        [Test]
-        public void HomeActionIdTest()
-        {
-            // TODO unit test for the property 'HomeActionId'
-        }
-        /// <summary>
-        /// Test the property 'HomeActionType'
-        /// </summary>
-        [Test]
-        public void HomeActionTypeTest()
-        {
-            // TODO unit test for the property 'HomeActionType'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'TitleKey'
-        /// </summary>
-        [Test]
-        public void TitleKeyTest()
-        {
-            // TODO unit test for the property 'TitleKey'
-        }
-        /// <summary>
-        /// Test the property 'ActionKey'
-        /// </summary>
-        [Test]
-        public void ActionKeyTest()
-        {
-            // TODO unit test for the property 'ActionKey'
-        }
-        /// <summary>
-        /// Test the property 'DescriptionKey'
-        /// </summary>
-        [Test]
-        public void DescriptionKeyTest()
-        {
-            // TODO unit test for the property 'DescriptionKey'
-        }
-        /// <summary>
-        /// Test the property 'Action'
-        /// </summary>
-        [Test]
-        public void ActionTest()
-        {
-            // TODO unit test for the property 'Action'
-        }
-        /// <summary>
-        /// Test the property 'Dismissible'
-        /// </summary>
-        [Test]
-        public void DismissibleTest()
-        {
-            // TODO unit test for the property 'Dismissible'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HomeStatisticsTests.cs b/src/Flipdish.Test/Model/HomeStatisticsTests.cs
deleted file mode 100644
index bd4a9597..00000000
--- a/src/Flipdish.Test/Model/HomeStatisticsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HomeStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HomeStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for HomeStatistics
-        //private HomeStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HomeStatistics
-            //instance = new HomeStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HomeStatistics
-        /// </summary>
-        [Test]
-        public void HomeStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HomeStatistics
-            //Assert.IsInstanceOfType<HomeStatistics> (instance, "variable 'instance' is a HomeStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TotalMoneySaved'
-        /// </summary>
-        [Test]
-        public void TotalMoneySavedTest()
-        {
-            // TODO unit test for the property 'TotalMoneySaved'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HttpRequestAndResponseLogTests.cs b/src/Flipdish.Test/Model/HttpRequestAndResponseLogTests.cs
deleted file mode 100644
index f070aab1..00000000
--- a/src/Flipdish.Test/Model/HttpRequestAndResponseLogTests.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HttpRequestAndResponseLog
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HttpRequestAndResponseLogTests
-    {
-        // TODO uncomment below to declare an instance variable for HttpRequestAndResponseLog
-        //private HttpRequestAndResponseLog instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HttpRequestAndResponseLog
-            //instance = new HttpRequestAndResponseLog();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HttpRequestAndResponseLog
-        /// </summary>
-        [Test]
-        public void HttpRequestAndResponseLogInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HttpRequestAndResponseLog
-            //Assert.IsInstanceOfType<HttpRequestAndResponseLog> (instance, "variable 'instance' is a HttpRequestAndResponseLog");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Guid'
-        /// </summary>
-        [Test]
-        public void GuidTest()
-        {
-            // TODO unit test for the property 'Guid'
-        }
-        /// <summary>
-        /// Test the property 'Verb'
-        /// </summary>
-        [Test]
-        public void VerbTest()
-        {
-            // TODO unit test for the property 'Verb'
-        }
-        /// <summary>
-        /// Test the property 'RequestUri'
-        /// </summary>
-        [Test]
-        public void RequestUriTest()
-        {
-            // TODO unit test for the property 'RequestUri'
-        }
-        /// <summary>
-        /// Test the property 'StatusCode'
-        /// </summary>
-        [Test]
-        public void StatusCodeTest()
-        {
-            // TODO unit test for the property 'StatusCode'
-        }
-        /// <summary>
-        /// Test the property 'ReasonPhrase'
-        /// </summary>
-        [Test]
-        public void ReasonPhraseTest()
-        {
-            // TODO unit test for the property 'ReasonPhrase'
-        }
-        /// <summary>
-        /// Test the property 'CallDurationInMilliseconds'
-        /// </summary>
-        [Test]
-        public void CallDurationInMillisecondsTest()
-        {
-            // TODO unit test for the property 'CallDurationInMilliseconds'
-        }
-        /// <summary>
-        /// Test the property 'UserId'
-        /// </summary>
-        [Test]
-        public void UserIdTest()
-        {
-            // TODO unit test for the property 'UserId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-        /// <summary>
-        /// Test the property 'CreatedDateTime'
-        /// </summary>
-        [Test]
-        public void CreatedDateTimeTest()
-        {
-            // TODO unit test for the property 'CreatedDateTime'
-        }
-        /// <summary>
-        /// Test the property 'RequestHeaders'
-        /// </summary>
-        [Test]
-        public void RequestHeadersTest()
-        {
-            // TODO unit test for the property 'RequestHeaders'
-        }
-        /// <summary>
-        /// Test the property 'RequestBody'
-        /// </summary>
-        [Test]
-        public void RequestBodyTest()
-        {
-            // TODO unit test for the property 'RequestBody'
-        }
-        /// <summary>
-        /// Test the property 'RequestLength'
-        /// </summary>
-        [Test]
-        public void RequestLengthTest()
-        {
-            // TODO unit test for the property 'RequestLength'
-        }
-        /// <summary>
-        /// Test the property 'ResponseHeaders'
-        /// </summary>
-        [Test]
-        public void ResponseHeadersTest()
-        {
-            // TODO unit test for the property 'ResponseHeaders'
-        }
-        /// <summary>
-        /// Test the property 'ResponseBody'
-        /// </summary>
-        [Test]
-        public void ResponseBodyTest()
-        {
-            // TODO unit test for the property 'ResponseBody'
-        }
-        /// <summary>
-        /// Test the property 'ResponseLength'
-        /// </summary>
-        [Test]
-        public void ResponseLengthTest()
-        {
-            // TODO unit test for the property 'ResponseLength'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraAssignedEventTests.cs b/src/Flipdish.Test/Model/HydraAssignedEventTests.cs
deleted file mode 100644
index 5677e8ef..00000000
--- a/src/Flipdish.Test/Model/HydraAssignedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraAssignedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraAssignedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraAssignedEvent
-        //private HydraAssignedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraAssignedEvent
-            //instance = new HydraAssignedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraAssignedEvent
-        /// </summary>
-        [Test]
-        public void HydraAssignedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraAssignedEvent
-            //Assert.IsInstanceOfType<HydraAssignedEvent> (instance, "variable 'instance' is a HydraAssignedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'HydraStatus'
-        /// </summary>
-        [Test]
-        public void HydraStatusTest()
-        {
-            // TODO unit test for the property 'HydraStatus'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraConfigTests.cs b/src/Flipdish.Test/Model/HydraConfigTests.cs
deleted file mode 100644
index a0d60a28..00000000
--- a/src/Flipdish.Test/Model/HydraConfigTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraConfig
-        //private HydraConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraConfig
-            //instance = new HydraConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraConfig
-        /// </summary>
-        [Test]
-        public void HydraConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraConfig
-            //Assert.IsInstanceOfType<HydraConfig> (instance, "variable 'instance' is a HydraConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MinimumVersion'
-        /// </summary>
-        [Test]
-        public void MinimumVersionTest()
-        {
-            // TODO unit test for the property 'MinimumVersion'
-        }
-        /// <summary>
-        /// Test the property 'PaymentOptions'
-        /// </summary>
-        [Test]
-        public void PaymentOptionsTest()
-        {
-            // TODO unit test for the property 'PaymentOptions'
-        }
-        /// <summary>
-        /// Test the property 'DeviceSettings'
-        /// </summary>
-        [Test]
-        public void DeviceSettingsTest()
-        {
-            // TODO unit test for the property 'DeviceSettings'
-        }
-        /// <summary>
-        /// Test the property 'Version'
-        /// </summary>
-        [Test]
-        public void VersionTest()
-        {
-            // TODO unit test for the property 'Version'
-        }
-        /// <summary>
-        /// Test the property 'BuildNumber'
-        /// </summary>
-        [Test]
-        public void BuildNumberTest()
-        {
-            // TODO unit test for the property 'BuildNumber'
-        }
-        /// <summary>
-        /// Test the property 'GitSha'
-        /// </summary>
-        [Test]
-        public void GitShaTest()
-        {
-            // TODO unit test for the property 'GitSha'
-        }
-        /// <summary>
-        /// Test the property 'GitBranch'
-        /// </summary>
-        [Test]
-        public void GitBranchTest()
-        {
-            // TODO unit test for the property 'GitBranch'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraConnectionStatusChangedEventTests.cs b/src/Flipdish.Test/Model/HydraConnectionStatusChangedEventTests.cs
deleted file mode 100644
index 5ac1f53b..00000000
--- a/src/Flipdish.Test/Model/HydraConnectionStatusChangedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraConnectionStatusChangedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraConnectionStatusChangedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraConnectionStatusChangedEvent
-        //private HydraConnectionStatusChangedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraConnectionStatusChangedEvent
-            //instance = new HydraConnectionStatusChangedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraConnectionStatusChangedEvent
-        /// </summary>
-        [Test]
-        public void HydraConnectionStatusChangedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraConnectionStatusChangedEvent
-            //Assert.IsInstanceOfType<HydraConnectionStatusChangedEvent> (instance, "variable 'instance' is a HydraConnectionStatusChangedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'HydraDeviceStatus'
-        /// </summary>
-        [Test]
-        public void HydraDeviceStatusTest()
-        {
-            // TODO unit test for the property 'HydraDeviceStatus'
-        }
-        /// <summary>
-        /// Test the property 'PollTime'
-        /// </summary>
-        [Test]
-        public void PollTimeTest()
-        {
-            // TODO unit test for the property 'PollTime'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraDeviceDetailsTests.cs b/src/Flipdish.Test/Model/HydraDeviceDetailsTests.cs
deleted file mode 100644
index d3453c4d..00000000
--- a/src/Flipdish.Test/Model/HydraDeviceDetailsTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraDeviceDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraDeviceDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraDeviceDetails
-        //private HydraDeviceDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraDeviceDetails
-            //instance = new HydraDeviceDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraDeviceDetails
-        /// </summary>
-        [Test]
-        public void HydraDeviceDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraDeviceDetails
-            //Assert.IsInstanceOfType<HydraDeviceDetails> (instance, "variable 'instance' is a HydraDeviceDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'HydraConfigId'
-        /// </summary>
-        [Test]
-        public void HydraConfigIdTest()
-        {
-            // TODO unit test for the property 'HydraConfigId'
-        }
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'DeviceType'
-        /// </summary>
-        [Test]
-        public void DeviceTypeTest()
-        {
-            // TODO unit test for the property 'DeviceType'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'DeviceName'
-        /// </summary>
-        [Test]
-        public void DeviceNameTest()
-        {
-            // TODO unit test for the property 'DeviceName'
-        }
-        /// <summary>
-        /// Test the property 'StoreNames'
-        /// </summary>
-        [Test]
-        public void StoreNamesTest()
-        {
-            // TODO unit test for the property 'StoreNames'
-        }
-        /// <summary>
-        /// Test the property 'LastPollUtc'
-        /// </summary>
-        [Test]
-        public void LastPollUtcTest()
-        {
-            // TODO unit test for the property 'LastPollUtc'
-        }
-        /// <summary>
-        /// Test the property 'Version'
-        /// </summary>
-        [Test]
-        public void VersionTest()
-        {
-            // TODO unit test for the property 'Version'
-        }
-        /// <summary>
-        /// Test the property 'BuildNumber'
-        /// </summary>
-        [Test]
-        public void BuildNumberTest()
-        {
-            // TODO unit test for the property 'BuildNumber'
-        }
-        /// <summary>
-        /// Test the property 'GitSha'
-        /// </summary>
-        [Test]
-        public void GitShaTest()
-        {
-            // TODO unit test for the property 'GitSha'
-        }
-        /// <summary>
-        /// Test the property 'GitBranch'
-        /// </summary>
-        [Test]
-        public void GitBranchTest()
-        {
-            // TODO unit test for the property 'GitBranch'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraRegistrationRequestTests.cs b/src/Flipdish.Test/Model/HydraRegistrationRequestTests.cs
deleted file mode 100644
index e06f48e4..00000000
--- a/src/Flipdish.Test/Model/HydraRegistrationRequestTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraRegistrationRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraRegistrationRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraRegistrationRequest
-        //private HydraRegistrationRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraRegistrationRequest
-            //instance = new HydraRegistrationRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraRegistrationRequest
-        /// </summary>
-        [Test]
-        public void HydraRegistrationRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraRegistrationRequest
-            //Assert.IsInstanceOfType<HydraRegistrationRequest> (instance, "variable 'instance' is a HydraRegistrationRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-        /// <summary>
-        /// Test the property 'DeviceName'
-        /// </summary>
-        [Test]
-        public void DeviceNameTest()
-        {
-            // TODO unit test for the property 'DeviceName'
-        }
-        /// <summary>
-        /// Test the property 'PinCode'
-        /// </summary>
-        [Test]
-        public void PinCodeTest()
-        {
-            // TODO unit test for the property 'PinCode'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraRegistrationTests.cs b/src/Flipdish.Test/Model/HydraRegistrationTests.cs
deleted file mode 100644
index 698a6408..00000000
--- a/src/Flipdish.Test/Model/HydraRegistrationTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraRegistration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraRegistrationTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraRegistration
-        //private HydraRegistration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraRegistration
-            //instance = new HydraRegistration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraRegistration
-        /// </summary>
-        [Test]
-        public void HydraRegistrationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraRegistration
-            //Assert.IsInstanceOfType<HydraRegistration> (instance, "variable 'instance' is a HydraRegistration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'DeviceName'
-        /// </summary>
-        [Test]
-        public void DeviceNameTest()
-        {
-            // TODO unit test for the property 'DeviceName'
-        }
-        /// <summary>
-        /// Test the property 'PinCode'
-        /// </summary>
-        [Test]
-        public void PinCodeTest()
-        {
-            // TODO unit test for the property 'PinCode'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraRequestResetEventTests.cs b/src/Flipdish.Test/Model/HydraRequestResetEventTests.cs
deleted file mode 100644
index de7e506e..00000000
--- a/src/Flipdish.Test/Model/HydraRequestResetEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraRequestResetEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraRequestResetEventTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraRequestResetEvent
-        //private HydraRequestResetEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraRequestResetEvent
-            //instance = new HydraRequestResetEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraRequestResetEvent
-        /// </summary>
-        [Test]
-        public void HydraRequestResetEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraRequestResetEvent
-            //Assert.IsInstanceOfType<HydraRequestResetEvent> (instance, "variable 'instance' is a HydraRequestResetEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraSettingChangedEventTests.cs b/src/Flipdish.Test/Model/HydraSettingChangedEventTests.cs
deleted file mode 100644
index 5f0646c2..00000000
--- a/src/Flipdish.Test/Model/HydraSettingChangedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraSettingChangedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraSettingChangedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraSettingChangedEvent
-        //private HydraSettingChangedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraSettingChangedEvent
-            //instance = new HydraSettingChangedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraSettingChangedEvent
-        /// </summary>
-        [Test]
-        public void HydraSettingChangedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraSettingChangedEvent
-            //Assert.IsInstanceOfType<HydraSettingChangedEvent> (instance, "variable 'instance' is a HydraSettingChangedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'HydraConfig'
-        /// </summary>
-        [Test]
-        public void HydraConfigTest()
-        {
-            // TODO unit test for the property 'HydraConfig'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraStatusTests.cs b/src/Flipdish.Test/Model/HydraStatusTests.cs
deleted file mode 100644
index cc7c05ed..00000000
--- a/src/Flipdish.Test/Model/HydraStatusTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraStatus
-        //private HydraStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraStatus
-            //instance = new HydraStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraStatus
-        /// </summary>
-        [Test]
-        public void HydraStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraStatus
-            //Assert.IsInstanceOfType<HydraStatus> (instance, "variable 'instance' is a HydraStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-        /// <summary>
-        /// Test the property 'IsRegistered'
-        /// </summary>
-        [Test]
-        public void IsRegisteredTest()
-        {
-            // TODO unit test for the property 'IsRegistered'
-        }
-        /// <summary>
-        /// Test the property 'PinCode'
-        /// </summary>
-        [Test]
-        public void PinCodeTest()
-        {
-            // TODO unit test for the property 'PinCode'
-        }
-        /// <summary>
-        /// Test the property 'Images'
-        /// </summary>
-        [Test]
-        public void ImagesTest()
-        {
-            // TODO unit test for the property 'Images'
-        }
-        /// <summary>
-        /// Test the property 'UserType'
-        /// </summary>
-        [Test]
-        public void UserTypeTest()
-        {
-            // TODO unit test for the property 'UserType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraStoreAssignedEventTests.cs b/src/Flipdish.Test/Model/HydraStoreAssignedEventTests.cs
deleted file mode 100644
index a068fe30..00000000
--- a/src/Flipdish.Test/Model/HydraStoreAssignedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraStoreAssignedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraStoreAssignedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraStoreAssignedEvent
-        //private HydraStoreAssignedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraStoreAssignedEvent
-            //instance = new HydraStoreAssignedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraStoreAssignedEvent
-        /// </summary>
-        [Test]
-        public void HydraStoreAssignedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraStoreAssignedEvent
-            //Assert.IsInstanceOfType<HydraStoreAssignedEvent> (instance, "variable 'instance' is a HydraStoreAssignedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraStoreDataTests.cs b/src/Flipdish.Test/Model/HydraStoreDataTests.cs
deleted file mode 100644
index 230eec5d..00000000
--- a/src/Flipdish.Test/Model/HydraStoreDataTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraStoreData
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraStoreDataTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraStoreData
-        //private HydraStoreData instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraStoreData
-            //instance = new HydraStoreData();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraStoreData
-        /// </summary>
-        [Test]
-        public void HydraStoreDataInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraStoreData
-            //Assert.IsInstanceOfType<HydraStoreData> (instance, "variable 'instance' is a HydraStoreData");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraStoreUnassignedEventTests.cs b/src/Flipdish.Test/Model/HydraStoreUnassignedEventTests.cs
deleted file mode 100644
index d107ebd9..00000000
--- a/src/Flipdish.Test/Model/HydraStoreUnassignedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraStoreUnassignedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraStoreUnassignedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraStoreUnassignedEvent
-        //private HydraStoreUnassignedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraStoreUnassignedEvent
-            //instance = new HydraStoreUnassignedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraStoreUnassignedEvent
-        /// </summary>
-        [Test]
-        public void HydraStoreUnassignedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraStoreUnassignedEvent
-            //Assert.IsInstanceOfType<HydraStoreUnassignedEvent> (instance, "variable 'instance' is a HydraStoreUnassignedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/HydraUnAssignedEventTests.cs b/src/Flipdish.Test/Model/HydraUnAssignedEventTests.cs
deleted file mode 100644
index cd6a25e8..00000000
--- a/src/Flipdish.Test/Model/HydraUnAssignedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing HydraUnAssignedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class HydraUnAssignedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for HydraUnAssignedEvent
-        //private HydraUnAssignedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of HydraUnAssignedEvent
-            //instance = new HydraUnAssignedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of HydraUnAssignedEvent
-        /// </summary>
-        [Test]
-        public void HydraUnAssignedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" HydraUnAssignedEvent
-            //Assert.IsInstanceOfType<HydraUnAssignedEvent> (instance, "variable 'instance' is a HydraUnAssignedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'HydraStatus'
-        /// </summary>
-        [Test]
-        public void HydraStatusTest()
-        {
-            // TODO unit test for the property 'HydraStatus'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/IndexPageBaseTests.cs b/src/Flipdish.Test/Model/IndexPageBaseTests.cs
deleted file mode 100644
index 17422504..00000000
--- a/src/Flipdish.Test/Model/IndexPageBaseTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing IndexPageBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class IndexPageBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for IndexPageBase
-        //private IndexPageBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of IndexPageBase
-            //instance = new IndexPageBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of IndexPageBase
-        /// </summary>
-        [Test]
-        public void IndexPageBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" IndexPageBase
-            //Assert.IsInstanceOfType<IndexPageBase> (instance, "variable 'instance' is a IndexPageBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AboutSectionEnabled'
-        /// </summary>
-        [Test]
-        public void AboutSectionEnabledTest()
-        {
-            // TODO unit test for the property 'AboutSectionEnabled'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionTitle'
-        /// </summary>
-        [Test]
-        public void AboutSectionTitleTest()
-        {
-            // TODO unit test for the property 'AboutSectionTitle'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionSubtitle'
-        /// </summary>
-        [Test]
-        public void AboutSectionSubtitleTest()
-        {
-            // TODO unit test for the property 'AboutSectionSubtitle'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionLeftTitle'
-        /// </summary>
-        [Test]
-        public void AboutSectionLeftTitleTest()
-        {
-            // TODO unit test for the property 'AboutSectionLeftTitle'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionLeftBody'
-        /// </summary>
-        [Test]
-        public void AboutSectionLeftBodyTest()
-        {
-            // TODO unit test for the property 'AboutSectionLeftBody'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionRightTitle'
-        /// </summary>
-        [Test]
-        public void AboutSectionRightTitleTest()
-        {
-            // TODO unit test for the property 'AboutSectionRightTitle'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionRightBody'
-        /// </summary>
-        [Test]
-        public void AboutSectionRightBodyTest()
-        {
-            // TODO unit test for the property 'AboutSectionRightBody'
-        }
-        /// <summary>
-        /// Test the property 'OpeningHoursEnabled'
-        /// </summary>
-        [Test]
-        public void OpeningHoursEnabledTest()
-        {
-            // TODO unit test for the property 'OpeningHoursEnabled'
-        }
-        /// <summary>
-        /// Test the property 'MenuPreviewEnabled'
-        /// </summary>
-        [Test]
-        public void MenuPreviewEnabledTest()
-        {
-            // TODO unit test for the property 'MenuPreviewEnabled'
-        }
-        /// <summary>
-        /// Test the property 'GalleryEnabled'
-        /// </summary>
-        [Test]
-        public void GalleryEnabledTest()
-        {
-            // TODO unit test for the property 'GalleryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'TestimonialsEnabled'
-        /// </summary>
-        [Test]
-        public void TestimonialsEnabledTest()
-        {
-            // TODO unit test for the property 'TestimonialsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'ContactFormEnabled'
-        /// </summary>
-        [Test]
-        public void ContactFormEnabledTest()
-        {
-            // TODO unit test for the property 'ContactFormEnabled'
-        }
-        /// <summary>
-        /// Test the property 'ContactFormEmail'
-        /// </summary>
-        [Test]
-        public void ContactFormEmailTest()
-        {
-            // TODO unit test for the property 'ContactFormEmail'
-        }
-        /// <summary>
-        /// Test the property 'MapEnabled'
-        /// </summary>
-        [Test]
-        public void MapEnabledTest()
-        {
-            // TODO unit test for the property 'MapEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/IndexPageTests.cs b/src/Flipdish.Test/Model/IndexPageTests.cs
deleted file mode 100644
index f26c4b7f..00000000
--- a/src/Flipdish.Test/Model/IndexPageTests.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing IndexPage
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class IndexPageTests
-    {
-        // TODO uncomment below to declare an instance variable for IndexPage
-        //private IndexPage instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of IndexPage
-            //instance = new IndexPage();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of IndexPage
-        /// </summary>
-        [Test]
-        public void IndexPageInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" IndexPage
-            //Assert.IsInstanceOfType<IndexPage> (instance, "variable 'instance' is a IndexPage");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Testimonials'
-        /// </summary>
-        [Test]
-        public void TestimonialsTest()
-        {
-            // TODO unit test for the property 'Testimonials'
-        }
-        /// <summary>
-        /// Test the property 'Images'
-        /// </summary>
-        [Test]
-        public void ImagesTest()
-        {
-            // TODO unit test for the property 'Images'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionEnabled'
-        /// </summary>
-        [Test]
-        public void AboutSectionEnabledTest()
-        {
-            // TODO unit test for the property 'AboutSectionEnabled'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionTitle'
-        /// </summary>
-        [Test]
-        public void AboutSectionTitleTest()
-        {
-            // TODO unit test for the property 'AboutSectionTitle'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionSubtitle'
-        /// </summary>
-        [Test]
-        public void AboutSectionSubtitleTest()
-        {
-            // TODO unit test for the property 'AboutSectionSubtitle'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionLeftTitle'
-        /// </summary>
-        [Test]
-        public void AboutSectionLeftTitleTest()
-        {
-            // TODO unit test for the property 'AboutSectionLeftTitle'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionLeftBody'
-        /// </summary>
-        [Test]
-        public void AboutSectionLeftBodyTest()
-        {
-            // TODO unit test for the property 'AboutSectionLeftBody'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionRightTitle'
-        /// </summary>
-        [Test]
-        public void AboutSectionRightTitleTest()
-        {
-            // TODO unit test for the property 'AboutSectionRightTitle'
-        }
-        /// <summary>
-        /// Test the property 'AboutSectionRightBody'
-        /// </summary>
-        [Test]
-        public void AboutSectionRightBodyTest()
-        {
-            // TODO unit test for the property 'AboutSectionRightBody'
-        }
-        /// <summary>
-        /// Test the property 'OpeningHoursEnabled'
-        /// </summary>
-        [Test]
-        public void OpeningHoursEnabledTest()
-        {
-            // TODO unit test for the property 'OpeningHoursEnabled'
-        }
-        /// <summary>
-        /// Test the property 'MenuPreviewEnabled'
-        /// </summary>
-        [Test]
-        public void MenuPreviewEnabledTest()
-        {
-            // TODO unit test for the property 'MenuPreviewEnabled'
-        }
-        /// <summary>
-        /// Test the property 'GalleryEnabled'
-        /// </summary>
-        [Test]
-        public void GalleryEnabledTest()
-        {
-            // TODO unit test for the property 'GalleryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'TestimonialsEnabled'
-        /// </summary>
-        [Test]
-        public void TestimonialsEnabledTest()
-        {
-            // TODO unit test for the property 'TestimonialsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'ContactFormEnabled'
-        /// </summary>
-        [Test]
-        public void ContactFormEnabledTest()
-        {
-            // TODO unit test for the property 'ContactFormEnabled'
-        }
-        /// <summary>
-        /// Test the property 'ContactFormEmail'
-        /// </summary>
-        [Test]
-        public void ContactFormEmailTest()
-        {
-            // TODO unit test for the property 'ContactFormEmail'
-        }
-        /// <summary>
-        /// Test the property 'MapEnabled'
-        /// </summary>
-        [Test]
-        public void MapEnabledTest()
-        {
-            // TODO unit test for the property 'MapEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobAddressTests.cs b/src/Flipdish.Test/Model/JobAddressTests.cs
deleted file mode 100644
index 6b1c823c..00000000
--- a/src/Flipdish.Test/Model/JobAddressTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobAddress
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobAddressTests
-    {
-        // TODO uncomment below to declare an instance variable for JobAddress
-        //private JobAddress instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobAddress
-            //instance = new JobAddress();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobAddress
-        /// </summary>
-        [Test]
-        public void JobAddressInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobAddress
-            //Assert.IsInstanceOfType<JobAddress> (instance, "variable 'instance' is a JobAddress");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Street'
-        /// </summary>
-        [Test]
-        public void StreetTest()
-        {
-            // TODO unit test for the property 'Street'
-        }
-        /// <summary>
-        /// Test the property 'Postcode'
-        /// </summary>
-        [Test]
-        public void PostcodeTest()
-        {
-            // TODO unit test for the property 'Postcode'
-        }
-        /// <summary>
-        /// Test the property 'City'
-        /// </summary>
-        [Test]
-        public void CityTest()
-        {
-            // TODO unit test for the property 'City'
-        }
-        /// <summary>
-        /// Test the property 'Country'
-        /// </summary>
-        [Test]
-        public void CountryTest()
-        {
-            // TODO unit test for the property 'Country'
-        }
-        /// <summary>
-        /// Test the property 'Zone'
-        /// </summary>
-        [Test]
-        public void ZoneTest()
-        {
-            // TODO unit test for the property 'Zone'
-        }
-        /// <summary>
-        /// Test the property 'FormattedAddress'
-        /// </summary>
-        [Test]
-        public void FormattedAddressTest()
-        {
-            // TODO unit test for the property 'FormattedAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobCancellationTests.cs b/src/Flipdish.Test/Model/JobCancellationTests.cs
deleted file mode 100644
index b3669801..00000000
--- a/src/Flipdish.Test/Model/JobCancellationTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobCancellation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobCancellationTests
-    {
-        // TODO uncomment below to declare an instance variable for JobCancellation
-        //private JobCancellation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobCancellation
-            //instance = new JobCancellation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobCancellation
-        /// </summary>
-        [Test]
-        public void JobCancellationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobCancellation
-            //Assert.IsInstanceOfType<JobCancellation> (instance, "variable 'instance' is a JobCancellation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CanceledBy'
-        /// </summary>
-        [Test]
-        public void CanceledByTest()
-        {
-            // TODO unit test for the property 'CanceledBy'
-        }
-        /// <summary>
-        /// Test the property 'ReasonKey'
-        /// </summary>
-        [Test]
-        public void ReasonKeyTest()
-        {
-            // TODO unit test for the property 'ReasonKey'
-        }
-        /// <summary>
-        /// Test the property 'Comment'
-        /// </summary>
-        [Test]
-        public void CommentTest()
-        {
-            // TODO unit test for the property 'Comment'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobContactTests.cs b/src/Flipdish.Test/Model/JobContactTests.cs
deleted file mode 100644
index a97e3ec5..00000000
--- a/src/Flipdish.Test/Model/JobContactTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobContact
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobContactTests
-    {
-        // TODO uncomment below to declare an instance variable for JobContact
-        //private JobContact instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobContact
-            //instance = new JobContact();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobContact
-        /// </summary>
-        [Test]
-        public void JobContactInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobContact
-            //Assert.IsInstanceOfType<JobContact> (instance, "variable 'instance' is a JobContact");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Firstname'
-        /// </summary>
-        [Test]
-        public void FirstnameTest()
-        {
-            // TODO unit test for the property 'Firstname'
-        }
-        /// <summary>
-        /// Test the property 'Lastname'
-        /// </summary>
-        [Test]
-        public void LastnameTest()
-        {
-            // TODO unit test for the property 'Lastname'
-        }
-        /// <summary>
-        /// Test the property 'Phone'
-        /// </summary>
-        [Test]
-        public void PhoneTest()
-        {
-            // TODO unit test for the property 'Phone'
-        }
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'Company'
-        /// </summary>
-        [Test]
-        public void CompanyTest()
-        {
-            // TODO unit test for the property 'Company'
-        }
-        /// <summary>
-        /// Test the property 'CompanyName'
-        /// </summary>
-        [Test]
-        public void CompanyNameTest()
-        {
-            // TODO unit test for the property 'CompanyName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobDeliveryDetailTests.cs b/src/Flipdish.Test/Model/JobDeliveryDetailTests.cs
deleted file mode 100644
index 6518c843..00000000
--- a/src/Flipdish.Test/Model/JobDeliveryDetailTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobDeliveryDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobDeliveryDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for JobDeliveryDetail
-        //private JobDeliveryDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobDeliveryDetail
-            //instance = new JobDeliveryDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobDeliveryDetail
-        /// </summary>
-        [Test]
-        public void JobDeliveryDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobDeliveryDetail
-            //Assert.IsInstanceOfType<JobDeliveryDetail> (instance, "variable 'instance' is a JobDeliveryDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Latitude'
-        /// </summary>
-        [Test]
-        public void LatitudeTest()
-        {
-            // TODO unit test for the property 'Latitude'
-        }
-        /// <summary>
-        /// Test the property 'Longitude'
-        /// </summary>
-        [Test]
-        public void LongitudeTest()
-        {
-            // TODO unit test for the property 'Longitude'
-        }
-        /// <summary>
-        /// Test the property 'Comment'
-        /// </summary>
-        [Test]
-        public void CommentTest()
-        {
-            // TODO unit test for the property 'Comment'
-        }
-        /// <summary>
-        /// Test the property 'Address'
-        /// </summary>
-        [Test]
-        public void AddressTest()
-        {
-            // TODO unit test for the property 'Address'
-        }
-        /// <summary>
-        /// Test the property 'Contact'
-        /// </summary>
-        [Test]
-        public void ContactTest()
-        {
-            // TODO unit test for the property 'Contact'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobDeliveryTests.cs b/src/Flipdish.Test/Model/JobDeliveryTests.cs
deleted file mode 100644
index f9214029..00000000
--- a/src/Flipdish.Test/Model/JobDeliveryTests.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobDelivery
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobDeliveryTests
-    {
-        // TODO uncomment below to declare an instance variable for JobDelivery
-        //private JobDelivery instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobDelivery
-            //instance = new JobDelivery();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobDelivery
-        /// </summary>
-        [Test]
-        public void JobDeliveryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobDelivery
-            //Assert.IsInstanceOfType<JobDelivery> (instance, "variable 'instance' is a JobDelivery");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'PickedAt'
-        /// </summary>
-        [Test]
-        public void PickedAtTest()
-        {
-            // TODO unit test for the property 'PickedAt'
-        }
-        /// <summary>
-        /// Test the property 'DeliveredAt'
-        /// </summary>
-        [Test]
-        public void DeliveredAtTest()
-        {
-            // TODO unit test for the property 'DeliveredAt'
-        }
-        /// <summary>
-        /// Test the property 'TrackingUrl'
-        /// </summary>
-        [Test]
-        public void TrackingUrlTest()
-        {
-            // TODO unit test for the property 'TrackingUrl'
-        }
-        /// <summary>
-        /// Test the property 'ClientReference'
-        /// </summary>
-        [Test]
-        public void ClientReferenceTest()
-        {
-            // TODO unit test for the property 'ClientReference'
-        }
-        /// <summary>
-        /// Test the property 'PackageDescription'
-        /// </summary>
-        [Test]
-        public void PackageDescriptionTest()
-        {
-            // TODO unit test for the property 'PackageDescription'
-        }
-        /// <summary>
-        /// Test the property 'PackageType'
-        /// </summary>
-        [Test]
-        public void PackageTypeTest()
-        {
-            // TODO unit test for the property 'PackageType'
-        }
-        /// <summary>
-        /// Test the property 'Pickup'
-        /// </summary>
-        [Test]
-        public void PickupTest()
-        {
-            // TODO unit test for the property 'Pickup'
-        }
-        /// <summary>
-        /// Test the property 'Dropoff'
-        /// </summary>
-        [Test]
-        public void DropoffTest()
-        {
-            // TODO unit test for the property 'Dropoff'
-        }
-        /// <summary>
-        /// Test the property 'Eta'
-        /// </summary>
-        [Test]
-        public void EtaTest()
-        {
-            // TODO unit test for the property 'Eta'
-        }
-        /// <summary>
-        /// Test the property 'Cancellation'
-        /// </summary>
-        [Test]
-        public void CancellationTest()
-        {
-            // TODO unit test for the property 'Cancellation'
-        }
-        /// <summary>
-        /// Test the property 'Proof'
-        /// </summary>
-        [Test]
-        public void ProofTest()
-        {
-            // TODO unit test for the property 'Proof'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobDriverTests.cs b/src/Flipdish.Test/Model/JobDriverTests.cs
deleted file mode 100644
index d966e6dd..00000000
--- a/src/Flipdish.Test/Model/JobDriverTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobDriver
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobDriverTests
-    {
-        // TODO uncomment below to declare an instance variable for JobDriver
-        //private JobDriver instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobDriver
-            //instance = new JobDriver();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobDriver
-        /// </summary>
-        [Test]
-        public void JobDriverInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobDriver
-            //Assert.IsInstanceOfType<JobDriver> (instance, "variable 'instance' is a JobDriver");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'DisplayName'
-        /// </summary>
-        [Test]
-        public void DisplayNameTest()
-        {
-            // TODO unit test for the property 'DisplayName'
-        }
-        /// <summary>
-        /// Test the property 'Phone'
-        /// </summary>
-        [Test]
-        public void PhoneTest()
-        {
-            // TODO unit test for the property 'Phone'
-        }
-        /// <summary>
-        /// Test the property 'PictureUrl'
-        /// </summary>
-        [Test]
-        public void PictureUrlTest()
-        {
-            // TODO unit test for the property 'PictureUrl'
-        }
-        /// <summary>
-        /// Test the property 'TransportType'
-        /// </summary>
-        [Test]
-        public void TransportTypeTest()
-        {
-            // TODO unit test for the property 'TransportType'
-        }
-        /// <summary>
-        /// Test the property 'Latitude'
-        /// </summary>
-        [Test]
-        public void LatitudeTest()
-        {
-            // TODO unit test for the property 'Latitude'
-        }
-        /// <summary>
-        /// Test the property 'Longitude'
-        /// </summary>
-        [Test]
-        public void LongitudeTest()
-        {
-            // TODO unit test for the property 'Longitude'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobEtaTests.cs b/src/Flipdish.Test/Model/JobEtaTests.cs
deleted file mode 100644
index 260607b9..00000000
--- a/src/Flipdish.Test/Model/JobEtaTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobEta
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobEtaTests
-    {
-        // TODO uncomment below to declare an instance variable for JobEta
-        //private JobEta instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobEta
-            //instance = new JobEta();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobEta
-        /// </summary>
-        [Test]
-        public void JobEtaInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobEta
-            //Assert.IsInstanceOfType<JobEta> (instance, "variable 'instance' is a JobEta");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Pickup'
-        /// </summary>
-        [Test]
-        public void PickupTest()
-        {
-            // TODO unit test for the property 'Pickup'
-        }
-        /// <summary>
-        /// Test the property 'Dropoff'
-        /// </summary>
-        [Test]
-        public void DropoffTest()
-        {
-            // TODO unit test for the property 'Dropoff'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobPricingTests.cs b/src/Flipdish.Test/Model/JobPricingTests.cs
deleted file mode 100644
index b59d4199..00000000
--- a/src/Flipdish.Test/Model/JobPricingTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobPricing
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobPricingTests
-    {
-        // TODO uncomment below to declare an instance variable for JobPricing
-        //private JobPricing instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobPricing
-            //instance = new JobPricing();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobPricing
-        /// </summary>
-        [Test]
-        public void JobPricingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobPricing
-            //Assert.IsInstanceOfType<JobPricing> (instance, "variable 'instance' is a JobPricing");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'TaxPercentage'
-        /// </summary>
-        [Test]
-        public void TaxPercentageTest()
-        {
-            // TODO unit test for the property 'TaxPercentage'
-        }
-        /// <summary>
-        /// Test the property 'PriceTaxIncluded'
-        /// </summary>
-        [Test]
-        public void PriceTaxIncludedTest()
-        {
-            // TODO unit test for the property 'PriceTaxIncluded'
-        }
-        /// <summary>
-        /// Test the property 'PriceTaxExcluded'
-        /// </summary>
-        [Test]
-        public void PriceTaxExcludedTest()
-        {
-            // TODO unit test for the property 'PriceTaxExcluded'
-        }
-        /// <summary>
-        /// Test the property 'TaxAmount'
-        /// </summary>
-        [Test]
-        public void TaxAmountTest()
-        {
-            // TODO unit test for the property 'TaxAmount'
-        }
-        /// <summary>
-        /// Test the property 'InvoiceUrl'
-        /// </summary>
-        [Test]
-        public void InvoiceUrlTest()
-        {
-            // TODO unit test for the property 'InvoiceUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobProofTests.cs b/src/Flipdish.Test/Model/JobProofTests.cs
deleted file mode 100644
index 99435996..00000000
--- a/src/Flipdish.Test/Model/JobProofTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobProof
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobProofTests
-    {
-        // TODO uncomment below to declare an instance variable for JobProof
-        //private JobProof instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobProof
-            //instance = new JobProof();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobProof
-        /// </summary>
-        [Test]
-        public void JobProofInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobProof
-            //Assert.IsInstanceOfType<JobProof> (instance, "variable 'instance' is a JobProof");
-        }
-
-
-        /// <summary>
-        /// Test the property 'SignatureUrl'
-        /// </summary>
-        [Test]
-        public void SignatureUrlTest()
-        {
-            // TODO unit test for the property 'SignatureUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/JobResponseTests.cs b/src/Flipdish.Test/Model/JobResponseTests.cs
deleted file mode 100644
index c0e958f7..00000000
--- a/src/Flipdish.Test/Model/JobResponseTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing JobResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class JobResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for JobResponse
-        //private JobResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of JobResponse
-            //instance = new JobResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of JobResponse
-        /// </summary>
-        [Test]
-        public void JobResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" JobResponse
-            //Assert.IsInstanceOfType<JobResponse> (instance, "variable 'instance' is a JobResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'CreatedAt'
-        /// </summary>
-        [Test]
-        public void CreatedAtTest()
-        {
-            // TODO unit test for the property 'CreatedAt'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'PackageType'
-        /// </summary>
-        [Test]
-        public void PackageTypeTest()
-        {
-            // TODO unit test for the property 'PackageType'
-        }
-        /// <summary>
-        /// Test the property 'TransportType'
-        /// </summary>
-        [Test]
-        public void TransportTypeTest()
-        {
-            // TODO unit test for the property 'TransportType'
-        }
-        /// <summary>
-        /// Test the property 'AssignmentCode'
-        /// </summary>
-        [Test]
-        public void AssignmentCodeTest()
-        {
-            // TODO unit test for the property 'AssignmentCode'
-        }
-        /// <summary>
-        /// Test the property 'PickupAt'
-        /// </summary>
-        [Test]
-        public void PickupAtTest()
-        {
-            // TODO unit test for the property 'PickupAt'
-        }
-        /// <summary>
-        /// Test the property 'DropoffAt'
-        /// </summary>
-        [Test]
-        public void DropoffAtTest()
-        {
-            // TODO unit test for the property 'DropoffAt'
-        }
-        /// <summary>
-        /// Test the property 'Comment'
-        /// </summary>
-        [Test]
-        public void CommentTest()
-        {
-            // TODO unit test for the property 'Comment'
-        }
-        /// <summary>
-        /// Test the property 'Distance'
-        /// </summary>
-        [Test]
-        public void DistanceTest()
-        {
-            // TODO unit test for the property 'Distance'
-        }
-        /// <summary>
-        /// Test the property 'Duration'
-        /// </summary>
-        [Test]
-        public void DurationTest()
-        {
-            // TODO unit test for the property 'Duration'
-        }
-        /// <summary>
-        /// Test the property 'Deliveries'
-        /// </summary>
-        [Test]
-        public void DeliveriesTest()
-        {
-            // TODO unit test for the property 'Deliveries'
-        }
-        /// <summary>
-        /// Test the property 'Pricing'
-        /// </summary>
-        [Test]
-        public void PricingTest()
-        {
-            // TODO unit test for the property 'Pricing'
-        }
-        /// <summary>
-        /// Test the property 'Driver'
-        /// </summary>
-        [Test]
-        public void DriverTest()
-        {
-            // TODO unit test for the property 'Driver'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothInstallUpdateInitiateEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothInstallUpdateInitiateEventTests.cs
deleted file mode 100644
index 62329b91..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothInstallUpdateInitiateEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothInstallUpdateInitiateEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothInstallUpdateInitiateEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothInstallUpdateInitiateEvent
-        //private KioskBluetoothInstallUpdateInitiateEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothInstallUpdateInitiateEvent
-            //instance = new KioskBluetoothInstallUpdateInitiateEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothInstallUpdateInitiateEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothInstallUpdateInitiateEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothInstallUpdateInitiateEvent
-            //Assert.IsInstanceOfType<KioskBluetoothInstallUpdateInitiateEvent> (instance, "variable 'instance' is a KioskBluetoothInstallUpdateInitiateEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalType'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalTypeTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalType'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothPairingModeEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothPairingModeEventTests.cs
deleted file mode 100644
index 83c09cc4..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothPairingModeEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothPairingModeEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothPairingModeEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothPairingModeEvent
-        //private KioskBluetoothPairingModeEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothPairingModeEvent
-            //instance = new KioskBluetoothPairingModeEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothPairingModeEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothPairingModeEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothPairingModeEvent
-            //Assert.IsInstanceOfType<KioskBluetoothPairingModeEvent> (instance, "variable 'instance' is a KioskBluetoothPairingModeEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalType'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalTypeTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalType'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothTerminalCancelUpdateEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothTerminalCancelUpdateEventTests.cs
deleted file mode 100644
index 446a87fd..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothTerminalCancelUpdateEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothTerminalCancelUpdateEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothTerminalCancelUpdateEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothTerminalCancelUpdateEvent
-        //private KioskBluetoothTerminalCancelUpdateEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothTerminalCancelUpdateEvent
-            //instance = new KioskBluetoothTerminalCancelUpdateEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothTerminalCancelUpdateEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothTerminalCancelUpdateEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothTerminalCancelUpdateEvent
-            //Assert.IsInstanceOfType<KioskBluetoothTerminalCancelUpdateEvent> (instance, "variable 'instance' is a KioskBluetoothTerminalCancelUpdateEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalType'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalTypeTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalType'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothTerminalFirmwareVersionStatusEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothTerminalFirmwareVersionStatusEventTests.cs
deleted file mode 100644
index 6db68088..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothTerminalFirmwareVersionStatusEventTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothTerminalFirmwareVersionStatusEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothTerminalFirmwareVersionStatusEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothTerminalFirmwareVersionStatusEvent
-        //private KioskBluetoothTerminalFirmwareVersionStatusEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothTerminalFirmwareVersionStatusEvent
-            //instance = new KioskBluetoothTerminalFirmwareVersionStatusEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothTerminalFirmwareVersionStatusEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothTerminalFirmwareVersionStatusEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothTerminalFirmwareVersionStatusEvent
-            //Assert.IsInstanceOfType<KioskBluetoothTerminalFirmwareVersionStatusEvent> (instance, "variable 'instance' is a KioskBluetoothTerminalFirmwareVersionStatusEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'SerialNumber'
-        /// </summary>
-        [Test]
-        public void SerialNumberTest()
-        {
-            // TODO unit test for the property 'SerialNumber'
-        }
-        /// <summary>
-        /// Test the property 'HasFirmwareUpdate'
-        /// </summary>
-        [Test]
-        public void HasFirmwareUpdateTest()
-        {
-            // TODO unit test for the property 'HasFirmwareUpdate'
-        }
-        /// <summary>
-        /// Test the property 'HasConfigUpdate'
-        /// </summary>
-        [Test]
-        public void HasConfigUpdateTest()
-        {
-            // TODO unit test for the property 'HasConfigUpdate'
-        }
-        /// <summary>
-        /// Test the property 'HasKeyUpdate'
-        /// </summary>
-        [Test]
-        public void HasKeyUpdateTest()
-        {
-            // TODO unit test for the property 'HasKeyUpdate'
-        }
-        /// <summary>
-        /// Test the property 'UpdateTimeEstimate'
-        /// </summary>
-        [Test]
-        public void UpdateTimeEstimateTest()
-        {
-            // TODO unit test for the property 'UpdateTimeEstimate'
-        }
-        /// <summary>
-        /// Test the property 'UserEventInfo'
-        /// </summary>
-        [Test]
-        public void UserEventInfoTest()
-        {
-            // TODO unit test for the property 'UserEventInfo'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothTerminalInitiateUpdateCheckEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothTerminalInitiateUpdateCheckEventTests.cs
deleted file mode 100644
index 2c0d2f2f..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothTerminalInitiateUpdateCheckEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothTerminalInitiateUpdateCheckEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothTerminalInitiateUpdateCheckEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothTerminalInitiateUpdateCheckEvent
-        //private KioskBluetoothTerminalInitiateUpdateCheckEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothTerminalInitiateUpdateCheckEvent
-            //instance = new KioskBluetoothTerminalInitiateUpdateCheckEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothTerminalInitiateUpdateCheckEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothTerminalInitiateUpdateCheckEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothTerminalInitiateUpdateCheckEvent
-            //Assert.IsInstanceOfType<KioskBluetoothTerminalInitiateUpdateCheckEvent> (instance, "variable 'instance' is a KioskBluetoothTerminalInitiateUpdateCheckEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothTerminalInstallationStatusEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothTerminalInstallationStatusEventTests.cs
deleted file mode 100644
index 8de1d6f6..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothTerminalInstallationStatusEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothTerminalInstallationStatusEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothTerminalInstallationStatusEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothTerminalInstallationStatusEvent
-        //private KioskBluetoothTerminalInstallationStatusEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothTerminalInstallationStatusEvent
-            //instance = new KioskBluetoothTerminalInstallationStatusEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothTerminalInstallationStatusEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothTerminalInstallationStatusEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothTerminalInstallationStatusEvent
-            //Assert.IsInstanceOfType<KioskBluetoothTerminalInstallationStatusEvent> (instance, "variable 'instance' is a KioskBluetoothTerminalInstallationStatusEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalType'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalTypeTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalType'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalSerialNumber'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalSerialNumberTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalSerialNumber'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Progress'
-        /// </summary>
-        [Test]
-        public void ProgressTest()
-        {
-            // TODO unit test for the property 'Progress'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothTerminalUnpairedEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothTerminalUnpairedEventTests.cs
deleted file mode 100644
index b2617097..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothTerminalUnpairedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothTerminalUnpairedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothTerminalUnpairedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothTerminalUnpairedEvent
-        //private KioskBluetoothTerminalUnpairedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothTerminalUnpairedEvent
-            //instance = new KioskBluetoothTerminalUnpairedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothTerminalUnpairedEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothTerminalUnpairedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothTerminalUnpairedEvent
-            //Assert.IsInstanceOfType<KioskBluetoothTerminalUnpairedEvent> (instance, "variable 'instance' is a KioskBluetoothTerminalUnpairedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalType'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalTypeTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalType'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothTerminalUpdatedEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothTerminalUpdatedEventTests.cs
deleted file mode 100644
index 6ee71d74..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothTerminalUpdatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothTerminalUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothTerminalUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothTerminalUpdatedEvent
-        //private KioskBluetoothTerminalUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothTerminalUpdatedEvent
-            //instance = new KioskBluetoothTerminalUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothTerminalUpdatedEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothTerminalUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothTerminalUpdatedEvent
-            //Assert.IsInstanceOfType<KioskBluetoothTerminalUpdatedEvent> (instance, "variable 'instance' is a KioskBluetoothTerminalUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalType'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalTypeTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalType'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalSerialNumber'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalSerialNumberTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalSerialNumber'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalStatus'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalStatusTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalStatus'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskBluetoothUnpairingModeEventTests.cs b/src/Flipdish.Test/Model/KioskBluetoothUnpairingModeEventTests.cs
deleted file mode 100644
index 3390c39d..00000000
--- a/src/Flipdish.Test/Model/KioskBluetoothUnpairingModeEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskBluetoothUnpairingModeEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskBluetoothUnpairingModeEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskBluetoothUnpairingModeEvent
-        //private KioskBluetoothUnpairingModeEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskBluetoothUnpairingModeEvent
-            //instance = new KioskBluetoothUnpairingModeEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskBluetoothUnpairingModeEvent
-        /// </summary>
-        [Test]
-        public void KioskBluetoothUnpairingModeEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskBluetoothUnpairingModeEvent
-            //Assert.IsInstanceOfType<KioskBluetoothUnpairingModeEvent> (instance, "variable 'instance' is a KioskBluetoothUnpairingModeEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DeviceId'
-        /// </summary>
-        [Test]
-        public void DeviceIdTest()
-        {
-            // TODO unit test for the property 'DeviceId'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalType'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalTypeTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalType'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskCashPaymentSettingsTests.cs b/src/Flipdish.Test/Model/KioskCashPaymentSettingsTests.cs
deleted file mode 100644
index 271775fa..00000000
--- a/src/Flipdish.Test/Model/KioskCashPaymentSettingsTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskCashPaymentSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskCashPaymentSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskCashPaymentSettings
-        //private KioskCashPaymentSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskCashPaymentSettings
-            //instance = new KioskCashPaymentSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskCashPaymentSettings
-        /// </summary>
-        [Test]
-        public void KioskCashPaymentSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskCashPaymentSettings
-            //Assert.IsInstanceOfType<KioskCashPaymentSettings> (instance, "variable 'instance' is a KioskCashPaymentSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'IsCashVisibleToCustomer'
-        /// </summary>
-        [Test]
-        public void IsCashVisibleToCustomerTest()
-        {
-            // TODO unit test for the property 'IsCashVisibleToCustomer'
-        }
-        /// <summary>
-        /// Test the property 'UserId'
-        /// </summary>
-        [Test]
-        public void UserIdTest()
-        {
-            // TODO unit test for the property 'UserId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskCashSettingTests.cs b/src/Flipdish.Test/Model/KioskCashSettingTests.cs
deleted file mode 100644
index bac10faa..00000000
--- a/src/Flipdish.Test/Model/KioskCashSettingTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskCashSetting
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskCashSettingTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskCashSetting
-        //private KioskCashSetting instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskCashSetting
-            //instance = new KioskCashSetting();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskCashSetting
-        /// </summary>
-        [Test]
-        public void KioskCashSettingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskCashSetting
-            //Assert.IsInstanceOfType<KioskCashSetting> (instance, "variable 'instance' is a KioskCashSetting");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CashPaymentEnabled'
-        /// </summary>
-        [Test]
-        public void CashPaymentEnabledTest()
-        {
-            // TODO unit test for the property 'CashPaymentEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskIotConnectionParametersTests.cs b/src/Flipdish.Test/Model/KioskIotConnectionParametersTests.cs
deleted file mode 100644
index 51720300..00000000
--- a/src/Flipdish.Test/Model/KioskIotConnectionParametersTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskIotConnectionParameters
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskIotConnectionParametersTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskIotConnectionParameters
-        //private KioskIotConnectionParameters instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskIotConnectionParameters
-            //instance = new KioskIotConnectionParameters();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskIotConnectionParameters
-        /// </summary>
-        [Test]
-        public void KioskIotConnectionParametersInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskIotConnectionParameters
-            //Assert.IsInstanceOfType<KioskIotConnectionParameters> (instance, "variable 'instance' is a KioskIotConnectionParameters");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ConnectionString'
-        /// </summary>
-        [Test]
-        public void ConnectionStringTest()
-        {
-            // TODO unit test for the property 'ConnectionString'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskStoreSettingsTests.cs b/src/Flipdish.Test/Model/KioskStoreSettingsTests.cs
deleted file mode 100644
index 8bebe36e..00000000
--- a/src/Flipdish.Test/Model/KioskStoreSettingsTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskStoreSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskStoreSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskStoreSettings
-        //private KioskStoreSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskStoreSettings
-            //instance = new KioskStoreSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskStoreSettings
-        /// </summary>
-        [Test]
-        public void KioskStoreSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskStoreSettings
-            //Assert.IsInstanceOfType<KioskStoreSettings> (instance, "variable 'instance' is a KioskStoreSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreKioskSettings'
-        /// </summary>
-        [Test]
-        public void StoreKioskSettingsTest()
-        {
-            // TODO unit test for the property 'StoreKioskSettings'
-        }
-        /// <summary>
-        /// Test the property 'Timezone'
-        /// </summary>
-        [Test]
-        public void TimezoneTest()
-        {
-            // TODO unit test for the property 'Timezone'
-        }
-        /// <summary>
-        /// Test the property 'CurrentUtcTime'
-        /// </summary>
-        [Test]
-        public void CurrentUtcTimeTest()
-        {
-            // TODO unit test for the property 'CurrentUtcTime'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/KioskTerminalActionStateChangedEventTests.cs b/src/Flipdish.Test/Model/KioskTerminalActionStateChangedEventTests.cs
deleted file mode 100644
index 11690c93..00000000
--- a/src/Flipdish.Test/Model/KioskTerminalActionStateChangedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing KioskTerminalActionStateChangedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class KioskTerminalActionStateChangedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for KioskTerminalActionStateChangedEvent
-        //private KioskTerminalActionStateChangedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of KioskTerminalActionStateChangedEvent
-            //instance = new KioskTerminalActionStateChangedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of KioskTerminalActionStateChangedEvent
-        /// </summary>
-        [Test]
-        public void KioskTerminalActionStateChangedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" KioskTerminalActionStateChangedEvent
-            //Assert.IsInstanceOfType<KioskTerminalActionStateChangedEvent> (instance, "variable 'instance' is a KioskTerminalActionStateChangedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ReaderId'
-        /// </summary>
-        [Test]
-        public void ReaderIdTest()
-        {
-            // TODO unit test for the property 'ReaderId'
-        }
-        /// <summary>
-        /// Test the property 'BluetoothTerminalType'
-        /// </summary>
-        [Test]
-        public void BluetoothTerminalTypeTest()
-        {
-            // TODO unit test for the property 'BluetoothTerminalType'
-        }
-        /// <summary>
-        /// Test the property 'ActionState'
-        /// </summary>
-        [Test]
-        public void ActionStateTest()
-        {
-            // TODO unit test for the property 'ActionState'
-        }
-        /// <summary>
-        /// Test the property 'FailureCode'
-        /// </summary>
-        [Test]
-        public void FailureCodeTest()
-        {
-            // TODO unit test for the property 'FailureCode'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LanguageTests.cs b/src/Flipdish.Test/Model/LanguageTests.cs
deleted file mode 100644
index de84e7b7..00000000
--- a/src/Flipdish.Test/Model/LanguageTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Language
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LanguageTests
-    {
-        // TODO uncomment below to declare an instance variable for Language
-        //private Language instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Language
-            //instance = new Language();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Language
-        /// </summary>
-        [Test]
-        public void LanguageInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Language
-            //Assert.IsInstanceOfType<Language> (instance, "variable 'instance' is a Language");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LanguageId'
-        /// </summary>
-        [Test]
-        public void LanguageIdTest()
-        {
-            // TODO unit test for the property 'LanguageId'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LastPaymentErrorTests.cs b/src/Flipdish.Test/Model/LastPaymentErrorTests.cs
deleted file mode 100644
index cef60772..00000000
--- a/src/Flipdish.Test/Model/LastPaymentErrorTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LastPaymentError
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LastPaymentErrorTests
-    {
-        // TODO uncomment below to declare an instance variable for LastPaymentError
-        //private LastPaymentError instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LastPaymentError
-            //instance = new LastPaymentError();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LastPaymentError
-        /// </summary>
-        [Test]
-        public void LastPaymentErrorInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LastPaymentError
-            //Assert.IsInstanceOfType<LastPaymentError> (instance, "variable 'instance' is a LastPaymentError");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-        /// <summary>
-        /// Test the property 'DeclineCode'
-        /// </summary>
-        [Test]
-        public void DeclineCodeTest()
-        {
-            // TODO unit test for the property 'DeclineCode'
-        }
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LightspeedSettingsTests.cs b/src/Flipdish.Test/Model/LightspeedSettingsTests.cs
deleted file mode 100644
index 9cd29ad7..00000000
--- a/src/Flipdish.Test/Model/LightspeedSettingsTests.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LightspeedSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LightspeedSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for LightspeedSettings
-        //private LightspeedSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LightspeedSettings
-            //instance = new LightspeedSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LightspeedSettings
-        /// </summary>
-        [Test]
-        public void LightspeedSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LightspeedSettings
-            //Assert.IsInstanceOfType<LightspeedSettings> (instance, "variable 'instance' is a LightspeedSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CompanyId'
-        /// </summary>
-        [Test]
-        public void CompanyIdTest()
-        {
-            // TODO unit test for the property 'CompanyId'
-        }
-        /// <summary>
-        /// Test the property 'Enabled'
-        /// </summary>
-        [Test]
-        public void EnabledTest()
-        {
-            // TODO unit test for the property 'Enabled'
-        }
-        /// <summary>
-        /// Test the property 'EstimatedMinutesForDelivery'
-        /// </summary>
-        [Test]
-        public void EstimatedMinutesForDeliveryTest()
-        {
-            // TODO unit test for the property 'EstimatedMinutesForDelivery'
-        }
-        /// <summary>
-        /// Test the property 'EstimatedMinutesForCollection'
-        /// </summary>
-        [Test]
-        public void EstimatedMinutesForCollectionTest()
-        {
-            // TODO unit test for the property 'EstimatedMinutesForCollection'
-        }
-        /// <summary>
-        /// Test the property 'GeographicLocation'
-        /// </summary>
-        [Test]
-        public void GeographicLocationTest()
-        {
-            // TODO unit test for the property 'GeographicLocation'
-        }
-        /// <summary>
-        /// Test the property 'Establishment'
-        /// </summary>
-        [Test]
-        public void EstablishmentTest()
-        {
-            // TODO unit test for the property 'Establishment'
-        }
-        /// <summary>
-        /// Test the property 'VoucherId'
-        /// </summary>
-        [Test]
-        public void VoucherIdTest()
-        {
-            // TODO unit test for the property 'VoucherId'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryFeeId'
-        /// </summary>
-        [Test]
-        public void DeliveryFeeIdTest()
-        {
-            // TODO unit test for the property 'DeliveryFeeId'
-        }
-        /// <summary>
-        /// Test the property 'ProcessingFeeId'
-        /// </summary>
-        [Test]
-        public void ProcessingFeeIdTest()
-        {
-            // TODO unit test for the property 'ProcessingFeeId'
-        }
-        /// <summary>
-        /// Test the property 'PriceType'
-        /// </summary>
-        [Test]
-        public void PriceTypeTest()
-        {
-            // TODO unit test for the property 'PriceType'
-        }
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'CollectionTableId'
-        /// </summary>
-        [Test]
-        public void CollectionTableIdTest()
-        {
-            // TODO unit test for the property 'CollectionTableId'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryTableId'
-        /// </summary>
-        [Test]
-        public void DeliveryTableIdTest()
-        {
-            // TODO unit test for the property 'DeliveryTableId'
-        }
-        /// <summary>
-        /// Test the property 'CollectionTableIds'
-        /// </summary>
-        [Test]
-        public void CollectionTableIdsTest()
-        {
-            // TODO unit test for the property 'CollectionTableIds'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryTableIds'
-        /// </summary>
-        [Test]
-        public void DeliveryTableIdsTest()
-        {
-            // TODO unit test for the property 'DeliveryTableIds'
-        }
-        /// <summary>
-        /// Test the property 'UseTaxInclusivePrices'
-        /// </summary>
-        [Test]
-        public void UseTaxInclusivePricesTest()
-        {
-            // TODO unit test for the property 'UseTaxInclusivePrices'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LineItemOptionTests.cs b/src/Flipdish.Test/Model/LineItemOptionTests.cs
deleted file mode 100644
index a19176f1..00000000
--- a/src/Flipdish.Test/Model/LineItemOptionTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LineItemOption
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LineItemOptionTests
-    {
-        // TODO uncomment below to declare an instance variable for LineItemOption
-        //private LineItemOption instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LineItemOption
-            //instance = new LineItemOption();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LineItemOption
-        /// </summary>
-        [Test]
-        public void LineItemOptionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LineItemOption
-            //Assert.IsInstanceOfType<LineItemOption> (instance, "variable 'instance' is a LineItemOption");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'ExternalId'
-        /// </summary>
-        [Test]
-        public void ExternalIdTest()
-        {
-            // TODO unit test for the property 'ExternalId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LineItemTests.cs b/src/Flipdish.Test/Model/LineItemTests.cs
deleted file mode 100644
index 4c64fba7..00000000
--- a/src/Flipdish.Test/Model/LineItemTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LineItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LineItemTests
-    {
-        // TODO uncomment below to declare an instance variable for LineItem
-        //private LineItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LineItem
-            //instance = new LineItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LineItem
-        /// </summary>
-        [Test]
-        public void LineItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LineItem
-            //Assert.IsInstanceOfType<LineItem> (instance, "variable 'instance' is a LineItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'SectionName'
-        /// </summary>
-        [Test]
-        public void SectionNameTest()
-        {
-            // TODO unit test for the property 'SectionName'
-        }
-        /// <summary>
-        /// Test the property 'ExternalId'
-        /// </summary>
-        [Test]
-        public void ExternalIdTest()
-        {
-            // TODO unit test for the property 'ExternalId'
-        }
-        /// <summary>
-        /// Test the property 'Quantity'
-        /// </summary>
-        [Test]
-        public void QuantityTest()
-        {
-            // TODO unit test for the property 'Quantity'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'Notes'
-        /// </summary>
-        [Test]
-        public void NotesTest()
-        {
-            // TODO unit test for the property 'Notes'
-        }
-        /// <summary>
-        /// Test the property 'Options'
-        /// </summary>
-        [Test]
-        public void OptionsTest()
-        {
-            // TODO unit test for the property 'Options'
-        }
-        /// <summary>
-        /// Test the property 'IsAlchohol'
-        /// </summary>
-        [Test]
-        public void IsAlchoholTest()
-        {
-            // TODO unit test for the property 'IsAlchohol'
-        }
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocalisedTimeZoneTests.cs b/src/Flipdish.Test/Model/LocalisedTimeZoneTests.cs
deleted file mode 100644
index 94ac0ea8..00000000
--- a/src/Flipdish.Test/Model/LocalisedTimeZoneTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocalisedTimeZone
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocalisedTimeZoneTests
-    {
-        // TODO uncomment below to declare an instance variable for LocalisedTimeZone
-        //private LocalisedTimeZone instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LocalisedTimeZone
-            //instance = new LocalisedTimeZone();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocalisedTimeZone
-        /// </summary>
-        [Test]
-        public void LocalisedTimeZoneInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LocalisedTimeZone
-            //Assert.IsInstanceOfType<LocalisedTimeZone> (instance, "variable 'instance' is a LocalisedTimeZone");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TimeZoneId'
-        /// </summary>
-        [Test]
-        public void TimeZoneIdTest()
-        {
-            // TODO unit test for the property 'TimeZoneId'
-        }
-        /// <summary>
-        /// Test the property 'IanaTimeZoneId'
-        /// </summary>
-        [Test]
-        public void IanaTimeZoneIdTest()
-        {
-            // TODO unit test for the property 'IanaTimeZoneId'
-        }
-        /// <summary>
-        /// Test the property 'DisplayName'
-        /// </summary>
-        [Test]
-        public void DisplayNameTest()
-        {
-            // TODO unit test for the property 'DisplayName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocationAreaCreatedEventTests.cs b/src/Flipdish.Test/Model/LocationAreaCreatedEventTests.cs
deleted file mode 100644
index 88cbdcce..00000000
--- a/src/Flipdish.Test/Model/LocationAreaCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationAreaCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocationAreaCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for LocationAreaCreatedEvent
-        //private LocationAreaCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LocationAreaCreatedEvent
-            //instance = new LocationAreaCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationAreaCreatedEvent
-        /// </summary>
-        [Test]
-        public void LocationAreaCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LocationAreaCreatedEvent
-            //Assert.IsInstanceOfType<LocationAreaCreatedEvent> (instance, "variable 'instance' is a LocationAreaCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationAreaId'
-        /// </summary>
-        [Test]
-        public void LocationAreaIdTest()
-        {
-            // TODO unit test for the property 'LocationAreaId'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaName'
-        /// </summary>
-        [Test]
-        public void LocationAreaNameTest()
-        {
-            // TODO unit test for the property 'LocationAreaName'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocationAreaLocationTests.cs b/src/Flipdish.Test/Model/LocationAreaLocationTests.cs
deleted file mode 100644
index 1d4b0f5c..00000000
--- a/src/Flipdish.Test/Model/LocationAreaLocationTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationAreaLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocationAreaLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for LocationAreaLocation
-        //private LocationAreaLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LocationAreaLocation
-            //instance = new LocationAreaLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationAreaLocation
-        /// </summary>
-        [Test]
-        public void LocationAreaLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LocationAreaLocation
-            //Assert.IsInstanceOfType<LocationAreaLocation> (instance, "variable 'instance' is a LocationAreaLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationId'
-        /// </summary>
-        [Test]
-        public void LocationIdTest()
-        {
-            // TODO unit test for the property 'LocationId'
-        }
-        /// <summary>
-        /// Test the property 'LocationName'
-        /// </summary>
-        [Test]
-        public void LocationNameTest()
-        {
-            // TODO unit test for the property 'LocationName'
-        }
-        /// <summary>
-        /// Test the property 'ExternalLocationId'
-        /// </summary>
-        [Test]
-        public void ExternalLocationIdTest()
-        {
-            // TODO unit test for the property 'ExternalLocationId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocationAreaTests.cs b/src/Flipdish.Test/Model/LocationAreaTests.cs
deleted file mode 100644
index 735d9a55..00000000
--- a/src/Flipdish.Test/Model/LocationAreaTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationArea
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocationAreaTests
-    {
-        // TODO uncomment below to declare an instance variable for LocationArea
-        //private LocationArea instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LocationArea
-            //instance = new LocationArea();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationArea
-        /// </summary>
-        [Test]
-        public void LocationAreaInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LocationArea
-            //Assert.IsInstanceOfType<LocationArea> (instance, "variable 'instance' is a LocationArea");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationAreaId'
-        /// </summary>
-        [Test]
-        public void LocationAreaIdTest()
-        {
-            // TODO unit test for the property 'LocationAreaId'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaName'
-        /// </summary>
-        [Test]
-        public void LocationAreaNameTest()
-        {
-            // TODO unit test for the property 'LocationAreaName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocationAreaUpdatedEventTests.cs b/src/Flipdish.Test/Model/LocationAreaUpdatedEventTests.cs
deleted file mode 100644
index c9129f2b..00000000
--- a/src/Flipdish.Test/Model/LocationAreaUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationAreaUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocationAreaUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for LocationAreaUpdatedEvent
-        //private LocationAreaUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LocationAreaUpdatedEvent
-            //instance = new LocationAreaUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationAreaUpdatedEvent
-        /// </summary>
-        [Test]
-        public void LocationAreaUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LocationAreaUpdatedEvent
-            //Assert.IsInstanceOfType<LocationAreaUpdatedEvent> (instance, "variable 'instance' is a LocationAreaUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationAreaId'
-        /// </summary>
-        [Test]
-        public void LocationAreaIdTest()
-        {
-            // TODO unit test for the property 'LocationAreaId'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaName'
-        /// </summary>
-        [Test]
-        public void LocationAreaNameTest()
-        {
-            // TODO unit test for the property 'LocationAreaName'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocationAreaWithLocationsTests.cs b/src/Flipdish.Test/Model/LocationAreaWithLocationsTests.cs
deleted file mode 100644
index e1ec12c3..00000000
--- a/src/Flipdish.Test/Model/LocationAreaWithLocationsTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationAreaWithLocations
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocationAreaWithLocationsTests
-    {
-        // TODO uncomment below to declare an instance variable for LocationAreaWithLocations
-        //private LocationAreaWithLocations instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LocationAreaWithLocations
-            //instance = new LocationAreaWithLocations();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationAreaWithLocations
-        /// </summary>
-        [Test]
-        public void LocationAreaWithLocationsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LocationAreaWithLocations
-            //Assert.IsInstanceOfType<LocationAreaWithLocations> (instance, "variable 'instance' is a LocationAreaWithLocations");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationAreaId'
-        /// </summary>
-        [Test]
-        public void LocationAreaIdTest()
-        {
-            // TODO unit test for the property 'LocationAreaId'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaName'
-        /// </summary>
-        [Test]
-        public void LocationAreaNameTest()
-        {
-            // TODO unit test for the property 'LocationAreaName'
-        }
-        /// <summary>
-        /// Test the property 'Locations'
-        /// </summary>
-        [Test]
-        public void LocationsTest()
-        {
-            // TODO unit test for the property 'Locations'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocationCreatedEventTests.cs b/src/Flipdish.Test/Model/LocationCreatedEventTests.cs
deleted file mode 100644
index 7daf845e..00000000
--- a/src/Flipdish.Test/Model/LocationCreatedEventTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocationCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for LocationCreatedEvent
-        //private LocationCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LocationCreatedEvent
-            //instance = new LocationCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationCreatedEvent
-        /// </summary>
-        [Test]
-        public void LocationCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LocationCreatedEvent
-            //Assert.IsInstanceOfType<LocationCreatedEvent> (instance, "variable 'instance' is a LocationCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationId'
-        /// </summary>
-        [Test]
-        public void LocationIdTest()
-        {
-            // TODO unit test for the property 'LocationId'
-        }
-        /// <summary>
-        /// Test the property 'LocationName'
-        /// </summary>
-        [Test]
-        public void LocationNameTest()
-        {
-            // TODO unit test for the property 'LocationName'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'ExternalLocationId'
-        /// </summary>
-        [Test]
-        public void ExternalLocationIdTest()
-        {
-            // TODO unit test for the property 'ExternalLocationId'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaId'
-        /// </summary>
-        [Test]
-        public void LocationAreaIdTest()
-        {
-            // TODO unit test for the property 'LocationAreaId'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocationDeletedEventTests.cs b/src/Flipdish.Test/Model/LocationDeletedEventTests.cs
deleted file mode 100644
index d77e3208..00000000
--- a/src/Flipdish.Test/Model/LocationDeletedEventTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LocationDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocationDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for LocationDeletedEvent
-        //private LocationDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LocationDeletedEvent
-            //instance = new LocationDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LocationDeletedEvent
-        /// </summary>
-        [Test]
-        public void LocationDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LocationDeletedEvent
-            //Assert.IsInstanceOfType<LocationDeletedEvent> (instance, "variable 'instance' is a LocationDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationId'
-        /// </summary>
-        [Test]
-        public void LocationIdTest()
-        {
-            // TODO unit test for the property 'LocationId'
-        }
-        /// <summary>
-        /// Test the property 'LocationName'
-        /// </summary>
-        [Test]
-        public void LocationNameTest()
-        {
-            // TODO unit test for the property 'LocationName'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'ExternalLocationId'
-        /// </summary>
-        [Test]
-        public void ExternalLocationIdTest()
-        {
-            // TODO unit test for the property 'ExternalLocationId'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaId'
-        /// </summary>
-        [Test]
-        public void LocationAreaIdTest()
-        {
-            // TODO unit test for the property 'LocationAreaId'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LocationTests.cs b/src/Flipdish.Test/Model/LocationTests.cs
deleted file mode 100644
index 3e050abc..00000000
--- a/src/Flipdish.Test/Model/LocationTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Location
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LocationTests
-    {
-        // TODO uncomment below to declare an instance variable for Location
-        //private Location instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Location
-            //instance = new Location();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Location
-        /// </summary>
-        [Test]
-        public void LocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Location
-            //Assert.IsInstanceOfType<Location> (instance, "variable 'instance' is a Location");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AddressLine1'
-        /// </summary>
-        [Test]
-        public void AddressLine1Test()
-        {
-            // TODO unit test for the property 'AddressLine1'
-        }
-        /// <summary>
-        /// Test the property 'AddressLine2'
-        /// </summary>
-        [Test]
-        public void AddressLine2Test()
-        {
-            // TODO unit test for the property 'AddressLine2'
-        }
-        /// <summary>
-        /// Test the property 'FormattedAddress'
-        /// </summary>
-        [Test]
-        public void FormattedAddressTest()
-        {
-            // TODO unit test for the property 'FormattedAddress'
-        }
-        /// <summary>
-        /// Test the property 'PostalCode'
-        /// </summary>
-        [Test]
-        public void PostalCodeTest()
-        {
-            // TODO unit test for the property 'PostalCode'
-        }
-        /// <summary>
-        /// Test the property 'City'
-        /// </summary>
-        [Test]
-        public void CityTest()
-        {
-            // TODO unit test for the property 'City'
-        }
-        /// <summary>
-        /// Test the property 'Coordinates'
-        /// </summary>
-        [Test]
-        public void CoordinatesTest()
-        {
-            // TODO unit test for the property 'Coordinates'
-        }
-        /// <summary>
-        /// Test the property 'Notes'
-        /// </summary>
-        [Test]
-        public void NotesTest()
-        {
-            // TODO unit test for the property 'Notes'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LoginModelTests.cs b/src/Flipdish.Test/Model/LoginModelTests.cs
deleted file mode 100644
index 8b7e633a..00000000
--- a/src/Flipdish.Test/Model/LoginModelTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LoginModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LoginModelTests
-    {
-        // TODO uncomment below to declare an instance variable for LoginModel
-        //private LoginModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LoginModel
-            //instance = new LoginModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LoginModel
-        /// </summary>
-        [Test]
-        public void LoginModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LoginModel
-            //Assert.IsInstanceOfType<LoginModel> (instance, "variable 'instance' is a LoginModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'Password'
-        /// </summary>
-        [Test]
-        public void PasswordTest()
-        {
-            // TODO unit test for the property 'Password'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LoginWithPinModelTests.cs b/src/Flipdish.Test/Model/LoginWithPinModelTests.cs
deleted file mode 100644
index de0e6571..00000000
--- a/src/Flipdish.Test/Model/LoginWithPinModelTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LoginWithPinModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LoginWithPinModelTests
-    {
-        // TODO uncomment below to declare an instance variable for LoginWithPinModel
-        //private LoginWithPinModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LoginWithPinModel
-            //instance = new LoginWithPinModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LoginWithPinModel
-        /// </summary>
-        [Test]
-        public void LoginWithPinModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LoginWithPinModel
-            //Assert.IsInstanceOfType<LoginWithPinModel> (instance, "variable 'instance' is a LoginWithPinModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'Pin'
-        /// </summary>
-        [Test]
-        public void PinTest()
-        {
-            // TODO unit test for the property 'Pin'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LoyaltyCampaignBaseTests.cs b/src/Flipdish.Test/Model/LoyaltyCampaignBaseTests.cs
deleted file mode 100644
index b9b9f44b..00000000
--- a/src/Flipdish.Test/Model/LoyaltyCampaignBaseTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LoyaltyCampaignBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LoyaltyCampaignBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for LoyaltyCampaignBase
-        //private LoyaltyCampaignBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LoyaltyCampaignBase
-            //instance = new LoyaltyCampaignBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LoyaltyCampaignBase
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LoyaltyCampaignBase
-            //Assert.IsInstanceOfType<LoyaltyCampaignBase> (instance, "variable 'instance' is a LoyaltyCampaignBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrdersBeforeReceivingVoucher'
-        /// </summary>
-        [Test]
-        public void OrdersBeforeReceivingVoucherTest()
-        {
-            // TODO unit test for the property 'OrdersBeforeReceivingVoucher'
-        }
-        /// <summary>
-        /// Test the property 'PercentDiscountAmount'
-        /// </summary>
-        [Test]
-        public void PercentDiscountAmountTest()
-        {
-            // TODO unit test for the property 'PercentDiscountAmount'
-        }
-        /// <summary>
-        /// Test the property 'VoucherValidPeriodDays'
-        /// </summary>
-        [Test]
-        public void VoucherValidPeriodDaysTest()
-        {
-            // TODO unit test for the property 'VoucherValidPeriodDays'
-        }
-        /// <summary>
-        /// Test the property 'IncludeDeliveryFee'
-        /// </summary>
-        [Test]
-        public void IncludeDeliveryFeeTest()
-        {
-            // TODO unit test for the property 'IncludeDeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'AutoApplyResultingVouchers'
-        /// </summary>
-        [Test]
-        public void AutoApplyResultingVouchersTest()
-        {
-            // TODO unit test for the property 'AutoApplyResultingVouchers'
-        }
-        /// <summary>
-        /// Test the property 'IncludeExistingOrders'
-        /// </summary>
-        [Test]
-        public void IncludeExistingOrdersTest()
-        {
-            // TODO unit test for the property 'IncludeExistingOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LoyaltyCampaignCreatedEventTests.cs b/src/Flipdish.Test/Model/LoyaltyCampaignCreatedEventTests.cs
deleted file mode 100644
index 43659cf5..00000000
--- a/src/Flipdish.Test/Model/LoyaltyCampaignCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LoyaltyCampaignCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LoyaltyCampaignCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for LoyaltyCampaignCreatedEvent
-        //private LoyaltyCampaignCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LoyaltyCampaignCreatedEvent
-            //instance = new LoyaltyCampaignCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LoyaltyCampaignCreatedEvent
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LoyaltyCampaignCreatedEvent
-            //Assert.IsInstanceOfType<LoyaltyCampaignCreatedEvent> (instance, "variable 'instance' is a LoyaltyCampaignCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'LoyaltyCampaign'
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignTest()
-        {
-            // TODO unit test for the property 'LoyaltyCampaign'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LoyaltyCampaignDeletedEventTests.cs b/src/Flipdish.Test/Model/LoyaltyCampaignDeletedEventTests.cs
deleted file mode 100644
index fa4388cf..00000000
--- a/src/Flipdish.Test/Model/LoyaltyCampaignDeletedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LoyaltyCampaignDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LoyaltyCampaignDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for LoyaltyCampaignDeletedEvent
-        //private LoyaltyCampaignDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LoyaltyCampaignDeletedEvent
-            //instance = new LoyaltyCampaignDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LoyaltyCampaignDeletedEvent
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LoyaltyCampaignDeletedEvent
-            //Assert.IsInstanceOfType<LoyaltyCampaignDeletedEvent> (instance, "variable 'instance' is a LoyaltyCampaignDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'LoyaltyCampaign'
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignTest()
-        {
-            // TODO unit test for the property 'LoyaltyCampaign'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LoyaltyCampaignTests.cs b/src/Flipdish.Test/Model/LoyaltyCampaignTests.cs
deleted file mode 100644
index f6e19bd3..00000000
--- a/src/Flipdish.Test/Model/LoyaltyCampaignTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LoyaltyCampaign
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LoyaltyCampaignTests
-    {
-        // TODO uncomment below to declare an instance variable for LoyaltyCampaign
-        //private LoyaltyCampaign instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LoyaltyCampaign
-            //instance = new LoyaltyCampaign();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LoyaltyCampaign
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LoyaltyCampaign
-            //Assert.IsInstanceOfType<LoyaltyCampaign> (instance, "variable 'instance' is a LoyaltyCampaign");
-        }
-
-
-        /// <summary>
-        /// Test the property 'From'
-        /// </summary>
-        [Test]
-        public void FromTest()
-        {
-            // TODO unit test for the property 'From'
-        }
-        /// <summary>
-        /// Test the property 'VoucherValidPeriodDays'
-        /// </summary>
-        [Test]
-        public void VoucherValidPeriodDaysTest()
-        {
-            // TODO unit test for the property 'VoucherValidPeriodDays'
-        }
-        /// <summary>
-        /// Test the property 'IncludeDeliveryFee'
-        /// </summary>
-        [Test]
-        public void IncludeDeliveryFeeTest()
-        {
-            // TODO unit test for the property 'IncludeDeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'OrdersBeforeReceivingVoucher'
-        /// </summary>
-        [Test]
-        public void OrdersBeforeReceivingVoucherTest()
-        {
-            // TODO unit test for the property 'OrdersBeforeReceivingVoucher'
-        }
-        /// <summary>
-        /// Test the property 'PercentDiscountAmount'
-        /// </summary>
-        [Test]
-        public void PercentDiscountAmountTest()
-        {
-            // TODO unit test for the property 'PercentDiscountAmount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LoyaltyCampaignUpdatedEventTests.cs b/src/Flipdish.Test/Model/LoyaltyCampaignUpdatedEventTests.cs
deleted file mode 100644
index b0e88623..00000000
--- a/src/Flipdish.Test/Model/LoyaltyCampaignUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LoyaltyCampaignUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LoyaltyCampaignUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for LoyaltyCampaignUpdatedEvent
-        //private LoyaltyCampaignUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LoyaltyCampaignUpdatedEvent
-            //instance = new LoyaltyCampaignUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LoyaltyCampaignUpdatedEvent
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LoyaltyCampaignUpdatedEvent
-            //Assert.IsInstanceOfType<LoyaltyCampaignUpdatedEvent> (instance, "variable 'instance' is a LoyaltyCampaignUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'LoyaltyCampaign'
-        /// </summary>
-        [Test]
-        public void LoyaltyCampaignTest()
-        {
-            // TODO unit test for the property 'LoyaltyCampaign'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/LumpDiscountDetailsTests.cs b/src/Flipdish.Test/Model/LumpDiscountDetailsTests.cs
deleted file mode 100644
index 7691a09f..00000000
--- a/src/Flipdish.Test/Model/LumpDiscountDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing LumpDiscountDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class LumpDiscountDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for LumpDiscountDetails
-        //private LumpDiscountDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of LumpDiscountDetails
-            //instance = new LumpDiscountDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of LumpDiscountDetails
-        /// </summary>
-        [Test]
-        public void LumpDiscountDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" LumpDiscountDetails
-            //Assert.IsInstanceOfType<LumpDiscountDetails> (instance, "variable 'instance' is a LumpDiscountDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DiscountAmount'
-        /// </summary>
-        [Test]
-        public void DiscountAmountTest()
-        {
-            // TODO unit test for the property 'DiscountAmount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MappedLocationTests.cs b/src/Flipdish.Test/Model/MappedLocationTests.cs
deleted file mode 100644
index 3195c44a..00000000
--- a/src/Flipdish.Test/Model/MappedLocationTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MappedLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MappedLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for MappedLocation
-        //private MappedLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MappedLocation
-            //instance = new MappedLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MappedLocation
-        /// </summary>
-        [Test]
-        public void MappedLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MappedLocation
-            //Assert.IsInstanceOfType<MappedLocation> (instance, "variable 'instance' is a MappedLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationId'
-        /// </summary>
-        [Test]
-        public void LocationIdTest()
-        {
-            // TODO unit test for the property 'LocationId'
-        }
-        /// <summary>
-        /// Test the property 'ExternalLocationId'
-        /// </summary>
-        [Test]
-        public void ExternalLocationIdTest()
-        {
-            // TODO unit test for the property 'ExternalLocationId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MaskedPhoneNumberTests.cs b/src/Flipdish.Test/Model/MaskedPhoneNumberTests.cs
deleted file mode 100644
index 6a7dd07f..00000000
--- a/src/Flipdish.Test/Model/MaskedPhoneNumberTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MaskedPhoneNumber
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MaskedPhoneNumberTests
-    {
-        // TODO uncomment below to declare an instance variable for MaskedPhoneNumber
-        //private MaskedPhoneNumber instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MaskedPhoneNumber
-            //instance = new MaskedPhoneNumber();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MaskedPhoneNumber
-        /// </summary>
-        [Test]
-        public void MaskedPhoneNumberInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MaskedPhoneNumber
-            //Assert.IsInstanceOfType<MaskedPhoneNumber> (instance, "variable 'instance' is a MaskedPhoneNumber");
-        }
-
-
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PhoneNumber'
-        /// </summary>
-        [Test]
-        public void PhoneNumberTest()
-        {
-            // TODO unit test for the property 'PhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuBaseTests.cs b/src/Flipdish.Test/Model/MenuBaseTests.cs
deleted file mode 100644
index e81542a8..00000000
--- a/src/Flipdish.Test/Model/MenuBaseTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuBase
-        //private MenuBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuBase
-            //instance = new MenuBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuBase
-        /// </summary>
-        [Test]
-        public void MenuBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuBase
-            //Assert.IsInstanceOfType<MenuBase> (instance, "variable 'instance' is a MenuBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DisplaySectionLinks'
-        /// </summary>
-        [Test]
-        public void DisplaySectionLinksTest()
-        {
-            // TODO unit test for the property 'DisplaySectionLinks'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionBehaviour'
-        /// </summary>
-        [Test]
-        public void MenuSectionBehaviourTest()
-        {
-            // TODO unit test for the property 'MenuSectionBehaviour'
-        }
-        /// <summary>
-        /// Test the property 'TaxType'
-        /// </summary>
-        [Test]
-        public void TaxTypeTest()
-        {
-            // TODO unit test for the property 'TaxType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuBulkEditEventTests.cs b/src/Flipdish.Test/Model/MenuBulkEditEventTests.cs
deleted file mode 100644
index c9c35acc..00000000
--- a/src/Flipdish.Test/Model/MenuBulkEditEventTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuBulkEditEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuBulkEditEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuBulkEditEvent
-        //private MenuBulkEditEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuBulkEditEvent
-            //instance = new MenuBulkEditEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuBulkEditEvent
-        /// </summary>
-        [Test]
-        public void MenuBulkEditEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuBulkEditEvent
-            //Assert.IsInstanceOfType<MenuBulkEditEvent> (instance, "variable 'instance' is a MenuBulkEditEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'MenuName'
-        /// </summary>
-        [Test]
-        public void MenuNameTest()
-        {
-            // TODO unit test for the property 'MenuName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Item'
-        /// </summary>
-        [Test]
-        public void ItemTest()
-        {
-            // TODO unit test for the property 'Item'
-        }
-        /// <summary>
-        /// Test the property 'InstanceCount'
-        /// </summary>
-        [Test]
-        public void InstanceCountTest()
-        {
-            // TODO unit test for the property 'InstanceCount'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuCatalogItemTests.cs b/src/Flipdish.Test/Model/MenuCatalogItemTests.cs
deleted file mode 100644
index 520874c2..00000000
--- a/src/Flipdish.Test/Model/MenuCatalogItemTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuCatalogItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuCatalogItemTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuCatalogItem
-        //private MenuCatalogItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuCatalogItem
-            //instance = new MenuCatalogItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuCatalogItem
-        /// </summary>
-        [Test]
-        public void MenuCatalogItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuCatalogItem
-            //Assert.IsInstanceOfType<MenuCatalogItem> (instance, "variable 'instance' is a MenuCatalogItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuCheckpointCreatedEventTests.cs b/src/Flipdish.Test/Model/MenuCheckpointCreatedEventTests.cs
deleted file mode 100644
index 9b2646d0..00000000
--- a/src/Flipdish.Test/Model/MenuCheckpointCreatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuCheckpointCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuCheckpointCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuCheckpointCreatedEvent
-        //private MenuCheckpointCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuCheckpointCreatedEvent
-            //instance = new MenuCheckpointCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuCheckpointCreatedEvent
-        /// </summary>
-        [Test]
-        public void MenuCheckpointCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuCheckpointCreatedEvent
-            //Assert.IsInstanceOfType<MenuCheckpointCreatedEvent> (instance, "variable 'instance' is a MenuCheckpointCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Menu'
-        /// </summary>
-        [Test]
-        public void MenuTest()
-        {
-            // TODO unit test for the property 'Menu'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuCheckpointTests.cs b/src/Flipdish.Test/Model/MenuCheckpointTests.cs
deleted file mode 100644
index 0a59e2cf..00000000
--- a/src/Flipdish.Test/Model/MenuCheckpointTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuCheckpoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuCheckpointTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuCheckpoint
-        //private MenuCheckpoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuCheckpoint
-            //instance = new MenuCheckpoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuCheckpoint
-        /// </summary>
-        [Test]
-        public void MenuCheckpointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuCheckpoint
-            //Assert.IsInstanceOfType<MenuCheckpoint> (instance, "variable 'instance' is a MenuCheckpoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuCheckpointId'
-        /// </summary>
-        [Test]
-        public void MenuCheckpointIdTest()
-        {
-            // TODO unit test for the property 'MenuCheckpointId'
-        }
-        /// <summary>
-        /// Test the property 'Time'
-        /// </summary>
-        [Test]
-        public void TimeTest()
-        {
-            // TODO unit test for the property 'Time'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Url'
-        /// </summary>
-        [Test]
-        public void UrlTest()
-        {
-            // TODO unit test for the property 'Url'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuCreatedEventTests.cs b/src/Flipdish.Test/Model/MenuCreatedEventTests.cs
deleted file mode 100644
index a1a75259..00000000
--- a/src/Flipdish.Test/Model/MenuCreatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuCreatedEvent
-        //private MenuCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuCreatedEvent
-            //instance = new MenuCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuCreatedEvent
-        /// </summary>
-        [Test]
-        public void MenuCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuCreatedEvent
-            //Assert.IsInstanceOfType<MenuCreatedEvent> (instance, "variable 'instance' is a MenuCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Menu'
-        /// </summary>
-        [Test]
-        public void MenuTest()
-        {
-            // TODO unit test for the property 'Menu'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuElementEditResponseTests.cs b/src/Flipdish.Test/Model/MenuElementEditResponseTests.cs
deleted file mode 100644
index 285320d6..00000000
--- a/src/Flipdish.Test/Model/MenuElementEditResponseTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuElementEditResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuElementEditResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuElementEditResponse
-        //private MenuElementEditResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuElementEditResponse
-            //instance = new MenuElementEditResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuElementEditResponse
-        /// </summary>
-        [Test]
-        public void MenuElementEditResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuElementEditResponse
-            //Assert.IsInstanceOfType<MenuElementEditResponse> (instance, "variable 'instance' is a MenuElementEditResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'SectionName'
-        /// </summary>
-        [Test]
-        public void SectionNameTest()
-        {
-            // TODO unit test for the property 'SectionName'
-        }
-        /// <summary>
-        /// Test the property 'ItemName'
-        /// </summary>
-        [Test]
-        public void ItemNameTest()
-        {
-            // TODO unit test for the property 'ItemName'
-        }
-        /// <summary>
-        /// Test the property 'OptionSetName'
-        /// </summary>
-        [Test]
-        public void OptionSetNameTest()
-        {
-            // TODO unit test for the property 'OptionSetName'
-        }
-        /// <summary>
-        /// Test the property 'OptionSetItemName'
-        /// </summary>
-        [Test]
-        public void OptionSetItemNameTest()
-        {
-            // TODO unit test for the property 'OptionSetItemName'
-        }
-        /// <summary>
-        /// Test the property 'MenuElementId'
-        /// </summary>
-        [Test]
-        public void MenuElementIdTest()
-        {
-            // TODO unit test for the property 'MenuElementId'
-        }
-        /// <summary>
-        /// Test the property 'MenuElementType'
-        /// </summary>
-        [Test]
-        public void MenuElementTypeTest()
-        {
-            // TODO unit test for the property 'MenuElementType'
-        }
-        /// <summary>
-        /// Test the property 'ValidationCode'
-        /// </summary>
-        [Test]
-        public void ValidationCodeTest()
-        {
-            // TODO unit test for the property 'ValidationCode'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuElementHideTests.cs b/src/Flipdish.Test/Model/MenuElementHideTests.cs
deleted file mode 100644
index 7f94ed70..00000000
--- a/src/Flipdish.Test/Model/MenuElementHideTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuElementHide
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuElementHideTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuElementHide
-        //private MenuElementHide instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuElementHide
-            //instance = new MenuElementHide();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuElementHide
-        /// </summary>
-        [Test]
-        public void MenuElementHideInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuElementHide
-            //Assert.IsInstanceOfType<MenuElementHide> (instance, "variable 'instance' is a MenuElementHide");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuElementId'
-        /// </summary>
-        [Test]
-        public void MenuElementIdTest()
-        {
-            // TODO unit test for the property 'MenuElementId'
-        }
-        /// <summary>
-        /// Test the property 'MenuElementType'
-        /// </summary>
-        [Test]
-        public void MenuElementTypeTest()
-        {
-            // TODO unit test for the property 'MenuElementType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuElementListItemResponseTests.cs b/src/Flipdish.Test/Model/MenuElementListItemResponseTests.cs
deleted file mode 100644
index 72c5e1c1..00000000
--- a/src/Flipdish.Test/Model/MenuElementListItemResponseTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuElementListItemResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuElementListItemResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuElementListItemResponse
-        //private MenuElementListItemResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuElementListItemResponse
-            //instance = new MenuElementListItemResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuElementListItemResponse
-        /// </summary>
-        [Test]
-        public void MenuElementListItemResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuElementListItemResponse
-            //Assert.IsInstanceOfType<MenuElementListItemResponse> (instance, "variable 'instance' is a MenuElementListItemResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuElementId'
-        /// </summary>
-        [Test]
-        public void MenuElementIdTest()
-        {
-            // TODO unit test for the property 'MenuElementId'
-        }
-        /// <summary>
-        /// Test the property 'MenuElementType'
-        /// </summary>
-        [Test]
-        public void MenuElementTypeTest()
-        {
-            // TODO unit test for the property 'MenuElementType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuElementListResponseTests.cs b/src/Flipdish.Test/Model/MenuElementListResponseTests.cs
deleted file mode 100644
index 301f8406..00000000
--- a/src/Flipdish.Test/Model/MenuElementListResponseTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuElementListResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuElementListResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuElementListResponse
-        //private MenuElementListResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuElementListResponse
-            //instance = new MenuElementListResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuElementListResponse
-        /// </summary>
-        [Test]
-        public void MenuElementListResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuElementListResponse
-            //Assert.IsInstanceOfType<MenuElementListResponse> (instance, "variable 'instance' is a MenuElementListResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuName'
-        /// </summary>
-        [Test]
-        public void MenuNameTest()
-        {
-            // TODO unit test for the property 'MenuName'
-        }
-        /// <summary>
-        /// Test the property 'MenuElementName'
-        /// </summary>
-        [Test]
-        public void MenuElementNameTest()
-        {
-            // TODO unit test for the property 'MenuElementName'
-        }
-        /// <summary>
-        /// Test the property 'InstanceCount'
-        /// </summary>
-        [Test]
-        public void InstanceCountTest()
-        {
-            // TODO unit test for the property 'InstanceCount'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'Items'
-        /// </summary>
-        [Test]
-        public void ItemsTest()
-        {
-            // TODO unit test for the property 'Items'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetBaseTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetBaseTests.cs
deleted file mode 100644
index 89bff3ec..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetBaseTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetBase
-        //private MenuItemOptionSetBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetBase
-            //instance = new MenuItemOptionSetBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetBase
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetBase
-            //Assert.IsInstanceOfType<MenuItemOptionSetBase> (instance, "variable 'instance' is a MenuItemOptionSetBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'IsMasterOptionSet'
-        /// </summary>
-        [Test]
-        public void IsMasterOptionSetTest()
-        {
-            // TODO unit test for the property 'IsMasterOptionSet'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'MinSelectCount'
-        /// </summary>
-        [Test]
-        public void MinSelectCountTest()
-        {
-            // TODO unit test for the property 'MinSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelectCount'
-        /// </summary>
-        [Test]
-        public void MaxSelectCountTest()
-        {
-            // TODO unit test for the property 'MaxSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetCreatedEventTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetCreatedEventTests.cs
deleted file mode 100644
index 1b959552..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetCreatedEvent
-        //private MenuItemOptionSetCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetCreatedEvent
-            //instance = new MenuItemOptionSetCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetCreatedEvent
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetCreatedEvent
-            //Assert.IsInstanceOfType<MenuItemOptionSetCreatedEvent> (instance, "variable 'instance' is a MenuItemOptionSetCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSet'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSet'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetDeletedEventTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetDeletedEventTests.cs
deleted file mode 100644
index 389a1730..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetDeletedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetDeletedEvent
-        //private MenuItemOptionSetDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetDeletedEvent
-            //instance = new MenuItemOptionSetDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetDeletedEvent
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetDeletedEvent
-            //Assert.IsInstanceOfType<MenuItemOptionSetDeletedEvent> (instance, "variable 'instance' is a MenuItemOptionSetDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSet'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSet'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetItemBaseTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetItemBaseTests.cs
deleted file mode 100644
index e6c92fb9..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetItemBaseTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetItemBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetItemBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetItemBase
-        //private MenuItemOptionSetItemBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetItemBase
-            //instance = new MenuItemOptionSetItemBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetItemBase
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetItemBase
-            //Assert.IsInstanceOfType<MenuItemOptionSetItemBase> (instance, "variable 'instance' is a MenuItemOptionSetItemBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetItemCreatedEventTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetItemCreatedEventTests.cs
deleted file mode 100644
index f8bbdc2d..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetItemCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetItemCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetItemCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetItemCreatedEvent
-        //private MenuItemOptionSetItemCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetItemCreatedEvent
-            //instance = new MenuItemOptionSetItemCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetItemCreatedEvent
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetItemCreatedEvent
-            //Assert.IsInstanceOfType<MenuItemOptionSetItemCreatedEvent> (instance, "variable 'instance' is a MenuItemOptionSetItemCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItem'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItem'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetItemDeletedEventTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetItemDeletedEventTests.cs
deleted file mode 100644
index f3637f05..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetItemDeletedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetItemDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetItemDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetItemDeletedEvent
-        //private MenuItemOptionSetItemDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetItemDeletedEvent
-            //instance = new MenuItemOptionSetItemDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetItemDeletedEvent
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetItemDeletedEvent
-            //Assert.IsInstanceOfType<MenuItemOptionSetItemDeletedEvent> (instance, "variable 'instance' is a MenuItemOptionSetItemDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItem'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItem'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetItemTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetItemTests.cs
deleted file mode 100644
index fd0d562d..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetItemTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetItemTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetItem
-        //private MenuItemOptionSetItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetItem
-            //instance = new MenuItemOptionSetItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetItem
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetItem
-            //Assert.IsInstanceOfType<MenuItemOptionSetItem> (instance, "variable 'instance' is a MenuItemOptionSetItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItemId'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemIdTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItemId'
-        }
-        /// <summary>
-        /// Test the property 'PublicId'
-        /// </summary>
-        [Test]
-        public void PublicIdTest()
-        {
-            // TODO unit test for the property 'PublicId'
-        }
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetItemUpdatedEventTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetItemUpdatedEventTests.cs
deleted file mode 100644
index 3ee439ce..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetItemUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetItemUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetItemUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetItemUpdatedEvent
-        //private MenuItemOptionSetItemUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetItemUpdatedEvent
-            //instance = new MenuItemOptionSetItemUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetItemUpdatedEvent
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetItemUpdatedEvent
-            //Assert.IsInstanceOfType<MenuItemOptionSetItemUpdatedEvent> (instance, "variable 'instance' is a MenuItemOptionSetItemUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItem'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItem'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetTests.cs
deleted file mode 100644
index 447a569e..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSet
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSet
-        //private MenuItemOptionSet instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSet
-            //instance = new MenuItemOptionSet();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSet
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSet
-            //Assert.IsInstanceOfType<MenuItemOptionSet> (instance, "variable 'instance' is a MenuItemOptionSet");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetId'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetIdTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetId'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetItems'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetItemsTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetItems'
-        }
-        /// <summary>
-        /// Test the property 'PublicId'
-        /// </summary>
-        [Test]
-        public void PublicIdTest()
-        {
-            // TODO unit test for the property 'PublicId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'IsMasterOptionSet'
-        /// </summary>
-        [Test]
-        public void IsMasterOptionSetTest()
-        {
-            // TODO unit test for the property 'IsMasterOptionSet'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'MinSelectCount'
-        /// </summary>
-        [Test]
-        public void MinSelectCountTest()
-        {
-            // TODO unit test for the property 'MinSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelectCount'
-        /// </summary>
-        [Test]
-        public void MaxSelectCountTest()
-        {
-            // TODO unit test for the property 'MaxSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuItemOptionSetUpdatedEventTests.cs b/src/Flipdish.Test/Model/MenuItemOptionSetUpdatedEventTests.cs
deleted file mode 100644
index 6080c544..00000000
--- a/src/Flipdish.Test/Model/MenuItemOptionSetUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuItemOptionSetUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuItemOptionSetUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuItemOptionSetUpdatedEvent
-        //private MenuItemOptionSetUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuItemOptionSetUpdatedEvent
-            //instance = new MenuItemOptionSetUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuItemOptionSetUpdatedEvent
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuItemOptionSetUpdatedEvent
-            //Assert.IsInstanceOfType<MenuItemOptionSetUpdatedEvent> (instance, "variable 'instance' is a MenuItemOptionSetUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSet'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSet'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuObjectDisplayOrdersTests.cs b/src/Flipdish.Test/Model/MenuObjectDisplayOrdersTests.cs
deleted file mode 100644
index abac0bbb..00000000
--- a/src/Flipdish.Test/Model/MenuObjectDisplayOrdersTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuObjectDisplayOrders
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuObjectDisplayOrdersTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuObjectDisplayOrders
-        //private MenuObjectDisplayOrders instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuObjectDisplayOrders
-            //instance = new MenuObjectDisplayOrders();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuObjectDisplayOrders
-        /// </summary>
-        [Test]
-        public void MenuObjectDisplayOrdersInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuObjectDisplayOrders
-            //Assert.IsInstanceOfType<MenuObjectDisplayOrders> (instance, "variable 'instance' is a MenuObjectDisplayOrders");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DisplayOrders'
-        /// </summary>
-        [Test]
-        public void DisplayOrdersTest()
-        {
-            // TODO unit test for the property 'DisplayOrders'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionAvailabilityBaseTests.cs b/src/Flipdish.Test/Model/MenuSectionAvailabilityBaseTests.cs
deleted file mode 100644
index cddf9223..00000000
--- a/src/Flipdish.Test/Model/MenuSectionAvailabilityBaseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionAvailabilityBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionAvailabilityBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionAvailabilityBase
-        //private MenuSectionAvailabilityBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionAvailabilityBase
-            //instance = new MenuSectionAvailabilityBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionAvailabilityBase
-        /// </summary>
-        [Test]
-        public void MenuSectionAvailabilityBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionAvailabilityBase
-            //Assert.IsInstanceOfType<MenuSectionAvailabilityBase> (instance, "variable 'instance' is a MenuSectionAvailabilityBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AvailabilityMode'
-        /// </summary>
-        [Test]
-        public void AvailabilityModeTest()
-        {
-            // TODO unit test for the property 'AvailabilityMode'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionAvailabilityTests.cs b/src/Flipdish.Test/Model/MenuSectionAvailabilityTests.cs
deleted file mode 100644
index 4a6e7b37..00000000
--- a/src/Flipdish.Test/Model/MenuSectionAvailabilityTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionAvailability
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionAvailabilityTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionAvailability
-        //private MenuSectionAvailability instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionAvailability
-            //instance = new MenuSectionAvailability();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionAvailability
-        /// </summary>
-        [Test]
-        public void MenuSectionAvailabilityInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionAvailability
-            //Assert.IsInstanceOfType<MenuSectionAvailability> (instance, "variable 'instance' is a MenuSectionAvailability");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AvailableTimes'
-        /// </summary>
-        [Test]
-        public void AvailableTimesTest()
-        {
-            // TODO unit test for the property 'AvailableTimes'
-        }
-        /// <summary>
-        /// Test the property 'AvailabilityMode'
-        /// </summary>
-        [Test]
-        public void AvailabilityModeTest()
-        {
-            // TODO unit test for the property 'AvailabilityMode'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionBaseTests.cs b/src/Flipdish.Test/Model/MenuSectionBaseTests.cs
deleted file mode 100644
index b74612f4..00000000
--- a/src/Flipdish.Test/Model/MenuSectionBaseTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionBase
-        //private MenuSectionBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionBase
-            //instance = new MenuSectionBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionBase
-        /// </summary>
-        [Test]
-        public void MenuSectionBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionBase
-            //Assert.IsInstanceOfType<MenuSectionBase> (instance, "variable 'instance' is a MenuSectionBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'IsHiddenFromCustomers'
-        /// </summary>
-        [Test]
-        public void IsHiddenFromCustomersTest()
-        {
-            // TODO unit test for the property 'IsHiddenFromCustomers'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionCreatedEventTests.cs b/src/Flipdish.Test/Model/MenuSectionCreatedEventTests.cs
deleted file mode 100644
index 05dc81f1..00000000
--- a/src/Flipdish.Test/Model/MenuSectionCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionCreatedEvent
-        //private MenuSectionCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionCreatedEvent
-            //instance = new MenuSectionCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionCreatedEvent
-        /// </summary>
-        [Test]
-        public void MenuSectionCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionCreatedEvent
-            //Assert.IsInstanceOfType<MenuSectionCreatedEvent> (instance, "variable 'instance' is a MenuSectionCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuSection'
-        /// </summary>
-        [Test]
-        public void MenuSectionTest()
-        {
-            // TODO unit test for the property 'MenuSection'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionDeletedEventTests.cs b/src/Flipdish.Test/Model/MenuSectionDeletedEventTests.cs
deleted file mode 100644
index 904bca54..00000000
--- a/src/Flipdish.Test/Model/MenuSectionDeletedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionDeletedEvent
-        //private MenuSectionDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionDeletedEvent
-            //instance = new MenuSectionDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionDeletedEvent
-        /// </summary>
-        [Test]
-        public void MenuSectionDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionDeletedEvent
-            //Assert.IsInstanceOfType<MenuSectionDeletedEvent> (instance, "variable 'instance' is a MenuSectionDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuSection'
-        /// </summary>
-        [Test]
-        public void MenuSectionTest()
-        {
-            // TODO unit test for the property 'MenuSection'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionItemBaseTests.cs b/src/Flipdish.Test/Model/MenuSectionItemBaseTests.cs
deleted file mode 100644
index 01cba800..00000000
--- a/src/Flipdish.Test/Model/MenuSectionItemBaseTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionItemBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionItemBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionItemBase
-        //private MenuSectionItemBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionItemBase
-            //instance = new MenuSectionItemBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionItemBase
-        /// </summary>
-        [Test]
-        public void MenuSectionItemBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionItemBase
-            //Assert.IsInstanceOfType<MenuSectionItemBase> (instance, "variable 'instance' is a MenuSectionItemBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'SpicinessRating'
-        /// </summary>
-        [Test]
-        public void SpicinessRatingTest()
-        {
-            // TODO unit test for the property 'SpicinessRating'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'Alcohol'
-        /// </summary>
-        [Test]
-        public void AlcoholTest()
-        {
-            // TODO unit test for the property 'Alcohol'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-        /// <summary>
-        /// Test the property 'DisableVouchers'
-        /// </summary>
-        [Test]
-        public void DisableVouchersTest()
-        {
-            // TODO unit test for the property 'DisableVouchers'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionItemCreatedEventTests.cs b/src/Flipdish.Test/Model/MenuSectionItemCreatedEventTests.cs
deleted file mode 100644
index aa090cdf..00000000
--- a/src/Flipdish.Test/Model/MenuSectionItemCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionItemCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionItemCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionItemCreatedEvent
-        //private MenuSectionItemCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionItemCreatedEvent
-            //instance = new MenuSectionItemCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionItemCreatedEvent
-        /// </summary>
-        [Test]
-        public void MenuSectionItemCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionItemCreatedEvent
-            //Assert.IsInstanceOfType<MenuSectionItemCreatedEvent> (instance, "variable 'instance' is a MenuSectionItemCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionItem'
-        /// </summary>
-        [Test]
-        public void MenuSectionItemTest()
-        {
-            // TODO unit test for the property 'MenuSectionItem'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionItemDeletedEventTests.cs b/src/Flipdish.Test/Model/MenuSectionItemDeletedEventTests.cs
deleted file mode 100644
index 354297aa..00000000
--- a/src/Flipdish.Test/Model/MenuSectionItemDeletedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionItemDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionItemDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionItemDeletedEvent
-        //private MenuSectionItemDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionItemDeletedEvent
-            //instance = new MenuSectionItemDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionItemDeletedEvent
-        /// </summary>
-        [Test]
-        public void MenuSectionItemDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionItemDeletedEvent
-            //Assert.IsInstanceOfType<MenuSectionItemDeletedEvent> (instance, "variable 'instance' is a MenuSectionItemDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionItem'
-        /// </summary>
-        [Test]
-        public void MenuSectionItemTest()
-        {
-            // TODO unit test for the property 'MenuSectionItem'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionItemTests.cs b/src/Flipdish.Test/Model/MenuSectionItemTests.cs
deleted file mode 100644
index 254e7baa..00000000
--- a/src/Flipdish.Test/Model/MenuSectionItemTests.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionItemTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionItem
-        //private MenuSectionItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionItem
-            //instance = new MenuSectionItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionItem
-        /// </summary>
-        [Test]
-        public void MenuSectionItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionItem
-            //Assert.IsInstanceOfType<MenuSectionItem> (instance, "variable 'instance' is a MenuSectionItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuItemId'
-        /// </summary>
-        [Test]
-        public void MenuItemIdTest()
-        {
-            // TODO unit test for the property 'MenuItemId'
-        }
-        /// <summary>
-        /// Test the property 'ActualPrice'
-        /// </summary>
-        [Test]
-        public void ActualPriceTest()
-        {
-            // TODO unit test for the property 'ActualPrice'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSets'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetsTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSets'
-        }
-        /// <summary>
-        /// Test the property 'DailySpecialHours'
-        /// </summary>
-        [Test]
-        public void DailySpecialHoursTest()
-        {
-            // TODO unit test for the property 'DailySpecialHours'
-        }
-        /// <summary>
-        /// Test the property 'PublicId'
-        /// </summary>
-        [Test]
-        public void PublicIdTest()
-        {
-            // TODO unit test for the property 'PublicId'
-        }
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'SpicinessRating'
-        /// </summary>
-        [Test]
-        public void SpicinessRatingTest()
-        {
-            // TODO unit test for the property 'SpicinessRating'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'Alcohol'
-        /// </summary>
-        [Test]
-        public void AlcoholTest()
-        {
-            // TODO unit test for the property 'Alcohol'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-        /// <summary>
-        /// Test the property 'DisableVouchers'
-        /// </summary>
-        [Test]
-        public void DisableVouchersTest()
-        {
-            // TODO unit test for the property 'DisableVouchers'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionItemUpdatedEventTests.cs b/src/Flipdish.Test/Model/MenuSectionItemUpdatedEventTests.cs
deleted file mode 100644
index b0a31b1c..00000000
--- a/src/Flipdish.Test/Model/MenuSectionItemUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionItemUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionItemUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionItemUpdatedEvent
-        //private MenuSectionItemUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionItemUpdatedEvent
-            //instance = new MenuSectionItemUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionItemUpdatedEvent
-        /// </summary>
-        [Test]
-        public void MenuSectionItemUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionItemUpdatedEvent
-            //Assert.IsInstanceOfType<MenuSectionItemUpdatedEvent> (instance, "variable 'instance' is a MenuSectionItemUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionItem'
-        /// </summary>
-        [Test]
-        public void MenuSectionItemTest()
-        {
-            // TODO unit test for the property 'MenuSectionItem'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionTests.cs b/src/Flipdish.Test/Model/MenuSectionTests.cs
deleted file mode 100644
index d54b1c84..00000000
--- a/src/Flipdish.Test/Model/MenuSectionTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSection
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSection
-        //private MenuSection instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSection
-            //instance = new MenuSection();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSection
-        /// </summary>
-        [Test]
-        public void MenuSectionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSection
-            //Assert.IsInstanceOfType<MenuSection> (instance, "variable 'instance' is a MenuSection");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuSectionId'
-        /// </summary>
-        [Test]
-        public void MenuSectionIdTest()
-        {
-            // TODO unit test for the property 'MenuSectionId'
-        }
-        /// <summary>
-        /// Test the property 'MenuItems'
-        /// </summary>
-        [Test]
-        public void MenuItemsTest()
-        {
-            // TODO unit test for the property 'MenuItems'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionAvailability'
-        /// </summary>
-        [Test]
-        public void MenuSectionAvailabilityTest()
-        {
-            // TODO unit test for the property 'MenuSectionAvailability'
-        }
-        /// <summary>
-        /// Test the property 'PublicId'
-        /// </summary>
-        [Test]
-        public void PublicIdTest()
-        {
-            // TODO unit test for the property 'PublicId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-        /// <summary>
-        /// Test the property 'IsHiddenFromCustomers'
-        /// </summary>
-        [Test]
-        public void IsHiddenFromCustomersTest()
-        {
-            // TODO unit test for the property 'IsHiddenFromCustomers'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSectionUpdatedEventTests.cs b/src/Flipdish.Test/Model/MenuSectionUpdatedEventTests.cs
deleted file mode 100644
index 033029e2..00000000
--- a/src/Flipdish.Test/Model/MenuSectionUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSectionUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSectionUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSectionUpdatedEvent
-        //private MenuSectionUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSectionUpdatedEvent
-            //instance = new MenuSectionUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSectionUpdatedEvent
-        /// </summary>
-        [Test]
-        public void MenuSectionUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSectionUpdatedEvent
-            //Assert.IsInstanceOfType<MenuSectionUpdatedEvent> (instance, "variable 'instance' is a MenuSectionUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'MenuSection'
-        /// </summary>
-        [Test]
-        public void MenuSectionTest()
-        {
-            // TODO unit test for the property 'MenuSection'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuStoreNamesTests.cs b/src/Flipdish.Test/Model/MenuStoreNamesTests.cs
deleted file mode 100644
index 9d14fc28..00000000
--- a/src/Flipdish.Test/Model/MenuStoreNamesTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuStoreNames
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuStoreNamesTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuStoreNames
-        //private MenuStoreNames instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuStoreNames
-            //instance = new MenuStoreNames();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuStoreNames
-        /// </summary>
-        [Test]
-        public void MenuStoreNamesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuStoreNames
-            //Assert.IsInstanceOfType<MenuStoreNames> (instance, "variable 'instance' is a MenuStoreNames");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreNames'
-        /// </summary>
-        [Test]
-        public void StoreNamesTest()
-        {
-            // TODO unit test for the property 'StoreNames'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuSummaryTests.cs b/src/Flipdish.Test/Model/MenuSummaryTests.cs
deleted file mode 100644
index 8094e0ad..00000000
--- a/src/Flipdish.Test/Model/MenuSummaryTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuSummary
-        //private MenuSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuSummary
-            //instance = new MenuSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuSummary
-        /// </summary>
-        [Test]
-        public void MenuSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuSummary
-            //Assert.IsInstanceOfType<MenuSummary> (instance, "variable 'instance' is a MenuSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'ModifiedTime'
-        /// </summary>
-        [Test]
-        public void ModifiedTimeTest()
-        {
-            // TODO unit test for the property 'ModifiedTime'
-        }
-        /// <summary>
-        /// Test the property 'VersionNumber'
-        /// </summary>
-        [Test]
-        public void VersionNumberTest()
-        {
-            // TODO unit test for the property 'VersionNumber'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Locked'
-        /// </summary>
-        [Test]
-        public void LockedTest()
-        {
-            // TODO unit test for the property 'Locked'
-        }
-        /// <summary>
-        /// Test the property 'StoreNames'
-        /// </summary>
-        [Test]
-        public void StoreNamesTest()
-        {
-            // TODO unit test for the property 'StoreNames'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuTaxDetailsTests.cs b/src/Flipdish.Test/Model/MenuTaxDetailsTests.cs
deleted file mode 100644
index f00d6815..00000000
--- a/src/Flipdish.Test/Model/MenuTaxDetailsTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuTaxDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuTaxDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuTaxDetails
-        //private MenuTaxDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuTaxDetails
-            //instance = new MenuTaxDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuTaxDetails
-        /// </summary>
-        [Test]
-        public void MenuTaxDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuTaxDetails
-            //Assert.IsInstanceOfType<MenuTaxDetails> (instance, "variable 'instance' is a MenuTaxDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TaxRates'
-        /// </summary>
-        [Test]
-        public void TaxRatesTest()
-        {
-            // TODO unit test for the property 'TaxRates'
-        }
-        /// <summary>
-        /// Test the property 'DisplayTax'
-        /// </summary>
-        [Test]
-        public void DisplayTaxTest()
-        {
-            // TODO unit test for the property 'DisplayTax'
-        }
-        /// <summary>
-        /// Test the property 'TaxType'
-        /// </summary>
-        [Test]
-        public void TaxTypeTest()
-        {
-            // TODO unit test for the property 'TaxType'
-        }
-        /// <summary>
-        /// Test the property 'ItemTaxes'
-        /// </summary>
-        [Test]
-        public void ItemTaxesTest()
-        {
-            // TODO unit test for the property 'ItemTaxes'
-        }
-        /// <summary>
-        /// Test the property 'SetItemTaxes'
-        /// </summary>
-        [Test]
-        public void SetItemTaxesTest()
-        {
-            // TODO unit test for the property 'SetItemTaxes'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuTaxRateTests.cs b/src/Flipdish.Test/Model/MenuTaxRateTests.cs
deleted file mode 100644
index b4ed51c6..00000000
--- a/src/Flipdish.Test/Model/MenuTaxRateTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuTaxRate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuTaxRateTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuTaxRate
-        //private MenuTaxRate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuTaxRate
-            //instance = new MenuTaxRate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuTaxRate
-        /// </summary>
-        [Test]
-        public void MenuTaxRateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuTaxRate
-            //Assert.IsInstanceOfType<MenuTaxRate> (instance, "variable 'instance' is a MenuTaxRate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TaxRateId'
-        /// </summary>
-        [Test]
-        public void TaxRateIdTest()
-        {
-            // TODO unit test for the property 'TaxRateId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Rate'
-        /// </summary>
-        [Test]
-        public void RateTest()
-        {
-            // TODO unit test for the property 'Rate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuTests.cs b/src/Flipdish.Test/Model/MenuTests.cs
deleted file mode 100644
index 42520c92..00000000
--- a/src/Flipdish.Test/Model/MenuTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Menu
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuTests
-    {
-        // TODO uncomment below to declare an instance variable for Menu
-        //private Menu instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Menu
-            //instance = new Menu();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Menu
-        /// </summary>
-        [Test]
-        public void MenuInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Menu
-            //Assert.IsInstanceOfType<Menu> (instance, "variable 'instance' is a Menu");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'ModifiedTime'
-        /// </summary>
-        [Test]
-        public void ModifiedTimeTest()
-        {
-            // TODO unit test for the property 'ModifiedTime'
-        }
-        /// <summary>
-        /// Test the property 'VersionNumber'
-        /// </summary>
-        [Test]
-        public void VersionNumberTest()
-        {
-            // TODO unit test for the property 'VersionNumber'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Locked'
-        /// </summary>
-        [Test]
-        public void LockedTest()
-        {
-            // TODO unit test for the property 'Locked'
-        }
-        /// <summary>
-        /// Test the property 'MenuSections'
-        /// </summary>
-        [Test]
-        public void MenuSectionsTest()
-        {
-            // TODO unit test for the property 'MenuSections'
-        }
-        /// <summary>
-        /// Test the property 'TaxRates'
-        /// </summary>
-        [Test]
-        public void TaxRatesTest()
-        {
-            // TODO unit test for the property 'TaxRates'
-        }
-        /// <summary>
-        /// Test the property 'DisplaySectionLinks'
-        /// </summary>
-        [Test]
-        public void DisplaySectionLinksTest()
-        {
-            // TODO unit test for the property 'DisplaySectionLinks'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionBehaviour'
-        /// </summary>
-        [Test]
-        public void MenuSectionBehaviourTest()
-        {
-            // TODO unit test for the property 'MenuSectionBehaviour'
-        }
-        /// <summary>
-        /// Test the property 'TaxType'
-        /// </summary>
-        [Test]
-        public void TaxTypeTest()
-        {
-            // TODO unit test for the property 'TaxType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuUpdatedEventTests.cs b/src/Flipdish.Test/Model/MenuUpdatedEventTests.cs
deleted file mode 100644
index 0f5c56ea..00000000
--- a/src/Flipdish.Test/Model/MenuUpdatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuUpdatedEvent
-        //private MenuUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuUpdatedEvent
-            //instance = new MenuUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuUpdatedEvent
-        /// </summary>
-        [Test]
-        public void MenuUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuUpdatedEvent
-            //Assert.IsInstanceOfType<MenuUpdatedEvent> (instance, "variable 'instance' is a MenuUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Menu'
-        /// </summary>
-        [Test]
-        public void MenuTest()
-        {
-            // TODO unit test for the property 'Menu'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MenuUploadedEventTests.cs b/src/Flipdish.Test/Model/MenuUploadedEventTests.cs
deleted file mode 100644
index 50a2adef..00000000
--- a/src/Flipdish.Test/Model/MenuUploadedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MenuUploadedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MenuUploadedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for MenuUploadedEvent
-        //private MenuUploadedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MenuUploadedEvent
-            //instance = new MenuUploadedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MenuUploadedEvent
-        /// </summary>
-        [Test]
-        public void MenuUploadedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MenuUploadedEvent
-            //Assert.IsInstanceOfType<MenuUploadedEvent> (instance, "variable 'instance' is a MenuUploadedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Menu'
-        /// </summary>
-        [Test]
-        public void MenuTest()
-        {
-            // TODO unit test for the property 'Menu'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MetadataTests.cs b/src/Flipdish.Test/Model/MetadataTests.cs
deleted file mode 100644
index 8e0c3fb6..00000000
--- a/src/Flipdish.Test/Model/MetadataTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Metadata
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MetadataTests
-    {
-        // TODO uncomment below to declare an instance variable for Metadata
-        //private Metadata instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Metadata
-            //instance = new Metadata();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Metadata
-        /// </summary>
-        [Test]
-        public void MetadataInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Metadata
-            //Assert.IsInstanceOfType<Metadata> (instance, "variable 'instance' is a Metadata");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuEntityId'
-        /// </summary>
-        [Test]
-        public void MenuEntityIdTest()
-        {
-            // TODO unit test for the property 'MenuEntityId'
-        }
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MetafieldDefinitionRecommendationTests.cs b/src/Flipdish.Test/Model/MetafieldDefinitionRecommendationTests.cs
deleted file mode 100644
index 73c2fb65..00000000
--- a/src/Flipdish.Test/Model/MetafieldDefinitionRecommendationTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MetafieldDefinitionRecommendation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MetafieldDefinitionRecommendationTests
-    {
-        // TODO uncomment below to declare an instance variable for MetafieldDefinitionRecommendation
-        //private MetafieldDefinitionRecommendation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MetafieldDefinitionRecommendation
-            //instance = new MetafieldDefinitionRecommendation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MetafieldDefinitionRecommendation
-        /// </summary>
-        [Test]
-        public void MetafieldDefinitionRecommendationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MetafieldDefinitionRecommendation
-            //Assert.IsInstanceOfType<MetafieldDefinitionRecommendation> (instance, "variable 'instance' is a MetafieldDefinitionRecommendation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OwnerEntity'
-        /// </summary>
-        [Test]
-        public void OwnerEntityTest()
-        {
-            // TODO unit test for the property 'OwnerEntity'
-        }
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'ValueType'
-        /// </summary>
-        [Test]
-        public void ValueTypeTest()
-        {
-            // TODO unit test for the property 'ValueType'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Behaviors'
-        /// </summary>
-        [Test]
-        public void BehaviorsTest()
-        {
-            // TODO unit test for the property 'Behaviors'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MetafieldDefinitionTests.cs b/src/Flipdish.Test/Model/MetafieldDefinitionTests.cs
deleted file mode 100644
index 29b87923..00000000
--- a/src/Flipdish.Test/Model/MetafieldDefinitionTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MetafieldDefinition
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MetafieldDefinitionTests
-    {
-        // TODO uncomment below to declare an instance variable for MetafieldDefinition
-        //private MetafieldDefinition instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MetafieldDefinition
-            //instance = new MetafieldDefinition();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MetafieldDefinition
-        /// </summary>
-        [Test]
-        public void MetafieldDefinitionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MetafieldDefinition
-            //Assert.IsInstanceOfType<MetafieldDefinition> (instance, "variable 'instance' is a MetafieldDefinition");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OwnerEntity'
-        /// </summary>
-        [Test]
-        public void OwnerEntityTest()
-        {
-            // TODO unit test for the property 'OwnerEntity'
-        }
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'ValueType'
-        /// </summary>
-        [Test]
-        public void ValueTypeTest()
-        {
-            // TODO unit test for the property 'ValueType'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Behaviors'
-        /// </summary>
-        [Test]
-        public void BehaviorsTest()
-        {
-            // TODO unit test for the property 'Behaviors'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MetafieldTests.cs b/src/Flipdish.Test/Model/MetafieldTests.cs
deleted file mode 100644
index 1f4d5449..00000000
--- a/src/Flipdish.Test/Model/MetafieldTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Metafield
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MetafieldTests
-    {
-        // TODO uncomment below to declare an instance variable for Metafield
-        //private Metafield instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Metafield
-            //instance = new Metafield();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Metafield
-        /// </summary>
-        [Test]
-        public void MetafieldInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Metafield
-            //Assert.IsInstanceOfType<Metafield> (instance, "variable 'instance' is a Metafield");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MobileAppConfigTests.cs b/src/Flipdish.Test/Model/MobileAppConfigTests.cs
deleted file mode 100644
index 4d0c7519..00000000
--- a/src/Flipdish.Test/Model/MobileAppConfigTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MobileAppConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MobileAppConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for MobileAppConfig
-        //private MobileAppConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MobileAppConfig
-            //instance = new MobileAppConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MobileAppConfig
-        /// </summary>
-        [Test]
-        public void MobileAppConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MobileAppConfig
-            //Assert.IsInstanceOfType<MobileAppConfig> (instance, "variable 'instance' is a MobileAppConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AutoPublish'
-        /// </summary>
-        [Test]
-        public void AutoPublishTest()
-        {
-            // TODO unit test for the property 'AutoPublish'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MobileAppsDetailsTests.cs b/src/Flipdish.Test/Model/MobileAppsDetailsTests.cs
deleted file mode 100644
index b1bf37fb..00000000
--- a/src/Flipdish.Test/Model/MobileAppsDetailsTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MobileAppsDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MobileAppsDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for MobileAppsDetails
-        //private MobileAppsDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MobileAppsDetails
-            //instance = new MobileAppsDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MobileAppsDetails
-        /// </summary>
-        [Test]
-        public void MobileAppsDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MobileAppsDetails
-            //Assert.IsInstanceOfType<MobileAppsDetails> (instance, "variable 'instance' is a MobileAppsDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppName'
-        /// </summary>
-        [Test]
-        public void AppNameTest()
-        {
-            // TODO unit test for the property 'AppName'
-        }
-        /// <summary>
-        /// Test the property 'AppDescription'
-        /// </summary>
-        [Test]
-        public void AppDescriptionTest()
-        {
-            // TODO unit test for the property 'AppDescription'
-        }
-        /// <summary>
-        /// Test the property 'AppShortDescription'
-        /// </summary>
-        [Test]
-        public void AppShortDescriptionTest()
-        {
-            // TODO unit test for the property 'AppShortDescription'
-        }
-        /// <summary>
-        /// Test the property 'Keywords'
-        /// </summary>
-        [Test]
-        public void KeywordsTest()
-        {
-            // TODO unit test for the property 'Keywords'
-        }
-        /// <summary>
-        /// Test the property 'AppLogoUrl'
-        /// </summary>
-        [Test]
-        public void AppLogoUrlTest()
-        {
-            // TODO unit test for the property 'AppLogoUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MobileAppsImageTests.cs b/src/Flipdish.Test/Model/MobileAppsImageTests.cs
deleted file mode 100644
index ac09e64e..00000000
--- a/src/Flipdish.Test/Model/MobileAppsImageTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MobileAppsImage
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MobileAppsImageTests
-    {
-        // TODO uncomment below to declare an instance variable for MobileAppsImage
-        //private MobileAppsImage instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MobileAppsImage
-            //instance = new MobileAppsImage();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MobileAppsImage
-        /// </summary>
-        [Test]
-        public void MobileAppsImageInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MobileAppsImage
-            //Assert.IsInstanceOfType<MobileAppsImage> (instance, "variable 'instance' is a MobileAppsImage");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ImageUri'
-        /// </summary>
-        [Test]
-        public void ImageUriTest()
-        {
-            // TODO unit test for the property 'ImageUri'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MobileAppsStatisticsTests.cs b/src/Flipdish.Test/Model/MobileAppsStatisticsTests.cs
deleted file mode 100644
index 328bc73d..00000000
--- a/src/Flipdish.Test/Model/MobileAppsStatisticsTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MobileAppsStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MobileAppsStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for MobileAppsStatistics
-        //private MobileAppsStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MobileAppsStatistics
-            //instance = new MobileAppsStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MobileAppsStatistics
-        /// </summary>
-        [Test]
-        public void MobileAppsStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MobileAppsStatistics
-            //Assert.IsInstanceOfType<MobileAppsStatistics> (instance, "variable 'instance' is a MobileAppsStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'NumberDownload'
-        /// </summary>
-        [Test]
-        public void NumberDownloadTest()
-        {
-            // TODO unit test for the property 'NumberDownload'
-        }
-        /// <summary>
-        /// Test the property 'CurrentRate'
-        /// </summary>
-        [Test]
-        public void CurrentRateTest()
-        {
-            // TODO unit test for the property 'CurrentRate'
-        }
-        /// <summary>
-        /// Test the property 'CurrentVersion'
-        /// </summary>
-        [Test]
-        public void CurrentVersionTest()
-        {
-            // TODO unit test for the property 'CurrentVersion'
-        }
-        /// <summary>
-        /// Test the property 'PlayStoreLink'
-        /// </summary>
-        [Test]
-        public void PlayStoreLinkTest()
-        {
-            // TODO unit test for the property 'PlayStoreLink'
-        }
-        /// <summary>
-        /// Test the property 'AppBundleId'
-        /// </summary>
-        [Test]
-        public void AppBundleIdTest()
-        {
-            // TODO unit test for the property 'AppBundleId'
-        }
-        /// <summary>
-        /// Test the property 'LastUpdated'
-        /// </summary>
-        [Test]
-        public void LastUpdatedTest()
-        {
-            // TODO unit test for the property 'LastUpdated'
-        }
-        /// <summary>
-        /// Test the property 'Notes'
-        /// </summary>
-        [Test]
-        public void NotesTest()
-        {
-            // TODO unit test for the property 'Notes'
-        }
-        /// <summary>
-        /// Test the property 'Published'
-        /// </summary>
-        [Test]
-        public void PublishedTest()
-        {
-            // TODO unit test for the property 'Published'
-        }
-        /// <summary>
-        /// Test the property 'PlatformType'
-        /// </summary>
-        [Test]
-        public void PlatformTypeTest()
-        {
-            // TODO unit test for the property 'PlatformType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MobileAppsSubmissionDetailsTests.cs b/src/Flipdish.Test/Model/MobileAppsSubmissionDetailsTests.cs
deleted file mode 100644
index 880970e0..00000000
--- a/src/Flipdish.Test/Model/MobileAppsSubmissionDetailsTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MobileAppsSubmissionDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MobileAppsSubmissionDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for MobileAppsSubmissionDetails
-        //private MobileAppsSubmissionDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MobileAppsSubmissionDetails
-            //instance = new MobileAppsSubmissionDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MobileAppsSubmissionDetails
-        /// </summary>
-        [Test]
-        public void MobileAppsSubmissionDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MobileAppsSubmissionDetails
-            //Assert.IsInstanceOfType<MobileAppsSubmissionDetails> (instance, "variable 'instance' is a MobileAppsSubmissionDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppName'
-        /// </summary>
-        [Test]
-        public void AppNameTest()
-        {
-            // TODO unit test for the property 'AppName'
-        }
-        /// <summary>
-        /// Test the property 'AppDescription'
-        /// </summary>
-        [Test]
-        public void AppDescriptionTest()
-        {
-            // TODO unit test for the property 'AppDescription'
-        }
-        /// <summary>
-        /// Test the property 'AppShortDescription'
-        /// </summary>
-        [Test]
-        public void AppShortDescriptionTest()
-        {
-            // TODO unit test for the property 'AppShortDescription'
-        }
-        /// <summary>
-        /// Test the property 'Keywords'
-        /// </summary>
-        [Test]
-        public void KeywordsTest()
-        {
-            // TODO unit test for the property 'Keywords'
-        }
-        /// <summary>
-        /// Test the property 'AppLogoUrl'
-        /// </summary>
-        [Test]
-        public void AppLogoUrlTest()
-        {
-            // TODO unit test for the property 'AppLogoUrl'
-        }
-        /// <summary>
-        /// Test the property 'AutoPublish'
-        /// </summary>
-        [Test]
-        public void AutoPublishTest()
-        {
-            // TODO unit test for the property 'AutoPublish'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MobileAppsSubmissionStatusTests.cs b/src/Flipdish.Test/Model/MobileAppsSubmissionStatusTests.cs
deleted file mode 100644
index 6f75ccf5..00000000
--- a/src/Flipdish.Test/Model/MobileAppsSubmissionStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MobileAppsSubmissionStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MobileAppsSubmissionStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for MobileAppsSubmissionStatus
-        //private MobileAppsSubmissionStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MobileAppsSubmissionStatus
-            //instance = new MobileAppsSubmissionStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MobileAppsSubmissionStatus
-        /// </summary>
-        [Test]
-        public void MobileAppsSubmissionStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MobileAppsSubmissionStatus
-            //Assert.IsInstanceOfType<MobileAppsSubmissionStatus> (instance, "variable 'instance' is a MobileAppsSubmissionStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/MobileAppsSubmissionTests.cs b/src/Flipdish.Test/Model/MobileAppsSubmissionTests.cs
deleted file mode 100644
index 94c83d5d..00000000
--- a/src/Flipdish.Test/Model/MobileAppsSubmissionTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing MobileAppsSubmission
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class MobileAppsSubmissionTests
-    {
-        // TODO uncomment below to declare an instance variable for MobileAppsSubmission
-        //private MobileAppsSubmission instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of MobileAppsSubmission
-            //instance = new MobileAppsSubmission();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of MobileAppsSubmission
-        /// </summary>
-        [Test]
-        public void MobileAppsSubmissionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" MobileAppsSubmission
-            //Assert.IsInstanceOfType<MobileAppsSubmission> (instance, "variable 'instance' is a MobileAppsSubmission");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppName'
-        /// </summary>
-        [Test]
-        public void AppNameTest()
-        {
-            // TODO unit test for the property 'AppName'
-        }
-        /// <summary>
-        /// Test the property 'AppDescription'
-        /// </summary>
-        [Test]
-        public void AppDescriptionTest()
-        {
-            // TODO unit test for the property 'AppDescription'
-        }
-        /// <summary>
-        /// Test the property 'AppShortDescription'
-        /// </summary>
-        [Test]
-        public void AppShortDescriptionTest()
-        {
-            // TODO unit test for the property 'AppShortDescription'
-        }
-        /// <summary>
-        /// Test the property 'Keywords'
-        /// </summary>
-        [Test]
-        public void KeywordsTest()
-        {
-            // TODO unit test for the property 'Keywords'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ModelBaseTests.cs b/src/Flipdish.Test/Model/ModelBaseTests.cs
deleted file mode 100644
index 3c25302b..00000000
--- a/src/Flipdish.Test/Model/ModelBaseTests.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ModelBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ModelBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for ModelBase
-        //private ModelBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ModelBase
-            //instance = new ModelBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ModelBase
-        /// </summary>
-        [Test]
-        public void ModelBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ModelBase
-            //Assert.IsInstanceOfType<ModelBase> (instance, "variable 'instance' is a ModelBase");
-        }
-
-
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ModifierGroupSubProductTests.cs b/src/Flipdish.Test/Model/ModifierGroupSubProductTests.cs
deleted file mode 100644
index 215ba874..00000000
--- a/src/Flipdish.Test/Model/ModifierGroupSubProductTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ModifierGroupSubProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ModifierGroupSubProductTests
-    {
-        // TODO uncomment below to declare an instance variable for ModifierGroupSubProduct
-        //private ModifierGroupSubProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ModifierGroupSubProduct
-            //instance = new ModifierGroupSubProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ModifierGroupSubProduct
-        /// </summary>
-        [Test]
-        public void ModifierGroupSubProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ModifierGroupSubProduct
-            //Assert.IsInstanceOfType<ModifierGroupSubProduct> (instance, "variable 'instance' is a ModifierGroupSubProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'preselectedQuantity'
-        /// </summary>
-        [Test]
-        public void preselectedQuantityTest()
-        {
-            // TODO unit test for the property 'preselectedQuantity'
-        }
-        /// <summary>
-        /// Test the property 'productId'
-        /// </summary>
-        [Test]
-        public void productIdTest()
-        {
-            // TODO unit test for the property 'productId'
-        }
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ModifierGroupTests.cs b/src/Flipdish.Test/Model/ModifierGroupTests.cs
deleted file mode 100644
index 8899ccfe..00000000
--- a/src/Flipdish.Test/Model/ModifierGroupTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ModifierGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ModifierGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for ModifierGroup
-        //private ModifierGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ModifierGroup
-            //instance = new ModifierGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ModifierGroup
-        /// </summary>
-        [Test]
-        public void ModifierGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ModifierGroup
-            //Assert.IsInstanceOfType<ModifierGroup> (instance, "variable 'instance' is a ModifierGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ModifierTests.cs b/src/Flipdish.Test/Model/ModifierTests.cs
deleted file mode 100644
index 97a522cd..00000000
--- a/src/Flipdish.Test/Model/ModifierTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Modifier
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ModifierTests
-    {
-        // TODO uncomment below to declare an instance variable for Modifier
-        //private Modifier instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Modifier
-            //instance = new Modifier();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Modifier
-        /// </summary>
-        [Test]
-        public void ModifierInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Modifier
-            //Assert.IsInstanceOfType<Modifier> (instance, "variable 'instance' is a Modifier");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/NextStatusWithOrderTypeTests.cs b/src/Flipdish.Test/Model/NextStatusWithOrderTypeTests.cs
deleted file mode 100644
index cfcc9694..00000000
--- a/src/Flipdish.Test/Model/NextStatusWithOrderTypeTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing NextStatusWithOrderType
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class NextStatusWithOrderTypeTests
-    {
-        // TODO uncomment below to declare an instance variable for NextStatusWithOrderType
-        //private NextStatusWithOrderType instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of NextStatusWithOrderType
-            //instance = new NextStatusWithOrderType();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of NextStatusWithOrderType
-        /// </summary>
-        [Test]
-        public void NextStatusWithOrderTypeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" NextStatusWithOrderType
-            //Assert.IsInstanceOfType<NextStatusWithOrderType> (instance, "variable 'instance' is a NextStatusWithOrderType");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderType'
-        /// </summary>
-        [Test]
-        public void OrderTypeTest()
-        {
-            // TODO unit test for the property 'OrderType'
-        }
-        /// <summary>
-        /// Test the property 'NextStatus'
-        /// </summary>
-        [Test]
-        public void NextStatusTest()
-        {
-            // TODO unit test for the property 'NextStatus'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OAuthAppTests.cs b/src/Flipdish.Test/Model/OAuthAppTests.cs
deleted file mode 100644
index 3f17904c..00000000
--- a/src/Flipdish.Test/Model/OAuthAppTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OAuthApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OAuthAppTests
-    {
-        // TODO uncomment below to declare an instance variable for OAuthApp
-        //private OAuthApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OAuthApp
-            //instance = new OAuthApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OAuthApp
-        /// </summary>
-        [Test]
-        public void OAuthAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OAuthApp
-            //Assert.IsInstanceOfType<OAuthApp> (instance, "variable 'instance' is a OAuthApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OauthAppId'
-        /// </summary>
-        [Test]
-        public void OauthAppIdTest()
-        {
-            // TODO unit test for the property 'OauthAppId'
-        }
-        /// <summary>
-        /// Test the property 'OauthAppName'
-        /// </summary>
-        [Test]
-        public void OauthAppNameTest()
-        {
-            // TODO unit test for the property 'OauthAppName'
-        }
-        /// <summary>
-        /// Test the property 'OwnerUserId'
-        /// </summary>
-        [Test]
-        public void OwnerUserIdTest()
-        {
-            // TODO unit test for the property 'OwnerUserId'
-        }
-        /// <summary>
-        /// Test the property 'LogoUri'
-        /// </summary>
-        [Test]
-        public void LogoUriTest()
-        {
-            // TODO unit test for the property 'LogoUri'
-        }
-        /// <summary>
-        /// Test the property 'Flow'
-        /// </summary>
-        [Test]
-        public void FlowTest()
-        {
-            // TODO unit test for the property 'Flow'
-        }
-        /// <summary>
-        /// Test the property 'RefreshTokenUsage'
-        /// </summary>
-        [Test]
-        public void RefreshTokenUsageTest()
-        {
-            // TODO unit test for the property 'RefreshTokenUsage'
-        }
-        /// <summary>
-        /// Test the property 'AccessTokenLifetime'
-        /// </summary>
-        [Test]
-        public void AccessTokenLifetimeTest()
-        {
-            // TODO unit test for the property 'AccessTokenLifetime'
-        }
-        /// <summary>
-        /// Test the property 'AbsoluteRefreshTokenLifetime'
-        /// </summary>
-        [Test]
-        public void AbsoluteRefreshTokenLifetimeTest()
-        {
-            // TODO unit test for the property 'AbsoluteRefreshTokenLifetime'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OAuthTokenModelTests.cs b/src/Flipdish.Test/Model/OAuthTokenModelTests.cs
deleted file mode 100644
index 5deb13db..00000000
--- a/src/Flipdish.Test/Model/OAuthTokenModelTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OAuthTokenModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OAuthTokenModelTests
-    {
-        // TODO uncomment below to declare an instance variable for OAuthTokenModel
-        //private OAuthTokenModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OAuthTokenModel
-            //instance = new OAuthTokenModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OAuthTokenModel
-        /// </summary>
-        [Test]
-        public void OAuthTokenModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OAuthTokenModel
-            //Assert.IsInstanceOfType<OAuthTokenModel> (instance, "variable 'instance' is a OAuthTokenModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'TokenType'
-        /// </summary>
-        [Test]
-        public void TokenTypeTest()
-        {
-            // TODO unit test for the property 'TokenType'
-        }
-        /// <summary>
-        /// Test the property 'SubjectId'
-        /// </summary>
-        [Test]
-        public void SubjectIdTest()
-        {
-            // TODO unit test for the property 'SubjectId'
-        }
-        /// <summary>
-        /// Test the property 'ClientId'
-        /// </summary>
-        [Test]
-        public void ClientIdTest()
-        {
-            // TODO unit test for the property 'ClientId'
-        }
-        /// <summary>
-        /// Test the property 'Expiry'
-        /// </summary>
-        [Test]
-        public void ExpiryTest()
-        {
-            // TODO unit test for the property 'Expiry'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OauthClientRedirectUriTests.cs b/src/Flipdish.Test/Model/OauthClientRedirectUriTests.cs
deleted file mode 100644
index 128468a7..00000000
--- a/src/Flipdish.Test/Model/OauthClientRedirectUriTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OauthClientRedirectUri
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OauthClientRedirectUriTests
-    {
-        // TODO uncomment below to declare an instance variable for OauthClientRedirectUri
-        //private OauthClientRedirectUri instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OauthClientRedirectUri
-            //instance = new OauthClientRedirectUri();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OauthClientRedirectUri
-        /// </summary>
-        [Test]
-        public void OauthClientRedirectUriInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OauthClientRedirectUri
-            //Assert.IsInstanceOfType<OauthClientRedirectUri> (instance, "variable 'instance' is a OauthClientRedirectUri");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Uri'
-        /// </summary>
-        [Test]
-        public void UriTest()
-        {
-            // TODO unit test for the property 'Uri'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ObjectDisplayOrderTests.cs b/src/Flipdish.Test/Model/ObjectDisplayOrderTests.cs
deleted file mode 100644
index b54ca385..00000000
--- a/src/Flipdish.Test/Model/ObjectDisplayOrderTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ObjectDisplayOrder
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ObjectDisplayOrderTests
-    {
-        // TODO uncomment below to declare an instance variable for ObjectDisplayOrder
-        //private ObjectDisplayOrder instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ObjectDisplayOrder
-            //instance = new ObjectDisplayOrder();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ObjectDisplayOrder
-        /// </summary>
-        [Test]
-        public void ObjectDisplayOrderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ObjectDisplayOrder
-            //Assert.IsInstanceOfType<ObjectDisplayOrder> (instance, "variable 'instance' is a ObjectDisplayOrder");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'DisplayOrder'
-        /// </summary>
-        [Test]
-        public void DisplayOrderTest()
-        {
-            // TODO unit test for the property 'DisplayOrder'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OnboardingConfigUpdateTests.cs b/src/Flipdish.Test/Model/OnboardingConfigUpdateTests.cs
deleted file mode 100644
index a1790fe0..00000000
--- a/src/Flipdish.Test/Model/OnboardingConfigUpdateTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OnboardingConfigUpdate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OnboardingConfigUpdateTests
-    {
-        // TODO uncomment below to declare an instance variable for OnboardingConfigUpdate
-        //private OnboardingConfigUpdate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OnboardingConfigUpdate
-            //instance = new OnboardingConfigUpdate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OnboardingConfigUpdate
-        /// </summary>
-        [Test]
-        public void OnboardingConfigUpdateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OnboardingConfigUpdate
-            //Assert.IsInstanceOfType<OnboardingConfigUpdate> (instance, "variable 'instance' is a OnboardingConfigUpdate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OnboardingItemUpdateTests.cs b/src/Flipdish.Test/Model/OnboardingItemUpdateTests.cs
deleted file mode 100644
index 8b60ec4e..00000000
--- a/src/Flipdish.Test/Model/OnboardingItemUpdateTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OnboardingItemUpdate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OnboardingItemUpdateTests
-    {
-        // TODO uncomment below to declare an instance variable for OnboardingItemUpdate
-        //private OnboardingItemUpdate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OnboardingItemUpdate
-            //instance = new OnboardingItemUpdate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OnboardingItemUpdate
-        /// </summary>
-        [Test]
-        public void OnboardingItemUpdateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OnboardingItemUpdate
-            //Assert.IsInstanceOfType<OnboardingItemUpdate> (instance, "variable 'instance' is a OnboardingItemUpdate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderAcceptedEventTests.cs b/src/Flipdish.Test/Model/OrderAcceptedEventTests.cs
deleted file mode 100644
index 7103a213..00000000
--- a/src/Flipdish.Test/Model/OrderAcceptedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderAcceptedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderAcceptedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderAcceptedEvent
-        //private OrderAcceptedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderAcceptedEvent
-            //instance = new OrderAcceptedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderAcceptedEvent
-        /// </summary>
-        [Test]
-        public void OrderAcceptedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderAcceptedEvent
-            //Assert.IsInstanceOfType<OrderAcceptedEvent> (instance, "variable 'instance' is a OrderAcceptedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'OrderAcceptedTime'
-        /// </summary>
-        [Test]
-        public void OrderAcceptedTimeTest()
-        {
-            // TODO unit test for the property 'OrderAcceptedTime'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderBatchItemTests.cs b/src/Flipdish.Test/Model/OrderBatchItemTests.cs
deleted file mode 100644
index a963bb3a..00000000
--- a/src/Flipdish.Test/Model/OrderBatchItemTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderBatchItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderBatchItemTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderBatchItem
-        //private OrderBatchItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderBatchItem
-            //instance = new OrderBatchItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderBatchItem
-        /// </summary>
-        [Test]
-        public void OrderBatchItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderBatchItem
-            //Assert.IsInstanceOfType<OrderBatchItem> (instance, "variable 'instance' is a OrderBatchItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BatchId'
-        /// </summary>
-        [Test]
-        public void BatchIdTest()
-        {
-            // TODO unit test for the property 'BatchId'
-        }
-        /// <summary>
-        /// Test the property 'CreatedAt'
-        /// </summary>
-        [Test]
-        public void CreatedAtTest()
-        {
-            // TODO unit test for the property 'CreatedAt'
-        }
-        /// <summary>
-        /// Test the property 'IsPublished'
-        /// </summary>
-        [Test]
-        public void IsPublishedTest()
-        {
-            // TODO unit test for the property 'IsPublished'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderBatchTests.cs b/src/Flipdish.Test/Model/OrderBatchTests.cs
deleted file mode 100644
index b43d07ed..00000000
--- a/src/Flipdish.Test/Model/OrderBatchTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderBatch
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderBatchTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderBatch
-        //private OrderBatch instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderBatch
-            //instance = new OrderBatch();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderBatch
-        /// </summary>
-        [Test]
-        public void OrderBatchInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderBatch
-            //Assert.IsInstanceOfType<OrderBatch> (instance, "variable 'instance' is a OrderBatch");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'DisplayCode'
-        /// </summary>
-        [Test]
-        public void DisplayCodeTest()
-        {
-            // TODO unit test for the property 'DisplayCode'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'IsPublished'
-        /// </summary>
-        [Test]
-        public void IsPublishedTest()
-        {
-            // TODO unit test for the property 'IsPublished'
-        }
-        /// <summary>
-        /// Test the property 'OrderIds'
-        /// </summary>
-        [Test]
-        public void OrderIdsTest()
-        {
-            // TODO unit test for the property 'OrderIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderBatchingConfigurationTests.cs b/src/Flipdish.Test/Model/OrderBatchingConfigurationTests.cs
deleted file mode 100644
index 68d725ff..00000000
--- a/src/Flipdish.Test/Model/OrderBatchingConfigurationTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderBatchingConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderBatchingConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderBatchingConfiguration
-        //private OrderBatchingConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderBatchingConfiguration
-            //instance = new OrderBatchingConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderBatchingConfiguration
-        /// </summary>
-        [Test]
-        public void OrderBatchingConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderBatchingConfiguration
-            //Assert.IsInstanceOfType<OrderBatchingConfiguration> (instance, "variable 'instance' is a OrderBatchingConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BatchIntervalInMinutes'
-        /// </summary>
-        [Test]
-        public void BatchIntervalInMinutesTest()
-        {
-            // TODO unit test for the property 'BatchIntervalInMinutes'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderCapacityConfigUpdatedEventTests.cs b/src/Flipdish.Test/Model/OrderCapacityConfigUpdatedEventTests.cs
deleted file mode 100644
index dd77bcee..00000000
--- a/src/Flipdish.Test/Model/OrderCapacityConfigUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderCapacityConfigUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderCapacityConfigUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderCapacityConfigUpdatedEvent
-        //private OrderCapacityConfigUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderCapacityConfigUpdatedEvent
-            //instance = new OrderCapacityConfigUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderCapacityConfigUpdatedEvent
-        /// </summary>
-        [Test]
-        public void OrderCapacityConfigUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderCapacityConfigUpdatedEvent
-            //Assert.IsInstanceOfType<OrderCapacityConfigUpdatedEvent> (instance, "variable 'instance' is a OrderCapacityConfigUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'OrderCapacityConfig'
-        /// </summary>
-        [Test]
-        public void OrderCapacityConfigTest()
-        {
-            // TODO unit test for the property 'OrderCapacityConfig'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderCreatedEventTests.cs b/src/Flipdish.Test/Model/OrderCreatedEventTests.cs
deleted file mode 100644
index a68d26e1..00000000
--- a/src/Flipdish.Test/Model/OrderCreatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderCreatedEvent
-        //private OrderCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderCreatedEvent
-            //instance = new OrderCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderCreatedEvent
-        /// </summary>
-        [Test]
-        public void OrderCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderCreatedEvent
-            //Assert.IsInstanceOfType<OrderCreatedEvent> (instance, "variable 'instance' is a OrderCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'OrderCreatedTime'
-        /// </summary>
-        [Test]
-        public void OrderCreatedTimeTest()
-        {
-            // TODO unit test for the property 'OrderCreatedTime'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderCustomerTrackingCreatedEventTests.cs b/src/Flipdish.Test/Model/OrderCustomerTrackingCreatedEventTests.cs
deleted file mode 100644
index 4fa89619..00000000
--- a/src/Flipdish.Test/Model/OrderCustomerTrackingCreatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderCustomerTrackingCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderCustomerTrackingCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderCustomerTrackingCreatedEvent
-        //private OrderCustomerTrackingCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderCustomerTrackingCreatedEvent
-            //instance = new OrderCustomerTrackingCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderCustomerTrackingCreatedEvent
-        /// </summary>
-        [Test]
-        public void OrderCustomerTrackingCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderCustomerTrackingCreatedEvent
-            //Assert.IsInstanceOfType<OrderCustomerTrackingCreatedEvent> (instance, "variable 'instance' is a OrderCustomerTrackingCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderDeliveryInformationBaseTests.cs b/src/Flipdish.Test/Model/OrderDeliveryInformationBaseTests.cs
deleted file mode 100644
index 0157f4f0..00000000
--- a/src/Flipdish.Test/Model/OrderDeliveryInformationBaseTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderDeliveryInformationBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderDeliveryInformationBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderDeliveryInformationBase
-        //private OrderDeliveryInformationBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderDeliveryInformationBase
-            //instance = new OrderDeliveryInformationBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderDeliveryInformationBase
-        /// </summary>
-        [Test]
-        public void OrderDeliveryInformationBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderDeliveryInformationBase
-            //Assert.IsInstanceOfType<OrderDeliveryInformationBase> (instance, "variable 'instance' is a OrderDeliveryInformationBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ExternalReferenceId'
-        /// </summary>
-        [Test]
-        public void ExternalReferenceIdTest()
-        {
-            // TODO unit test for the property 'ExternalReferenceId'
-        }
-        /// <summary>
-        /// Test the property 'TrackUrl'
-        /// </summary>
-        [Test]
-        public void TrackUrlTest()
-        {
-            // TODO unit test for the property 'TrackUrl'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryStatusNotes'
-        /// </summary>
-        [Test]
-        public void DeliveryStatusNotesTest()
-        {
-            // TODO unit test for the property 'DeliveryStatusNotes'
-        }
-        /// <summary>
-        /// Test the property 'ErrorMessage'
-        /// </summary>
-        [Test]
-        public void ErrorMessageTest()
-        {
-            // TODO unit test for the property 'ErrorMessage'
-        }
-        /// <summary>
-        /// Test the property 'IntegrationCode'
-        /// </summary>
-        [Test]
-        public void IntegrationCodeTest()
-        {
-            // TODO unit test for the property 'IntegrationCode'
-        }
-        /// <summary>
-        /// Test the property 'IntegrationName'
-        /// </summary>
-        [Test]
-        public void IntegrationNameTest()
-        {
-            // TODO unit test for the property 'IntegrationName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderDeliveryInformationTests.cs b/src/Flipdish.Test/Model/OrderDeliveryInformationTests.cs
deleted file mode 100644
index c3be0430..00000000
--- a/src/Flipdish.Test/Model/OrderDeliveryInformationTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderDeliveryInformation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderDeliveryInformationTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderDeliveryInformation
-        //private OrderDeliveryInformation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderDeliveryInformation
-            //instance = new OrderDeliveryInformation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderDeliveryInformation
-        /// </summary>
-        [Test]
-        public void OrderDeliveryInformationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderDeliveryInformation
-            //Assert.IsInstanceOfType<OrderDeliveryInformation> (instance, "variable 'instance' is a OrderDeliveryInformation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'ExternalReferenceId'
-        /// </summary>
-        [Test]
-        public void ExternalReferenceIdTest()
-        {
-            // TODO unit test for the property 'ExternalReferenceId'
-        }
-        /// <summary>
-        /// Test the property 'TrackUrl'
-        /// </summary>
-        [Test]
-        public void TrackUrlTest()
-        {
-            // TODO unit test for the property 'TrackUrl'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryStatusNotes'
-        /// </summary>
-        [Test]
-        public void DeliveryStatusNotesTest()
-        {
-            // TODO unit test for the property 'DeliveryStatusNotes'
-        }
-        /// <summary>
-        /// Test the property 'ErrorMessage'
-        /// </summary>
-        [Test]
-        public void ErrorMessageTest()
-        {
-            // TODO unit test for the property 'ErrorMessage'
-        }
-        /// <summary>
-        /// Test the property 'IntegrationCode'
-        /// </summary>
-        [Test]
-        public void IntegrationCodeTest()
-        {
-            // TODO unit test for the property 'IntegrationCode'
-        }
-        /// <summary>
-        /// Test the property 'IntegrationName'
-        /// </summary>
-        [Test]
-        public void IntegrationNameTest()
-        {
-            // TODO unit test for the property 'IntegrationName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderDeliveryTrackingStatusUpdatedEventTests.cs b/src/Flipdish.Test/Model/OrderDeliveryTrackingStatusUpdatedEventTests.cs
deleted file mode 100644
index bee5b3fc..00000000
--- a/src/Flipdish.Test/Model/OrderDeliveryTrackingStatusUpdatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderDeliveryTrackingStatusUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderDeliveryTrackingStatusUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderDeliveryTrackingStatusUpdatedEvent
-        //private OrderDeliveryTrackingStatusUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderDeliveryTrackingStatusUpdatedEvent
-            //instance = new OrderDeliveryTrackingStatusUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderDeliveryTrackingStatusUpdatedEvent
-        /// </summary>
-        [Test]
-        public void OrderDeliveryTrackingStatusUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderDeliveryTrackingStatusUpdatedEvent
-            //Assert.IsInstanceOfType<OrderDeliveryTrackingStatusUpdatedEvent> (instance, "variable 'instance' is a OrderDeliveryTrackingStatusUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderDispatchedEventTests.cs b/src/Flipdish.Test/Model/OrderDispatchedEventTests.cs
deleted file mode 100644
index c8cddd26..00000000
--- a/src/Flipdish.Test/Model/OrderDispatchedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderDispatchedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderDispatchedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderDispatchedEvent
-        //private OrderDispatchedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderDispatchedEvent
-            //instance = new OrderDispatchedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderDispatchedEvent
-        /// </summary>
-        [Test]
-        public void OrderDispatchedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderDispatchedEvent
-            //Assert.IsInstanceOfType<OrderDispatchedEvent> (instance, "variable 'instance' is a OrderDispatchedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'OrderDispatchedTime'
-        /// </summary>
-        [Test]
-        public void OrderDispatchedTimeTest()
-        {
-            // TODO unit test for the property 'OrderDispatchedTime'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderDropOffLocationTests.cs b/src/Flipdish.Test/Model/OrderDropOffLocationTests.cs
deleted file mode 100644
index f0e2811d..00000000
--- a/src/Flipdish.Test/Model/OrderDropOffLocationTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderDropOffLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderDropOffLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderDropOffLocation
-        //private OrderDropOffLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderDropOffLocation
-            //instance = new OrderDropOffLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderDropOffLocation
-        /// </summary>
-        [Test]
-        public void OrderDropOffLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderDropOffLocation
-            //Assert.IsInstanceOfType<OrderDropOffLocation> (instance, "variable 'instance' is a OrderDropOffLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'LocationName'
-        /// </summary>
-        [Test]
-        public void LocationNameTest()
-        {
-            // TODO unit test for the property 'LocationName'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaName'
-        /// </summary>
-        [Test]
-        public void LocationAreaNameTest()
-        {
-            // TODO unit test for the property 'LocationAreaName'
-        }
-        /// <summary>
-        /// Test the property 'LocationId'
-        /// </summary>
-        [Test]
-        public void LocationIdTest()
-        {
-            // TODO unit test for the property 'LocationId'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaId'
-        /// </summary>
-        [Test]
-        public void LocationAreaIdTest()
-        {
-            // TODO unit test for the property 'LocationAreaId'
-        }
-        /// <summary>
-        /// Test the property 'ExternalLocationId'
-        /// </summary>
-        [Test]
-        public void ExternalLocationIdTest()
-        {
-            // TODO unit test for the property 'ExternalLocationId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderFulfillmentStatusBaseTests.cs b/src/Flipdish.Test/Model/OrderFulfillmentStatusBaseTests.cs
deleted file mode 100644
index 2fd0d079..00000000
--- a/src/Flipdish.Test/Model/OrderFulfillmentStatusBaseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderFulfillmentStatusBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderFulfillmentStatusBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderFulfillmentStatusBase
-        //private OrderFulfillmentStatusBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderFulfillmentStatusBase
-            //instance = new OrderFulfillmentStatusBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderFulfillmentStatusBase
-        /// </summary>
-        [Test]
-        public void OrderFulfillmentStatusBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderFulfillmentStatusBase
-            //Assert.IsInstanceOfType<OrderFulfillmentStatusBase> (instance, "variable 'instance' is a OrderFulfillmentStatusBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StatusId'
-        /// </summary>
-        [Test]
-        public void StatusIdTest()
-        {
-            // TODO unit test for the property 'StatusId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderFulfillmentStatusTests.cs b/src/Flipdish.Test/Model/OrderFulfillmentStatusTests.cs
deleted file mode 100644
index f1a1996b..00000000
--- a/src/Flipdish.Test/Model/OrderFulfillmentStatusTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderFulfillmentStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderFulfillmentStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderFulfillmentStatus
-        //private OrderFulfillmentStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderFulfillmentStatus
-            //instance = new OrderFulfillmentStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderFulfillmentStatus
-        /// </summary>
-        [Test]
-        public void OrderFulfillmentStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderFulfillmentStatus
-            //Assert.IsInstanceOfType<OrderFulfillmentStatus> (instance, "variable 'instance' is a OrderFulfillmentStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'StatusId'
-        /// </summary>
-        [Test]
-        public void StatusIdTest()
-        {
-            // TODO unit test for the property 'StatusId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderFulfillmentStatusUpdateTests.cs b/src/Flipdish.Test/Model/OrderFulfillmentStatusUpdateTests.cs
deleted file mode 100644
index 045b96d4..00000000
--- a/src/Flipdish.Test/Model/OrderFulfillmentStatusUpdateTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderFulfillmentStatusUpdate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderFulfillmentStatusUpdateTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderFulfillmentStatusUpdate
-        //private OrderFulfillmentStatusUpdate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderFulfillmentStatusUpdate
-            //instance = new OrderFulfillmentStatusUpdate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderFulfillmentStatusUpdate
-        /// </summary>
-        [Test]
-        public void OrderFulfillmentStatusUpdateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderFulfillmentStatusUpdate
-            //Assert.IsInstanceOfType<OrderFulfillmentStatusUpdate> (instance, "variable 'instance' is a OrderFulfillmentStatusUpdate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StatusId'
-        /// </summary>
-        [Test]
-        public void StatusIdTest()
-        {
-            // TODO unit test for the property 'StatusId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderFulfillmentStatusUpdatedEventTests.cs b/src/Flipdish.Test/Model/OrderFulfillmentStatusUpdatedEventTests.cs
deleted file mode 100644
index 76a1b503..00000000
--- a/src/Flipdish.Test/Model/OrderFulfillmentStatusUpdatedEventTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderFulfillmentStatusUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderFulfillmentStatusUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderFulfillmentStatusUpdatedEvent
-        //private OrderFulfillmentStatusUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderFulfillmentStatusUpdatedEvent
-            //instance = new OrderFulfillmentStatusUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderFulfillmentStatusUpdatedEvent
-        /// </summary>
-        [Test]
-        public void OrderFulfillmentStatusUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderFulfillmentStatusUpdatedEvent
-            //Assert.IsInstanceOfType<OrderFulfillmentStatusUpdatedEvent> (instance, "variable 'instance' is a OrderFulfillmentStatusUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'StatusName'
-        /// </summary>
-        [Test]
-        public void StatusNameTest()
-        {
-            // TODO unit test for the property 'StatusName'
-        }
-        /// <summary>
-        /// Test the property 'StatusId'
-        /// </summary>
-        [Test]
-        public void StatusIdTest()
-        {
-            // TODO unit test for the property 'StatusId'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderFulfillmentStatusWithConfigurationActionsTests.cs b/src/Flipdish.Test/Model/OrderFulfillmentStatusWithConfigurationActionsTests.cs
deleted file mode 100644
index b717d6f5..00000000
--- a/src/Flipdish.Test/Model/OrderFulfillmentStatusWithConfigurationActionsTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderFulfillmentStatusWithConfigurationActions
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderFulfillmentStatusWithConfigurationActionsTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderFulfillmentStatusWithConfigurationActions
-        //private OrderFulfillmentStatusWithConfigurationActions instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderFulfillmentStatusWithConfigurationActions
-            //instance = new OrderFulfillmentStatusWithConfigurationActions();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderFulfillmentStatusWithConfigurationActions
-        /// </summary>
-        [Test]
-        public void OrderFulfillmentStatusWithConfigurationActionsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderFulfillmentStatusWithConfigurationActions
-            //Assert.IsInstanceOfType<OrderFulfillmentStatusWithConfigurationActions> (instance, "variable 'instance' is a OrderFulfillmentStatusWithConfigurationActions");
-        }
-
-
-        /// <summary>
-        /// Test the property 'DefaultNextStatus'
-        /// </summary>
-        [Test]
-        public void DefaultNextStatusTest()
-        {
-            // TODO unit test for the property 'DefaultNextStatus'
-        }
-        /// <summary>
-        /// Test the property 'NextStatuses'
-        /// </summary>
-        [Test]
-        public void NextStatusesTest()
-        {
-            // TODO unit test for the property 'NextStatuses'
-        }
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'StatusId'
-        /// </summary>
-        [Test]
-        public void StatusIdTest()
-        {
-            // TODO unit test for the property 'StatusId'
-        }
-        /// <summary>
-        /// Test the property 'StatusName'
-        /// </summary>
-        [Test]
-        public void StatusNameTest()
-        {
-            // TODO unit test for the property 'StatusName'
-        }
-        /// <summary>
-        /// Test the property 'Icon'
-        /// </summary>
-        [Test]
-        public void IconTest()
-        {
-            // TODO unit test for the property 'Icon'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderIdAndSequenceNumberTests.cs b/src/Flipdish.Test/Model/OrderIdAndSequenceNumberTests.cs
deleted file mode 100644
index 65912b27..00000000
--- a/src/Flipdish.Test/Model/OrderIdAndSequenceNumberTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderIdAndSequenceNumber
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderIdAndSequenceNumberTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderIdAndSequenceNumber
-        //private OrderIdAndSequenceNumber instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderIdAndSequenceNumber
-            //instance = new OrderIdAndSequenceNumber();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderIdAndSequenceNumber
-        /// </summary>
-        [Test]
-        public void OrderIdAndSequenceNumberInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderIdAndSequenceNumber
-            //Assert.IsInstanceOfType<OrderIdAndSequenceNumber> (instance, "variable 'instance' is a OrderIdAndSequenceNumber");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'Sequence'
-        /// </summary>
-        [Test]
-        public void SequenceTest()
-        {
-            // TODO unit test for the property 'Sequence'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderIngestSubmitOrderRequestTests.cs b/src/Flipdish.Test/Model/OrderIngestSubmitOrderRequestTests.cs
deleted file mode 100644
index 68a4fe9b..00000000
--- a/src/Flipdish.Test/Model/OrderIngestSubmitOrderRequestTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderIngestSubmitOrderRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderIngestSubmitOrderRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderIngestSubmitOrderRequest
-        //private OrderIngestSubmitOrderRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderIngestSubmitOrderRequest
-            //instance = new OrderIngestSubmitOrderRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderIngestSubmitOrderRequest
-        /// </summary>
-        [Test]
-        public void OrderIngestSubmitOrderRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderIngestSubmitOrderRequest
-            //Assert.IsInstanceOfType<OrderIngestSubmitOrderRequest> (instance, "variable 'instance' is a OrderIngestSubmitOrderRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppType'
-        /// </summary>
-        [Test]
-        public void AppTypeTest()
-        {
-            // TODO unit test for the property 'AppType'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'CurrencyCode'
-        /// </summary>
-        [Test]
-        public void CurrencyCodeTest()
-        {
-            // TODO unit test for the property 'CurrencyCode'
-        }
-        /// <summary>
-        /// Test the property 'Cart'
-        /// </summary>
-        [Test]
-        public void CartTest()
-        {
-            // TODO unit test for the property 'Cart'
-        }
-        /// <summary>
-        /// Test the property 'FulfillmentInfo'
-        /// </summary>
-        [Test]
-        public void FulfillmentInfoTest()
-        {
-            // TODO unit test for the property 'FulfillmentInfo'
-        }
-        /// <summary>
-        /// Test the property 'ExternalOrderId'
-        /// </summary>
-        [Test]
-        public void ExternalOrderIdTest()
-        {
-            // TODO unit test for the property 'ExternalOrderId'
-        }
-        /// <summary>
-        /// Test the property 'ExternalPublicOrderId'
-        /// </summary>
-        [Test]
-        public void ExternalPublicOrderIdTest()
-        {
-            // TODO unit test for the property 'ExternalPublicOrderId'
-        }
-        /// <summary>
-        /// Test the property 'OrderDateUtc'
-        /// </summary>
-        [Test]
-        public void OrderDateUtcTest()
-        {
-            // TODO unit test for the property 'OrderDateUtc'
-        }
-        /// <summary>
-        /// Test the property 'PaymentInfo'
-        /// </summary>
-        [Test]
-        public void PaymentInfoTest()
-        {
-            // TODO unit test for the property 'PaymentInfo'
-        }
-        /// <summary>
-        /// Test the property 'Contact'
-        /// </summary>
-        [Test]
-        public void ContactTest()
-        {
-            // TODO unit test for the property 'Contact'
-        }
-        /// <summary>
-        /// Test the property 'TipAmount'
-        /// </summary>
-        [Test]
-        public void TipAmountTest()
-        {
-            // TODO unit test for the property 'TipAmount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderIngestSubmitOrderResponseTests.cs b/src/Flipdish.Test/Model/OrderIngestSubmitOrderResponseTests.cs
deleted file mode 100644
index 15e62b84..00000000
--- a/src/Flipdish.Test/Model/OrderIngestSubmitOrderResponseTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderIngestSubmitOrderResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderIngestSubmitOrderResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderIngestSubmitOrderResponse
-        //private OrderIngestSubmitOrderResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderIngestSubmitOrderResponse
-            //instance = new OrderIngestSubmitOrderResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderIngestSubmitOrderResponse
-        /// </summary>
-        [Test]
-        public void OrderIngestSubmitOrderResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderIngestSubmitOrderResponse
-            //Assert.IsInstanceOfType<OrderIngestSubmitOrderResponse> (instance, "variable 'instance' is a OrderIngestSubmitOrderResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'ReceiptUrl'
-        /// </summary>
-        [Test]
-        public void ReceiptUrlTest()
-        {
-            // TODO unit test for the property 'ReceiptUrl'
-        }
-        /// <summary>
-        /// Test the property 'CurrencyCode'
-        /// </summary>
-        [Test]
-        public void CurrencyCodeTest()
-        {
-            // TODO unit test for the property 'CurrencyCode'
-        }
-        /// <summary>
-        /// Test the property 'TotalPrice'
-        /// </summary>
-        [Test]
-        public void TotalPriceTest()
-        {
-            // TODO unit test for the property 'TotalPrice'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryFee'
-        /// </summary>
-        [Test]
-        public void DeliveryFeeTest()
-        {
-            // TODO unit test for the property 'DeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'EstimatedDeliveryTime'
-        /// </summary>
-        [Test]
-        public void EstimatedDeliveryTimeTest()
-        {
-            // TODO unit test for the property 'EstimatedDeliveryTime'
-        }
-        /// <summary>
-        /// Test the property 'ExternalOrderId'
-        /// </summary>
-        [Test]
-        public void ExternalOrderIdTest()
-        {
-            // TODO unit test for the property 'ExternalOrderId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderItemOptionTests.cs b/src/Flipdish.Test/Model/OrderItemOptionTests.cs
deleted file mode 100644
index 1e416da4..00000000
--- a/src/Flipdish.Test/Model/OrderItemOptionTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderItemOption
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderItemOptionTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderItemOption
-        //private OrderItemOption instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderItemOption
-            //instance = new OrderItemOption();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderItemOption
-        /// </summary>
-        [Test]
-        public void OrderItemOptionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderItemOption
-            //Assert.IsInstanceOfType<OrderItemOption> (instance, "variable 'instance' is a OrderItemOption");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionPublicId'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionPublicIdTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionPublicId'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionId'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionIdTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionId'
-        }
-        /// <summary>
-        /// Test the property 'IsMasterOptionSetItem'
-        /// </summary>
-        [Test]
-        public void IsMasterOptionSetItemTest()
-        {
-            // TODO unit test for the property 'IsMasterOptionSetItem'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionDisplayOrder'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionDisplayOrderTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionDisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemOptionSetDisplayOrder'
-        /// </summary>
-        [Test]
-        public void MenuItemOptionSetDisplayOrderTest()
-        {
-            // TODO unit test for the property 'MenuItemOptionSetDisplayOrder'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderItemTests.cs b/src/Flipdish.Test/Model/OrderItemTests.cs
deleted file mode 100644
index 288ade6b..00000000
--- a/src/Flipdish.Test/Model/OrderItemTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderItemTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderItem
-        //private OrderItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderItem
-            //instance = new OrderItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderItem
-        /// </summary>
-        [Test]
-        public void OrderItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderItem
-            //Assert.IsInstanceOfType<OrderItem> (instance, "variable 'instance' is a OrderItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderItemOptions'
-        /// </summary>
-        [Test]
-        public void OrderItemOptionsTest()
-        {
-            // TODO unit test for the property 'OrderItemOptions'
-        }
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemPublicId'
-        /// </summary>
-        [Test]
-        public void MenuItemPublicIdTest()
-        {
-            // TODO unit test for the property 'MenuItemPublicId'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionName'
-        /// </summary>
-        [Test]
-        public void MenuSectionNameTest()
-        {
-            // TODO unit test for the property 'MenuSectionName'
-        }
-        /// <summary>
-        /// Test the property 'MenuSectionDisplayOrder'
-        /// </summary>
-        [Test]
-        public void MenuSectionDisplayOrderTest()
-        {
-            // TODO unit test for the property 'MenuSectionDisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'PriceIncludingOptionSetItems'
-        /// </summary>
-        [Test]
-        public void PriceIncludingOptionSetItemsTest()
-        {
-            // TODO unit test for the property 'PriceIncludingOptionSetItems'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemId'
-        /// </summary>
-        [Test]
-        public void MenuItemIdTest()
-        {
-            // TODO unit test for the property 'MenuItemId'
-        }
-        /// <summary>
-        /// Test the property 'MenuItemDisplayOrder'
-        /// </summary>
-        [Test]
-        public void MenuItemDisplayOrderTest()
-        {
-            // TODO unit test for the property 'MenuItemDisplayOrder'
-        }
-        /// <summary>
-        /// Test the property 'IsAvailable'
-        /// </summary>
-        [Test]
-        public void IsAvailableTest()
-        {
-            // TODO unit test for the property 'IsAvailable'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderPaymentInformationTests.cs b/src/Flipdish.Test/Model/OrderPaymentInformationTests.cs
deleted file mode 100644
index 8dd3ffeb..00000000
--- a/src/Flipdish.Test/Model/OrderPaymentInformationTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderPaymentInformation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderPaymentInformationTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderPaymentInformation
-        //private OrderPaymentInformation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderPaymentInformation
-            //instance = new OrderPaymentInformation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderPaymentInformation
-        /// </summary>
-        [Test]
-        public void OrderPaymentInformationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderPaymentInformation
-            //Assert.IsInstanceOfType<OrderPaymentInformation> (instance, "variable 'instance' is a OrderPaymentInformation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'PaymentRefundable'
-        /// </summary>
-        [Test]
-        public void PaymentRefundableTest()
-        {
-            // TODO unit test for the property 'PaymentRefundable'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderRatingUpdatedEventTests.cs b/src/Flipdish.Test/Model/OrderRatingUpdatedEventTests.cs
deleted file mode 100644
index ac22ba9b..00000000
--- a/src/Flipdish.Test/Model/OrderRatingUpdatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderRatingUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderRatingUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderRatingUpdatedEvent
-        //private OrderRatingUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderRatingUpdatedEvent
-            //instance = new OrderRatingUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderRatingUpdatedEvent
-        /// </summary>
-        [Test]
-        public void OrderRatingUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderRatingUpdatedEvent
-            //Assert.IsInstanceOfType<OrderRatingUpdatedEvent> (instance, "variable 'instance' is a OrderRatingUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Rating'
-        /// </summary>
-        [Test]
-        public void RatingTest()
-        {
-            // TODO unit test for the property 'Rating'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderRefundedEventTests.cs b/src/Flipdish.Test/Model/OrderRefundedEventTests.cs
deleted file mode 100644
index dbbad288..00000000
--- a/src/Flipdish.Test/Model/OrderRefundedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderRefundedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderRefundedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderRefundedEvent
-        //private OrderRefundedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderRefundedEvent
-            //instance = new OrderRefundedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderRefundedEvent
-        /// </summary>
-        [Test]
-        public void OrderRefundedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderRefundedEvent
-            //Assert.IsInstanceOfType<OrderRefundedEvent> (instance, "variable 'instance' is a OrderRefundedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'RefundedAmount'
-        /// </summary>
-        [Test]
-        public void RefundedAmountTest()
-        {
-            // TODO unit test for the property 'RefundedAmount'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderRejectedEventTests.cs b/src/Flipdish.Test/Model/OrderRejectedEventTests.cs
deleted file mode 100644
index 5431794d..00000000
--- a/src/Flipdish.Test/Model/OrderRejectedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderRejectedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderRejectedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderRejectedEvent
-        //private OrderRejectedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderRejectedEvent
-            //instance = new OrderRejectedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderRejectedEvent
-        /// </summary>
-        [Test]
-        public void OrderRejectedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderRejectedEvent
-            //Assert.IsInstanceOfType<OrderRejectedEvent> (instance, "variable 'instance' is a OrderRejectedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'OrderRejectedTime'
-        /// </summary>
-        [Test]
-        public void OrderRejectedTimeTest()
-        {
-            // TODO unit test for the property 'OrderRejectedTime'
-        }
-        /// <summary>
-        /// Test the property 'Reason'
-        /// </summary>
-        [Test]
-        public void ReasonTest()
-        {
-            // TODO unit test for the property 'Reason'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderSummaryTests.cs b/src/Flipdish.Test/Model/OrderSummaryTests.cs
deleted file mode 100644
index c1dee5f7..00000000
--- a/src/Flipdish.Test/Model/OrderSummaryTests.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderSummary
-        //private OrderSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderSummary
-            //instance = new OrderSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderSummary
-        /// </summary>
-        [Test]
-        public void OrderSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderSummary
-            //Assert.IsInstanceOfType<OrderSummary> (instance, "variable 'instance' is a OrderSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryType'
-        /// </summary>
-        [Test]
-        public void DeliveryTypeTest()
-        {
-            // TODO unit test for the property 'DeliveryType'
-        }
-        /// <summary>
-        /// Test the property 'PickupLocationType'
-        /// </summary>
-        [Test]
-        public void PickupLocationTypeTest()
-        {
-            // TODO unit test for the property 'PickupLocationType'
-        }
-        /// <summary>
-        /// Test the property 'TableServiceCatagory'
-        /// </summary>
-        [Test]
-        public void TableServiceCatagoryTest()
-        {
-            // TODO unit test for the property 'TableServiceCatagory'
-        }
-        /// <summary>
-        /// Test the property 'OrderState'
-        /// </summary>
-        [Test]
-        public void OrderStateTest()
-        {
-            // TODO unit test for the property 'OrderState'
-        }
-        /// <summary>
-        /// Test the property 'RequestedForTime'
-        /// </summary>
-        [Test]
-        public void RequestedForTimeTest()
-        {
-            // TODO unit test for the property 'RequestedForTime'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-        /// <summary>
-        /// Test the property 'StoreIanaTimeZone'
-        /// </summary>
-        [Test]
-        public void StoreIanaTimeZoneTest()
-        {
-            // TODO unit test for the property 'StoreIanaTimeZone'
-        }
-        /// <summary>
-        /// Test the property 'CustomerName'
-        /// </summary>
-        [Test]
-        public void CustomerNameTest()
-        {
-            // TODO unit test for the property 'CustomerName'
-        }
-        /// <summary>
-        /// Test the property 'CustomerPhoneNumber'
-        /// </summary>
-        [Test]
-        public void CustomerPhoneNumberTest()
-        {
-            // TODO unit test for the property 'CustomerPhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'Amount'
-        /// </summary>
-        [Test]
-        public void AmountTest()
-        {
-            // TODO unit test for the property 'Amount'
-        }
-        /// <summary>
-        /// Test the property 'RefundedAmount'
-        /// </summary>
-        [Test]
-        public void RefundedAmountTest()
-        {
-            // TODO unit test for the property 'RefundedAmount'
-        }
-        /// <summary>
-        /// Test the property 'PaymentAccountType'
-        /// </summary>
-        [Test]
-        public void PaymentAccountTypeTest()
-        {
-            // TODO unit test for the property 'PaymentAccountType'
-        }
-        /// <summary>
-        /// Test the property 'PaymentStatus'
-        /// </summary>
-        [Test]
-        public void PaymentStatusTest()
-        {
-            // TODO unit test for the property 'PaymentStatus'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'AppType'
-        /// </summary>
-        [Test]
-        public void AppTypeTest()
-        {
-            // TODO unit test for the property 'AppType'
-        }
-        /// <summary>
-        /// Test the property 'LocalOrderId'
-        /// </summary>
-        [Test]
-        public void LocalOrderIdTest()
-        {
-            // TODO unit test for the property 'LocalOrderId'
-        }
-        /// <summary>
-        /// Test the property 'DropOffLocationId'
-        /// </summary>
-        [Test]
-        public void DropOffLocationIdTest()
-        {
-            // TODO unit test for the property 'DropOffLocationId'
-        }
-        /// <summary>
-        /// Test the property 'DropOffLocation'
-        /// </summary>
-        [Test]
-        public void DropOffLocationTest()
-        {
-            // TODO unit test for the property 'DropOffLocation'
-        }
-        /// <summary>
-        /// Test the property 'AcceptedFor'
-        /// </summary>
-        [Test]
-        public void AcceptedForTest()
-        {
-            // TODO unit test for the property 'AcceptedFor'
-        }
-        /// <summary>
-        /// Test the property 'InFraudZone'
-        /// </summary>
-        [Test]
-        public void InFraudZoneTest()
-        {
-            // TODO unit test for the property 'InFraudZone'
-        }
-        /// <summary>
-        /// Test the property 'UnusualHighValueOrder'
-        /// </summary>
-        [Test]
-        public void UnusualHighValueOrderTest()
-        {
-            // TODO unit test for the property 'UnusualHighValueOrder'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderTerminalNotificationTests.cs b/src/Flipdish.Test/Model/OrderTerminalNotificationTests.cs
deleted file mode 100644
index 71f1b690..00000000
--- a/src/Flipdish.Test/Model/OrderTerminalNotificationTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderTerminalNotification
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderTerminalNotificationTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderTerminalNotification
-        //private OrderTerminalNotification instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderTerminalNotification
-            //instance = new OrderTerminalNotification();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderTerminalNotification
-        /// </summary>
-        [Test]
-        public void OrderTerminalNotificationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderTerminalNotification
-            //Assert.IsInstanceOfType<OrderTerminalNotification> (instance, "variable 'instance' is a OrderTerminalNotification");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Notification'
-        /// </summary>
-        [Test]
-        public void NotificationTest()
-        {
-            // TODO unit test for the property 'Notification'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'TerminalId'
-        /// </summary>
-        [Test]
-        public void TerminalIdTest()
-        {
-            // TODO unit test for the property 'TerminalId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderTests.cs b/src/Flipdish.Test/Model/OrderTests.cs
deleted file mode 100644
index 72b05794..00000000
--- a/src/Flipdish.Test/Model/OrderTests.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Order
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderTests
-    {
-        // TODO uncomment below to declare an instance variable for Order
-        //private Order instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Order
-            //instance = new Order();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Order
-        /// </summary>
-        [Test]
-        public void OrderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Order
-            //Assert.IsInstanceOfType<Order> (instance, "variable 'instance' is a Order");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Store'
-        /// </summary>
-        [Test]
-        public void StoreTest()
-        {
-            // TODO unit test for the property 'Store'
-        }
-        /// <summary>
-        /// Test the property 'Customer'
-        /// </summary>
-        [Test]
-        public void CustomerTest()
-        {
-            // TODO unit test for the property 'Customer'
-        }
-        /// <summary>
-        /// Test the property 'Voucher'
-        /// </summary>
-        [Test]
-        public void VoucherTest()
-        {
-            // TODO unit test for the property 'Voucher'
-        }
-        /// <summary>
-        /// Test the property 'Fees'
-        /// </summary>
-        [Test]
-        public void FeesTest()
-        {
-            // TODO unit test for the property 'Fees'
-        }
-        /// <summary>
-        /// Test the property 'OrderItems'
-        /// </summary>
-        [Test]
-        public void OrderItemsTest()
-        {
-            // TODO unit test for the property 'OrderItems'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryLocation'
-        /// </summary>
-        [Test]
-        public void DeliveryLocationTest()
-        {
-            // TODO unit test for the property 'DeliveryLocation'
-        }
-        /// <summary>
-        /// Test the property 'CustomerLocation'
-        /// </summary>
-        [Test]
-        public void CustomerLocationTest()
-        {
-            // TODO unit test for the property 'CustomerLocation'
-        }
-        /// <summary>
-        /// Test the property 'MaskedPhoneNumber'
-        /// </summary>
-        [Test]
-        public void MaskedPhoneNumberTest()
-        {
-            // TODO unit test for the property 'MaskedPhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'DropOffLocationId'
-        /// </summary>
-        [Test]
-        public void DropOffLocationIdTest()
-        {
-            // TODO unit test for the property 'DropOffLocationId'
-        }
-        /// <summary>
-        /// Test the property 'DropOffLocation'
-        /// </summary>
-        [Test]
-        public void DropOffLocationTest()
-        {
-            // TODO unit test for the property 'DropOffLocation'
-        }
-        /// <summary>
-        /// Test the property 'AcceptedFor'
-        /// </summary>
-        [Test]
-        public void AcceptedForTest()
-        {
-            // TODO unit test for the property 'AcceptedFor'
-        }
-        /// <summary>
-        /// Test the property 'InFraudZone'
-        /// </summary>
-        [Test]
-        public void InFraudZoneTest()
-        {
-            // TODO unit test for the property 'InFraudZone'
-        }
-        /// <summary>
-        /// Test the property 'UnusualHighValueOrder'
-        /// </summary>
-        [Test]
-        public void UnusualHighValueOrderTest()
-        {
-            // TODO unit test for the property 'UnusualHighValueOrder'
-        }
-        /// <summary>
-        /// Test the property 'RejectedByUserId'
-        /// </summary>
-        [Test]
-        public void RejectedByUserIdTest()
-        {
-            // TODO unit test for the property 'RejectedByUserId'
-        }
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'LocalOrderId'
-        /// </summary>
-        [Test]
-        public void LocalOrderIdTest()
-        {
-            // TODO unit test for the property 'LocalOrderId'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryType'
-        /// </summary>
-        [Test]
-        public void DeliveryTypeTest()
-        {
-            // TODO unit test for the property 'DeliveryType'
-        }
-        /// <summary>
-        /// Test the property 'PickupLocationType'
-        /// </summary>
-        [Test]
-        public void PickupLocationTypeTest()
-        {
-            // TODO unit test for the property 'PickupLocationType'
-        }
-        /// <summary>
-        /// Test the property 'TableServiceCatagory'
-        /// </summary>
-        [Test]
-        public void TableServiceCatagoryTest()
-        {
-            // TODO unit test for the property 'TableServiceCatagory'
-        }
-        /// <summary>
-        /// Test the property 'TipAmount'
-        /// </summary>
-        [Test]
-        public void TipAmountTest()
-        {
-            // TODO unit test for the property 'TipAmount'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryAmount'
-        /// </summary>
-        [Test]
-        public void DeliveryAmountTest()
-        {
-            // TODO unit test for the property 'DeliveryAmount'
-        }
-        /// <summary>
-        /// Test the property 'OrderItemsAmount'
-        /// </summary>
-        [Test]
-        public void OrderItemsAmountTest()
-        {
-            // TODO unit test for the property 'OrderItemsAmount'
-        }
-        /// <summary>
-        /// Test the property 'Amount'
-        /// </summary>
-        [Test]
-        public void AmountTest()
-        {
-            // TODO unit test for the property 'Amount'
-        }
-        /// <summary>
-        /// Test the property 'ProcessingFee'
-        /// </summary>
-        [Test]
-        public void ProcessingFeeTest()
-        {
-            // TODO unit test for the property 'ProcessingFee'
-        }
-        /// <summary>
-        /// Test the property 'PaymentAccountType'
-        /// </summary>
-        [Test]
-        public void PaymentAccountTypeTest()
-        {
-            // TODO unit test for the property 'PaymentAccountType'
-        }
-        /// <summary>
-        /// Test the property 'PaymentAccountDescription'
-        /// </summary>
-        [Test]
-        public void PaymentAccountDescriptionTest()
-        {
-            // TODO unit test for the property 'PaymentAccountDescription'
-        }
-        /// <summary>
-        /// Test the property 'OrderState'
-        /// </summary>
-        [Test]
-        public void OrderStateTest()
-        {
-            // TODO unit test for the property 'OrderState'
-        }
-        /// <summary>
-        /// Test the property 'IsPreOrder'
-        /// </summary>
-        [Test]
-        public void IsPreOrderTest()
-        {
-            // TODO unit test for the property 'IsPreOrder'
-        }
-        /// <summary>
-        /// Test the property 'PlacedTime'
-        /// </summary>
-        [Test]
-        public void PlacedTimeTest()
-        {
-            // TODO unit test for the property 'PlacedTime'
-        }
-        /// <summary>
-        /// Test the property 'RequestedForTime'
-        /// </summary>
-        [Test]
-        public void RequestedForTimeTest()
-        {
-            // TODO unit test for the property 'RequestedForTime'
-        }
-        /// <summary>
-        /// Test the property 'ChefNote'
-        /// </summary>
-        [Test]
-        public void ChefNoteTest()
-        {
-            // TODO unit test for the property 'ChefNote'
-        }
-        /// <summary>
-        /// Test the property 'AppType'
-        /// </summary>
-        [Test]
-        public void AppTypeTest()
-        {
-            // TODO unit test for the property 'AppType'
-        }
-        /// <summary>
-        /// Test the property 'UserRating'
-        /// </summary>
-        [Test]
-        public void UserRatingTest()
-        {
-            // TODO unit test for the property 'UserRating'
-        }
-        /// <summary>
-        /// Test the property 'PaymentStatus'
-        /// </summary>
-        [Test]
-        public void PaymentStatusTest()
-        {
-            // TODO unit test for the property 'PaymentStatus'
-        }
-        /// <summary>
-        /// Test the property 'RejectionReason'
-        /// </summary>
-        [Test]
-        public void RejectionReasonTest()
-        {
-            // TODO unit test for the property 'RejectionReason'
-        }
-        /// <summary>
-        /// Test the property 'RefundedAmount'
-        /// </summary>
-        [Test]
-        public void RefundedAmountTest()
-        {
-            // TODO unit test for the property 'RefundedAmount'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryTrackingStatus'
-        /// </summary>
-        [Test]
-        public void DeliveryTrackingStatusTest()
-        {
-            // TODO unit test for the property 'DeliveryTrackingStatus'
-        }
-        /// <summary>
-        /// Test the property 'DriverId'
-        /// </summary>
-        [Test]
-        public void DriverIdTest()
-        {
-            // TODO unit test for the property 'DriverId'
-        }
-        /// <summary>
-        /// Test the property 'TotalTax'
-        /// </summary>
-        [Test]
-        public void TotalTaxTest()
-        {
-            // TODO unit test for the property 'TotalTax'
-        }
-        /// <summary>
-        /// Test the property 'OrderTrackingCode'
-        /// </summary>
-        [Test]
-        public void OrderTrackingCodeTest()
-        {
-            // TODO unit test for the property 'OrderTrackingCode'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderTipUpdatedEventTests.cs b/src/Flipdish.Test/Model/OrderTipUpdatedEventTests.cs
deleted file mode 100644
index 095e4304..00000000
--- a/src/Flipdish.Test/Model/OrderTipUpdatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderTipUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderTipUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderTipUpdatedEvent
-        //private OrderTipUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderTipUpdatedEvent
-            //instance = new OrderTipUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderTipUpdatedEvent
-        /// </summary>
-        [Test]
-        public void OrderTipUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderTipUpdatedEvent
-            //Assert.IsInstanceOfType<OrderTipUpdatedEvent> (instance, "variable 'instance' is a OrderTipUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'TipAmount'
-        /// </summary>
-        [Test]
-        public void TipAmountTest()
-        {
-            // TODO unit test for the property 'TipAmount'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Order'
-        /// </summary>
-        [Test]
-        public void OrderTest()
-        {
-            // TODO unit test for the property 'Order'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OrderVoucherSummaryTests.cs b/src/Flipdish.Test/Model/OrderVoucherSummaryTests.cs
deleted file mode 100644
index 16721e77..00000000
--- a/src/Flipdish.Test/Model/OrderVoucherSummaryTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OrderVoucherSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OrderVoucherSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for OrderVoucherSummary
-        //private OrderVoucherSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OrderVoucherSummary
-            //instance = new OrderVoucherSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OrderVoucherSummary
-        /// </summary>
-        [Test]
-        public void OrderVoucherSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OrderVoucherSummary
-            //Assert.IsInstanceOfType<OrderVoucherSummary> (instance, "variable 'instance' is a OrderVoucherSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-        /// <summary>
-        /// Test the property 'Amount'
-        /// </summary>
-        [Test]
-        public void AmountTest()
-        {
-            // TODO unit test for the property 'Amount'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'SubType'
-        /// </summary>
-        [Test]
-        public void SubTypeTest()
-        {
-            // TODO unit test for the property 'SubType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OtherChargesDetailsTests.cs b/src/Flipdish.Test/Model/OtherChargesDetailsTests.cs
deleted file mode 100644
index fb2344c7..00000000
--- a/src/Flipdish.Test/Model/OtherChargesDetailsTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OtherChargesDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OtherChargesDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for OtherChargesDetails
-        //private OtherChargesDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OtherChargesDetails
-            //instance = new OtherChargesDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OtherChargesDetails
-        /// </summary>
-        [Test]
-        public void OtherChargesDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OtherChargesDetails
-            //Assert.IsInstanceOfType<OtherChargesDetails> (instance, "variable 'instance' is a OtherChargesDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TotalOtherCharges'
-        /// </summary>
-        [Test]
-        public void TotalOtherChargesTest()
-        {
-            // TODO unit test for the property 'TotalOtherCharges'
-        }
-        /// <summary>
-        /// Test the property 'ChargesCount'
-        /// </summary>
-        [Test]
-        public void ChargesCountTest()
-        {
-            // TODO unit test for the property 'ChargesCount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OwnerEntityConfigurationTests.cs b/src/Flipdish.Test/Model/OwnerEntityConfigurationTests.cs
deleted file mode 100644
index a2d56921..00000000
--- a/src/Flipdish.Test/Model/OwnerEntityConfigurationTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OwnerEntityConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OwnerEntityConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for OwnerEntityConfiguration
-        //private OwnerEntityConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OwnerEntityConfiguration
-            //instance = new OwnerEntityConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OwnerEntityConfiguration
-        /// </summary>
-        [Test]
-        public void OwnerEntityConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OwnerEntityConfiguration
-            //Assert.IsInstanceOfType<OwnerEntityConfiguration> (instance, "variable 'instance' is a OwnerEntityConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OwnerEntity'
-        /// </summary>
-        [Test]
-        public void OwnerEntityTest()
-        {
-            // TODO unit test for the property 'OwnerEntity'
-        }
-        /// <summary>
-        /// Test the property 'AllowedBehaviors'
-        /// </summary>
-        [Test]
-        public void AllowedBehaviorsTest()
-        {
-            // TODO unit test for the property 'AllowedBehaviors'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/OwnerEntityConfigurationsTests.cs b/src/Flipdish.Test/Model/OwnerEntityConfigurationsTests.cs
deleted file mode 100644
index 5f050032..00000000
--- a/src/Flipdish.Test/Model/OwnerEntityConfigurationsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing OwnerEntityConfigurations
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class OwnerEntityConfigurationsTests
-    {
-        // TODO uncomment below to declare an instance variable for OwnerEntityConfigurations
-        //private OwnerEntityConfigurations instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of OwnerEntityConfigurations
-            //instance = new OwnerEntityConfigurations();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of OwnerEntityConfigurations
-        /// </summary>
-        [Test]
-        public void OwnerEntityConfigurationsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" OwnerEntityConfigurations
-            //Assert.IsInstanceOfType<OwnerEntityConfigurations> (instance, "variable 'instance' is a OwnerEntityConfigurations");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Configurations'
-        /// </summary>
-        [Test]
-        public void ConfigurationsTest()
-        {
-            // TODO unit test for the property 'Configurations'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PasswordResetModelTests.cs b/src/Flipdish.Test/Model/PasswordResetModelTests.cs
deleted file mode 100644
index 4387d18e..00000000
--- a/src/Flipdish.Test/Model/PasswordResetModelTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PasswordResetModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PasswordResetModelTests
-    {
-        // TODO uncomment below to declare an instance variable for PasswordResetModel
-        //private PasswordResetModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PasswordResetModel
-            //instance = new PasswordResetModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PasswordResetModel
-        /// </summary>
-        [Test]
-        public void PasswordResetModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PasswordResetModel
-            //Assert.IsInstanceOfType<PasswordResetModel> (instance, "variable 'instance' is a PasswordResetModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'Password'
-        /// </summary>
-        [Test]
-        public void PasswordTest()
-        {
-            // TODO unit test for the property 'Password'
-        }
-        /// <summary>
-        /// Test the property 'PasswordConfirmation'
-        /// </summary>
-        [Test]
-        public void PasswordConfirmationTest()
-        {
-            // TODO unit test for the property 'PasswordConfirmation'
-        }
-        /// <summary>
-        /// Test the property 'Token'
-        /// </summary>
-        [Test]
-        public void TokenTest()
-        {
-            // TODO unit test for the property 'Token'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayOrderTests.cs b/src/Flipdish.Test/Model/PayOrderTests.cs
deleted file mode 100644
index 8eebff7b..00000000
--- a/src/Flipdish.Test/Model/PayOrderTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayOrder
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayOrderTests
-    {
-        // TODO uncomment below to declare an instance variable for PayOrder
-        //private PayOrder instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayOrder
-            //instance = new PayOrder();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayOrder
-        /// </summary>
-        [Test]
-        public void PayOrderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayOrder
-            //Assert.IsInstanceOfType<PayOrder> (instance, "variable 'instance' is a PayOrder");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PaymentOption'
-        /// </summary>
-        [Test]
-        public void PaymentOptionTest()
-        {
-            // TODO unit test for the property 'PaymentOption'
-        }
-        /// <summary>
-        /// Test the property 'ChefNote'
-        /// </summary>
-        [Test]
-        public void ChefNoteTest()
-        {
-            // TODO unit test for the property 'ChefNote'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PaymentInfoTests.cs b/src/Flipdish.Test/Model/PaymentInfoTests.cs
deleted file mode 100644
index 590c2a9e..00000000
--- a/src/Flipdish.Test/Model/PaymentInfoTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PaymentInfo
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PaymentInfoTests
-    {
-        // TODO uncomment below to declare an instance variable for PaymentInfo
-        //private PaymentInfo instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PaymentInfo
-            //instance = new PaymentInfo();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PaymentInfo
-        /// </summary>
-        [Test]
-        public void PaymentInfoInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PaymentInfo
-            //Assert.IsInstanceOfType<PaymentInfo> (instance, "variable 'instance' is a PaymentInfo");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Paid'
-        /// </summary>
-        [Test]
-        public void PaidTest()
-        {
-            // TODO unit test for the property 'Paid'
-        }
-        /// <summary>
-        /// Test the property 'PaymentType'
-        /// </summary>
-        [Test]
-        public void PaymentTypeTest()
-        {
-            // TODO unit test for the property 'PaymentType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PaymentIntentTests.cs b/src/Flipdish.Test/Model/PaymentIntentTests.cs
deleted file mode 100644
index bc259896..00000000
--- a/src/Flipdish.Test/Model/PaymentIntentTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PaymentIntent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PaymentIntentTests
-    {
-        // TODO uncomment below to declare an instance variable for PaymentIntent
-        //private PaymentIntent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PaymentIntent
-            //instance = new PaymentIntent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PaymentIntent
-        /// </summary>
-        [Test]
-        public void PaymentIntentInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PaymentIntent
-            //Assert.IsInstanceOfType<PaymentIntent> (instance, "variable 'instance' is a PaymentIntent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'Created'
-        /// </summary>
-        [Test]
-        public void CreatedTest()
-        {
-            // TODO unit test for the property 'Created'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PaymentTerminalDetailsTests.cs b/src/Flipdish.Test/Model/PaymentTerminalDetailsTests.cs
deleted file mode 100644
index 82aa269b..00000000
--- a/src/Flipdish.Test/Model/PaymentTerminalDetailsTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PaymentTerminalDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PaymentTerminalDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for PaymentTerminalDetails
-        //private PaymentTerminalDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PaymentTerminalDetails
-            //instance = new PaymentTerminalDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PaymentTerminalDetails
-        /// </summary>
-        [Test]
-        public void PaymentTerminalDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PaymentTerminalDetails
-            //Assert.IsInstanceOfType<PaymentTerminalDetails> (instance, "variable 'instance' is a PaymentTerminalDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TerminalId'
-        /// </summary>
-        [Test]
-        public void TerminalIdTest()
-        {
-            // TODO unit test for the property 'TerminalId'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'Uri'
-        /// </summary>
-        [Test]
-        public void UriTest()
-        {
-            // TODO unit test for the property 'Uri'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PaymentTerminalTransactionDetailsTests.cs b/src/Flipdish.Test/Model/PaymentTerminalTransactionDetailsTests.cs
deleted file mode 100644
index ae459d79..00000000
--- a/src/Flipdish.Test/Model/PaymentTerminalTransactionDetailsTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PaymentTerminalTransactionDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PaymentTerminalTransactionDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for PaymentTerminalTransactionDetails
-        //private PaymentTerminalTransactionDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PaymentTerminalTransactionDetails
-            //instance = new PaymentTerminalTransactionDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PaymentTerminalTransactionDetails
-        /// </summary>
-        [Test]
-        public void PaymentTerminalTransactionDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PaymentTerminalTransactionDetails
-            //Assert.IsInstanceOfType<PaymentTerminalTransactionDetails> (instance, "variable 'instance' is a PaymentTerminalTransactionDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CardSchemeName'
-        /// </summary>
-        [Test]
-        public void CardSchemeNameTest()
-        {
-            // TODO unit test for the property 'CardSchemeName'
-        }
-        /// <summary>
-        /// Test the property 'DateOfExpiry'
-        /// </summary>
-        [Test]
-        public void DateOfExpiryTest()
-        {
-            // TODO unit test for the property 'DateOfExpiry'
-        }
-        /// <summary>
-        /// Test the property 'AuthCode'
-        /// </summary>
-        [Test]
-        public void AuthCodeTest()
-        {
-            // TODO unit test for the property 'AuthCode'
-        }
-        /// <summary>
-        /// Test the property 'TransactionResult'
-        /// </summary>
-        [Test]
-        public void TransactionResultTest()
-        {
-            // TODO unit test for the property 'TransactionResult'
-        }
-        /// <summary>
-        /// Test the property 'PrimaryAccountNumber'
-        /// </summary>
-        [Test]
-        public void PrimaryAccountNumberTest()
-        {
-            // TODO unit test for the property 'PrimaryAccountNumber'
-        }
-        /// <summary>
-        /// Test the property 'CardholderVerificationMethod'
-        /// </summary>
-        [Test]
-        public void CardholderVerificationMethodTest()
-        {
-            // TODO unit test for the property 'CardholderVerificationMethod'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutChargebackTests.cs b/src/Flipdish.Test/Model/PayoutChargebackTests.cs
deleted file mode 100644
index 5f82dbf8..00000000
--- a/src/Flipdish.Test/Model/PayoutChargebackTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutChargeback
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutChargebackTests
-    {
-        // TODO uncomment below to declare an instance variable for PayoutChargeback
-        //private PayoutChargeback instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayoutChargeback
-            //instance = new PayoutChargeback();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutChargeback
-        /// </summary>
-        [Test]
-        public void PayoutChargebackInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayoutChargeback
-            //Assert.IsInstanceOfType<PayoutChargeback> (instance, "variable 'instance' is a PayoutChargeback");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'OrderCurrency'
-        /// </summary>
-        [Test]
-        public void OrderCurrencyTest()
-        {
-            // TODO unit test for the property 'OrderCurrency'
-        }
-        /// <summary>
-        /// Test the property 'PayoutId'
-        /// </summary>
-        [Test]
-        public void PayoutIdTest()
-        {
-            // TODO unit test for the property 'PayoutId'
-        }
-        /// <summary>
-        /// Test the property 'OrderDate'
-        /// </summary>
-        [Test]
-        public void OrderDateTest()
-        {
-            // TODO unit test for the property 'OrderDate'
-        }
-        /// <summary>
-        /// Test the property 'OrderType'
-        /// </summary>
-        [Test]
-        public void OrderTypeTest()
-        {
-            // TODO unit test for the property 'OrderType'
-        }
-        /// <summary>
-        /// Test the property 'ChargebackDate'
-        /// </summary>
-        [Test]
-        public void ChargebackDateTest()
-        {
-            // TODO unit test for the property 'ChargebackDate'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'ChargebackAmount'
-        /// </summary>
-        [Test]
-        public void ChargebackAmountTest()
-        {
-            // TODO unit test for the property 'ChargebackAmount'
-        }
-        /// <summary>
-        /// Test the property 'RefundedFees'
-        /// </summary>
-        [Test]
-        public void RefundedFeesTest()
-        {
-            // TODO unit test for the property 'RefundedFees'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutDetailTests.cs b/src/Flipdish.Test/Model/PayoutDetailTests.cs
deleted file mode 100644
index 872ae723..00000000
--- a/src/Flipdish.Test/Model/PayoutDetailTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for PayoutDetail
-        //private PayoutDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayoutDetail
-            //instance = new PayoutDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutDetail
-        /// </summary>
-        [Test]
-        public void PayoutDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayoutDetail
-            //Assert.IsInstanceOfType<PayoutDetail> (instance, "variable 'instance' is a PayoutDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PayoutId'
-        /// </summary>
-        [Test]
-        public void PayoutIdTest()
-        {
-            // TODO unit test for the property 'PayoutId'
-        }
-        /// <summary>
-        /// Test the property 'BankAccountId'
-        /// </summary>
-        [Test]
-        public void BankAccountIdTest()
-        {
-            // TODO unit test for the property 'BankAccountId'
-        }
-        /// <summary>
-        /// Test the property 'AccountName'
-        /// </summary>
-        [Test]
-        public void AccountNameTest()
-        {
-            // TODO unit test for the property 'AccountName'
-        }
-        /// <summary>
-        /// Test the property 'PayoutStatus'
-        /// </summary>
-        [Test]
-        public void PayoutStatusTest()
-        {
-            // TODO unit test for the property 'PayoutStatus'
-        }
-        /// <summary>
-        /// Test the property 'CreatedDate'
-        /// </summary>
-        [Test]
-        public void CreatedDateTest()
-        {
-            // TODO unit test for the property 'CreatedDate'
-        }
-        /// <summary>
-        /// Test the property 'PeriodStartTime'
-        /// </summary>
-        [Test]
-        public void PeriodStartTimeTest()
-        {
-            // TODO unit test for the property 'PeriodStartTime'
-        }
-        /// <summary>
-        /// Test the property 'PeriodEndTime'
-        /// </summary>
-        [Test]
-        public void PeriodEndTimeTest()
-        {
-            // TODO unit test for the property 'PeriodEndTime'
-        }
-        /// <summary>
-        /// Test the property 'DestinationBank'
-        /// </summary>
-        [Test]
-        public void DestinationBankTest()
-        {
-            // TODO unit test for the property 'DestinationBank'
-        }
-        /// <summary>
-        /// Test the property 'DestinationAccount'
-        /// </summary>
-        [Test]
-        public void DestinationAccountTest()
-        {
-            // TODO unit test for the property 'DestinationAccount'
-        }
-        /// <summary>
-        /// Test the property 'PayoutType'
-        /// </summary>
-        [Test]
-        public void PayoutTypeTest()
-        {
-            // TODO unit test for the property 'PayoutType'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'PayoutStores'
-        /// </summary>
-        [Test]
-        public void PayoutStoresTest()
-        {
-            // TODO unit test for the property 'PayoutStores'
-        }
-        /// <summary>
-        /// Test the property 'Amount'
-        /// </summary>
-        [Test]
-        public void AmountTest()
-        {
-            // TODO unit test for the property 'Amount'
-        }
-        /// <summary>
-        /// Test the property 'CutoffDate'
-        /// </summary>
-        [Test]
-        public void CutoffDateTest()
-        {
-            // TODO unit test for the property 'CutoffDate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutOrderTests.cs b/src/Flipdish.Test/Model/PayoutOrderTests.cs
deleted file mode 100644
index e0b62a9c..00000000
--- a/src/Flipdish.Test/Model/PayoutOrderTests.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutOrder
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutOrderTests
-    {
-        // TODO uncomment below to declare an instance variable for PayoutOrder
-        //private PayoutOrder instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayoutOrder
-            //instance = new PayoutOrder();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutOrder
-        /// </summary>
-        [Test]
-        public void PayoutOrderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayoutOrder
-            //Assert.IsInstanceOfType<PayoutOrder> (instance, "variable 'instance' is a PayoutOrder");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'PayoutId'
-        /// </summary>
-        [Test]
-        public void PayoutIdTest()
-        {
-            // TODO unit test for the property 'PayoutId'
-        }
-        /// <summary>
-        /// Test the property 'OrderDate'
-        /// </summary>
-        [Test]
-        public void OrderDateTest()
-        {
-            // TODO unit test for the property 'OrderDate'
-        }
-        /// <summary>
-        /// Test the property 'OrderType'
-        /// </summary>
-        [Test]
-        public void OrderTypeTest()
-        {
-            // TODO unit test for the property 'OrderType'
-        }
-        /// <summary>
-        /// Test the property 'OrderCurrency'
-        /// </summary>
-        [Test]
-        public void OrderCurrencyTest()
-        {
-            // TODO unit test for the property 'OrderCurrency'
-        }
-        /// <summary>
-        /// Test the property 'Sales'
-        /// </summary>
-        [Test]
-        public void SalesTest()
-        {
-            // TODO unit test for the property 'Sales'
-        }
-        /// <summary>
-        /// Test the property 'SalesTax'
-        /// </summary>
-        [Test]
-        public void SalesTaxTest()
-        {
-            // TODO unit test for the property 'SalesTax'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryCharges'
-        /// </summary>
-        [Test]
-        public void DeliveryChargesTest()
-        {
-            // TODO unit test for the property 'DeliveryCharges'
-        }
-        /// <summary>
-        /// Test the property 'Tips'
-        /// </summary>
-        [Test]
-        public void TipsTest()
-        {
-            // TODO unit test for the property 'Tips'
-        }
-        /// <summary>
-        /// Test the property 'Voucher'
-        /// </summary>
-        [Test]
-        public void VoucherTest()
-        {
-            // TODO unit test for the property 'Voucher'
-        }
-        /// <summary>
-        /// Test the property 'FlatFeeExcludingVat'
-        /// </summary>
-        [Test]
-        public void FlatFeeExcludingVatTest()
-        {
-            // TODO unit test for the property 'FlatFeeExcludingVat'
-        }
-        /// <summary>
-        /// Test the property 'FlatFeeExcludingVAT'
-        /// </summary>
-        [Test]
-        public void FlatFeeExcludingVATTest()
-        {
-            // TODO unit test for the property 'FlatFeeExcludingVAT'
-        }
-        /// <summary>
-        /// Test the property 'PercentageFeeExcludingVat'
-        /// </summary>
-        [Test]
-        public void PercentageFeeExcludingVatTest()
-        {
-            // TODO unit test for the property 'PercentageFeeExcludingVat'
-        }
-        /// <summary>
-        /// Test the property 'PercentageFeeExcludingVAT'
-        /// </summary>
-        [Test]
-        public void PercentageFeeExcludingVATTest()
-        {
-            // TODO unit test for the property 'PercentageFeeExcludingVAT'
-        }
-        /// <summary>
-        /// Test the property 'Vat'
-        /// </summary>
-        [Test]
-        public void VatTest()
-        {
-            // TODO unit test for the property 'Vat'
-        }
-        /// <summary>
-        /// Test the property 'TotalFees'
-        /// </summary>
-        [Test]
-        public void TotalFeesTest()
-        {
-            // TODO unit test for the property 'TotalFees'
-        }
-        /// <summary>
-        /// Test the property 'CashFeeChargedToCustomer'
-        /// </summary>
-        [Test]
-        public void CashFeeChargedToCustomerTest()
-        {
-            // TODO unit test for the property 'CashFeeChargedToCustomer'
-        }
-        /// <summary>
-        /// Test the property 'NetSales'
-        /// </summary>
-        [Test]
-        public void NetSalesTest()
-        {
-            // TODO unit test for the property 'NetSales'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutOtherChargeTests.cs b/src/Flipdish.Test/Model/PayoutOtherChargeTests.cs
deleted file mode 100644
index 3c85d700..00000000
--- a/src/Flipdish.Test/Model/PayoutOtherChargeTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutOtherCharge
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutOtherChargeTests
-    {
-        // TODO uncomment below to declare an instance variable for PayoutOtherCharge
-        //private PayoutOtherCharge instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayoutOtherCharge
-            //instance = new PayoutOtherCharge();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutOtherCharge
-        /// </summary>
-        [Test]
-        public void PayoutOtherChargeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayoutOtherCharge
-            //Assert.IsInstanceOfType<PayoutOtherCharge> (instance, "variable 'instance' is a PayoutOtherCharge");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ChargeId'
-        /// </summary>
-        [Test]
-        public void ChargeIdTest()
-        {
-            // TODO unit test for the property 'ChargeId'
-        }
-        /// <summary>
-        /// Test the property 'Amount'
-        /// </summary>
-        [Test]
-        public void AmountTest()
-        {
-            // TODO unit test for the property 'Amount'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'PayoutId'
-        /// </summary>
-        [Test]
-        public void PayoutIdTest()
-        {
-            // TODO unit test for the property 'PayoutId'
-        }
-        /// <summary>
-        /// Test the property 'ChargeDate'
-        /// </summary>
-        [Test]
-        public void ChargeDateTest()
-        {
-            // TODO unit test for the property 'ChargeDate'
-        }
-        /// <summary>
-        /// Test the property 'ChargeType'
-        /// </summary>
-        [Test]
-        public void ChargeTypeTest()
-        {
-            // TODO unit test for the property 'ChargeType'
-        }
-        /// <summary>
-        /// Test the property 'ChargeDescription'
-        /// </summary>
-        [Test]
-        public void ChargeDescriptionTest()
-        {
-            // TODO unit test for the property 'ChargeDescription'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutRefundTests.cs b/src/Flipdish.Test/Model/PayoutRefundTests.cs
deleted file mode 100644
index 93dab2a9..00000000
--- a/src/Flipdish.Test/Model/PayoutRefundTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutRefund
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutRefundTests
-    {
-        // TODO uncomment below to declare an instance variable for PayoutRefund
-        //private PayoutRefund instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayoutRefund
-            //instance = new PayoutRefund();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutRefund
-        /// </summary>
-        [Test]
-        public void PayoutRefundInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayoutRefund
-            //Assert.IsInstanceOfType<PayoutRefund> (instance, "variable 'instance' is a PayoutRefund");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'OrderCurrency'
-        /// </summary>
-        [Test]
-        public void OrderCurrencyTest()
-        {
-            // TODO unit test for the property 'OrderCurrency'
-        }
-        /// <summary>
-        /// Test the property 'PayoutId'
-        /// </summary>
-        [Test]
-        public void PayoutIdTest()
-        {
-            // TODO unit test for the property 'PayoutId'
-        }
-        /// <summary>
-        /// Test the property 'OrderDate'
-        /// </summary>
-        [Test]
-        public void OrderDateTest()
-        {
-            // TODO unit test for the property 'OrderDate'
-        }
-        /// <summary>
-        /// Test the property 'OrderType'
-        /// </summary>
-        [Test]
-        public void OrderTypeTest()
-        {
-            // TODO unit test for the property 'OrderType'
-        }
-        /// <summary>
-        /// Test the property 'RefundDate'
-        /// </summary>
-        [Test]
-        public void RefundDateTest()
-        {
-            // TODO unit test for the property 'RefundDate'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'TotalRefund'
-        /// </summary>
-        [Test]
-        public void TotalRefundTest()
-        {
-            // TODO unit test for the property 'TotalRefund'
-        }
-        /// <summary>
-        /// Test the property 'RefundedFees'
-        /// </summary>
-        [Test]
-        public void RefundedFeesTest()
-        {
-            // TODO unit test for the property 'RefundedFees'
-        }
-        /// <summary>
-        /// Test the property 'RefundedAmount'
-        /// </summary>
-        [Test]
-        public void RefundedAmountTest()
-        {
-            // TODO unit test for the property 'RefundedAmount'
-        }
-        /// <summary>
-        /// Test the property 'CashFeeRefundedToCustomer'
-        /// </summary>
-        [Test]
-        public void CashFeeRefundedToCustomerTest()
-        {
-            // TODO unit test for the property 'CashFeeRefundedToCustomer'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutRequestIdsTests.cs b/src/Flipdish.Test/Model/PayoutRequestIdsTests.cs
deleted file mode 100644
index 92d65b9b..00000000
--- a/src/Flipdish.Test/Model/PayoutRequestIdsTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutRequestIds
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutRequestIdsTests
-    {
-        // TODO uncomment below to declare an instance variable for PayoutRequestIds
-        //private PayoutRequestIds instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayoutRequestIds
-            //instance = new PayoutRequestIds();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutRequestIds
-        /// </summary>
-        [Test]
-        public void PayoutRequestIdsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayoutRequestIds
-            //Assert.IsInstanceOfType<PayoutRequestIds> (instance, "variable 'instance' is a PayoutRequestIds");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BankAccountIds'
-        /// </summary>
-        [Test]
-        public void BankAccountIdsTest()
-        {
-            // TODO unit test for the property 'BankAccountIds'
-        }
-        /// <summary>
-        /// Test the property 'States'
-        /// </summary>
-        [Test]
-        public void StatesTest()
-        {
-            // TODO unit test for the property 'States'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutStoreTests.cs b/src/Flipdish.Test/Model/PayoutStoreTests.cs
deleted file mode 100644
index 5b4ccce0..00000000
--- a/src/Flipdish.Test/Model/PayoutStoreTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for PayoutStore
-        //private PayoutStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayoutStore
-            //instance = new PayoutStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutStore
-        /// </summary>
-        [Test]
-        public void PayoutStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayoutStore
-            //Assert.IsInstanceOfType<PayoutStore> (instance, "variable 'instance' is a PayoutStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-        /// <summary>
-        /// Test the property 'Amount'
-        /// </summary>
-        [Test]
-        public void AmountTest()
-        {
-            // TODO unit test for the property 'Amount'
-        }
-        /// <summary>
-        /// Test the property 'OnlineRevenue'
-        /// </summary>
-        [Test]
-        public void OnlineRevenueTest()
-        {
-            // TODO unit test for the property 'OnlineRevenue'
-        }
-        /// <summary>
-        /// Test the property 'Revenue'
-        /// </summary>
-        [Test]
-        public void RevenueTest()
-        {
-            // TODO unit test for the property 'Revenue'
-        }
-        /// <summary>
-        /// Test the property 'RevenueAdjustments'
-        /// </summary>
-        [Test]
-        public void RevenueAdjustmentsTest()
-        {
-            // TODO unit test for the property 'RevenueAdjustments'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishFees'
-        /// </summary>
-        [Test]
-        public void FlipdishFeesTest()
-        {
-            // TODO unit test for the property 'FlipdishFees'
-        }
-        /// <summary>
-        /// Test the property 'Chargebacks'
-        /// </summary>
-        [Test]
-        public void ChargebacksTest()
-        {
-            // TODO unit test for the property 'Chargebacks'
-        }
-        /// <summary>
-        /// Test the property 'OtherCharges'
-        /// </summary>
-        [Test]
-        public void OtherChargesTest()
-        {
-            // TODO unit test for the property 'OtherCharges'
-        }
-        /// <summary>
-        /// Test the property 'Balance'
-        /// </summary>
-        [Test]
-        public void BalanceTest()
-        {
-            // TODO unit test for the property 'Balance'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutSummaryTests.cs b/src/Flipdish.Test/Model/PayoutSummaryTests.cs
deleted file mode 100644
index c0716f9a..00000000
--- a/src/Flipdish.Test/Model/PayoutSummaryTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PayoutSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for PayoutSummary
-        //private PayoutSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PayoutSummary
-            //instance = new PayoutSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PayoutSummary
-        /// </summary>
-        [Test]
-        public void PayoutSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PayoutSummary
-            //Assert.IsInstanceOfType<PayoutSummary> (instance, "variable 'instance' is a PayoutSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PayoutStatus'
-        /// </summary>
-        [Test]
-        public void PayoutStatusTest()
-        {
-            // TODO unit test for the property 'PayoutStatus'
-        }
-        /// <summary>
-        /// Test the property 'TotalAmount'
-        /// </summary>
-        [Test]
-        public void TotalAmountTest()
-        {
-            // TODO unit test for the property 'TotalAmount'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'TotalCount'
-        /// </summary>
-        [Test]
-        public void TotalCountTest()
-        {
-            // TODO unit test for the property 'TotalCount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PayoutTests.cs b/src/Flipdish.Test/Model/PayoutTests.cs
deleted file mode 100644
index 27f4afb4..00000000
--- a/src/Flipdish.Test/Model/PayoutTests.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Payout
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PayoutTests
-    {
-        // TODO uncomment below to declare an instance variable for Payout
-        //private Payout instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Payout
-            //instance = new Payout();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Payout
-        /// </summary>
-        [Test]
-        public void PayoutInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Payout
-            //Assert.IsInstanceOfType<Payout> (instance, "variable 'instance' is a Payout");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PayoutId'
-        /// </summary>
-        [Test]
-        public void PayoutIdTest()
-        {
-            // TODO unit test for the property 'PayoutId'
-        }
-        /// <summary>
-        /// Test the property 'PayeeBankAccountId'
-        /// </summary>
-        [Test]
-        public void PayeeBankAccountIdTest()
-        {
-            // TODO unit test for the property 'PayeeBankAccountId'
-        }
-        /// <summary>
-        /// Test the property 'AccountName'
-        /// </summary>
-        [Test]
-        public void AccountNameTest()
-        {
-            // TODO unit test for the property 'AccountName'
-        }
-        /// <summary>
-        /// Test the property 'PayoutStatus'
-        /// </summary>
-        [Test]
-        public void PayoutStatusTest()
-        {
-            // TODO unit test for the property 'PayoutStatus'
-        }
-        /// <summary>
-        /// Test the property 'CreatedDate'
-        /// </summary>
-        [Test]
-        public void CreatedDateTest()
-        {
-            // TODO unit test for the property 'CreatedDate'
-        }
-        /// <summary>
-        /// Test the property 'PeriodStartTime'
-        /// </summary>
-        [Test]
-        public void PeriodStartTimeTest()
-        {
-            // TODO unit test for the property 'PeriodStartTime'
-        }
-        /// <summary>
-        /// Test the property 'PeriodEndTime'
-        /// </summary>
-        [Test]
-        public void PeriodEndTimeTest()
-        {
-            // TODO unit test for the property 'PeriodEndTime'
-        }
-        /// <summary>
-        /// Test the property 'DestinationBank'
-        /// </summary>
-        [Test]
-        public void DestinationBankTest()
-        {
-            // TODO unit test for the property 'DestinationBank'
-        }
-        /// <summary>
-        /// Test the property 'DestinationAccount'
-        /// </summary>
-        [Test]
-        public void DestinationAccountTest()
-        {
-            // TODO unit test for the property 'DestinationAccount'
-        }
-        /// <summary>
-        /// Test the property 'Amount'
-        /// </summary>
-        [Test]
-        public void AmountTest()
-        {
-            // TODO unit test for the property 'Amount'
-        }
-        /// <summary>
-        /// Test the property 'PayoutType'
-        /// </summary>
-        [Test]
-        public void PayoutTypeTest()
-        {
-            // TODO unit test for the property 'PayoutType'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'CutoffDate'
-        /// </summary>
-        [Test]
-        public void CutoffDateTest()
-        {
-            // TODO unit test for the property 'CutoffDate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PendingMenuChangesSummariesTests.cs b/src/Flipdish.Test/Model/PendingMenuChangesSummariesTests.cs
deleted file mode 100644
index ef0adca2..00000000
--- a/src/Flipdish.Test/Model/PendingMenuChangesSummariesTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PendingMenuChangesSummaries
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PendingMenuChangesSummariesTests
-    {
-        // TODO uncomment below to declare an instance variable for PendingMenuChangesSummaries
-        //private PendingMenuChangesSummaries instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PendingMenuChangesSummaries
-            //instance = new PendingMenuChangesSummaries();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PendingMenuChangesSummaries
-        /// </summary>
-        [Test]
-        public void PendingMenuChangesSummariesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PendingMenuChangesSummaries
-            //Assert.IsInstanceOfType<PendingMenuChangesSummaries> (instance, "variable 'instance' is a PendingMenuChangesSummaries");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'TotalPendingChanges'
-        /// </summary>
-        [Test]
-        public void TotalPendingChangesTest()
-        {
-            // TODO unit test for the property 'TotalPendingChanges'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PendingMenuChangesTests.cs b/src/Flipdish.Test/Model/PendingMenuChangesTests.cs
deleted file mode 100644
index d7ae036a..00000000
--- a/src/Flipdish.Test/Model/PendingMenuChangesTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PendingMenuChanges
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PendingMenuChangesTests
-    {
-        // TODO uncomment below to declare an instance variable for PendingMenuChanges
-        //private PendingMenuChanges instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PendingMenuChanges
-            //instance = new PendingMenuChanges();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PendingMenuChanges
-        /// </summary>
-        [Test]
-        public void PendingMenuChangesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PendingMenuChanges
-            //Assert.IsInstanceOfType<PendingMenuChanges> (instance, "variable 'instance' is a PendingMenuChanges");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ProductId'
-        /// </summary>
-        [Test]
-        public void ProductIdTest()
-        {
-            // TODO unit test for the property 'ProductId'
-        }
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'LastUpdatedAt'
-        /// </summary>
-        [Test]
-        public void LastUpdatedAtTest()
-        {
-            // TODO unit test for the property 'LastUpdatedAt'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PercentDiscountDetailsTests.cs b/src/Flipdish.Test/Model/PercentDiscountDetailsTests.cs
deleted file mode 100644
index c812ce43..00000000
--- a/src/Flipdish.Test/Model/PercentDiscountDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PercentDiscountDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PercentDiscountDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for PercentDiscountDetails
-        //private PercentDiscountDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PercentDiscountDetails
-            //instance = new PercentDiscountDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PercentDiscountDetails
-        /// </summary>
-        [Test]
-        public void PercentDiscountDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PercentDiscountDetails
-            //Assert.IsInstanceOfType<PercentDiscountDetails> (instance, "variable 'instance' is a PercentDiscountDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PercentageDiscount'
-        /// </summary>
-        [Test]
-        public void PercentageDiscountTest()
-        {
-            // TODO unit test for the property 'PercentageDiscount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PhoneCallEndedEventTests.cs b/src/Flipdish.Test/Model/PhoneCallEndedEventTests.cs
deleted file mode 100644
index 4cbe0625..00000000
--- a/src/Flipdish.Test/Model/PhoneCallEndedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PhoneCallEndedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PhoneCallEndedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PhoneCallEndedEvent
-        //private PhoneCallEndedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PhoneCallEndedEvent
-            //instance = new PhoneCallEndedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PhoneCallEndedEvent
-        /// </summary>
-        [Test]
-        public void PhoneCallEndedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PhoneCallEndedEvent
-            //Assert.IsInstanceOfType<PhoneCallEndedEvent> (instance, "variable 'instance' is a PhoneCallEndedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'PhoneCall'
-        /// </summary>
-        [Test]
-        public void PhoneCallTest()
-        {
-            // TODO unit test for the property 'PhoneCall'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PhoneCallStartedEventTests.cs b/src/Flipdish.Test/Model/PhoneCallStartedEventTests.cs
deleted file mode 100644
index fd5ece5b..00000000
--- a/src/Flipdish.Test/Model/PhoneCallStartedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PhoneCallStartedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PhoneCallStartedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PhoneCallStartedEvent
-        //private PhoneCallStartedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PhoneCallStartedEvent
-            //instance = new PhoneCallStartedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PhoneCallStartedEvent
-        /// </summary>
-        [Test]
-        public void PhoneCallStartedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PhoneCallStartedEvent
-            //Assert.IsInstanceOfType<PhoneCallStartedEvent> (instance, "variable 'instance' is a PhoneCallStartedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'PhoneCall'
-        /// </summary>
-        [Test]
-        public void PhoneCallTest()
-        {
-            // TODO unit test for the property 'PhoneCall'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PhoneCallTests.cs b/src/Flipdish.Test/Model/PhoneCallTests.cs
deleted file mode 100644
index 682a15a4..00000000
--- a/src/Flipdish.Test/Model/PhoneCallTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PhoneCall
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PhoneCallTests
-    {
-        // TODO uncomment below to declare an instance variable for PhoneCall
-        //private PhoneCall instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PhoneCall
-            //instance = new PhoneCall();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PhoneCall
-        /// </summary>
-        [Test]
-        public void PhoneCallInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PhoneCall
-            //Assert.IsInstanceOfType<PhoneCall> (instance, "variable 'instance' is a PhoneCall");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PhoneCallId'
-        /// </summary>
-        [Test]
-        public void PhoneCallIdTest()
-        {
-            // TODO unit test for the property 'PhoneCallId'
-        }
-        /// <summary>
-        /// Test the property 'TimeOfCall'
-        /// </summary>
-        [Test]
-        public void TimeOfCallTest()
-        {
-            // TODO unit test for the property 'TimeOfCall'
-        }
-        /// <summary>
-        /// Test the property 'TimeOfCallLocal'
-        /// </summary>
-        [Test]
-        public void TimeOfCallLocalTest()
-        {
-            // TODO unit test for the property 'TimeOfCallLocal'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-        /// <summary>
-        /// Test the property 'CallerName'
-        /// </summary>
-        [Test]
-        public void CallerNameTest()
-        {
-            // TODO unit test for the property 'CallerName'
-        }
-        /// <summary>
-        /// Test the property 'CallerUserId'
-        /// </summary>
-        [Test]
-        public void CallerUserIdTest()
-        {
-            // TODO unit test for the property 'CallerUserId'
-        }
-        /// <summary>
-        /// Test the property 'CallerNumber'
-        /// </summary>
-        [Test]
-        public void CallerNumberTest()
-        {
-            // TODO unit test for the property 'CallerNumber'
-        }
-        /// <summary>
-        /// Test the property 'CallLengthInSeconds'
-        /// </summary>
-        [Test]
-        public void CallLengthInSecondsTest()
-        {
-            // TODO unit test for the property 'CallLengthInSeconds'
-        }
-        /// <summary>
-        /// Test the property 'CallStatus'
-        /// </summary>
-        [Test]
-        public void CallStatusTest()
-        {
-            // TODO unit test for the property 'CallStatus'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PreOrderConfigTests.cs b/src/Flipdish.Test/Model/PreOrderConfigTests.cs
deleted file mode 100644
index d09bad57..00000000
--- a/src/Flipdish.Test/Model/PreOrderConfigTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PreOrderConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PreOrderConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for PreOrderConfig
-        //private PreOrderConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PreOrderConfig
-            //instance = new PreOrderConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PreOrderConfig
-        /// </summary>
-        [Test]
-        public void PreOrderConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PreOrderConfig
-            //Assert.IsInstanceOfType<PreOrderConfig> (instance, "variable 'instance' is a PreOrderConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LeadTimeMinutes'
-        /// </summary>
-        [Test]
-        public void LeadTimeMinutesTest()
-        {
-            // TODO unit test for the property 'LeadTimeMinutes'
-        }
-        /// <summary>
-        /// Test the property 'IntervalMinutes'
-        /// </summary>
-        [Test]
-        public void IntervalMinutesTest()
-        {
-            // TODO unit test for the property 'IntervalMinutes'
-        }
-        /// <summary>
-        /// Test the property 'MaxOrderAheadDays'
-        /// </summary>
-        [Test]
-        public void MaxOrderAheadDaysTest()
-        {
-            // TODO unit test for the property 'MaxOrderAheadDays'
-        }
-        /// <summary>
-        /// Test the property 'IncludeAsap'
-        /// </summary>
-        [Test]
-        public void IncludeAsapTest()
-        {
-            // TODO unit test for the property 'IncludeAsap'
-        }
-        /// <summary>
-        /// Test the property 'IncludeMoreGranularInitialTime'
-        /// </summary>
-        [Test]
-        public void IncludeMoreGranularInitialTimeTest()
-        {
-            // TODO unit test for the property 'IncludeMoreGranularInitialTime'
-        }
-        /// <summary>
-        /// Test the property 'CutOffTimePreviousDayBasic'
-        /// </summary>
-        [Test]
-        public void CutOffTimePreviousDayBasicTest()
-        {
-            // TODO unit test for the property 'CutOffTimePreviousDayBasic'
-        }
-        /// <summary>
-        /// Test the property 'CutOffTimeCurrentDayBasic'
-        /// </summary>
-        [Test]
-        public void CutOffTimeCurrentDayBasicTest()
-        {
-            // TODO unit test for the property 'CutOffTimeCurrentDayBasic'
-        }
-        /// <summary>
-        /// Test the property 'PreOrderTimeDisplayType'
-        /// </summary>
-        [Test]
-        public void PreOrderTimeDisplayTypeTest()
-        {
-            // TODO unit test for the property 'PreOrderTimeDisplayType'
-        }
-        /// <summary>
-        /// Test the property 'AlwaysAppearOpen'
-        /// </summary>
-        [Test]
-        public void AlwaysAppearOpenTest()
-        {
-            // TODO unit test for the property 'AlwaysAppearOpen'
-        }
-        /// <summary>
-        /// Test the property 'RequireExplicitSelectAlways'
-        /// </summary>
-        [Test]
-        public void RequireExplicitSelectAlwaysTest()
-        {
-            // TODO unit test for the property 'RequireExplicitSelectAlways'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PreOrderTimeTests.cs b/src/Flipdish.Test/Model/PreOrderTimeTests.cs
deleted file mode 100644
index bb2df092..00000000
--- a/src/Flipdish.Test/Model/PreOrderTimeTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PreOrderTime
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PreOrderTimeTests
-    {
-        // TODO uncomment below to declare an instance variable for PreOrderTime
-        //private PreOrderTime instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PreOrderTime
-            //instance = new PreOrderTime();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PreOrderTime
-        /// </summary>
-        [Test]
-        public void PreOrderTimeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PreOrderTime
-            //Assert.IsInstanceOfType<PreOrderTime> (instance, "variable 'instance' is a PreOrderTime");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StartTime'
-        /// </summary>
-        [Test]
-        public void StartTimeTest()
-        {
-            // TODO unit test for the property 'StartTime'
-        }
-        /// <summary>
-        /// Test the property 'EndTime'
-        /// </summary>
-        [Test]
-        public void EndTimeTest()
-        {
-            // TODO unit test for the property 'EndTime'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PredefinedAnswerTests.cs b/src/Flipdish.Test/Model/PredefinedAnswerTests.cs
deleted file mode 100644
index 69c71878..00000000
--- a/src/Flipdish.Test/Model/PredefinedAnswerTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PredefinedAnswer
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PredefinedAnswerTests
-    {
-        // TODO uncomment below to declare an instance variable for PredefinedAnswer
-        //private PredefinedAnswer instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PredefinedAnswer
-            //instance = new PredefinedAnswer();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PredefinedAnswer
-        /// </summary>
-        [Test]
-        public void PredefinedAnswerInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PredefinedAnswer
-            //Assert.IsInstanceOfType<PredefinedAnswer> (instance, "variable 'instance' is a PredefinedAnswer");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Text'
-        /// </summary>
-        [Test]
-        public void TextTest()
-        {
-            // TODO unit test for the property 'Text'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PriceTests.cs b/src/Flipdish.Test/Model/PriceTests.cs
deleted file mode 100644
index f3a16034..00000000
--- a/src/Flipdish.Test/Model/PriceTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Price
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PriceTests
-    {
-        // TODO uncomment below to declare an instance variable for Price
-        //private Price instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Price
-            //instance = new Price();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Price
-        /// </summary>
-        [Test]
-        public void PriceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Price
-            //Assert.IsInstanceOfType<Price> (instance, "variable 'instance' is a Price");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Amount'
-        /// </summary>
-        [Test]
-        public void AmountTest()
-        {
-            // TODO unit test for the property 'Amount'
-        }
-        /// <summary>
-        /// Test the property 'Tax'
-        /// </summary>
-        [Test]
-        public void TaxTest()
-        {
-            // TODO unit test for the property 'Tax'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PrinterAssignedToStoreEventTests.cs b/src/Flipdish.Test/Model/PrinterAssignedToStoreEventTests.cs
deleted file mode 100644
index 2cd2cec2..00000000
--- a/src/Flipdish.Test/Model/PrinterAssignedToStoreEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PrinterAssignedToStoreEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PrinterAssignedToStoreEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PrinterAssignedToStoreEvent
-        //private PrinterAssignedToStoreEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PrinterAssignedToStoreEvent
-            //instance = new PrinterAssignedToStoreEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PrinterAssignedToStoreEvent
-        /// </summary>
-        [Test]
-        public void PrinterAssignedToStoreEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PrinterAssignedToStoreEvent
-            //Assert.IsInstanceOfType<PrinterAssignedToStoreEvent> (instance, "variable 'instance' is a PrinterAssignedToStoreEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Printer'
-        /// </summary>
-        [Test]
-        public void PrinterTest()
-        {
-            // TODO unit test for the property 'Printer'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PrinterTests.cs b/src/Flipdish.Test/Model/PrinterTests.cs
deleted file mode 100644
index bbf482a0..00000000
--- a/src/Flipdish.Test/Model/PrinterTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Printer
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PrinterTests
-    {
-        // TODO uncomment below to declare an instance variable for Printer
-        //private Printer instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Printer
-            //instance = new Printer();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Printer
-        /// </summary>
-        [Test]
-        public void PrinterInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Printer
-            //Assert.IsInstanceOfType<Printer> (instance, "variable 'instance' is a Printer");
-        }
-
-
-        /// <summary>
-        /// Test the property 'SerialNumber'
-        /// </summary>
-        [Test]
-        public void SerialNumberTest()
-        {
-            // TODO unit test for the property 'SerialNumber'
-        }
-        /// <summary>
-        /// Test the property 'LastPollTime'
-        /// </summary>
-        [Test]
-        public void LastPollTimeTest()
-        {
-            // TODO unit test for the property 'LastPollTime'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PrinterTurnedOffEventTests.cs b/src/Flipdish.Test/Model/PrinterTurnedOffEventTests.cs
deleted file mode 100644
index 4fa77bf3..00000000
--- a/src/Flipdish.Test/Model/PrinterTurnedOffEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PrinterTurnedOffEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PrinterTurnedOffEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PrinterTurnedOffEvent
-        //private PrinterTurnedOffEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PrinterTurnedOffEvent
-            //instance = new PrinterTurnedOffEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PrinterTurnedOffEvent
-        /// </summary>
-        [Test]
-        public void PrinterTurnedOffEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PrinterTurnedOffEvent
-            //Assert.IsInstanceOfType<PrinterTurnedOffEvent> (instance, "variable 'instance' is a PrinterTurnedOffEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Printer'
-        /// </summary>
-        [Test]
-        public void PrinterTest()
-        {
-            // TODO unit test for the property 'Printer'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PrinterTurnedOnEventTests.cs b/src/Flipdish.Test/Model/PrinterTurnedOnEventTests.cs
deleted file mode 100644
index 3bd3db71..00000000
--- a/src/Flipdish.Test/Model/PrinterTurnedOnEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PrinterTurnedOnEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PrinterTurnedOnEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PrinterTurnedOnEvent
-        //private PrinterTurnedOnEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PrinterTurnedOnEvent
-            //instance = new PrinterTurnedOnEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PrinterTurnedOnEvent
-        /// </summary>
-        [Test]
-        public void PrinterTurnedOnEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PrinterTurnedOnEvent
-            //Assert.IsInstanceOfType<PrinterTurnedOnEvent> (instance, "variable 'instance' is a PrinterTurnedOnEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Printer'
-        /// </summary>
-        [Test]
-        public void PrinterTest()
-        {
-            // TODO unit test for the property 'Printer'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PrinterUnassignedFromStoreEventTests.cs b/src/Flipdish.Test/Model/PrinterUnassignedFromStoreEventTests.cs
deleted file mode 100644
index 93ff4b9a..00000000
--- a/src/Flipdish.Test/Model/PrinterUnassignedFromStoreEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PrinterUnassignedFromStoreEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PrinterUnassignedFromStoreEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PrinterUnassignedFromStoreEvent
-        //private PrinterUnassignedFromStoreEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PrinterUnassignedFromStoreEvent
-            //instance = new PrinterUnassignedFromStoreEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PrinterUnassignedFromStoreEvent
-        /// </summary>
-        [Test]
-        public void PrinterUnassignedFromStoreEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PrinterUnassignedFromStoreEvent
-            //Assert.IsInstanceOfType<PrinterUnassignedFromStoreEvent> (instance, "variable 'instance' is a PrinterUnassignedFromStoreEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Printer'
-        /// </summary>
-        [Test]
-        public void PrinterTest()
-        {
-            // TODO unit test for the property 'Printer'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ProcessPaymentIntentRequestTests.cs b/src/Flipdish.Test/Model/ProcessPaymentIntentRequestTests.cs
deleted file mode 100644
index c16107df..00000000
--- a/src/Flipdish.Test/Model/ProcessPaymentIntentRequestTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ProcessPaymentIntentRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ProcessPaymentIntentRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for ProcessPaymentIntentRequest
-        //private ProcessPaymentIntentRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ProcessPaymentIntentRequest
-            //instance = new ProcessPaymentIntentRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ProcessPaymentIntentRequest
-        /// </summary>
-        [Test]
-        public void ProcessPaymentIntentRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ProcessPaymentIntentRequest
-            //Assert.IsInstanceOfType<ProcessPaymentIntentRequest> (instance, "variable 'instance' is a ProcessPaymentIntentRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PaymentIntentId'
-        /// </summary>
-        [Test]
-        public void PaymentIntentIdTest()
-        {
-            // TODO unit test for the property 'PaymentIntentId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ProcessingFeeConfigTests.cs b/src/Flipdish.Test/Model/ProcessingFeeConfigTests.cs
deleted file mode 100644
index a6daa82d..00000000
--- a/src/Flipdish.Test/Model/ProcessingFeeConfigTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ProcessingFeeConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ProcessingFeeConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for ProcessingFeeConfig
-        //private ProcessingFeeConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ProcessingFeeConfig
-            //instance = new ProcessingFeeConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ProcessingFeeConfig
-        /// </summary>
-        [Test]
-        public void ProcessingFeeConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ProcessingFeeConfig
-            //Assert.IsInstanceOfType<ProcessingFeeConfig> (instance, "variable 'instance' is a ProcessingFeeConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'PaymentAccountType'
-        /// </summary>
-        [Test]
-        public void PaymentAccountTypeTest()
-        {
-            // TODO unit test for the property 'PaymentAccountType'
-        }
-        /// <summary>
-        /// Test the property 'PercentFee'
-        /// </summary>
-        [Test]
-        public void PercentFeeTest()
-        {
-            // TODO unit test for the property 'PercentFee'
-        }
-        /// <summary>
-        /// Test the property 'FixedFee'
-        /// </summary>
-        [Test]
-        public void FixedFeeTest()
-        {
-            // TODO unit test for the property 'FixedFee'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ProductItemTests.cs b/src/Flipdish.Test/Model/ProductItemTests.cs
deleted file mode 100644
index 62c4b433..00000000
--- a/src/Flipdish.Test/Model/ProductItemTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ProductItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ProductItemTests
-    {
-        // TODO uncomment below to declare an instance variable for ProductItem
-        //private ProductItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ProductItem
-            //instance = new ProductItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ProductItem
-        /// </summary>
-        [Test]
-        public void ProductItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ProductItem
-            //Assert.IsInstanceOfType<ProductItem> (instance, "variable 'instance' is a ProductItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ProductId'
-        /// </summary>
-        [Test]
-        public void ProductIdTest()
-        {
-            // TODO unit test for the property 'ProductId'
-        }
-        /// <summary>
-        /// Test the property 'CellLayoutType'
-        /// </summary>
-        [Test]
-        public void CellLayoutTypeTest()
-        {
-            // TODO unit test for the property 'CellLayoutType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ProductReferenceTests.cs b/src/Flipdish.Test/Model/ProductReferenceTests.cs
deleted file mode 100644
index a04f0ea1..00000000
--- a/src/Flipdish.Test/Model/ProductReferenceTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ProductReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ProductReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for ProductReference
-        //private ProductReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ProductReference
-            //instance = new ProductReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ProductReference
-        /// </summary>
-        [Test]
-        public void ProductReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ProductReference
-            //Assert.IsInstanceOfType<ProductReference> (instance, "variable 'instance' is a ProductReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Item'
-        /// </summary>
-        [Test]
-        public void ItemTest()
-        {
-            // TODO unit test for the property 'Item'
-        }
-        /// <summary>
-        /// Test the property 'Product'
-        /// </summary>
-        [Test]
-        public void ProductTest()
-        {
-            // TODO unit test for the property 'Product'
-        }
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'ProductType'
-        /// </summary>
-        [Test]
-        public void ProductTypeTest()
-        {
-            // TODO unit test for the property 'ProductType'
-        }
-        /// <summary>
-        /// Test the property 'PreselectedQuantity'
-        /// </summary>
-        [Test]
-        public void PreselectedQuantityTest()
-        {
-            // TODO unit test for the property 'PreselectedQuantity'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ProductTests.cs b/src/Flipdish.Test/Model/ProductTests.cs
deleted file mode 100644
index 3270bed8..00000000
--- a/src/Flipdish.Test/Model/ProductTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Product
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ProductTests
-    {
-        // TODO uncomment below to declare an instance variable for Product
-        //private Product instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Product
-            //instance = new Product();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Product
-        /// </summary>
-        [Test]
-        public void ProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Product
-            //Assert.IsInstanceOfType<Product> (instance, "variable 'instance' is a Product");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ProductId'
-        /// </summary>
-        [Test]
-        public void ProductIdTest()
-        {
-            // TODO unit test for the property 'ProductId'
-        }
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PublishMenuChangesTests.cs b/src/Flipdish.Test/Model/PublishMenuChangesTests.cs
deleted file mode 100644
index 8bf0d0d7..00000000
--- a/src/Flipdish.Test/Model/PublishMenuChangesTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PublishMenuChanges
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PublishMenuChangesTests
-    {
-        // TODO uncomment below to declare an instance variable for PublishMenuChanges
-        //private PublishMenuChanges instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PublishMenuChanges
-            //instance = new PublishMenuChanges();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PublishMenuChanges
-        /// </summary>
-        [Test]
-        public void PublishMenuChangesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PublishMenuChanges
-            //Assert.IsInstanceOfType<PublishMenuChanges> (instance, "variable 'instance' is a PublishMenuChanges");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogElementId'
-        /// </summary>
-        [Test]
-        public void CatalogElementIdTest()
-        {
-            // TODO unit test for the property 'CatalogElementId'
-        }
-        /// <summary>
-        /// Test the property 'MenuIds'
-        /// </summary>
-        [Test]
-        public void MenuIdsTest()
-        {
-            // TODO unit test for the property 'MenuIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PushNotificationDeletedEventTests.cs b/src/Flipdish.Test/Model/PushNotificationDeletedEventTests.cs
deleted file mode 100644
index c845f00e..00000000
--- a/src/Flipdish.Test/Model/PushNotificationDeletedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PushNotificationDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PushNotificationDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PushNotificationDeletedEvent
-        //private PushNotificationDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PushNotificationDeletedEvent
-            //instance = new PushNotificationDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PushNotificationDeletedEvent
-        /// </summary>
-        [Test]
-        public void PushNotificationDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PushNotificationDeletedEvent
-            //Assert.IsInstanceOfType<PushNotificationDeletedEvent> (instance, "variable 'instance' is a PushNotificationDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'PushNotification'
-        /// </summary>
-        [Test]
-        public void PushNotificationTest()
-        {
-            // TODO unit test for the property 'PushNotification'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PushNotificationRequestTests.cs b/src/Flipdish.Test/Model/PushNotificationRequestTests.cs
deleted file mode 100644
index 35f68807..00000000
--- a/src/Flipdish.Test/Model/PushNotificationRequestTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PushNotificationRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PushNotificationRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for PushNotificationRequest
-        //private PushNotificationRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PushNotificationRequest
-            //instance = new PushNotificationRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PushNotificationRequest
-        /// </summary>
-        [Test]
-        public void PushNotificationRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PushNotificationRequest
-            //Assert.IsInstanceOfType<PushNotificationRequest> (instance, "variable 'instance' is a PushNotificationRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ScheduledTime'
-        /// </summary>
-        [Test]
-        public void ScheduledTimeTest()
-        {
-            // TODO unit test for the property 'ScheduledTime'
-        }
-        /// <summary>
-        /// Test the property 'Title'
-        /// </summary>
-        [Test]
-        public void TitleTest()
-        {
-            // TODO unit test for the property 'Title'
-        }
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PushNotificationResponseTests.cs b/src/Flipdish.Test/Model/PushNotificationResponseTests.cs
deleted file mode 100644
index 4c880fcb..00000000
--- a/src/Flipdish.Test/Model/PushNotificationResponseTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PushNotificationResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PushNotificationResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for PushNotificationResponse
-        //private PushNotificationResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PushNotificationResponse
-            //instance = new PushNotificationResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PushNotificationResponse
-        /// </summary>
-        [Test]
-        public void PushNotificationResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PushNotificationResponse
-            //Assert.IsInstanceOfType<PushNotificationResponse> (instance, "variable 'instance' is a PushNotificationResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Sent'
-        /// </summary>
-        [Test]
-        public void SentTest()
-        {
-            // TODO unit test for the property 'Sent'
-        }
-        /// <summary>
-        /// Test the property 'ScheduledPushNotificationId'
-        /// </summary>
-        [Test]
-        public void ScheduledPushNotificationIdTest()
-        {
-            // TODO unit test for the property 'ScheduledPushNotificationId'
-        }
-        /// <summary>
-        /// Test the property 'ScheduledTime'
-        /// </summary>
-        [Test]
-        public void ScheduledTimeTest()
-        {
-            // TODO unit test for the property 'ScheduledTime'
-        }
-        /// <summary>
-        /// Test the property 'Title'
-        /// </summary>
-        [Test]
-        public void TitleTest()
-        {
-            // TODO unit test for the property 'Title'
-        }
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PushNotificationScheduledEventTests.cs b/src/Flipdish.Test/Model/PushNotificationScheduledEventTests.cs
deleted file mode 100644
index 666b5de8..00000000
--- a/src/Flipdish.Test/Model/PushNotificationScheduledEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PushNotificationScheduledEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PushNotificationScheduledEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PushNotificationScheduledEvent
-        //private PushNotificationScheduledEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PushNotificationScheduledEvent
-            //instance = new PushNotificationScheduledEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PushNotificationScheduledEvent
-        /// </summary>
-        [Test]
-        public void PushNotificationScheduledEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PushNotificationScheduledEvent
-            //Assert.IsInstanceOfType<PushNotificationScheduledEvent> (instance, "variable 'instance' is a PushNotificationScheduledEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'PushNotification'
-        /// </summary>
-        [Test]
-        public void PushNotificationTest()
-        {
-            // TODO unit test for the property 'PushNotification'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/PushNotificationSentEventTests.cs b/src/Flipdish.Test/Model/PushNotificationSentEventTests.cs
deleted file mode 100644
index 340460dc..00000000
--- a/src/Flipdish.Test/Model/PushNotificationSentEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing PushNotificationSentEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class PushNotificationSentEventTests
-    {
-        // TODO uncomment below to declare an instance variable for PushNotificationSentEvent
-        //private PushNotificationSentEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of PushNotificationSentEvent
-            //instance = new PushNotificationSentEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of PushNotificationSentEvent
-        /// </summary>
-        [Test]
-        public void PushNotificationSentEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" PushNotificationSentEvent
-            //Assert.IsInstanceOfType<PushNotificationSentEvent> (instance, "variable 'instance' is a PushNotificationSentEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'PushNotification'
-        /// </summary>
-        [Test]
-        public void PushNotificationTest()
-        {
-            // TODO unit test for the property 'PushNotification'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RangeTests.cs b/src/Flipdish.Test/Model/RangeTests.cs
deleted file mode 100644
index 8cf25d40..00000000
--- a/src/Flipdish.Test/Model/RangeTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Range
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RangeTests
-    {
-        // TODO uncomment below to declare an instance variable for Range
-        //private Range instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Range
-            //instance = new Range();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Range
-        /// </summary>
-        [Test]
-        public void RangeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Range
-            //Assert.IsInstanceOfType<Range> (instance, "variable 'instance' is a Range");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StartTime'
-        /// </summary>
-        [Test]
-        public void StartTimeTest()
-        {
-            // TODO unit test for the property 'StartTime'
-        }
-        /// <summary>
-        /// Test the property 'Period'
-        /// </summary>
-        [Test]
-        public void PeriodTest()
-        {
-            // TODO unit test for the property 'Period'
-        }
-        /// <summary>
-        /// Test the property 'DayOfWeek'
-        /// </summary>
-        [Test]
-        public void DayOfWeekTest()
-        {
-            // TODO unit test for the property 'DayOfWeek'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ReaderActionStateInfoTests.cs b/src/Flipdish.Test/Model/ReaderActionStateInfoTests.cs
deleted file mode 100644
index dd564c89..00000000
--- a/src/Flipdish.Test/Model/ReaderActionStateInfoTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ReaderActionStateInfo
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ReaderActionStateInfoTests
-    {
-        // TODO uncomment below to declare an instance variable for ReaderActionStateInfo
-        //private ReaderActionStateInfo instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ReaderActionStateInfo
-            //instance = new ReaderActionStateInfo();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ReaderActionStateInfo
-        /// </summary>
-        [Test]
-        public void ReaderActionStateInfoInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ReaderActionStateInfo
-            //Assert.IsInstanceOfType<ReaderActionStateInfo> (instance, "variable 'instance' is a ReaderActionStateInfo");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ActionState'
-        /// </summary>
-        [Test]
-        public void ActionStateTest()
-        {
-            // TODO unit test for the property 'ActionState'
-        }
-        /// <summary>
-        /// Test the property 'FailureCode'
-        /// </summary>
-        [Test]
-        public void FailureCodeTest()
-        {
-            // TODO unit test for the property 'FailureCode'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RedeemInvitationResultTests.cs b/src/Flipdish.Test/Model/RedeemInvitationResultTests.cs
deleted file mode 100644
index 1e9219a3..00000000
--- a/src/Flipdish.Test/Model/RedeemInvitationResultTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RedeemInvitationResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RedeemInvitationResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RedeemInvitationResult
-        //private RedeemInvitationResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RedeemInvitationResult
-            //instance = new RedeemInvitationResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RedeemInvitationResult
-        /// </summary>
-        [Test]
-        public void RedeemInvitationResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RedeemInvitationResult
-            //Assert.IsInstanceOfType<RedeemInvitationResult> (instance, "variable 'instance' is a RedeemInvitationResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'InvitationStatus'
-        /// </summary>
-        [Test]
-        public void InvitationStatusTest()
-        {
-            // TODO unit test for the property 'InvitationStatus'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RefundTests.cs b/src/Flipdish.Test/Model/RefundTests.cs
deleted file mode 100644
index 84a220e4..00000000
--- a/src/Flipdish.Test/Model/RefundTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Refund
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RefundTests
-    {
-        // TODO uncomment below to declare an instance variable for Refund
-        //private Refund instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Refund
-            //instance = new Refund();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Refund
-        /// </summary>
-        [Test]
-        public void RefundInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Refund
-            //Assert.IsInstanceOfType<Refund> (instance, "variable 'instance' is a Refund");
-        }
-
-
-        /// <summary>
-        /// Test the property 'RefundReason'
-        /// </summary>
-        [Test]
-        public void RefundReasonTest()
-        {
-            // TODO unit test for the property 'RefundReason'
-        }
-        /// <summary>
-        /// Test the property 'RefundAmount'
-        /// </summary>
-        [Test]
-        public void RefundAmountTest()
-        {
-            // TODO unit test for the property 'RefundAmount'
-        }
-        /// <summary>
-        /// Test the property 'NotifyCustomer'
-        /// </summary>
-        [Test]
-        public void NotifyCustomerTest()
-        {
-            // TODO unit test for the property 'NotifyCustomer'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RejectTests.cs b/src/Flipdish.Test/Model/RejectTests.cs
deleted file mode 100644
index 03a22462..00000000
--- a/src/Flipdish.Test/Model/RejectTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Reject
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RejectTests
-    {
-        // TODO uncomment below to declare an instance variable for Reject
-        //private Reject instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Reject
-            //instance = new Reject();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Reject
-        /// </summary>
-        [Test]
-        public void RejectInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Reject
-            //Assert.IsInstanceOfType<Reject> (instance, "variable 'instance' is a Reject");
-        }
-
-
-        /// <summary>
-        /// Test the property 'RejectReason'
-        /// </summary>
-        [Test]
-        public void RejectReasonTest()
-        {
-            // TODO unit test for the property 'RejectReason'
-        }
-        /// <summary>
-        /// Test the property 'DoNotNotifyCustomer'
-        /// </summary>
-        [Test]
-        public void DoNotNotifyCustomerTest()
-        {
-            // TODO unit test for the property 'DoNotNotifyCustomer'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RequestLoginPinModelTests.cs b/src/Flipdish.Test/Model/RequestLoginPinModelTests.cs
deleted file mode 100644
index 7aa6cb18..00000000
--- a/src/Flipdish.Test/Model/RequestLoginPinModelTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RequestLoginPinModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RequestLoginPinModelTests
-    {
-        // TODO uncomment below to declare an instance variable for RequestLoginPinModel
-        //private RequestLoginPinModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RequestLoginPinModel
-            //instance = new RequestLoginPinModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RequestLoginPinModel
-        /// </summary>
-        [Test]
-        public void RequestLoginPinModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RequestLoginPinModel
-            //Assert.IsInstanceOfType<RequestLoginPinModel> (instance, "variable 'instance' is a RequestLoginPinModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RequestLoginPinResposneTests.cs b/src/Flipdish.Test/Model/RequestLoginPinResposneTests.cs
deleted file mode 100644
index 467d396c..00000000
--- a/src/Flipdish.Test/Model/RequestLoginPinResposneTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RequestLoginPinResposne
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RequestLoginPinResposneTests
-    {
-        // TODO uncomment below to declare an instance variable for RequestLoginPinResposne
-        //private RequestLoginPinResposne instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RequestLoginPinResposne
-            //instance = new RequestLoginPinResposne();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RequestLoginPinResposne
-        /// </summary>
-        [Test]
-        public void RequestLoginPinResposneInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RequestLoginPinResposne
-            //Assert.IsInstanceOfType<RequestLoginPinResposne> (instance, "variable 'instance' is a RequestLoginPinResposne");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LoginPinSentViaEmail'
-        /// </summary>
-        [Test]
-        public void LoginPinSentViaEmailTest()
-        {
-            // TODO unit test for the property 'LoginPinSentViaEmail'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RequestPasswordResetModelTests.cs b/src/Flipdish.Test/Model/RequestPasswordResetModelTests.cs
deleted file mode 100644
index 67280079..00000000
--- a/src/Flipdish.Test/Model/RequestPasswordResetModelTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RequestPasswordResetModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RequestPasswordResetModelTests
-    {
-        // TODO uncomment below to declare an instance variable for RequestPasswordResetModel
-        //private RequestPasswordResetModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RequestPasswordResetModel
-            //instance = new RequestPasswordResetModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RequestPasswordResetModel
-        /// </summary>
-        [Test]
-        public void RequestPasswordResetModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RequestPasswordResetModel
-            //Assert.IsInstanceOfType<RequestPasswordResetModel> (instance, "variable 'instance' is a RequestPasswordResetModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RequestPasswordResetPinResponseTests.cs b/src/Flipdish.Test/Model/RequestPasswordResetPinResponseTests.cs
deleted file mode 100644
index 244e703d..00000000
--- a/src/Flipdish.Test/Model/RequestPasswordResetPinResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RequestPasswordResetPinResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RequestPasswordResetPinResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RequestPasswordResetPinResponse
-        //private RequestPasswordResetPinResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RequestPasswordResetPinResponse
-            //instance = new RequestPasswordResetPinResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RequestPasswordResetPinResponse
-        /// </summary>
-        [Test]
-        public void RequestPasswordResetPinResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RequestPasswordResetPinResponse
-            //Assert.IsInstanceOfType<RequestPasswordResetPinResponse> (instance, "variable 'instance' is a RequestPasswordResetPinResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PasswordResetPinSentViaEmail'
-        /// </summary>
-        [Test]
-        public void PasswordResetPinSentViaEmailTest()
-        {
-            // TODO unit test for the property 'PasswordResetPinSentViaEmail'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ResponseTests.cs b/src/Flipdish.Test/Model/ResponseTests.cs
deleted file mode 100644
index 835e72ce..00000000
--- a/src/Flipdish.Test/Model/ResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Response
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for Response
-        //private Response instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Response
-            //instance = new Response();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Response
-        /// </summary>
-        [Test]
-        public void ResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Response
-            //Assert.IsInstanceOfType<Response> (instance, "variable 'instance' is a Response");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Stores'
-        /// </summary>
-        [Test]
-        public void StoresTest()
-        {
-            // TODO unit test for the property 'Stores'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultAllMetadataResultTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultAllMetadataResultTests.cs
deleted file mode 100644
index cc193b01..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultAllMetadataResultTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultAllMetadataResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultAllMetadataResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultAllMetadataResult
-        //private RestApiArrayResultAllMetadataResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultAllMetadataResult
-            //instance = new RestApiArrayResultAllMetadataResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultAllMetadataResult
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultAllMetadataResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultAllMetadataResult
-            //Assert.IsInstanceOfType<RestApiArrayResultAllMetadataResult> (instance, "variable 'instance' is a RestApiArrayResultAllMetadataResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultApmCurrencyDataPointTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultApmCurrencyDataPointTests.cs
deleted file mode 100644
index 206fff57..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultApmCurrencyDataPointTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultApmCurrencyDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultApmCurrencyDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultApmCurrencyDataPoint
-        //private RestApiArrayResultApmCurrencyDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultApmCurrencyDataPoint
-            //instance = new RestApiArrayResultApmCurrencyDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultApmCurrencyDataPoint
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultApmCurrencyDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultApmCurrencyDataPoint
-            //Assert.IsInstanceOfType<RestApiArrayResultApmCurrencyDataPoint> (instance, "variable 'instance' is a RestApiArrayResultApmCurrencyDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultApmDataPointTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultApmDataPointTests.cs
deleted file mode 100644
index 0bdaf0b1..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultApmDataPointTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultApmDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultApmDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultApmDataPoint
-        //private RestApiArrayResultApmDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultApmDataPoint
-            //instance = new RestApiArrayResultApmDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultApmDataPoint
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultApmDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultApmDataPoint
-            //Assert.IsInstanceOfType<RestApiArrayResultApmDataPoint> (instance, "variable 'instance' is a RestApiArrayResultApmDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultApmHourlyDataPointTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultApmHourlyDataPointTests.cs
deleted file mode 100644
index e71204fe..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultApmHourlyDataPointTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultApmHourlyDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultApmHourlyDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultApmHourlyDataPoint
-        //private RestApiArrayResultApmHourlyDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultApmHourlyDataPoint
-            //instance = new RestApiArrayResultApmHourlyDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultApmHourlyDataPoint
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultApmHourlyDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultApmHourlyDataPoint
-            //Assert.IsInstanceOfType<RestApiArrayResultApmHourlyDataPoint> (instance, "variable 'instance' is a RestApiArrayResultApmHourlyDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultAppConfigurationHeaderTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultAppConfigurationHeaderTests.cs
deleted file mode 100644
index 9e079f60..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultAppConfigurationHeaderTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultAppConfigurationHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultAppConfigurationHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultAppConfigurationHeader
-        //private RestApiArrayResultAppConfigurationHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultAppConfigurationHeader
-            //instance = new RestApiArrayResultAppConfigurationHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultAppConfigurationHeader
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultAppConfigurationHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultAppConfigurationHeader
-            //Assert.IsInstanceOfType<RestApiArrayResultAppConfigurationHeader> (instance, "variable 'instance' is a RestApiArrayResultAppConfigurationHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultAppConfigurationSummaryTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultAppConfigurationSummaryTests.cs
deleted file mode 100644
index 52107867..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultAppConfigurationSummaryTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultAppConfigurationSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultAppConfigurationSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultAppConfigurationSummary
-        //private RestApiArrayResultAppConfigurationSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultAppConfigurationSummary
-            //instance = new RestApiArrayResultAppConfigurationSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultAppConfigurationSummary
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultAppConfigurationSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultAppConfigurationSummary
-            //Assert.IsInstanceOfType<RestApiArrayResultAppConfigurationSummary> (instance, "variable 'instance' is a RestApiArrayResultAppConfigurationSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultAppStoreAppConfigurationHeaderTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultAppStoreAppConfigurationHeaderTests.cs
deleted file mode 100644
index 2d3417c6..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultAppStoreAppConfigurationHeaderTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultAppStoreAppConfigurationHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultAppStoreAppConfigurationHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultAppStoreAppConfigurationHeader
-        //private RestApiArrayResultAppStoreAppConfigurationHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultAppStoreAppConfigurationHeader
-            //instance = new RestApiArrayResultAppStoreAppConfigurationHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultAppStoreAppConfigurationHeader
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultAppStoreAppConfigurationHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultAppStoreAppConfigurationHeader
-            //Assert.IsInstanceOfType<RestApiArrayResultAppStoreAppConfigurationHeader> (instance, "variable 'instance' is a RestApiArrayResultAppStoreAppConfigurationHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultAppStoreAppConfigurationSummaryTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultAppStoreAppConfigurationSummaryTests.cs
deleted file mode 100644
index e12f0899..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultAppStoreAppConfigurationSummaryTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultAppStoreAppConfigurationSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultAppStoreAppConfigurationSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultAppStoreAppConfigurationSummary
-        //private RestApiArrayResultAppStoreAppConfigurationSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultAppStoreAppConfigurationSummary
-            //instance = new RestApiArrayResultAppStoreAppConfigurationSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultAppStoreAppConfigurationSummary
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultAppStoreAppConfigurationSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultAppStoreAppConfigurationSummary
-            //Assert.IsInstanceOfType<RestApiArrayResultAppStoreAppConfigurationSummary> (instance, "variable 'instance' is a RestApiArrayResultAppStoreAppConfigurationSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultBankAccountSummaryTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultBankAccountSummaryTests.cs
deleted file mode 100644
index 20b392f7..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultBankAccountSummaryTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultBankAccountSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultBankAccountSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultBankAccountSummary
-        //private RestApiArrayResultBankAccountSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultBankAccountSummary
-            //instance = new RestApiArrayResultBankAccountSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultBankAccountSummary
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultBankAccountSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultBankAccountSummary
-            //Assert.IsInstanceOfType<RestApiArrayResultBankAccountSummary> (instance, "variable 'instance' is a RestApiArrayResultBankAccountSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultBusinessHoursPeriodTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultBusinessHoursPeriodTests.cs
deleted file mode 100644
index a60aaf55..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultBusinessHoursPeriodTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultBusinessHoursPeriod
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultBusinessHoursPeriodTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultBusinessHoursPeriod
-        //private RestApiArrayResultBusinessHoursPeriod instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultBusinessHoursPeriod
-            //instance = new RestApiArrayResultBusinessHoursPeriod();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultBusinessHoursPeriod
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultBusinessHoursPeriodInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultBusinessHoursPeriod
-            //Assert.IsInstanceOfType<RestApiArrayResultBusinessHoursPeriod> (instance, "variable 'instance' is a RestApiArrayResultBusinessHoursPeriod");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultChannelTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultChannelTests.cs
deleted file mode 100644
index 685189f0..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultChannelTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultChannel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultChannelTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultChannel
-        //private RestApiArrayResultChannel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultChannel
-            //instance = new RestApiArrayResultChannel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultChannel
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultChannelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultChannel
-            //Assert.IsInstanceOfType<RestApiArrayResultChannel> (instance, "variable 'instance' is a RestApiArrayResultChannel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultConfiguredAppHeaderTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultConfiguredAppHeaderTests.cs
deleted file mode 100644
index 53103591..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultConfiguredAppHeaderTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultConfiguredAppHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultConfiguredAppHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultConfiguredAppHeader
-        //private RestApiArrayResultConfiguredAppHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultConfiguredAppHeader
-            //instance = new RestApiArrayResultConfiguredAppHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultConfiguredAppHeader
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultConfiguredAppHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultConfiguredAppHeader
-            //Assert.IsInstanceOfType<RestApiArrayResultConfiguredAppHeader> (instance, "variable 'instance' is a RestApiArrayResultConfiguredAppHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultCountryWithAccountFieldsDefinitionsTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultCountryWithAccountFieldsDefinitionsTests.cs
deleted file mode 100644
index f7385e3e..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultCountryWithAccountFieldsDefinitionsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultCountryWithAccountFieldsDefinitions
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultCountryWithAccountFieldsDefinitionsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultCountryWithAccountFieldsDefinitions
-        //private RestApiArrayResultCountryWithAccountFieldsDefinitions instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultCountryWithAccountFieldsDefinitions
-            //instance = new RestApiArrayResultCountryWithAccountFieldsDefinitions();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultCountryWithAccountFieldsDefinitions
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultCountryWithAccountFieldsDefinitionsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultCountryWithAccountFieldsDefinitions
-            //Assert.IsInstanceOfType<RestApiArrayResultCountryWithAccountFieldsDefinitions> (instance, "variable 'instance' is a RestApiArrayResultCountryWithAccountFieldsDefinitions");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultDeliveryZoneTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultDeliveryZoneTests.cs
deleted file mode 100644
index c7c617cc..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultDeliveryZoneTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultDeliveryZone
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultDeliveryZoneTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultDeliveryZone
-        //private RestApiArrayResultDeliveryZone instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultDeliveryZone
-            //instance = new RestApiArrayResultDeliveryZone();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultDeliveryZone
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultDeliveryZoneInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultDeliveryZone
-            //Assert.IsInstanceOfType<RestApiArrayResultDeliveryZone> (instance, "variable 'instance' is a RestApiArrayResultDeliveryZone");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultDriverStoreTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultDriverStoreTests.cs
deleted file mode 100644
index 01d82d85..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultDriverStoreTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultDriverStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultDriverStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultDriverStore
-        //private RestApiArrayResultDriverStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultDriverStore
-            //instance = new RestApiArrayResultDriverStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultDriverStore
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultDriverStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultDriverStore
-            //Assert.IsInstanceOfType<RestApiArrayResultDriverStore> (instance, "variable 'instance' is a RestApiArrayResultDriverStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultDriverTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultDriverTests.cs
deleted file mode 100644
index 9262c79d..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultDriverTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultDriver
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultDriverTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultDriver
-        //private RestApiArrayResultDriver instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultDriver
-            //instance = new RestApiArrayResultDriver();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultDriver
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultDriverInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultDriver
-            //Assert.IsInstanceOfType<RestApiArrayResultDriver> (instance, "variable 'instance' is a RestApiArrayResultDriver");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultEmvTerminalWithAssignmentsTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultEmvTerminalWithAssignmentsTests.cs
deleted file mode 100644
index 72c7359b..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultEmvTerminalWithAssignmentsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultEmvTerminalWithAssignments
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultEmvTerminalWithAssignmentsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultEmvTerminalWithAssignments
-        //private RestApiArrayResultEmvTerminalWithAssignments instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultEmvTerminalWithAssignments
-            //instance = new RestApiArrayResultEmvTerminalWithAssignments();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultEmvTerminalWithAssignments
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultEmvTerminalWithAssignmentsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultEmvTerminalWithAssignments
-            //Assert.IsInstanceOfType<RestApiArrayResultEmvTerminalWithAssignments> (instance, "variable 'instance' is a RestApiArrayResultEmvTerminalWithAssignments");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultFulfillmentStatesConfigurationSummaryTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultFulfillmentStatesConfigurationSummaryTests.cs
deleted file mode 100644
index 415e6104..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultFulfillmentStatesConfigurationSummaryTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultFulfillmentStatesConfigurationSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultFulfillmentStatesConfigurationSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultFulfillmentStatesConfigurationSummary
-        //private RestApiArrayResultFulfillmentStatesConfigurationSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultFulfillmentStatesConfigurationSummary
-            //instance = new RestApiArrayResultFulfillmentStatesConfigurationSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultFulfillmentStatesConfigurationSummary
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultFulfillmentStatesConfigurationSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultFulfillmentStatesConfigurationSummary
-            //Assert.IsInstanceOfType<RestApiArrayResultFulfillmentStatesConfigurationSummary> (instance, "variable 'instance' is a RestApiArrayResultFulfillmentStatesConfigurationSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultHomeActionTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultHomeActionTests.cs
deleted file mode 100644
index f48a9d7e..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultHomeActionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultHomeAction
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultHomeActionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultHomeAction
-        //private RestApiArrayResultHomeAction instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultHomeAction
-            //instance = new RestApiArrayResultHomeAction();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultHomeAction
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultHomeActionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultHomeAction
-            //Assert.IsInstanceOfType<RestApiArrayResultHomeAction> (instance, "variable 'instance' is a RestApiArrayResultHomeAction");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultKioskCashPaymentSettingsTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultKioskCashPaymentSettingsTests.cs
deleted file mode 100644
index 6715889a..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultKioskCashPaymentSettingsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultKioskCashPaymentSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultKioskCashPaymentSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultKioskCashPaymentSettings
-        //private RestApiArrayResultKioskCashPaymentSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultKioskCashPaymentSettings
-            //instance = new RestApiArrayResultKioskCashPaymentSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultKioskCashPaymentSettings
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultKioskCashPaymentSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultKioskCashPaymentSettings
-            //Assert.IsInstanceOfType<RestApiArrayResultKioskCashPaymentSettings> (instance, "variable 'instance' is a RestApiArrayResultKioskCashPaymentSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultLocalisedTimeZoneTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultLocalisedTimeZoneTests.cs
deleted file mode 100644
index 5bb33211..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultLocalisedTimeZoneTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultLocalisedTimeZone
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultLocalisedTimeZoneTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultLocalisedTimeZone
-        //private RestApiArrayResultLocalisedTimeZone instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultLocalisedTimeZone
-            //instance = new RestApiArrayResultLocalisedTimeZone();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultLocalisedTimeZone
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultLocalisedTimeZoneInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultLocalisedTimeZone
-            //Assert.IsInstanceOfType<RestApiArrayResultLocalisedTimeZone> (instance, "variable 'instance' is a RestApiArrayResultLocalisedTimeZone");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultLocationAreaLocationTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultLocationAreaLocationTests.cs
deleted file mode 100644
index 3c8b0a07..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultLocationAreaLocationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultLocationAreaLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultLocationAreaLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultLocationAreaLocation
-        //private RestApiArrayResultLocationAreaLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultLocationAreaLocation
-            //instance = new RestApiArrayResultLocationAreaLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultLocationAreaLocation
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultLocationAreaLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultLocationAreaLocation
-            //Assert.IsInstanceOfType<RestApiArrayResultLocationAreaLocation> (instance, "variable 'instance' is a RestApiArrayResultLocationAreaLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultLocationAreaWithLocationsTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultLocationAreaWithLocationsTests.cs
deleted file mode 100644
index 0d3fbe2a..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultLocationAreaWithLocationsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultLocationAreaWithLocations
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultLocationAreaWithLocationsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultLocationAreaWithLocations
-        //private RestApiArrayResultLocationAreaWithLocations instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultLocationAreaWithLocations
-            //instance = new RestApiArrayResultLocationAreaWithLocations();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultLocationAreaWithLocations
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultLocationAreaWithLocationsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultLocationAreaWithLocations
-            //Assert.IsInstanceOfType<RestApiArrayResultLocationAreaWithLocations> (instance, "variable 'instance' is a RestApiArrayResultLocationAreaWithLocations");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultLoyaltyCampaignTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultLoyaltyCampaignTests.cs
deleted file mode 100644
index 2a967c90..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultLoyaltyCampaignTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultLoyaltyCampaign
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultLoyaltyCampaignTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultLoyaltyCampaign
-        //private RestApiArrayResultLoyaltyCampaign instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultLoyaltyCampaign
-            //instance = new RestApiArrayResultLoyaltyCampaign();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultLoyaltyCampaign
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultLoyaltyCampaignInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultLoyaltyCampaign
-            //Assert.IsInstanceOfType<RestApiArrayResultLoyaltyCampaign> (instance, "variable 'instance' is a RestApiArrayResultLoyaltyCampaign");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuCheckpointTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuCheckpointTests.cs
deleted file mode 100644
index 2951dcf8..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuCheckpointTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuCheckpoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuCheckpointTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuCheckpoint
-        //private RestApiArrayResultMenuCheckpoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuCheckpoint
-            //instance = new RestApiArrayResultMenuCheckpoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuCheckpoint
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuCheckpointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuCheckpoint
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuCheckpoint> (instance, "variable 'instance' is a RestApiArrayResultMenuCheckpoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuElementEditResponseTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuElementEditResponseTests.cs
deleted file mode 100644
index 3a47a413..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuElementEditResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuElementEditResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuElementEditResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuElementEditResponse
-        //private RestApiArrayResultMenuElementEditResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuElementEditResponse
-            //instance = new RestApiArrayResultMenuElementEditResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuElementEditResponse
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuElementEditResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuElementEditResponse
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuElementEditResponse> (instance, "variable 'instance' is a RestApiArrayResultMenuElementEditResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuElementListResponseTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuElementListResponseTests.cs
deleted file mode 100644
index 123b6041..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuElementListResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuElementListResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuElementListResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuElementListResponse
-        //private RestApiArrayResultMenuElementListResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuElementListResponse
-            //instance = new RestApiArrayResultMenuElementListResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuElementListResponse
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuElementListResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuElementListResponse
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuElementListResponse> (instance, "variable 'instance' is a RestApiArrayResultMenuElementListResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuItemOptionSetItemTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuItemOptionSetItemTests.cs
deleted file mode 100644
index d92752cc..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuItemOptionSetItemTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuItemOptionSetItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuItemOptionSetItemTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuItemOptionSetItem
-        //private RestApiArrayResultMenuItemOptionSetItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuItemOptionSetItem
-            //instance = new RestApiArrayResultMenuItemOptionSetItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuItemOptionSetItem
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuItemOptionSetItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuItemOptionSetItem
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuItemOptionSetItem> (instance, "variable 'instance' is a RestApiArrayResultMenuItemOptionSetItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuItemOptionSetTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuItemOptionSetTests.cs
deleted file mode 100644
index d0b60416..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuItemOptionSetTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuItemOptionSet
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuItemOptionSetTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuItemOptionSet
-        //private RestApiArrayResultMenuItemOptionSet instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuItemOptionSet
-            //instance = new RestApiArrayResultMenuItemOptionSet();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuItemOptionSet
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuItemOptionSetInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuItemOptionSet
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuItemOptionSet> (instance, "variable 'instance' is a RestApiArrayResultMenuItemOptionSet");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuSectionItemTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuSectionItemTests.cs
deleted file mode 100644
index a8be01b2..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuSectionItemTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuSectionItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuSectionItemTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuSectionItem
-        //private RestApiArrayResultMenuSectionItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuSectionItem
-            //instance = new RestApiArrayResultMenuSectionItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuSectionItem
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuSectionItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuSectionItem
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuSectionItem> (instance, "variable 'instance' is a RestApiArrayResultMenuSectionItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuSectionTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuSectionTests.cs
deleted file mode 100644
index 4ce5e6af..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuSectionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuSection
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuSectionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuSection
-        //private RestApiArrayResultMenuSection instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuSection
-            //instance = new RestApiArrayResultMenuSection();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuSection
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuSectionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuSection
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuSection> (instance, "variable 'instance' is a RestApiArrayResultMenuSection");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuStoreNamesTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuStoreNamesTests.cs
deleted file mode 100644
index b826229d..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuStoreNamesTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuStoreNames
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuStoreNamesTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuStoreNames
-        //private RestApiArrayResultMenuStoreNames instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuStoreNames
-            //instance = new RestApiArrayResultMenuStoreNames();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuStoreNames
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuStoreNamesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuStoreNames
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuStoreNames> (instance, "variable 'instance' is a RestApiArrayResultMenuStoreNames");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuSummaryTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuSummaryTests.cs
deleted file mode 100644
index 3c4eae35..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuSummaryTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuSummary
-        //private RestApiArrayResultMenuSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuSummary
-            //instance = new RestApiArrayResultMenuSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuSummary
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuSummary
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuSummary> (instance, "variable 'instance' is a RestApiArrayResultMenuSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMenuTaxDetailsTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMenuTaxDetailsTests.cs
deleted file mode 100644
index ceb7ed0e..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMenuTaxDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMenuTaxDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMenuTaxDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMenuTaxDetails
-        //private RestApiArrayResultMenuTaxDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMenuTaxDetails
-            //instance = new RestApiArrayResultMenuTaxDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMenuTaxDetails
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMenuTaxDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMenuTaxDetails
-            //Assert.IsInstanceOfType<RestApiArrayResultMenuTaxDetails> (instance, "variable 'instance' is a RestApiArrayResultMenuTaxDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMetadataTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMetadataTests.cs
deleted file mode 100644
index fc5e2a87..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMetadataTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMetadata
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMetadataTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMetadata
-        //private RestApiArrayResultMetadata instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMetadata
-            //instance = new RestApiArrayResultMetadata();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMetadata
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMetadataInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMetadata
-            //Assert.IsInstanceOfType<RestApiArrayResultMetadata> (instance, "variable 'instance' is a RestApiArrayResultMetadata");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultMobileAppsStatisticsTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultMobileAppsStatisticsTests.cs
deleted file mode 100644
index c8ddd454..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultMobileAppsStatisticsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultMobileAppsStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultMobileAppsStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultMobileAppsStatistics
-        //private RestApiArrayResultMobileAppsStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultMobileAppsStatistics
-            //instance = new RestApiArrayResultMobileAppsStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultMobileAppsStatistics
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultMobileAppsStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultMobileAppsStatistics
-            //Assert.IsInstanceOfType<RestApiArrayResultMobileAppsStatistics> (instance, "variable 'instance' is a RestApiArrayResultMobileAppsStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultOAuthAppTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultOAuthAppTests.cs
deleted file mode 100644
index 71ba26bf..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultOAuthAppTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultOAuthApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultOAuthAppTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultOAuthApp
-        //private RestApiArrayResultOAuthApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultOAuthApp
-            //instance = new RestApiArrayResultOAuthApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultOAuthApp
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultOAuthAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultOAuthApp
-            //Assert.IsInstanceOfType<RestApiArrayResultOAuthApp> (instance, "variable 'instance' is a RestApiArrayResultOAuthApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultOauthClientRedirectUriTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultOauthClientRedirectUriTests.cs
deleted file mode 100644
index 9c652ebf..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultOauthClientRedirectUriTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultOauthClientRedirectUri
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultOauthClientRedirectUriTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultOauthClientRedirectUri
-        //private RestApiArrayResultOauthClientRedirectUri instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultOauthClientRedirectUri
-            //instance = new RestApiArrayResultOauthClientRedirectUri();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultOauthClientRedirectUri
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultOauthClientRedirectUriInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultOauthClientRedirectUri
-            //Assert.IsInstanceOfType<RestApiArrayResultOauthClientRedirectUri> (instance, "variable 'instance' is a RestApiArrayResultOauthClientRedirectUri");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultOrderBatchItemTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultOrderBatchItemTests.cs
deleted file mode 100644
index f233d21b..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultOrderBatchItemTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultOrderBatchItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultOrderBatchItemTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultOrderBatchItem
-        //private RestApiArrayResultOrderBatchItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultOrderBatchItem
-            //instance = new RestApiArrayResultOrderBatchItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultOrderBatchItem
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultOrderBatchItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultOrderBatchItem
-            //Assert.IsInstanceOfType<RestApiArrayResultOrderBatchItem> (instance, "variable 'instance' is a RestApiArrayResultOrderBatchItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultOrderFulfillmentStatusTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultOrderFulfillmentStatusTests.cs
deleted file mode 100644
index 777b2334..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultOrderFulfillmentStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultOrderFulfillmentStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultOrderFulfillmentStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultOrderFulfillmentStatus
-        //private RestApiArrayResultOrderFulfillmentStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultOrderFulfillmentStatus
-            //instance = new RestApiArrayResultOrderFulfillmentStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultOrderFulfillmentStatus
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultOrderFulfillmentStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultOrderFulfillmentStatus
-            //Assert.IsInstanceOfType<RestApiArrayResultOrderFulfillmentStatus> (instance, "variable 'instance' is a RestApiArrayResultOrderFulfillmentStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultPayoutSummaryTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultPayoutSummaryTests.cs
deleted file mode 100644
index ba33c87c..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultPayoutSummaryTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultPayoutSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultPayoutSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultPayoutSummary
-        //private RestApiArrayResultPayoutSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultPayoutSummary
-            //instance = new RestApiArrayResultPayoutSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultPayoutSummary
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultPayoutSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultPayoutSummary
-            //Assert.IsInstanceOfType<RestApiArrayResultPayoutSummary> (instance, "variable 'instance' is a RestApiArrayResultPayoutSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultPendingMenuChangesSummariesTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultPendingMenuChangesSummariesTests.cs
deleted file mode 100644
index 8f09bdcf..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultPendingMenuChangesSummariesTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultPendingMenuChangesSummaries
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultPendingMenuChangesSummariesTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultPendingMenuChangesSummaries
-        //private RestApiArrayResultPendingMenuChangesSummaries instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultPendingMenuChangesSummaries
-            //instance = new RestApiArrayResultPendingMenuChangesSummaries();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultPendingMenuChangesSummaries
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultPendingMenuChangesSummariesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultPendingMenuChangesSummaries
-            //Assert.IsInstanceOfType<RestApiArrayResultPendingMenuChangesSummaries> (instance, "variable 'instance' is a RestApiArrayResultPendingMenuChangesSummaries");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultPreOrderTimeTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultPreOrderTimeTests.cs
deleted file mode 100644
index 293c17b1..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultPreOrderTimeTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultPreOrderTime
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultPreOrderTimeTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultPreOrderTime
-        //private RestApiArrayResultPreOrderTime instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultPreOrderTime
-            //instance = new RestApiArrayResultPreOrderTime();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultPreOrderTime
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultPreOrderTimeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultPreOrderTime
-            //Assert.IsInstanceOfType<RestApiArrayResultPreOrderTime> (instance, "variable 'instance' is a RestApiArrayResultPreOrderTime");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultProcessingFeeConfigTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultProcessingFeeConfigTests.cs
deleted file mode 100644
index f9791c1e..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultProcessingFeeConfigTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultProcessingFeeConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultProcessingFeeConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultProcessingFeeConfig
-        //private RestApiArrayResultProcessingFeeConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultProcessingFeeConfig
-            //instance = new RestApiArrayResultProcessingFeeConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultProcessingFeeConfig
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultProcessingFeeConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultProcessingFeeConfig
-            //Assert.IsInstanceOfType<RestApiArrayResultProcessingFeeConfig> (instance, "variable 'instance' is a RestApiArrayResultProcessingFeeConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultRestApiDefaultResponseTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultRestApiDefaultResponseTests.cs
deleted file mode 100644
index 54a7dbd4..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultRestApiDefaultResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultRestApiDefaultResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultRestApiDefaultResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultRestApiDefaultResponse
-        //private RestApiArrayResultRestApiDefaultResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultRestApiDefaultResponse
-            //instance = new RestApiArrayResultRestApiDefaultResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultRestApiDefaultResponse
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultRestApiDefaultResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultRestApiDefaultResponse
-            //Assert.IsInstanceOfType<RestApiArrayResultRestApiDefaultResponse> (instance, "variable 'instance' is a RestApiArrayResultRestApiDefaultResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultRestaurantVoucherEligibleStoreTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultRestaurantVoucherEligibleStoreTests.cs
deleted file mode 100644
index 02ebd325..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultRestaurantVoucherEligibleStoreTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultRestaurantVoucherEligibleStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultRestaurantVoucherEligibleStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultRestaurantVoucherEligibleStore
-        //private RestApiArrayResultRestaurantVoucherEligibleStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultRestaurantVoucherEligibleStore
-            //instance = new RestApiArrayResultRestaurantVoucherEligibleStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultRestaurantVoucherEligibleStore
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultRestaurantVoucherEligibleStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultRestaurantVoucherEligibleStore
-            //Assert.IsInstanceOfType<RestApiArrayResultRestaurantVoucherEligibleStore> (instance, "variable 'instance' is a RestApiArrayResultRestaurantVoucherEligibleStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultRetentionCampaignTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultRetentionCampaignTests.cs
deleted file mode 100644
index f8aba6dd..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultRetentionCampaignTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultRetentionCampaign
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultRetentionCampaignTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultRetentionCampaign
-        //private RestApiArrayResultRetentionCampaign instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultRetentionCampaign
-            //instance = new RestApiArrayResultRetentionCampaign();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultRetentionCampaign
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultRetentionCampaignInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultRetentionCampaign
-            //Assert.IsInstanceOfType<RestApiArrayResultRetentionCampaign> (instance, "variable 'instance' is a RestApiArrayResultRetentionCampaign");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultStoreChannelAssignmentTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultStoreChannelAssignmentTests.cs
deleted file mode 100644
index 31c3af83..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultStoreChannelAssignmentTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultStoreChannelAssignment
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultStoreChannelAssignmentTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultStoreChannelAssignment
-        //private RestApiArrayResultStoreChannelAssignment instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultStoreChannelAssignment
-            //instance = new RestApiArrayResultStoreChannelAssignment();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultStoreChannelAssignment
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultStoreChannelAssignmentInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultStoreChannelAssignment
-            //Assert.IsInstanceOfType<RestApiArrayResultStoreChannelAssignment> (instance, "variable 'instance' is a RestApiArrayResultStoreChannelAssignment");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultStoreChannelStoreMappingTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultStoreChannelStoreMappingTests.cs
deleted file mode 100644
index 4834b047..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultStoreChannelStoreMappingTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultStoreChannelStoreMapping
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultStoreChannelStoreMappingTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultStoreChannelStoreMapping
-        //private RestApiArrayResultStoreChannelStoreMapping instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultStoreChannelStoreMapping
-            //instance = new RestApiArrayResultStoreChannelStoreMapping();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultStoreChannelStoreMapping
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultStoreChannelStoreMappingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultStoreChannelStoreMapping
-            //Assert.IsInstanceOfType<RestApiArrayResultStoreChannelStoreMapping> (instance, "variable 'instance' is a RestApiArrayResultStoreChannelStoreMapping");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultStoreListItemTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultStoreListItemTests.cs
deleted file mode 100644
index 6528a47b..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultStoreListItemTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultStoreListItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultStoreListItemTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultStoreListItem
-        //private RestApiArrayResultStoreListItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultStoreListItem
-            //instance = new RestApiArrayResultStoreListItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultStoreListItem
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultStoreListItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultStoreListItem
-            //Assert.IsInstanceOfType<RestApiArrayResultStoreListItem> (instance, "variable 'instance' is a RestApiArrayResultStoreListItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultStoreStatisticsTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultStoreStatisticsTests.cs
deleted file mode 100644
index 60eabe9d..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultStoreStatisticsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultStoreStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultStoreStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultStoreStatistics
-        //private RestApiArrayResultStoreStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultStoreStatistics
-            //instance = new RestApiArrayResultStoreStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultStoreStatistics
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultStoreStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultStoreStatistics
-            //Assert.IsInstanceOfType<RestApiArrayResultStoreStatistics> (instance, "variable 'instance' is a RestApiArrayResultStoreStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultSupportedCountryTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultSupportedCountryTests.cs
deleted file mode 100644
index ceedb77b..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultSupportedCountryTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultSupportedCountry
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultSupportedCountryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultSupportedCountry
-        //private RestApiArrayResultSupportedCountry instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultSupportedCountry
-            //instance = new RestApiArrayResultSupportedCountry();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultSupportedCountry
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultSupportedCountryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultSupportedCountry
-            //Assert.IsInstanceOfType<RestApiArrayResultSupportedCountry> (instance, "variable 'instance' is a RestApiArrayResultSupportedCountry");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultTeammateTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultTeammateTests.cs
deleted file mode 100644
index 20cca43b..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultTeammateTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultTeammate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultTeammateTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultTeammate
-        //private RestApiArrayResultTeammate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultTeammate
-            //instance = new RestApiArrayResultTeammate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultTeammate
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultTeammateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultTeammate
-            //Assert.IsInstanceOfType<RestApiArrayResultTeammate> (instance, "variable 'instance' is a RestApiArrayResultTeammate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultVoucherDataPointTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultVoucherDataPointTests.cs
deleted file mode 100644
index 0e79d0a1..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultVoucherDataPointTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultVoucherDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultVoucherDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultVoucherDataPoint
-        //private RestApiArrayResultVoucherDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultVoucherDataPoint
-            //instance = new RestApiArrayResultVoucherDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultVoucherDataPoint
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultVoucherDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultVoucherDataPoint
-            //Assert.IsInstanceOfType<RestApiArrayResultVoucherDataPoint> (instance, "variable 'instance' is a RestApiArrayResultVoucherDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiArrayResultWebhookSubscriptionTests.cs b/src/Flipdish.Test/Model/RestApiArrayResultWebhookSubscriptionTests.cs
deleted file mode 100644
index c272c78f..00000000
--- a/src/Flipdish.Test/Model/RestApiArrayResultWebhookSubscriptionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiArrayResultWebhookSubscription
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiArrayResultWebhookSubscriptionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiArrayResultWebhookSubscription
-        //private RestApiArrayResultWebhookSubscription instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiArrayResultWebhookSubscription
-            //instance = new RestApiArrayResultWebhookSubscription();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiArrayResultWebhookSubscription
-        /// </summary>
-        [Test]
-        public void RestApiArrayResultWebhookSubscriptionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiArrayResultWebhookSubscription
-            //Assert.IsInstanceOfType<RestApiArrayResultWebhookSubscription> (instance, "variable 'instance' is a RestApiArrayResultWebhookSubscription");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiDefaultResponseTests.cs b/src/Flipdish.Test/Model/RestApiDefaultResponseTests.cs
deleted file mode 100644
index 6197d4d1..00000000
--- a/src/Flipdish.Test/Model/RestApiDefaultResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiDefaultResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiDefaultResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiDefaultResponse
-        //private RestApiDefaultResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiDefaultResponse
-            //instance = new RestApiDefaultResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiDefaultResponse
-        /// </summary>
-        [Test]
-        public void RestApiDefaultResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiDefaultResponse
-            //Assert.IsInstanceOfType<RestApiDefaultResponse> (instance, "variable 'instance' is a RestApiDefaultResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiErrorResultTests.cs b/src/Flipdish.Test/Model/RestApiErrorResultTests.cs
deleted file mode 100644
index bd880850..00000000
--- a/src/Flipdish.Test/Model/RestApiErrorResultTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiErrorResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiErrorResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiErrorResult
-        //private RestApiErrorResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiErrorResult
-            //instance = new RestApiErrorResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiErrorResult
-        /// </summary>
-        [Test]
-        public void RestApiErrorResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiErrorResult
-            //Assert.IsInstanceOfType<RestApiErrorResult> (instance, "variable 'instance' is a RestApiErrorResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-        /// <summary>
-        /// Test the property 'StackTrace'
-        /// </summary>
-        [Test]
-        public void StackTraceTest()
-        {
-            // TODO unit test for the property 'StackTrace'
-        }
-        /// <summary>
-        /// Test the property 'Errors'
-        /// </summary>
-        [Test]
-        public void ErrorsTest()
-        {
-            // TODO unit test for the property 'Errors'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiEventSearchPaginationResultTests.cs b/src/Flipdish.Test/Model/RestApiEventSearchPaginationResultTests.cs
deleted file mode 100644
index 609987a2..00000000
--- a/src/Flipdish.Test/Model/RestApiEventSearchPaginationResultTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiEventSearchPaginationResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiEventSearchPaginationResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiEventSearchPaginationResult
-        //private RestApiEventSearchPaginationResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiEventSearchPaginationResult
-            //instance = new RestApiEventSearchPaginationResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiEventSearchPaginationResult
-        /// </summary>
-        [Test]
-        public void RestApiEventSearchPaginationResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiEventSearchPaginationResult
-            //Assert.IsInstanceOfType<RestApiEventSearchPaginationResult> (instance, "variable 'instance' is a RestApiEventSearchPaginationResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiForbiddenResultTests.cs b/src/Flipdish.Test/Model/RestApiForbiddenResultTests.cs
deleted file mode 100644
index 766c6e13..00000000
--- a/src/Flipdish.Test/Model/RestApiForbiddenResultTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiForbiddenResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiForbiddenResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiForbiddenResult
-        //private RestApiForbiddenResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiForbiddenResult
-            //instance = new RestApiForbiddenResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiForbiddenResult
-        /// </summary>
-        [Test]
-        public void RestApiForbiddenResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiForbiddenResult
-            //Assert.IsInstanceOfType<RestApiForbiddenResult> (instance, "variable 'instance' is a RestApiForbiddenResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiIntegerResultTests.cs b/src/Flipdish.Test/Model/RestApiIntegerResultTests.cs
deleted file mode 100644
index a6c33c32..00000000
--- a/src/Flipdish.Test/Model/RestApiIntegerResultTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiIntegerResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiIntegerResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiIntegerResult
-        //private RestApiIntegerResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiIntegerResult
-            //instance = new RestApiIntegerResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiIntegerResult
-        /// </summary>
-        [Test]
-        public void RestApiIntegerResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiIntegerResult
-            //Assert.IsInstanceOfType<RestApiIntegerResult> (instance, "variable 'instance' is a RestApiIntegerResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultAppStoreAppSummaryTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultAppStoreAppSummaryTests.cs
deleted file mode 100644
index 7ae66692..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultAppStoreAppSummaryTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultAppStoreAppSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultAppStoreAppSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultAppStoreAppSummary
-        //private RestApiPaginationResultAppStoreAppSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultAppStoreAppSummary
-            //instance = new RestApiPaginationResultAppStoreAppSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultAppStoreAppSummary
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultAppStoreAppSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultAppStoreAppSummary
-            //Assert.IsInstanceOfType<RestApiPaginationResultAppStoreAppSummary> (instance, "variable 'instance' is a RestApiPaginationResultAppStoreAppSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultAppSummaryTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultAppSummaryTests.cs
deleted file mode 100644
index 53778190..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultAppSummaryTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultAppSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultAppSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultAppSummary
-        //private RestApiPaginationResultAppSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultAppSummary
-            //instance = new RestApiPaginationResultAppSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultAppSummary
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultAppSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultAppSummary
-            //Assert.IsInstanceOfType<RestApiPaginationResultAppSummary> (instance, "variable 'instance' is a RestApiPaginationResultAppSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultAppTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultAppTests.cs
deleted file mode 100644
index ba9cca7c..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultAppTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultAppTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultApp
-        //private RestApiPaginationResultApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultApp
-            //instance = new RestApiPaginationResultApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultApp
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultApp
-            //Assert.IsInstanceOfType<RestApiPaginationResultApp> (instance, "variable 'instance' is a RestApiPaginationResultApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultBusinessHoursOverrideTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultBusinessHoursOverrideTests.cs
deleted file mode 100644
index 4be5ca7c..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultBusinessHoursOverrideTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultBusinessHoursOverride
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultBusinessHoursOverrideTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultBusinessHoursOverride
-        //private RestApiPaginationResultBusinessHoursOverride instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultBusinessHoursOverride
-            //instance = new RestApiPaginationResultBusinessHoursOverride();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultBusinessHoursOverride
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultBusinessHoursOverrideInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultBusinessHoursOverride
-            //Assert.IsInstanceOfType<RestApiPaginationResultBusinessHoursOverride> (instance, "variable 'instance' is a RestApiPaginationResultBusinessHoursOverride");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultCatalogGroupTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultCatalogGroupTests.cs
deleted file mode 100644
index 309cbd94..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultCatalogGroupTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultCatalogGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultCatalogGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultCatalogGroup
-        //private RestApiPaginationResultCatalogGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultCatalogGroup
-            //instance = new RestApiPaginationResultCatalogGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultCatalogGroup
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultCatalogGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultCatalogGroup
-            //Assert.IsInstanceOfType<RestApiPaginationResultCatalogGroup> (instance, "variable 'instance' is a RestApiPaginationResultCatalogGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultCatalogItemTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultCatalogItemTests.cs
deleted file mode 100644
index c4bd9d0c..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultCatalogItemTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultCatalogItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultCatalogItemTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultCatalogItem
-        //private RestApiPaginationResultCatalogItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultCatalogItem
-            //instance = new RestApiPaginationResultCatalogItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultCatalogItem
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultCatalogItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultCatalogItem
-            //Assert.IsInstanceOfType<RestApiPaginationResultCatalogItem> (instance, "variable 'instance' is a RestApiPaginationResultCatalogItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultChannelTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultChannelTests.cs
deleted file mode 100644
index 773f9ec7..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultChannelTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultChannel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultChannelTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultChannel
-        //private RestApiPaginationResultChannel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultChannel
-            //instance = new RestApiPaginationResultChannel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultChannel
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultChannelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultChannel
-            //Assert.IsInstanceOfType<RestApiPaginationResultChannel> (instance, "variable 'instance' is a RestApiPaginationResultChannel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultGroupTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultGroupTests.cs
deleted file mode 100644
index 2e2fb93f..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultGroupTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultGroup
-        //private RestApiPaginationResultGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultGroup
-            //instance = new RestApiPaginationResultGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultGroup
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultGroup
-            //Assert.IsInstanceOfType<RestApiPaginationResultGroup> (instance, "variable 'instance' is a RestApiPaginationResultGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultHttpRequestAndResponseLogTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultHttpRequestAndResponseLogTests.cs
deleted file mode 100644
index ccb72a1c..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultHttpRequestAndResponseLogTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultHttpRequestAndResponseLog
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultHttpRequestAndResponseLogTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultHttpRequestAndResponseLog
-        //private RestApiPaginationResultHttpRequestAndResponseLog instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultHttpRequestAndResponseLog
-            //instance = new RestApiPaginationResultHttpRequestAndResponseLog();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultHttpRequestAndResponseLog
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultHttpRequestAndResponseLogInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultHttpRequestAndResponseLog
-            //Assert.IsInstanceOfType<RestApiPaginationResultHttpRequestAndResponseLog> (instance, "variable 'instance' is a RestApiPaginationResultHttpRequestAndResponseLog");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultHydraDeviceDetailsTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultHydraDeviceDetailsTests.cs
deleted file mode 100644
index 701f7d81..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultHydraDeviceDetailsTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultHydraDeviceDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultHydraDeviceDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultHydraDeviceDetails
-        //private RestApiPaginationResultHydraDeviceDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultHydraDeviceDetails
-            //instance = new RestApiPaginationResultHydraDeviceDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultHydraDeviceDetails
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultHydraDeviceDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultHydraDeviceDetails
-            //Assert.IsInstanceOfType<RestApiPaginationResultHydraDeviceDetails> (instance, "variable 'instance' is a RestApiPaginationResultHydraDeviceDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultMetafieldDefinitionRecommendationTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultMetafieldDefinitionRecommendationTests.cs
deleted file mode 100644
index 3fc9f8f9..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultMetafieldDefinitionRecommendationTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultMetafieldDefinitionRecommendation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultMetafieldDefinitionRecommendationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultMetafieldDefinitionRecommendation
-        //private RestApiPaginationResultMetafieldDefinitionRecommendation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultMetafieldDefinitionRecommendation
-            //instance = new RestApiPaginationResultMetafieldDefinitionRecommendation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultMetafieldDefinitionRecommendation
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultMetafieldDefinitionRecommendationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultMetafieldDefinitionRecommendation
-            //Assert.IsInstanceOfType<RestApiPaginationResultMetafieldDefinitionRecommendation> (instance, "variable 'instance' is a RestApiPaginationResultMetafieldDefinitionRecommendation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultMetafieldDefinitionTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultMetafieldDefinitionTests.cs
deleted file mode 100644
index c2927c08..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultMetafieldDefinitionTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultMetafieldDefinition
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultMetafieldDefinitionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultMetafieldDefinition
-        //private RestApiPaginationResultMetafieldDefinition instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultMetafieldDefinition
-            //instance = new RestApiPaginationResultMetafieldDefinition();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultMetafieldDefinition
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultMetafieldDefinitionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultMetafieldDefinition
-            //Assert.IsInstanceOfType<RestApiPaginationResultMetafieldDefinition> (instance, "variable 'instance' is a RestApiPaginationResultMetafieldDefinition");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultOAuthTokenModelTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultOAuthTokenModelTests.cs
deleted file mode 100644
index 4738012b..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultOAuthTokenModelTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultOAuthTokenModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultOAuthTokenModelTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultOAuthTokenModel
-        //private RestApiPaginationResultOAuthTokenModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultOAuthTokenModel
-            //instance = new RestApiPaginationResultOAuthTokenModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultOAuthTokenModel
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultOAuthTokenModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultOAuthTokenModel
-            //Assert.IsInstanceOfType<RestApiPaginationResultOAuthTokenModel> (instance, "variable 'instance' is a RestApiPaginationResultOAuthTokenModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultOrderSummaryTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultOrderSummaryTests.cs
deleted file mode 100644
index bc1f9b96..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultOrderSummaryTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultOrderSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultOrderSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultOrderSummary
-        //private RestApiPaginationResultOrderSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultOrderSummary
-            //instance = new RestApiPaginationResultOrderSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultOrderSummary
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultOrderSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultOrderSummary
-            //Assert.IsInstanceOfType<RestApiPaginationResultOrderSummary> (instance, "variable 'instance' is a RestApiPaginationResultOrderSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultOrderTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultOrderTests.cs
deleted file mode 100644
index 300452fc..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultOrderTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultOrder
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultOrderTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultOrder
-        //private RestApiPaginationResultOrder instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultOrder
-            //instance = new RestApiPaginationResultOrder();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultOrder
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultOrderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultOrder
-            //Assert.IsInstanceOfType<RestApiPaginationResultOrder> (instance, "variable 'instance' is a RestApiPaginationResultOrder");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultOwnerEntityConfigurationsTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultOwnerEntityConfigurationsTests.cs
deleted file mode 100644
index 549157c3..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultOwnerEntityConfigurationsTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultOwnerEntityConfigurations
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultOwnerEntityConfigurationsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultOwnerEntityConfigurations
-        //private RestApiPaginationResultOwnerEntityConfigurations instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultOwnerEntityConfigurations
-            //instance = new RestApiPaginationResultOwnerEntityConfigurations();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultOwnerEntityConfigurations
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultOwnerEntityConfigurationsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultOwnerEntityConfigurations
-            //Assert.IsInstanceOfType<RestApiPaginationResultOwnerEntityConfigurations> (instance, "variable 'instance' is a RestApiPaginationResultOwnerEntityConfigurations");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutChargebackTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultPayoutChargebackTests.cs
deleted file mode 100644
index 19a1936a..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutChargebackTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultPayoutChargeback
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultPayoutChargebackTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultPayoutChargeback
-        //private RestApiPaginationResultPayoutChargeback instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultPayoutChargeback
-            //instance = new RestApiPaginationResultPayoutChargeback();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultPayoutChargeback
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultPayoutChargebackInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultPayoutChargeback
-            //Assert.IsInstanceOfType<RestApiPaginationResultPayoutChargeback> (instance, "variable 'instance' is a RestApiPaginationResultPayoutChargeback");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutOrderTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultPayoutOrderTests.cs
deleted file mode 100644
index 4ee863b9..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutOrderTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultPayoutOrder
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultPayoutOrderTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultPayoutOrder
-        //private RestApiPaginationResultPayoutOrder instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultPayoutOrder
-            //instance = new RestApiPaginationResultPayoutOrder();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultPayoutOrder
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultPayoutOrderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultPayoutOrder
-            //Assert.IsInstanceOfType<RestApiPaginationResultPayoutOrder> (instance, "variable 'instance' is a RestApiPaginationResultPayoutOrder");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutOtherChargeTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultPayoutOtherChargeTests.cs
deleted file mode 100644
index 2d80a2d9..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutOtherChargeTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultPayoutOtherCharge
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultPayoutOtherChargeTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultPayoutOtherCharge
-        //private RestApiPaginationResultPayoutOtherCharge instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultPayoutOtherCharge
-            //instance = new RestApiPaginationResultPayoutOtherCharge();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultPayoutOtherCharge
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultPayoutOtherChargeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultPayoutOtherCharge
-            //Assert.IsInstanceOfType<RestApiPaginationResultPayoutOtherCharge> (instance, "variable 'instance' is a RestApiPaginationResultPayoutOtherCharge");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutRefundTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultPayoutRefundTests.cs
deleted file mode 100644
index 9f7ffd58..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutRefundTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultPayoutRefund
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultPayoutRefundTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultPayoutRefund
-        //private RestApiPaginationResultPayoutRefund instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultPayoutRefund
-            //instance = new RestApiPaginationResultPayoutRefund();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultPayoutRefund
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultPayoutRefundInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultPayoutRefund
-            //Assert.IsInstanceOfType<RestApiPaginationResultPayoutRefund> (instance, "variable 'instance' is a RestApiPaginationResultPayoutRefund");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultPayoutTests.cs
deleted file mode 100644
index 704d54fb..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultPayoutTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultPayout
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultPayoutTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultPayout
-        //private RestApiPaginationResultPayout instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultPayout
-            //instance = new RestApiPaginationResultPayout();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultPayout
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultPayoutInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultPayout
-            //Assert.IsInstanceOfType<RestApiPaginationResultPayout> (instance, "variable 'instance' is a RestApiPaginationResultPayout");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultPendingMenuChangesTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultPendingMenuChangesTests.cs
deleted file mode 100644
index 43fca26f..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultPendingMenuChangesTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultPendingMenuChanges
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultPendingMenuChangesTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultPendingMenuChanges
-        //private RestApiPaginationResultPendingMenuChanges instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultPendingMenuChanges
-            //instance = new RestApiPaginationResultPendingMenuChanges();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultPendingMenuChanges
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultPendingMenuChangesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultPendingMenuChanges
-            //Assert.IsInstanceOfType<RestApiPaginationResultPendingMenuChanges> (instance, "variable 'instance' is a RestApiPaginationResultPendingMenuChanges");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultPhoneCallTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultPhoneCallTests.cs
deleted file mode 100644
index 8ac7dd61..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultPhoneCallTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultPhoneCall
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultPhoneCallTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultPhoneCall
-        //private RestApiPaginationResultPhoneCall instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultPhoneCall
-            //instance = new RestApiPaginationResultPhoneCall();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultPhoneCall
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultPhoneCallInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultPhoneCall
-            //Assert.IsInstanceOfType<RestApiPaginationResultPhoneCall> (instance, "variable 'instance' is a RestApiPaginationResultPhoneCall");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultProductTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultProductTests.cs
deleted file mode 100644
index aa723508..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultProductTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultProductTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultProduct
-        //private RestApiPaginationResultProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultProduct
-            //instance = new RestApiPaginationResultProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultProduct
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultProduct
-            //Assert.IsInstanceOfType<RestApiPaginationResultProduct> (instance, "variable 'instance' is a RestApiPaginationResultProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultPushNotificationResponseTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultPushNotificationResponseTests.cs
deleted file mode 100644
index 59e0d90f..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultPushNotificationResponseTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultPushNotificationResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultPushNotificationResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultPushNotificationResponse
-        //private RestApiPaginationResultPushNotificationResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultPushNotificationResponse
-            //instance = new RestApiPaginationResultPushNotificationResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultPushNotificationResponse
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultPushNotificationResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultPushNotificationResponse
-            //Assert.IsInstanceOfType<RestApiPaginationResultPushNotificationResponse> (instance, "variable 'instance' is a RestApiPaginationResultPushNotificationResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultStoreGroupExtendedTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultStoreGroupExtendedTests.cs
deleted file mode 100644
index 596b9e99..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultStoreGroupExtendedTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultStoreGroupExtended
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultStoreGroupExtendedTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultStoreGroupExtended
-        //private RestApiPaginationResultStoreGroupExtended instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultStoreGroupExtended
-            //instance = new RestApiPaginationResultStoreGroupExtended();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultStoreGroupExtended
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultStoreGroupExtendedInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultStoreGroupExtended
-            //Assert.IsInstanceOfType<RestApiPaginationResultStoreGroupExtended> (instance, "variable 'instance' is a RestApiPaginationResultStoreGroupExtended");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultStoreGroupTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultStoreGroupTests.cs
deleted file mode 100644
index 94222720..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultStoreGroupTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultStoreGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultStoreGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultStoreGroup
-        //private RestApiPaginationResultStoreGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultStoreGroup
-            //instance = new RestApiPaginationResultStoreGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultStoreGroup
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultStoreGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultStoreGroup
-            //Assert.IsInstanceOfType<RestApiPaginationResultStoreGroup> (instance, "variable 'instance' is a RestApiPaginationResultStoreGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultStoreHeaderTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultStoreHeaderTests.cs
deleted file mode 100644
index 2ef5b6df..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultStoreHeaderTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultStoreHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultStoreHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultStoreHeader
-        //private RestApiPaginationResultStoreHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultStoreHeader
-            //instance = new RestApiPaginationResultStoreHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultStoreHeader
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultStoreHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultStoreHeader
-            //Assert.IsInstanceOfType<RestApiPaginationResultStoreHeader> (instance, "variable 'instance' is a RestApiPaginationResultStoreHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultStoreTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultStoreTests.cs
deleted file mode 100644
index bac3be39..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultStoreTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultStore
-        //private RestApiPaginationResultStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultStore
-            //instance = new RestApiPaginationResultStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultStore
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultStore
-            //Assert.IsInstanceOfType<RestApiPaginationResultStore> (instance, "variable 'instance' is a RestApiPaginationResultStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultStoreValidationConfigTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultStoreValidationConfigTests.cs
deleted file mode 100644
index 93082d98..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultStoreValidationConfigTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultStoreValidationConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultStoreValidationConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultStoreValidationConfig
-        //private RestApiPaginationResultStoreValidationConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultStoreValidationConfig
-            //instance = new RestApiPaginationResultStoreValidationConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultStoreValidationConfig
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultStoreValidationConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultStoreValidationConfig
-            //Assert.IsInstanceOfType<RestApiPaginationResultStoreValidationConfig> (instance, "variable 'instance' is a RestApiPaginationResultStoreValidationConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultVoucherSummaryTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultVoucherSummaryTests.cs
deleted file mode 100644
index 5830ccd2..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultVoucherSummaryTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultVoucherSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultVoucherSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultVoucherSummary
-        //private RestApiPaginationResultVoucherSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultVoucherSummary
-            //instance = new RestApiPaginationResultVoucherSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultVoucherSummary
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultVoucherSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultVoucherSummary
-            //Assert.IsInstanceOfType<RestApiPaginationResultVoucherSummary> (instance, "variable 'instance' is a RestApiPaginationResultVoucherSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultWebhookLogTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultWebhookLogTests.cs
deleted file mode 100644
index 76abcbb1..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultWebhookLogTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultWebhookLog
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultWebhookLogTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultWebhookLog
-        //private RestApiPaginationResultWebhookLog instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultWebhookLog
-            //instance = new RestApiPaginationResultWebhookLog();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultWebhookLog
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultWebhookLogInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultWebhookLog
-            //Assert.IsInstanceOfType<RestApiPaginationResultWebhookLog> (instance, "variable 'instance' is a RestApiPaginationResultWebhookLog");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiPaginationResultWebhookSubscriptionTests.cs b/src/Flipdish.Test/Model/RestApiPaginationResultWebhookSubscriptionTests.cs
deleted file mode 100644
index 45f1b4dc..00000000
--- a/src/Flipdish.Test/Model/RestApiPaginationResultWebhookSubscriptionTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiPaginationResultWebhookSubscription
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiPaginationResultWebhookSubscriptionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiPaginationResultWebhookSubscription
-        //private RestApiPaginationResultWebhookSubscription instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiPaginationResultWebhookSubscription
-            //instance = new RestApiPaginationResultWebhookSubscription();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiPaginationResultWebhookSubscription
-        /// </summary>
-        [Test]
-        public void RestApiPaginationResultWebhookSubscriptionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiPaginationResultWebhookSubscription
-            //Assert.IsInstanceOfType<RestApiPaginationResultWebhookSubscription> (instance, "variable 'instance' is a RestApiPaginationResultWebhookSubscription");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'TotalRecordCount'
-        /// </summary>
-        [Test]
-        public void TotalRecordCountTest()
-        {
-            // TODO unit test for the property 'TotalRecordCount'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAccountDetailTests.cs b/src/Flipdish.Test/Model/RestApiResultAccountDetailTests.cs
deleted file mode 100644
index 2fa1d0cb..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAccountDetailTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAccountDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAccountDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAccountDetail
-        //private RestApiResultAccountDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAccountDetail
-            //instance = new RestApiResultAccountDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAccountDetail
-        /// </summary>
-        [Test]
-        public void RestApiResultAccountDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAccountDetail
-            //Assert.IsInstanceOfType<RestApiResultAccountDetail> (instance, "variable 'instance' is a RestApiResultAccountDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAccountFieldsDefinitionsTests.cs b/src/Flipdish.Test/Model/RestApiResultAccountFieldsDefinitionsTests.cs
deleted file mode 100644
index e10a39fd..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAccountFieldsDefinitionsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAccountFieldsDefinitions
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAccountFieldsDefinitionsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAccountFieldsDefinitions
-        //private RestApiResultAccountFieldsDefinitions instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAccountFieldsDefinitions
-            //instance = new RestApiResultAccountFieldsDefinitions();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAccountFieldsDefinitions
-        /// </summary>
-        [Test]
-        public void RestApiResultAccountFieldsDefinitionsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAccountFieldsDefinitions
-            //Assert.IsInstanceOfType<RestApiResultAccountFieldsDefinitions> (instance, "variable 'instance' is a RestApiResultAccountFieldsDefinitions");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAddressFormResponseTests.cs b/src/Flipdish.Test/Model/RestApiResultAddressFormResponseTests.cs
deleted file mode 100644
index b8163a5f..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAddressFormResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAddressFormResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAddressFormResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAddressFormResponse
-        //private RestApiResultAddressFormResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAddressFormResponse
-            //instance = new RestApiResultAddressFormResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAddressFormResponse
-        /// </summary>
-        [Test]
-        public void RestApiResultAddressFormResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAddressFormResponse
-            //Assert.IsInstanceOfType<RestApiResultAddressFormResponse> (instance, "variable 'instance' is a RestApiResultAddressFormResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultApmStatisticsTests.cs b/src/Flipdish.Test/Model/RestApiResultApmStatisticsTests.cs
deleted file mode 100644
index fb3ac29b..00000000
--- a/src/Flipdish.Test/Model/RestApiResultApmStatisticsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultApmStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultApmStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultApmStatistics
-        //private RestApiResultApmStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultApmStatistics
-            //instance = new RestApiResultApmStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultApmStatistics
-        /// </summary>
-        [Test]
-        public void RestApiResultApmStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultApmStatistics
-            //Assert.IsInstanceOfType<RestApiResultApmStatistics> (instance, "variable 'instance' is a RestApiResultApmStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultApmStatusTests.cs b/src/Flipdish.Test/Model/RestApiResultApmStatusTests.cs
deleted file mode 100644
index 4e848f65..00000000
--- a/src/Flipdish.Test/Model/RestApiResultApmStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultApmStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultApmStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultApmStatus
-        //private RestApiResultApmStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultApmStatus
-            //instance = new RestApiResultApmStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultApmStatus
-        /// </summary>
-        [Test]
-        public void RestApiResultApmStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultApmStatus
-            //Assert.IsInstanceOfType<RestApiResultApmStatus> (instance, "variable 'instance' is a RestApiResultApmStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAppChannelAssignmentTests.cs b/src/Flipdish.Test/Model/RestApiResultAppChannelAssignmentTests.cs
deleted file mode 100644
index 7e08f800..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAppChannelAssignmentTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAppChannelAssignment
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAppChannelAssignmentTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAppChannelAssignment
-        //private RestApiResultAppChannelAssignment instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAppChannelAssignment
-            //instance = new RestApiResultAppChannelAssignment();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAppChannelAssignment
-        /// </summary>
-        [Test]
-        public void RestApiResultAppChannelAssignmentInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAppChannelAssignment
-            //Assert.IsInstanceOfType<RestApiResultAppChannelAssignment> (instance, "variable 'instance' is a RestApiResultAppChannelAssignment");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAppComplianceTests.cs b/src/Flipdish.Test/Model/RestApiResultAppComplianceTests.cs
deleted file mode 100644
index 44dcc29d..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAppComplianceTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAppCompliance
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAppComplianceTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAppCompliance
-        //private RestApiResultAppCompliance instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAppCompliance
-            //instance = new RestApiResultAppCompliance();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAppCompliance
-        /// </summary>
-        [Test]
-        public void RestApiResultAppComplianceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAppCompliance
-            //Assert.IsInstanceOfType<RestApiResultAppCompliance> (instance, "variable 'instance' is a RestApiResultAppCompliance");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAppConfigSalesChannelTests.cs b/src/Flipdish.Test/Model/RestApiResultAppConfigSalesChannelTests.cs
deleted file mode 100644
index 2cb2462c..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAppConfigSalesChannelTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAppConfigSalesChannel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAppConfigSalesChannelTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAppConfigSalesChannel
-        //private RestApiResultAppConfigSalesChannel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAppConfigSalesChannel
-            //instance = new RestApiResultAppConfigSalesChannel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAppConfigSalesChannel
-        /// </summary>
-        [Test]
-        public void RestApiResultAppConfigSalesChannelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAppConfigSalesChannel
-            //Assert.IsInstanceOfType<RestApiResultAppConfigSalesChannel> (instance, "variable 'instance' is a RestApiResultAppConfigSalesChannel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAppConfigurationSummaryTests.cs b/src/Flipdish.Test/Model/RestApiResultAppConfigurationSummaryTests.cs
deleted file mode 100644
index b577e41e..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAppConfigurationSummaryTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAppConfigurationSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAppConfigurationSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAppConfigurationSummary
-        //private RestApiResultAppConfigurationSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAppConfigurationSummary
-            //instance = new RestApiResultAppConfigurationSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAppConfigurationSummary
-        /// </summary>
-        [Test]
-        public void RestApiResultAppConfigurationSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAppConfigurationSummary
-            //Assert.IsInstanceOfType<RestApiResultAppConfigurationSummary> (instance, "variable 'instance' is a RestApiResultAppConfigurationSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAppDetailTests.cs b/src/Flipdish.Test/Model/RestApiResultAppDetailTests.cs
deleted file mode 100644
index 3686200e..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAppDetailTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAppDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAppDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAppDetail
-        //private RestApiResultAppDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAppDetail
-            //instance = new RestApiResultAppDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAppDetail
-        /// </summary>
-        [Test]
-        public void RestApiResultAppDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAppDetail
-            //Assert.IsInstanceOfType<RestApiResultAppDetail> (instance, "variable 'instance' is a RestApiResultAppDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAppStoreAppConfigurationTests.cs b/src/Flipdish.Test/Model/RestApiResultAppStoreAppConfigurationTests.cs
deleted file mode 100644
index 9399513a..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAppStoreAppConfigurationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAppStoreAppConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAppStoreAppConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAppStoreAppConfiguration
-        //private RestApiResultAppStoreAppConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAppStoreAppConfiguration
-            //instance = new RestApiResultAppStoreAppConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAppStoreAppConfiguration
-        /// </summary>
-        [Test]
-        public void RestApiResultAppStoreAppConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAppStoreAppConfiguration
-            //Assert.IsInstanceOfType<RestApiResultAppStoreAppConfiguration> (instance, "variable 'instance' is a RestApiResultAppStoreAppConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAppStoreAppTests.cs b/src/Flipdish.Test/Model/RestApiResultAppStoreAppTests.cs
deleted file mode 100644
index 9d76c0cc..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAppStoreAppTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAppStoreApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAppStoreAppTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAppStoreApp
-        //private RestApiResultAppStoreApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAppStoreApp
-            //instance = new RestApiResultAppStoreApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAppStoreApp
-        /// </summary>
-        [Test]
-        public void RestApiResultAppStoreAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAppStoreApp
-            //Assert.IsInstanceOfType<RestApiResultAppStoreApp> (instance, "variable 'instance' is a RestApiResultAppStoreApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAppTests.cs b/src/Flipdish.Test/Model/RestApiResultAppTests.cs
deleted file mode 100644
index 17a65d40..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAppTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAppTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultApp
-        //private RestApiResultApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultApp
-            //instance = new RestApiResultApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultApp
-        /// </summary>
-        [Test]
-        public void RestApiResultAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultApp
-            //Assert.IsInstanceOfType<RestApiResultApp> (instance, "variable 'instance' is a RestApiResultApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultAssignedBankAccountTests.cs b/src/Flipdish.Test/Model/RestApiResultAssignedBankAccountTests.cs
deleted file mode 100644
index 9ff8e80c..00000000
--- a/src/Flipdish.Test/Model/RestApiResultAssignedBankAccountTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultAssignedBankAccount
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultAssignedBankAccountTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultAssignedBankAccount
-        //private RestApiResultAssignedBankAccount instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultAssignedBankAccount
-            //instance = new RestApiResultAssignedBankAccount();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultAssignedBankAccount
-        /// </summary>
-        [Test]
-        public void RestApiResultAssignedBankAccountInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultAssignedBankAccount
-            //Assert.IsInstanceOfType<RestApiResultAssignedBankAccount> (instance, "variable 'instance' is a RestApiResultAssignedBankAccount");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultBankAccountDetailTests.cs b/src/Flipdish.Test/Model/RestApiResultBankAccountDetailTests.cs
deleted file mode 100644
index b7bcca74..00000000
--- a/src/Flipdish.Test/Model/RestApiResultBankAccountDetailTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultBankAccountDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultBankAccountDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultBankAccountDetail
-        //private RestApiResultBankAccountDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultBankAccountDetail
-            //instance = new RestApiResultBankAccountDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultBankAccountDetail
-        /// </summary>
-        [Test]
-        public void RestApiResultBankAccountDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultBankAccountDetail
-            //Assert.IsInstanceOfType<RestApiResultBankAccountDetail> (instance, "variable 'instance' is a RestApiResultBankAccountDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultBluetoothTerminalStatusTests.cs b/src/Flipdish.Test/Model/RestApiResultBluetoothTerminalStatusTests.cs
deleted file mode 100644
index 52a26834..00000000
--- a/src/Flipdish.Test/Model/RestApiResultBluetoothTerminalStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultBluetoothTerminalStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultBluetoothTerminalStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultBluetoothTerminalStatus
-        //private RestApiResultBluetoothTerminalStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultBluetoothTerminalStatus
-            //instance = new RestApiResultBluetoothTerminalStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultBluetoothTerminalStatus
-        /// </summary>
-        [Test]
-        public void RestApiResultBluetoothTerminalStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultBluetoothTerminalStatus
-            //Assert.IsInstanceOfType<RestApiResultBluetoothTerminalStatus> (instance, "variable 'instance' is a RestApiResultBluetoothTerminalStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultBusinessHoursOverrideTests.cs b/src/Flipdish.Test/Model/RestApiResultBusinessHoursOverrideTests.cs
deleted file mode 100644
index 394729c3..00000000
--- a/src/Flipdish.Test/Model/RestApiResultBusinessHoursOverrideTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultBusinessHoursOverride
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultBusinessHoursOverrideTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultBusinessHoursOverride
-        //private RestApiResultBusinessHoursOverride instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultBusinessHoursOverride
-            //instance = new RestApiResultBusinessHoursOverride();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultBusinessHoursOverride
-        /// </summary>
-        [Test]
-        public void RestApiResultBusinessHoursOverrideInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultBusinessHoursOverride
-            //Assert.IsInstanceOfType<RestApiResultBusinessHoursOverride> (instance, "variable 'instance' is a RestApiResultBusinessHoursOverride");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultBusinessHoursPeriodTests.cs b/src/Flipdish.Test/Model/RestApiResultBusinessHoursPeriodTests.cs
deleted file mode 100644
index c18ef0fb..00000000
--- a/src/Flipdish.Test/Model/RestApiResultBusinessHoursPeriodTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultBusinessHoursPeriod
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultBusinessHoursPeriodTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultBusinessHoursPeriod
-        //private RestApiResultBusinessHoursPeriod instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultBusinessHoursPeriod
-            //instance = new RestApiResultBusinessHoursPeriod();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultBusinessHoursPeriod
-        /// </summary>
-        [Test]
-        public void RestApiResultBusinessHoursPeriodInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultBusinessHoursPeriod
-            //Assert.IsInstanceOfType<RestApiResultBusinessHoursPeriod> (instance, "variable 'instance' is a RestApiResultBusinessHoursPeriod");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultCardReaderTests.cs b/src/Flipdish.Test/Model/RestApiResultCardReaderTests.cs
deleted file mode 100644
index 7f6e83c8..00000000
--- a/src/Flipdish.Test/Model/RestApiResultCardReaderTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultCardReader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultCardReaderTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultCardReader
-        //private RestApiResultCardReader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultCardReader
-            //instance = new RestApiResultCardReader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultCardReader
-        /// </summary>
-        [Test]
-        public void RestApiResultCardReaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultCardReader
-            //Assert.IsInstanceOfType<RestApiResultCardReader> (instance, "variable 'instance' is a RestApiResultCardReader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultCardTests.cs b/src/Flipdish.Test/Model/RestApiResultCardTests.cs
deleted file mode 100644
index 0376074a..00000000
--- a/src/Flipdish.Test/Model/RestApiResultCardTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultCard
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultCardTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultCard
-        //private RestApiResultCard instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultCard
-            //instance = new RestApiResultCard();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultCard
-        /// </summary>
-        [Test]
-        public void RestApiResultCardInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultCard
-            //Assert.IsInstanceOfType<RestApiResultCard> (instance, "variable 'instance' is a RestApiResultCard");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultCatalogGroupTests.cs b/src/Flipdish.Test/Model/RestApiResultCatalogGroupTests.cs
deleted file mode 100644
index 1f61dfd9..00000000
--- a/src/Flipdish.Test/Model/RestApiResultCatalogGroupTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultCatalogGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultCatalogGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultCatalogGroup
-        //private RestApiResultCatalogGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultCatalogGroup
-            //instance = new RestApiResultCatalogGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultCatalogGroup
-        /// </summary>
-        [Test]
-        public void RestApiResultCatalogGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultCatalogGroup
-            //Assert.IsInstanceOfType<RestApiResultCatalogGroup> (instance, "variable 'instance' is a RestApiResultCatalogGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultCatalogItemTests.cs b/src/Flipdish.Test/Model/RestApiResultCatalogItemTests.cs
deleted file mode 100644
index 3ae74d60..00000000
--- a/src/Flipdish.Test/Model/RestApiResultCatalogItemTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultCatalogItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultCatalogItemTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultCatalogItem
-        //private RestApiResultCatalogItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultCatalogItem
-            //instance = new RestApiResultCatalogItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultCatalogItem
-        /// </summary>
-        [Test]
-        public void RestApiResultCatalogItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultCatalogItem
-            //Assert.IsInstanceOfType<RestApiResultCatalogItem> (instance, "variable 'instance' is a RestApiResultCatalogItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultChannelTests.cs b/src/Flipdish.Test/Model/RestApiResultChannelTests.cs
deleted file mode 100644
index 5ced3c80..00000000
--- a/src/Flipdish.Test/Model/RestApiResultChannelTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultChannel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultChannelTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultChannel
-        //private RestApiResultChannel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultChannel
-            //instance = new RestApiResultChannel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultChannel
-        /// </summary>
-        [Test]
-        public void RestApiResultChannelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultChannel
-            //Assert.IsInstanceOfType<RestApiResultChannel> (instance, "variable 'instance' is a RestApiResultChannel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultCoordinatesTests.cs b/src/Flipdish.Test/Model/RestApiResultCoordinatesTests.cs
deleted file mode 100644
index 1e7fd8b9..00000000
--- a/src/Flipdish.Test/Model/RestApiResultCoordinatesTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultCoordinates
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultCoordinatesTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultCoordinates
-        //private RestApiResultCoordinates instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultCoordinates
-            //instance = new RestApiResultCoordinates();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultCoordinates
-        /// </summary>
-        [Test]
-        public void RestApiResultCoordinatesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultCoordinates
-            //Assert.IsInstanceOfType<RestApiResultCoordinates> (instance, "variable 'instance' is a RestApiResultCoordinates");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultCountryFormResponseTests.cs b/src/Flipdish.Test/Model/RestApiResultCountryFormResponseTests.cs
deleted file mode 100644
index 41a0fb8b..00000000
--- a/src/Flipdish.Test/Model/RestApiResultCountryFormResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultCountryFormResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultCountryFormResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultCountryFormResponse
-        //private RestApiResultCountryFormResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultCountryFormResponse
-            //instance = new RestApiResultCountryFormResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultCountryFormResponse
-        /// </summary>
-        [Test]
-        public void RestApiResultCountryFormResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultCountryFormResponse
-            //Assert.IsInstanceOfType<RestApiResultCountryFormResponse> (instance, "variable 'instance' is a RestApiResultCountryFormResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultCreatedMenuSectionItemsTests.cs b/src/Flipdish.Test/Model/RestApiResultCreatedMenuSectionItemsTests.cs
deleted file mode 100644
index 74418796..00000000
--- a/src/Flipdish.Test/Model/RestApiResultCreatedMenuSectionItemsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultCreatedMenuSectionItems
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultCreatedMenuSectionItemsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultCreatedMenuSectionItems
-        //private RestApiResultCreatedMenuSectionItems instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultCreatedMenuSectionItems
-            //instance = new RestApiResultCreatedMenuSectionItems();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultCreatedMenuSectionItems
-        /// </summary>
-        [Test]
-        public void RestApiResultCreatedMenuSectionItemsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultCreatedMenuSectionItems
-            //Assert.IsInstanceOfType<RestApiResultCreatedMenuSectionItems> (instance, "variable 'instance' is a RestApiResultCreatedMenuSectionItems");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultCustomerTests.cs b/src/Flipdish.Test/Model/RestApiResultCustomerTests.cs
deleted file mode 100644
index 4504dc89..00000000
--- a/src/Flipdish.Test/Model/RestApiResultCustomerTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultCustomer
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultCustomerTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultCustomer
-        //private RestApiResultCustomer instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultCustomer
-            //instance = new RestApiResultCustomer();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultCustomer
-        /// </summary>
-        [Test]
-        public void RestApiResultCustomerInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultCustomer
-            //Assert.IsInstanceOfType<RestApiResultCustomer> (instance, "variable 'instance' is a RestApiResultCustomer");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultDeliveryZoneTests.cs b/src/Flipdish.Test/Model/RestApiResultDeliveryZoneTests.cs
deleted file mode 100644
index 6f4e6140..00000000
--- a/src/Flipdish.Test/Model/RestApiResultDeliveryZoneTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultDeliveryZone
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultDeliveryZoneTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultDeliveryZone
-        //private RestApiResultDeliveryZone instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultDeliveryZone
-            //instance = new RestApiResultDeliveryZone();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultDeliveryZone
-        /// </summary>
-        [Test]
-        public void RestApiResultDeliveryZoneInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultDeliveryZone
-            //Assert.IsInstanceOfType<RestApiResultDeliveryZone> (instance, "variable 'instance' is a RestApiResultDeliveryZone");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultDnsRecordInformationTests.cs b/src/Flipdish.Test/Model/RestApiResultDnsRecordInformationTests.cs
deleted file mode 100644
index 5e9ca816..00000000
--- a/src/Flipdish.Test/Model/RestApiResultDnsRecordInformationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultDnsRecordInformation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultDnsRecordInformationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultDnsRecordInformation
-        //private RestApiResultDnsRecordInformation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultDnsRecordInformation
-            //instance = new RestApiResultDnsRecordInformation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultDnsRecordInformation
-        /// </summary>
-        [Test]
-        public void RestApiResultDnsRecordInformationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultDnsRecordInformation
-            //Assert.IsInstanceOfType<RestApiResultDnsRecordInformation> (instance, "variable 'instance' is a RestApiResultDnsRecordInformation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultDriverTests.cs b/src/Flipdish.Test/Model/RestApiResultDriverTests.cs
deleted file mode 100644
index 054f92e4..00000000
--- a/src/Flipdish.Test/Model/RestApiResultDriverTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultDriver
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultDriverTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultDriver
-        //private RestApiResultDriver instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultDriver
-            //instance = new RestApiResultDriver();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultDriver
-        /// </summary>
-        [Test]
-        public void RestApiResultDriverInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultDriver
-            //Assert.IsInstanceOfType<RestApiResultDriver> (instance, "variable 'instance' is a RestApiResultDriver");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultFulfillmentStatesConfigurationTests.cs b/src/Flipdish.Test/Model/RestApiResultFulfillmentStatesConfigurationTests.cs
deleted file mode 100644
index 1574f267..00000000
--- a/src/Flipdish.Test/Model/RestApiResultFulfillmentStatesConfigurationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultFulfillmentStatesConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultFulfillmentStatesConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultFulfillmentStatesConfiguration
-        //private RestApiResultFulfillmentStatesConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultFulfillmentStatesConfiguration
-            //instance = new RestApiResultFulfillmentStatesConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultFulfillmentStatesConfiguration
-        /// </summary>
-        [Test]
-        public void RestApiResultFulfillmentStatesConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultFulfillmentStatesConfiguration
-            //Assert.IsInstanceOfType<RestApiResultFulfillmentStatesConfiguration> (instance, "variable 'instance' is a RestApiResultFulfillmentStatesConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultGroupTests.cs b/src/Flipdish.Test/Model/RestApiResultGroupTests.cs
deleted file mode 100644
index aa53ea3a..00000000
--- a/src/Flipdish.Test/Model/RestApiResultGroupTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultGroup
-        //private RestApiResultGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultGroup
-            //instance = new RestApiResultGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultGroup
-        /// </summary>
-        [Test]
-        public void RestApiResultGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultGroup
-            //Assert.IsInstanceOfType<RestApiResultGroup> (instance, "variable 'instance' is a RestApiResultGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultHomeStatisticsTests.cs b/src/Flipdish.Test/Model/RestApiResultHomeStatisticsTests.cs
deleted file mode 100644
index 91daa81e..00000000
--- a/src/Flipdish.Test/Model/RestApiResultHomeStatisticsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultHomeStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultHomeStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultHomeStatistics
-        //private RestApiResultHomeStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultHomeStatistics
-            //instance = new RestApiResultHomeStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultHomeStatistics
-        /// </summary>
-        [Test]
-        public void RestApiResultHomeStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultHomeStatistics
-            //Assert.IsInstanceOfType<RestApiResultHomeStatistics> (instance, "variable 'instance' is a RestApiResultHomeStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultHydraConfigTests.cs b/src/Flipdish.Test/Model/RestApiResultHydraConfigTests.cs
deleted file mode 100644
index 3c5911c4..00000000
--- a/src/Flipdish.Test/Model/RestApiResultHydraConfigTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultHydraConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultHydraConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultHydraConfig
-        //private RestApiResultHydraConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultHydraConfig
-            //instance = new RestApiResultHydraConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultHydraConfig
-        /// </summary>
-        [Test]
-        public void RestApiResultHydraConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultHydraConfig
-            //Assert.IsInstanceOfType<RestApiResultHydraConfig> (instance, "variable 'instance' is a RestApiResultHydraConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultHydraDeviceDetailsTests.cs b/src/Flipdish.Test/Model/RestApiResultHydraDeviceDetailsTests.cs
deleted file mode 100644
index 9b3a672e..00000000
--- a/src/Flipdish.Test/Model/RestApiResultHydraDeviceDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultHydraDeviceDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultHydraDeviceDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultHydraDeviceDetails
-        //private RestApiResultHydraDeviceDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultHydraDeviceDetails
-            //instance = new RestApiResultHydraDeviceDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultHydraDeviceDetails
-        /// </summary>
-        [Test]
-        public void RestApiResultHydraDeviceDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultHydraDeviceDetails
-            //Assert.IsInstanceOfType<RestApiResultHydraDeviceDetails> (instance, "variable 'instance' is a RestApiResultHydraDeviceDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultHydraStatusTests.cs b/src/Flipdish.Test/Model/RestApiResultHydraStatusTests.cs
deleted file mode 100644
index 085b506c..00000000
--- a/src/Flipdish.Test/Model/RestApiResultHydraStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultHydraStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultHydraStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultHydraStatus
-        //private RestApiResultHydraStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultHydraStatus
-            //instance = new RestApiResultHydraStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultHydraStatus
-        /// </summary>
-        [Test]
-        public void RestApiResultHydraStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultHydraStatus
-            //Assert.IsInstanceOfType<RestApiResultHydraStatus> (instance, "variable 'instance' is a RestApiResultHydraStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultIndexPageBaseTests.cs b/src/Flipdish.Test/Model/RestApiResultIndexPageBaseTests.cs
deleted file mode 100644
index 907c61fe..00000000
--- a/src/Flipdish.Test/Model/RestApiResultIndexPageBaseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultIndexPageBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultIndexPageBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultIndexPageBase
-        //private RestApiResultIndexPageBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultIndexPageBase
-            //instance = new RestApiResultIndexPageBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultIndexPageBase
-        /// </summary>
-        [Test]
-        public void RestApiResultIndexPageBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultIndexPageBase
-            //Assert.IsInstanceOfType<RestApiResultIndexPageBase> (instance, "variable 'instance' is a RestApiResultIndexPageBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultIndexPageTests.cs b/src/Flipdish.Test/Model/RestApiResultIndexPageTests.cs
deleted file mode 100644
index 82d1bb0d..00000000
--- a/src/Flipdish.Test/Model/RestApiResultIndexPageTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultIndexPage
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultIndexPageTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultIndexPage
-        //private RestApiResultIndexPage instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultIndexPage
-            //instance = new RestApiResultIndexPage();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultIndexPage
-        /// </summary>
-        [Test]
-        public void RestApiResultIndexPageInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultIndexPage
-            //Assert.IsInstanceOfType<RestApiResultIndexPage> (instance, "variable 'instance' is a RestApiResultIndexPage");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultJobResponseTests.cs b/src/Flipdish.Test/Model/RestApiResultJobResponseTests.cs
deleted file mode 100644
index a51c9f93..00000000
--- a/src/Flipdish.Test/Model/RestApiResultJobResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultJobResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultJobResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultJobResponse
-        //private RestApiResultJobResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultJobResponse
-            //instance = new RestApiResultJobResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultJobResponse
-        /// </summary>
-        [Test]
-        public void RestApiResultJobResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultJobResponse
-            //Assert.IsInstanceOfType<RestApiResultJobResponse> (instance, "variable 'instance' is a RestApiResultJobResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultKioskCashSettingTests.cs b/src/Flipdish.Test/Model/RestApiResultKioskCashSettingTests.cs
deleted file mode 100644
index 1208d046..00000000
--- a/src/Flipdish.Test/Model/RestApiResultKioskCashSettingTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultKioskCashSetting
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultKioskCashSettingTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultKioskCashSetting
-        //private RestApiResultKioskCashSetting instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultKioskCashSetting
-            //instance = new RestApiResultKioskCashSetting();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultKioskCashSetting
-        /// </summary>
-        [Test]
-        public void RestApiResultKioskCashSettingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultKioskCashSetting
-            //Assert.IsInstanceOfType<RestApiResultKioskCashSetting> (instance, "variable 'instance' is a RestApiResultKioskCashSetting");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultKioskIotConnectionParametersTests.cs b/src/Flipdish.Test/Model/RestApiResultKioskIotConnectionParametersTests.cs
deleted file mode 100644
index 93cf02e7..00000000
--- a/src/Flipdish.Test/Model/RestApiResultKioskIotConnectionParametersTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultKioskIotConnectionParameters
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultKioskIotConnectionParametersTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultKioskIotConnectionParameters
-        //private RestApiResultKioskIotConnectionParameters instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultKioskIotConnectionParameters
-            //instance = new RestApiResultKioskIotConnectionParameters();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultKioskIotConnectionParameters
-        /// </summary>
-        [Test]
-        public void RestApiResultKioskIotConnectionParametersInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultKioskIotConnectionParameters
-            //Assert.IsInstanceOfType<RestApiResultKioskIotConnectionParameters> (instance, "variable 'instance' is a RestApiResultKioskIotConnectionParameters");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultKioskStoreSettingsTests.cs b/src/Flipdish.Test/Model/RestApiResultKioskStoreSettingsTests.cs
deleted file mode 100644
index 6d396cfd..00000000
--- a/src/Flipdish.Test/Model/RestApiResultKioskStoreSettingsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultKioskStoreSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultKioskStoreSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultKioskStoreSettings
-        //private RestApiResultKioskStoreSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultKioskStoreSettings
-            //instance = new RestApiResultKioskStoreSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultKioskStoreSettings
-        /// </summary>
-        [Test]
-        public void RestApiResultKioskStoreSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultKioskStoreSettings
-            //Assert.IsInstanceOfType<RestApiResultKioskStoreSettings> (instance, "variable 'instance' is a RestApiResultKioskStoreSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultLightspeedSettingsTests.cs b/src/Flipdish.Test/Model/RestApiResultLightspeedSettingsTests.cs
deleted file mode 100644
index cc391269..00000000
--- a/src/Flipdish.Test/Model/RestApiResultLightspeedSettingsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultLightspeedSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultLightspeedSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultLightspeedSettings
-        //private RestApiResultLightspeedSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultLightspeedSettings
-            //instance = new RestApiResultLightspeedSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultLightspeedSettings
-        /// </summary>
-        [Test]
-        public void RestApiResultLightspeedSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultLightspeedSettings
-            //Assert.IsInstanceOfType<RestApiResultLightspeedSettings> (instance, "variable 'instance' is a RestApiResultLightspeedSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultLocationAreaLocationTests.cs b/src/Flipdish.Test/Model/RestApiResultLocationAreaLocationTests.cs
deleted file mode 100644
index a41db323..00000000
--- a/src/Flipdish.Test/Model/RestApiResultLocationAreaLocationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultLocationAreaLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultLocationAreaLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultLocationAreaLocation
-        //private RestApiResultLocationAreaLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultLocationAreaLocation
-            //instance = new RestApiResultLocationAreaLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultLocationAreaLocation
-        /// </summary>
-        [Test]
-        public void RestApiResultLocationAreaLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultLocationAreaLocation
-            //Assert.IsInstanceOfType<RestApiResultLocationAreaLocation> (instance, "variable 'instance' is a RestApiResultLocationAreaLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultLocationAreaTests.cs b/src/Flipdish.Test/Model/RestApiResultLocationAreaTests.cs
deleted file mode 100644
index 6f5fdf99..00000000
--- a/src/Flipdish.Test/Model/RestApiResultLocationAreaTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultLocationArea
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultLocationAreaTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultLocationArea
-        //private RestApiResultLocationArea instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultLocationArea
-            //instance = new RestApiResultLocationArea();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultLocationArea
-        /// </summary>
-        [Test]
-        public void RestApiResultLocationAreaInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultLocationArea
-            //Assert.IsInstanceOfType<RestApiResultLocationArea> (instance, "variable 'instance' is a RestApiResultLocationArea");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultLocationAreaWithLocationsTests.cs b/src/Flipdish.Test/Model/RestApiResultLocationAreaWithLocationsTests.cs
deleted file mode 100644
index 015fb59f..00000000
--- a/src/Flipdish.Test/Model/RestApiResultLocationAreaWithLocationsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultLocationAreaWithLocations
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultLocationAreaWithLocationsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultLocationAreaWithLocations
-        //private RestApiResultLocationAreaWithLocations instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultLocationAreaWithLocations
-            //instance = new RestApiResultLocationAreaWithLocations();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultLocationAreaWithLocations
-        /// </summary>
-        [Test]
-        public void RestApiResultLocationAreaWithLocationsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultLocationAreaWithLocations
-            //Assert.IsInstanceOfType<RestApiResultLocationAreaWithLocations> (instance, "variable 'instance' is a RestApiResultLocationAreaWithLocations");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultLoyaltyCampaignTests.cs b/src/Flipdish.Test/Model/RestApiResultLoyaltyCampaignTests.cs
deleted file mode 100644
index 975d1d3e..00000000
--- a/src/Flipdish.Test/Model/RestApiResultLoyaltyCampaignTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultLoyaltyCampaign
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultLoyaltyCampaignTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultLoyaltyCampaign
-        //private RestApiResultLoyaltyCampaign instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultLoyaltyCampaign
-            //instance = new RestApiResultLoyaltyCampaign();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultLoyaltyCampaign
-        /// </summary>
-        [Test]
-        public void RestApiResultLoyaltyCampaignInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultLoyaltyCampaign
-            //Assert.IsInstanceOfType<RestApiResultLoyaltyCampaign> (instance, "variable 'instance' is a RestApiResultLoyaltyCampaign");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMappedLocationTests.cs b/src/Flipdish.Test/Model/RestApiResultMappedLocationTests.cs
deleted file mode 100644
index 4aa3be7b..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMappedLocationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMappedLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMappedLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMappedLocation
-        //private RestApiResultMappedLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMappedLocation
-            //instance = new RestApiResultMappedLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMappedLocation
-        /// </summary>
-        [Test]
-        public void RestApiResultMappedLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMappedLocation
-            //Assert.IsInstanceOfType<RestApiResultMappedLocation> (instance, "variable 'instance' is a RestApiResultMappedLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMenuItemOptionSetItemTests.cs b/src/Flipdish.Test/Model/RestApiResultMenuItemOptionSetItemTests.cs
deleted file mode 100644
index 54e26f54..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMenuItemOptionSetItemTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMenuItemOptionSetItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMenuItemOptionSetItemTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMenuItemOptionSetItem
-        //private RestApiResultMenuItemOptionSetItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMenuItemOptionSetItem
-            //instance = new RestApiResultMenuItemOptionSetItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMenuItemOptionSetItem
-        /// </summary>
-        [Test]
-        public void RestApiResultMenuItemOptionSetItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMenuItemOptionSetItem
-            //Assert.IsInstanceOfType<RestApiResultMenuItemOptionSetItem> (instance, "variable 'instance' is a RestApiResultMenuItemOptionSetItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMenuItemOptionSetTests.cs b/src/Flipdish.Test/Model/RestApiResultMenuItemOptionSetTests.cs
deleted file mode 100644
index 16279afc..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMenuItemOptionSetTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMenuItemOptionSet
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMenuItemOptionSetTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMenuItemOptionSet
-        //private RestApiResultMenuItemOptionSet instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMenuItemOptionSet
-            //instance = new RestApiResultMenuItemOptionSet();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMenuItemOptionSet
-        /// </summary>
-        [Test]
-        public void RestApiResultMenuItemOptionSetInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMenuItemOptionSet
-            //Assert.IsInstanceOfType<RestApiResultMenuItemOptionSet> (instance, "variable 'instance' is a RestApiResultMenuItemOptionSet");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMenuSectionAvailabilityTests.cs b/src/Flipdish.Test/Model/RestApiResultMenuSectionAvailabilityTests.cs
deleted file mode 100644
index 6a49425c..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMenuSectionAvailabilityTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMenuSectionAvailability
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMenuSectionAvailabilityTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMenuSectionAvailability
-        //private RestApiResultMenuSectionAvailability instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMenuSectionAvailability
-            //instance = new RestApiResultMenuSectionAvailability();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMenuSectionAvailability
-        /// </summary>
-        [Test]
-        public void RestApiResultMenuSectionAvailabilityInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMenuSectionAvailability
-            //Assert.IsInstanceOfType<RestApiResultMenuSectionAvailability> (instance, "variable 'instance' is a RestApiResultMenuSectionAvailability");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMenuSectionItemTests.cs b/src/Flipdish.Test/Model/RestApiResultMenuSectionItemTests.cs
deleted file mode 100644
index 51e417d8..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMenuSectionItemTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMenuSectionItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMenuSectionItemTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMenuSectionItem
-        //private RestApiResultMenuSectionItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMenuSectionItem
-            //instance = new RestApiResultMenuSectionItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMenuSectionItem
-        /// </summary>
-        [Test]
-        public void RestApiResultMenuSectionItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMenuSectionItem
-            //Assert.IsInstanceOfType<RestApiResultMenuSectionItem> (instance, "variable 'instance' is a RestApiResultMenuSectionItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMenuSectionTests.cs b/src/Flipdish.Test/Model/RestApiResultMenuSectionTests.cs
deleted file mode 100644
index c0504516..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMenuSectionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMenuSection
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMenuSectionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMenuSection
-        //private RestApiResultMenuSection instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMenuSection
-            //instance = new RestApiResultMenuSection();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMenuSection
-        /// </summary>
-        [Test]
-        public void RestApiResultMenuSectionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMenuSection
-            //Assert.IsInstanceOfType<RestApiResultMenuSection> (instance, "variable 'instance' is a RestApiResultMenuSection");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMenuTests.cs b/src/Flipdish.Test/Model/RestApiResultMenuTests.cs
deleted file mode 100644
index 365b3726..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMenuTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMenu
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMenuTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMenu
-        //private RestApiResultMenu instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMenu
-            //instance = new RestApiResultMenu();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMenu
-        /// </summary>
-        [Test]
-        public void RestApiResultMenuInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMenu
-            //Assert.IsInstanceOfType<RestApiResultMenu> (instance, "variable 'instance' is a RestApiResultMenu");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMetadataTests.cs b/src/Flipdish.Test/Model/RestApiResultMetadataTests.cs
deleted file mode 100644
index 93f29210..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMetadataTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMetadata
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMetadataTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMetadata
-        //private RestApiResultMetadata instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMetadata
-            //instance = new RestApiResultMetadata();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMetadata
-        /// </summary>
-        [Test]
-        public void RestApiResultMetadataInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMetadata
-            //Assert.IsInstanceOfType<RestApiResultMetadata> (instance, "variable 'instance' is a RestApiResultMetadata");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMetafieldDefinitionTests.cs b/src/Flipdish.Test/Model/RestApiResultMetafieldDefinitionTests.cs
deleted file mode 100644
index f22ce367..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMetafieldDefinitionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMetafieldDefinition
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMetafieldDefinitionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMetafieldDefinition
-        //private RestApiResultMetafieldDefinition instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMetafieldDefinition
-            //instance = new RestApiResultMetafieldDefinition();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMetafieldDefinition
-        /// </summary>
-        [Test]
-        public void RestApiResultMetafieldDefinitionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMetafieldDefinition
-            //Assert.IsInstanceOfType<RestApiResultMetafieldDefinition> (instance, "variable 'instance' is a RestApiResultMetafieldDefinition");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMobileAppsDetailsTests.cs b/src/Flipdish.Test/Model/RestApiResultMobileAppsDetailsTests.cs
deleted file mode 100644
index b0fe8cce..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMobileAppsDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMobileAppsDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMobileAppsDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMobileAppsDetails
-        //private RestApiResultMobileAppsDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMobileAppsDetails
-            //instance = new RestApiResultMobileAppsDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMobileAppsDetails
-        /// </summary>
-        [Test]
-        public void RestApiResultMobileAppsDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMobileAppsDetails
-            //Assert.IsInstanceOfType<RestApiResultMobileAppsDetails> (instance, "variable 'instance' is a RestApiResultMobileAppsDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMobileAppsImageTests.cs b/src/Flipdish.Test/Model/RestApiResultMobileAppsImageTests.cs
deleted file mode 100644
index 52293523..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMobileAppsImageTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMobileAppsImage
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMobileAppsImageTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMobileAppsImage
-        //private RestApiResultMobileAppsImage instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMobileAppsImage
-            //instance = new RestApiResultMobileAppsImage();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMobileAppsImage
-        /// </summary>
-        [Test]
-        public void RestApiResultMobileAppsImageInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMobileAppsImage
-            //Assert.IsInstanceOfType<RestApiResultMobileAppsImage> (instance, "variable 'instance' is a RestApiResultMobileAppsImage");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionDetailsTests.cs b/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionDetailsTests.cs
deleted file mode 100644
index 3a5cf027..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMobileAppsSubmissionDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMobileAppsSubmissionDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMobileAppsSubmissionDetails
-        //private RestApiResultMobileAppsSubmissionDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMobileAppsSubmissionDetails
-            //instance = new RestApiResultMobileAppsSubmissionDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMobileAppsSubmissionDetails
-        /// </summary>
-        [Test]
-        public void RestApiResultMobileAppsSubmissionDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMobileAppsSubmissionDetails
-            //Assert.IsInstanceOfType<RestApiResultMobileAppsSubmissionDetails> (instance, "variable 'instance' is a RestApiResultMobileAppsSubmissionDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionStatusTests.cs b/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionStatusTests.cs
deleted file mode 100644
index 706f5f66..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMobileAppsSubmissionStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMobileAppsSubmissionStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMobileAppsSubmissionStatus
-        //private RestApiResultMobileAppsSubmissionStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMobileAppsSubmissionStatus
-            //instance = new RestApiResultMobileAppsSubmissionStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMobileAppsSubmissionStatus
-        /// </summary>
-        [Test]
-        public void RestApiResultMobileAppsSubmissionStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMobileAppsSubmissionStatus
-            //Assert.IsInstanceOfType<RestApiResultMobileAppsSubmissionStatus> (instance, "variable 'instance' is a RestApiResultMobileAppsSubmissionStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionTests.cs b/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionTests.cs
deleted file mode 100644
index 7c8e1c80..00000000
--- a/src/Flipdish.Test/Model/RestApiResultMobileAppsSubmissionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultMobileAppsSubmission
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultMobileAppsSubmissionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultMobileAppsSubmission
-        //private RestApiResultMobileAppsSubmission instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultMobileAppsSubmission
-            //instance = new RestApiResultMobileAppsSubmission();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultMobileAppsSubmission
-        /// </summary>
-        [Test]
-        public void RestApiResultMobileAppsSubmissionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultMobileAppsSubmission
-            //Assert.IsInstanceOfType<RestApiResultMobileAppsSubmission> (instance, "variable 'instance' is a RestApiResultMobileAppsSubmission");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultModelBaseTests.cs b/src/Flipdish.Test/Model/RestApiResultModelBaseTests.cs
deleted file mode 100644
index 3bf0b56e..00000000
--- a/src/Flipdish.Test/Model/RestApiResultModelBaseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultModelBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultModelBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultModelBase
-        //private RestApiResultModelBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultModelBase
-            //instance = new RestApiResultModelBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultModelBase
-        /// </summary>
-        [Test]
-        public void RestApiResultModelBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultModelBase
-            //Assert.IsInstanceOfType<RestApiResultModelBase> (instance, "variable 'instance' is a RestApiResultModelBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOAuthAppTests.cs b/src/Flipdish.Test/Model/RestApiResultOAuthAppTests.cs
deleted file mode 100644
index b506996a..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOAuthAppTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOAuthApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOAuthAppTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOAuthApp
-        //private RestApiResultOAuthApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOAuthApp
-            //instance = new RestApiResultOAuthApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOAuthApp
-        /// </summary>
-        [Test]
-        public void RestApiResultOAuthAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOAuthApp
-            //Assert.IsInstanceOfType<RestApiResultOAuthApp> (instance, "variable 'instance' is a RestApiResultOAuthApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOauthClientRedirectUriTests.cs b/src/Flipdish.Test/Model/RestApiResultOauthClientRedirectUriTests.cs
deleted file mode 100644
index 7eac9903..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOauthClientRedirectUriTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOauthClientRedirectUri
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOauthClientRedirectUriTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOauthClientRedirectUri
-        //private RestApiResultOauthClientRedirectUri instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOauthClientRedirectUri
-            //instance = new RestApiResultOauthClientRedirectUri();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOauthClientRedirectUri
-        /// </summary>
-        [Test]
-        public void RestApiResultOauthClientRedirectUriInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOauthClientRedirectUri
-            //Assert.IsInstanceOfType<RestApiResultOauthClientRedirectUri> (instance, "variable 'instance' is a RestApiResultOauthClientRedirectUri");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOrderBatchTests.cs b/src/Flipdish.Test/Model/RestApiResultOrderBatchTests.cs
deleted file mode 100644
index 42cb9e7f..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOrderBatchTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOrderBatch
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOrderBatchTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOrderBatch
-        //private RestApiResultOrderBatch instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOrderBatch
-            //instance = new RestApiResultOrderBatch();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOrderBatch
-        /// </summary>
-        [Test]
-        public void RestApiResultOrderBatchInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOrderBatch
-            //Assert.IsInstanceOfType<RestApiResultOrderBatch> (instance, "variable 'instance' is a RestApiResultOrderBatch");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOrderBatchingConfigurationTests.cs b/src/Flipdish.Test/Model/RestApiResultOrderBatchingConfigurationTests.cs
deleted file mode 100644
index 30c97888..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOrderBatchingConfigurationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOrderBatchingConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOrderBatchingConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOrderBatchingConfiguration
-        //private RestApiResultOrderBatchingConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOrderBatchingConfiguration
-            //instance = new RestApiResultOrderBatchingConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOrderBatchingConfiguration
-        /// </summary>
-        [Test]
-        public void RestApiResultOrderBatchingConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOrderBatchingConfiguration
-            //Assert.IsInstanceOfType<RestApiResultOrderBatchingConfiguration> (instance, "variable 'instance' is a RestApiResultOrderBatchingConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOrderDeliveryInformationTests.cs b/src/Flipdish.Test/Model/RestApiResultOrderDeliveryInformationTests.cs
deleted file mode 100644
index d4871d8f..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOrderDeliveryInformationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOrderDeliveryInformation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOrderDeliveryInformationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOrderDeliveryInformation
-        //private RestApiResultOrderDeliveryInformation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOrderDeliveryInformation
-            //instance = new RestApiResultOrderDeliveryInformation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOrderDeliveryInformation
-        /// </summary>
-        [Test]
-        public void RestApiResultOrderDeliveryInformationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOrderDeliveryInformation
-            //Assert.IsInstanceOfType<RestApiResultOrderDeliveryInformation> (instance, "variable 'instance' is a RestApiResultOrderDeliveryInformation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOrderFulfillmentStatusTests.cs b/src/Flipdish.Test/Model/RestApiResultOrderFulfillmentStatusTests.cs
deleted file mode 100644
index 6294964c..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOrderFulfillmentStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOrderFulfillmentStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOrderFulfillmentStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOrderFulfillmentStatus
-        //private RestApiResultOrderFulfillmentStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOrderFulfillmentStatus
-            //instance = new RestApiResultOrderFulfillmentStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOrderFulfillmentStatus
-        /// </summary>
-        [Test]
-        public void RestApiResultOrderFulfillmentStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOrderFulfillmentStatus
-            //Assert.IsInstanceOfType<RestApiResultOrderFulfillmentStatus> (instance, "variable 'instance' is a RestApiResultOrderFulfillmentStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOrderFulfillmentStatusWithConfigurationActionsTests.cs b/src/Flipdish.Test/Model/RestApiResultOrderFulfillmentStatusWithConfigurationActionsTests.cs
deleted file mode 100644
index cdfc5bd4..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOrderFulfillmentStatusWithConfigurationActionsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOrderFulfillmentStatusWithConfigurationActions
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOrderFulfillmentStatusWithConfigurationActionsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOrderFulfillmentStatusWithConfigurationActions
-        //private RestApiResultOrderFulfillmentStatusWithConfigurationActions instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOrderFulfillmentStatusWithConfigurationActions
-            //instance = new RestApiResultOrderFulfillmentStatusWithConfigurationActions();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOrderFulfillmentStatusWithConfigurationActions
-        /// </summary>
-        [Test]
-        public void RestApiResultOrderFulfillmentStatusWithConfigurationActionsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOrderFulfillmentStatusWithConfigurationActions
-            //Assert.IsInstanceOfType<RestApiResultOrderFulfillmentStatusWithConfigurationActions> (instance, "variable 'instance' is a RestApiResultOrderFulfillmentStatusWithConfigurationActions");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOrderIngestSubmitOrderResponseTests.cs b/src/Flipdish.Test/Model/RestApiResultOrderIngestSubmitOrderResponseTests.cs
deleted file mode 100644
index 72595563..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOrderIngestSubmitOrderResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOrderIngestSubmitOrderResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOrderIngestSubmitOrderResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOrderIngestSubmitOrderResponse
-        //private RestApiResultOrderIngestSubmitOrderResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOrderIngestSubmitOrderResponse
-            //instance = new RestApiResultOrderIngestSubmitOrderResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOrderIngestSubmitOrderResponse
-        /// </summary>
-        [Test]
-        public void RestApiResultOrderIngestSubmitOrderResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOrderIngestSubmitOrderResponse
-            //Assert.IsInstanceOfType<RestApiResultOrderIngestSubmitOrderResponse> (instance, "variable 'instance' is a RestApiResultOrderIngestSubmitOrderResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOrderPaymentInformationTests.cs b/src/Flipdish.Test/Model/RestApiResultOrderPaymentInformationTests.cs
deleted file mode 100644
index fa818b95..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOrderPaymentInformationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOrderPaymentInformation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOrderPaymentInformationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOrderPaymentInformation
-        //private RestApiResultOrderPaymentInformation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOrderPaymentInformation
-            //instance = new RestApiResultOrderPaymentInformation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOrderPaymentInformation
-        /// </summary>
-        [Test]
-        public void RestApiResultOrderPaymentInformationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOrderPaymentInformation
-            //Assert.IsInstanceOfType<RestApiResultOrderPaymentInformation> (instance, "variable 'instance' is a RestApiResultOrderPaymentInformation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultOrderTests.cs b/src/Flipdish.Test/Model/RestApiResultOrderTests.cs
deleted file mode 100644
index eb641283..00000000
--- a/src/Flipdish.Test/Model/RestApiResultOrderTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultOrder
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultOrderTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultOrder
-        //private RestApiResultOrder instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultOrder
-            //instance = new RestApiResultOrder();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultOrder
-        /// </summary>
-        [Test]
-        public void RestApiResultOrderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultOrder
-            //Assert.IsInstanceOfType<RestApiResultOrder> (instance, "variable 'instance' is a RestApiResultOrder");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultPaymentIntentTests.cs b/src/Flipdish.Test/Model/RestApiResultPaymentIntentTests.cs
deleted file mode 100644
index c531e20c..00000000
--- a/src/Flipdish.Test/Model/RestApiResultPaymentIntentTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultPaymentIntent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultPaymentIntentTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultPaymentIntent
-        //private RestApiResultPaymentIntent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultPaymentIntent
-            //instance = new RestApiResultPaymentIntent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultPaymentIntent
-        /// </summary>
-        [Test]
-        public void RestApiResultPaymentIntentInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultPaymentIntent
-            //Assert.IsInstanceOfType<RestApiResultPaymentIntent> (instance, "variable 'instance' is a RestApiResultPaymentIntent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultPaymentTerminalDetailsTests.cs b/src/Flipdish.Test/Model/RestApiResultPaymentTerminalDetailsTests.cs
deleted file mode 100644
index 4ff76130..00000000
--- a/src/Flipdish.Test/Model/RestApiResultPaymentTerminalDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultPaymentTerminalDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultPaymentTerminalDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultPaymentTerminalDetails
-        //private RestApiResultPaymentTerminalDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultPaymentTerminalDetails
-            //instance = new RestApiResultPaymentTerminalDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultPaymentTerminalDetails
-        /// </summary>
-        [Test]
-        public void RestApiResultPaymentTerminalDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultPaymentTerminalDetails
-            //Assert.IsInstanceOfType<RestApiResultPaymentTerminalDetails> (instance, "variable 'instance' is a RestApiResultPaymentTerminalDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultPaymentTerminalTransactionDetailsTests.cs b/src/Flipdish.Test/Model/RestApiResultPaymentTerminalTransactionDetailsTests.cs
deleted file mode 100644
index 28debcdf..00000000
--- a/src/Flipdish.Test/Model/RestApiResultPaymentTerminalTransactionDetailsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultPaymentTerminalTransactionDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultPaymentTerminalTransactionDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultPaymentTerminalTransactionDetails
-        //private RestApiResultPaymentTerminalTransactionDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultPaymentTerminalTransactionDetails
-            //instance = new RestApiResultPaymentTerminalTransactionDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultPaymentTerminalTransactionDetails
-        /// </summary>
-        [Test]
-        public void RestApiResultPaymentTerminalTransactionDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultPaymentTerminalTransactionDetails
-            //Assert.IsInstanceOfType<RestApiResultPaymentTerminalTransactionDetails> (instance, "variable 'instance' is a RestApiResultPaymentTerminalTransactionDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultPreOrderConfigTests.cs b/src/Flipdish.Test/Model/RestApiResultPreOrderConfigTests.cs
deleted file mode 100644
index 9200ae37..00000000
--- a/src/Flipdish.Test/Model/RestApiResultPreOrderConfigTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultPreOrderConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultPreOrderConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultPreOrderConfig
-        //private RestApiResultPreOrderConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultPreOrderConfig
-            //instance = new RestApiResultPreOrderConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultPreOrderConfig
-        /// </summary>
-        [Test]
-        public void RestApiResultPreOrderConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultPreOrderConfig
-            //Assert.IsInstanceOfType<RestApiResultPreOrderConfig> (instance, "variable 'instance' is a RestApiResultPreOrderConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultProcessingFeeConfigTests.cs b/src/Flipdish.Test/Model/RestApiResultProcessingFeeConfigTests.cs
deleted file mode 100644
index 0ae05ac2..00000000
--- a/src/Flipdish.Test/Model/RestApiResultProcessingFeeConfigTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultProcessingFeeConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultProcessingFeeConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultProcessingFeeConfig
-        //private RestApiResultProcessingFeeConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultProcessingFeeConfig
-            //instance = new RestApiResultProcessingFeeConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultProcessingFeeConfig
-        /// </summary>
-        [Test]
-        public void RestApiResultProcessingFeeConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultProcessingFeeConfig
-            //Assert.IsInstanceOfType<RestApiResultProcessingFeeConfig> (instance, "variable 'instance' is a RestApiResultProcessingFeeConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultProductTests.cs b/src/Flipdish.Test/Model/RestApiResultProductTests.cs
deleted file mode 100644
index d2332384..00000000
--- a/src/Flipdish.Test/Model/RestApiResultProductTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultProductTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultProduct
-        //private RestApiResultProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultProduct
-            //instance = new RestApiResultProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultProduct
-        /// </summary>
-        [Test]
-        public void RestApiResultProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultProduct
-            //Assert.IsInstanceOfType<RestApiResultProduct> (instance, "variable 'instance' is a RestApiResultProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultPushNotificationResponseTests.cs b/src/Flipdish.Test/Model/RestApiResultPushNotificationResponseTests.cs
deleted file mode 100644
index a5c3f6b6..00000000
--- a/src/Flipdish.Test/Model/RestApiResultPushNotificationResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultPushNotificationResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultPushNotificationResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultPushNotificationResponse
-        //private RestApiResultPushNotificationResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultPushNotificationResponse
-            //instance = new RestApiResultPushNotificationResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultPushNotificationResponse
-        /// </summary>
-        [Test]
-        public void RestApiResultPushNotificationResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultPushNotificationResponse
-            //Assert.IsInstanceOfType<RestApiResultPushNotificationResponse> (instance, "variable 'instance' is a RestApiResultPushNotificationResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultRedeemInvitationResultTests.cs b/src/Flipdish.Test/Model/RestApiResultRedeemInvitationResultTests.cs
deleted file mode 100644
index f2b5a62f..00000000
--- a/src/Flipdish.Test/Model/RestApiResultRedeemInvitationResultTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultRedeemInvitationResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultRedeemInvitationResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultRedeemInvitationResult
-        //private RestApiResultRedeemInvitationResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultRedeemInvitationResult
-            //instance = new RestApiResultRedeemInvitationResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultRedeemInvitationResult
-        /// </summary>
-        [Test]
-        public void RestApiResultRedeemInvitationResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultRedeemInvitationResult
-            //Assert.IsInstanceOfType<RestApiResultRedeemInvitationResult> (instance, "variable 'instance' is a RestApiResultRedeemInvitationResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultRetentionCampaignTests.cs b/src/Flipdish.Test/Model/RestApiResultRetentionCampaignTests.cs
deleted file mode 100644
index 4de1b5fa..00000000
--- a/src/Flipdish.Test/Model/RestApiResultRetentionCampaignTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultRetentionCampaign
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultRetentionCampaignTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultRetentionCampaign
-        //private RestApiResultRetentionCampaign instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultRetentionCampaign
-            //instance = new RestApiResultRetentionCampaign();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultRetentionCampaign
-        /// </summary>
-        [Test]
-        public void RestApiResultRetentionCampaignInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultRetentionCampaign
-            //Assert.IsInstanceOfType<RestApiResultRetentionCampaign> (instance, "variable 'instance' is a RestApiResultRetentionCampaign");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultServiceChargeTests.cs b/src/Flipdish.Test/Model/RestApiResultServiceChargeTests.cs
deleted file mode 100644
index 8c0f4240..00000000
--- a/src/Flipdish.Test/Model/RestApiResultServiceChargeTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultServiceCharge
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultServiceChargeTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultServiceCharge
-        //private RestApiResultServiceCharge instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultServiceCharge
-            //instance = new RestApiResultServiceCharge();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultServiceCharge
-        /// </summary>
-        [Test]
-        public void RestApiResultServiceChargeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultServiceCharge
-            //Assert.IsInstanceOfType<RestApiResultServiceCharge> (instance, "variable 'instance' is a RestApiResultServiceCharge");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStoreAddressTests.cs b/src/Flipdish.Test/Model/RestApiResultStoreAddressTests.cs
deleted file mode 100644
index a1b5f63d..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStoreAddressTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStoreAddress
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStoreAddressTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStoreAddress
-        //private RestApiResultStoreAddress instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStoreAddress
-            //instance = new RestApiResultStoreAddress();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStoreAddress
-        /// </summary>
-        [Test]
-        public void RestApiResultStoreAddressInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStoreAddress
-            //Assert.IsInstanceOfType<RestApiResultStoreAddress> (instance, "variable 'instance' is a RestApiResultStoreAddress");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStoreChannelAssignmentTests.cs b/src/Flipdish.Test/Model/RestApiResultStoreChannelAssignmentTests.cs
deleted file mode 100644
index 8ad51118..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStoreChannelAssignmentTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStoreChannelAssignment
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStoreChannelAssignmentTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStoreChannelAssignment
-        //private RestApiResultStoreChannelAssignment instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStoreChannelAssignment
-            //instance = new RestApiResultStoreChannelAssignment();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStoreChannelAssignment
-        /// </summary>
-        [Test]
-        public void RestApiResultStoreChannelAssignmentInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStoreChannelAssignment
-            //Assert.IsInstanceOfType<RestApiResultStoreChannelAssignment> (instance, "variable 'instance' is a RestApiResultStoreChannelAssignment");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStoreEndOfDayReportTests.cs b/src/Flipdish.Test/Model/RestApiResultStoreEndOfDayReportTests.cs
deleted file mode 100644
index 8922d87e..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStoreEndOfDayReportTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStoreEndOfDayReport
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStoreEndOfDayReportTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStoreEndOfDayReport
-        //private RestApiResultStoreEndOfDayReport instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStoreEndOfDayReport
-            //instance = new RestApiResultStoreEndOfDayReport();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStoreEndOfDayReport
-        /// </summary>
-        [Test]
-        public void RestApiResultStoreEndOfDayReportInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStoreEndOfDayReport
-            //Assert.IsInstanceOfType<RestApiResultStoreEndOfDayReport> (instance, "variable 'instance' is a RestApiResultStoreEndOfDayReport");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStoreGroupBaseTests.cs b/src/Flipdish.Test/Model/RestApiResultStoreGroupBaseTests.cs
deleted file mode 100644
index b14ec39c..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStoreGroupBaseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStoreGroupBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStoreGroupBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStoreGroupBase
-        //private RestApiResultStoreGroupBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStoreGroupBase
-            //instance = new RestApiResultStoreGroupBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStoreGroupBase
-        /// </summary>
-        [Test]
-        public void RestApiResultStoreGroupBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStoreGroupBase
-            //Assert.IsInstanceOfType<RestApiResultStoreGroupBase> (instance, "variable 'instance' is a RestApiResultStoreGroupBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStoreGroupTests.cs b/src/Flipdish.Test/Model/RestApiResultStoreGroupTests.cs
deleted file mode 100644
index 80595a68..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStoreGroupTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStoreGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStoreGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStoreGroup
-        //private RestApiResultStoreGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStoreGroup
-            //instance = new RestApiResultStoreGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStoreGroup
-        /// </summary>
-        [Test]
-        public void RestApiResultStoreGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStoreGroup
-            //Assert.IsInstanceOfType<RestApiResultStoreGroup> (instance, "variable 'instance' is a RestApiResultStoreGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStoreKioskSettingsTests.cs b/src/Flipdish.Test/Model/RestApiResultStoreKioskSettingsTests.cs
deleted file mode 100644
index 33feb298..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStoreKioskSettingsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStoreKioskSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStoreKioskSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStoreKioskSettings
-        //private RestApiResultStoreKioskSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStoreKioskSettings
-            //instance = new RestApiResultStoreKioskSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStoreKioskSettings
-        /// </summary>
-        [Test]
-        public void RestApiResultStoreKioskSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStoreKioskSettings
-            //Assert.IsInstanceOfType<RestApiResultStoreKioskSettings> (instance, "variable 'instance' is a RestApiResultStoreKioskSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStoreOrderCapacityConfigTests.cs b/src/Flipdish.Test/Model/RestApiResultStoreOrderCapacityConfigTests.cs
deleted file mode 100644
index 60e2cdc5..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStoreOrderCapacityConfigTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStoreOrderCapacityConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStoreOrderCapacityConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStoreOrderCapacityConfig
-        //private RestApiResultStoreOrderCapacityConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStoreOrderCapacityConfig
-            //instance = new RestApiResultStoreOrderCapacityConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStoreOrderCapacityConfig
-        /// </summary>
-        [Test]
-        public void RestApiResultStoreOrderCapacityConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStoreOrderCapacityConfig
-            //Assert.IsInstanceOfType<RestApiResultStoreOrderCapacityConfig> (instance, "variable 'instance' is a RestApiResultStoreOrderCapacityConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStoreTests.cs b/src/Flipdish.Test/Model/RestApiResultStoreTests.cs
deleted file mode 100644
index 2809d7d2..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStoreTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStore
-        //private RestApiResultStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStore
-            //instance = new RestApiResultStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStore
-        /// </summary>
-        [Test]
-        public void RestApiResultStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStore
-            //Assert.IsInstanceOfType<RestApiResultStore> (instance, "variable 'instance' is a RestApiResultStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStripeConnectedAccountTests.cs b/src/Flipdish.Test/Model/RestApiResultStripeConnectedAccountTests.cs
deleted file mode 100644
index 66de9679..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStripeConnectedAccountTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStripeConnectedAccount
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStripeConnectedAccountTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStripeConnectedAccount
-        //private RestApiResultStripeConnectedAccount instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStripeConnectedAccount
-            //instance = new RestApiResultStripeConnectedAccount();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStripeConnectedAccount
-        /// </summary>
-        [Test]
-        public void RestApiResultStripeConnectedAccountInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStripeConnectedAccount
-            //Assert.IsInstanceOfType<RestApiResultStripeConnectedAccount> (instance, "variable 'instance' is a RestApiResultStripeConnectedAccount");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStripeTerminalConnectionTokenTests.cs b/src/Flipdish.Test/Model/RestApiResultStripeTerminalConnectionTokenTests.cs
deleted file mode 100644
index c6d9b6aa..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStripeTerminalConnectionTokenTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStripeTerminalConnectionToken
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStripeTerminalConnectionTokenTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStripeTerminalConnectionToken
-        //private RestApiResultStripeTerminalConnectionToken instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStripeTerminalConnectionToken
-            //instance = new RestApiResultStripeTerminalConnectionToken();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStripeTerminalConnectionToken
-        /// </summary>
-        [Test]
-        public void RestApiResultStripeTerminalConnectionTokenInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStripeTerminalConnectionToken
-            //Assert.IsInstanceOfType<RestApiResultStripeTerminalConnectionToken> (instance, "variable 'instance' is a RestApiResultStripeTerminalConnectionToken");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStripeTerminalLocationTests.cs b/src/Flipdish.Test/Model/RestApiResultStripeTerminalLocationTests.cs
deleted file mode 100644
index 1614640a..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStripeTerminalLocationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStripeTerminalLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStripeTerminalLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStripeTerminalLocation
-        //private RestApiResultStripeTerminalLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStripeTerminalLocation
-            //instance = new RestApiResultStripeTerminalLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStripeTerminalLocation
-        /// </summary>
-        [Test]
-        public void RestApiResultStripeTerminalLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStripeTerminalLocation
-            //Assert.IsInstanceOfType<RestApiResultStripeTerminalLocation> (instance, "variable 'instance' is a RestApiResultStripeTerminalLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStripeTerminalPrivateKeyTests.cs b/src/Flipdish.Test/Model/RestApiResultStripeTerminalPrivateKeyTests.cs
deleted file mode 100644
index 8009e8f0..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStripeTerminalPrivateKeyTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStripeTerminalPrivateKey
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStripeTerminalPrivateKeyTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStripeTerminalPrivateKey
-        //private RestApiResultStripeTerminalPrivateKey instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStripeTerminalPrivateKey
-            //instance = new RestApiResultStripeTerminalPrivateKey();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStripeTerminalPrivateKey
-        /// </summary>
-        [Test]
-        public void RestApiResultStripeTerminalPrivateKeyInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStripeTerminalPrivateKey
-            //Assert.IsInstanceOfType<RestApiResultStripeTerminalPrivateKey> (instance, "variable 'instance' is a RestApiResultStripeTerminalPrivateKey");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultStuartSettingsTests.cs b/src/Flipdish.Test/Model/RestApiResultStuartSettingsTests.cs
deleted file mode 100644
index 1345b3a9..00000000
--- a/src/Flipdish.Test/Model/RestApiResultStuartSettingsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultStuartSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultStuartSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultStuartSettings
-        //private RestApiResultStuartSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultStuartSettings
-            //instance = new RestApiResultStuartSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultStuartSettings
-        /// </summary>
-        [Test]
-        public void RestApiResultStuartSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultStuartSettings
-            //Assert.IsInstanceOfType<RestApiResultStuartSettings> (instance, "variable 'instance' is a RestApiResultStuartSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultSubscriptionPlansResponseTests.cs b/src/Flipdish.Test/Model/RestApiResultSubscriptionPlansResponseTests.cs
deleted file mode 100644
index 604772ce..00000000
--- a/src/Flipdish.Test/Model/RestApiResultSubscriptionPlansResponseTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultSubscriptionPlansResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultSubscriptionPlansResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultSubscriptionPlansResponse
-        //private RestApiResultSubscriptionPlansResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultSubscriptionPlansResponse
-            //instance = new RestApiResultSubscriptionPlansResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultSubscriptionPlansResponse
-        /// </summary>
-        [Test]
-        public void RestApiResultSubscriptionPlansResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultSubscriptionPlansResponse
-            //Assert.IsInstanceOfType<RestApiResultSubscriptionPlansResponse> (instance, "variable 'instance' is a RestApiResultSubscriptionPlansResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultSubscriptionTests.cs b/src/Flipdish.Test/Model/RestApiResultSubscriptionTests.cs
deleted file mode 100644
index 82d3179d..00000000
--- a/src/Flipdish.Test/Model/RestApiResultSubscriptionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultSubscription
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultSubscriptionTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultSubscription
-        //private RestApiResultSubscription instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultSubscription
-            //instance = new RestApiResultSubscription();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultSubscription
-        /// </summary>
-        [Test]
-        public void RestApiResultSubscriptionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultSubscription
-            //Assert.IsInstanceOfType<RestApiResultSubscription> (instance, "variable 'instance' is a RestApiResultSubscription");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultTeammateTests.cs b/src/Flipdish.Test/Model/RestApiResultTeammateTests.cs
deleted file mode 100644
index 1ab9ad59..00000000
--- a/src/Flipdish.Test/Model/RestApiResultTeammateTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultTeammate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultTeammateTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultTeammate
-        //private RestApiResultTeammate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultTeammate
-            //instance = new RestApiResultTeammate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultTeammate
-        /// </summary>
-        [Test]
-        public void RestApiResultTeammateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultTeammate
-            //Assert.IsInstanceOfType<RestApiResultTeammate> (instance, "variable 'instance' is a RestApiResultTeammate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultTelemetrySeriesResultTests.cs b/src/Flipdish.Test/Model/RestApiResultTelemetrySeriesResultTests.cs
deleted file mode 100644
index 45710e6e..00000000
--- a/src/Flipdish.Test/Model/RestApiResultTelemetrySeriesResultTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultTelemetrySeriesResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultTelemetrySeriesResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultTelemetrySeriesResult
-        //private RestApiResultTelemetrySeriesResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultTelemetrySeriesResult
-            //instance = new RestApiResultTelemetrySeriesResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultTelemetrySeriesResult
-        /// </summary>
-        [Test]
-        public void RestApiResultTelemetrySeriesResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultTelemetrySeriesResult
-            //Assert.IsInstanceOfType<RestApiResultTelemetrySeriesResult> (instance, "variable 'instance' is a RestApiResultTelemetrySeriesResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultTests.cs b/src/Flipdish.Test/Model/RestApiResultTests.cs
deleted file mode 100644
index d190cfe8..00000000
--- a/src/Flipdish.Test/Model/RestApiResultTests.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResult
-        //private RestApiResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResult
-            //instance = new RestApiResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResult
-        /// </summary>
-        [Test]
-        public void RestApiResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResult
-            //Assert.IsInstanceOfType<RestApiResult> (instance, "variable 'instance' is a RestApiResult");
-        }
-
-
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultTipConfigurationTests.cs b/src/Flipdish.Test/Model/RestApiResultTipConfigurationTests.cs
deleted file mode 100644
index 1dbd12f2..00000000
--- a/src/Flipdish.Test/Model/RestApiResultTipConfigurationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultTipConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultTipConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultTipConfiguration
-        //private RestApiResultTipConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultTipConfiguration
-            //instance = new RestApiResultTipConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultTipConfiguration
-        /// </summary>
-        [Test]
-        public void RestApiResultTipConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultTipConfiguration
-            //Assert.IsInstanceOfType<RestApiResultTipConfiguration> (instance, "variable 'instance' is a RestApiResultTipConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultUpdateMobileAppsSubmissionStatusTests.cs b/src/Flipdish.Test/Model/RestApiResultUpdateMobileAppsSubmissionStatusTests.cs
deleted file mode 100644
index b77452e4..00000000
--- a/src/Flipdish.Test/Model/RestApiResultUpdateMobileAppsSubmissionStatusTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultUpdateMobileAppsSubmissionStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultUpdateMobileAppsSubmissionStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultUpdateMobileAppsSubmissionStatus
-        //private RestApiResultUpdateMobileAppsSubmissionStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultUpdateMobileAppsSubmissionStatus
-            //instance = new RestApiResultUpdateMobileAppsSubmissionStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultUpdateMobileAppsSubmissionStatus
-        /// </summary>
-        [Test]
-        public void RestApiResultUpdateMobileAppsSubmissionStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultUpdateMobileAppsSubmissionStatus
-            //Assert.IsInstanceOfType<RestApiResultUpdateMobileAppsSubmissionStatus> (instance, "variable 'instance' is a RestApiResultUpdateMobileAppsSubmissionStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultVoucherWithStatsTests.cs b/src/Flipdish.Test/Model/RestApiResultVoucherWithStatsTests.cs
deleted file mode 100644
index 4cde8dad..00000000
--- a/src/Flipdish.Test/Model/RestApiResultVoucherWithStatsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultVoucherWithStats
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultVoucherWithStatsTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultVoucherWithStats
-        //private RestApiResultVoucherWithStats instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultVoucherWithStats
-            //instance = new RestApiResultVoucherWithStats();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultVoucherWithStats
-        /// </summary>
-        [Test]
-        public void RestApiResultVoucherWithStatsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultVoucherWithStats
-            //Assert.IsInstanceOfType<RestApiResultVoucherWithStats> (instance, "variable 'instance' is a RestApiResultVoucherWithStats");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultWebsiteImageTests.cs b/src/Flipdish.Test/Model/RestApiResultWebsiteImageTests.cs
deleted file mode 100644
index d54711fc..00000000
--- a/src/Flipdish.Test/Model/RestApiResultWebsiteImageTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultWebsiteImage
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultWebsiteImageTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultWebsiteImage
-        //private RestApiResultWebsiteImage instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultWebsiteImage
-            //instance = new RestApiResultWebsiteImage();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultWebsiteImage
-        /// </summary>
-        [Test]
-        public void RestApiResultWebsiteImageInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultWebsiteImage
-            //Assert.IsInstanceOfType<RestApiResultWebsiteImage> (instance, "variable 'instance' is a RestApiResultWebsiteImage");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiResultWebsiteTestimonialTests.cs b/src/Flipdish.Test/Model/RestApiResultWebsiteTestimonialTests.cs
deleted file mode 100644
index fe763211..00000000
--- a/src/Flipdish.Test/Model/RestApiResultWebsiteTestimonialTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiResultWebsiteTestimonial
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiResultWebsiteTestimonialTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiResultWebsiteTestimonial
-        //private RestApiResultWebsiteTestimonial instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiResultWebsiteTestimonial
-            //instance = new RestApiResultWebsiteTestimonial();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiResultWebsiteTestimonial
-        /// </summary>
-        [Test]
-        public void RestApiResultWebsiteTestimonialInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiResultWebsiteTestimonial
-            //Assert.IsInstanceOfType<RestApiResultWebsiteTestimonial> (instance, "variable 'instance' is a RestApiResultWebsiteTestimonial");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiStringArrayResultTests.cs b/src/Flipdish.Test/Model/RestApiStringArrayResultTests.cs
deleted file mode 100644
index 49538a67..00000000
--- a/src/Flipdish.Test/Model/RestApiStringArrayResultTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiStringArrayResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiStringArrayResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiStringArrayResult
-        //private RestApiStringArrayResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiStringArrayResult
-            //instance = new RestApiStringArrayResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiStringArrayResult
-        /// </summary>
-        [Test]
-        public void RestApiStringArrayResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiStringArrayResult
-            //Assert.IsInstanceOfType<RestApiStringArrayResult> (instance, "variable 'instance' is a RestApiStringArrayResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiStringResultTests.cs b/src/Flipdish.Test/Model/RestApiStringResultTests.cs
deleted file mode 100644
index 3913dade..00000000
--- a/src/Flipdish.Test/Model/RestApiStringResultTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiStringResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiStringResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiStringResult
-        //private RestApiStringResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiStringResult
-            //instance = new RestApiStringResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiStringResult
-        /// </summary>
-        [Test]
-        public void RestApiStringResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiStringResult
-            //Assert.IsInstanceOfType<RestApiStringResult> (instance, "variable 'instance' is a RestApiStringResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestApiUnauthorizedResultTests.cs b/src/Flipdish.Test/Model/RestApiUnauthorizedResultTests.cs
deleted file mode 100644
index b5e57d6e..00000000
--- a/src/Flipdish.Test/Model/RestApiUnauthorizedResultTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestApiUnauthorizedResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestApiUnauthorizedResultTests
-    {
-        // TODO uncomment below to declare an instance variable for RestApiUnauthorizedResult
-        //private RestApiUnauthorizedResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestApiUnauthorizedResult
-            //instance = new RestApiUnauthorizedResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestApiUnauthorizedResult
-        /// </summary>
-        [Test]
-        public void RestApiUnauthorizedResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestApiUnauthorizedResult
-            //Assert.IsInstanceOfType<RestApiUnauthorizedResult> (instance, "variable 'instance' is a RestApiUnauthorizedResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestaurantVoucherAssignedStoreTests.cs b/src/Flipdish.Test/Model/RestaurantVoucherAssignedStoreTests.cs
deleted file mode 100644
index bdf0f36a..00000000
--- a/src/Flipdish.Test/Model/RestaurantVoucherAssignedStoreTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestaurantVoucherAssignedStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestaurantVoucherAssignedStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for RestaurantVoucherAssignedStore
-        //private RestaurantVoucherAssignedStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestaurantVoucherAssignedStore
-            //instance = new RestaurantVoucherAssignedStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestaurantVoucherAssignedStore
-        /// </summary>
-        [Test]
-        public void RestaurantVoucherAssignedStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestaurantVoucherAssignedStore
-            //Assert.IsInstanceOfType<RestaurantVoucherAssignedStore> (instance, "variable 'instance' is a RestaurantVoucherAssignedStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Active'
-        /// </summary>
-        [Test]
-        public void ActiveTest()
-        {
-            // TODO unit test for the property 'Active'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RestaurantVoucherEligibleStoreTests.cs b/src/Flipdish.Test/Model/RestaurantVoucherEligibleStoreTests.cs
deleted file mode 100644
index 72c3cb21..00000000
--- a/src/Flipdish.Test/Model/RestaurantVoucherEligibleStoreTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RestaurantVoucherEligibleStore
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RestaurantVoucherEligibleStoreTests
-    {
-        // TODO uncomment below to declare an instance variable for RestaurantVoucherEligibleStore
-        //private RestaurantVoucherEligibleStore instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RestaurantVoucherEligibleStore
-            //instance = new RestaurantVoucherEligibleStore();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RestaurantVoucherEligibleStore
-        /// </summary>
-        [Test]
-        public void RestaurantVoucherEligibleStoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RestaurantVoucherEligibleStore
-            //Assert.IsInstanceOfType<RestaurantVoucherEligibleStore> (instance, "variable 'instance' is a RestaurantVoucherEligibleStore");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RetentionCampaignBaseTests.cs b/src/Flipdish.Test/Model/RetentionCampaignBaseTests.cs
deleted file mode 100644
index 26aad0ce..00000000
--- a/src/Flipdish.Test/Model/RetentionCampaignBaseTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RetentionCampaignBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RetentionCampaignBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for RetentionCampaignBase
-        //private RetentionCampaignBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RetentionCampaignBase
-            //instance = new RetentionCampaignBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RetentionCampaignBase
-        /// </summary>
-        [Test]
-        public void RetentionCampaignBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RetentionCampaignBase
-            //Assert.IsInstanceOfType<RetentionCampaignBase> (instance, "variable 'instance' is a RetentionCampaignBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'NotifyCustomerAfterMinutes'
-        /// </summary>
-        [Test]
-        public void NotifyCustomerAfterMinutesTest()
-        {
-            // TODO unit test for the property 'NotifyCustomerAfterMinutes'
-        }
-        /// <summary>
-        /// Test the property 'PercentDiscountAmount'
-        /// </summary>
-        [Test]
-        public void PercentDiscountAmountTest()
-        {
-            // TODO unit test for the property 'PercentDiscountAmount'
-        }
-        /// <summary>
-        /// Test the property 'LumpDiscountAmount'
-        /// </summary>
-        [Test]
-        public void LumpDiscountAmountTest()
-        {
-            // TODO unit test for the property 'LumpDiscountAmount'
-        }
-        /// <summary>
-        /// Test the property 'VoucherValidPeriodDays'
-        /// </summary>
-        [Test]
-        public void VoucherValidPeriodDaysTest()
-        {
-            // TODO unit test for the property 'VoucherValidPeriodDays'
-        }
-        /// <summary>
-        /// Test the property 'IncludeDeliveryFee'
-        /// </summary>
-        [Test]
-        public void IncludeDeliveryFeeTest()
-        {
-            // TODO unit test for the property 'IncludeDeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'AutoApplyResultingVouchers'
-        /// </summary>
-        [Test]
-        public void AutoApplyResultingVouchersTest()
-        {
-            // TODO unit test for the property 'AutoApplyResultingVouchers'
-        }
-        /// <summary>
-        /// Test the property 'IncludeExistingOrders'
-        /// </summary>
-        [Test]
-        public void IncludeExistingOrdersTest()
-        {
-            // TODO unit test for the property 'IncludeExistingOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RetentionCampaignCreatedEventTests.cs b/src/Flipdish.Test/Model/RetentionCampaignCreatedEventTests.cs
deleted file mode 100644
index 6b925468..00000000
--- a/src/Flipdish.Test/Model/RetentionCampaignCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RetentionCampaignCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RetentionCampaignCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for RetentionCampaignCreatedEvent
-        //private RetentionCampaignCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RetentionCampaignCreatedEvent
-            //instance = new RetentionCampaignCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RetentionCampaignCreatedEvent
-        /// </summary>
-        [Test]
-        public void RetentionCampaignCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RetentionCampaignCreatedEvent
-            //Assert.IsInstanceOfType<RetentionCampaignCreatedEvent> (instance, "variable 'instance' is a RetentionCampaignCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'RetentionCampaign'
-        /// </summary>
-        [Test]
-        public void RetentionCampaignTest()
-        {
-            // TODO unit test for the property 'RetentionCampaign'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RetentionCampaignDeletedEventTests.cs b/src/Flipdish.Test/Model/RetentionCampaignDeletedEventTests.cs
deleted file mode 100644
index 990cb389..00000000
--- a/src/Flipdish.Test/Model/RetentionCampaignDeletedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RetentionCampaignDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RetentionCampaignDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for RetentionCampaignDeletedEvent
-        //private RetentionCampaignDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RetentionCampaignDeletedEvent
-            //instance = new RetentionCampaignDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RetentionCampaignDeletedEvent
-        /// </summary>
-        [Test]
-        public void RetentionCampaignDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RetentionCampaignDeletedEvent
-            //Assert.IsInstanceOfType<RetentionCampaignDeletedEvent> (instance, "variable 'instance' is a RetentionCampaignDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'RetentionCampaign'
-        /// </summary>
-        [Test]
-        public void RetentionCampaignTest()
-        {
-            // TODO unit test for the property 'RetentionCampaign'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RetentionCampaignTests.cs b/src/Flipdish.Test/Model/RetentionCampaignTests.cs
deleted file mode 100644
index 547c737c..00000000
--- a/src/Flipdish.Test/Model/RetentionCampaignTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RetentionCampaign
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RetentionCampaignTests
-    {
-        // TODO uncomment below to declare an instance variable for RetentionCampaign
-        //private RetentionCampaign instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RetentionCampaign
-            //instance = new RetentionCampaign();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RetentionCampaign
-        /// </summary>
-        [Test]
-        public void RetentionCampaignInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RetentionCampaign
-            //Assert.IsInstanceOfType<RetentionCampaign> (instance, "variable 'instance' is a RetentionCampaign");
-        }
-
-
-        /// <summary>
-        /// Test the property 'From'
-        /// </summary>
-        [Test]
-        public void FromTest()
-        {
-            // TODO unit test for the property 'From'
-        }
-        /// <summary>
-        /// Test the property 'VoucherValidPeriodDays'
-        /// </summary>
-        [Test]
-        public void VoucherValidPeriodDaysTest()
-        {
-            // TODO unit test for the property 'VoucherValidPeriodDays'
-        }
-        /// <summary>
-        /// Test the property 'IncludeDeliveryFee'
-        /// </summary>
-        [Test]
-        public void IncludeDeliveryFeeTest()
-        {
-            // TODO unit test for the property 'IncludeDeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'NotifyCustomerAfterMinutes'
-        /// </summary>
-        [Test]
-        public void NotifyCustomerAfterMinutesTest()
-        {
-            // TODO unit test for the property 'NotifyCustomerAfterMinutes'
-        }
-        /// <summary>
-        /// Test the property 'PercentDiscountAmount'
-        /// </summary>
-        [Test]
-        public void PercentDiscountAmountTest()
-        {
-            // TODO unit test for the property 'PercentDiscountAmount'
-        }
-        /// <summary>
-        /// Test the property 'LumpDiscountAmount'
-        /// </summary>
-        [Test]
-        public void LumpDiscountAmountTest()
-        {
-            // TODO unit test for the property 'LumpDiscountAmount'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RetentionCampaignUpdatedEventTests.cs b/src/Flipdish.Test/Model/RetentionCampaignUpdatedEventTests.cs
deleted file mode 100644
index 83c308b8..00000000
--- a/src/Flipdish.Test/Model/RetentionCampaignUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RetentionCampaignUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RetentionCampaignUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for RetentionCampaignUpdatedEvent
-        //private RetentionCampaignUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RetentionCampaignUpdatedEvent
-            //instance = new RetentionCampaignUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RetentionCampaignUpdatedEvent
-        /// </summary>
-        [Test]
-        public void RetentionCampaignUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RetentionCampaignUpdatedEvent
-            //Assert.IsInstanceOfType<RetentionCampaignUpdatedEvent> (instance, "variable 'instance' is a RetentionCampaignUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'RetentionCampaign'
-        /// </summary>
-        [Test]
-        public void RetentionCampaignTest()
-        {
-            // TODO unit test for the property 'RetentionCampaign'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RevenueAdjustmentsDetailsTests.cs b/src/Flipdish.Test/Model/RevenueAdjustmentsDetailsTests.cs
deleted file mode 100644
index a5057621..00000000
--- a/src/Flipdish.Test/Model/RevenueAdjustmentsDetailsTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RevenueAdjustmentsDetails
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RevenueAdjustmentsDetailsTests
-    {
-        // TODO uncomment below to declare an instance variable for RevenueAdjustmentsDetails
-        //private RevenueAdjustmentsDetails instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RevenueAdjustmentsDetails
-            //instance = new RevenueAdjustmentsDetails();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RevenueAdjustmentsDetails
-        /// </summary>
-        [Test]
-        public void RevenueAdjustmentsDetailsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RevenueAdjustmentsDetails
-            //Assert.IsInstanceOfType<RevenueAdjustmentsDetails> (instance, "variable 'instance' is a RevenueAdjustmentsDetails");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OnlineSalesRefundedAmount'
-        /// </summary>
-        [Test]
-        public void OnlineSalesRefundedAmountTest()
-        {
-            // TODO unit test for the property 'OnlineSalesRefundedAmount'
-        }
-        /// <summary>
-        /// Test the property 'CashSalesRefundedAmount'
-        /// </summary>
-        [Test]
-        public void CashSalesRefundedAmountTest()
-        {
-            // TODO unit test for the property 'CashSalesRefundedAmount'
-        }
-        /// <summary>
-        /// Test the property 'CustomerCashFees'
-        /// </summary>
-        [Test]
-        public void CustomerCashFeesTest()
-        {
-            // TODO unit test for the property 'CustomerCashFees'
-        }
-        /// <summary>
-        /// Test the property 'RefundsCount'
-        /// </summary>
-        [Test]
-        public void RefundsCountTest()
-        {
-            // TODO unit test for the property 'RefundsCount'
-        }
-        /// <summary>
-        /// Test the property 'TotalOnlineRevenueAdjustments'
-        /// </summary>
-        [Test]
-        public void TotalOnlineRevenueAdjustmentsTest()
-        {
-            // TODO unit test for the property 'TotalOnlineRevenueAdjustments'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/RevenueDetailTests.cs b/src/Flipdish.Test/Model/RevenueDetailTests.cs
deleted file mode 100644
index 78f2568f..00000000
--- a/src/Flipdish.Test/Model/RevenueDetailTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing RevenueDetail
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class RevenueDetailTests
-    {
-        // TODO uncomment below to declare an instance variable for RevenueDetail
-        //private RevenueDetail instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of RevenueDetail
-            //instance = new RevenueDetail();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of RevenueDetail
-        /// </summary>
-        [Test]
-        public void RevenueDetailInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" RevenueDetail
-            //Assert.IsInstanceOfType<RevenueDetail> (instance, "variable 'instance' is a RevenueDetail");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OnlineSalesAmount'
-        /// </summary>
-        [Test]
-        public void OnlineSalesAmountTest()
-        {
-            // TODO unit test for the property 'OnlineSalesAmount'
-        }
-        /// <summary>
-        /// Test the property 'OnlineSalesTax'
-        /// </summary>
-        [Test]
-        public void OnlineSalesTaxTest()
-        {
-            // TODO unit test for the property 'OnlineSalesTax'
-        }
-        /// <summary>
-        /// Test the property 'OnlineSalesIncludingTax'
-        /// </summary>
-        [Test]
-        public void OnlineSalesIncludingTaxTest()
-        {
-            // TODO unit test for the property 'OnlineSalesIncludingTax'
-        }
-        /// <summary>
-        /// Test the property 'OnlineSalesFeesBaseAmount'
-        /// </summary>
-        [Test]
-        public void OnlineSalesFeesBaseAmountTest()
-        {
-            // TODO unit test for the property 'OnlineSalesFeesBaseAmount'
-        }
-        /// <summary>
-        /// Test the property 'CashSalesAmount'
-        /// </summary>
-        [Test]
-        public void CashSalesAmountTest()
-        {
-            // TODO unit test for the property 'CashSalesAmount'
-        }
-        /// <summary>
-        /// Test the property 'CashSalesTax'
-        /// </summary>
-        [Test]
-        public void CashSalesTaxTest()
-        {
-            // TODO unit test for the property 'CashSalesTax'
-        }
-        /// <summary>
-        /// Test the property 'CashSalesIncludingTax'
-        /// </summary>
-        [Test]
-        public void CashSalesIncludingTaxTest()
-        {
-            // TODO unit test for the property 'CashSalesIncludingTax'
-        }
-        /// <summary>
-        /// Test the property 'CashSalesFeesBaseAmount'
-        /// </summary>
-        [Test]
-        public void CashSalesFeesBaseAmountTest()
-        {
-            // TODO unit test for the property 'CashSalesFeesBaseAmount'
-        }
-        /// <summary>
-        /// Test the property 'TotalSalesIncludingTax'
-        /// </summary>
-        [Test]
-        public void TotalSalesIncludingTaxTest()
-        {
-            // TODO unit test for the property 'TotalSalesIncludingTax'
-        }
-        /// <summary>
-        /// Test the property 'OnlineSalesDeliveryCharges'
-        /// </summary>
-        [Test]
-        public void OnlineSalesDeliveryChargesTest()
-        {
-            // TODO unit test for the property 'OnlineSalesDeliveryCharges'
-        }
-        /// <summary>
-        /// Test the property 'OnlineSalesTips'
-        /// </summary>
-        [Test]
-        public void OnlineSalesTipsTest()
-        {
-            // TODO unit test for the property 'OnlineSalesTips'
-        }
-        /// <summary>
-        /// Test the property 'TotalOnlineRevenue'
-        /// </summary>
-        [Test]
-        public void TotalOnlineRevenueTest()
-        {
-            // TODO unit test for the property 'TotalOnlineRevenue'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SearchCriteriaTests.cs b/src/Flipdish.Test/Model/SearchCriteriaTests.cs
deleted file mode 100644
index e1a9b873..00000000
--- a/src/Flipdish.Test/Model/SearchCriteriaTests.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SearchCriteria
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SearchCriteriaTests
-    {
-        // TODO uncomment below to declare an instance variable for SearchCriteria
-        //private SearchCriteria instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SearchCriteria
-            //instance = new SearchCriteria();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SearchCriteria
-        /// </summary>
-        [Test]
-        public void SearchCriteriaInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SearchCriteria
-            //Assert.IsInstanceOfType<SearchCriteria> (instance, "variable 'instance' is a SearchCriteria");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Limit'
-        /// </summary>
-        [Test]
-        public void LimitTest()
-        {
-            // TODO unit test for the property 'Limit'
-        }
-        /// <summary>
-        /// Test the property 'Page'
-        /// </summary>
-        [Test]
-        public void PageTest()
-        {
-            // TODO unit test for the property 'Page'
-        }
-        /// <summary>
-        /// Test the property 'Start'
-        /// </summary>
-        [Test]
-        public void StartTest()
-        {
-            // TODO unit test for the property 'Start'
-        }
-        /// <summary>
-        /// Test the property 'End'
-        /// </summary>
-        [Test]
-        public void EndTest()
-        {
-            // TODO unit test for the property 'End'
-        }
-        /// <summary>
-        /// Test the property 'OrderId'
-        /// </summary>
-        [Test]
-        public void OrderIdTest()
-        {
-            // TODO unit test for the property 'OrderId'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'UserId'
-        /// </summary>
-        [Test]
-        public void UserIdTest()
-        {
-            // TODO unit test for the property 'UserId'
-        }
-        /// <summary>
-        /// Test the property 'UserEmail'
-        /// </summary>
-        [Test]
-        public void UserEmailTest()
-        {
-            // TODO unit test for the property 'UserEmail'
-        }
-        /// <summary>
-        /// Test the property 'UserName'
-        /// </summary>
-        [Test]
-        public void UserNameTest()
-        {
-            // TODO unit test for the property 'UserName'
-        }
-        /// <summary>
-        /// Test the property 'VoucherCode'
-        /// </summary>
-        [Test]
-        public void VoucherCodeTest()
-        {
-            // TODO unit test for the property 'VoucherCode'
-        }
-        /// <summary>
-        /// Test the property 'EventType'
-        /// </summary>
-        [Test]
-        public void EventTypeTest()
-        {
-            // TODO unit test for the property 'EventType'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ServiceChargeTests.cs b/src/Flipdish.Test/Model/ServiceChargeTests.cs
deleted file mode 100644
index 1b619da0..00000000
--- a/src/Flipdish.Test/Model/ServiceChargeTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ServiceCharge
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ServiceChargeTests
-    {
-        // TODO uncomment below to declare an instance variable for ServiceCharge
-        //private ServiceCharge instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ServiceCharge
-            //instance = new ServiceCharge();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ServiceCharge
-        /// </summary>
-        [Test]
-        public void ServiceChargeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ServiceCharge
-            //Assert.IsInstanceOfType<ServiceCharge> (instance, "variable 'instance' is a ServiceCharge");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'PercentageValue'
-        /// </summary>
-        [Test]
-        public void PercentageValueTest()
-        {
-            // TODO unit test for the property 'PercentageValue'
-        }
-        /// <summary>
-        /// Test the property 'Enabled'
-        /// </summary>
-        [Test]
-        public void EnabledTest()
-        {
-            // TODO unit test for the property 'Enabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SetOrderBatchingConfigurationTests.cs b/src/Flipdish.Test/Model/SetOrderBatchingConfigurationTests.cs
deleted file mode 100644
index 89c580e1..00000000
--- a/src/Flipdish.Test/Model/SetOrderBatchingConfigurationTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SetOrderBatchingConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SetOrderBatchingConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for SetOrderBatchingConfiguration
-        //private SetOrderBatchingConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SetOrderBatchingConfiguration
-            //instance = new SetOrderBatchingConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SetOrderBatchingConfiguration
-        /// </summary>
-        [Test]
-        public void SetOrderBatchingConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SetOrderBatchingConfiguration
-            //Assert.IsInstanceOfType<SetOrderBatchingConfiguration> (instance, "variable 'instance' is a SetOrderBatchingConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'BatchIntervalInMinutes'
-        /// </summary>
-        [Test]
-        public void BatchIntervalInMinutesTest()
-        {
-            // TODO unit test for the property 'BatchIntervalInMinutes'
-        }
-        /// <summary>
-        /// Test the property 'Enabled'
-        /// </summary>
-        [Test]
-        public void EnabledTest()
-        {
-            // TODO unit test for the property 'Enabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SetPasswordWithPinModelTests.cs b/src/Flipdish.Test/Model/SetPasswordWithPinModelTests.cs
deleted file mode 100644
index eef37da2..00000000
--- a/src/Flipdish.Test/Model/SetPasswordWithPinModelTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SetPasswordWithPinModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SetPasswordWithPinModelTests
-    {
-        // TODO uncomment below to declare an instance variable for SetPasswordWithPinModel
-        //private SetPasswordWithPinModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SetPasswordWithPinModel
-            //instance = new SetPasswordWithPinModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SetPasswordWithPinModel
-        /// </summary>
-        [Test]
-        public void SetPasswordWithPinModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SetPasswordWithPinModel
-            //Assert.IsInstanceOfType<SetPasswordWithPinModel> (instance, "variable 'instance' is a SetPasswordWithPinModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Pin'
-        /// </summary>
-        [Test]
-        public void PinTest()
-        {
-            // TODO unit test for the property 'Pin'
-        }
-        /// <summary>
-        /// Test the property 'NewPassword'
-        /// </summary>
-        [Test]
-        public void NewPasswordTest()
-        {
-            // TODO unit test for the property 'NewPassword'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SettingTests.cs b/src/Flipdish.Test/Model/SettingTests.cs
deleted file mode 100644
index 587f8e67..00000000
--- a/src/Flipdish.Test/Model/SettingTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Setting
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SettingTests
-    {
-        // TODO uncomment below to declare an instance variable for Setting
-        //private Setting instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Setting
-            //instance = new Setting();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Setting
-        /// </summary>
-        [Test]
-        public void SettingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Setting
-            //Assert.IsInstanceOfType<Setting> (instance, "variable 'instance' is a Setting");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Key'
-        /// </summary>
-        [Test]
-        public void KeyTest()
-        {
-            // TODO unit test for the property 'Key'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SignupStepTests.cs b/src/Flipdish.Test/Model/SignupStepTests.cs
deleted file mode 100644
index 37904bda..00000000
--- a/src/Flipdish.Test/Model/SignupStepTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SignupStep
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SignupStepTests
-    {
-        // TODO uncomment below to declare an instance variable for SignupStep
-        //private SignupStep instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SignupStep
-            //instance = new SignupStep();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SignupStep
-        /// </summary>
-        [Test]
-        public void SignupStepInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SignupStep
-            //Assert.IsInstanceOfType<SignupStep> (instance, "variable 'instance' is a SignupStep");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Action'
-        /// </summary>
-        [Test]
-        public void ActionTest()
-        {
-            // TODO unit test for the property 'Action'
-        }
-        /// <summary>
-        /// Test the property 'Question'
-        /// </summary>
-        [Test]
-        public void QuestionTest()
-        {
-            // TODO unit test for the property 'Question'
-        }
-        /// <summary>
-        /// Test the property 'PredefinedAnswers'
-        /// </summary>
-        [Test]
-        public void PredefinedAnswersTest()
-        {
-            // TODO unit test for the property 'PredefinedAnswers'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SimpleProductSubProductTests.cs b/src/Flipdish.Test/Model/SimpleProductSubProductTests.cs
deleted file mode 100644
index f21009b4..00000000
--- a/src/Flipdish.Test/Model/SimpleProductSubProductTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SimpleProductSubProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SimpleProductSubProductTests
-    {
-        // TODO uncomment below to declare an instance variable for SimpleProductSubProduct
-        //private SimpleProductSubProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SimpleProductSubProduct
-            //instance = new SimpleProductSubProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SimpleProductSubProduct
-        /// </summary>
-        [Test]
-        public void SimpleProductSubProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SimpleProductSubProduct
-            //Assert.IsInstanceOfType<SimpleProductSubProduct> (instance, "variable 'instance' is a SimpleProductSubProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productId'
-        /// </summary>
-        [Test]
-        public void productIdTest()
-        {
-            // TODO unit test for the property 'productId'
-        }
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SimpleProductTests.cs b/src/Flipdish.Test/Model/SimpleProductTests.cs
deleted file mode 100644
index 326d937f..00000000
--- a/src/Flipdish.Test/Model/SimpleProductTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SimpleProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SimpleProductTests
-    {
-        // TODO uncomment below to declare an instance variable for SimpleProduct
-        //private SimpleProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SimpleProduct
-            //instance = new SimpleProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SimpleProduct
-        /// </summary>
-        [Test]
-        public void SimpleProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SimpleProduct
-            //Assert.IsInstanceOfType<SimpleProduct> (instance, "variable 'instance' is a SimpleProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SmsInfoTests.cs b/src/Flipdish.Test/Model/SmsInfoTests.cs
deleted file mode 100644
index b9101d53..00000000
--- a/src/Flipdish.Test/Model/SmsInfoTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SmsInfo
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SmsInfoTests
-    {
-        // TODO uncomment below to declare an instance variable for SmsInfo
-        //private SmsInfo instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SmsInfo
-            //instance = new SmsInfo();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SmsInfo
-        /// </summary>
-        [Test]
-        public void SmsInfoInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SmsInfo
-            //Assert.IsInstanceOfType<SmsInfo> (instance, "variable 'instance' is a SmsInfo");
-        }
-
-
-        /// <summary>
-        /// Test the property 'From'
-        /// </summary>
-        [Test]
-        public void FromTest()
-        {
-            // TODO unit test for the property 'From'
-        }
-        /// <summary>
-        /// Test the property 'To'
-        /// </summary>
-        [Test]
-        public void ToTest()
-        {
-            // TODO unit test for the property 'To'
-        }
-        /// <summary>
-        /// Test the property 'Text'
-        /// </summary>
-        [Test]
-        public void TextTest()
-        {
-            // TODO unit test for the property 'Text'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SmsReceivedEventTests.cs b/src/Flipdish.Test/Model/SmsReceivedEventTests.cs
deleted file mode 100644
index 340f942d..00000000
--- a/src/Flipdish.Test/Model/SmsReceivedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SmsReceivedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SmsReceivedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for SmsReceivedEvent
-        //private SmsReceivedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SmsReceivedEvent
-            //instance = new SmsReceivedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SmsReceivedEvent
-        /// </summary>
-        [Test]
-        public void SmsReceivedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SmsReceivedEvent
-            //Assert.IsInstanceOfType<SmsReceivedEvent> (instance, "variable 'instance' is a SmsReceivedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'SmsInfo'
-        /// </summary>
-        [Test]
-        public void SmsInfoTest()
-        {
-            // TODO unit test for the property 'SmsInfo'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StatisticsCurrencyDataPointTests.cs b/src/Flipdish.Test/Model/StatisticsCurrencyDataPointTests.cs
deleted file mode 100644
index 3fbc63d8..00000000
--- a/src/Flipdish.Test/Model/StatisticsCurrencyDataPointTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StatisticsCurrencyDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StatisticsCurrencyDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for StatisticsCurrencyDataPoint
-        //private StatisticsCurrencyDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StatisticsCurrencyDataPoint
-            //instance = new StatisticsCurrencyDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StatisticsCurrencyDataPoint
-        /// </summary>
-        [Test]
-        public void StatisticsCurrencyDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StatisticsCurrencyDataPoint
-            //Assert.IsInstanceOfType<StatisticsCurrencyDataPoint> (instance, "variable 'instance' is a StatisticsCurrencyDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'UserCount'
-        /// </summary>
-        [Test]
-        public void UserCountTest()
-        {
-            // TODO unit test for the property 'UserCount'
-        }
-        /// <summary>
-        /// Test the property 'OrderCount'
-        /// </summary>
-        [Test]
-        public void OrderCountTest()
-        {
-            // TODO unit test for the property 'OrderCount'
-        }
-        /// <summary>
-        /// Test the property 'OrderValue'
-        /// </summary>
-        [Test]
-        public void OrderValueTest()
-        {
-            // TODO unit test for the property 'OrderValue'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreAddressBaseTests.cs b/src/Flipdish.Test/Model/StoreAddressBaseTests.cs
deleted file mode 100644
index 205ad537..00000000
--- a/src/Flipdish.Test/Model/StoreAddressBaseTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreAddressBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreAddressBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreAddressBase
-        //private StoreAddressBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreAddressBase
-            //instance = new StoreAddressBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreAddressBase
-        /// </summary>
-        [Test]
-        public void StoreAddressBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreAddressBase
-            //Assert.IsInstanceOfType<StoreAddressBase> (instance, "variable 'instance' is a StoreAddressBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Line1'
-        /// </summary>
-        [Test]
-        public void Line1Test()
-        {
-            // TODO unit test for the property 'Line1'
-        }
-        /// <summary>
-        /// Test the property 'Postcode'
-        /// </summary>
-        [Test]
-        public void PostcodeTest()
-        {
-            // TODO unit test for the property 'Postcode'
-        }
-        /// <summary>
-        /// Test the property 'City'
-        /// </summary>
-        [Test]
-        public void CityTest()
-        {
-            // TODO unit test for the property 'City'
-        }
-        /// <summary>
-        /// Test the property 'CountryCode'
-        /// </summary>
-        [Test]
-        public void CountryCodeTest()
-        {
-            // TODO unit test for the property 'CountryCode'
-        }
-        /// <summary>
-        /// Test the property 'DisplayForCustomer'
-        /// </summary>
-        [Test]
-        public void DisplayForCustomerTest()
-        {
-            // TODO unit test for the property 'DisplayForCustomer'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreAddressFormTests.cs b/src/Flipdish.Test/Model/StoreAddressFormTests.cs
deleted file mode 100644
index fb80c525..00000000
--- a/src/Flipdish.Test/Model/StoreAddressFormTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreAddressForm
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreAddressFormTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreAddressForm
-        //private StoreAddressForm instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreAddressForm
-            //instance = new StoreAddressForm();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreAddressForm
-        /// </summary>
-        [Test]
-        public void StoreAddressFormInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreAddressForm
-            //Assert.IsInstanceOfType<StoreAddressForm> (instance, "variable 'instance' is a StoreAddressForm");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AddressFields'
-        /// </summary>
-        [Test]
-        public void AddressFieldsTest()
-        {
-            // TODO unit test for the property 'AddressFields'
-        }
-        /// <summary>
-        /// Test the property 'CountryCode'
-        /// </summary>
-        [Test]
-        public void CountryCodeTest()
-        {
-            // TODO unit test for the property 'CountryCode'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreAddressTests.cs b/src/Flipdish.Test/Model/StoreAddressTests.cs
deleted file mode 100644
index b5724c06..00000000
--- a/src/Flipdish.Test/Model/StoreAddressTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreAddress
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreAddressTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreAddress
-        //private StoreAddress instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreAddress
-            //instance = new StoreAddress();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreAddress
-        /// </summary>
-        [Test]
-        public void StoreAddressInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreAddress
-            //Assert.IsInstanceOfType<StoreAddress> (instance, "variable 'instance' is a StoreAddress");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AddressId'
-        /// </summary>
-        [Test]
-        public void AddressIdTest()
-        {
-            // TODO unit test for the property 'AddressId'
-        }
-        /// <summary>
-        /// Test the property 'Coordinates'
-        /// </summary>
-        [Test]
-        public void CoordinatesTest()
-        {
-            // TODO unit test for the property 'Coordinates'
-        }
-        /// <summary>
-        /// Test the property 'Line1'
-        /// </summary>
-        [Test]
-        public void Line1Test()
-        {
-            // TODO unit test for the property 'Line1'
-        }
-        /// <summary>
-        /// Test the property 'Postcode'
-        /// </summary>
-        [Test]
-        public void PostcodeTest()
-        {
-            // TODO unit test for the property 'Postcode'
-        }
-        /// <summary>
-        /// Test the property 'City'
-        /// </summary>
-        [Test]
-        public void CityTest()
-        {
-            // TODO unit test for the property 'City'
-        }
-        /// <summary>
-        /// Test the property 'CountryCode'
-        /// </summary>
-        [Test]
-        public void CountryCodeTest()
-        {
-            // TODO unit test for the property 'CountryCode'
-        }
-        /// <summary>
-        /// Test the property 'DisplayForCustomer'
-        /// </summary>
-        [Test]
-        public void DisplayForCustomerTest()
-        {
-            // TODO unit test for the property 'DisplayForCustomer'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreAddressUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreAddressUpdatedEventTests.cs
deleted file mode 100644
index 9145beb9..00000000
--- a/src/Flipdish.Test/Model/StoreAddressUpdatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreAddressUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreAddressUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreAddressUpdatedEvent
-        //private StoreAddressUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreAddressUpdatedEvent
-            //instance = new StoreAddressUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreAddressUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreAddressUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreAddressUpdatedEvent
-            //Assert.IsInstanceOfType<StoreAddressUpdatedEvent> (instance, "variable 'instance' is a StoreAddressUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreAddress'
-        /// </summary>
-        [Test]
-        public void StoreAddressTest()
-        {
-            // TODO unit test for the property 'StoreAddress'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreArchivedEventTests.cs b/src/Flipdish.Test/Model/StoreArchivedEventTests.cs
deleted file mode 100644
index e1d57ae1..00000000
--- a/src/Flipdish.Test/Model/StoreArchivedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreArchivedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreArchivedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreArchivedEvent
-        //private StoreArchivedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreArchivedEvent
-            //instance = new StoreArchivedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreArchivedEvent
-        /// </summary>
-        [Test]
-        public void StoreArchivedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreArchivedEvent
-            //Assert.IsInstanceOfType<StoreArchivedEvent> (instance, "variable 'instance' is a StoreArchivedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Store'
-        /// </summary>
-        [Test]
-        public void StoreTest()
-        {
-            // TODO unit test for the property 'Store'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreBaseTests.cs b/src/Flipdish.Test/Model/StoreBaseTests.cs
deleted file mode 100644
index 5684aff9..00000000
--- a/src/Flipdish.Test/Model/StoreBaseTests.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreBase
-        //private StoreBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreBase
-            //instance = new StoreBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreBase
-        /// </summary>
-        [Test]
-        public void StoreBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreBase
-            //Assert.IsInstanceOfType<StoreBase> (instance, "variable 'instance' is a StoreBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PhoneNumber'
-        /// </summary>
-        [Test]
-        public void PhoneNumberTest()
-        {
-            // TODO unit test for the property 'PhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'AlwaysAppearOpen'
-        /// </summary>
-        [Test]
-        public void AlwaysAppearOpenTest()
-        {
-            // TODO unit test for the property 'AlwaysAppearOpen'
-        }
-        /// <summary>
-        /// Test the property 'PreOrderEnabled'
-        /// </summary>
-        [Test]
-        public void PreOrderEnabledTest()
-        {
-            // TODO unit test for the property 'PreOrderEnabled'
-        }
-        /// <summary>
-        /// Test the property 'TakeOutEnabled'
-        /// </summary>
-        [Test]
-        public void TakeOutEnabledTest()
-        {
-            // TODO unit test for the property 'TakeOutEnabled'
-        }
-        /// <summary>
-        /// Test the property 'TableServiceEnabled'
-        /// </summary>
-        [Test]
-        public void TableServiceEnabledTest()
-        {
-            // TODO unit test for the property 'TableServiceEnabled'
-        }
-        /// <summary>
-        /// Test the property 'DineInEnabled'
-        /// </summary>
-        [Test]
-        public void DineInEnabledTest()
-        {
-            // TODO unit test for the property 'DineInEnabled'
-        }
-        /// <summary>
-        /// Test the property 'AllowPreOrdersAndTableService'
-        /// </summary>
-        [Test]
-        public void AllowPreOrdersAndTableServiceTest()
-        {
-            // TODO unit test for the property 'AllowPreOrdersAndTableService'
-        }
-        /// <summary>
-        /// Test the property 'PickupEnabled'
-        /// </summary>
-        [Test]
-        public void PickupEnabledTest()
-        {
-            // TODO unit test for the property 'PickupEnabled'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryEnabled'
-        /// </summary>
-        [Test]
-        public void DeliveryEnabledTest()
-        {
-            // TODO unit test for the property 'DeliveryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CardOrderDeliveryEnabled'
-        /// </summary>
-        [Test]
-        public void CardOrderDeliveryEnabledTest()
-        {
-            // TODO unit test for the property 'CardOrderDeliveryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CashOrdersDeliveryEnabled'
-        /// </summary>
-        [Test]
-        public void CashOrdersDeliveryEnabledTest()
-        {
-            // TODO unit test for the property 'CashOrdersDeliveryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CardOrdersPickupEnabled'
-        /// </summary>
-        [Test]
-        public void CardOrdersPickupEnabledTest()
-        {
-            // TODO unit test for the property 'CardOrdersPickupEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CashOrdersPickupEnabled'
-        /// </summary>
-        [Test]
-        public void CashOrdersPickupEnabledTest()
-        {
-            // TODO unit test for the property 'CashOrdersPickupEnabled'
-        }
-        /// <summary>
-        /// Test the property 'TipsEnabled'
-        /// </summary>
-        [Test]
-        public void TipsEnabledTest()
-        {
-            // TODO unit test for the property 'TipsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'AutomaticallyAcceptOrders'
-        /// </summary>
-        [Test]
-        public void AutomaticallyAcceptOrdersTest()
-        {
-            // TODO unit test for the property 'AutomaticallyAcceptOrders'
-        }
-        /// <summary>
-        /// Test the property 'OpenForDelivery'
-        /// </summary>
-        [Test]
-        public void OpenForDeliveryTest()
-        {
-            // TODO unit test for the property 'OpenForDelivery'
-        }
-        /// <summary>
-        /// Test the property 'OpenForPickup'
-        /// </summary>
-        [Test]
-        public void OpenForPickupTest()
-        {
-            // TODO unit test for the property 'OpenForPickup'
-        }
-        /// <summary>
-        /// Test the property 'MinimumPickupOrderAmount'
-        /// </summary>
-        [Test]
-        public void MinimumPickupOrderAmountTest()
-        {
-            // TODO unit test for the property 'MinimumPickupOrderAmount'
-        }
-        /// <summary>
-        /// Test the property 'RequireCustomerNameForPickup'
-        /// </summary>
-        [Test]
-        public void RequireCustomerNameForPickupTest()
-        {
-            // TODO unit test for the property 'RequireCustomerNameForPickup'
-        }
-        /// <summary>
-        /// Test the property 'GdprCustomerPhoneNumbers'
-        /// </summary>
-        [Test]
-        public void GdprCustomerPhoneNumbersTest()
-        {
-            // TODO unit test for the property 'GdprCustomerPhoneNumbers'
-        }
-        /// <summary>
-        /// Test the property 'RequireCustomerNameForDelivery'
-        /// </summary>
-        [Test]
-        public void RequireCustomerNameForDeliveryTest()
-        {
-            // TODO unit test for the property 'RequireCustomerNameForDelivery'
-        }
-        /// <summary>
-        /// Test the property 'AllowChefNotes'
-        /// </summary>
-        [Test]
-        public void AllowChefNotesTest()
-        {
-            // TODO unit test for the property 'AllowChefNotes'
-        }
-        /// <summary>
-        /// Test the property 'EtaInPickupConfirmationSmsEnabled'
-        /// </summary>
-        [Test]
-        public void EtaInPickupConfirmationSmsEnabledTest()
-        {
-            // TODO unit test for the property 'EtaInPickupConfirmationSmsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'EtaInDeliveryConfirmationSmsEnabled'
-        /// </summary>
-        [Test]
-        public void EtaInDeliveryConfirmationSmsEnabledTest()
-        {
-            // TODO unit test for the property 'EtaInDeliveryConfirmationSmsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsArchived'
-        /// </summary>
-        [Test]
-        public void IsArchivedTest()
-        {
-            // TODO unit test for the property 'IsArchived'
-        }
-        /// <summary>
-        /// Test the property 'IsPublished'
-        /// </summary>
-        [Test]
-        public void IsPublishedTest()
-        {
-            // TODO unit test for the property 'IsPublished'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'EmailAddress'
-        /// </summary>
-        [Test]
-        public void EmailAddressTest()
-        {
-            // TODO unit test for the property 'EmailAddress'
-        }
-        /// <summary>
-        /// Test the property 'StaffLanguage'
-        /// </summary>
-        [Test]
-        public void StaffLanguageTest()
-        {
-            // TODO unit test for the property 'StaffLanguage'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreBusinessHoursOverrideCreatedEventTests.cs b/src/Flipdish.Test/Model/StoreBusinessHoursOverrideCreatedEventTests.cs
deleted file mode 100644
index e0c0cddb..00000000
--- a/src/Flipdish.Test/Model/StoreBusinessHoursOverrideCreatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreBusinessHoursOverrideCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreBusinessHoursOverrideCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreBusinessHoursOverrideCreatedEvent
-        //private StoreBusinessHoursOverrideCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreBusinessHoursOverrideCreatedEvent
-            //instance = new StoreBusinessHoursOverrideCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreBusinessHoursOverrideCreatedEvent
-        /// </summary>
-        [Test]
-        public void StoreBusinessHoursOverrideCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreBusinessHoursOverrideCreatedEvent
-            //Assert.IsInstanceOfType<StoreBusinessHoursOverrideCreatedEvent> (instance, "variable 'instance' is a StoreBusinessHoursOverrideCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'BusinessHoursOverride'
-        /// </summary>
-        [Test]
-        public void BusinessHoursOverrideTest()
-        {
-            // TODO unit test for the property 'BusinessHoursOverride'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreBusinessHoursOverrideDeletedEventTests.cs b/src/Flipdish.Test/Model/StoreBusinessHoursOverrideDeletedEventTests.cs
deleted file mode 100644
index bf23df73..00000000
--- a/src/Flipdish.Test/Model/StoreBusinessHoursOverrideDeletedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreBusinessHoursOverrideDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreBusinessHoursOverrideDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreBusinessHoursOverrideDeletedEvent
-        //private StoreBusinessHoursOverrideDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreBusinessHoursOverrideDeletedEvent
-            //instance = new StoreBusinessHoursOverrideDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreBusinessHoursOverrideDeletedEvent
-        /// </summary>
-        [Test]
-        public void StoreBusinessHoursOverrideDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreBusinessHoursOverrideDeletedEvent
-            //Assert.IsInstanceOfType<StoreBusinessHoursOverrideDeletedEvent> (instance, "variable 'instance' is a StoreBusinessHoursOverrideDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'BusinessHoursOverride'
-        /// </summary>
-        [Test]
-        public void BusinessHoursOverrideTest()
-        {
-            // TODO unit test for the property 'BusinessHoursOverride'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreCampaignStartTimeTests.cs b/src/Flipdish.Test/Model/StoreCampaignStartTimeTests.cs
deleted file mode 100644
index 3ffb0f30..00000000
--- a/src/Flipdish.Test/Model/StoreCampaignStartTimeTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreCampaignStartTime
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreCampaignStartTimeTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreCampaignStartTime
-        //private StoreCampaignStartTime instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreCampaignStartTime
-            //instance = new StoreCampaignStartTime();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreCampaignStartTime
-        /// </summary>
-        [Test]
-        public void StoreCampaignStartTimeInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreCampaignStartTime
-            //Assert.IsInstanceOfType<StoreCampaignStartTime> (instance, "variable 'instance' is a StoreCampaignStartTime");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'TsStart'
-        /// </summary>
-        [Test]
-        public void TsStartTest()
-        {
-            // TODO unit test for the property 'TsStart'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreChannelAssignmentTests.cs b/src/Flipdish.Test/Model/StoreChannelAssignmentTests.cs
deleted file mode 100644
index 8c1fd07e..00000000
--- a/src/Flipdish.Test/Model/StoreChannelAssignmentTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreChannelAssignment
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreChannelAssignmentTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreChannelAssignment
-        //private StoreChannelAssignment instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreChannelAssignment
-            //instance = new StoreChannelAssignment();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreChannelAssignment
-        /// </summary>
-        [Test]
-        public void StoreChannelAssignmentInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreChannelAssignment
-            //Assert.IsInstanceOfType<StoreChannelAssignment> (instance, "variable 'instance' is a StoreChannelAssignment");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ChannelId'
-        /// </summary>
-        [Test]
-        public void ChannelIdTest()
-        {
-            // TODO unit test for the property 'ChannelId'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreChannelStoreMappingTests.cs b/src/Flipdish.Test/Model/StoreChannelStoreMappingTests.cs
deleted file mode 100644
index f78e7a12..00000000
--- a/src/Flipdish.Test/Model/StoreChannelStoreMappingTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreChannelStoreMapping
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreChannelStoreMappingTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreChannelStoreMapping
-        //private StoreChannelStoreMapping instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreChannelStoreMapping
-            //instance = new StoreChannelStoreMapping();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreChannelStoreMapping
-        /// </summary>
-        [Test]
-        public void StoreChannelStoreMappingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreChannelStoreMapping
-            //Assert.IsInstanceOfType<StoreChannelStoreMapping> (instance, "variable 'instance' is a StoreChannelStoreMapping");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ChannelId'
-        /// </summary>
-        [Test]
-        public void ChannelIdTest()
-        {
-            // TODO unit test for the property 'ChannelId'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'ChannelStoreId'
-        /// </summary>
-        [Test]
-        public void ChannelStoreIdTest()
-        {
-            // TODO unit test for the property 'ChannelStoreId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreCloneSettingsTests.cs b/src/Flipdish.Test/Model/StoreCloneSettingsTests.cs
deleted file mode 100644
index d7ea8b5c..00000000
--- a/src/Flipdish.Test/Model/StoreCloneSettingsTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreCloneSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreCloneSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreCloneSettings
-        //private StoreCloneSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreCloneSettings
-            //instance = new StoreCloneSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreCloneSettings
-        /// </summary>
-        [Test]
-        public void StoreCloneSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreCloneSettings
-            //Assert.IsInstanceOfType<StoreCloneSettings> (instance, "variable 'instance' is a StoreCloneSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TargetStoreGroupId'
-        /// </summary>
-        [Test]
-        public void TargetStoreGroupIdTest()
-        {
-            // TODO unit test for the property 'TargetStoreGroupId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreConfigTests.cs b/src/Flipdish.Test/Model/StoreConfigTests.cs
deleted file mode 100644
index 67b7cc12..00000000
--- a/src/Flipdish.Test/Model/StoreConfigTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreConfig
-        //private StoreConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreConfig
-            //instance = new StoreConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreConfig
-        /// </summary>
-        [Test]
-        public void StoreConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreConfig
-            //Assert.IsInstanceOfType<StoreConfig> (instance, "variable 'instance' is a StoreConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PickupEnabled'
-        /// </summary>
-        [Test]
-        public void PickupEnabledTest()
-        {
-            // TODO unit test for the property 'PickupEnabled'
-        }
-        /// <summary>
-        /// Test the property 'BankAccountAttached'
-        /// </summary>
-        [Test]
-        public void BankAccountAttachedTest()
-        {
-            // TODO unit test for the property 'BankAccountAttached'
-        }
-        /// <summary>
-        /// Test the property 'MenuAssigned'
-        /// </summary>
-        [Test]
-        public void MenuAssignedTest()
-        {
-            // TODO unit test for the property 'MenuAssigned'
-        }
-        /// <summary>
-        /// Test the property 'HasFullAddress'
-        /// </summary>
-        [Test]
-        public void HasFullAddressTest()
-        {
-            // TODO unit test for the property 'HasFullAddress'
-        }
-        /// <summary>
-        /// Test the property 'PickupHours'
-        /// </summary>
-        [Test]
-        public void PickupHoursTest()
-        {
-            // TODO unit test for the property 'PickupHours'
-        }
-        /// <summary>
-        /// Test the property 'IsPublished'
-        /// </summary>
-        [Test]
-        public void IsPublishedTest()
-        {
-            // TODO unit test for the property 'IsPublished'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreCreateBaseTests.cs b/src/Flipdish.Test/Model/StoreCreateBaseTests.cs
deleted file mode 100644
index 3a3389b0..00000000
--- a/src/Flipdish.Test/Model/StoreCreateBaseTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreCreateBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreCreateBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreCreateBase
-        //private StoreCreateBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreCreateBase
-            //instance = new StoreCreateBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreCreateBase
-        /// </summary>
-        [Test]
-        public void StoreCreateBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreCreateBase
-            //Assert.IsInstanceOfType<StoreCreateBase> (instance, "variable 'instance' is a StoreCreateBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'EmailAddress'
-        /// </summary>
-        [Test]
-        public void EmailAddressTest()
-        {
-            // TODO unit test for the property 'EmailAddress'
-        }
-        /// <summary>
-        /// Test the property 'StaffLanguage'
-        /// </summary>
-        [Test]
-        public void StaffLanguageTest()
-        {
-            // TODO unit test for the property 'StaffLanguage'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreCreatedEventTests.cs b/src/Flipdish.Test/Model/StoreCreatedEventTests.cs
deleted file mode 100644
index 8d94d4ac..00000000
--- a/src/Flipdish.Test/Model/StoreCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreCreatedEvent
-        //private StoreCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreCreatedEvent
-            //instance = new StoreCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreCreatedEvent
-        /// </summary>
-        [Test]
-        public void StoreCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreCreatedEvent
-            //Assert.IsInstanceOfType<StoreCreatedEvent> (instance, "variable 'instance' is a StoreCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Store'
-        /// </summary>
-        [Test]
-        public void StoreTest()
-        {
-            // TODO unit test for the property 'Store'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreDataPointTests.cs b/src/Flipdish.Test/Model/StoreDataPointTests.cs
deleted file mode 100644
index 5b1b6a6f..00000000
--- a/src/Flipdish.Test/Model/StoreDataPointTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreDataPoint
-        //private StoreDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreDataPoint
-            //instance = new StoreDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreDataPoint
-        /// </summary>
-        [Test]
-        public void StoreDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreDataPoint
-            //Assert.IsInstanceOfType<StoreDataPoint> (instance, "variable 'instance' is a StoreDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Day'
-        /// </summary>
-        [Test]
-        public void DayTest()
-        {
-            // TODO unit test for the property 'Day'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreDeletedEventTests.cs b/src/Flipdish.Test/Model/StoreDeletedEventTests.cs
deleted file mode 100644
index e6182562..00000000
--- a/src/Flipdish.Test/Model/StoreDeletedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreDeletedEvent
-        //private StoreDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreDeletedEvent
-            //instance = new StoreDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreDeletedEvent
-        /// </summary>
-        [Test]
-        public void StoreDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreDeletedEvent
-            //Assert.IsInstanceOfType<StoreDeletedEvent> (instance, "variable 'instance' is a StoreDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Store'
-        /// </summary>
-        [Test]
-        public void StoreTest()
-        {
-            // TODO unit test for the property 'Store'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreEndOfDayReportTests.cs b/src/Flipdish.Test/Model/StoreEndOfDayReportTests.cs
deleted file mode 100644
index dc00522b..00000000
--- a/src/Flipdish.Test/Model/StoreEndOfDayReportTests.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreEndOfDayReport
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreEndOfDayReportTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreEndOfDayReport
-        //private StoreEndOfDayReport instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreEndOfDayReport
-            //instance = new StoreEndOfDayReport();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreEndOfDayReport
-        /// </summary>
-        [Test]
-        public void StoreEndOfDayReportInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreEndOfDayReport
-            //Assert.IsInstanceOfType<StoreEndOfDayReport> (instance, "variable 'instance' is a StoreEndOfDayReport");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'OrderCount'
-        /// </summary>
-        [Test]
-        public void OrderCountTest()
-        {
-            // TODO unit test for the property 'OrderCount'
-        }
-        /// <summary>
-        /// Test the property 'OrderValue'
-        /// </summary>
-        [Test]
-        public void OrderValueTest()
-        {
-            // TODO unit test for the property 'OrderValue'
-        }
-        /// <summary>
-        /// Test the property 'OrderValueExcludingDeliveryFees'
-        /// </summary>
-        [Test]
-        public void OrderValueExcludingDeliveryFeesTest()
-        {
-            // TODO unit test for the property 'OrderValueExcludingDeliveryFees'
-        }
-        /// <summary>
-        /// Test the property 'CollectionOrderCount'
-        /// </summary>
-        [Test]
-        public void CollectionOrderCountTest()
-        {
-            // TODO unit test for the property 'CollectionOrderCount'
-        }
-        /// <summary>
-        /// Test the property 'CollectionCashOrderCount'
-        /// </summary>
-        [Test]
-        public void CollectionCashOrderCountTest()
-        {
-            // TODO unit test for the property 'CollectionCashOrderCount'
-        }
-        /// <summary>
-        /// Test the property 'CollectionPaidOnlineOrderCount'
-        /// </summary>
-        [Test]
-        public void CollectionPaidOnlineOrderCountTest()
-        {
-            // TODO unit test for the property 'CollectionPaidOnlineOrderCount'
-        }
-        /// <summary>
-        /// Test the property 'CollectionOrderValue'
-        /// </summary>
-        [Test]
-        public void CollectionOrderValueTest()
-        {
-            // TODO unit test for the property 'CollectionOrderValue'
-        }
-        /// <summary>
-        /// Test the property 'CollectionCashOrderValue'
-        /// </summary>
-        [Test]
-        public void CollectionCashOrderValueTest()
-        {
-            // TODO unit test for the property 'CollectionCashOrderValue'
-        }
-        /// <summary>
-        /// Test the property 'CollectionPaidOnlineOrderValue'
-        /// </summary>
-        [Test]
-        public void CollectionPaidOnlineOrderValueTest()
-        {
-            // TODO unit test for the property 'CollectionPaidOnlineOrderValue'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryOrderCount'
-        /// </summary>
-        [Test]
-        public void DeliveryOrderCountTest()
-        {
-            // TODO unit test for the property 'DeliveryOrderCount'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryCashOrderCount'
-        /// </summary>
-        [Test]
-        public void DeliveryCashOrderCountTest()
-        {
-            // TODO unit test for the property 'DeliveryCashOrderCount'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryPaidOnlineOrderCount'
-        /// </summary>
-        [Test]
-        public void DeliveryPaidOnlineOrderCountTest()
-        {
-            // TODO unit test for the property 'DeliveryPaidOnlineOrderCount'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryOrderValue'
-        /// </summary>
-        [Test]
-        public void DeliveryOrderValueTest()
-        {
-            // TODO unit test for the property 'DeliveryOrderValue'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryCashOrderValue'
-        /// </summary>
-        [Test]
-        public void DeliveryCashOrderValueTest()
-        {
-            // TODO unit test for the property 'DeliveryCashOrderValue'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryPaidOnlineOrderValue'
-        /// </summary>
-        [Test]
-        public void DeliveryPaidOnlineOrderValueTest()
-        {
-            // TODO unit test for the property 'DeliveryPaidOnlineOrderValue'
-        }
-        /// <summary>
-        /// Test the property 'PaidOnlineOrderCount'
-        /// </summary>
-        [Test]
-        public void PaidOnlineOrderCountTest()
-        {
-            // TODO unit test for the property 'PaidOnlineOrderCount'
-        }
-        /// <summary>
-        /// Test the property 'CashOrderCount'
-        /// </summary>
-        [Test]
-        public void CashOrderCountTest()
-        {
-            // TODO unit test for the property 'CashOrderCount'
-        }
-        /// <summary>
-        /// Test the property 'PaidOnlineOrderValue'
-        /// </summary>
-        [Test]
-        public void PaidOnlineOrderValueTest()
-        {
-            // TODO unit test for the property 'PaidOnlineOrderValue'
-        }
-        /// <summary>
-        /// Test the property 'CashOrderValue'
-        /// </summary>
-        [Test]
-        public void CashOrderValueTest()
-        {
-            // TODO unit test for the property 'CashOrderValue'
-        }
-        /// <summary>
-        /// Test the property 'PaidOnlineOrderValueExcludingDeliveryFees'
-        /// </summary>
-        [Test]
-        public void PaidOnlineOrderValueExcludingDeliveryFeesTest()
-        {
-            // TODO unit test for the property 'PaidOnlineOrderValueExcludingDeliveryFees'
-        }
-        /// <summary>
-        /// Test the property 'CashOrderValueExcludingDeliveryFees'
-        /// </summary>
-        [Test]
-        public void CashOrderValueExcludingDeliveryFeesTest()
-        {
-            // TODO unit test for the property 'CashOrderValueExcludingDeliveryFees'
-        }
-        /// <summary>
-        /// Test the property 'StartTime'
-        /// </summary>
-        [Test]
-        public void StartTimeTest()
-        {
-            // TODO unit test for the property 'StartTime'
-        }
-        /// <summary>
-        /// Test the property 'EndTime'
-        /// </summary>
-        [Test]
-        public void EndTimeTest()
-        {
-            // TODO unit test for the property 'EndTime'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreFeeConfigTests.cs b/src/Flipdish.Test/Model/StoreFeeConfigTests.cs
deleted file mode 100644
index 60d48229..00000000
--- a/src/Flipdish.Test/Model/StoreFeeConfigTests.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreFeeConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreFeeConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreFeeConfig
-        //private StoreFeeConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreFeeConfig
-            //instance = new StoreFeeConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreFeeConfig
-        /// </summary>
-        [Test]
-        public void StoreFeeConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreFeeConfig
-            //Assert.IsInstanceOfType<StoreFeeConfig> (instance, "variable 'instance' is a StoreFeeConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'FeeConfigId'
-        /// </summary>
-        [Test]
-        public void FeeConfigIdTest()
-        {
-            // TODO unit test for the property 'FeeConfigId'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StartTime'
-        /// </summary>
-        [Test]
-        public void StartTimeTest()
-        {
-            // TODO unit test for the property 'StartTime'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCardOrders'
-        /// </summary>
-        [Test]
-        public void PercentFeeCardOrdersTest()
-        {
-            // TODO unit test for the property 'PercentFeeCardOrders'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCashOrders'
-        /// </summary>
-        [Test]
-        public void PercentFeeCashOrdersTest()
-        {
-            // TODO unit test for the property 'PercentFeeCashOrders'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCardOrdersWeb'
-        /// </summary>
-        [Test]
-        public void PercentFeeCardOrdersWebTest()
-        {
-            // TODO unit test for the property 'PercentFeeCardOrdersWeb'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCashOrdersWeb'
-        /// </summary>
-        [Test]
-        public void PercentFeeCashOrdersWebTest()
-        {
-            // TODO unit test for the property 'PercentFeeCashOrdersWeb'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCardOrdersKiosk'
-        /// </summary>
-        [Test]
-        public void PercentFeeCardOrdersKioskTest()
-        {
-            // TODO unit test for the property 'PercentFeeCardOrdersKiosk'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCashOrdersKiosk'
-        /// </summary>
-        [Test]
-        public void PercentFeeCashOrdersKioskTest()
-        {
-            // TODO unit test for the property 'PercentFeeCashOrdersKiosk'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCardOrdersKiosk'
-        /// </summary>
-        [Test]
-        public void FixedFeeCardOrdersKioskTest()
-        {
-            // TODO unit test for the property 'FixedFeeCardOrdersKiosk'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCashOrdersKiosk'
-        /// </summary>
-        [Test]
-        public void FixedFeeCashOrdersKioskTest()
-        {
-            // TODO unit test for the property 'FixedFeeCashOrdersKiosk'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCardOrdersKioskChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void PercentFeeCardOrdersKioskChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'PercentFeeCardOrdersKioskChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCardOrdersKioskChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void FixedFeeCardOrdersKioskChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'FixedFeeCardOrdersKioskChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCashOrdersKioskChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void PercentFeeCashOrdersKioskChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'PercentFeeCashOrdersKioskChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCashOrdersKioskChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void FixedFeeCashOrdersKioskChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'FixedFeeCashOrdersKioskChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCardOrders'
-        /// </summary>
-        [Test]
-        public void FixedFeeCardOrdersTest()
-        {
-            // TODO unit test for the property 'FixedFeeCardOrders'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCashOrders'
-        /// </summary>
-        [Test]
-        public void FixedFeeCashOrdersTest()
-        {
-            // TODO unit test for the property 'FixedFeeCashOrders'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCardOrdersChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void PercentFeeCardOrdersChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'PercentFeeCardOrdersChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCardOrdersChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void FixedFeeCardOrdersChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'FixedFeeCardOrdersChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCashOrdersChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void PercentFeeCashOrdersChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'PercentFeeCashOrdersChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCashOrdersChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void FixedFeeCashOrdersChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'FixedFeeCashOrdersChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeTips'
-        /// </summary>
-        [Test]
-        public void PercentFeeTipsTest()
-        {
-            // TODO unit test for the property 'PercentFeeTips'
-        }
-        /// <summary>
-        /// Test the property 'TaxRatePercent'
-        /// </summary>
-        [Test]
-        public void TaxRatePercentTest()
-        {
-            // TODO unit test for the property 'TaxRatePercent'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCardOrdersLocationService'
-        /// </summary>
-        [Test]
-        public void PercentFeeCardOrdersLocationServiceTest()
-        {
-            // TODO unit test for the property 'PercentFeeCardOrdersLocationService'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCashOrdersLocationService'
-        /// </summary>
-        [Test]
-        public void PercentFeeCashOrdersLocationServiceTest()
-        {
-            // TODO unit test for the property 'PercentFeeCashOrdersLocationService'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCardOrdersLocationService'
-        /// </summary>
-        [Test]
-        public void FixedFeeCardOrdersLocationServiceTest()
-        {
-            // TODO unit test for the property 'FixedFeeCardOrdersLocationService'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCashOrdersLocationService'
-        /// </summary>
-        [Test]
-        public void FixedFeeCashOrdersLocationServiceTest()
-        {
-            // TODO unit test for the property 'FixedFeeCashOrdersLocationService'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCardOrdersLocationServiceChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void PercentFeeCardOrdersLocationServiceChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'PercentFeeCardOrdersLocationServiceChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCashOrdersLocationServiceChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void PercentFeeCashOrdersLocationServiceChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'PercentFeeCashOrdersLocationServiceChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCardOrdersLocationServiceChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void FixedFeeCardOrdersLocationServiceChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'FixedFeeCardOrdersLocationServiceChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCashOrdersLocationServiceChargedToCustomerIncludingVat'
-        /// </summary>
-        [Test]
-        public void FixedFeeCashOrdersLocationServiceChargedToCustomerIncludingVatTest()
-        {
-            // TODO unit test for the property 'FixedFeeCashOrdersLocationServiceChargedToCustomerIncludingVat'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCardOrdersIngest'
-        /// </summary>
-        [Test]
-        public void PercentFeeCardOrdersIngestTest()
-        {
-            // TODO unit test for the property 'PercentFeeCardOrdersIngest'
-        }
-        /// <summary>
-        /// Test the property 'PercentFeeCashOrdersIngest'
-        /// </summary>
-        [Test]
-        public void PercentFeeCashOrdersIngestTest()
-        {
-            // TODO unit test for the property 'PercentFeeCashOrdersIngest'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCardOrdersIngest'
-        /// </summary>
-        [Test]
-        public void FixedFeeCardOrdersIngestTest()
-        {
-            // TODO unit test for the property 'FixedFeeCardOrdersIngest'
-        }
-        /// <summary>
-        /// Test the property 'FixedFeeCashOrdersIngest'
-        /// </summary>
-        [Test]
-        public void FixedFeeCashOrdersIngestTest()
-        {
-            // TODO unit test for the property 'FixedFeeCashOrdersIngest'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreGroupBaseTests.cs b/src/Flipdish.Test/Model/StoreGroupBaseTests.cs
deleted file mode 100644
index 0faa7357..00000000
--- a/src/Flipdish.Test/Model/StoreGroupBaseTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreGroupBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreGroupBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreGroupBase
-        //private StoreGroupBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreGroupBase
-            //instance = new StoreGroupBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreGroupBase
-        /// </summary>
-        [Test]
-        public void StoreGroupBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreGroupBase
-            //Assert.IsInstanceOfType<StoreGroupBase> (instance, "variable 'instance' is a StoreGroupBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreGroupCreatedEventTests.cs b/src/Flipdish.Test/Model/StoreGroupCreatedEventTests.cs
deleted file mode 100644
index 9463cc80..00000000
--- a/src/Flipdish.Test/Model/StoreGroupCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreGroupCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreGroupCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreGroupCreatedEvent
-        //private StoreGroupCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreGroupCreatedEvent
-            //instance = new StoreGroupCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreGroupCreatedEvent
-        /// </summary>
-        [Test]
-        public void StoreGroupCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreGroupCreatedEvent
-            //Assert.IsInstanceOfType<StoreGroupCreatedEvent> (instance, "variable 'instance' is a StoreGroupCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroup'
-        /// </summary>
-        [Test]
-        public void StoreGroupTest()
-        {
-            // TODO unit test for the property 'StoreGroup'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreGroupDeletedEventTests.cs b/src/Flipdish.Test/Model/StoreGroupDeletedEventTests.cs
deleted file mode 100644
index 35e16ea7..00000000
--- a/src/Flipdish.Test/Model/StoreGroupDeletedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreGroupDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreGroupDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreGroupDeletedEvent
-        //private StoreGroupDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreGroupDeletedEvent
-            //instance = new StoreGroupDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreGroupDeletedEvent
-        /// </summary>
-        [Test]
-        public void StoreGroupDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreGroupDeletedEvent
-            //Assert.IsInstanceOfType<StoreGroupDeletedEvent> (instance, "variable 'instance' is a StoreGroupDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroup'
-        /// </summary>
-        [Test]
-        public void StoreGroupTest()
-        {
-            // TODO unit test for the property 'StoreGroup'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreGroupExtendedTests.cs b/src/Flipdish.Test/Model/StoreGroupExtendedTests.cs
deleted file mode 100644
index c10fc834..00000000
--- a/src/Flipdish.Test/Model/StoreGroupExtendedTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreGroupExtended
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreGroupExtendedTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreGroupExtended
-        //private StoreGroupExtended instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreGroupExtended
-            //instance = new StoreGroupExtended();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreGroupExtended
-        /// </summary>
-        [Test]
-        public void StoreGroupExtendedInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreGroupExtended
-            //Assert.IsInstanceOfType<StoreGroupExtended> (instance, "variable 'instance' is a StoreGroupExtended");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TotalStores'
-        /// </summary>
-        [Test]
-        public void TotalStoresTest()
-        {
-            // TODO unit test for the property 'TotalStores'
-        }
-        /// <summary>
-        /// Test the property 'GroupedCoordinates'
-        /// </summary>
-        [Test]
-        public void GroupedCoordinatesTest()
-        {
-            // TODO unit test for the property 'GroupedCoordinates'
-        }
-        /// <summary>
-        /// Test the property 'StoreHeaders'
-        /// </summary>
-        [Test]
-        public void StoreHeadersTest()
-        {
-            // TODO unit test for the property 'StoreHeaders'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'GeneralRating'
-        /// </summary>
-        [Test]
-        public void GeneralRatingTest()
-        {
-            // TODO unit test for the property 'GeneralRating'
-        }
-        /// <summary>
-        /// Test the property 'GeneralRatingCount'
-        /// </summary>
-        [Test]
-        public void GeneralRatingCountTest()
-        {
-            // TODO unit test for the property 'GeneralRatingCount'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreGroupTests.cs b/src/Flipdish.Test/Model/StoreGroupTests.cs
deleted file mode 100644
index 783b925b..00000000
--- a/src/Flipdish.Test/Model/StoreGroupTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreGroup
-        //private StoreGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreGroup
-            //instance = new StoreGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreGroup
-        /// </summary>
-        [Test]
-        public void StoreGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreGroup
-            //Assert.IsInstanceOfType<StoreGroup> (instance, "variable 'instance' is a StoreGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'GeneralRating'
-        /// </summary>
-        [Test]
-        public void GeneralRatingTest()
-        {
-            // TODO unit test for the property 'GeneralRating'
-        }
-        /// <summary>
-        /// Test the property 'GeneralRatingCount'
-        /// </summary>
-        [Test]
-        public void GeneralRatingCountTest()
-        {
-            // TODO unit test for the property 'GeneralRatingCount'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreGroupUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreGroupUpdatedEventTests.cs
deleted file mode 100644
index ee948149..00000000
--- a/src/Flipdish.Test/Model/StoreGroupUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreGroupUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreGroupUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreGroupUpdatedEvent
-        //private StoreGroupUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreGroupUpdatedEvent
-            //instance = new StoreGroupUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreGroupUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreGroupUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreGroupUpdatedEvent
-            //Assert.IsInstanceOfType<StoreGroupUpdatedEvent> (instance, "variable 'instance' is a StoreGroupUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroup'
-        /// </summary>
-        [Test]
-        public void StoreGroupTest()
-        {
-            // TODO unit test for the property 'StoreGroup'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreHeaderTests.cs b/src/Flipdish.Test/Model/StoreHeaderTests.cs
deleted file mode 100644
index 0a8c74fb..00000000
--- a/src/Flipdish.Test/Model/StoreHeaderTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreHeader
-        //private StoreHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreHeader
-            //instance = new StoreHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreHeader
-        /// </summary>
-        [Test]
-        public void StoreHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreHeader
-            //Assert.IsInstanceOfType<StoreHeader> (instance, "variable 'instance' is a StoreHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreItemHeaderTests.cs b/src/Flipdish.Test/Model/StoreItemHeaderTests.cs
deleted file mode 100644
index 1426c91b..00000000
--- a/src/Flipdish.Test/Model/StoreItemHeaderTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreItemHeader
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreItemHeaderTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreItemHeader
-        //private StoreItemHeader instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreItemHeader
-            //instance = new StoreItemHeader();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreItemHeader
-        /// </summary>
-        [Test]
-        public void StoreItemHeaderInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreItemHeader
-            //Assert.IsInstanceOfType<StoreItemHeader> (instance, "variable 'instance' is a StoreItemHeader");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreKioskSettingModelTests.cs b/src/Flipdish.Test/Model/StoreKioskSettingModelTests.cs
deleted file mode 100644
index eb46aefe..00000000
--- a/src/Flipdish.Test/Model/StoreKioskSettingModelTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreKioskSettingModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreKioskSettingModelTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreKioskSettingModel
-        //private StoreKioskSettingModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreKioskSettingModel
-            //instance = new StoreKioskSettingModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreKioskSettingModel
-        /// </summary>
-        [Test]
-        public void StoreKioskSettingModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreKioskSettingModel
-            //Assert.IsInstanceOfType<StoreKioskSettingModel> (instance, "variable 'instance' is a StoreKioskSettingModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'KioskName'
-        /// </summary>
-        [Test]
-        public void KioskNameTest()
-        {
-            // TODO unit test for the property 'KioskName'
-        }
-        /// <summary>
-        /// Test the property 'RequireCustomerName'
-        /// </summary>
-        [Test]
-        public void RequireCustomerNameTest()
-        {
-            // TODO unit test for the property 'RequireCustomerName'
-        }
-        /// <summary>
-        /// Test the property 'RequireCustomerPhoneNumber'
-        /// </summary>
-        [Test]
-        public void RequireCustomerPhoneNumberTest()
-        {
-            // TODO unit test for the property 'RequireCustomerPhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'RequestTableNumber'
-        /// </summary>
-        [Test]
-        public void RequestTableNumberTest()
-        {
-            // TODO unit test for the property 'RequestTableNumber'
-        }
-        /// <summary>
-        /// Test the property 'OfferDineInOrTakeawayOptions'
-        /// </summary>
-        [Test]
-        public void OfferDineInOrTakeawayOptionsTest()
-        {
-            // TODO unit test for the property 'OfferDineInOrTakeawayOptions'
-        }
-        /// <summary>
-        /// Test the property 'SortOrder'
-        /// </summary>
-        [Test]
-        public void SortOrderTest()
-        {
-            // TODO unit test for the property 'SortOrder'
-        }
-        /// <summary>
-        /// Test the property 'ConfigId'
-        /// </summary>
-        [Test]
-        public void ConfigIdTest()
-        {
-            // TODO unit test for the property 'ConfigId'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreKioskSettingTests.cs b/src/Flipdish.Test/Model/StoreKioskSettingTests.cs
deleted file mode 100644
index 5275f254..00000000
--- a/src/Flipdish.Test/Model/StoreKioskSettingTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreKioskSetting
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreKioskSettingTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreKioskSetting
-        //private StoreKioskSetting instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreKioskSetting
-            //instance = new StoreKioskSetting();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreKioskSetting
-        /// </summary>
-        [Test]
-        public void StoreKioskSettingInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreKioskSetting
-            //Assert.IsInstanceOfType<StoreKioskSetting> (instance, "variable 'instance' is a StoreKioskSetting");
-        }
-
-
-        /// <summary>
-        /// Test the property 'KioskSettingId'
-        /// </summary>
-        [Test]
-        public void KioskSettingIdTest()
-        {
-            // TODO unit test for the property 'KioskSettingId'
-        }
-        /// <summary>
-        /// Test the property 'KioskName'
-        /// </summary>
-        [Test]
-        public void KioskNameTest()
-        {
-            // TODO unit test for the property 'KioskName'
-        }
-        /// <summary>
-        /// Test the property 'RequireCustomerName'
-        /// </summary>
-        [Test]
-        public void RequireCustomerNameTest()
-        {
-            // TODO unit test for the property 'RequireCustomerName'
-        }
-        /// <summary>
-        /// Test the property 'RequestTableNumber'
-        /// </summary>
-        [Test]
-        public void RequestTableNumberTest()
-        {
-            // TODO unit test for the property 'RequestTableNumber'
-        }
-        /// <summary>
-        /// Test the property 'OfferDineInOrTakeawayOption'
-        /// </summary>
-        [Test]
-        public void OfferDineInOrTakeawayOptionTest()
-        {
-            // TODO unit test for the property 'OfferDineInOrTakeawayOption'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurantId'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantIdTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurantId'
-        }
-        /// <summary>
-        /// Test the property 'HydraConfigId'
-        /// </summary>
-        [Test]
-        public void HydraConfigIdTest()
-        {
-            // TODO unit test for the property 'HydraConfigId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreKioskSettingUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreKioskSettingUpdatedEventTests.cs
deleted file mode 100644
index afa4d845..00000000
--- a/src/Flipdish.Test/Model/StoreKioskSettingUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreKioskSettingUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreKioskSettingUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreKioskSettingUpdatedEvent
-        //private StoreKioskSettingUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreKioskSettingUpdatedEvent
-            //instance = new StoreKioskSettingUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreKioskSettingUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreKioskSettingUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreKioskSettingUpdatedEvent
-            //Assert.IsInstanceOfType<StoreKioskSettingUpdatedEvent> (instance, "variable 'instance' is a StoreKioskSettingUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'StoreKioskSetting'
-        /// </summary>
-        [Test]
-        public void StoreKioskSettingTest()
-        {
-            // TODO unit test for the property 'StoreKioskSetting'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreKioskSettingsTests.cs b/src/Flipdish.Test/Model/StoreKioskSettingsTests.cs
deleted file mode 100644
index 7218705e..00000000
--- a/src/Flipdish.Test/Model/StoreKioskSettingsTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreKioskSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreKioskSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreKioskSettings
-        //private StoreKioskSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreKioskSettings
-            //instance = new StoreKioskSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreKioskSettings
-        /// </summary>
-        [Test]
-        public void StoreKioskSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreKioskSettings
-            //Assert.IsInstanceOfType<StoreKioskSettings> (instance, "variable 'instance' is a StoreKioskSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'KioskStoreSettings'
-        /// </summary>
-        [Test]
-        public void KioskStoreSettingsTest()
-        {
-            // TODO unit test for the property 'KioskStoreSettings'
-        }
-        /// <summary>
-        /// Test the property 'StoreLogoUrl'
-        /// </summary>
-        [Test]
-        public void StoreLogoUrlTest()
-        {
-            // TODO unit test for the property 'StoreLogoUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreListItemTests.cs b/src/Flipdish.Test/Model/StoreListItemTests.cs
deleted file mode 100644
index 6d623fc2..00000000
--- a/src/Flipdish.Test/Model/StoreListItemTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreListItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreListItemTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreListItem
-        //private StoreListItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreListItem
-            //instance = new StoreListItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreListItem
-        /// </summary>
-        [Test]
-        public void StoreListItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreListItem
-            //Assert.IsInstanceOfType<StoreListItem> (instance, "variable 'instance' is a StoreListItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreName'
-        /// </summary>
-        [Test]
-        public void StoreNameTest()
-        {
-            // TODO unit test for the property 'StoreName'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupName'
-        /// </summary>
-        [Test]
-        public void StoreGroupNameTest()
-        {
-            // TODO unit test for the property 'StoreGroupName'
-        }
-        /// <summary>
-        /// Test the property 'HasLoyaltyCampaign'
-        /// </summary>
-        [Test]
-        public void HasLoyaltyCampaignTest()
-        {
-            // TODO unit test for the property 'HasLoyaltyCampaign'
-        }
-        /// <summary>
-        /// Test the property 'HasRetentionCampaign'
-        /// </summary>
-        [Test]
-        public void HasRetentionCampaignTest()
-        {
-            // TODO unit test for the property 'HasRetentionCampaign'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreLogoCreatedEventTests.cs b/src/Flipdish.Test/Model/StoreLogoCreatedEventTests.cs
deleted file mode 100644
index 6b3b6360..00000000
--- a/src/Flipdish.Test/Model/StoreLogoCreatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreLogoCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreLogoCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreLogoCreatedEvent
-        //private StoreLogoCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreLogoCreatedEvent
-            //instance = new StoreLogoCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreLogoCreatedEvent
-        /// </summary>
-        [Test]
-        public void StoreLogoCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreLogoCreatedEvent
-            //Assert.IsInstanceOfType<StoreLogoCreatedEvent> (instance, "variable 'instance' is a StoreLogoCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreLogoDeletedEventTests.cs b/src/Flipdish.Test/Model/StoreLogoDeletedEventTests.cs
deleted file mode 100644
index 5dfbd7e1..00000000
--- a/src/Flipdish.Test/Model/StoreLogoDeletedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreLogoDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreLogoDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreLogoDeletedEvent
-        //private StoreLogoDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreLogoDeletedEvent
-            //instance = new StoreLogoDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreLogoDeletedEvent
-        /// </summary>
-        [Test]
-        public void StoreLogoDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreLogoDeletedEvent
-            //Assert.IsInstanceOfType<StoreLogoDeletedEvent> (instance, "variable 'instance' is a StoreLogoDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreLogoUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreLogoUpdatedEventTests.cs
deleted file mode 100644
index ef378ee8..00000000
--- a/src/Flipdish.Test/Model/StoreLogoUpdatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreLogoUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreLogoUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreLogoUpdatedEvent
-        //private StoreLogoUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreLogoUpdatedEvent
-            //instance = new StoreLogoUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreLogoUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreLogoUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreLogoUpdatedEvent
-            //Assert.IsInstanceOfType<StoreLogoUpdatedEvent> (instance, "variable 'instance' is a StoreLogoUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreMenuAssignedEventTests.cs b/src/Flipdish.Test/Model/StoreMenuAssignedEventTests.cs
deleted file mode 100644
index 8ddefbfc..00000000
--- a/src/Flipdish.Test/Model/StoreMenuAssignedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreMenuAssignedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreMenuAssignedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreMenuAssignedEvent
-        //private StoreMenuAssignedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreMenuAssignedEvent
-            //instance = new StoreMenuAssignedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreMenuAssignedEvent
-        /// </summary>
-        [Test]
-        public void StoreMenuAssignedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreMenuAssignedEvent
-            //Assert.IsInstanceOfType<StoreMenuAssignedEvent> (instance, "variable 'instance' is a StoreMenuAssignedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreNoteTests.cs b/src/Flipdish.Test/Model/StoreNoteTests.cs
deleted file mode 100644
index 70d57cdd..00000000
--- a/src/Flipdish.Test/Model/StoreNoteTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreNote
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreNoteTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreNote
-        //private StoreNote instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreNote
-            //instance = new StoreNote();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreNote
-        /// </summary>
-        [Test]
-        public void StoreNoteInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreNote
-            //Assert.IsInstanceOfType<StoreNote> (instance, "variable 'instance' is a StoreNote");
-        }
-
-
-        /// <summary>
-        /// Test the property 'UserId'
-        /// </summary>
-        [Test]
-        public void UserIdTest()
-        {
-            // TODO unit test for the property 'UserId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Note'
-        /// </summary>
-        [Test]
-        public void NoteTest()
-        {
-            // TODO unit test for the property 'Note'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreOpeningHoursUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreOpeningHoursUpdatedEventTests.cs
deleted file mode 100644
index be8e617e..00000000
--- a/src/Flipdish.Test/Model/StoreOpeningHoursUpdatedEventTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreOpeningHoursUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreOpeningHoursUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreOpeningHoursUpdatedEvent
-        //private StoreOpeningHoursUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreOpeningHoursUpdatedEvent
-            //instance = new StoreOpeningHoursUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreOpeningHoursUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreOpeningHoursUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreOpeningHoursUpdatedEvent
-            //Assert.IsInstanceOfType<StoreOpeningHoursUpdatedEvent> (instance, "variable 'instance' is a StoreOpeningHoursUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryType'
-        /// </summary>
-        [Test]
-        public void DeliveryTypeTest()
-        {
-            // TODO unit test for the property 'DeliveryType'
-        }
-        /// <summary>
-        /// Test the property 'BusinessHoursPeriodOld'
-        /// </summary>
-        [Test]
-        public void BusinessHoursPeriodOldTest()
-        {
-            // TODO unit test for the property 'BusinessHoursPeriodOld'
-        }
-        /// <summary>
-        /// Test the property 'BusinessHoursPeriod'
-        /// </summary>
-        [Test]
-        public void BusinessHoursPeriodTest()
-        {
-            // TODO unit test for the property 'BusinessHoursPeriod'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreOrderCapacityConfigEditModelTests.cs b/src/Flipdish.Test/Model/StoreOrderCapacityConfigEditModelTests.cs
deleted file mode 100644
index a8f2dc9c..00000000
--- a/src/Flipdish.Test/Model/StoreOrderCapacityConfigEditModelTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreOrderCapacityConfigEditModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreOrderCapacityConfigEditModelTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreOrderCapacityConfigEditModel
-        //private StoreOrderCapacityConfigEditModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreOrderCapacityConfigEditModel
-            //instance = new StoreOrderCapacityConfigEditModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreOrderCapacityConfigEditModel
-        /// </summary>
-        [Test]
-        public void StoreOrderCapacityConfigEditModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreOrderCapacityConfigEditModel
-            //Assert.IsInstanceOfType<StoreOrderCapacityConfigEditModel> (instance, "variable 'instance' is a StoreOrderCapacityConfigEditModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OrderCapacityPeriods'
-        /// </summary>
-        [Test]
-        public void OrderCapacityPeriodsTest()
-        {
-            // TODO unit test for the property 'OrderCapacityPeriods'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreOrderCapacityConfigTests.cs b/src/Flipdish.Test/Model/StoreOrderCapacityConfigTests.cs
deleted file mode 100644
index 3779f56f..00000000
--- a/src/Flipdish.Test/Model/StoreOrderCapacityConfigTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreOrderCapacityConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreOrderCapacityConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreOrderCapacityConfig
-        //private StoreOrderCapacityConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreOrderCapacityConfig
-            //instance = new StoreOrderCapacityConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreOrderCapacityConfig
-        /// </summary>
-        [Test]
-        public void StoreOrderCapacityConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreOrderCapacityConfig
-            //Assert.IsInstanceOfType<StoreOrderCapacityConfig> (instance, "variable 'instance' is a StoreOrderCapacityConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryType'
-        /// </summary>
-        [Test]
-        public void DeliveryTypeTest()
-        {
-            // TODO unit test for the property 'DeliveryType'
-        }
-        /// <summary>
-        /// Test the property 'StoreIntervalInMinutes'
-        /// </summary>
-        [Test]
-        public void StoreIntervalInMinutesTest()
-        {
-            // TODO unit test for the property 'StoreIntervalInMinutes'
-        }
-        /// <summary>
-        /// Test the property 'OrderCapacityPeriods'
-        /// </summary>
-        [Test]
-        public void OrderCapacityPeriodsTest()
-        {
-            // TODO unit test for the property 'OrderCapacityPeriods'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreOrderCapacityPeriodTests.cs b/src/Flipdish.Test/Model/StoreOrderCapacityPeriodTests.cs
deleted file mode 100644
index 38c6fa83..00000000
--- a/src/Flipdish.Test/Model/StoreOrderCapacityPeriodTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreOrderCapacityPeriod
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreOrderCapacityPeriodTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreOrderCapacityPeriod
-        //private StoreOrderCapacityPeriod instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreOrderCapacityPeriod
-            //instance = new StoreOrderCapacityPeriod();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreOrderCapacityPeriod
-        /// </summary>
-        [Test]
-        public void StoreOrderCapacityPeriodInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreOrderCapacityPeriod
-            //Assert.IsInstanceOfType<StoreOrderCapacityPeriod> (instance, "variable 'instance' is a StoreOrderCapacityPeriod");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MaxOrderNumberPerStoreInterval'
-        /// </summary>
-        [Test]
-        public void MaxOrderNumberPerStoreIntervalTest()
-        {
-            // TODO unit test for the property 'MaxOrderNumberPerStoreInterval'
-        }
-        /// <summary>
-        /// Test the property 'DayOfTheWeek'
-        /// </summary>
-        [Test]
-        public void DayOfTheWeekTest()
-        {
-            // TODO unit test for the property 'DayOfTheWeek'
-        }
-        /// <summary>
-        /// Test the property 'PeriodStartHour'
-        /// </summary>
-        [Test]
-        public void PeriodStartHourTest()
-        {
-            // TODO unit test for the property 'PeriodStartHour'
-        }
-        /// <summary>
-        /// Test the property 'PeriodStartMinutes'
-        /// </summary>
-        [Test]
-        public void PeriodStartMinutesTest()
-        {
-            // TODO unit test for the property 'PeriodStartMinutes'
-        }
-        /// <summary>
-        /// Test the property 'PeriodEndHour'
-        /// </summary>
-        [Test]
-        public void PeriodEndHourTest()
-        {
-            // TODO unit test for the property 'PeriodEndHour'
-        }
-        /// <summary>
-        /// Test the property 'PeriodEndMinutes'
-        /// </summary>
-        [Test]
-        public void PeriodEndMinutesTest()
-        {
-            // TODO unit test for the property 'PeriodEndMinutes'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreOrderCapacityUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreOrderCapacityUpdatedEventTests.cs
deleted file mode 100644
index 02a9b102..00000000
--- a/src/Flipdish.Test/Model/StoreOrderCapacityUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreOrderCapacityUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreOrderCapacityUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreOrderCapacityUpdatedEvent
-        //private StoreOrderCapacityUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreOrderCapacityUpdatedEvent
-            //instance = new StoreOrderCapacityUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreOrderCapacityUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreOrderCapacityUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreOrderCapacityUpdatedEvent
-            //Assert.IsInstanceOfType<StoreOrderCapacityUpdatedEvent> (instance, "variable 'instance' is a StoreOrderCapacityUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'OrderCapacityConfig'
-        /// </summary>
-        [Test]
-        public void OrderCapacityConfigTest()
-        {
-            // TODO unit test for the property 'OrderCapacityConfig'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StorePreOrderConfigUpdatedEventTests.cs b/src/Flipdish.Test/Model/StorePreOrderConfigUpdatedEventTests.cs
deleted file mode 100644
index 75847d18..00000000
--- a/src/Flipdish.Test/Model/StorePreOrderConfigUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StorePreOrderConfigUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StorePreOrderConfigUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StorePreOrderConfigUpdatedEvent
-        //private StorePreOrderConfigUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StorePreOrderConfigUpdatedEvent
-            //instance = new StorePreOrderConfigUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StorePreOrderConfigUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StorePreOrderConfigUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StorePreOrderConfigUpdatedEvent
-            //Assert.IsInstanceOfType<StorePreOrderConfigUpdatedEvent> (instance, "variable 'instance' is a StorePreOrderConfigUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'PreOrderConfig'
-        /// </summary>
-        [Test]
-        public void PreOrderConfigTest()
-        {
-            // TODO unit test for the property 'PreOrderConfig'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StorePublishedEventTests.cs b/src/Flipdish.Test/Model/StorePublishedEventTests.cs
deleted file mode 100644
index ce5ea660..00000000
--- a/src/Flipdish.Test/Model/StorePublishedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StorePublishedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StorePublishedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StorePublishedEvent
-        //private StorePublishedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StorePublishedEvent
-            //instance = new StorePublishedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StorePublishedEvent
-        /// </summary>
-        [Test]
-        public void StorePublishedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StorePublishedEvent
-            //Assert.IsInstanceOfType<StorePublishedEvent> (instance, "variable 'instance' is a StorePublishedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Store'
-        /// </summary>
-        [Test]
-        public void StoreTest()
-        {
-            // TODO unit test for the property 'Store'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreServiceChargeUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreServiceChargeUpdatedEventTests.cs
deleted file mode 100644
index 6a612ad7..00000000
--- a/src/Flipdish.Test/Model/StoreServiceChargeUpdatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreServiceChargeUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreServiceChargeUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreServiceChargeUpdatedEvent
-        //private StoreServiceChargeUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreServiceChargeUpdatedEvent
-            //instance = new StoreServiceChargeUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreServiceChargeUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreServiceChargeUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreServiceChargeUpdatedEvent
-            //Assert.IsInstanceOfType<StoreServiceChargeUpdatedEvent> (instance, "variable 'instance' is a StoreServiceChargeUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'ServiceCharge'
-        /// </summary>
-        [Test]
-        public void ServiceChargeTest()
-        {
-            // TODO unit test for the property 'ServiceCharge'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreStatisticsTests.cs b/src/Flipdish.Test/Model/StoreStatisticsTests.cs
deleted file mode 100644
index 32aa8a28..00000000
--- a/src/Flipdish.Test/Model/StoreStatisticsTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreStatistics
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreStatisticsTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreStatistics
-        //private StoreStatistics instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreStatistics
-            //instance = new StoreStatistics();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreStatistics
-        /// </summary>
-        [Test]
-        public void StoreStatisticsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreStatistics
-            //Assert.IsInstanceOfType<StoreStatistics> (instance, "variable 'instance' is a StoreStatistics");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Data'
-        /// </summary>
-        [Test]
-        public void DataTest()
-        {
-            // TODO unit test for the property 'Data'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreSummaryTests.cs b/src/Flipdish.Test/Model/StoreSummaryTests.cs
deleted file mode 100644
index 53d21aea..00000000
--- a/src/Flipdish.Test/Model/StoreSummaryTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreSummary
-        //private StoreSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreSummary
-            //instance = new StoreSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreSummary
-        /// </summary>
-        [Test]
-        public void StoreSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreSummary
-            //Assert.IsInstanceOfType<StoreSummary> (instance, "variable 'instance' is a StoreSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'Metadata'
-        /// </summary>
-        [Test]
-        public void MetadataTest()
-        {
-            // TODO unit test for the property 'Metadata'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'Coordinates'
-        /// </summary>
-        [Test]
-        public void CoordinatesTest()
-        {
-            // TODO unit test for the property 'Coordinates'
-        }
-        /// <summary>
-        /// Test the property 'StoreTimezone'
-        /// </summary>
-        [Test]
-        public void StoreTimezoneTest()
-        {
-            // TODO unit test for the property 'StoreTimezone'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreTests.cs b/src/Flipdish.Test/Model/StoreTests.cs
deleted file mode 100644
index 2e2e0182..00000000
--- a/src/Flipdish.Test/Model/StoreTests.cs
+++ /dev/null
@@ -1,448 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Store
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreTests
-    {
-        // TODO uncomment below to declare an instance variable for Store
-        //private Store instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Store
-            //instance = new Store();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Store
-        /// </summary>
-        [Test]
-        public void StoreInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Store
-            //Assert.IsInstanceOfType<Store> (instance, "variable 'instance' is a Store");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'Address'
-        /// </summary>
-        [Test]
-        public void AddressTest()
-        {
-            // TODO unit test for the property 'Address'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryZones'
-        /// </summary>
-        [Test]
-        public void DeliveryZonesTest()
-        {
-            // TODO unit test for the property 'DeliveryZones'
-        }
-        /// <summary>
-        /// Test the property 'ApmPhoneNumber'
-        /// </summary>
-        [Test]
-        public void ApmPhoneNumberTest()
-        {
-            // TODO unit test for the property 'ApmPhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'PickupHours'
-        /// </summary>
-        [Test]
-        public void PickupHoursTest()
-        {
-            // TODO unit test for the property 'PickupHours'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryHours'
-        /// </summary>
-        [Test]
-        public void DeliveryHoursTest()
-        {
-            // TODO unit test for the property 'DeliveryHours'
-        }
-        /// <summary>
-        /// Test the property 'MenuId'
-        /// </summary>
-        [Test]
-        public void MenuIdTest()
-        {
-            // TODO unit test for the property 'MenuId'
-        }
-        /// <summary>
-        /// Test the property 'OrderConfirmationMessageOverrideDelivery'
-        /// </summary>
-        [Test]
-        public void OrderConfirmationMessageOverrideDeliveryTest()
-        {
-            // TODO unit test for the property 'OrderConfirmationMessageOverrideDelivery'
-        }
-        /// <summary>
-        /// Test the property 'OrderConfirmationMessageOverridePickup'
-        /// </summary>
-        [Test]
-        public void OrderConfirmationMessageOverridePickupTest()
-        {
-            // TODO unit test for the property 'OrderConfirmationMessageOverridePickup'
-        }
-        /// <summary>
-        /// Test the property 'PrintoutLayoutType'
-        /// </summary>
-        [Test]
-        public void PrintoutLayoutTypeTest()
-        {
-            // TODO unit test for the property 'PrintoutLayoutType'
-        }
-        /// <summary>
-        /// Test the property 'StoreNotes'
-        /// </summary>
-        [Test]
-        public void StoreNotesTest()
-        {
-            // TODO unit test for the property 'StoreNotes'
-        }
-        /// <summary>
-        /// Test the property 'MicrosoftTimeZone'
-        /// </summary>
-        [Test]
-        public void MicrosoftTimeZoneTest()
-        {
-            // TODO unit test for the property 'MicrosoftTimeZone'
-        }
-        /// <summary>
-        /// Test the property 'IanaTimeZone'
-        /// </summary>
-        [Test]
-        public void IanaTimeZoneTest()
-        {
-            // TODO unit test for the property 'IanaTimeZone'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'PreOrderDeliveryEnabled'
-        /// </summary>
-        [Test]
-        public void PreOrderDeliveryEnabledTest()
-        {
-            // TODO unit test for the property 'PreOrderDeliveryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PreOrderPickupEnabled'
-        /// </summary>
-        [Test]
-        public void PreOrderPickupEnabledTest()
-        {
-            // TODO unit test for the property 'PreOrderPickupEnabled'
-        }
-        /// <summary>
-        /// Test the property 'LogoUrl'
-        /// </summary>
-        [Test]
-        public void LogoUrlTest()
-        {
-            // TODO unit test for the property 'LogoUrl'
-        }
-        /// <summary>
-        /// Test the property 'PhoneNumber'
-        /// </summary>
-        [Test]
-        public void PhoneNumberTest()
-        {
-            // TODO unit test for the property 'PhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'AlwaysAppearOpen'
-        /// </summary>
-        [Test]
-        public void AlwaysAppearOpenTest()
-        {
-            // TODO unit test for the property 'AlwaysAppearOpen'
-        }
-        /// <summary>
-        /// Test the property 'PreOrderEnabled'
-        /// </summary>
-        [Test]
-        public void PreOrderEnabledTest()
-        {
-            // TODO unit test for the property 'PreOrderEnabled'
-        }
-        /// <summary>
-        /// Test the property 'TakeOutEnabled'
-        /// </summary>
-        [Test]
-        public void TakeOutEnabledTest()
-        {
-            // TODO unit test for the property 'TakeOutEnabled'
-        }
-        /// <summary>
-        /// Test the property 'TableServiceEnabled'
-        /// </summary>
-        [Test]
-        public void TableServiceEnabledTest()
-        {
-            // TODO unit test for the property 'TableServiceEnabled'
-        }
-        /// <summary>
-        /// Test the property 'DineInEnabled'
-        /// </summary>
-        [Test]
-        public void DineInEnabledTest()
-        {
-            // TODO unit test for the property 'DineInEnabled'
-        }
-        /// <summary>
-        /// Test the property 'AllowPreOrdersAndTableService'
-        /// </summary>
-        [Test]
-        public void AllowPreOrdersAndTableServiceTest()
-        {
-            // TODO unit test for the property 'AllowPreOrdersAndTableService'
-        }
-        /// <summary>
-        /// Test the property 'PickupEnabled'
-        /// </summary>
-        [Test]
-        public void PickupEnabledTest()
-        {
-            // TODO unit test for the property 'PickupEnabled'
-        }
-        /// <summary>
-        /// Test the property 'DeliveryEnabled'
-        /// </summary>
-        [Test]
-        public void DeliveryEnabledTest()
-        {
-            // TODO unit test for the property 'DeliveryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CardOrderDeliveryEnabled'
-        /// </summary>
-        [Test]
-        public void CardOrderDeliveryEnabledTest()
-        {
-            // TODO unit test for the property 'CardOrderDeliveryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CashOrdersDeliveryEnabled'
-        /// </summary>
-        [Test]
-        public void CashOrdersDeliveryEnabledTest()
-        {
-            // TODO unit test for the property 'CashOrdersDeliveryEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CardOrdersPickupEnabled'
-        /// </summary>
-        [Test]
-        public void CardOrdersPickupEnabledTest()
-        {
-            // TODO unit test for the property 'CardOrdersPickupEnabled'
-        }
-        /// <summary>
-        /// Test the property 'CashOrdersPickupEnabled'
-        /// </summary>
-        [Test]
-        public void CashOrdersPickupEnabledTest()
-        {
-            // TODO unit test for the property 'CashOrdersPickupEnabled'
-        }
-        /// <summary>
-        /// Test the property 'TipsEnabled'
-        /// </summary>
-        [Test]
-        public void TipsEnabledTest()
-        {
-            // TODO unit test for the property 'TipsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'AutomaticallyAcceptOrders'
-        /// </summary>
-        [Test]
-        public void AutomaticallyAcceptOrdersTest()
-        {
-            // TODO unit test for the property 'AutomaticallyAcceptOrders'
-        }
-        /// <summary>
-        /// Test the property 'OpenForDelivery'
-        /// </summary>
-        [Test]
-        public void OpenForDeliveryTest()
-        {
-            // TODO unit test for the property 'OpenForDelivery'
-        }
-        /// <summary>
-        /// Test the property 'OpenForPickup'
-        /// </summary>
-        [Test]
-        public void OpenForPickupTest()
-        {
-            // TODO unit test for the property 'OpenForPickup'
-        }
-        /// <summary>
-        /// Test the property 'MinimumPickupOrderAmount'
-        /// </summary>
-        [Test]
-        public void MinimumPickupOrderAmountTest()
-        {
-            // TODO unit test for the property 'MinimumPickupOrderAmount'
-        }
-        /// <summary>
-        /// Test the property 'RequireCustomerNameForPickup'
-        /// </summary>
-        [Test]
-        public void RequireCustomerNameForPickupTest()
-        {
-            // TODO unit test for the property 'RequireCustomerNameForPickup'
-        }
-        /// <summary>
-        /// Test the property 'GdprCustomerPhoneNumbers'
-        /// </summary>
-        [Test]
-        public void GdprCustomerPhoneNumbersTest()
-        {
-            // TODO unit test for the property 'GdprCustomerPhoneNumbers'
-        }
-        /// <summary>
-        /// Test the property 'RequireCustomerNameForDelivery'
-        /// </summary>
-        [Test]
-        public void RequireCustomerNameForDeliveryTest()
-        {
-            // TODO unit test for the property 'RequireCustomerNameForDelivery'
-        }
-        /// <summary>
-        /// Test the property 'AllowChefNotes'
-        /// </summary>
-        [Test]
-        public void AllowChefNotesTest()
-        {
-            // TODO unit test for the property 'AllowChefNotes'
-        }
-        /// <summary>
-        /// Test the property 'EtaInPickupConfirmationSmsEnabled'
-        /// </summary>
-        [Test]
-        public void EtaInPickupConfirmationSmsEnabledTest()
-        {
-            // TODO unit test for the property 'EtaInPickupConfirmationSmsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'EtaInDeliveryConfirmationSmsEnabled'
-        /// </summary>
-        [Test]
-        public void EtaInDeliveryConfirmationSmsEnabledTest()
-        {
-            // TODO unit test for the property 'EtaInDeliveryConfirmationSmsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsArchived'
-        /// </summary>
-        [Test]
-        public void IsArchivedTest()
-        {
-            // TODO unit test for the property 'IsArchived'
-        }
-        /// <summary>
-        /// Test the property 'IsPublished'
-        /// </summary>
-        [Test]
-        public void IsPublishedTest()
-        {
-            // TODO unit test for the property 'IsPublished'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'EmailAddress'
-        /// </summary>
-        [Test]
-        public void EmailAddressTest()
-        {
-            // TODO unit test for the property 'EmailAddress'
-        }
-        /// <summary>
-        /// Test the property 'StaffLanguage'
-        /// </summary>
-        [Test]
-        public void StaffLanguageTest()
-        {
-            // TODO unit test for the property 'StaffLanguage'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreTipUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreTipUpdatedEventTests.cs
deleted file mode 100644
index 274822e2..00000000
--- a/src/Flipdish.Test/Model/StoreTipUpdatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreTipUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreTipUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreTipUpdatedEvent
-        //private StoreTipUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreTipUpdatedEvent
-            //instance = new StoreTipUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreTipUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreTipUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreTipUpdatedEvent
-            //Assert.IsInstanceOfType<StoreTipUpdatedEvent> (instance, "variable 'instance' is a StoreTipUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Config'
-        /// </summary>
-        [Test]
-        public void ConfigTest()
-        {
-            // TODO unit test for the property 'Config'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'IpAddress'
-        /// </summary>
-        [Test]
-        public void IpAddressTest()
-        {
-            // TODO unit test for the property 'IpAddress'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreUnarchivedEventTests.cs b/src/Flipdish.Test/Model/StoreUnarchivedEventTests.cs
deleted file mode 100644
index 9255ee6b..00000000
--- a/src/Flipdish.Test/Model/StoreUnarchivedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreUnarchivedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreUnarchivedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreUnarchivedEvent
-        //private StoreUnarchivedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreUnarchivedEvent
-            //instance = new StoreUnarchivedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreUnarchivedEvent
-        /// </summary>
-        [Test]
-        public void StoreUnarchivedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreUnarchivedEvent
-            //Assert.IsInstanceOfType<StoreUnarchivedEvent> (instance, "variable 'instance' is a StoreUnarchivedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Store'
-        /// </summary>
-        [Test]
-        public void StoreTest()
-        {
-            // TODO unit test for the property 'Store'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreUnpublishedEventTests.cs b/src/Flipdish.Test/Model/StoreUnpublishedEventTests.cs
deleted file mode 100644
index f79c1f97..00000000
--- a/src/Flipdish.Test/Model/StoreUnpublishedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreUnpublishedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreUnpublishedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreUnpublishedEvent
-        //private StoreUnpublishedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreUnpublishedEvent
-            //instance = new StoreUnpublishedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreUnpublishedEvent
-        /// </summary>
-        [Test]
-        public void StoreUnpublishedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreUnpublishedEvent
-            //Assert.IsInstanceOfType<StoreUnpublishedEvent> (instance, "variable 'instance' is a StoreUnpublishedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Store'
-        /// </summary>
-        [Test]
-        public void StoreTest()
-        {
-            // TODO unit test for the property 'Store'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreUpdatedEventTests.cs b/src/Flipdish.Test/Model/StoreUpdatedEventTests.cs
deleted file mode 100644
index 71d5684f..00000000
--- a/src/Flipdish.Test/Model/StoreUpdatedEventTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreUpdatedEvent
-        //private StoreUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreUpdatedEvent
-            //instance = new StoreUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreUpdatedEvent
-        /// </summary>
-        [Test]
-        public void StoreUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreUpdatedEvent
-            //Assert.IsInstanceOfType<StoreUpdatedEvent> (instance, "variable 'instance' is a StoreUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Store'
-        /// </summary>
-        [Test]
-        public void StoreTest()
-        {
-            // TODO unit test for the property 'Store'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StoreValidationConfigTests.cs b/src/Flipdish.Test/Model/StoreValidationConfigTests.cs
deleted file mode 100644
index a4b73bf2..00000000
--- a/src/Flipdish.Test/Model/StoreValidationConfigTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StoreValidationConfig
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StoreValidationConfigTests
-    {
-        // TODO uncomment below to declare an instance variable for StoreValidationConfig
-        //private StoreValidationConfig instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StoreValidationConfig
-            //instance = new StoreValidationConfig();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StoreValidationConfig
-        /// </summary>
-        [Test]
-        public void StoreValidationConfigInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StoreValidationConfig
-            //Assert.IsInstanceOfType<StoreValidationConfig> (instance, "variable 'instance' is a StoreValidationConfig");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'IsValid'
-        /// </summary>
-        [Test]
-        public void IsValidTest()
-        {
-            // TODO unit test for the property 'IsValid'
-        }
-        /// <summary>
-        /// Test the property 'StoreGroupId'
-        /// </summary>
-        [Test]
-        public void StoreGroupIdTest()
-        {
-            // TODO unit test for the property 'StoreGroupId'
-        }
-        /// <summary>
-        /// Test the property 'ConfigValidation'
-        /// </summary>
-        [Test]
-        public void ConfigValidationTest()
-        {
-            // TODO unit test for the property 'ConfigValidation'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StripeAccountLinkRequestTests.cs b/src/Flipdish.Test/Model/StripeAccountLinkRequestTests.cs
deleted file mode 100644
index a6093fb6..00000000
--- a/src/Flipdish.Test/Model/StripeAccountLinkRequestTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StripeAccountLinkRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StripeAccountLinkRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for StripeAccountLinkRequest
-        //private StripeAccountLinkRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StripeAccountLinkRequest
-            //instance = new StripeAccountLinkRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StripeAccountLinkRequest
-        /// </summary>
-        [Test]
-        public void StripeAccountLinkRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StripeAccountLinkRequest
-            //Assert.IsInstanceOfType<StripeAccountLinkRequest> (instance, "variable 'instance' is a StripeAccountLinkRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StripeId'
-        /// </summary>
-        [Test]
-        public void StripeIdTest()
-        {
-            // TODO unit test for the property 'StripeId'
-        }
-        /// <summary>
-        /// Test the property 'SuccessUrl'
-        /// </summary>
-        [Test]
-        public void SuccessUrlTest()
-        {
-            // TODO unit test for the property 'SuccessUrl'
-        }
-        /// <summary>
-        /// Test the property 'FailureUrl'
-        /// </summary>
-        [Test]
-        public void FailureUrlTest()
-        {
-            // TODO unit test for the property 'FailureUrl'
-        }
-        /// <summary>
-        /// Test the property 'Collect'
-        /// </summary>
-        [Test]
-        public void CollectTest()
-        {
-            // TODO unit test for the property 'Collect'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StripeConnectedAccountInfoTests.cs b/src/Flipdish.Test/Model/StripeConnectedAccountInfoTests.cs
deleted file mode 100644
index 1e303e54..00000000
--- a/src/Flipdish.Test/Model/StripeConnectedAccountInfoTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StripeConnectedAccountInfo
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StripeConnectedAccountInfoTests
-    {
-        // TODO uncomment below to declare an instance variable for StripeConnectedAccountInfo
-        //private StripeConnectedAccountInfo instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StripeConnectedAccountInfo
-            //instance = new StripeConnectedAccountInfo();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StripeConnectedAccountInfo
-        /// </summary>
-        [Test]
-        public void StripeConnectedAccountInfoInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StripeConnectedAccountInfo
-            //Assert.IsInstanceOfType<StripeConnectedAccountInfo> (instance, "variable 'instance' is a StripeConnectedAccountInfo");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AccountStatus'
-        /// </summary>
-        [Test]
-        public void AccountStatusTest()
-        {
-            // TODO unit test for the property 'AccountStatus'
-        }
-        /// <summary>
-        /// Test the property 'StripeId'
-        /// </summary>
-        [Test]
-        public void StripeIdTest()
-        {
-            // TODO unit test for the property 'StripeId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StripeConnectedAccountTests.cs b/src/Flipdish.Test/Model/StripeConnectedAccountTests.cs
deleted file mode 100644
index 84e89066..00000000
--- a/src/Flipdish.Test/Model/StripeConnectedAccountTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StripeConnectedAccount
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StripeConnectedAccountTests
-    {
-        // TODO uncomment below to declare an instance variable for StripeConnectedAccount
-        //private StripeConnectedAccount instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StripeConnectedAccount
-            //instance = new StripeConnectedAccount();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StripeConnectedAccount
-        /// </summary>
-        [Test]
-        public void StripeConnectedAccountInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StripeConnectedAccount
-            //Assert.IsInstanceOfType<StripeConnectedAccount> (instance, "variable 'instance' is a StripeConnectedAccount");
-        }
-
-
-        /// <summary>
-        /// Test the property 'FlipdishConnectedAccountId'
-        /// </summary>
-        [Test]
-        public void FlipdishConnectedAccountIdTest()
-        {
-            // TODO unit test for the property 'FlipdishConnectedAccountId'
-        }
-        /// <summary>
-        /// Test the property 'StripeId'
-        /// </summary>
-        [Test]
-        public void StripeIdTest()
-        {
-            // TODO unit test for the property 'StripeId'
-        }
-        /// <summary>
-        /// Test the property 'WhitelabelConfigId'
-        /// </summary>
-        [Test]
-        public void WhitelabelConfigIdTest()
-        {
-            // TODO unit test for the property 'WhitelabelConfigId'
-        }
-        /// <summary>
-        /// Test the property 'CardPaymentsStatus'
-        /// </summary>
-        [Test]
-        public void CardPaymentsStatusTest()
-        {
-            // TODO unit test for the property 'CardPaymentsStatus'
-        }
-        /// <summary>
-        /// Test the property 'TransfersStatus'
-        /// </summary>
-        [Test]
-        public void TransfersStatusTest()
-        {
-            // TODO unit test for the property 'TransfersStatus'
-        }
-        /// <summary>
-        /// Test the property 'AccountStatus'
-        /// </summary>
-        [Test]
-        public void AccountStatusTest()
-        {
-            // TODO unit test for the property 'AccountStatus'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StripeTerminalConnectionTokenTests.cs b/src/Flipdish.Test/Model/StripeTerminalConnectionTokenTests.cs
deleted file mode 100644
index 9beca4a9..00000000
--- a/src/Flipdish.Test/Model/StripeTerminalConnectionTokenTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StripeTerminalConnectionToken
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StripeTerminalConnectionTokenTests
-    {
-        // TODO uncomment below to declare an instance variable for StripeTerminalConnectionToken
-        //private StripeTerminalConnectionToken instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StripeTerminalConnectionToken
-            //instance = new StripeTerminalConnectionToken();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StripeTerminalConnectionToken
-        /// </summary>
-        [Test]
-        public void StripeTerminalConnectionTokenInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StripeTerminalConnectionToken
-            //Assert.IsInstanceOfType<StripeTerminalConnectionToken> (instance, "variable 'instance' is a StripeTerminalConnectionToken");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Token'
-        /// </summary>
-        [Test]
-        public void TokenTest()
-        {
-            // TODO unit test for the property 'Token'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StripeTerminalLocationTests.cs b/src/Flipdish.Test/Model/StripeTerminalLocationTests.cs
deleted file mode 100644
index 2802f80b..00000000
--- a/src/Flipdish.Test/Model/StripeTerminalLocationTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StripeTerminalLocation
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StripeTerminalLocationTests
-    {
-        // TODO uncomment below to declare an instance variable for StripeTerminalLocation
-        //private StripeTerminalLocation instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StripeTerminalLocation
-            //instance = new StripeTerminalLocation();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StripeTerminalLocation
-        /// </summary>
-        [Test]
-        public void StripeTerminalLocationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StripeTerminalLocation
-            //Assert.IsInstanceOfType<StripeTerminalLocation> (instance, "variable 'instance' is a StripeTerminalLocation");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Location'
-        /// </summary>
-        [Test]
-        public void LocationTest()
-        {
-            // TODO unit test for the property 'Location'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StripeTerminalPrivateKeyTests.cs b/src/Flipdish.Test/Model/StripeTerminalPrivateKeyTests.cs
deleted file mode 100644
index aea2c67a..00000000
--- a/src/Flipdish.Test/Model/StripeTerminalPrivateKeyTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StripeTerminalPrivateKey
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StripeTerminalPrivateKeyTests
-    {
-        // TODO uncomment below to declare an instance variable for StripeTerminalPrivateKey
-        //private StripeTerminalPrivateKey instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StripeTerminalPrivateKey
-            //instance = new StripeTerminalPrivateKey();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StripeTerminalPrivateKey
-        /// </summary>
-        [Test]
-        public void StripeTerminalPrivateKeyInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StripeTerminalPrivateKey
-            //Assert.IsInstanceOfType<StripeTerminalPrivateKey> (instance, "variable 'instance' is a StripeTerminalPrivateKey");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Location'
-        /// </summary>
-        [Test]
-        public void LocationTest()
-        {
-            // TODO unit test for the property 'Location'
-        }
-        /// <summary>
-        /// Test the property 'Secret'
-        /// </summary>
-        [Test]
-        public void SecretTest()
-        {
-            // TODO unit test for the property 'Secret'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StuartSettingsTests.cs b/src/Flipdish.Test/Model/StuartSettingsTests.cs
deleted file mode 100644
index 3712240e..00000000
--- a/src/Flipdish.Test/Model/StuartSettingsTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StuartSettings
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StuartSettingsTests
-    {
-        // TODO uncomment below to declare an instance variable for StuartSettings
-        //private StuartSettings instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StuartSettings
-            //instance = new StuartSettings();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StuartSettings
-        /// </summary>
-        [Test]
-        public void StuartSettingsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StuartSettings
-            //Assert.IsInstanceOfType<StuartSettings> (instance, "variable 'instance' is a StuartSettings");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ClientId'
-        /// </summary>
-        [Test]
-        public void ClientIdTest()
-        {
-            // TODO unit test for the property 'ClientId'
-        }
-        /// <summary>
-        /// Test the property 'ClientSecret'
-        /// </summary>
-        [Test]
-        public void ClientSecretTest()
-        {
-            // TODO unit test for the property 'ClientSecret'
-        }
-        /// <summary>
-        /// Test the property 'Enabled'
-        /// </summary>
-        [Test]
-        public void EnabledTest()
-        {
-            // TODO unit test for the property 'Enabled'
-        }
-        /// <summary>
-        /// Test the property 'WebhookUrlBasicAuthentication'
-        /// </summary>
-        [Test]
-        public void WebhookUrlBasicAuthenticationTest()
-        {
-            // TODO unit test for the property 'WebhookUrlBasicAuthentication'
-        }
-        /// <summary>
-        /// Test the property 'MinutesToPickupBeforeThanDeliveryTime'
-        /// </summary>
-        [Test]
-        public void MinutesToPickupBeforeThanDeliveryTimeTest()
-        {
-            // TODO unit test for the property 'MinutesToPickupBeforeThanDeliveryTime'
-        }
-        /// <summary>
-        /// Test the property 'PackageType'
-        /// </summary>
-        [Test]
-        public void PackageTypeTest()
-        {
-            // TODO unit test for the property 'PackageType'
-        }
-        /// <summary>
-        /// Test the property 'TransportType'
-        /// </summary>
-        [Test]
-        public void TransportTypeTest()
-        {
-            // TODO unit test for the property 'TransportType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/StuartSettingsTransportPricesTests.cs b/src/Flipdish.Test/Model/StuartSettingsTransportPricesTests.cs
deleted file mode 100644
index ec0706a7..00000000
--- a/src/Flipdish.Test/Model/StuartSettingsTransportPricesTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing StuartSettingsTransportPrices
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class StuartSettingsTransportPricesTests
-    {
-        // TODO uncomment below to declare an instance variable for StuartSettingsTransportPrices
-        //private StuartSettingsTransportPrices instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of StuartSettingsTransportPrices
-            //instance = new StuartSettingsTransportPrices();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of StuartSettingsTransportPrices
-        /// </summary>
-        [Test]
-        public void StuartSettingsTransportPricesInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" StuartSettingsTransportPrices
-            //Assert.IsInstanceOfType<StuartSettingsTransportPrices> (instance, "variable 'instance' is a StuartSettingsTransportPrices");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Bike'
-        /// </summary>
-        [Test]
-        public void BikeTest()
-        {
-            // TODO unit test for the property 'Bike'
-        }
-        /// <summary>
-        /// Test the property 'Cargobike'
-        /// </summary>
-        [Test]
-        public void CargobikeTest()
-        {
-            // TODO unit test for the property 'Cargobike'
-        }
-        /// <summary>
-        /// Test the property 'Cargobikexl'
-        /// </summary>
-        [Test]
-        public void CargobikexlTest()
-        {
-            // TODO unit test for the property 'Cargobikexl'
-        }
-        /// <summary>
-        /// Test the property 'Motorbike'
-        /// </summary>
-        [Test]
-        public void MotorbikeTest()
-        {
-            // TODO unit test for the property 'Motorbike'
-        }
-        /// <summary>
-        /// Test the property 'Motorbikexl'
-        /// </summary>
-        [Test]
-        public void MotorbikexlTest()
-        {
-            // TODO unit test for the property 'Motorbikexl'
-        }
-        /// <summary>
-        /// Test the property 'Car'
-        /// </summary>
-        [Test]
-        public void CarTest()
-        {
-            // TODO unit test for the property 'Car'
-        }
-        /// <summary>
-        /// Test the property 'Van'
-        /// </summary>
-        [Test]
-        public void VanTest()
-        {
-            // TODO unit test for the property 'Van'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SubscriptionBaseTests.cs b/src/Flipdish.Test/Model/SubscriptionBaseTests.cs
deleted file mode 100644
index b12e8e90..00000000
--- a/src/Flipdish.Test/Model/SubscriptionBaseTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SubscriptionBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SubscriptionBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for SubscriptionBase
-        //private SubscriptionBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SubscriptionBase
-            //instance = new SubscriptionBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SubscriptionBase
-        /// </summary>
-        [Test]
-        public void SubscriptionBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SubscriptionBase
-            //Assert.IsInstanceOfType<SubscriptionBase> (instance, "variable 'instance' is a SubscriptionBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Quantity'
-        /// </summary>
-        [Test]
-        public void QuantityTest()
-        {
-            // TODO unit test for the property 'Quantity'
-        }
-        /// <summary>
-        /// Test the property 'SubscriptionPlanId'
-        /// </summary>
-        [Test]
-        public void SubscriptionPlanIdTest()
-        {
-            // TODO unit test for the property 'SubscriptionPlanId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SubscriptionPlanTests.cs b/src/Flipdish.Test/Model/SubscriptionPlanTests.cs
deleted file mode 100644
index f5654eef..00000000
--- a/src/Flipdish.Test/Model/SubscriptionPlanTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SubscriptionPlan
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SubscriptionPlanTests
-    {
-        // TODO uncomment below to declare an instance variable for SubscriptionPlan
-        //private SubscriptionPlan instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SubscriptionPlan
-            //instance = new SubscriptionPlan();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SubscriptionPlan
-        /// </summary>
-        [Test]
-        public void SubscriptionPlanInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SubscriptionPlan
-            //Assert.IsInstanceOfType<SubscriptionPlan> (instance, "variable 'instance' is a SubscriptionPlan");
-        }
-
-
-        /// <summary>
-        /// Test the property 'SubscriptionPlanId'
-        /// </summary>
-        [Test]
-        public void SubscriptionPlanIdTest()
-        {
-            // TODO unit test for the property 'SubscriptionPlanId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'Interval'
-        /// </summary>
-        [Test]
-        public void IntervalTest()
-        {
-            // TODO unit test for the property 'Interval'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SubscriptionPlansResponseTests.cs b/src/Flipdish.Test/Model/SubscriptionPlansResponseTests.cs
deleted file mode 100644
index 67eb5198..00000000
--- a/src/Flipdish.Test/Model/SubscriptionPlansResponseTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SubscriptionPlansResponse
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SubscriptionPlansResponseTests
-    {
-        // TODO uncomment below to declare an instance variable for SubscriptionPlansResponse
-        //private SubscriptionPlansResponse instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SubscriptionPlansResponse
-            //instance = new SubscriptionPlansResponse();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SubscriptionPlansResponse
-        /// </summary>
-        [Test]
-        public void SubscriptionPlansResponseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SubscriptionPlansResponse
-            //Assert.IsInstanceOfType<SubscriptionPlansResponse> (instance, "variable 'instance' is a SubscriptionPlansResponse");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PublishableApiKey'
-        /// </summary>
-        [Test]
-        public void PublishableApiKeyTest()
-        {
-            // TODO unit test for the property 'PublishableApiKey'
-        }
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'SubscriptionPlans'
-        /// </summary>
-        [Test]
-        public void SubscriptionPlansTest()
-        {
-            // TODO unit test for the property 'SubscriptionPlans'
-        }
-        /// <summary>
-        /// Test the property 'AppIds'
-        /// </summary>
-        [Test]
-        public void AppIdsTest()
-        {
-            // TODO unit test for the property 'AppIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SubscriptionTests.cs b/src/Flipdish.Test/Model/SubscriptionTests.cs
deleted file mode 100644
index f4a2ce8a..00000000
--- a/src/Flipdish.Test/Model/SubscriptionTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Subscription
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SubscriptionTests
-    {
-        // TODO uncomment below to declare an instance variable for Subscription
-        //private Subscription instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Subscription
-            //instance = new Subscription();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Subscription
-        /// </summary>
-        [Test]
-        public void SubscriptionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Subscription
-            //Assert.IsInstanceOfType<Subscription> (instance, "variable 'instance' is a Subscription");
-        }
-
-
-        /// <summary>
-        /// Test the property 'SubscriptionId'
-        /// </summary>
-        [Test]
-        public void SubscriptionIdTest()
-        {
-            // TODO unit test for the property 'SubscriptionId'
-        }
-        /// <summary>
-        /// Test the property 'StartDate'
-        /// </summary>
-        [Test]
-        public void StartDateTest()
-        {
-            // TODO unit test for the property 'StartDate'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'UserId'
-        /// </summary>
-        [Test]
-        public void UserIdTest()
-        {
-            // TODO unit test for the property 'UserId'
-        }
-        /// <summary>
-        /// Test the property 'SubscriptionPlan'
-        /// </summary>
-        [Test]
-        public void SubscriptionPlanTest()
-        {
-            // TODO unit test for the property 'SubscriptionPlan'
-        }
-        /// <summary>
-        /// Test the property 'Card'
-        /// </summary>
-        [Test]
-        public void CardTest()
-        {
-            // TODO unit test for the property 'Card'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'VatNumber'
-        /// </summary>
-        [Test]
-        public void VatNumberTest()
-        {
-            // TODO unit test for the property 'VatNumber'
-        }
-        /// <summary>
-        /// Test the property 'VatCountryCode'
-        /// </summary>
-        [Test]
-        public void VatCountryCodeTest()
-        {
-            // TODO unit test for the property 'VatCountryCode'
-        }
-        /// <summary>
-        /// Test the property 'Quantity'
-        /// </summary>
-        [Test]
-        public void QuantityTest()
-        {
-            // TODO unit test for the property 'Quantity'
-        }
-        /// <summary>
-        /// Test the property 'SubscriptionPlanId'
-        /// </summary>
-        [Test]
-        public void SubscriptionPlanIdTest()
-        {
-            // TODO unit test for the property 'SubscriptionPlanId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SubscriptionWithTokenTests.cs b/src/Flipdish.Test/Model/SubscriptionWithTokenTests.cs
deleted file mode 100644
index 91b184cd..00000000
--- a/src/Flipdish.Test/Model/SubscriptionWithTokenTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SubscriptionWithToken
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SubscriptionWithTokenTests
-    {
-        // TODO uncomment below to declare an instance variable for SubscriptionWithToken
-        //private SubscriptionWithToken instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SubscriptionWithToken
-            //instance = new SubscriptionWithToken();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SubscriptionWithToken
-        /// </summary>
-        [Test]
-        public void SubscriptionWithTokenInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SubscriptionWithToken
-            //Assert.IsInstanceOfType<SubscriptionWithToken> (instance, "variable 'instance' is a SubscriptionWithToken");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Token'
-        /// </summary>
-        [Test]
-        public void TokenTest()
-        {
-            // TODO unit test for the property 'Token'
-        }
-        /// <summary>
-        /// Test the property 'Quantity'
-        /// </summary>
-        [Test]
-        public void QuantityTest()
-        {
-            // TODO unit test for the property 'Quantity'
-        }
-        /// <summary>
-        /// Test the property 'SubscriptionPlanId'
-        /// </summary>
-        [Test]
-        public void SubscriptionPlanIdTest()
-        {
-            // TODO unit test for the property 'SubscriptionPlanId'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'VatNumber'
-        /// </summary>
-        [Test]
-        public void VatNumberTest()
-        {
-            // TODO unit test for the property 'VatNumber'
-        }
-        /// <summary>
-        /// Test the property 'VatCountryCode'
-        /// </summary>
-        [Test]
-        public void VatCountryCodeTest()
-        {
-            // TODO unit test for the property 'VatCountryCode'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/SupportedCountryTests.cs b/src/Flipdish.Test/Model/SupportedCountryTests.cs
deleted file mode 100644
index 1f459770..00000000
--- a/src/Flipdish.Test/Model/SupportedCountryTests.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing SupportedCountry
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class SupportedCountryTests
-    {
-        // TODO uncomment below to declare an instance variable for SupportedCountry
-        //private SupportedCountry instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of SupportedCountry
-            //instance = new SupportedCountry();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of SupportedCountry
-        /// </summary>
-        [Test]
-        public void SupportedCountryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" SupportedCountry
-            //Assert.IsInstanceOfType<SupportedCountry> (instance, "variable 'instance' is a SupportedCountry");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CountryCode'
-        /// </summary>
-        [Test]
-        public void CountryCodeTest()
-        {
-            // TODO unit test for the property 'CountryCode'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'PhoneCode'
-        /// </summary>
-        [Test]
-        public void PhoneCodeTest()
-        {
-            // TODO unit test for the property 'PhoneCode'
-        }
-        /// <summary>
-        /// Test the property 'LanguageCode'
-        /// </summary>
-        [Test]
-        public void LanguageCodeTest()
-        {
-            // TODO unit test for the property 'LanguageCode'
-        }
-        /// <summary>
-        /// Test the property 'LanguageName'
-        /// </summary>
-        [Test]
-        public void LanguageNameTest()
-        {
-            // TODO unit test for the property 'LanguageName'
-        }
-        /// <summary>
-        /// Test the property 'OtpNumber'
-        /// </summary>
-        [Test]
-        public void OtpNumberTest()
-        {
-            // TODO unit test for the property 'OtpNumber'
-        }
-        /// <summary>
-        /// Test the property 'SupportNumber'
-        /// </summary>
-        [Test]
-        public void SupportNumberTest()
-        {
-            // TODO unit test for the property 'SupportNumber'
-        }
-        /// <summary>
-        /// Test the property 'AddressLayout'
-        /// </summary>
-        [Test]
-        public void AddressLayoutTest()
-        {
-            // TODO unit test for the property 'AddressLayout'
-        }
-        /// <summary>
-        /// Test the property 'PostCodeType'
-        /// </summary>
-        [Test]
-        public void PostCodeTypeTest()
-        {
-            // TODO unit test for the property 'PostCodeType'
-        }
-        /// <summary>
-        /// Test the property 'SupportRegion'
-        /// </summary>
-        [Test]
-        public void SupportRegionTest()
-        {
-            // TODO unit test for the property 'SupportRegion'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TeammateBaseTests.cs b/src/Flipdish.Test/Model/TeammateBaseTests.cs
deleted file mode 100644
index d18d8d92..00000000
--- a/src/Flipdish.Test/Model/TeammateBaseTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TeammateBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TeammateBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for TeammateBase
-        //private TeammateBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TeammateBase
-            //instance = new TeammateBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TeammateBase
-        /// </summary>
-        [Test]
-        public void TeammateBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TeammateBase
-            //Assert.IsInstanceOfType<TeammateBase> (instance, "variable 'instance' is a TeammateBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppAccessLevel'
-        /// </summary>
-        [Test]
-        public void AppAccessLevelTest()
-        {
-            // TODO unit test for the property 'AppAccessLevel'
-        }
-        /// <summary>
-        /// Test the property 'HasAccessToAllStores'
-        /// </summary>
-        [Test]
-        public void HasAccessToAllStoresTest()
-        {
-            // TODO unit test for the property 'HasAccessToAllStores'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TeammateDeletedEventTests.cs b/src/Flipdish.Test/Model/TeammateDeletedEventTests.cs
deleted file mode 100644
index f857971e..00000000
--- a/src/Flipdish.Test/Model/TeammateDeletedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TeammateDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TeammateDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for TeammateDeletedEvent
-        //private TeammateDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TeammateDeletedEvent
-            //instance = new TeammateDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TeammateDeletedEvent
-        /// </summary>
-        [Test]
-        public void TeammateDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TeammateDeletedEvent
-            //Assert.IsInstanceOfType<TeammateDeletedEvent> (instance, "variable 'instance' is a TeammateDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Teammate'
-        /// </summary>
-        [Test]
-        public void TeammateTest()
-        {
-            // TODO unit test for the property 'Teammate'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TeammateInviteAcceptedEventTests.cs b/src/Flipdish.Test/Model/TeammateInviteAcceptedEventTests.cs
deleted file mode 100644
index 3f13bee5..00000000
--- a/src/Flipdish.Test/Model/TeammateInviteAcceptedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TeammateInviteAcceptedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TeammateInviteAcceptedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for TeammateInviteAcceptedEvent
-        //private TeammateInviteAcceptedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TeammateInviteAcceptedEvent
-            //instance = new TeammateInviteAcceptedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TeammateInviteAcceptedEvent
-        /// </summary>
-        [Test]
-        public void TeammateInviteAcceptedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TeammateInviteAcceptedEvent
-            //Assert.IsInstanceOfType<TeammateInviteAcceptedEvent> (instance, "variable 'instance' is a TeammateInviteAcceptedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Teammate'
-        /// </summary>
-        [Test]
-        public void TeammateTest()
-        {
-            // TODO unit test for the property 'Teammate'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TeammateInviteSentEventTests.cs b/src/Flipdish.Test/Model/TeammateInviteSentEventTests.cs
deleted file mode 100644
index 37cfff29..00000000
--- a/src/Flipdish.Test/Model/TeammateInviteSentEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TeammateInviteSentEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TeammateInviteSentEventTests
-    {
-        // TODO uncomment below to declare an instance variable for TeammateInviteSentEvent
-        //private TeammateInviteSentEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TeammateInviteSentEvent
-            //instance = new TeammateInviteSentEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TeammateInviteSentEvent
-        /// </summary>
-        [Test]
-        public void TeammateInviteSentEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TeammateInviteSentEvent
-            //Assert.IsInstanceOfType<TeammateInviteSentEvent> (instance, "variable 'instance' is a TeammateInviteSentEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Teammate'
-        /// </summary>
-        [Test]
-        public void TeammateTest()
-        {
-            // TODO unit test for the property 'Teammate'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TeammateTests.cs b/src/Flipdish.Test/Model/TeammateTests.cs
deleted file mode 100644
index 65c07d65..00000000
--- a/src/Flipdish.Test/Model/TeammateTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Teammate
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TeammateTests
-    {
-        // TODO uncomment below to declare an instance variable for Teammate
-        //private Teammate instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Teammate
-            //instance = new Teammate();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Teammate
-        /// </summary>
-        [Test]
-        public void TeammateInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Teammate
-            //Assert.IsInstanceOfType<Teammate> (instance, "variable 'instance' is a Teammate");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TeammateId'
-        /// </summary>
-        [Test]
-        public void TeammateIdTest()
-        {
-            // TODO unit test for the property 'TeammateId'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'LastActivity'
-        /// </summary>
-        [Test]
-        public void LastActivityTest()
-        {
-            // TODO unit test for the property 'LastActivity'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-        /// <summary>
-        /// Test the property 'InvitationStatus'
-        /// </summary>
-        [Test]
-        public void InvitationStatusTest()
-        {
-            // TODO unit test for the property 'InvitationStatus'
-        }
-        /// <summary>
-        /// Test the property 'Email'
-        /// </summary>
-        [Test]
-        public void EmailTest()
-        {
-            // TODO unit test for the property 'Email'
-        }
-        /// <summary>
-        /// Test the property 'AppAccessLevel'
-        /// </summary>
-        [Test]
-        public void AppAccessLevelTest()
-        {
-            // TODO unit test for the property 'AppAccessLevel'
-        }
-        /// <summary>
-        /// Test the property 'HasAccessToAllStores'
-        /// </summary>
-        [Test]
-        public void HasAccessToAllStoresTest()
-        {
-            // TODO unit test for the property 'HasAccessToAllStores'
-        }
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TeammateUpdatedEventTests.cs b/src/Flipdish.Test/Model/TeammateUpdatedEventTests.cs
deleted file mode 100644
index c2f04540..00000000
--- a/src/Flipdish.Test/Model/TeammateUpdatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TeammateUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TeammateUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for TeammateUpdatedEvent
-        //private TeammateUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TeammateUpdatedEvent
-            //instance = new TeammateUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TeammateUpdatedEvent
-        /// </summary>
-        [Test]
-        public void TeammateUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TeammateUpdatedEvent
-            //Assert.IsInstanceOfType<TeammateUpdatedEvent> (instance, "variable 'instance' is a TeammateUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Teammate'
-        /// </summary>
-        [Test]
-        public void TeammateTest()
-        {
-            // TODO unit test for the property 'Teammate'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TelemetrySeriesPropertyTests.cs b/src/Flipdish.Test/Model/TelemetrySeriesPropertyTests.cs
deleted file mode 100644
index eac142f8..00000000
--- a/src/Flipdish.Test/Model/TelemetrySeriesPropertyTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TelemetrySeriesProperty
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TelemetrySeriesPropertyTests
-    {
-        // TODO uncomment below to declare an instance variable for TelemetrySeriesProperty
-        //private TelemetrySeriesProperty instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TelemetrySeriesProperty
-            //instance = new TelemetrySeriesProperty();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TelemetrySeriesProperty
-        /// </summary>
-        [Test]
-        public void TelemetrySeriesPropertyInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TelemetrySeriesProperty
-            //Assert.IsInstanceOfType<TelemetrySeriesProperty> (instance, "variable 'instance' is a TelemetrySeriesProperty");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'IntValues'
-        /// </summary>
-        [Test]
-        public void IntValuesTest()
-        {
-            // TODO unit test for the property 'IntValues'
-        }
-        /// <summary>
-        /// Test the property 'StringValues'
-        /// </summary>
-        [Test]
-        public void StringValuesTest()
-        {
-            // TODO unit test for the property 'StringValues'
-        }
-        /// <summary>
-        /// Test the property 'DoubleValues'
-        /// </summary>
-        [Test]
-        public void DoubleValuesTest()
-        {
-            // TODO unit test for the property 'DoubleValues'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TelemetrySeriesQueryParametersTests.cs b/src/Flipdish.Test/Model/TelemetrySeriesQueryParametersTests.cs
deleted file mode 100644
index b184f767..00000000
--- a/src/Flipdish.Test/Model/TelemetrySeriesQueryParametersTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TelemetrySeriesQueryParameters
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TelemetrySeriesQueryParametersTests
-    {
-        // TODO uncomment below to declare an instance variable for TelemetrySeriesQueryParameters
-        //private TelemetrySeriesQueryParameters instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TelemetrySeriesQueryParameters
-            //instance = new TelemetrySeriesQueryParameters();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TelemetrySeriesQueryParameters
-        /// </summary>
-        [Test]
-        public void TelemetrySeriesQueryParametersInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TelemetrySeriesQueryParameters
-            //Assert.IsInstanceOfType<TelemetrySeriesQueryParameters> (instance, "variable 'instance' is a TelemetrySeriesQueryParameters");
-        }
-
-
-        /// <summary>
-        /// Test the property 'KioskId'
-        /// </summary>
-        [Test]
-        public void KioskIdTest()
-        {
-            // TODO unit test for the property 'KioskId'
-        }
-        /// <summary>
-        /// Test the property 'Variables'
-        /// </summary>
-        [Test]
-        public void VariablesTest()
-        {
-            // TODO unit test for the property 'Variables'
-        }
-        /// <summary>
-        /// Test the property 'StartDate'
-        /// </summary>
-        [Test]
-        public void StartDateTest()
-        {
-            // TODO unit test for the property 'StartDate'
-        }
-        /// <summary>
-        /// Test the property 'EndDate'
-        /// </summary>
-        [Test]
-        public void EndDateTest()
-        {
-            // TODO unit test for the property 'EndDate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TelemetrySeriesResultTests.cs b/src/Flipdish.Test/Model/TelemetrySeriesResultTests.cs
deleted file mode 100644
index 9660908e..00000000
--- a/src/Flipdish.Test/Model/TelemetrySeriesResultTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TelemetrySeriesResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TelemetrySeriesResultTests
-    {
-        // TODO uncomment below to declare an instance variable for TelemetrySeriesResult
-        //private TelemetrySeriesResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TelemetrySeriesResult
-            //instance = new TelemetrySeriesResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TelemetrySeriesResult
-        /// </summary>
-        [Test]
-        public void TelemetrySeriesResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TelemetrySeriesResult
-            //Assert.IsInstanceOfType<TelemetrySeriesResult> (instance, "variable 'instance' is a TelemetrySeriesResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Timestamps'
-        /// </summary>
-        [Test]
-        public void TimestampsTest()
-        {
-            // TODO unit test for the property 'Timestamps'
-        }
-        /// <summary>
-        /// Test the property 'Properties'
-        /// </summary>
-        [Test]
-        public void PropertiesTest()
-        {
-            // TODO unit test for the property 'Properties'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/TipConfigurationTests.cs b/src/Flipdish.Test/Model/TipConfigurationTests.cs
deleted file mode 100644
index 6a5e0b52..00000000
--- a/src/Flipdish.Test/Model/TipConfigurationTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing TipConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class TipConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for TipConfiguration
-        //private TipConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of TipConfiguration
-            //instance = new TipConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of TipConfiguration
-        /// </summary>
-        [Test]
-        public void TipConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" TipConfiguration
-            //Assert.IsInstanceOfType<TipConfiguration> (instance, "variable 'instance' is a TipConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreId'
-        /// </summary>
-        [Test]
-        public void StoreIdTest()
-        {
-            // TODO unit test for the property 'StoreId'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'AllowCustomTips'
-        /// </summary>
-        [Test]
-        public void AllowCustomTipsTest()
-        {
-            // TODO unit test for the property 'AllowCustomTips'
-        }
-        /// <summary>
-        /// Test the property 'Percentages'
-        /// </summary>
-        [Test]
-        public void PercentagesTest()
-        {
-            // TODO unit test for the property 'Percentages'
-        }
-        /// <summary>
-        /// Test the property 'DefaultPercentage'
-        /// </summary>
-        [Test]
-        public void DefaultPercentageTest()
-        {
-            // TODO unit test for the property 'DefaultPercentage'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UnRegisterCardReaderRequestTests.cs b/src/Flipdish.Test/Model/UnRegisterCardReaderRequestTests.cs
deleted file mode 100644
index a7354417..00000000
--- a/src/Flipdish.Test/Model/UnRegisterCardReaderRequestTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UnRegisterCardReaderRequest
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UnRegisterCardReaderRequestTests
-    {
-        // TODO uncomment below to declare an instance variable for UnRegisterCardReaderRequest
-        //private UnRegisterCardReaderRequest instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UnRegisterCardReaderRequest
-            //instance = new UnRegisterCardReaderRequest();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UnRegisterCardReaderRequest
-        /// </summary>
-        [Test]
-        public void UnRegisterCardReaderRequestInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UnRegisterCardReaderRequest
-            //Assert.IsInstanceOfType<UnRegisterCardReaderRequest> (instance, "variable 'instance' is a UnRegisterCardReaderRequest");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ReaderId'
-        /// </summary>
-        [Test]
-        public void ReaderIdTest()
-        {
-            // TODO unit test for the property 'ReaderId'
-        }
-        /// <summary>
-        /// Test the property 'KioskDeviceId'
-        /// </summary>
-        [Test]
-        public void KioskDeviceIdTest()
-        {
-            // TODO unit test for the property 'KioskDeviceId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateAppConfigurationTests.cs b/src/Flipdish.Test/Model/UpdateAppConfigurationTests.cs
deleted file mode 100644
index 056165b8..00000000
--- a/src/Flipdish.Test/Model/UpdateAppConfigurationTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateAppConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateAppConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateAppConfiguration
-        //private UpdateAppConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateAppConfiguration
-            //instance = new UpdateAppConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateAppConfiguration
-        /// </summary>
-        [Test]
-        public void UpdateAppConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateAppConfiguration
-            //Assert.IsInstanceOfType<UpdateAppConfiguration> (instance, "variable 'instance' is a UpdateAppConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'Settings'
-        /// </summary>
-        [Test]
-        public void SettingsTest()
-        {
-            // TODO unit test for the property 'Settings'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateAppStoreAppConfigurationTests.cs b/src/Flipdish.Test/Model/UpdateAppStoreAppConfigurationTests.cs
deleted file mode 100644
index 0d481b57..00000000
--- a/src/Flipdish.Test/Model/UpdateAppStoreAppConfigurationTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateAppStoreAppConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateAppStoreAppConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateAppStoreAppConfiguration
-        //private UpdateAppStoreAppConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateAppStoreAppConfiguration
-            //instance = new UpdateAppStoreAppConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateAppStoreAppConfiguration
-        /// </summary>
-        [Test]
-        public void UpdateAppStoreAppConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateAppStoreAppConfiguration
-            //Assert.IsInstanceOfType<UpdateAppStoreAppConfiguration> (instance, "variable 'instance' is a UpdateAppStoreAppConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-        /// <summary>
-        /// Test the property 'Settings'
-        /// </summary>
-        [Test]
-        public void SettingsTest()
-        {
-            // TODO unit test for the property 'Settings'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateAppStoreAppConfigurationWebhookDTOTests.cs b/src/Flipdish.Test/Model/UpdateAppStoreAppConfigurationWebhookDTOTests.cs
deleted file mode 100644
index 5fcd0d5c..00000000
--- a/src/Flipdish.Test/Model/UpdateAppStoreAppConfigurationWebhookDTOTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateAppStoreAppConfigurationWebhookDTO
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateAppStoreAppConfigurationWebhookDTOTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateAppStoreAppConfigurationWebhookDTO
-        //private UpdateAppStoreAppConfigurationWebhookDTO instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateAppStoreAppConfigurationWebhookDTO
-            //instance = new UpdateAppStoreAppConfigurationWebhookDTO();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateAppStoreAppConfigurationWebhookDTO
-        /// </summary>
-        [Test]
-        public void UpdateAppStoreAppConfigurationWebhookDTOInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateAppStoreAppConfigurationWebhookDTO
-            //Assert.IsInstanceOfType<UpdateAppStoreAppConfigurationWebhookDTO> (instance, "variable 'instance' is a UpdateAppStoreAppConfigurationWebhookDTO");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'PhysicalRestaurants'
-        /// </summary>
-        [Test]
-        public void PhysicalRestaurantsTest()
-        {
-            // TODO unit test for the property 'PhysicalRestaurants'
-        }
-        /// <summary>
-        /// Test the property 'Settings'
-        /// </summary>
-        [Test]
-        public void SettingsTest()
-        {
-            // TODO unit test for the property 'Settings'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateAppStoreAppTests.cs b/src/Flipdish.Test/Model/UpdateAppStoreAppTests.cs
deleted file mode 100644
index 4c0c6f2e..00000000
--- a/src/Flipdish.Test/Model/UpdateAppStoreAppTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateAppStoreApp
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateAppStoreAppTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateAppStoreApp
-        //private UpdateAppStoreApp instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateAppStoreApp
-            //instance = new UpdateAppStoreApp();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateAppStoreApp
-        /// </summary>
-        [Test]
-        public void UpdateAppStoreAppInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateAppStoreApp
-            //Assert.IsInstanceOfType<UpdateAppStoreApp> (instance, "variable 'instance' is a UpdateAppStoreApp");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ConfigurationType'
-        /// </summary>
-        [Test]
-        public void ConfigurationTypeTest()
-        {
-            // TODO unit test for the property 'ConfigurationType'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'FieldGroups'
-        /// </summary>
-        [Test]
-        public void FieldGroupsTest()
-        {
-            // TODO unit test for the property 'FieldGroups'
-        }
-        /// <summary>
-        /// Test the property 'SetupInstructions'
-        /// </summary>
-        [Test]
-        public void SetupInstructionsTest()
-        {
-            // TODO unit test for the property 'SetupInstructions'
-        }
-        /// <summary>
-        /// Test the property 'ExternalSetupLink'
-        /// </summary>
-        [Test]
-        public void ExternalSetupLinkTest()
-        {
-            // TODO unit test for the property 'ExternalSetupLink'
-        }
-        /// <summary>
-        /// Test the property 'OAuthAppId'
-        /// </summary>
-        [Test]
-        public void OAuthAppIdTest()
-        {
-            // TODO unit test for the property 'OAuthAppId'
-        }
-        /// <summary>
-        /// Test the property 'TeammateAppAccessLevel'
-        /// </summary>
-        [Test]
-        public void TeammateAppAccessLevelTest()
-        {
-            // TODO unit test for the property 'TeammateAppAccessLevel'
-        }
-        /// <summary>
-        /// Test the property 'PermissionsType'
-        /// </summary>
-        [Test]
-        public void PermissionsTypeTest()
-        {
-            // TODO unit test for the property 'PermissionsType'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'Tags'
-        /// </summary>
-        [Test]
-        public void TagsTest()
-        {
-            // TODO unit test for the property 'Tags'
-        }
-        /// <summary>
-        /// Test the property 'Regions'
-        /// </summary>
-        [Test]
-        public void RegionsTest()
-        {
-            // TODO unit test for the property 'Regions'
-        }
-        /// <summary>
-        /// Test the property 'DeveloperName'
-        /// </summary>
-        [Test]
-        public void DeveloperNameTest()
-        {
-            // TODO unit test for the property 'DeveloperName'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateCatalogGroupReferenceTests.cs b/src/Flipdish.Test/Model/UpdateCatalogGroupReferenceTests.cs
deleted file mode 100644
index 620bd8e3..00000000
--- a/src/Flipdish.Test/Model/UpdateCatalogGroupReferenceTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateCatalogGroupReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateCatalogGroupReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateCatalogGroupReference
-        //private UpdateCatalogGroupReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateCatalogGroupReference
-            //instance = new UpdateCatalogGroupReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateCatalogGroupReference
-        /// </summary>
-        [Test]
-        public void UpdateCatalogGroupReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateCatalogGroupReference
-            //Assert.IsInstanceOfType<UpdateCatalogGroupReference> (instance, "variable 'instance' is a UpdateCatalogGroupReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogGroupId'
-        /// </summary>
-        [Test]
-        public void CatalogGroupIdTest()
-        {
-            // TODO unit test for the property 'CatalogGroupId'
-        }
-        /// <summary>
-        /// Test the property 'GroupType'
-        /// </summary>
-        [Test]
-        public void GroupTypeTest()
-        {
-            // TODO unit test for the property 'GroupType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateCatalogGroupTests.cs b/src/Flipdish.Test/Model/UpdateCatalogGroupTests.cs
deleted file mode 100644
index a903c519..00000000
--- a/src/Flipdish.Test/Model/UpdateCatalogGroupTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateCatalogGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateCatalogGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateCatalogGroup
-        //private UpdateCatalogGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateCatalogGroup
-            //instance = new UpdateCatalogGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateCatalogGroup
-        /// </summary>
-        [Test]
-        public void UpdateCatalogGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateCatalogGroup
-            //Assert.IsInstanceOfType<UpdateCatalogGroup> (instance, "variable 'instance' is a UpdateCatalogGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'MinSelectCount'
-        /// </summary>
-        [Test]
-        public void MinSelectCountTest()
-        {
-            // TODO unit test for the property 'MinSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelectCount'
-        /// </summary>
-        [Test]
-        public void MaxSelectCountTest()
-        {
-            // TODO unit test for the property 'MaxSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'Items'
-        /// </summary>
-        [Test]
-        public void ItemsTest()
-        {
-            // TODO unit test for the property 'Items'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateCatalogItemReferenceTests.cs b/src/Flipdish.Test/Model/UpdateCatalogItemReferenceTests.cs
deleted file mode 100644
index efc08f6f..00000000
--- a/src/Flipdish.Test/Model/UpdateCatalogItemReferenceTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateCatalogItemReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateCatalogItemReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateCatalogItemReference
-        //private UpdateCatalogItemReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateCatalogItemReference
-            //instance = new UpdateCatalogItemReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateCatalogItemReference
-        /// </summary>
-        [Test]
-        public void UpdateCatalogItemReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateCatalogItemReference
-            //Assert.IsInstanceOfType<UpdateCatalogItemReference> (instance, "variable 'instance' is a UpdateCatalogItemReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'ItemType'
-        /// </summary>
-        [Test]
-        public void ItemTypeTest()
-        {
-            // TODO unit test for the property 'ItemType'
-        }
-        /// <summary>
-        /// Test the property 'PreselectedQuantity'
-        /// </summary>
-        [Test]
-        public void PreselectedQuantityTest()
-        {
-            // TODO unit test for the property 'PreselectedQuantity'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateCatalogItemTests.cs b/src/Flipdish.Test/Model/UpdateCatalogItemTests.cs
deleted file mode 100644
index f13a9724..00000000
--- a/src/Flipdish.Test/Model/UpdateCatalogItemTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateCatalogItem
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateCatalogItemTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateCatalogItem
-        //private UpdateCatalogItem instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateCatalogItem
-            //instance = new UpdateCatalogItem();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateCatalogItem
-        /// </summary>
-        [Test]
-        public void UpdateCatalogItemInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateCatalogItem
-            //Assert.IsInstanceOfType<UpdateCatalogItem> (instance, "variable 'instance' is a UpdateCatalogItem");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-        /// <summary>
-        /// Test the property 'ImageFileName'
-        /// </summary>
-        [Test]
-        public void ImageFileNameTest()
-        {
-            // TODO unit test for the property 'ImageFileName'
-        }
-        /// <summary>
-        /// Test the property 'Alcohol'
-        /// </summary>
-        [Test]
-        public void AlcoholTest()
-        {
-            // TODO unit test for the property 'Alcohol'
-        }
-        /// <summary>
-        /// Test the property 'Groups'
-        /// </summary>
-        [Test]
-        public void GroupsTest()
-        {
-            // TODO unit test for the property 'Groups'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateDriverNotificationTokenTests.cs b/src/Flipdish.Test/Model/UpdateDriverNotificationTokenTests.cs
deleted file mode 100644
index 10bd8efa..00000000
--- a/src/Flipdish.Test/Model/UpdateDriverNotificationTokenTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateDriverNotificationToken
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateDriverNotificationTokenTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateDriverNotificationToken
-        //private UpdateDriverNotificationToken instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateDriverNotificationToken
-            //instance = new UpdateDriverNotificationToken();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateDriverNotificationToken
-        /// </summary>
-        [Test]
-        public void UpdateDriverNotificationTokenInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateDriverNotificationToken
-            //Assert.IsInstanceOfType<UpdateDriverNotificationToken> (instance, "variable 'instance' is a UpdateDriverNotificationToken");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PushNotificationsToken'
-        /// </summary>
-        [Test]
-        public void PushNotificationsTokenTest()
-        {
-            // TODO unit test for the property 'PushNotificationsToken'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateDriverProfileModelTests.cs b/src/Flipdish.Test/Model/UpdateDriverProfileModelTests.cs
deleted file mode 100644
index 0bcef60e..00000000
--- a/src/Flipdish.Test/Model/UpdateDriverProfileModelTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateDriverProfileModel
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateDriverProfileModelTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateDriverProfileModel
-        //private UpdateDriverProfileModel instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateDriverProfileModel
-            //instance = new UpdateDriverProfileModel();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateDriverProfileModel
-        /// </summary>
-        [Test]
-        public void UpdateDriverProfileModelInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateDriverProfileModel
-            //Assert.IsInstanceOfType<UpdateDriverProfileModel> (instance, "variable 'instance' is a UpdateDriverProfileModel");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateFulfillmentStatesConfigurationTests.cs b/src/Flipdish.Test/Model/UpdateFulfillmentStatesConfigurationTests.cs
deleted file mode 100644
index eed91645..00000000
--- a/src/Flipdish.Test/Model/UpdateFulfillmentStatesConfigurationTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateFulfillmentStatesConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateFulfillmentStatesConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateFulfillmentStatesConfiguration
-        //private UpdateFulfillmentStatesConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateFulfillmentStatesConfiguration
-            //instance = new UpdateFulfillmentStatesConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateFulfillmentStatesConfiguration
-        /// </summary>
-        [Test]
-        public void UpdateFulfillmentStatesConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateFulfillmentStatesConfiguration
-            //Assert.IsInstanceOfType<UpdateFulfillmentStatesConfiguration> (instance, "variable 'instance' is a UpdateFulfillmentStatesConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'StoreIds'
-        /// </summary>
-        [Test]
-        public void StoreIdsTest()
-        {
-            // TODO unit test for the property 'StoreIds'
-        }
-        /// <summary>
-        /// Test the property 'StoreSelectorType'
-        /// </summary>
-        [Test]
-        public void StoreSelectorTypeTest()
-        {
-            // TODO unit test for the property 'StoreSelectorType'
-        }
-        /// <summary>
-        /// Test the property 'States'
-        /// </summary>
-        [Test]
-        public void StatesTest()
-        {
-            // TODO unit test for the property 'States'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateGroupReferenceTests.cs b/src/Flipdish.Test/Model/UpdateGroupReferenceTests.cs
deleted file mode 100644
index 5157b257..00000000
--- a/src/Flipdish.Test/Model/UpdateGroupReferenceTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateGroupReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateGroupReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateGroupReference
-        //private UpdateGroupReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateGroupReference
-            //instance = new UpdateGroupReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateGroupReference
-        /// </summary>
-        [Test]
-        public void UpdateGroupReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateGroupReference
-            //Assert.IsInstanceOfType<UpdateGroupReference> (instance, "variable 'instance' is a UpdateGroupReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogGroupId'
-        /// </summary>
-        [Test]
-        public void CatalogGroupIdTest()
-        {
-            // TODO unit test for the property 'CatalogGroupId'
-        }
-        /// <summary>
-        /// Test the property 'GroupType'
-        /// </summary>
-        [Test]
-        public void GroupTypeTest()
-        {
-            // TODO unit test for the property 'GroupType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateGroupTests.cs b/src/Flipdish.Test/Model/UpdateGroupTests.cs
deleted file mode 100644
index 92ddc211..00000000
--- a/src/Flipdish.Test/Model/UpdateGroupTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateGroup
-        //private UpdateGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateGroup
-            //instance = new UpdateGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateGroup
-        /// </summary>
-        [Test]
-        public void UpdateGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateGroup
-            //Assert.IsInstanceOfType<UpdateGroup> (instance, "variable 'instance' is a UpdateGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'AutogenerateDisplayText'
-        /// </summary>
-        [Test]
-        public void AutogenerateDisplayTextTest()
-        {
-            // TODO unit test for the property 'AutogenerateDisplayText'
-        }
-        /// <summary>
-        /// Test the property 'ImageFileName'
-        /// </summary>
-        [Test]
-        public void ImageFileNameTest()
-        {
-            // TODO unit test for the property 'ImageFileName'
-        }
-        /// <summary>
-        /// Test the property 'MinSelectCount'
-        /// </summary>
-        [Test]
-        public void MinSelectCountTest()
-        {
-            // TODO unit test for the property 'MinSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'MaxSelectCount'
-        /// </summary>
-        [Test]
-        public void MaxSelectCountTest()
-        {
-            // TODO unit test for the property 'MaxSelectCount'
-        }
-        /// <summary>
-        /// Test the property 'Products'
-        /// </summary>
-        [Test]
-        public void ProductsTest()
-        {
-            // TODO unit test for the property 'Products'
-        }
-        /// <summary>
-        /// Test the property 'Metafields'
-        /// </summary>
-        [Test]
-        public void MetafieldsTest()
-        {
-            // TODO unit test for the property 'Metafields'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateLocationAreaTests.cs b/src/Flipdish.Test/Model/UpdateLocationAreaTests.cs
deleted file mode 100644
index fe5bf394..00000000
--- a/src/Flipdish.Test/Model/UpdateLocationAreaTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateLocationArea
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateLocationAreaTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateLocationArea
-        //private UpdateLocationArea instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateLocationArea
-            //instance = new UpdateLocationArea();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateLocationArea
-        /// </summary>
-        [Test]
-        public void UpdateLocationAreaInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateLocationArea
-            //Assert.IsInstanceOfType<UpdateLocationArea> (instance, "variable 'instance' is a UpdateLocationArea");
-        }
-
-
-        /// <summary>
-        /// Test the property 'LocationAreaId'
-        /// </summary>
-        [Test]
-        public void LocationAreaIdTest()
-        {
-            // TODO unit test for the property 'LocationAreaId'
-        }
-        /// <summary>
-        /// Test the property 'LocationAreaName'
-        /// </summary>
-        [Test]
-        public void LocationAreaNameTest()
-        {
-            // TODO unit test for the property 'LocationAreaName'
-        }
-        /// <summary>
-        /// Test the property 'IsDeleted'
-        /// </summary>
-        [Test]
-        public void IsDeletedTest()
-        {
-            // TODO unit test for the property 'IsDeleted'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateMetafieldDefinitionTests.cs b/src/Flipdish.Test/Model/UpdateMetafieldDefinitionTests.cs
deleted file mode 100644
index 9dd0054b..00000000
--- a/src/Flipdish.Test/Model/UpdateMetafieldDefinitionTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateMetafieldDefinition
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateMetafieldDefinitionTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateMetafieldDefinition
-        //private UpdateMetafieldDefinition instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateMetafieldDefinition
-            //instance = new UpdateMetafieldDefinition();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateMetafieldDefinition
-        /// </summary>
-        [Test]
-        public void UpdateMetafieldDefinitionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateMetafieldDefinition
-            //Assert.IsInstanceOfType<UpdateMetafieldDefinition> (instance, "variable 'instance' is a UpdateMetafieldDefinition");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Behaviors'
-        /// </summary>
-        [Test]
-        public void BehaviorsTest()
-        {
-            // TODO unit test for the property 'Behaviors'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateMobileAppsSubmissionStatusTests.cs b/src/Flipdish.Test/Model/UpdateMobileAppsSubmissionStatusTests.cs
deleted file mode 100644
index 36bdcb42..00000000
--- a/src/Flipdish.Test/Model/UpdateMobileAppsSubmissionStatusTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateMobileAppsSubmissionStatus
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateMobileAppsSubmissionStatusTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateMobileAppsSubmissionStatus
-        //private UpdateMobileAppsSubmissionStatus instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateMobileAppsSubmissionStatus
-            //instance = new UpdateMobileAppsSubmissionStatus();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateMobileAppsSubmissionStatus
-        /// </summary>
-        [Test]
-        public void UpdateMobileAppsSubmissionStatusInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateMobileAppsSubmissionStatus
-            //Assert.IsInstanceOfType<UpdateMobileAppsSubmissionStatus> (instance, "variable 'instance' is a UpdateMobileAppsSubmissionStatus");
-        }
-
-
-        /// <summary>
-        /// Test the property 'MobileAppsSubmissionStatusId'
-        /// </summary>
-        [Test]
-        public void MobileAppsSubmissionStatusIdTest()
-        {
-            // TODO unit test for the property 'MobileAppsSubmissionStatusId'
-        }
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'AppStatus'
-        /// </summary>
-        [Test]
-        public void AppStatusTest()
-        {
-            // TODO unit test for the property 'AppStatus'
-        }
-        /// <summary>
-        /// Test the property 'UpdateStatus'
-        /// </summary>
-        [Test]
-        public void UpdateStatusTest()
-        {
-            // TODO unit test for the property 'UpdateStatus'
-        }
-        /// <summary>
-        /// Test the property 'LastUpdateStatusTime'
-        /// </summary>
-        [Test]
-        public void LastUpdateStatusTimeTest()
-        {
-            // TODO unit test for the property 'LastUpdateStatusTime'
-        }
-        /// <summary>
-        /// Test the property 'Notes'
-        /// </summary>
-        [Test]
-        public void NotesTest()
-        {
-            // TODO unit test for the property 'Notes'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateModifierGroupTests.cs b/src/Flipdish.Test/Model/UpdateModifierGroupTests.cs
deleted file mode 100644
index 04320747..00000000
--- a/src/Flipdish.Test/Model/UpdateModifierGroupTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateModifierGroup
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateModifierGroupTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateModifierGroup
-        //private UpdateModifierGroup instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateModifierGroup
-            //instance = new UpdateModifierGroup();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateModifierGroup
-        /// </summary>
-        [Test]
-        public void UpdateModifierGroupInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateModifierGroup
-            //Assert.IsInstanceOfType<UpdateModifierGroup> (instance, "variable 'instance' is a UpdateModifierGroup");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateModifierTests.cs b/src/Flipdish.Test/Model/UpdateModifierTests.cs
deleted file mode 100644
index 35232100..00000000
--- a/src/Flipdish.Test/Model/UpdateModifierTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateModifier
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateModifierTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateModifier
-        //private UpdateModifier instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateModifier
-            //instance = new UpdateModifier();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateModifier
-        /// </summary>
-        [Test]
-        public void UpdateModifierInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateModifier
-            //Assert.IsInstanceOfType<UpdateModifier> (instance, "variable 'instance' is a UpdateModifier");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateProductReferenceTests.cs b/src/Flipdish.Test/Model/UpdateProductReferenceTests.cs
deleted file mode 100644
index 38c5e015..00000000
--- a/src/Flipdish.Test/Model/UpdateProductReferenceTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateProductReference
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateProductReferenceTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateProductReference
-        //private UpdateProductReference instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateProductReference
-            //instance = new UpdateProductReference();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateProductReference
-        /// </summary>
-        [Test]
-        public void UpdateProductReferenceInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateProductReference
-            //Assert.IsInstanceOfType<UpdateProductReference> (instance, "variable 'instance' is a UpdateProductReference");
-        }
-
-
-        /// <summary>
-        /// Test the property 'CatalogItemId'
-        /// </summary>
-        [Test]
-        public void CatalogItemIdTest()
-        {
-            // TODO unit test for the property 'CatalogItemId'
-        }
-        /// <summary>
-        /// Test the property 'ProductType'
-        /// </summary>
-        [Test]
-        public void ProductTypeTest()
-        {
-            // TODO unit test for the property 'ProductType'
-        }
-        /// <summary>
-        /// Test the property 'PreselectedQuantity'
-        /// </summary>
-        [Test]
-        public void PreselectedQuantityTest()
-        {
-            // TODO unit test for the property 'PreselectedQuantity'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateProductTests.cs b/src/Flipdish.Test/Model/UpdateProductTests.cs
deleted file mode 100644
index df8ce600..00000000
--- a/src/Flipdish.Test/Model/UpdateProductTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateProductTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateProduct
-        //private UpdateProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateProduct
-            //instance = new UpdateProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateProduct
-        /// </summary>
-        [Test]
-        public void UpdateProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateProduct
-            //Assert.IsInstanceOfType<UpdateProduct> (instance, "variable 'instance' is a UpdateProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Sku'
-        /// </summary>
-        [Test]
-        public void SkuTest()
-        {
-            // TODO unit test for the property 'Sku'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Price'
-        /// </summary>
-        [Test]
-        public void PriceTest()
-        {
-            // TODO unit test for the property 'Price'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateSimpleProductTests.cs b/src/Flipdish.Test/Model/UpdateSimpleProductTests.cs
deleted file mode 100644
index 20af9a1b..00000000
--- a/src/Flipdish.Test/Model/UpdateSimpleProductTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateSimpleProduct
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateSimpleProductTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateSimpleProduct
-        //private UpdateSimpleProduct instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateSimpleProduct
-            //instance = new UpdateSimpleProduct();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateSimpleProduct
-        /// </summary>
-        [Test]
-        public void UpdateSimpleProductInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateSimpleProduct
-            //Assert.IsInstanceOfType<UpdateSimpleProduct> (instance, "variable 'instance' is a UpdateSimpleProduct");
-        }
-
-
-        /// <summary>
-        /// Test the property 'productType'
-        /// </summary>
-        [Test]
-        public void productTypeTest()
-        {
-            // TODO unit test for the property 'productType'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UpdateTipConfigurationTests.cs b/src/Flipdish.Test/Model/UpdateTipConfigurationTests.cs
deleted file mode 100644
index 3cb5949f..00000000
--- a/src/Flipdish.Test/Model/UpdateTipConfigurationTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UpdateTipConfiguration
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UpdateTipConfigurationTests
-    {
-        // TODO uncomment below to declare an instance variable for UpdateTipConfiguration
-        //private UpdateTipConfiguration instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UpdateTipConfiguration
-            //instance = new UpdateTipConfiguration();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UpdateTipConfiguration
-        /// </summary>
-        [Test]
-        public void UpdateTipConfigurationInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UpdateTipConfiguration
-            //Assert.IsInstanceOfType<UpdateTipConfiguration> (instance, "variable 'instance' is a UpdateTipConfiguration");
-        }
-
-
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'AllowCustomTips'
-        /// </summary>
-        [Test]
-        public void AllowCustomTipsTest()
-        {
-            // TODO unit test for the property 'AllowCustomTips'
-        }
-        /// <summary>
-        /// Test the property 'Percentages'
-        /// </summary>
-        [Test]
-        public void PercentagesTest()
-        {
-            // TODO unit test for the property 'Percentages'
-        }
-        /// <summary>
-        /// Test the property 'DefaultPercentage'
-        /// </summary>
-        [Test]
-        public void DefaultPercentageTest()
-        {
-            // TODO unit test for the property 'DefaultPercentage'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UserAnsweredSignupQuestionsEventTests.cs b/src/Flipdish.Test/Model/UserAnsweredSignupQuestionsEventTests.cs
deleted file mode 100644
index a2ae4984..00000000
--- a/src/Flipdish.Test/Model/UserAnsweredSignupQuestionsEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UserAnsweredSignupQuestionsEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UserAnsweredSignupQuestionsEventTests
-    {
-        // TODO uncomment below to declare an instance variable for UserAnsweredSignupQuestionsEvent
-        //private UserAnsweredSignupQuestionsEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UserAnsweredSignupQuestionsEvent
-            //instance = new UserAnsweredSignupQuestionsEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UserAnsweredSignupQuestionsEvent
-        /// </summary>
-        [Test]
-        public void UserAnsweredSignupQuestionsEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UserAnsweredSignupQuestionsEvent
-            //Assert.IsInstanceOfType<UserAnsweredSignupQuestionsEvent> (instance, "variable 'instance' is a UserAnsweredSignupQuestionsEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'SignupAnswers'
-        /// </summary>
-        [Test]
-        public void SignupAnswersTest()
-        {
-            // TODO unit test for the property 'SignupAnswers'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UserCreatedEventTests.cs b/src/Flipdish.Test/Model/UserCreatedEventTests.cs
deleted file mode 100644
index 54df6a02..00000000
--- a/src/Flipdish.Test/Model/UserCreatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UserCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UserCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for UserCreatedEvent
-        //private UserCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UserCreatedEvent
-            //instance = new UserCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UserCreatedEvent
-        /// </summary>
-        [Test]
-        public void UserCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UserCreatedEvent
-            //Assert.IsInstanceOfType<UserCreatedEvent> (instance, "variable 'instance' is a UserCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UserDeletedEventTests.cs b/src/Flipdish.Test/Model/UserDeletedEventTests.cs
deleted file mode 100644
index 90202ffc..00000000
--- a/src/Flipdish.Test/Model/UserDeletedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UserDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UserDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for UserDeletedEvent
-        //private UserDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UserDeletedEvent
-            //instance = new UserDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UserDeletedEvent
-        /// </summary>
-        [Test]
-        public void UserDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UserDeletedEvent
-            //Assert.IsInstanceOfType<UserDeletedEvent> (instance, "variable 'instance' is a UserDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UserEventInfoTests.cs b/src/Flipdish.Test/Model/UserEventInfoTests.cs
deleted file mode 100644
index 47bc7d87..00000000
--- a/src/Flipdish.Test/Model/UserEventInfoTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UserEventInfo
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UserEventInfoTests
-    {
-        // TODO uncomment below to declare an instance variable for UserEventInfo
-        //private UserEventInfo instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UserEventInfo
-            //instance = new UserEventInfo();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UserEventInfo
-        /// </summary>
-        [Test]
-        public void UserEventInfoInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UserEventInfo
-            //Assert.IsInstanceOfType<UserEventInfo> (instance, "variable 'instance' is a UserEventInfo");
-        }
-
-
-        /// <summary>
-        /// Test the property 'UserId'
-        /// </summary>
-        [Test]
-        public void UserIdTest()
-        {
-            // TODO unit test for the property 'UserId'
-        }
-        /// <summary>
-        /// Test the property 'UserName'
-        /// </summary>
-        [Test]
-        public void UserNameTest()
-        {
-            // TODO unit test for the property 'UserName'
-        }
-        /// <summary>
-        /// Test the property 'UserPhoneNumber'
-        /// </summary>
-        [Test]
-        public void UserPhoneNumberTest()
-        {
-            // TODO unit test for the property 'UserPhoneNumber'
-        }
-        /// <summary>
-        /// Test the property 'UserEmail'
-        /// </summary>
-        [Test]
-        public void UserEmailTest()
-        {
-            // TODO unit test for the property 'UserEmail'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UserLoginEventTests.cs b/src/Flipdish.Test/Model/UserLoginEventTests.cs
deleted file mode 100644
index e925321f..00000000
--- a/src/Flipdish.Test/Model/UserLoginEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UserLoginEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UserLoginEventTests
-    {
-        // TODO uncomment below to declare an instance variable for UserLoginEvent
-        //private UserLoginEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UserLoginEvent
-            //instance = new UserLoginEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UserLoginEvent
-        /// </summary>
-        [Test]
-        public void UserLoginEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UserLoginEvent
-            //Assert.IsInstanceOfType<UserLoginEvent> (instance, "variable 'instance' is a UserLoginEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UserPasswordCreatedEventTests.cs b/src/Flipdish.Test/Model/UserPasswordCreatedEventTests.cs
deleted file mode 100644
index bf1e612e..00000000
--- a/src/Flipdish.Test/Model/UserPasswordCreatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UserPasswordCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UserPasswordCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for UserPasswordCreatedEvent
-        //private UserPasswordCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UserPasswordCreatedEvent
-            //instance = new UserPasswordCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UserPasswordCreatedEvent
-        /// </summary>
-        [Test]
-        public void UserPasswordCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UserPasswordCreatedEvent
-            //Assert.IsInstanceOfType<UserPasswordCreatedEvent> (instance, "variable 'instance' is a UserPasswordCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/UserUpdatedEventTests.cs b/src/Flipdish.Test/Model/UserUpdatedEventTests.cs
deleted file mode 100644
index 2ef9be83..00000000
--- a/src/Flipdish.Test/Model/UserUpdatedEventTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing UserUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class UserUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for UserUpdatedEvent
-        //private UserUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of UserUpdatedEvent
-            //instance = new UserUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of UserUpdatedEvent
-        /// </summary>
-        [Test]
-        public void UserUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" UserUpdatedEvent
-            //Assert.IsInstanceOfType<UserUpdatedEvent> (instance, "variable 'instance' is a UserUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ValidValueTests.cs b/src/Flipdish.Test/Model/ValidValueTests.cs
deleted file mode 100644
index a4ae5ba5..00000000
--- a/src/Flipdish.Test/Model/ValidValueTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ValidValue
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ValidValueTests
-    {
-        // TODO uncomment below to declare an instance variable for ValidValue
-        //private ValidValue instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ValidValue
-            //instance = new ValidValue();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ValidValue
-        /// </summary>
-        [Test]
-        public void ValidValueInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ValidValue
-            //Assert.IsInstanceOfType<ValidValue> (instance, "variable 'instance' is a ValidValue");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-        /// <summary>
-        /// Test the property 'Name'
-        /// </summary>
-        [Test]
-        public void NameTest()
-        {
-            // TODO unit test for the property 'Name'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/ValidationErrorResultTests.cs b/src/Flipdish.Test/Model/ValidationErrorResultTests.cs
deleted file mode 100644
index cfc76b04..00000000
--- a/src/Flipdish.Test/Model/ValidationErrorResultTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing ValidationErrorResult
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class ValidationErrorResultTests
-    {
-        // TODO uncomment below to declare an instance variable for ValidationErrorResult
-        //private ValidationErrorResult instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of ValidationErrorResult
-            //instance = new ValidationErrorResult();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of ValidationErrorResult
-        /// </summary>
-        [Test]
-        public void ValidationErrorResultInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" ValidationErrorResult
-            //Assert.IsInstanceOfType<ValidationErrorResult> (instance, "variable 'instance' is a ValidationErrorResult");
-        }
-
-
-        /// <summary>
-        /// Test the property 'FieldName'
-        /// </summary>
-        [Test]
-        public void FieldNameTest()
-        {
-            // TODO unit test for the property 'FieldName'
-        }
-        /// <summary>
-        /// Test the property 'Errors'
-        /// </summary>
-        [Test]
-        public void ErrorsTest()
-        {
-            // TODO unit test for the property 'Errors'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/VoucherBaseTests.cs b/src/Flipdish.Test/Model/VoucherBaseTests.cs
deleted file mode 100644
index 713e7dd8..00000000
--- a/src/Flipdish.Test/Model/VoucherBaseTests.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing VoucherBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class VoucherBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for VoucherBase
-        //private VoucherBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of VoucherBase
-            //instance = new VoucherBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of VoucherBase
-        /// </summary>
-        [Test]
-        public void VoucherBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" VoucherBase
-            //Assert.IsInstanceOfType<VoucherBase> (instance, "variable 'instance' is a VoucherBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'ValidOnOrdersOver'
-        /// </summary>
-        [Test]
-        public void ValidOnOrdersOverTest()
-        {
-            // TODO unit test for the property 'ValidOnOrdersOver'
-        }
-        /// <summary>
-        /// Test the property 'TakesPriority'
-        /// </summary>
-        [Test]
-        public void TakesPriorityTest()
-        {
-            // TODO unit test for the property 'TakesPriority'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsAutomaticallyApplied'
-        /// </summary>
-        [Test]
-        public void IsAutomaticallyAppliedTest()
-        {
-            // TODO unit test for the property 'IsAutomaticallyApplied'
-        }
-        /// <summary>
-        /// Test the property 'IncludeDeliveryFee'
-        /// </summary>
-        [Test]
-        public void IncludeDeliveryFeeTest()
-        {
-            // TODO unit test for the property 'IncludeDeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForDeliveryOrders'
-        /// </summary>
-        [Test]
-        public void IsValidForDeliveryOrdersTest()
-        {
-            // TODO unit test for the property 'IsValidForDeliveryOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForPickupOrders'
-        /// </summary>
-        [Test]
-        public void IsValidForPickupOrdersTest()
-        {
-            // TODO unit test for the property 'IsValidForPickupOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForOrdersPayedOnline'
-        /// </summary>
-        [Test]
-        public void IsValidForOrdersPayedOnlineTest()
-        {
-            // TODO unit test for the property 'IsValidForOrdersPayedOnline'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForOrdersPayedByCash'
-        /// </summary>
-        [Test]
-        public void IsValidForOrdersPayedByCashTest()
-        {
-            // TODO unit test for the property 'IsValidForOrdersPayedByCash'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForFirstOrderOnly'
-        /// </summary>
-        [Test]
-        public void IsValidForFirstOrderOnlyTest()
-        {
-            // TODO unit test for the property 'IsValidForFirstOrderOnly'
-        }
-        /// <summary>
-        /// Test the property 'IsValidOncePerCustomer'
-        /// </summary>
-        [Test]
-        public void IsValidOncePerCustomerTest()
-        {
-            // TODO unit test for the property 'IsValidOncePerCustomer'
-        }
-        /// <summary>
-        /// Test the property 'IsValidOnlyOnce'
-        /// </summary>
-        [Test]
-        public void IsValidOnlyOnceTest()
-        {
-            // TODO unit test for the property 'IsValidOnlyOnce'
-        }
-        /// <summary>
-        /// Test the property 'StartDate'
-        /// </summary>
-        [Test]
-        public void StartDateTest()
-        {
-            // TODO unit test for the property 'StartDate'
-        }
-        /// <summary>
-        /// Test the property 'ExpiryDate'
-        /// </summary>
-        [Test]
-        public void ExpiryDateTest()
-        {
-            // TODO unit test for the property 'ExpiryDate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/VoucherCreatedEventTests.cs b/src/Flipdish.Test/Model/VoucherCreatedEventTests.cs
deleted file mode 100644
index 2a159f65..00000000
--- a/src/Flipdish.Test/Model/VoucherCreatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing VoucherCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class VoucherCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for VoucherCreatedEvent
-        //private VoucherCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of VoucherCreatedEvent
-            //instance = new VoucherCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of VoucherCreatedEvent
-        /// </summary>
-        [Test]
-        public void VoucherCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" VoucherCreatedEvent
-            //Assert.IsInstanceOfType<VoucherCreatedEvent> (instance, "variable 'instance' is a VoucherCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'VoucherId'
-        /// </summary>
-        [Test]
-        public void VoucherIdTest()
-        {
-            // TODO unit test for the property 'VoucherId'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Voucher'
-        /// </summary>
-        [Test]
-        public void VoucherTest()
-        {
-            // TODO unit test for the property 'Voucher'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/VoucherDataPointTests.cs b/src/Flipdish.Test/Model/VoucherDataPointTests.cs
deleted file mode 100644
index e90e9dce..00000000
--- a/src/Flipdish.Test/Model/VoucherDataPointTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing VoucherDataPoint
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class VoucherDataPointTests
-    {
-        // TODO uncomment below to declare an instance variable for VoucherDataPoint
-        //private VoucherDataPoint instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of VoucherDataPoint
-            //instance = new VoucherDataPoint();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of VoucherDataPoint
-        /// </summary>
-        [Test]
-        public void VoucherDataPointInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" VoucherDataPoint
-            //Assert.IsInstanceOfType<VoucherDataPoint> (instance, "variable 'instance' is a VoucherDataPoint");
-        }
-
-
-        /// <summary>
-        /// Test the property 'PeriodStart'
-        /// </summary>
-        [Test]
-        public void PeriodStartTest()
-        {
-            // TODO unit test for the property 'PeriodStart'
-        }
-        /// <summary>
-        /// Test the property 'PeriodLengthInDays'
-        /// </summary>
-        [Test]
-        public void PeriodLengthInDaysTest()
-        {
-            // TODO unit test for the property 'PeriodLengthInDays'
-        }
-        /// <summary>
-        /// Test the property 'Value'
-        /// </summary>
-        [Test]
-        public void ValueTest()
-        {
-            // TODO unit test for the property 'Value'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/VoucherDeletedEventTests.cs b/src/Flipdish.Test/Model/VoucherDeletedEventTests.cs
deleted file mode 100644
index 65b3a6c0..00000000
--- a/src/Flipdish.Test/Model/VoucherDeletedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing VoucherDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class VoucherDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for VoucherDeletedEvent
-        //private VoucherDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of VoucherDeletedEvent
-            //instance = new VoucherDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of VoucherDeletedEvent
-        /// </summary>
-        [Test]
-        public void VoucherDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" VoucherDeletedEvent
-            //Assert.IsInstanceOfType<VoucherDeletedEvent> (instance, "variable 'instance' is a VoucherDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'VoucherId'
-        /// </summary>
-        [Test]
-        public void VoucherIdTest()
-        {
-            // TODO unit test for the property 'VoucherId'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Voucher'
-        /// </summary>
-        [Test]
-        public void VoucherTest()
-        {
-            // TODO unit test for the property 'Voucher'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/VoucherSummaryTests.cs b/src/Flipdish.Test/Model/VoucherSummaryTests.cs
deleted file mode 100644
index a6872026..00000000
--- a/src/Flipdish.Test/Model/VoucherSummaryTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing VoucherSummary
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class VoucherSummaryTests
-    {
-        // TODO uncomment below to declare an instance variable for VoucherSummary
-        //private VoucherSummary instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of VoucherSummary
-            //instance = new VoucherSummary();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of VoucherSummary
-        /// </summary>
-        [Test]
-        public void VoucherSummaryInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" VoucherSummary
-            //Assert.IsInstanceOfType<VoucherSummary> (instance, "variable 'instance' is a VoucherSummary");
-        }
-
-
-        /// <summary>
-        /// Test the property 'VoucherId'
-        /// </summary>
-        [Test]
-        public void VoucherIdTest()
-        {
-            // TODO unit test for the property 'VoucherId'
-        }
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'VoucherType'
-        /// </summary>
-        [Test]
-        public void VoucherTypeTest()
-        {
-            // TODO unit test for the property 'VoucherType'
-        }
-        /// <summary>
-        /// Test the property 'VoucherSubType'
-        /// </summary>
-        [Test]
-        public void VoucherSubTypeTest()
-        {
-            // TODO unit test for the property 'VoucherSubType'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/VoucherTests.cs b/src/Flipdish.Test/Model/VoucherTests.cs
deleted file mode 100644
index 934205eb..00000000
--- a/src/Flipdish.Test/Model/VoucherTests.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing Voucher
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class VoucherTests
-    {
-        // TODO uncomment below to declare an instance variable for Voucher
-        //private Voucher instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of Voucher
-            //instance = new Voucher();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of Voucher
-        /// </summary>
-        [Test]
-        public void VoucherInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" Voucher
-            //Assert.IsInstanceOfType<Voucher> (instance, "variable 'instance' is a Voucher");
-        }
-
-
-        /// <summary>
-        /// Test the property 'VoucherId'
-        /// </summary>
-        [Test]
-        public void VoucherIdTest()
-        {
-            // TODO unit test for the property 'VoucherId'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'VoucherType'
-        /// </summary>
-        [Test]
-        public void VoucherTypeTest()
-        {
-            // TODO unit test for the property 'VoucherType'
-        }
-        /// <summary>
-        /// Test the property 'VoucherSubType'
-        /// </summary>
-        [Test]
-        public void VoucherSubTypeTest()
-        {
-            // TODO unit test for the property 'VoucherSubType'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'Stores'
-        /// </summary>
-        [Test]
-        public void StoresTest()
-        {
-            // TODO unit test for the property 'Stores'
-        }
-        /// <summary>
-        /// Test the property 'StoreNames'
-        /// </summary>
-        [Test]
-        public void StoreNamesTest()
-        {
-            // TODO unit test for the property 'StoreNames'
-        }
-        /// <summary>
-        /// Test the property 'AddItemDetails'
-        /// </summary>
-        [Test]
-        public void AddItemDetailsTest()
-        {
-            // TODO unit test for the property 'AddItemDetails'
-        }
-        /// <summary>
-        /// Test the property 'CreditNoteDetails'
-        /// </summary>
-        [Test]
-        public void CreditNoteDetailsTest()
-        {
-            // TODO unit test for the property 'CreditNoteDetails'
-        }
-        /// <summary>
-        /// Test the property 'LumpDiscountDetails'
-        /// </summary>
-        [Test]
-        public void LumpDiscountDetailsTest()
-        {
-            // TODO unit test for the property 'LumpDiscountDetails'
-        }
-        /// <summary>
-        /// Test the property 'PercentDiscountDetails'
-        /// </summary>
-        [Test]
-        public void PercentDiscountDetailsTest()
-        {
-            // TODO unit test for the property 'PercentDiscountDetails'
-        }
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'ValidOnOrdersOver'
-        /// </summary>
-        [Test]
-        public void ValidOnOrdersOverTest()
-        {
-            // TODO unit test for the property 'ValidOnOrdersOver'
-        }
-        /// <summary>
-        /// Test the property 'TakesPriority'
-        /// </summary>
-        [Test]
-        public void TakesPriorityTest()
-        {
-            // TODO unit test for the property 'TakesPriority'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsAutomaticallyApplied'
-        /// </summary>
-        [Test]
-        public void IsAutomaticallyAppliedTest()
-        {
-            // TODO unit test for the property 'IsAutomaticallyApplied'
-        }
-        /// <summary>
-        /// Test the property 'IncludeDeliveryFee'
-        /// </summary>
-        [Test]
-        public void IncludeDeliveryFeeTest()
-        {
-            // TODO unit test for the property 'IncludeDeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForDeliveryOrders'
-        /// </summary>
-        [Test]
-        public void IsValidForDeliveryOrdersTest()
-        {
-            // TODO unit test for the property 'IsValidForDeliveryOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForPickupOrders'
-        /// </summary>
-        [Test]
-        public void IsValidForPickupOrdersTest()
-        {
-            // TODO unit test for the property 'IsValidForPickupOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForOrdersPayedOnline'
-        /// </summary>
-        [Test]
-        public void IsValidForOrdersPayedOnlineTest()
-        {
-            // TODO unit test for the property 'IsValidForOrdersPayedOnline'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForOrdersPayedByCash'
-        /// </summary>
-        [Test]
-        public void IsValidForOrdersPayedByCashTest()
-        {
-            // TODO unit test for the property 'IsValidForOrdersPayedByCash'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForFirstOrderOnly'
-        /// </summary>
-        [Test]
-        public void IsValidForFirstOrderOnlyTest()
-        {
-            // TODO unit test for the property 'IsValidForFirstOrderOnly'
-        }
-        /// <summary>
-        /// Test the property 'IsValidOncePerCustomer'
-        /// </summary>
-        [Test]
-        public void IsValidOncePerCustomerTest()
-        {
-            // TODO unit test for the property 'IsValidOncePerCustomer'
-        }
-        /// <summary>
-        /// Test the property 'IsValidOnlyOnce'
-        /// </summary>
-        [Test]
-        public void IsValidOnlyOnceTest()
-        {
-            // TODO unit test for the property 'IsValidOnlyOnce'
-        }
-        /// <summary>
-        /// Test the property 'StartDate'
-        /// </summary>
-        [Test]
-        public void StartDateTest()
-        {
-            // TODO unit test for the property 'StartDate'
-        }
-        /// <summary>
-        /// Test the property 'ExpiryDate'
-        /// </summary>
-        [Test]
-        public void ExpiryDateTest()
-        {
-            // TODO unit test for the property 'ExpiryDate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/VoucherUpdatedEventTests.cs b/src/Flipdish.Test/Model/VoucherUpdatedEventTests.cs
deleted file mode 100644
index bc51f30a..00000000
--- a/src/Flipdish.Test/Model/VoucherUpdatedEventTests.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing VoucherUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class VoucherUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for VoucherUpdatedEvent
-        //private VoucherUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of VoucherUpdatedEvent
-            //instance = new VoucherUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of VoucherUpdatedEvent
-        /// </summary>
-        [Test]
-        public void VoucherUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" VoucherUpdatedEvent
-            //Assert.IsInstanceOfType<VoucherUpdatedEvent> (instance, "variable 'instance' is a VoucherUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'VoucherId'
-        /// </summary>
-        [Test]
-        public void VoucherIdTest()
-        {
-            // TODO unit test for the property 'VoucherId'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'Voucher'
-        /// </summary>
-        [Test]
-        public void VoucherTest()
-        {
-            // TODO unit test for the property 'Voucher'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/VoucherWithStatsTests.cs b/src/Flipdish.Test/Model/VoucherWithStatsTests.cs
deleted file mode 100644
index 3b03835a..00000000
--- a/src/Flipdish.Test/Model/VoucherWithStatsTests.cs
+++ /dev/null
@@ -1,328 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing VoucherWithStats
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class VoucherWithStatsTests
-    {
-        // TODO uncomment below to declare an instance variable for VoucherWithStats
-        //private VoucherWithStats instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of VoucherWithStats
-            //instance = new VoucherWithStats();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of VoucherWithStats
-        /// </summary>
-        [Test]
-        public void VoucherWithStatsInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" VoucherWithStats
-            //Assert.IsInstanceOfType<VoucherWithStats> (instance, "variable 'instance' is a VoucherWithStats");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TotalUsed'
-        /// </summary>
-        [Test]
-        public void TotalUsedTest()
-        {
-            // TODO unit test for the property 'TotalUsed'
-        }
-        /// <summary>
-        /// Test the property 'TotalCustomers'
-        /// </summary>
-        [Test]
-        public void TotalCustomersTest()
-        {
-            // TODO unit test for the property 'TotalCustomers'
-        }
-        /// <summary>
-        /// Test the property 'TotalAmountFromOrders'
-        /// </summary>
-        [Test]
-        public void TotalAmountFromOrdersTest()
-        {
-            // TODO unit test for the property 'TotalAmountFromOrders'
-        }
-        /// <summary>
-        /// Test the property 'TotalDiscounted'
-        /// </summary>
-        [Test]
-        public void TotalDiscountedTest()
-        {
-            // TODO unit test for the property 'TotalDiscounted'
-        }
-        /// <summary>
-        /// Test the property 'AverageOrderSize'
-        /// </summary>
-        [Test]
-        public void AverageOrderSizeTest()
-        {
-            // TODO unit test for the property 'AverageOrderSize'
-        }
-        /// <summary>
-        /// Test the property 'VoucherId'
-        /// </summary>
-        [Test]
-        public void VoucherIdTest()
-        {
-            // TODO unit test for the property 'VoucherId'
-        }
-        /// <summary>
-        /// Test the property 'Status'
-        /// </summary>
-        [Test]
-        public void StatusTest()
-        {
-            // TODO unit test for the property 'Status'
-        }
-        /// <summary>
-        /// Test the property 'VoucherType'
-        /// </summary>
-        [Test]
-        public void VoucherTypeTest()
-        {
-            // TODO unit test for the property 'VoucherType'
-        }
-        /// <summary>
-        /// Test the property 'VoucherSubType'
-        /// </summary>
-        [Test]
-        public void VoucherSubTypeTest()
-        {
-            // TODO unit test for the property 'VoucherSubType'
-        }
-        /// <summary>
-        /// Test the property 'Currency'
-        /// </summary>
-        [Test]
-        public void CurrencyTest()
-        {
-            // TODO unit test for the property 'Currency'
-        }
-        /// <summary>
-        /// Test the property 'Stores'
-        /// </summary>
-        [Test]
-        public void StoresTest()
-        {
-            // TODO unit test for the property 'Stores'
-        }
-        /// <summary>
-        /// Test the property 'StoreNames'
-        /// </summary>
-        [Test]
-        public void StoreNamesTest()
-        {
-            // TODO unit test for the property 'StoreNames'
-        }
-        /// <summary>
-        /// Test the property 'AddItemDetails'
-        /// </summary>
-        [Test]
-        public void AddItemDetailsTest()
-        {
-            // TODO unit test for the property 'AddItemDetails'
-        }
-        /// <summary>
-        /// Test the property 'CreditNoteDetails'
-        /// </summary>
-        [Test]
-        public void CreditNoteDetailsTest()
-        {
-            // TODO unit test for the property 'CreditNoteDetails'
-        }
-        /// <summary>
-        /// Test the property 'LumpDiscountDetails'
-        /// </summary>
-        [Test]
-        public void LumpDiscountDetailsTest()
-        {
-            // TODO unit test for the property 'LumpDiscountDetails'
-        }
-        /// <summary>
-        /// Test the property 'PercentDiscountDetails'
-        /// </summary>
-        [Test]
-        public void PercentDiscountDetailsTest()
-        {
-            // TODO unit test for the property 'PercentDiscountDetails'
-        }
-        /// <summary>
-        /// Test the property 'Code'
-        /// </summary>
-        [Test]
-        public void CodeTest()
-        {
-            // TODO unit test for the property 'Code'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'ValidOnOrdersOver'
-        /// </summary>
-        [Test]
-        public void ValidOnOrdersOverTest()
-        {
-            // TODO unit test for the property 'ValidOnOrdersOver'
-        }
-        /// <summary>
-        /// Test the property 'TakesPriority'
-        /// </summary>
-        [Test]
-        public void TakesPriorityTest()
-        {
-            // TODO unit test for the property 'TakesPriority'
-        }
-        /// <summary>
-        /// Test the property 'IsEnabled'
-        /// </summary>
-        [Test]
-        public void IsEnabledTest()
-        {
-            // TODO unit test for the property 'IsEnabled'
-        }
-        /// <summary>
-        /// Test the property 'IsAutomaticallyApplied'
-        /// </summary>
-        [Test]
-        public void IsAutomaticallyAppliedTest()
-        {
-            // TODO unit test for the property 'IsAutomaticallyApplied'
-        }
-        /// <summary>
-        /// Test the property 'IncludeDeliveryFee'
-        /// </summary>
-        [Test]
-        public void IncludeDeliveryFeeTest()
-        {
-            // TODO unit test for the property 'IncludeDeliveryFee'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForDeliveryOrders'
-        /// </summary>
-        [Test]
-        public void IsValidForDeliveryOrdersTest()
-        {
-            // TODO unit test for the property 'IsValidForDeliveryOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForPickupOrders'
-        /// </summary>
-        [Test]
-        public void IsValidForPickupOrdersTest()
-        {
-            // TODO unit test for the property 'IsValidForPickupOrders'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForOrdersPayedOnline'
-        /// </summary>
-        [Test]
-        public void IsValidForOrdersPayedOnlineTest()
-        {
-            // TODO unit test for the property 'IsValidForOrdersPayedOnline'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForOrdersPayedByCash'
-        /// </summary>
-        [Test]
-        public void IsValidForOrdersPayedByCashTest()
-        {
-            // TODO unit test for the property 'IsValidForOrdersPayedByCash'
-        }
-        /// <summary>
-        /// Test the property 'IsValidForFirstOrderOnly'
-        /// </summary>
-        [Test]
-        public void IsValidForFirstOrderOnlyTest()
-        {
-            // TODO unit test for the property 'IsValidForFirstOrderOnly'
-        }
-        /// <summary>
-        /// Test the property 'IsValidOncePerCustomer'
-        /// </summary>
-        [Test]
-        public void IsValidOncePerCustomerTest()
-        {
-            // TODO unit test for the property 'IsValidOncePerCustomer'
-        }
-        /// <summary>
-        /// Test the property 'IsValidOnlyOnce'
-        /// </summary>
-        [Test]
-        public void IsValidOnlyOnceTest()
-        {
-            // TODO unit test for the property 'IsValidOnlyOnce'
-        }
-        /// <summary>
-        /// Test the property 'StartDate'
-        /// </summary>
-        [Test]
-        public void StartDateTest()
-        {
-            // TODO unit test for the property 'StartDate'
-        }
-        /// <summary>
-        /// Test the property 'ExpiryDate'
-        /// </summary>
-        [Test]
-        public void ExpiryDateTest()
-        {
-            // TODO unit test for the property 'ExpiryDate'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebhookEventSampleTests.cs b/src/Flipdish.Test/Model/WebhookEventSampleTests.cs
deleted file mode 100644
index 708b2e02..00000000
--- a/src/Flipdish.Test/Model/WebhookEventSampleTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebhookEventSample
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebhookEventSampleTests
-    {
-        // TODO uncomment below to declare an instance variable for WebhookEventSample
-        //private WebhookEventSample instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebhookEventSample
-            //instance = new WebhookEventSample();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebhookEventSample
-        /// </summary>
-        [Test]
-        public void WebhookEventSampleInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebhookEventSample
-            //Assert.IsInstanceOfType<WebhookEventSample> (instance, "variable 'instance' is a WebhookEventSample");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Type'
-        /// </summary>
-        [Test]
-        public void TypeTest()
-        {
-            // TODO unit test for the property 'Type'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Body'
-        /// </summary>
-        [Test]
-        public void BodyTest()
-        {
-            // TODO unit test for the property 'Body'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebhookLogTests.cs b/src/Flipdish.Test/Model/WebhookLogTests.cs
deleted file mode 100644
index d192968c..00000000
--- a/src/Flipdish.Test/Model/WebhookLogTests.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebhookLog
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebhookLogTests
-    {
-        // TODO uncomment below to declare an instance variable for WebhookLog
-        //private WebhookLog instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebhookLog
-            //instance = new WebhookLog();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebhookLog
-        /// </summary>
-        [Test]
-        public void WebhookLogInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebhookLog
-            //Assert.IsInstanceOfType<WebhookLog> (instance, "variable 'instance' is a WebhookLog");
-        }
-
-
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionOwnerUserId'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionOwnerUserIdTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionOwnerUserId'
-        }
-        /// <summary>
-        /// Test the property 'EventCreated'
-        /// </summary>
-        [Test]
-        public void EventCreatedTest()
-        {
-            // TODO unit test for the property 'EventCreated'
-        }
-        /// <summary>
-        /// Test the property 'WebhookTriggered'
-        /// </summary>
-        [Test]
-        public void WebhookTriggeredTest()
-        {
-            // TODO unit test for the property 'WebhookTriggered'
-        }
-        /// <summary>
-        /// Test the property 'WebhookEventName'
-        /// </summary>
-        [Test]
-        public void WebhookEventNameTest()
-        {
-            // TODO unit test for the property 'WebhookEventName'
-        }
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionCallbackUrl'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionCallbackUrlTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionCallbackUrl'
-        }
-        /// <summary>
-        /// Test the property 'HttpResponseStatusCode'
-        /// </summary>
-        [Test]
-        public void HttpResponseStatusCodeTest()
-        {
-            // TODO unit test for the property 'HttpResponseStatusCode'
-        }
-        /// <summary>
-        /// Test the property 'HttpResponseStatus'
-        /// </summary>
-        [Test]
-        public void HttpResponseStatusTest()
-        {
-            // TODO unit test for the property 'HttpResponseStatus'
-        }
-        /// <summary>
-        /// Test the property 'RequestHeaders'
-        /// </summary>
-        [Test]
-        public void RequestHeadersTest()
-        {
-            // TODO unit test for the property 'RequestHeaders'
-        }
-        /// <summary>
-        /// Test the property 'RequestBody'
-        /// </summary>
-        [Test]
-        public void RequestBodyTest()
-        {
-            // TODO unit test for the property 'RequestBody'
-        }
-        /// <summary>
-        /// Test the property 'ResponseHeaders'
-        /// </summary>
-        [Test]
-        public void ResponseHeadersTest()
-        {
-            // TODO unit test for the property 'ResponseHeaders'
-        }
-        /// <summary>
-        /// Test the property 'ResponseBody'
-        /// </summary>
-        [Test]
-        public void ResponseBodyTest()
-        {
-            // TODO unit test for the property 'ResponseBody'
-        }
-        /// <summary>
-        /// Test the property 'Duration'
-        /// </summary>
-        [Test]
-        public void DurationTest()
-        {
-            // TODO unit test for the property 'Duration'
-        }
-        /// <summary>
-        /// Test the property 'RetryCount'
-        /// </summary>
-        [Test]
-        public void RetryCountTest()
-        {
-            // TODO unit test for the property 'RetryCount'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishWebhookId'
-        /// </summary>
-        [Test]
-        public void FlipdishWebhookIdTest()
-        {
-            // TODO unit test for the property 'FlipdishWebhookId'
-        }
-        /// <summary>
-        /// Test the property 'Version'
-        /// </summary>
-        [Test]
-        public void VersionTest()
-        {
-            // TODO unit test for the property 'Version'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebhookSubscriptionCreatedEventTests.cs b/src/Flipdish.Test/Model/WebhookSubscriptionCreatedEventTests.cs
deleted file mode 100644
index 5c6c6192..00000000
--- a/src/Flipdish.Test/Model/WebhookSubscriptionCreatedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebhookSubscriptionCreatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebhookSubscriptionCreatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for WebhookSubscriptionCreatedEvent
-        //private WebhookSubscriptionCreatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebhookSubscriptionCreatedEvent
-            //instance = new WebhookSubscriptionCreatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebhookSubscriptionCreatedEvent
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionCreatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebhookSubscriptionCreatedEvent
-            //Assert.IsInstanceOfType<WebhookSubscriptionCreatedEvent> (instance, "variable 'instance' is a WebhookSubscriptionCreatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionEventInfo'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionEventInfoTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionEventInfo'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebhookSubscriptionDeletedEventTests.cs b/src/Flipdish.Test/Model/WebhookSubscriptionDeletedEventTests.cs
deleted file mode 100644
index b04ac49d..00000000
--- a/src/Flipdish.Test/Model/WebhookSubscriptionDeletedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebhookSubscriptionDeletedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebhookSubscriptionDeletedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for WebhookSubscriptionDeletedEvent
-        //private WebhookSubscriptionDeletedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebhookSubscriptionDeletedEvent
-            //instance = new WebhookSubscriptionDeletedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebhookSubscriptionDeletedEvent
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionDeletedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebhookSubscriptionDeletedEvent
-            //Assert.IsInstanceOfType<WebhookSubscriptionDeletedEvent> (instance, "variable 'instance' is a WebhookSubscriptionDeletedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionEventInfo'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionEventInfoTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionEventInfo'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebhookSubscriptionEventInfoTests.cs b/src/Flipdish.Test/Model/WebhookSubscriptionEventInfoTests.cs
deleted file mode 100644
index 50c78d31..00000000
--- a/src/Flipdish.Test/Model/WebhookSubscriptionEventInfoTests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebhookSubscriptionEventInfo
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebhookSubscriptionEventInfoTests
-    {
-        // TODO uncomment below to declare an instance variable for WebhookSubscriptionEventInfo
-        //private WebhookSubscriptionEventInfo instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebhookSubscriptionEventInfo
-            //instance = new WebhookSubscriptionEventInfo();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebhookSubscriptionEventInfo
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionEventInfoInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebhookSubscriptionEventInfo
-            //Assert.IsInstanceOfType<WebhookSubscriptionEventInfo> (instance, "variable 'instance' is a WebhookSubscriptionEventInfo");
-        }
-
-
-        /// <summary>
-        /// Test the property 'OwnerUserId'
-        /// </summary>
-        [Test]
-        public void OwnerUserIdTest()
-        {
-            // TODO unit test for the property 'OwnerUserId'
-        }
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionId'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionIdTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionId'
-        }
-        /// <summary>
-        /// Test the property 'ClientId'
-        /// </summary>
-        [Test]
-        public void ClientIdTest()
-        {
-            // TODO unit test for the property 'ClientId'
-        }
-        /// <summary>
-        /// Test the property 'CallbackUrl'
-        /// </summary>
-        [Test]
-        public void CallbackUrlTest()
-        {
-            // TODO unit test for the property 'CallbackUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebhookSubscriptionTests.cs b/src/Flipdish.Test/Model/WebhookSubscriptionTests.cs
deleted file mode 100644
index ac6c0f6a..00000000
--- a/src/Flipdish.Test/Model/WebhookSubscriptionTests.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebhookSubscription
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebhookSubscriptionTests
-    {
-        // TODO uncomment below to declare an instance variable for WebhookSubscription
-        //private WebhookSubscription instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebhookSubscription
-            //instance = new WebhookSubscription();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebhookSubscription
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebhookSubscription
-            //Assert.IsInstanceOfType<WebhookSubscription> (instance, "variable 'instance' is a WebhookSubscription");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Id'
-        /// </summary>
-        [Test]
-        public void IdTest()
-        {
-            // TODO unit test for the property 'Id'
-        }
-        /// <summary>
-        /// Test the property 'OwnerUserId'
-        /// </summary>
-        [Test]
-        public void OwnerUserIdTest()
-        {
-            // TODO unit test for the property 'OwnerUserId'
-        }
-        /// <summary>
-        /// Test the property 'Version'
-        /// </summary>
-        [Test]
-        public void VersionTest()
-        {
-            // TODO unit test for the property 'Version'
-        }
-        /// <summary>
-        /// Test the property 'EventNames'
-        /// </summary>
-        [Test]
-        public void EventNamesTest()
-        {
-            // TODO unit test for the property 'EventNames'
-        }
-        /// <summary>
-        /// Test the property 'CallbackUrl'
-        /// </summary>
-        [Test]
-        public void CallbackUrlTest()
-        {
-            // TODO unit test for the property 'CallbackUrl'
-        }
-        /// <summary>
-        /// Test the property 'Enabled'
-        /// </summary>
-        [Test]
-        public void EnabledTest()
-        {
-            // TODO unit test for the property 'Enabled'
-        }
-        /// <summary>
-        /// Test the property 'VerifyToken'
-        /// </summary>
-        [Test]
-        public void VerifyTokenTest()
-        {
-            // TODO unit test for the property 'VerifyToken'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebhookSubscriptionUpdatedEventTests.cs b/src/Flipdish.Test/Model/WebhookSubscriptionUpdatedEventTests.cs
deleted file mode 100644
index 2bc4caa7..00000000
--- a/src/Flipdish.Test/Model/WebhookSubscriptionUpdatedEventTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebhookSubscriptionUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebhookSubscriptionUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for WebhookSubscriptionUpdatedEvent
-        //private WebhookSubscriptionUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebhookSubscriptionUpdatedEvent
-            //instance = new WebhookSubscriptionUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebhookSubscriptionUpdatedEvent
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebhookSubscriptionUpdatedEvent
-            //Assert.IsInstanceOfType<WebhookSubscriptionUpdatedEvent> (instance, "variable 'instance' is a WebhookSubscriptionUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'WebhookSubscriptionEventInfo'
-        /// </summary>
-        [Test]
-        public void WebhookSubscriptionEventInfoTest()
-        {
-            // TODO unit test for the property 'WebhookSubscriptionEventInfo'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebsiteImageTests.cs b/src/Flipdish.Test/Model/WebsiteImageTests.cs
deleted file mode 100644
index a19d4422..00000000
--- a/src/Flipdish.Test/Model/WebsiteImageTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebsiteImage
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebsiteImageTests
-    {
-        // TODO uncomment below to declare an instance variable for WebsiteImage
-        //private WebsiteImage instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebsiteImage
-            //instance = new WebsiteImage();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebsiteImage
-        /// </summary>
-        [Test]
-        public void WebsiteImageInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebsiteImage
-            //Assert.IsInstanceOfType<WebsiteImage> (instance, "variable 'instance' is a WebsiteImage");
-        }
-
-
-        /// <summary>
-        /// Test the property 'ImageId'
-        /// </summary>
-        [Test]
-        public void ImageIdTest()
-        {
-            // TODO unit test for the property 'ImageId'
-        }
-        /// <summary>
-        /// Test the property 'ImageLocation'
-        /// </summary>
-        [Test]
-        public void ImageLocationTest()
-        {
-            // TODO unit test for the property 'ImageLocation'
-        }
-        /// <summary>
-        /// Test the property 'ImageUrl'
-        /// </summary>
-        [Test]
-        public void ImageUrlTest()
-        {
-            // TODO unit test for the property 'ImageUrl'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebsiteTestimonialBaseTests.cs b/src/Flipdish.Test/Model/WebsiteTestimonialBaseTests.cs
deleted file mode 100644
index d34b23c7..00000000
--- a/src/Flipdish.Test/Model/WebsiteTestimonialBaseTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebsiteTestimonialBase
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebsiteTestimonialBaseTests
-    {
-        // TODO uncomment below to declare an instance variable for WebsiteTestimonialBase
-        //private WebsiteTestimonialBase instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebsiteTestimonialBase
-            //instance = new WebsiteTestimonialBase();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebsiteTestimonialBase
-        /// </summary>
-        [Test]
-        public void WebsiteTestimonialBaseInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebsiteTestimonialBase
-            //Assert.IsInstanceOfType<WebsiteTestimonialBase> (instance, "variable 'instance' is a WebsiteTestimonialBase");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Author'
-        /// </summary>
-        [Test]
-        public void AuthorTest()
-        {
-            // TODO unit test for the property 'Author'
-        }
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebsiteTestimonialTests.cs b/src/Flipdish.Test/Model/WebsiteTestimonialTests.cs
deleted file mode 100644
index 095d796d..00000000
--- a/src/Flipdish.Test/Model/WebsiteTestimonialTests.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebsiteTestimonial
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebsiteTestimonialTests
-    {
-        // TODO uncomment below to declare an instance variable for WebsiteTestimonial
-        //private WebsiteTestimonial instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebsiteTestimonial
-            //instance = new WebsiteTestimonial();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebsiteTestimonial
-        /// </summary>
-        [Test]
-        public void WebsiteTestimonialInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebsiteTestimonial
-            //Assert.IsInstanceOfType<WebsiteTestimonial> (instance, "variable 'instance' is a WebsiteTestimonial");
-        }
-
-
-        /// <summary>
-        /// Test the property 'TestimonialId'
-        /// </summary>
-        [Test]
-        public void TestimonialIdTest()
-        {
-            // TODO unit test for the property 'TestimonialId'
-        }
-        /// <summary>
-        /// Test the property 'Author'
-        /// </summary>
-        [Test]
-        public void AuthorTest()
-        {
-            // TODO unit test for the property 'Author'
-        }
-        /// <summary>
-        /// Test the property 'Message'
-        /// </summary>
-        [Test]
-        public void MessageTest()
-        {
-            // TODO unit test for the property 'Message'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebsiteUpdatedEventTests.cs b/src/Flipdish.Test/Model/WebsiteUpdatedEventTests.cs
deleted file mode 100644
index f0450046..00000000
--- a/src/Flipdish.Test/Model/WebsiteUpdatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebsiteUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebsiteUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for WebsiteUpdatedEvent
-        //private WebsiteUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebsiteUpdatedEvent
-            //instance = new WebsiteUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebsiteUpdatedEvent
-        /// </summary>
-        [Test]
-        public void WebsiteUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebsiteUpdatedEvent
-            //Assert.IsInstanceOfType<WebsiteUpdatedEvent> (instance, "variable 'instance' is a WebsiteUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'AppNameId'
-        /// </summary>
-        [Test]
-        public void AppNameIdTest()
-        {
-            // TODO unit test for the property 'AppNameId'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/Model/WebsiteVanityUrlUpdatedEventTests.cs b/src/Flipdish.Test/Model/WebsiteVanityUrlUpdatedEventTests.cs
deleted file mode 100644
index 2e2b56c8..00000000
--- a/src/Flipdish.Test/Model/WebsiteVanityUrlUpdatedEventTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-
-using NUnit.Framework;
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections.Generic;
-using Flipdish.Api;
-using Flipdish.Model;
-using Flipdish.Client;
-using System.Reflection;
-using Newtonsoft.Json;
-
-namespace Flipdish.Test
-{
-    /// <summary>
-    ///  Class for testing WebsiteVanityUrlUpdatedEvent
-    /// </summary>
-    /// <remarks>
-    /// This file is automatically generated by Swagger Codegen.
-    /// Please update the test case below to test the model.
-    /// </remarks>
-    [TestFixture]
-    public class WebsiteVanityUrlUpdatedEventTests
-    {
-        // TODO uncomment below to declare an instance variable for WebsiteVanityUrlUpdatedEvent
-        //private WebsiteVanityUrlUpdatedEvent instance;
-
-        /// <summary>
-        /// Setup before each test
-        /// </summary>
-        [SetUp]
-        public void Init()
-        {
-            // TODO uncomment below to create an instance of WebsiteVanityUrlUpdatedEvent
-            //instance = new WebsiteVanityUrlUpdatedEvent();
-        }
-
-        /// <summary>
-        /// Clean up after each test
-        /// </summary>
-        [TearDown]
-        public void Cleanup()
-        {
-
-        }
-
-        /// <summary>
-        /// Test an instance of WebsiteVanityUrlUpdatedEvent
-        /// </summary>
-        [Test]
-        public void WebsiteVanityUrlUpdatedEventInstanceTest()
-        {
-            // TODO uncomment below to test "IsInstanceOfType" WebsiteVanityUrlUpdatedEvent
-            //Assert.IsInstanceOfType<WebsiteVanityUrlUpdatedEvent> (instance, "variable 'instance' is a WebsiteVanityUrlUpdatedEvent");
-        }
-
-
-        /// <summary>
-        /// Test the property 'Description'
-        /// </summary>
-        [Test]
-        public void DescriptionTest()
-        {
-            // TODO unit test for the property 'Description'
-        }
-        /// <summary>
-        /// Test the property 'User'
-        /// </summary>
-        [Test]
-        public void UserTest()
-        {
-            // TODO unit test for the property 'User'
-        }
-        /// <summary>
-        /// Test the property 'VanityUrl'
-        /// </summary>
-        [Test]
-        public void VanityUrlTest()
-        {
-            // TODO unit test for the property 'VanityUrl'
-        }
-        /// <summary>
-        /// Test the property 'EventName'
-        /// </summary>
-        [Test]
-        public void EventNameTest()
-        {
-            // TODO unit test for the property 'EventName'
-        }
-        /// <summary>
-        /// Test the property 'FlipdishEventId'
-        /// </summary>
-        [Test]
-        public void FlipdishEventIdTest()
-        {
-            // TODO unit test for the property 'FlipdishEventId'
-        }
-        /// <summary>
-        /// Test the property 'CreateTime'
-        /// </summary>
-        [Test]
-        public void CreateTimeTest()
-        {
-            // TODO unit test for the property 'CreateTime'
-        }
-        /// <summary>
-        /// Test the property 'Position'
-        /// </summary>
-        [Test]
-        public void PositionTest()
-        {
-            // TODO unit test for the property 'Position'
-        }
-        /// <summary>
-        /// Test the property 'AppId'
-        /// </summary>
-        [Test]
-        public void AppIdTest()
-        {
-            // TODO unit test for the property 'AppId'
-        }
-
-    }
-
-}
diff --git a/src/Flipdish.Test/packages.config b/src/Flipdish.Test/packages.config
deleted file mode 100644
index ac390c1d..00000000
--- a/src/Flipdish.Test/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
-  <package id="JsonSubTypes" version="1.2.0" targetFramework="net45" developmentDependency="true" />
-</packages>
diff --git a/src/Flipdish/Api/AccountsApi.cs b/src/Flipdish/Api/AccountsApi.cs
index effb062f..4b1d97d0 100644
--- a/src/Flipdish/Api/AccountsApi.cs
+++ b/src/Flipdish/Api/AccountsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,93 +25,93 @@ public interface IAccountsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Answer a signup question
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
-        /// <param name="answerId">Identifier of the answer</param>
+        /// <param name="signupStepAction"></param>
+        /// <param name="answerId"></param>
         /// <returns></returns>
         void AnswerSignUpQuestion (string signupStepAction, int? answerId);
 
         /// <summary>
-        /// Answer a signup question
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
-        /// <param name="answerId">Identifier of the answer</param>
+        /// <param name="signupStepAction"></param>
+        /// <param name="answerId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> AnswerSignUpQuestionWithHttpInfo (string signupStepAction, int? answerId);
         /// <summary>
-        /// Change password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="changePasswordModel"></param>
         /// <returns></returns>
         void ChangePassword (ChangePasswordModel changePasswordModel);
 
         /// <summary>
-        /// Change password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="changePasswordModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> ChangePasswordWithHttpInfo (ChangePasswordModel changePasswordModel);
         /// <summary>
-        /// Change password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="createAccountModel"></param>
         /// <returns></returns>
-        void ChangePasswordWithPin (SetPasswordWithPinModel changePasswordModel);
+        void CreateAccount (CreateAccountModel createAccountModel);
 
         /// <summary>
-        /// Change password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="createAccountModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> ChangePasswordWithPinWithHttpInfo (SetPasswordWithPinModel changePasswordModel);
+        ApiResponse<Object> CreateAccountWithHttpInfo (CreateAccountModel createAccountModel);
         /// <summary>
-        /// Create account with email address and store name
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createAccountModel">Create account model</param>
-        /// <returns></returns>
-        void CreateAccount (CreateAccountModel createAccountModel);
+        /// <param name="basicAccountModel"></param>
+        /// <returns>string</returns>
+        string CreateBasicAccount (CreateBasicAccountModel basicAccountModel);
 
         /// <summary>
-        /// Create account with email address and store name
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createAccountModel">Create account model</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> CreateAccountWithHttpInfo (CreateAccountModel createAccountModel);
+        /// <param name="basicAccountModel"></param>
+        /// <returns>ApiResponse of string</returns>
+        ApiResponse<string> CreateBasicAccountWithHttpInfo (CreateBasicAccountModel basicAccountModel);
         /// <summary>
-        /// Gets the current account detail
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -121,7 +121,7 @@ public interface IAccountsApi : IApiAccessor
         RestApiResultAccountDetail GetAccountDetails ();
 
         /// <summary>
-        /// Gets the current account detail
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -130,7 +130,7 @@ public interface IAccountsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultAccountDetail</returns>
         ApiResponse<RestApiResultAccountDetail> GetAccountDetailsWithHttpInfo ();
         /// <summary>
-        /// [PRIVATE API] Get timezones localised to users language
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -140,7 +140,7 @@ public interface IAccountsApi : IApiAccessor
         RestApiArrayResultLocalisedTimeZone GetLocalisedTimeZones ();
 
         /// <summary>
-        /// [PRIVATE API] Get timezones localised to users language
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -149,49 +149,47 @@ public interface IAccountsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultLocalisedTimeZone</returns>
         ApiResponse<RestApiArrayResultLocalisedTimeZone> GetLocalisedTimeZonesWithHttpInfo ();
         /// <summary>
-        /// Login with username and password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
+        /// <param name="loginModel"></param>
         /// <returns></returns>
         void Login (LoginModel loginModel);
 
         /// <summary>
-        /// Login with username and password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
+        /// <param name="loginModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> LoginWithHttpInfo (LoginModel loginModel);
         /// <summary>
-        /// Login with username and password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
         /// <returns></returns>
-        void LoginWithPin (LoginWithPinModel loginModel);
+        void LoginSso ();
 
         /// <summary>
-        /// Login with username and password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> LoginWithPinWithHttpInfo (LoginWithPinModel loginModel);
+        ApiResponse<Object> LoginSsoWithHttpInfo ();
         /// <summary>
-        /// Log out. It removes Flipdish authorization Cookie.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -201,7 +199,7 @@ public interface IAccountsApi : IApiAccessor
         void Logout ();
 
         /// <summary>
-        /// Log out. It removes Flipdish authorization Cookie.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -210,221 +208,200 @@ public interface IAccountsApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> LogoutWithHttpInfo ();
         /// <summary>
-        /// Reset password with token.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="passwordResetModel">Password reset model</param>
+        /// <param name="passwordResetModel"></param>
         /// <returns></returns>
         void PasswordResetWithToken (PasswordResetModel passwordResetModel);
 
         /// <summary>
-        /// Reset password with token.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="passwordResetModel">Password reset model</param>
+        /// <param name="passwordResetModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> PasswordResetWithTokenWithHttpInfo (PasswordResetModel passwordResetModel);
         /// <summary>
-        /// Request login PIN. The server sends the PIN to the email address.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestLoginPinRequest">Request login PIN request</param>
-        /// <returns>RequestLoginPinResposne</returns>
-        RequestLoginPinResposne RequestLoginPin (RequestLoginPinModel requestLoginPinRequest);
+        /// <param name="token"></param>
+        /// <returns></returns>
+        void RecaptchaValidate (string token);
 
         /// <summary>
-        /// Request login PIN. The server sends the PIN to the email address.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestLoginPinRequest">Request login PIN request</param>
-        /// <returns>ApiResponse of RequestLoginPinResposne</returns>
-        ApiResponse<RequestLoginPinResposne> RequestLoginPinWithHttpInfo (RequestLoginPinModel requestLoginPinRequest);
+        /// <param name="token"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> RecaptchaValidateWithHttpInfo (string token);
         /// <summary>
-        /// Request password reset. Flipdish system will send a token via email.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetModel">Request password reset model</param>
+        /// <param name="requestPasswordResetModel"></param>
         /// <returns></returns>
         void RequestPasswordReset (RequestPasswordResetModel requestPasswordResetModel);
 
         /// <summary>
-        /// Request password reset. Flipdish system will send a token via email.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetModel">Request password reset model</param>
+        /// <param name="requestPasswordResetModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RequestPasswordResetWithHttpInfo (RequestPasswordResetModel requestPasswordResetModel);
         /// <summary>
-        /// Request Password Reset PIN. The server sends the PIN to the email address.
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetRequest"></param>
-        /// <returns>RequestPasswordResetPinResponse</returns>
-        RequestPasswordResetPinResponse SendPinForPasswordReset (RequestPasswordResetModel requestPasswordResetRequest);
-
-        /// <summary>
-        /// Request Password Reset PIN. The server sends the PIN to the email address.
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetRequest"></param>
-        /// <returns>ApiResponse of RequestPasswordResetPinResponse</returns>
-        ApiResponse<RequestPasswordResetPinResponse> SendPinForPasswordResetWithHttpInfo (RequestPasswordResetModel requestPasswordResetRequest);
-        /// <summary>
-        /// Skip a signup question
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
+        /// <param name="signupStepAction"></param>
         /// <returns></returns>
         void SkipSignupStep (string signupStepAction);
 
         /// <summary>
-        /// Skip a signup question
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
+        /// <param name="signupStepAction"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> SkipSignupStepWithHttpInfo (string signupStepAction);
         /// <summary>
-        /// Update account with name and language
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateAccountModel">Update account model</param>
+        /// <param name="updateAccountModel"></param>
         /// <returns></returns>
         void UpdateAccount (AccountDetailBase updateAccountModel);
 
         /// <summary>
-        /// Update account with name and language
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateAccountModel">Update account model</param>
+        /// <param name="updateAccountModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateAccountWithHttpInfo (AccountDetailBase updateAccountModel);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Answer a signup question
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
-        /// <param name="answerId">Identifier of the answer</param>
+        /// <param name="signupStepAction"></param>
+        /// <param name="answerId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task AnswerSignUpQuestionAsync (string signupStepAction, int? answerId);
 
         /// <summary>
-        /// Answer a signup question
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
-        /// <param name="answerId">Identifier of the answer</param>
+        /// <param name="signupStepAction"></param>
+        /// <param name="answerId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AnswerSignUpQuestionAsyncWithHttpInfo (string signupStepAction, int? answerId);
         /// <summary>
-        /// Change password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="changePasswordModel"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task ChangePasswordAsync (ChangePasswordModel changePasswordModel);
 
         /// <summary>
-        /// Change password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="changePasswordModel"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> ChangePasswordAsyncWithHttpInfo (ChangePasswordModel changePasswordModel);
         /// <summary>
-        /// Change password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="createAccountModel"></param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task ChangePasswordWithPinAsync (SetPasswordWithPinModel changePasswordModel);
+        System.Threading.Tasks.Task CreateAccountAsync (CreateAccountModel createAccountModel);
 
         /// <summary>
-        /// Change password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="createAccountModel"></param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> ChangePasswordWithPinAsyncWithHttpInfo (SetPasswordWithPinModel changePasswordModel);
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateAccountAsyncWithHttpInfo (CreateAccountModel createAccountModel);
         /// <summary>
-        /// Create account with email address and store name
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createAccountModel">Create account model</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task CreateAccountAsync (CreateAccountModel createAccountModel);
+        /// <param name="basicAccountModel"></param>
+        /// <returns>Task of string</returns>
+        System.Threading.Tasks.Task<string> CreateBasicAccountAsync (CreateBasicAccountModel basicAccountModel);
 
         /// <summary>
-        /// Create account with email address and store name
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createAccountModel">Create account model</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> CreateAccountAsyncWithHttpInfo (CreateAccountModel createAccountModel);
+        /// <param name="basicAccountModel"></param>
+        /// <returns>Task of ApiResponse (string)</returns>
+        System.Threading.Tasks.Task<ApiResponse<string>> CreateBasicAccountAsyncWithHttpInfo (CreateBasicAccountModel basicAccountModel);
         /// <summary>
-        /// Gets the current account detail
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -434,7 +411,7 @@ public interface IAccountsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultAccountDetail> GetAccountDetailsAsync ();
 
         /// <summary>
-        /// Gets the current account detail
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -443,7 +420,7 @@ public interface IAccountsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultAccountDetail)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAccountDetail>> GetAccountDetailsAsyncWithHttpInfo ();
         /// <summary>
-        /// [PRIVATE API] Get timezones localised to users language
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -453,7 +430,7 @@ public interface IAccountsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultLocalisedTimeZone> GetLocalisedTimeZonesAsync ();
 
         /// <summary>
-        /// [PRIVATE API] Get timezones localised to users language
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -462,49 +439,47 @@ public interface IAccountsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultLocalisedTimeZone)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLocalisedTimeZone>> GetLocalisedTimeZonesAsyncWithHttpInfo ();
         /// <summary>
-        /// Login with username and password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
+        /// <param name="loginModel"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task LoginAsync (LoginModel loginModel);
 
         /// <summary>
-        /// Login with username and password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
+        /// <param name="loginModel"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> LoginAsyncWithHttpInfo (LoginModel loginModel);
         /// <summary>
-        /// Login with username and password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task LoginWithPinAsync (LoginWithPinModel loginModel);
+        System.Threading.Tasks.Task LoginSsoAsync ();
 
         /// <summary>
-        /// Login with username and password
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> LoginWithPinAsyncWithHttpInfo (LoginWithPinModel loginModel);
+        System.Threading.Tasks.Task<ApiResponse<Object>> LoginSsoAsyncWithHttpInfo ();
         /// <summary>
-        /// Log out. It removes Flipdish authorization Cookie.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -514,7 +489,7 @@ public interface IAccountsApi : IApiAccessor
         System.Threading.Tasks.Task LogoutAsync ();
 
         /// <summary>
-        /// Log out. It removes Flipdish authorization Cookie.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -523,129 +498,108 @@ public interface IAccountsApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> LogoutAsyncWithHttpInfo ();
         /// <summary>
-        /// Reset password with token.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="passwordResetModel">Password reset model</param>
+        /// <param name="passwordResetModel"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task PasswordResetWithTokenAsync (PasswordResetModel passwordResetModel);
 
         /// <summary>
-        /// Reset password with token.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="passwordResetModel">Password reset model</param>
+        /// <param name="passwordResetModel"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> PasswordResetWithTokenAsyncWithHttpInfo (PasswordResetModel passwordResetModel);
         /// <summary>
-        /// Request login PIN. The server sends the PIN to the email address.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestLoginPinRequest">Request login PIN request</param>
-        /// <returns>Task of RequestLoginPinResposne</returns>
-        System.Threading.Tasks.Task<RequestLoginPinResposne> RequestLoginPinAsync (RequestLoginPinModel requestLoginPinRequest);
+        /// <param name="token"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task RecaptchaValidateAsync (string token);
 
         /// <summary>
-        /// Request login PIN. The server sends the PIN to the email address.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestLoginPinRequest">Request login PIN request</param>
-        /// <returns>Task of ApiResponse (RequestLoginPinResposne)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RequestLoginPinResposne>> RequestLoginPinAsyncWithHttpInfo (RequestLoginPinModel requestLoginPinRequest);
+        /// <param name="token"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> RecaptchaValidateAsyncWithHttpInfo (string token);
         /// <summary>
-        /// Request password reset. Flipdish system will send a token via email.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetModel">Request password reset model</param>
+        /// <param name="requestPasswordResetModel"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task RequestPasswordResetAsync (RequestPasswordResetModel requestPasswordResetModel);
 
         /// <summary>
-        /// Request password reset. Flipdish system will send a token via email.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetModel">Request password reset model</param>
+        /// <param name="requestPasswordResetModel"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RequestPasswordResetAsyncWithHttpInfo (RequestPasswordResetModel requestPasswordResetModel);
         /// <summary>
-        /// Request Password Reset PIN. The server sends the PIN to the email address.
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetRequest"></param>
-        /// <returns>Task of RequestPasswordResetPinResponse</returns>
-        System.Threading.Tasks.Task<RequestPasswordResetPinResponse> SendPinForPasswordResetAsync (RequestPasswordResetModel requestPasswordResetRequest);
-
-        /// <summary>
-        /// Request Password Reset PIN. The server sends the PIN to the email address.
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetRequest"></param>
-        /// <returns>Task of ApiResponse (RequestPasswordResetPinResponse)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RequestPasswordResetPinResponse>> SendPinForPasswordResetAsyncWithHttpInfo (RequestPasswordResetModel requestPasswordResetRequest);
-        /// <summary>
-        /// Skip a signup question
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
+        /// <param name="signupStepAction"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task SkipSignupStepAsync (string signupStepAction);
 
         /// <summary>
-        /// Skip a signup question
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
+        /// <param name="signupStepAction"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> SkipSignupStepAsyncWithHttpInfo (string signupStepAction);
         /// <summary>
-        /// Update account with name and language
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateAccountModel">Update account model</param>
+        /// <param name="updateAccountModel"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateAccountAsync (AccountDetailBase updateAccountModel);
 
         /// <summary>
-        /// Update account with name and language
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateAccountModel">Update account model</param>
+        /// <param name="updateAccountModel"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAccountAsyncWithHttpInfo (AccountDetailBase updateAccountModel);
         #endregion Asynchronous Operations
@@ -749,11 +703,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Answer a signup question 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
-        /// <param name="answerId">Identifier of the answer</param>
+        /// <param name="signupStepAction"></param>
+        /// <param name="answerId"></param>
         /// <returns></returns>
         public void AnswerSignUpQuestion (string signupStepAction, int? answerId)
         {
@@ -761,11 +715,11 @@ public void AnswerSignUpQuestion (string signupStepAction, int? answerId)
         }
 
         /// <summary>
-        /// Answer a signup question 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
-        /// <param name="answerId">Identifier of the answer</param>
+        /// <param name="signupStepAction"></param>
+        /// <param name="answerId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> AnswerSignUpQuestionWithHttpInfo (string signupStepAction, int? answerId)
         {
@@ -776,7 +730,7 @@ public ApiResponse<Object> AnswerSignUpQuestionWithHttpInfo (string signupStepAc
             if (answerId == null)
                 throw new ApiException(400, "Missing required parameter 'answerId' when calling AccountsApi->AnswerSignUpQuestion");
 
-            var localVarPath = "/api/v1.0/accounts/signupstep/{signupStepAction}/answer";
+            var localVarPath = "./api/v1.0/accounts/signupstep/{signupStepAction}/answer";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -836,16 +790,16 @@ public ApiResponse<Object> AnswerSignUpQuestionWithHttpInfo (string signupStepAc
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Answer a signup question 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
-        /// <param name="answerId">Identifier of the answer</param>
+        /// <param name="signupStepAction"></param>
+        /// <param name="answerId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task AnswerSignUpQuestionAsync (string signupStepAction, int? answerId)
         {
@@ -854,11 +808,11 @@ public async System.Threading.Tasks.Task AnswerSignUpQuestionAsync (string signu
         }
 
         /// <summary>
-        /// Answer a signup question 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
-        /// <param name="answerId">Identifier of the answer</param>
+        /// <param name="signupStepAction"></param>
+        /// <param name="answerId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> AnswerSignUpQuestionAsyncWithHttpInfo (string signupStepAction, int? answerId)
         {
@@ -869,7 +823,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AnswerSignUpQuesti
             if (answerId == null)
                 throw new ApiException(400, "Missing required parameter 'answerId' when calling AccountsApi->AnswerSignUpQuestion");
 
-            var localVarPath = "/api/v1.0/accounts/signupstep/{signupStepAction}/answer";
+            var localVarPath = "./api/v1.0/accounts/signupstep/{signupStepAction}/answer";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -929,15 +883,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AnswerSignUpQuesti
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Change password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="changePasswordModel"></param>
         /// <returns></returns>
         public void ChangePassword (ChangePasswordModel changePasswordModel)
         {
@@ -945,10 +899,10 @@ public void ChangePassword (ChangePasswordModel changePasswordModel)
         }
 
         /// <summary>
-        /// Change password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="changePasswordModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> ChangePasswordWithHttpInfo (ChangePasswordModel changePasswordModel)
         {
@@ -956,7 +910,7 @@ public ApiResponse<Object> ChangePasswordWithHttpInfo (ChangePasswordModel chang
             if (changePasswordModel == null)
                 throw new ApiException(400, "Missing required parameter 'changePasswordModel' when calling AccountsApi->ChangePassword");
 
-            var localVarPath = "/api/v1.0/accounts/password";
+            var localVarPath = "./api/v1.0/accounts/password";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1015,15 +969,15 @@ public ApiResponse<Object> ChangePasswordWithHttpInfo (ChangePasswordModel chang
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Change password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="changePasswordModel"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task ChangePasswordAsync (ChangePasswordModel changePasswordModel)
         {
@@ -1032,10 +986,10 @@ public async System.Threading.Tasks.Task ChangePasswordAsync (ChangePasswordMode
         }
 
         /// <summary>
-        /// Change password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="changePasswordModel"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> ChangePasswordAsyncWithHttpInfo (ChangePasswordModel changePasswordModel)
         {
@@ -1043,7 +997,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ChangePasswordAsyn
             if (changePasswordModel == null)
                 throw new ApiException(400, "Missing required parameter 'changePasswordModel' when calling AccountsApi->ChangePassword");
 
-            var localVarPath = "/api/v1.0/accounts/password";
+            var localVarPath = "./api/v1.0/accounts/password";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1102,34 +1056,34 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ChangePasswordAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Change password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="createAccountModel"></param>
         /// <returns></returns>
-        public void ChangePasswordWithPin (SetPasswordWithPinModel changePasswordModel)
+        public void CreateAccount (CreateAccountModel createAccountModel)
         {
-             ChangePasswordWithPinWithHttpInfo(changePasswordModel);
+             CreateAccountWithHttpInfo(createAccountModel);
         }
 
         /// <summary>
-        /// Change password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="createAccountModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> ChangePasswordWithPinWithHttpInfo (SetPasswordWithPinModel changePasswordModel)
+        public ApiResponse<Object> CreateAccountWithHttpInfo (CreateAccountModel createAccountModel)
         {
-            // verify the required parameter 'changePasswordModel' is set
-            if (changePasswordModel == null)
-                throw new ApiException(400, "Missing required parameter 'changePasswordModel' when calling AccountsApi->ChangePasswordWithPin");
+            // verify the required parameter 'createAccountModel' is set
+            if (createAccountModel == null)
+                throw new ApiException(400, "Missing required parameter 'createAccountModel' when calling AccountsApi->CreateAccount");
 
-            var localVarPath = "/api/v1.0/accounts/password/pin";
+            var localVarPath = "./api/v1.0/accounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1158,13 +1112,13 @@ public ApiResponse<Object> ChangePasswordWithPinWithHttpInfo (SetPasswordWithPin
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (changePasswordModel != null && changePasswordModel.GetType() != typeof(byte[]))
+            if (createAccountModel != null && createAccountModel.GetType() != typeof(byte[]))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(changePasswordModel); // http body (model) parameter
+                localVarPostBody = this.Configuration.ApiClient.Serialize(createAccountModel); // http body (model) parameter
             }
             else
             {
-                localVarPostBody = changePasswordModel; // byte array
+                localVarPostBody = createAccountModel; // byte array
             }
 
             // authentication (oauth2) required
@@ -1176,47 +1130,47 @@ public ApiResponse<Object> ChangePasswordWithPinWithHttpInfo (SetPasswordWithPin
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("ChangePasswordWithPin", localVarResponse);
+                Exception exception = ExceptionFactory("CreateAccount", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Change password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="createAccountModel"></param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task ChangePasswordWithPinAsync (SetPasswordWithPinModel changePasswordModel)
+        public async System.Threading.Tasks.Task CreateAccountAsync (CreateAccountModel createAccountModel)
         {
-             await ChangePasswordWithPinAsyncWithHttpInfo(changePasswordModel);
+             await CreateAccountAsyncWithHttpInfo(createAccountModel);
 
         }
 
         /// <summary>
-        /// Change password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="changePasswordModel">Change password model</param>
+        /// <param name="createAccountModel"></param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> ChangePasswordWithPinAsyncWithHttpInfo (SetPasswordWithPinModel changePasswordModel)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateAccountAsyncWithHttpInfo (CreateAccountModel createAccountModel)
         {
-            // verify the required parameter 'changePasswordModel' is set
-            if (changePasswordModel == null)
-                throw new ApiException(400, "Missing required parameter 'changePasswordModel' when calling AccountsApi->ChangePasswordWithPin");
+            // verify the required parameter 'createAccountModel' is set
+            if (createAccountModel == null)
+                throw new ApiException(400, "Missing required parameter 'createAccountModel' when calling AccountsApi->CreateAccount");
 
-            var localVarPath = "/api/v1.0/accounts/password/pin";
+            var localVarPath = "./api/v1.0/accounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1245,13 +1199,13 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ChangePasswordWith
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (changePasswordModel != null && changePasswordModel.GetType() != typeof(byte[]))
+            if (createAccountModel != null && createAccountModel.GetType() != typeof(byte[]))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(changePasswordModel); // http body (model) parameter
+                localVarPostBody = this.Configuration.ApiClient.Serialize(createAccountModel); // http body (model) parameter
             }
             else
             {
-                localVarPostBody = changePasswordModel; // byte array
+                localVarPostBody = createAccountModel; // byte array
             }
 
             // authentication (oauth2) required
@@ -1263,46 +1217,47 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ChangePasswordWith
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("ChangePasswordWithPin", localVarResponse);
+                Exception exception = ExceptionFactory("CreateAccount", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Create account with email address and store name 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createAccountModel">Create account model</param>
-        /// <returns></returns>
-        public void CreateAccount (CreateAccountModel createAccountModel)
+        /// <param name="basicAccountModel"></param>
+        /// <returns>string</returns>
+        public string CreateBasicAccount (CreateBasicAccountModel basicAccountModel)
         {
-             CreateAccountWithHttpInfo(createAccountModel);
+             ApiResponse<string> localVarResponse = CreateBasicAccountWithHttpInfo(basicAccountModel);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Create account with email address and store name 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createAccountModel">Create account model</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> CreateAccountWithHttpInfo (CreateAccountModel createAccountModel)
+        /// <param name="basicAccountModel"></param>
+        /// <returns>ApiResponse of string</returns>
+        public ApiResponse< string > CreateBasicAccountWithHttpInfo (CreateBasicAccountModel basicAccountModel)
         {
-            // verify the required parameter 'createAccountModel' is set
-            if (createAccountModel == null)
-                throw new ApiException(400, "Missing required parameter 'createAccountModel' when calling AccountsApi->CreateAccount");
+            // verify the required parameter 'basicAccountModel' is set
+            if (basicAccountModel == null)
+                throw new ApiException(400, "Missing required parameter 'basicAccountModel' when calling AccountsApi->CreateBasicAccount");
 
-            var localVarPath = "/api/v1.0/accounts";
+            var localVarPath = "./api/v1.0/accounts/basic-account";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1331,13 +1286,13 @@ public ApiResponse<Object> CreateAccountWithHttpInfo (CreateAccountModel createA
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (createAccountModel != null && createAccountModel.GetType() != typeof(byte[]))
+            if (basicAccountModel != null && basicAccountModel.GetType() != typeof(byte[]))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(createAccountModel); // http body (model) parameter
+                localVarPostBody = this.Configuration.ApiClient.Serialize(basicAccountModel); // http body (model) parameter
             }
             else
             {
-                localVarPostBody = createAccountModel; // byte array
+                localVarPostBody = basicAccountModel; // byte array
             }
 
             // authentication (oauth2) required
@@ -1356,40 +1311,41 @@ public ApiResponse<Object> CreateAccountWithHttpInfo (CreateAccountModel createA
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("CreateAccount", localVarResponse);
+                Exception exception = ExceptionFactory("CreateBasicAccount", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
         /// <summary>
-        /// Create account with email address and store name 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createAccountModel">Create account model</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task CreateAccountAsync (CreateAccountModel createAccountModel)
+        /// <param name="basicAccountModel"></param>
+        /// <returns>Task of string</returns>
+        public async System.Threading.Tasks.Task<string> CreateBasicAccountAsync (CreateBasicAccountModel basicAccountModel)
         {
-             await CreateAccountAsyncWithHttpInfo(createAccountModel);
+             ApiResponse<string> localVarResponse = await CreateBasicAccountAsyncWithHttpInfo(basicAccountModel);
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Create account with email address and store name 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createAccountModel">Create account model</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateAccountAsyncWithHttpInfo (CreateAccountModel createAccountModel)
+        /// <param name="basicAccountModel"></param>
+        /// <returns>Task of ApiResponse (string)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<string>> CreateBasicAccountAsyncWithHttpInfo (CreateBasicAccountModel basicAccountModel)
         {
-            // verify the required parameter 'createAccountModel' is set
-            if (createAccountModel == null)
-                throw new ApiException(400, "Missing required parameter 'createAccountModel' when calling AccountsApi->CreateAccount");
+            // verify the required parameter 'basicAccountModel' is set
+            if (basicAccountModel == null)
+                throw new ApiException(400, "Missing required parameter 'basicAccountModel' when calling AccountsApi->CreateBasicAccount");
 
-            var localVarPath = "/api/v1.0/accounts";
+            var localVarPath = "./api/v1.0/accounts/basic-account";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1418,13 +1374,13 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateAccountAsync
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (createAccountModel != null && createAccountModel.GetType() != typeof(byte[]))
+            if (basicAccountModel != null && basicAccountModel.GetType() != typeof(byte[]))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(createAccountModel); // http body (model) parameter
+                localVarPostBody = this.Configuration.ApiClient.Serialize(basicAccountModel); // http body (model) parameter
             }
             else
             {
-                localVarPostBody = createAccountModel; // byte array
+                localVarPostBody = basicAccountModel; // byte array
             }
 
             // authentication (oauth2) required
@@ -1443,17 +1399,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateAccountAsync
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("CreateAccount", localVarResponse);
+                Exception exception = ExceptionFactory("CreateBasicAccount", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
         /// <summary>
-        /// Gets the current account detail 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>RestApiResultAccountDetail</returns>
@@ -1464,14 +1420,14 @@ public RestApiResultAccountDetail GetAccountDetails ()
         }
 
         /// <summary>
-        /// Gets the current account detail 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of RestApiResultAccountDetail</returns>
         public ApiResponse< RestApiResultAccountDetail > GetAccountDetailsWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/accounts";
+            var localVarPath = "./api/v1.0/accounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1517,12 +1473,12 @@ public ApiResponse< RestApiResultAccountDetail > GetAccountDetailsWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAccountDetail)));
         }
 
         /// <summary>
-        /// Gets the current account detail 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of RestApiResultAccountDetail</returns>
@@ -1534,14 +1490,14 @@ public async System.Threading.Tasks.Task<RestApiResultAccountDetail> GetAccountD
         }
 
         /// <summary>
-        /// Gets the current account detail 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of ApiResponse (RestApiResultAccountDetail)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAccountDetail>> GetAccountDetailsAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/accounts";
+            var localVarPath = "./api/v1.0/accounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1587,12 +1543,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAccountDetail>
             }
 
             return new ApiResponse<RestApiResultAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAccountDetail)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get timezones localised to users language 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>RestApiArrayResultLocalisedTimeZone</returns>
@@ -1603,14 +1559,14 @@ public RestApiArrayResultLocalisedTimeZone GetLocalisedTimeZones ()
         }
 
         /// <summary>
-        /// [PRIVATE API] Get timezones localised to users language 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of RestApiArrayResultLocalisedTimeZone</returns>
         public ApiResponse< RestApiArrayResultLocalisedTimeZone > GetLocalisedTimeZonesWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/accounts/timezones";
+            var localVarPath = "./api/v1.0/accounts/timezones";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1656,12 +1612,12 @@ public ApiResponse< RestApiArrayResultLocalisedTimeZone > GetLocalisedTimeZonesW
             }
 
             return new ApiResponse<RestApiArrayResultLocalisedTimeZone>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultLocalisedTimeZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultLocalisedTimeZone)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get timezones localised to users language 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of RestApiArrayResultLocalisedTimeZone</returns>
@@ -1673,14 +1629,14 @@ public async System.Threading.Tasks.Task<RestApiArrayResultLocalisedTimeZone> Ge
         }
 
         /// <summary>
-        /// [PRIVATE API] Get timezones localised to users language 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of ApiResponse (RestApiArrayResultLocalisedTimeZone)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLocalisedTimeZone>> GetLocalisedTimeZonesAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/accounts/timezones";
+            var localVarPath = "./api/v1.0/accounts/timezones";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1726,15 +1682,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLocalised
             }
 
             return new ApiResponse<RestApiArrayResultLocalisedTimeZone>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultLocalisedTimeZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultLocalisedTimeZone)));
         }
 
         /// <summary>
-        /// Login with username and password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
+        /// <param name="loginModel"></param>
         /// <returns></returns>
         public void Login (LoginModel loginModel)
         {
@@ -1742,10 +1698,10 @@ public void Login (LoginModel loginModel)
         }
 
         /// <summary>
-        /// Login with username and password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
+        /// <param name="loginModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> LoginWithHttpInfo (LoginModel loginModel)
         {
@@ -1753,7 +1709,7 @@ public ApiResponse<Object> LoginWithHttpInfo (LoginModel loginModel)
             if (loginModel == null)
                 throw new ApiException(400, "Missing required parameter 'loginModel' when calling AccountsApi->Login");
 
-            var localVarPath = "/api/v1.0/accounts/login";
+            var localVarPath = "./api/v1.0/accounts/login";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1812,15 +1768,15 @@ public ApiResponse<Object> LoginWithHttpInfo (LoginModel loginModel)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Login with username and password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
+        /// <param name="loginModel"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task LoginAsync (LoginModel loginModel)
         {
@@ -1829,10 +1785,10 @@ public async System.Threading.Tasks.Task LoginAsync (LoginModel loginModel)
         }
 
         /// <summary>
-        /// Login with username and password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
+        /// <param name="loginModel"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginAsyncWithHttpInfo (LoginModel loginModel)
         {
@@ -1840,7 +1796,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginAsyncWithHttp
             if (loginModel == null)
                 throw new ApiException(400, "Missing required parameter 'loginModel' when calling AccountsApi->Login");
 
-            var localVarPath = "/api/v1.0/accounts/login";
+            var localVarPath = "./api/v1.0/accounts/login";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1899,34 +1855,29 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginAsyncWithHttp
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Login with username and password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
         /// <returns></returns>
-        public void LoginWithPin (LoginWithPinModel loginModel)
+        public void LoginSso ()
         {
-             LoginWithPinWithHttpInfo(loginModel);
+             LoginSsoWithHttpInfo();
         }
 
         /// <summary>
-        /// Login with username and password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> LoginWithPinWithHttpInfo (LoginWithPinModel loginModel)
+        public ApiResponse<Object> LoginSsoWithHttpInfo ()
         {
-            // verify the required parameter 'loginModel' is set
-            if (loginModel == null)
-                throw new ApiException(400, "Missing required parameter 'loginModel' when calling AccountsApi->LoginWithPin");
 
-            var localVarPath = "/api/v1.0/accounts/login/pin";
+            var localVarPath = "./api/v1.0/accounts/login/sso";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1936,11 +1887,6 @@ public ApiResponse<Object> LoginWithPinWithHttpInfo (LoginWithPinModel loginMode
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1955,14 +1901,6 @@ public ApiResponse<Object> LoginWithPinWithHttpInfo (LoginWithPinModel loginMode
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (loginModel != null && loginModel.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(loginModel); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = loginModel; // byte array
-            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1980,40 +1918,35 @@ public ApiResponse<Object> LoginWithPinWithHttpInfo (LoginWithPinModel loginMode
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("LoginWithPin", localVarResponse);
+                Exception exception = ExceptionFactory("LoginSso", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Login with username and password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task LoginWithPinAsync (LoginWithPinModel loginModel)
+        public async System.Threading.Tasks.Task LoginSsoAsync ()
         {
-             await LoginWithPinAsyncWithHttpInfo(loginModel);
+             await LoginSsoAsyncWithHttpInfo();
 
         }
 
         /// <summary>
-        /// Login with username and password 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="loginModel">Login model</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginWithPinAsyncWithHttpInfo (LoginWithPinModel loginModel)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginSsoAsyncWithHttpInfo ()
         {
-            // verify the required parameter 'loginModel' is set
-            if (loginModel == null)
-                throw new ApiException(400, "Missing required parameter 'loginModel' when calling AccountsApi->LoginWithPin");
 
-            var localVarPath = "/api/v1.0/accounts/login/pin";
+            var localVarPath = "./api/v1.0/accounts/login/sso";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2023,11 +1956,6 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginWithPinAsyncW
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -2042,14 +1970,6 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginWithPinAsyncW
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (loginModel != null && loginModel.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(loginModel); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = loginModel; // byte array
-            }
 
             // authentication (oauth2) required
             // oauth required
@@ -2067,17 +1987,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginWithPinAsyncW
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("LoginWithPin", localVarResponse);
+                Exception exception = ExceptionFactory("LoginSso", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Log out. It removes Flipdish authorization Cookie. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns></returns>
@@ -2087,14 +2007,14 @@ public void Logout ()
         }
 
         /// <summary>
-        /// Log out. It removes Flipdish authorization Cookie. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> LogoutWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/accounts/logout";
+            var localVarPath = "./api/v1.0/accounts/logout";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2140,12 +2060,12 @@ public ApiResponse<Object> LogoutWithHttpInfo ()
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Log out. It removes Flipdish authorization Cookie. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of void</returns>
@@ -2156,14 +2076,14 @@ public async System.Threading.Tasks.Task LogoutAsync ()
         }
 
         /// <summary>
-        /// Log out. It removes Flipdish authorization Cookie. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> LogoutAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/accounts/logout";
+            var localVarPath = "./api/v1.0/accounts/logout";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2209,15 +2129,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LogoutAsyncWithHtt
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Reset password with token. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="passwordResetModel">Password reset model</param>
+        /// <param name="passwordResetModel"></param>
         /// <returns></returns>
         public void PasswordResetWithToken (PasswordResetModel passwordResetModel)
         {
@@ -2225,10 +2145,10 @@ public void PasswordResetWithToken (PasswordResetModel passwordResetModel)
         }
 
         /// <summary>
-        /// Reset password with token. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="passwordResetModel">Password reset model</param>
+        /// <param name="passwordResetModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> PasswordResetWithTokenWithHttpInfo (PasswordResetModel passwordResetModel)
         {
@@ -2236,7 +2156,7 @@ public ApiResponse<Object> PasswordResetWithTokenWithHttpInfo (PasswordResetMode
             if (passwordResetModel == null)
                 throw new ApiException(400, "Missing required parameter 'passwordResetModel' when calling AccountsApi->PasswordResetWithToken");
 
-            var localVarPath = "/api/v1.0/accounts/password";
+            var localVarPath = "./api/v1.0/accounts/password";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2295,15 +2215,15 @@ public ApiResponse<Object> PasswordResetWithTokenWithHttpInfo (PasswordResetMode
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Reset password with token. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="passwordResetModel">Password reset model</param>
+        /// <param name="passwordResetModel"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task PasswordResetWithTokenAsync (PasswordResetModel passwordResetModel)
         {
@@ -2312,10 +2232,10 @@ public async System.Threading.Tasks.Task PasswordResetWithTokenAsync (PasswordRe
         }
 
         /// <summary>
-        /// Reset password with token. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="passwordResetModel">Password reset model</param>
+        /// <param name="passwordResetModel"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> PasswordResetWithTokenAsyncWithHttpInfo (PasswordResetModel passwordResetModel)
         {
@@ -2323,7 +2243,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PasswordResetWithT
             if (passwordResetModel == null)
                 throw new ApiException(400, "Missing required parameter 'passwordResetModel' when calling AccountsApi->PasswordResetWithToken");
 
-            var localVarPath = "/api/v1.0/accounts/password";
+            var localVarPath = "./api/v1.0/accounts/password";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2382,35 +2302,34 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PasswordResetWithT
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Request login PIN. The server sends the PIN to the email address. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestLoginPinRequest">Request login PIN request</param>
-        /// <returns>RequestLoginPinResposne</returns>
-        public RequestLoginPinResposne RequestLoginPin (RequestLoginPinModel requestLoginPinRequest)
+        /// <param name="token"></param>
+        /// <returns></returns>
+        public void RecaptchaValidate (string token)
         {
-             ApiResponse<RequestLoginPinResposne> localVarResponse = RequestLoginPinWithHttpInfo(requestLoginPinRequest);
-             return localVarResponse.Data;
+             RecaptchaValidateWithHttpInfo(token);
         }
 
         /// <summary>
-        /// Request login PIN. The server sends the PIN to the email address. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestLoginPinRequest">Request login PIN request</param>
-        /// <returns>ApiResponse of RequestLoginPinResposne</returns>
-        public ApiResponse< RequestLoginPinResposne > RequestLoginPinWithHttpInfo (RequestLoginPinModel requestLoginPinRequest)
+        /// <param name="token"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> RecaptchaValidateWithHttpInfo (string token)
         {
-            // verify the required parameter 'requestLoginPinRequest' is set
-            if (requestLoginPinRequest == null)
-                throw new ApiException(400, "Missing required parameter 'requestLoginPinRequest' when calling AccountsApi->RequestLoginPin");
+            // verify the required parameter 'token' is set
+            if (token == null)
+                throw new ApiException(400, "Missing required parameter 'token' when calling AccountsApi->RecaptchaValidate");
 
-            var localVarPath = "/api/v1.0/accounts/pin";
+            var localVarPath = "./api/v1.0/accounts/recaptcha";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2420,11 +2339,6 @@ public ApiResponse< RequestLoginPinResposne > RequestLoginPinWithHttpInfo (Reque
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -2439,14 +2353,7 @@ public ApiResponse< RequestLoginPinResposne > RequestLoginPinWithHttpInfo (Reque
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (requestLoginPinRequest != null && requestLoginPinRequest.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(requestLoginPinRequest); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = requestLoginPinRequest; // byte array
-            }
+            if (token != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "token", token)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2464,41 +2371,40 @@ public ApiResponse< RequestLoginPinResposne > RequestLoginPinWithHttpInfo (Reque
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("RequestLoginPin", localVarResponse);
+                Exception exception = ExceptionFactory("RecaptchaValidate", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RequestLoginPinResposne>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RequestLoginPinResposne) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RequestLoginPinResposne)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Request login PIN. The server sends the PIN to the email address. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestLoginPinRequest">Request login PIN request</param>
-        /// <returns>Task of RequestLoginPinResposne</returns>
-        public async System.Threading.Tasks.Task<RequestLoginPinResposne> RequestLoginPinAsync (RequestLoginPinModel requestLoginPinRequest)
+        /// <param name="token"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task RecaptchaValidateAsync (string token)
         {
-             ApiResponse<RequestLoginPinResposne> localVarResponse = await RequestLoginPinAsyncWithHttpInfo(requestLoginPinRequest);
-             return localVarResponse.Data;
+             await RecaptchaValidateAsyncWithHttpInfo(token);
 
         }
 
         /// <summary>
-        /// Request login PIN. The server sends the PIN to the email address. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestLoginPinRequest">Request login PIN request</param>
-        /// <returns>Task of ApiResponse (RequestLoginPinResposne)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RequestLoginPinResposne>> RequestLoginPinAsyncWithHttpInfo (RequestLoginPinModel requestLoginPinRequest)
+        /// <param name="token"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> RecaptchaValidateAsyncWithHttpInfo (string token)
         {
-            // verify the required parameter 'requestLoginPinRequest' is set
-            if (requestLoginPinRequest == null)
-                throw new ApiException(400, "Missing required parameter 'requestLoginPinRequest' when calling AccountsApi->RequestLoginPin");
+            // verify the required parameter 'token' is set
+            if (token == null)
+                throw new ApiException(400, "Missing required parameter 'token' when calling AccountsApi->RecaptchaValidate");
 
-            var localVarPath = "/api/v1.0/accounts/pin";
+            var localVarPath = "./api/v1.0/accounts/recaptcha";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2508,11 +2414,6 @@ public async System.Threading.Tasks.Task<ApiResponse<RequestLoginPinResposne>> R
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -2527,14 +2428,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RequestLoginPinResposne>> R
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (requestLoginPinRequest != null && requestLoginPinRequest.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(requestLoginPinRequest); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = requestLoginPinRequest; // byte array
-            }
+            if (token != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "token", token)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2552,20 +2446,20 @@ public async System.Threading.Tasks.Task<ApiResponse<RequestLoginPinResposne>> R
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("RequestLoginPin", localVarResponse);
+                Exception exception = ExceptionFactory("RecaptchaValidate", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RequestLoginPinResposne>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RequestLoginPinResposne) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RequestLoginPinResposne)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Request password reset. Flipdish system will send a token via email. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetModel">Request password reset model</param>
+        /// <param name="requestPasswordResetModel"></param>
         /// <returns></returns>
         public void RequestPasswordReset (RequestPasswordResetModel requestPasswordResetModel)
         {
@@ -2573,10 +2467,10 @@ public void RequestPasswordReset (RequestPasswordResetModel requestPasswordReset
         }
 
         /// <summary>
-        /// Request password reset. Flipdish system will send a token via email. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetModel">Request password reset model</param>
+        /// <param name="requestPasswordResetModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> RequestPasswordResetWithHttpInfo (RequestPasswordResetModel requestPasswordResetModel)
         {
@@ -2584,7 +2478,7 @@ public ApiResponse<Object> RequestPasswordResetWithHttpInfo (RequestPasswordRese
             if (requestPasswordResetModel == null)
                 throw new ApiException(400, "Missing required parameter 'requestPasswordResetModel' when calling AccountsApi->RequestPasswordReset");
 
-            var localVarPath = "/api/v1.0/accounts/passwordreset";
+            var localVarPath = "./api/v1.0/accounts/passwordreset";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2643,15 +2537,15 @@ public ApiResponse<Object> RequestPasswordResetWithHttpInfo (RequestPasswordRese
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Request password reset. Flipdish system will send a token via email. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetModel">Request password reset model</param>
+        /// <param name="requestPasswordResetModel"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task RequestPasswordResetAsync (RequestPasswordResetModel requestPasswordResetModel)
         {
@@ -2660,10 +2554,10 @@ public async System.Threading.Tasks.Task RequestPasswordResetAsync (RequestPassw
         }
 
         /// <summary>
-        /// Request password reset. Flipdish system will send a token via email. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetModel">Request password reset model</param>
+        /// <param name="requestPasswordResetModel"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> RequestPasswordResetAsyncWithHttpInfo (RequestPasswordResetModel requestPasswordResetModel)
         {
@@ -2671,7 +2565,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RequestPasswordRes
             if (requestPasswordResetModel == null)
                 throw new ApiException(400, "Missing required parameter 'requestPasswordResetModel' when calling AccountsApi->RequestPasswordReset");
 
-            var localVarPath = "/api/v1.0/accounts/passwordreset";
+            var localVarPath = "./api/v1.0/accounts/passwordreset";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2730,190 +2624,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RequestPasswordRes
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Request Password Reset PIN. The server sends the PIN to the email address. 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetRequest"></param>
-        /// <returns>RequestPasswordResetPinResponse</returns>
-        public RequestPasswordResetPinResponse SendPinForPasswordReset (RequestPasswordResetModel requestPasswordResetRequest)
-        {
-             ApiResponse<RequestPasswordResetPinResponse> localVarResponse = SendPinForPasswordResetWithHttpInfo(requestPasswordResetRequest);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Request Password Reset PIN. The server sends the PIN to the email address. 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetRequest"></param>
-        /// <returns>ApiResponse of RequestPasswordResetPinResponse</returns>
-        public ApiResponse< RequestPasswordResetPinResponse > SendPinForPasswordResetWithHttpInfo (RequestPasswordResetModel requestPasswordResetRequest)
-        {
-            // verify the required parameter 'requestPasswordResetRequest' is set
-            if (requestPasswordResetRequest == null)
-                throw new ApiException(400, "Missing required parameter 'requestPasswordResetRequest' when calling AccountsApi->SendPinForPasswordReset");
-
-            var localVarPath = "/api/v1.0/accounts/password/resetpin";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (requestPasswordResetRequest != null && requestPasswordResetRequest.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(requestPasswordResetRequest); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = requestPasswordResetRequest; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SendPinForPasswordReset", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RequestPasswordResetPinResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RequestPasswordResetPinResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RequestPasswordResetPinResponse)));
-        }
-
-        /// <summary>
-        /// Request Password Reset PIN. The server sends the PIN to the email address. 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetRequest"></param>
-        /// <returns>Task of RequestPasswordResetPinResponse</returns>
-        public async System.Threading.Tasks.Task<RequestPasswordResetPinResponse> SendPinForPasswordResetAsync (RequestPasswordResetModel requestPasswordResetRequest)
-        {
-             ApiResponse<RequestPasswordResetPinResponse> localVarResponse = await SendPinForPasswordResetAsyncWithHttpInfo(requestPasswordResetRequest);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Request Password Reset PIN. The server sends the PIN to the email address. 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="requestPasswordResetRequest"></param>
-        /// <returns>Task of ApiResponse (RequestPasswordResetPinResponse)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RequestPasswordResetPinResponse>> SendPinForPasswordResetAsyncWithHttpInfo (RequestPasswordResetModel requestPasswordResetRequest)
-        {
-            // verify the required parameter 'requestPasswordResetRequest' is set
-            if (requestPasswordResetRequest == null)
-                throw new ApiException(400, "Missing required parameter 'requestPasswordResetRequest' when calling AccountsApi->SendPinForPasswordReset");
-
-            var localVarPath = "/api/v1.0/accounts/password/resetpin";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (requestPasswordResetRequest != null && requestPasswordResetRequest.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(requestPasswordResetRequest); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = requestPasswordResetRequest; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SendPinForPasswordReset", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RequestPasswordResetPinResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RequestPasswordResetPinResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RequestPasswordResetPinResponse)));
-        }
-
-        /// <summary>
-        /// Skip a signup question 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
+        /// <param name="signupStepAction"></param>
         /// <returns></returns>
         public void SkipSignupStep (string signupStepAction)
         {
@@ -2921,10 +2640,10 @@ public void SkipSignupStep (string signupStepAction)
         }
 
         /// <summary>
-        /// Skip a signup question 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
+        /// <param name="signupStepAction"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> SkipSignupStepWithHttpInfo (string signupStepAction)
         {
@@ -2932,7 +2651,7 @@ public ApiResponse<Object> SkipSignupStepWithHttpInfo (string signupStepAction)
             if (signupStepAction == null)
                 throw new ApiException(400, "Missing required parameter 'signupStepAction' when calling AccountsApi->SkipSignupStep");
 
-            var localVarPath = "/api/v1.0/accounts/signupstep/{signupStepAction}/skip";
+            var localVarPath = "./api/v1.0/accounts/signupstep/{signupStepAction}/skip";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2979,15 +2698,15 @@ public ApiResponse<Object> SkipSignupStepWithHttpInfo (string signupStepAction)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Skip a signup question 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
+        /// <param name="signupStepAction"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task SkipSignupStepAsync (string signupStepAction)
         {
@@ -2996,10 +2715,10 @@ public async System.Threading.Tasks.Task SkipSignupStepAsync (string signupStepA
         }
 
         /// <summary>
-        /// Skip a signup question 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="signupStepAction">Signup step action</param>
+        /// <param name="signupStepAction"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> SkipSignupStepAsyncWithHttpInfo (string signupStepAction)
         {
@@ -3007,7 +2726,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SkipSignupStepAsyn
             if (signupStepAction == null)
                 throw new ApiException(400, "Missing required parameter 'signupStepAction' when calling AccountsApi->SkipSignupStep");
 
-            var localVarPath = "/api/v1.0/accounts/signupstep/{signupStepAction}/skip";
+            var localVarPath = "./api/v1.0/accounts/signupstep/{signupStepAction}/skip";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3054,15 +2773,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SkipSignupStepAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update account with name and language 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateAccountModel">Update account model</param>
+        /// <param name="updateAccountModel"></param>
         /// <returns></returns>
         public void UpdateAccount (AccountDetailBase updateAccountModel)
         {
@@ -3070,10 +2789,10 @@ public void UpdateAccount (AccountDetailBase updateAccountModel)
         }
 
         /// <summary>
-        /// Update account with name and language 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateAccountModel">Update account model</param>
+        /// <param name="updateAccountModel"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateAccountWithHttpInfo (AccountDetailBase updateAccountModel)
         {
@@ -3081,7 +2800,7 @@ public ApiResponse<Object> UpdateAccountWithHttpInfo (AccountDetailBase updateAc
             if (updateAccountModel == null)
                 throw new ApiException(400, "Missing required parameter 'updateAccountModel' when calling AccountsApi->UpdateAccount");
 
-            var localVarPath = "/api/v1.0/accounts";
+            var localVarPath = "./api/v1.0/accounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3140,15 +2859,15 @@ public ApiResponse<Object> UpdateAccountWithHttpInfo (AccountDetailBase updateAc
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update account with name and language 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateAccountModel">Update account model</param>
+        /// <param name="updateAccountModel"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateAccountAsync (AccountDetailBase updateAccountModel)
         {
@@ -3157,10 +2876,10 @@ public async System.Threading.Tasks.Task UpdateAccountAsync (AccountDetailBase u
         }
 
         /// <summary>
-        /// Update account with name and language 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateAccountModel">Update account model</param>
+        /// <param name="updateAccountModel"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAccountAsyncWithHttpInfo (AccountDetailBase updateAccountModel)
         {
@@ -3168,7 +2887,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAccountAsync
             if (updateAccountModel == null)
                 throw new ApiException(400, "Missing required parameter 'updateAccountModel' when calling AccountsApi->UpdateAccount");
 
-            var localVarPath = "/api/v1.0/accounts";
+            var localVarPath = "./api/v1.0/accounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3227,7 +2946,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAccountAsync
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/AddressApi.cs b/src/Flipdish/Api/AddressApi.cs
index ccfe4bc2..eb3d7bd2 100644
--- a/src/Flipdish/Api/AddressApi.cs
+++ b/src/Flipdish/Api/AddressApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,76 +25,97 @@ public interface IAddressApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language.
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="address"></param>
+        /// <returns>RestApiStringResult</returns>
+        RestApiStringResult AddressTemplates (StoreAddressForm address);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="address"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        ApiResponse<RestApiStringResult> AddressTemplatesWithHttpInfo (StoreAddressForm address);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application (WhiteLabel) Id (WhiteLabelId or AppNameId).</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>RestApiResultAddressFormResponse</returns>
         RestApiResultAddressFormResponse FormByApp (string appId, string language = null);
 
         /// <summary>
-        /// Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application (WhiteLabel) Id (WhiteLabelId or AppNameId).</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultAddressFormResponse</returns>
         ApiResponse<RestApiResultAddressFormResponse> FormByAppWithHttpInfo (string appId, string language = null);
         /// <summary>
-        /// Provides a dyamic form definition for the given country code, with labels localized using the provided language.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="countryCode">The 2 letter ISO country code, e.g.: IE.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="countryCode"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>RestApiResultAddressFormResponse</returns>
         RestApiResultAddressFormResponse FormByCountry (string countryCode, string language = null);
 
         /// <summary>
-        /// Provides a dyamic form definition for the given country code, with labels localized using the provided language.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="countryCode">The 2 letter ISO country code, e.g.: IE.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="countryCode"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultAddressFormResponse</returns>
         ApiResponse<RestApiResultAddressFormResponse> FormByCountryWithHttpInfo (string countryCode, string language = null);
         /// <summary>
-        /// Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="googleAddress">A Google address object, as it is retuned from the maps API.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="googleAddress"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>RestApiResultAddressFormResponse</returns>
         RestApiResultAddressFormResponse FormatGoogleAddress (GoogleAddress googleAddress, string language = null);
 
         /// <summary>
-        /// Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="googleAddress">A Google address object, as it is retuned from the maps API.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="googleAddress"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultAddressFormResponse</returns>
         ApiResponse<RestApiResultAddressFormResponse> FormatGoogleAddressWithHttpInfo (GoogleAddress googleAddress, string language = null);
         /// <summary>
-        /// Retuns a list of localised countries
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -105,7 +126,7 @@ public interface IAddressApi : IApiAccessor
         RestApiResultCountryFormResponse GetCountries (string language = null);
 
         /// <summary>
-        /// Retuns a list of localised countries
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -117,76 +138,97 @@ public interface IAddressApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language.
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="address"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        System.Threading.Tasks.Task<RestApiStringResult> AddressTemplatesAsync (StoreAddressForm address);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="address"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> AddressTemplatesAsyncWithHttpInfo (StoreAddressForm address);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application (WhiteLabel) Id (WhiteLabelId or AppNameId).</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of RestApiResultAddressFormResponse</returns>
         System.Threading.Tasks.Task<RestApiResultAddressFormResponse> FormByAppAsync (string appId, string language = null);
 
         /// <summary>
-        /// Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application (WhiteLabel) Id (WhiteLabelId or AppNameId).</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultAddressFormResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormResponse>> FormByAppAsyncWithHttpInfo (string appId, string language = null);
         /// <summary>
-        /// Provides a dyamic form definition for the given country code, with labels localized using the provided language.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="countryCode">The 2 letter ISO country code, e.g.: IE.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="countryCode"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of RestApiResultAddressFormResponse</returns>
         System.Threading.Tasks.Task<RestApiResultAddressFormResponse> FormByCountryAsync (string countryCode, string language = null);
 
         /// <summary>
-        /// Provides a dyamic form definition for the given country code, with labels localized using the provided language.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="countryCode">The 2 letter ISO country code, e.g.: IE.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="countryCode"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultAddressFormResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormResponse>> FormByCountryAsyncWithHttpInfo (string countryCode, string language = null);
         /// <summary>
-        /// Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="googleAddress">A Google address object, as it is retuned from the maps API.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="googleAddress"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of RestApiResultAddressFormResponse</returns>
         System.Threading.Tasks.Task<RestApiResultAddressFormResponse> FormatGoogleAddressAsync (GoogleAddress googleAddress, string language = null);
 
         /// <summary>
-        /// Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="googleAddress">A Google address object, as it is retuned from the maps API.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="googleAddress"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultAddressFormResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormResponse>> FormatGoogleAddressAsyncWithHttpInfo (GoogleAddress googleAddress, string language = null);
         /// <summary>
-        /// Retuns a list of localised countries
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -197,7 +239,7 @@ public interface IAddressApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultCountryFormResponse> GetCountriesAsync (string language = null);
 
         /// <summary>
-        /// Retuns a list of localised countries
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -307,11 +349,186 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language. 
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="address"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult AddressTemplates (StoreAddressForm address)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = AddressTemplatesWithHttpInfo(address);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application (WhiteLabel) Id (WhiteLabelId or AppNameId).</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="address"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > AddressTemplatesWithHttpInfo (StoreAddressForm address)
+        {
+            // verify the required parameter 'address' is set
+            if (address == null)
+                throw new ApiException(400, "Missing required parameter 'address' when calling AddressApi->AddressTemplates");
+
+            var localVarPath = "./api/v1.0/address/templates";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (address != null && address.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(address); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = address; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddressTemplates", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="address"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> AddressTemplatesAsync (StoreAddressForm address)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = await AddressTemplatesAsyncWithHttpInfo(address);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="address"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> AddressTemplatesAsyncWithHttpInfo (StoreAddressForm address)
+        {
+            // verify the required parameter 'address' is set
+            if (address == null)
+                throw new ApiException(400, "Missing required parameter 'address' when calling AddressApi->AddressTemplates");
+
+            var localVarPath = "./api/v1.0/address/templates";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (address != null && address.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(address); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = address; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddressTemplates", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>RestApiResultAddressFormResponse</returns>
         public RestApiResultAddressFormResponse FormByApp (string appId, string language = null)
         {
@@ -320,11 +537,11 @@ public RestApiResultAddressFormResponse FormByApp (string appId, string language
         }
 
         /// <summary>
-        /// Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application (WhiteLabel) Id (WhiteLabelId or AppNameId).</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultAddressFormResponse</returns>
         public ApiResponse< RestApiResultAddressFormResponse > FormByAppWithHttpInfo (string appId, string language = null)
         {
@@ -332,7 +549,7 @@ public ApiResponse< RestApiResultAddressFormResponse > FormByAppWithHttpInfo (st
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling AddressApi->FormByApp");
 
-            var localVarPath = "/api/v1.0/app/{appId}/address/form";
+            var localVarPath = "./api/v1.0/app/{appId}/address/form";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -380,16 +597,16 @@ public ApiResponse< RestApiResultAddressFormResponse > FormByAppWithHttpInfo (st
             }
 
             return new ApiResponse<RestApiResultAddressFormResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAddressFormResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAddressFormResponse)));
         }
 
         /// <summary>
-        /// Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application (WhiteLabel) Id (WhiteLabelId or AppNameId).</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of RestApiResultAddressFormResponse</returns>
         public async System.Threading.Tasks.Task<RestApiResultAddressFormResponse> FormByAppAsync (string appId, string language = null)
         {
@@ -399,11 +616,11 @@ public async System.Threading.Tasks.Task<RestApiResultAddressFormResponse> FormB
         }
 
         /// <summary>
-        /// Provides a dyamic form definition based for the country of the given appId, with labels localized using the provided language. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application (WhiteLabel) Id (WhiteLabelId or AppNameId).</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultAddressFormResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormResponse>> FormByAppAsyncWithHttpInfo (string appId, string language = null)
         {
@@ -411,7 +628,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormRes
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling AddressApi->FormByApp");
 
-            var localVarPath = "/api/v1.0/app/{appId}/address/form";
+            var localVarPath = "./api/v1.0/app/{appId}/address/form";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -459,16 +676,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormRes
             }
 
             return new ApiResponse<RestApiResultAddressFormResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAddressFormResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAddressFormResponse)));
         }
 
         /// <summary>
-        /// Provides a dyamic form definition for the given country code, with labels localized using the provided language. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="countryCode">The 2 letter ISO country code, e.g.: IE.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="countryCode"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>RestApiResultAddressFormResponse</returns>
         public RestApiResultAddressFormResponse FormByCountry (string countryCode, string language = null)
         {
@@ -477,11 +694,11 @@ public RestApiResultAddressFormResponse FormByCountry (string countryCode, strin
         }
 
         /// <summary>
-        /// Provides a dyamic form definition for the given country code, with labels localized using the provided language. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="countryCode">The 2 letter ISO country code, e.g.: IE.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="countryCode"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultAddressFormResponse</returns>
         public ApiResponse< RestApiResultAddressFormResponse > FormByCountryWithHttpInfo (string countryCode, string language = null)
         {
@@ -489,7 +706,7 @@ public ApiResponse< RestApiResultAddressFormResponse > FormByCountryWithHttpInfo
             if (countryCode == null)
                 throw new ApiException(400, "Missing required parameter 'countryCode' when calling AddressApi->FormByCountry");
 
-            var localVarPath = "/api/v1.0/address/country/{countryCode}/form";
+            var localVarPath = "./api/v1.0/address/country/{countryCode}/form";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -537,16 +754,16 @@ public ApiResponse< RestApiResultAddressFormResponse > FormByCountryWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultAddressFormResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAddressFormResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAddressFormResponse)));
         }
 
         /// <summary>
-        /// Provides a dyamic form definition for the given country code, with labels localized using the provided language. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="countryCode">The 2 letter ISO country code, e.g.: IE.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="countryCode"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of RestApiResultAddressFormResponse</returns>
         public async System.Threading.Tasks.Task<RestApiResultAddressFormResponse> FormByCountryAsync (string countryCode, string language = null)
         {
@@ -556,11 +773,11 @@ public async System.Threading.Tasks.Task<RestApiResultAddressFormResponse> FormB
         }
 
         /// <summary>
-        /// Provides a dyamic form definition for the given country code, with labels localized using the provided language. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="countryCode">The 2 letter ISO country code, e.g.: IE.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="countryCode"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultAddressFormResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormResponse>> FormByCountryAsyncWithHttpInfo (string countryCode, string language = null)
         {
@@ -568,7 +785,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormRes
             if (countryCode == null)
                 throw new ApiException(400, "Missing required parameter 'countryCode' when calling AddressApi->FormByCountry");
 
-            var localVarPath = "/api/v1.0/address/country/{countryCode}/form";
+            var localVarPath = "./api/v1.0/address/country/{countryCode}/form";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -616,16 +833,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormRes
             }
 
             return new ApiResponse<RestApiResultAddressFormResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAddressFormResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAddressFormResponse)));
         }
 
         /// <summary>
-        /// Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="googleAddress">A Google address object, as it is retuned from the maps API.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="googleAddress"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>RestApiResultAddressFormResponse</returns>
         public RestApiResultAddressFormResponse FormatGoogleAddress (GoogleAddress googleAddress, string language = null)
         {
@@ -634,11 +851,11 @@ public RestApiResultAddressFormResponse FormatGoogleAddress (GoogleAddress googl
         }
 
         /// <summary>
-        /// Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="googleAddress">A Google address object, as it is retuned from the maps API.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="googleAddress"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultAddressFormResponse</returns>
         public ApiResponse< RestApiResultAddressFormResponse > FormatGoogleAddressWithHttpInfo (GoogleAddress googleAddress, string language = null)
         {
@@ -646,7 +863,7 @@ public ApiResponse< RestApiResultAddressFormResponse > FormatGoogleAddressWithHt
             if (googleAddress == null)
                 throw new ApiException(400, "Missing required parameter 'googleAddress' when calling AddressApi->FormatGoogleAddress");
 
-            var localVarPath = "/api/v1.0/address/google";
+            var localVarPath = "./api/v1.0/address/google";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -706,16 +923,16 @@ public ApiResponse< RestApiResultAddressFormResponse > FormatGoogleAddressWithHt
             }
 
             return new ApiResponse<RestApiResultAddressFormResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAddressFormResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAddressFormResponse)));
         }
 
         /// <summary>
-        /// Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="googleAddress">A Google address object, as it is retuned from the maps API.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="googleAddress"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of RestApiResultAddressFormResponse</returns>
         public async System.Threading.Tasks.Task<RestApiResultAddressFormResponse> FormatGoogleAddressAsync (GoogleAddress googleAddress, string language = null)
         {
@@ -725,11 +942,11 @@ public async System.Threading.Tasks.Task<RestApiResultAddressFormResponse> Forma
         }
 
         /// <summary>
-        /// Maps a Google Address Object to the values of the dynamic form associated with the address country and returns the dynamic form. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="googleAddress">A Google address object, as it is retuned from the maps API.</param>
-        /// <param name="language">(Optional) ISO culture info code, e.g.: en-IE, the default is en-US. (optional)</param>
+        /// <param name="googleAddress"></param>
+        /// <param name="language"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultAddressFormResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormResponse>> FormatGoogleAddressAsyncWithHttpInfo (GoogleAddress googleAddress, string language = null)
         {
@@ -737,7 +954,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormRes
             if (googleAddress == null)
                 throw new ApiException(400, "Missing required parameter 'googleAddress' when calling AddressApi->FormatGoogleAddress");
 
-            var localVarPath = "/api/v1.0/address/google";
+            var localVarPath = "./api/v1.0/address/google";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -797,12 +1014,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAddressFormRes
             }
 
             return new ApiResponse<RestApiResultAddressFormResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAddressFormResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAddressFormResponse)));
         }
 
         /// <summary>
-        /// Retuns a list of localised countries 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="language"> (optional)</param>
@@ -814,7 +1031,7 @@ public RestApiResultCountryFormResponse GetCountries (string language = null)
         }
 
         /// <summary>
-        /// Retuns a list of localised countries 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="language"> (optional)</param>
@@ -822,7 +1039,7 @@ public RestApiResultCountryFormResponse GetCountries (string language = null)
         public ApiResponse< RestApiResultCountryFormResponse > GetCountriesWithHttpInfo (string language = null)
         {
 
-            var localVarPath = "/api/v1.0/address/countries";
+            var localVarPath = "./api/v1.0/address/countries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -869,12 +1086,12 @@ public ApiResponse< RestApiResultCountryFormResponse > GetCountriesWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultCountryFormResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCountryFormResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCountryFormResponse)));
         }
 
         /// <summary>
-        /// Retuns a list of localised countries 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="language"> (optional)</param>
@@ -887,7 +1104,7 @@ public async System.Threading.Tasks.Task<RestApiResultCountryFormResponse> GetCo
         }
 
         /// <summary>
-        /// Retuns a list of localised countries 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="language"> (optional)</param>
@@ -895,7 +1112,7 @@ public async System.Threading.Tasks.Task<RestApiResultCountryFormResponse> GetCo
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCountryFormResponse>> GetCountriesAsyncWithHttpInfo (string language = null)
         {
 
-            var localVarPath = "/api/v1.0/address/countries";
+            var localVarPath = "./api/v1.0/address/countries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -942,7 +1159,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCountryFormRes
             }
 
             return new ApiResponse<RestApiResultCountryFormResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCountryFormResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCountryFormResponse)));
         }
 
diff --git a/src/Flipdish/Api/ApmApi.cs b/src/Flipdish/Api/ApmApi.cs
index 613bacd6..2404dd20 100644
--- a/src/Flipdish/Api/ApmApi.cs
+++ b/src/Flipdish/Api/ApmApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,301 +25,301 @@ public interface IApmApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// [PRIVATE API] Returns true if APM is enabled on at least one store in an application
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultApmStatus</returns>
         RestApiResultApmStatus GetApmStatus (string appId);
 
         /// <summary>
-        /// [PRIVATE API] Returns true if APM is enabled on at least one store in an application
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultApmStatus</returns>
         ApiResponse<RestApiResultApmStatus> GetApmStatusWithHttpInfo (string appId);
         /// <summary>
-        /// [PRIVATE API] Get Basic Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiResultApmStatistics</returns>
         RestApiResultApmStatistics GetBasicStatistics (string appId, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get Basic Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultApmStatistics</returns>
         ApiResponse<RestApiResultApmStatistics> GetBasicStatisticsWithHttpInfo (string appId, List<int?> storeId = null);
         /// <summary>
-        /// [PRIVATE API] Get Calendar statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiArrayResultApmHourlyDataPoint</returns>
         RestApiArrayResultApmHourlyDataPoint GetCalendarWeekStatistics (string appId, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get Calendar statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultApmHourlyDataPoint</returns>
         ApiResponse<RestApiArrayResultApmHourlyDataPoint> GetCalendarWeekStatisticsWithHttpInfo (string appId, List<int?> storeId = null);
         /// <summary>
-        /// [PRIVATE API] Get Calls Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiArrayResultApmDataPoint</returns>
         RestApiArrayResultApmDataPoint GetCallsStatistics (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get Calls Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultApmDataPoint</returns>
         ApiResponse<RestApiArrayResultApmDataPoint> GetCallsStatisticsWithHttpInfo (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null);
         /// <summary>
-        /// [PRIVATE API] Get Order Statistics (Value of Orders)
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiArrayResultApmCurrencyDataPoint</returns>
         RestApiArrayResultApmCurrencyDataPoint GetOrderStatistics (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get Order Statistics (Value of Orders)
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultApmCurrencyDataPoint</returns>
         ApiResponse<RestApiArrayResultApmCurrencyDataPoint> GetOrderStatisticsWithHttpInfo (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null);
         /// <summary>
-        /// [PRIVATE API] Get paginated APM call list
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiPaginationResultPhoneCall</returns>
         RestApiPaginationResultPhoneCall GetPaginatedCallList (string appId, int? page = null, int? limit = null, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get paginated APM call list
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultPhoneCall</returns>
         ApiResponse<RestApiPaginationResultPhoneCall> GetPaginatedCallListWithHttpInfo (string appId, int? page = null, int? limit = null, List<int?> storeId = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// [PRIVATE API] Returns true if APM is enabled on at least one store in an application
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiResultApmStatus</returns>
         System.Threading.Tasks.Task<RestApiResultApmStatus> GetApmStatusAsync (string appId);
 
         /// <summary>
-        /// [PRIVATE API] Returns true if APM is enabled on at least one store in an application
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultApmStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultApmStatus>> GetApmStatusAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// [PRIVATE API] Get Basic Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiResultApmStatistics</returns>
         System.Threading.Tasks.Task<RestApiResultApmStatistics> GetBasicStatisticsAsync (string appId, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get Basic Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultApmStatistics)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultApmStatistics>> GetBasicStatisticsAsyncWithHttpInfo (string appId, List<int?> storeId = null);
         /// <summary>
-        /// [PRIVATE API] Get Calendar statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiArrayResultApmHourlyDataPoint</returns>
         System.Threading.Tasks.Task<RestApiArrayResultApmHourlyDataPoint> GetCalendarWeekStatisticsAsync (string appId, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get Calendar statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultApmHourlyDataPoint)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmHourlyDataPoint>> GetCalendarWeekStatisticsAsyncWithHttpInfo (string appId, List<int?> storeId = null);
         /// <summary>
-        /// [PRIVATE API] Get Calls Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiArrayResultApmDataPoint</returns>
         System.Threading.Tasks.Task<RestApiArrayResultApmDataPoint> GetCallsStatisticsAsync (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get Calls Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultApmDataPoint)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmDataPoint>> GetCallsStatisticsAsyncWithHttpInfo (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null);
         /// <summary>
-        /// [PRIVATE API] Get Order Statistics (Value of Orders)
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiArrayResultApmCurrencyDataPoint</returns>
         System.Threading.Tasks.Task<RestApiArrayResultApmCurrencyDataPoint> GetOrderStatisticsAsync (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get Order Statistics (Value of Orders)
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultApmCurrencyDataPoint)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmCurrencyDataPoint>> GetOrderStatisticsAsyncWithHttpInfo (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null);
         /// <summary>
-        /// [PRIVATE API] Get paginated APM call list
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultPhoneCall</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultPhoneCall> GetPaginatedCallListAsync (string appId, int? page = null, int? limit = null, List<int?> storeId = null);
 
         /// <summary>
-        /// [PRIVATE API] Get paginated APM call list
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultPhoneCall)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPhoneCall>> GetPaginatedCallListAsyncWithHttpInfo (string appId, int? page = null, int? limit = null, List<int?> storeId = null);
         #endregion Asynchronous Operations
@@ -423,10 +423,10 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// [PRIVATE API] Returns true if APM is enabled on at least one store in an application 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultApmStatus</returns>
         public RestApiResultApmStatus GetApmStatus (string appId)
         {
@@ -435,10 +435,10 @@ public RestApiResultApmStatus GetApmStatus (string appId)
         }
 
         /// <summary>
-        /// [PRIVATE API] Returns true if APM is enabled on at least one store in an application 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultApmStatus</returns>
         public ApiResponse< RestApiResultApmStatus > GetApmStatusWithHttpInfo (string appId)
         {
@@ -446,7 +446,7 @@ public ApiResponse< RestApiResultApmStatus > GetApmStatusWithHttpInfo (string ap
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ApmApi->GetApmStatus");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/status";
+            var localVarPath = "./api/v1.0/{appId}/apm/status";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -493,15 +493,15 @@ public ApiResponse< RestApiResultApmStatus > GetApmStatusWithHttpInfo (string ap
             }
 
             return new ApiResponse<RestApiResultApmStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultApmStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApmStatus)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Returns true if APM is enabled on at least one store in an application 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiResultApmStatus</returns>
         public async System.Threading.Tasks.Task<RestApiResultApmStatus> GetApmStatusAsync (string appId)
         {
@@ -511,10 +511,10 @@ public async System.Threading.Tasks.Task<RestApiResultApmStatus> GetApmStatusAsy
         }
 
         /// <summary>
-        /// [PRIVATE API] Returns true if APM is enabled on at least one store in an application 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultApmStatus)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApmStatus>> GetApmStatusAsyncWithHttpInfo (string appId)
         {
@@ -522,7 +522,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApmStatus>> Ge
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ApmApi->GetApmStatus");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/status";
+            var localVarPath = "./api/v1.0/{appId}/apm/status";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -569,16 +569,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApmStatus>> Ge
             }
 
             return new ApiResponse<RestApiResultApmStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultApmStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApmStatus)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Basic Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiResultApmStatistics</returns>
         public RestApiResultApmStatistics GetBasicStatistics (string appId, List<int?> storeId = null)
         {
@@ -587,11 +587,11 @@ public RestApiResultApmStatistics GetBasicStatistics (string appId, List<int?> s
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Basic Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultApmStatistics</returns>
         public ApiResponse< RestApiResultApmStatistics > GetBasicStatisticsWithHttpInfo (string appId, List<int?> storeId = null)
         {
@@ -599,7 +599,7 @@ public ApiResponse< RestApiResultApmStatistics > GetBasicStatisticsWithHttpInfo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ApmApi->GetBasicStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/statistics";
+            var localVarPath = "./api/v1.0/{appId}/apm/statistics";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -647,16 +647,16 @@ public ApiResponse< RestApiResultApmStatistics > GetBasicStatisticsWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultApmStatistics>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultApmStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApmStatistics)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Basic Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiResultApmStatistics</returns>
         public async System.Threading.Tasks.Task<RestApiResultApmStatistics> GetBasicStatisticsAsync (string appId, List<int?> storeId = null)
         {
@@ -666,11 +666,11 @@ public async System.Threading.Tasks.Task<RestApiResultApmStatistics> GetBasicSta
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Basic Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultApmStatistics)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApmStatistics>> GetBasicStatisticsAsyncWithHttpInfo (string appId, List<int?> storeId = null)
         {
@@ -678,7 +678,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApmStatistics>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ApmApi->GetBasicStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/statistics";
+            var localVarPath = "./api/v1.0/{appId}/apm/statistics";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -726,16 +726,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApmStatistics>
             }
 
             return new ApiResponse<RestApiResultApmStatistics>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultApmStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApmStatistics)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Calendar statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiArrayResultApmHourlyDataPoint</returns>
         public RestApiArrayResultApmHourlyDataPoint GetCalendarWeekStatistics (string appId, List<int?> storeId = null)
         {
@@ -744,11 +744,11 @@ public RestApiArrayResultApmHourlyDataPoint GetCalendarWeekStatistics (string ap
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Calendar statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultApmHourlyDataPoint</returns>
         public ApiResponse< RestApiArrayResultApmHourlyDataPoint > GetCalendarWeekStatisticsWithHttpInfo (string appId, List<int?> storeId = null)
         {
@@ -756,7 +756,7 @@ public ApiResponse< RestApiArrayResultApmHourlyDataPoint > GetCalendarWeekStatis
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ApmApi->GetCalendarWeekStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/statistics/calendar";
+            var localVarPath = "./api/v1.0/{appId}/apm/statistics/calendar";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -804,16 +804,16 @@ public ApiResponse< RestApiArrayResultApmHourlyDataPoint > GetCalendarWeekStatis
             }
 
             return new ApiResponse<RestApiArrayResultApmHourlyDataPoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultApmHourlyDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultApmHourlyDataPoint)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Calendar statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiArrayResultApmHourlyDataPoint</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultApmHourlyDataPoint> GetCalendarWeekStatisticsAsync (string appId, List<int?> storeId = null)
         {
@@ -823,11 +823,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultApmHourlyDataPoint> G
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Calendar statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultApmHourlyDataPoint)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmHourlyDataPoint>> GetCalendarWeekStatisticsAsyncWithHttpInfo (string appId, List<int?> storeId = null)
         {
@@ -835,7 +835,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmHourly
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ApmApi->GetCalendarWeekStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/statistics/calendar";
+            var localVarPath = "./api/v1.0/{appId}/apm/statistics/calendar";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -883,18 +883,18 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmHourly
             }
 
             return new ApiResponse<RestApiArrayResultApmHourlyDataPoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultApmHourlyDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultApmHourlyDataPoint)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Calls Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiArrayResultApmDataPoint</returns>
         public RestApiArrayResultApmDataPoint GetCallsStatistics (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
         {
@@ -903,13 +903,13 @@ public RestApiArrayResultApmDataPoint GetCallsStatistics (string appId, string a
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Calls Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultApmDataPoint</returns>
         public ApiResponse< RestApiArrayResultApmDataPoint > GetCallsStatisticsWithHttpInfo (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
         {
@@ -920,7 +920,7 @@ public ApiResponse< RestApiArrayResultApmDataPoint > GetCallsStatisticsWithHttpI
             if (aggregateDataBy == null)
                 throw new ApiException(400, "Missing required parameter 'aggregateDataBy' when calling ApmApi->GetCallsStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/statistics/calls/{aggregateDataBy}";
+            var localVarPath = "./api/v1.0/{appId}/apm/statistics/calls/{aggregateDataBy}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -970,18 +970,18 @@ public ApiResponse< RestApiArrayResultApmDataPoint > GetCallsStatisticsWithHttpI
             }
 
             return new ApiResponse<RestApiArrayResultApmDataPoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultApmDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultApmDataPoint)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Calls Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiArrayResultApmDataPoint</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultApmDataPoint> GetCallsStatisticsAsync (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
         {
@@ -991,13 +991,13 @@ public async System.Threading.Tasks.Task<RestApiArrayResultApmDataPoint> GetCall
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Calls Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultApmDataPoint)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmDataPoint>> GetCallsStatisticsAsyncWithHttpInfo (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
         {
@@ -1008,7 +1008,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmDataPo
             if (aggregateDataBy == null)
                 throw new ApiException(400, "Missing required parameter 'aggregateDataBy' when calling ApmApi->GetCallsStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/statistics/calls/{aggregateDataBy}";
+            var localVarPath = "./api/v1.0/{appId}/apm/statistics/calls/{aggregateDataBy}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1058,18 +1058,18 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmDataPo
             }
 
             return new ApiResponse<RestApiArrayResultApmDataPoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultApmDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultApmDataPoint)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Order Statistics (Value of Orders) 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiArrayResultApmCurrencyDataPoint</returns>
         public RestApiArrayResultApmCurrencyDataPoint GetOrderStatistics (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
         {
@@ -1078,13 +1078,13 @@ public RestApiArrayResultApmCurrencyDataPoint GetOrderStatistics (string appId,
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Order Statistics (Value of Orders) 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultApmCurrencyDataPoint</returns>
         public ApiResponse< RestApiArrayResultApmCurrencyDataPoint > GetOrderStatisticsWithHttpInfo (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
         {
@@ -1095,7 +1095,7 @@ public ApiResponse< RestApiArrayResultApmCurrencyDataPoint > GetOrderStatisticsW
             if (aggregateDataBy == null)
                 throw new ApiException(400, "Missing required parameter 'aggregateDataBy' when calling ApmApi->GetOrderStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/statistics/orders/{aggregateDataBy}";
+            var localVarPath = "./api/v1.0/{appId}/apm/statistics/orders/{aggregateDataBy}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1145,18 +1145,18 @@ public ApiResponse< RestApiArrayResultApmCurrencyDataPoint > GetOrderStatisticsW
             }
 
             return new ApiResponse<RestApiArrayResultApmCurrencyDataPoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultApmCurrencyDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultApmCurrencyDataPoint)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Order Statistics (Value of Orders) 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiArrayResultApmCurrencyDataPoint</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultApmCurrencyDataPoint> GetOrderStatisticsAsync (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
         {
@@ -1166,13 +1166,13 @@ public async System.Threading.Tasks.Task<RestApiArrayResultApmCurrencyDataPoint>
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Order Statistics (Value of Orders) 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultApmCurrencyDataPoint)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmCurrencyDataPoint>> GetOrderStatisticsAsyncWithHttpInfo (string appId, string aggregateDataBy, int? dataPointLimit = null, List<int?> storeId = null)
         {
@@ -1183,7 +1183,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmCurren
             if (aggregateDataBy == null)
                 throw new ApiException(400, "Missing required parameter 'aggregateDataBy' when calling ApmApi->GetOrderStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/statistics/orders/{aggregateDataBy}";
+            var localVarPath = "./api/v1.0/{appId}/apm/statistics/orders/{aggregateDataBy}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1233,18 +1233,18 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultApmCurren
             }
 
             return new ApiResponse<RestApiArrayResultApmCurrencyDataPoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultApmCurrencyDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultApmCurrencyDataPoint)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get paginated APM call list 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>RestApiPaginationResultPhoneCall</returns>
         public RestApiPaginationResultPhoneCall GetPaginatedCallList (string appId, int? page = null, int? limit = null, List<int?> storeId = null)
         {
@@ -1253,13 +1253,13 @@ public RestApiPaginationResultPhoneCall GetPaginatedCallList (string appId, int?
         }
 
         /// <summary>
-        /// [PRIVATE API] Get paginated APM call list 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultPhoneCall</returns>
         public ApiResponse< RestApiPaginationResultPhoneCall > GetPaginatedCallListWithHttpInfo (string appId, int? page = null, int? limit = null, List<int?> storeId = null)
         {
@@ -1267,7 +1267,7 @@ public ApiResponse< RestApiPaginationResultPhoneCall > GetPaginatedCallListWithH
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ApmApi->GetPaginatedCallList");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/calls";
+            var localVarPath = "./api/v1.0/{appId}/apm/calls";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1317,18 +1317,18 @@ public ApiResponse< RestApiPaginationResultPhoneCall > GetPaginatedCallListWithH
             }
 
             return new ApiResponse<RestApiPaginationResultPhoneCall>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPhoneCall) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPhoneCall)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get paginated APM call list 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultPhoneCall</returns>
         public async System.Threading.Tasks.Task<RestApiPaginationResultPhoneCall> GetPaginatedCallListAsync (string appId, int? page = null, int? limit = null, List<int?> storeId = null)
         {
@@ -1338,13 +1338,13 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultPhoneCall> GetPa
         }
 
         /// <summary>
-        /// [PRIVATE API] Get paginated APM call list 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeId">List of stores to search by (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultPhoneCall)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPhoneCall>> GetPaginatedCallListAsyncWithHttpInfo (string appId, int? page = null, int? limit = null, List<int?> storeId = null)
         {
@@ -1352,7 +1352,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPhon
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ApmApi->GetPaginatedCallList");
 
-            var localVarPath = "/api/v1.0/{appId}/apm/calls";
+            var localVarPath = "./api/v1.0/{appId}/apm/calls";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1402,7 +1402,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPhon
             }
 
             return new ApiResponse<RestApiPaginationResultPhoneCall>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPhoneCall) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPhoneCall)));
         }
 
diff --git a/src/Flipdish/Api/AppStoreApi.cs b/src/Flipdish/Api/AppStoreApi.cs
index a004652b..04866403 100644
--- a/src/Flipdish/Api/AppStoreApi.cs
+++ b/src/Flipdish/Api/AppStoreApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,103 +25,111 @@ public interface IAppStoreApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>AppStoreApp</returns>
-        AppStoreApp GetAppStoreApp (string appStoreAppId);
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appId"> (optional)</param>
+        /// <returns>RestApiResultAppStoreApp</returns>
+        RestApiResultAppStoreApp GetAppStoreApp (string appStoreAppId, string appId = null);
 
         /// <summary>
-        /// Get App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>ApiResponse of AppStoreApp</returns>
-        ApiResponse<AppStoreApp> GetAppStoreAppWithHttpInfo (string appStoreAppId);
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultAppStoreApp</returns>
+        ApiResponse<RestApiResultAppStoreApp> GetAppStoreAppWithHttpInfo (string appStoreAppId, string appId = null);
         /// <summary>
-        /// Get list of App store app summaries
+        /// 
         /// </summary>
         /// <remarks>
-        /// Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="search">Query App store app name</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="excludeNotOwned">Exclude App store apps that user is not the owner off (optional)</param>
+        /// <param name="search"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="excludeNotOwned"> (optional)</param>
+        /// <param name="showOnlyVerified"> (optional)</param>
         /// <returns>RestApiPaginationResultAppStoreAppSummary</returns>
-        RestApiPaginationResultAppStoreAppSummary GetAppStoreApps (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null);
+        RestApiPaginationResultAppStoreAppSummary GetAppStoreApps (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null);
 
         /// <summary>
-        /// Get list of App store app summaries
+        /// 
         /// </summary>
         /// <remarks>
-        /// Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="search">Query App store app name</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="excludeNotOwned">Exclude App store apps that user is not the owner off (optional)</param>
+        /// <param name="search"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="excludeNotOwned"> (optional)</param>
+        /// <param name="showOnlyVerified"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultAppStoreAppSummary</returns>
-        ApiResponse<RestApiPaginationResultAppStoreAppSummary> GetAppStoreAppsWithHttpInfo (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null);
+        ApiResponse<RestApiPaginationResultAppStoreAppSummary> GetAppStoreAppsWithHttpInfo (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>Task of AppStoreApp</returns>
-        System.Threading.Tasks.Task<AppStoreApp> GetAppStoreAppAsync (string appStoreAppId);
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appId"> (optional)</param>
+        /// <returns>Task of RestApiResultAppStoreApp</returns>
+        System.Threading.Tasks.Task<RestApiResultAppStoreApp> GetAppStoreAppAsync (string appStoreAppId, string appId = null);
 
         /// <summary>
-        /// Get App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>Task of ApiResponse (AppStoreApp)</returns>
-        System.Threading.Tasks.Task<ApiResponse<AppStoreApp>> GetAppStoreAppAsyncWithHttpInfo (string appStoreAppId);
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreApp)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreApp>> GetAppStoreAppAsyncWithHttpInfo (string appStoreAppId, string appId = null);
         /// <summary>
-        /// Get list of App store app summaries
+        /// 
         /// </summary>
         /// <remarks>
-        /// Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="search">Query App store app name</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="excludeNotOwned">Exclude App store apps that user is not the owner off (optional)</param>
+        /// <param name="search"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="excludeNotOwned"> (optional)</param>
+        /// <param name="showOnlyVerified"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultAppStoreAppSummary</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultAppStoreAppSummary> GetAppStoreAppsAsync (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null);
+        System.Threading.Tasks.Task<RestApiPaginationResultAppStoreAppSummary> GetAppStoreAppsAsync (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null);
 
         /// <summary>
-        /// Get list of App store app summaries
+        /// 
         /// </summary>
         /// <remarks>
-        /// Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="search">Query App store app name</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="excludeNotOwned">Exclude App store apps that user is not the owner off (optional)</param>
+        /// <param name="search"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="excludeNotOwned"> (optional)</param>
+        /// <param name="showOnlyVerified"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultAppStoreAppSummary)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultAppStoreAppSummary>> GetAppStoreAppsAsyncWithHttpInfo (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultAppStoreAppSummary>> GetAppStoreAppsAsyncWithHttpInfo (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null);
         #endregion Asynchronous Operations
     }
 
@@ -223,30 +231,32 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get App store app App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>AppStoreApp</returns>
-        public AppStoreApp GetAppStoreApp (string appStoreAppId)
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appId"> (optional)</param>
+        /// <returns>RestApiResultAppStoreApp</returns>
+        public RestApiResultAppStoreApp GetAppStoreApp (string appStoreAppId, string appId = null)
         {
-             ApiResponse<AppStoreApp> localVarResponse = GetAppStoreAppWithHttpInfo(appStoreAppId);
+             ApiResponse<RestApiResultAppStoreApp> localVarResponse = GetAppStoreAppWithHttpInfo(appStoreAppId, appId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get App store app App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>ApiResponse of AppStoreApp</returns>
-        public ApiResponse< AppStoreApp > GetAppStoreAppWithHttpInfo (string appStoreAppId)
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultAppStoreApp</returns>
+        public ApiResponse< RestApiResultAppStoreApp > GetAppStoreAppWithHttpInfo (string appStoreAppId, string appId = null)
         {
             // verify the required parameter 'appStoreAppId' is set
             if (appStoreAppId == null)
                 throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreApi->GetAppStoreApp");
 
-            var localVarPath = "/api/v1.0/appstore/apps/{appStoreAppId}";
+            var localVarPath = "./api/v1.0/appstore/apps/{appStoreAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -271,6 +281,7 @@ public ApiResponse< AppStoreApp > GetAppStoreAppWithHttpInfo (string appStoreApp
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (appId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "appId", appId)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -292,37 +303,39 @@ public ApiResponse< AppStoreApp > GetAppStoreAppWithHttpInfo (string appStoreApp
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<AppStoreApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (AppStoreApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(AppStoreApp)));
+            return new ApiResponse<RestApiResultAppStoreApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreApp)));
         }
 
         /// <summary>
-        /// Get App store app App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>Task of AppStoreApp</returns>
-        public async System.Threading.Tasks.Task<AppStoreApp> GetAppStoreAppAsync (string appStoreAppId)
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appId"> (optional)</param>
+        /// <returns>Task of RestApiResultAppStoreApp</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppStoreApp> GetAppStoreAppAsync (string appStoreAppId, string appId = null)
         {
-             ApiResponse<AppStoreApp> localVarResponse = await GetAppStoreAppAsyncWithHttpInfo(appStoreAppId);
+             ApiResponse<RestApiResultAppStoreApp> localVarResponse = await GetAppStoreAppAsyncWithHttpInfo(appStoreAppId, appId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get App store app App store app must be verified or you are the owner [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>Task of ApiResponse (AppStoreApp)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<AppStoreApp>> GetAppStoreAppAsyncWithHttpInfo (string appStoreAppId)
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreApp)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreApp>> GetAppStoreAppAsyncWithHttpInfo (string appStoreAppId, string appId = null)
         {
             // verify the required parameter 'appStoreAppId' is set
             if (appStoreAppId == null)
                 throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreApi->GetAppStoreApp");
 
-            var localVarPath = "/api/v1.0/appstore/apps/{appStoreAppId}";
+            var localVarPath = "./api/v1.0/appstore/apps/{appStoreAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -347,6 +360,7 @@ public async System.Threading.Tasks.Task<ApiResponse<AppStoreApp>> GetAppStoreAp
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (appId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "appId", appId)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -368,42 +382,44 @@ public async System.Threading.Tasks.Task<ApiResponse<AppStoreApp>> GetAppStoreAp
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<AppStoreApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (AppStoreApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(AppStoreApp)));
+            return new ApiResponse<RestApiResultAppStoreApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreApp)));
         }
 
         /// <summary>
-        /// Get list of App store app summaries Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="search">Query App store app name</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="excludeNotOwned">Exclude App store apps that user is not the owner off (optional)</param>
+        /// <param name="search"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="excludeNotOwned"> (optional)</param>
+        /// <param name="showOnlyVerified"> (optional)</param>
         /// <returns>RestApiPaginationResultAppStoreAppSummary</returns>
-        public RestApiPaginationResultAppStoreAppSummary GetAppStoreApps (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null)
+        public RestApiPaginationResultAppStoreAppSummary GetAppStoreApps (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null)
         {
-             ApiResponse<RestApiPaginationResultAppStoreAppSummary> localVarResponse = GetAppStoreAppsWithHttpInfo(search, page, limit, excludeNotOwned);
+             ApiResponse<RestApiPaginationResultAppStoreAppSummary> localVarResponse = GetAppStoreAppsWithHttpInfo(search, page, limit, excludeNotOwned, showOnlyVerified);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get list of App store app summaries Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="search">Query App store app name</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="excludeNotOwned">Exclude App store apps that user is not the owner off (optional)</param>
+        /// <param name="search"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="excludeNotOwned"> (optional)</param>
+        /// <param name="showOnlyVerified"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultAppStoreAppSummary</returns>
-        public ApiResponse< RestApiPaginationResultAppStoreAppSummary > GetAppStoreAppsWithHttpInfo (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null)
+        public ApiResponse< RestApiPaginationResultAppStoreAppSummary > GetAppStoreAppsWithHttpInfo (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null)
         {
             // verify the required parameter 'search' is set
             if (search == null)
                 throw new ApiException(400, "Missing required parameter 'search' when calling AppStoreApi->GetAppStoreApps");
 
-            var localVarPath = "/api/v1.0/appstore/apps";
+            var localVarPath = "./api/v1.0/appstore/apps";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -431,6 +447,7 @@ public ApiResponse< RestApiPaginationResultAppStoreAppSummary > GetAppStoreAppsW
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (excludeNotOwned != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeNotOwned", excludeNotOwned)); // query parameter
+            if (showOnlyVerified != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "showOnlyVerified", showOnlyVerified)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -453,42 +470,44 @@ public ApiResponse< RestApiPaginationResultAppStoreAppSummary > GetAppStoreAppsW
             }
 
             return new ApiResponse<RestApiPaginationResultAppStoreAppSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultAppStoreAppSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultAppStoreAppSummary)));
         }
 
         /// <summary>
-        /// Get list of App store app summaries Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="search">Query App store app name</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="excludeNotOwned">Exclude App store apps that user is not the owner off (optional)</param>
+        /// <param name="search"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="excludeNotOwned"> (optional)</param>
+        /// <param name="showOnlyVerified"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultAppStoreAppSummary</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultAppStoreAppSummary> GetAppStoreAppsAsync (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null)
+        public async System.Threading.Tasks.Task<RestApiPaginationResultAppStoreAppSummary> GetAppStoreAppsAsync (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null)
         {
-             ApiResponse<RestApiPaginationResultAppStoreAppSummary> localVarResponse = await GetAppStoreAppsAsyncWithHttpInfo(search, page, limit, excludeNotOwned);
+             ApiResponse<RestApiPaginationResultAppStoreAppSummary> localVarResponse = await GetAppStoreAppsAsyncWithHttpInfo(search, page, limit, excludeNotOwned, showOnlyVerified);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get list of App store app summaries Only returns verified applications [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="search">Query App store app name</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="excludeNotOwned">Exclude App store apps that user is not the owner off (optional)</param>
+        /// <param name="search"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="excludeNotOwned"> (optional)</param>
+        /// <param name="showOnlyVerified"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultAppStoreAppSummary)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultAppStoreAppSummary>> GetAppStoreAppsAsyncWithHttpInfo (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultAppStoreAppSummary>> GetAppStoreAppsAsyncWithHttpInfo (string search, int? page = null, int? limit = null, bool? excludeNotOwned = null, bool? showOnlyVerified = null)
         {
             // verify the required parameter 'search' is set
             if (search == null)
                 throw new ApiException(400, "Missing required parameter 'search' when calling AppStoreApi->GetAppStoreApps");
 
-            var localVarPath = "/api/v1.0/appstore/apps";
+            var localVarPath = "./api/v1.0/appstore/apps";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -516,6 +535,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultAppS
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (excludeNotOwned != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeNotOwned", excludeNotOwned)); // query parameter
+            if (showOnlyVerified != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "showOnlyVerified", showOnlyVerified)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -538,7 +558,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultAppS
             }
 
             return new ApiResponse<RestApiPaginationResultAppStoreAppSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultAppStoreAppSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultAppStoreAppSummary)));
         }
 
diff --git a/src/Flipdish/Api/AppStoreConfigurationsApi.cs b/src/Flipdish/Api/AppStoreConfigurationsApi.cs
index eeff1d3f..fd11dc1a 100644
--- a/src/Flipdish/Api/AppStoreConfigurationsApi.cs
+++ b/src/Flipdish/Api/AppStoreConfigurationsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,295 +25,445 @@ public interface IAppStoreConfigurationsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Object</returns>
+        Object AppStoreConfigurationsAppStoreHandleOauthResponseCode (string appStoreAppId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> AppStoreConfigurationsAppStoreHandleOauthResponseCodeWithHttpInfo (string appStoreAppId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>RestApiResultAppStoreAppConfiguration</returns>
         RestApiResultAppStoreAppConfiguration CreateAppStoreConfig (string appId, string appStoreAppId);
 
         /// <summary>
-        /// Create App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>ApiResponse of RestApiResultAppStoreAppConfiguration</returns>
         ApiResponse<RestApiResultAppStoreAppConfiguration> CreateAppStoreConfigWithHttpInfo (string appId, string appStoreAppId);
         /// <summary>
-        /// Delete App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
         /// <returns>RestApiStringResult</returns>
         RestApiStringResult DeleteAppStoreConfig (string appId, string appStoreAppId, string configId);
 
         /// <summary>
-        /// Delete App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         ApiResponse<RestApiStringResult> DeleteAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId);
         /// <summary>
-        /// Get App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>AppStoreAppConfiguration</returns>
-        AppStoreAppConfiguration GetAppStoreConfig (string appId, string appStoreAppId, string configId);
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="executeConfigurationActionRequest"></param>
+        /// <returns>RestApiResultExecuteConfigurationActionResult</returns>
+        RestApiResultExecuteConfigurationActionResult ExecuteConfigurationAction (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest);
 
         /// <summary>
-        /// Get App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>ApiResponse of AppStoreAppConfiguration</returns>
-        ApiResponse<AppStoreAppConfiguration> GetAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId);
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="executeConfigurationActionRequest"></param>
+        /// <returns>ApiResponse of RestApiResultExecuteConfigurationActionResult</returns>
+        ApiResponse<RestApiResultExecuteConfigurationActionResult> ExecuteConfigurationActionWithHttpInfo (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest);
         /// <summary>
-        /// Get list of App store app configurations for one App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [ALPHA - this endpoint is not ready to be consumed]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>RestApiResultAppStoreAppConfiguration</returns>
+        RestApiResultAppStoreAppConfiguration GetAppStoreConfig (string appId, string appStoreAppId, string configId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>ApiResponse of RestApiResultAppStoreAppConfiguration</returns>
+        ApiResponse<RestApiResultAppStoreAppConfiguration> GetAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>RestApiArrayResultAppStoreAppConfigurationSummary</returns>
         RestApiArrayResultAppStoreAppConfigurationSummary GetConfiguredAppSingleApp (string appId, string appStoreAppId);
 
         /// <summary>
-        /// Get list of App store app configurations for one App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [ALPHA - this endpoint is not ready to be consumed]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>ApiResponse of RestApiArrayResultAppStoreAppConfigurationSummary</returns>
         ApiResponse<RestApiArrayResultAppStoreAppConfigurationSummary> GetConfiguredAppSingleAppWithHttpInfo (string appId, string appStoreAppId);
         /// <summary>
-        /// Get list of App store apps which have been configured
+        /// 
         /// </summary>
         /// <remarks>
-        /// [ALPHA - this endpoint is not ready to be consumed]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <returns>RestApiArrayResultAppStoreAppConfigurationHeader</returns>
-        RestApiArrayResultAppStoreAppConfigurationHeader GetConfiguredApps (string appId);
+        /// <param name="appId"></param>
+        /// <returns>RestApiArrayResultAppStoreAppSummary</returns>
+        RestApiArrayResultAppStoreAppSummary GetConfiguredApps (string appId);
 
         /// <summary>
-        /// Get list of App store apps which have been configured
+        /// 
         /// </summary>
         /// <remarks>
-        /// [ALPHA - this endpoint is not ready to be consumed]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <returns>ApiResponse of RestApiArrayResultAppStoreAppConfigurationHeader</returns>
-        ApiResponse<RestApiArrayResultAppStoreAppConfigurationHeader> GetConfiguredAppsWithHttpInfo (string appId);
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultAppStoreAppSummary</returns>
+        ApiResponse<RestApiArrayResultAppStoreAppSummary> GetConfiguredAppsWithHttpInfo (string appId);
         /// <summary>
-        /// Update App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <param name="updateAppStoreAppConfiguration">Update App store app configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfiguration"></param>
         /// <returns></returns>
         void UpdateAppStoreConfig (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration);
 
         /// <summary>
-        /// Update App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <param name="updateAppStoreAppConfiguration">Update App store app configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfiguration"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfigurationValues"></param>
+        /// <returns></returns>
+        void UpdateAppStoreConfigSettingValues (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfigurationValues"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdateAppStoreConfigSettingValuesWithHttpInfo (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create App store app configuration
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> AppStoreConfigurationsAppStoreHandleOauthResponseCodeAsync (string appStoreAppId);
+
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> AppStoreConfigurationsAppStoreHandleOauthResponseCodeAsyncWithHttpInfo (string appStoreAppId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of RestApiResultAppStoreAppConfiguration</returns>
         System.Threading.Tasks.Task<RestApiResultAppStoreAppConfiguration> CreateAppStoreConfigAsync (string appId, string appStoreAppId);
 
         /// <summary>
-        /// Create App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of ApiResponse (RestApiResultAppStoreAppConfiguration)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppConfiguration>> CreateAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId);
         /// <summary>
-        /// Delete App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         System.Threading.Tasks.Task<RestApiStringResult> DeleteAppStoreConfigAsync (string appId, string appStoreAppId, string configId);
 
         /// <summary>
-        /// Delete App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> DeleteAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId);
         /// <summary>
-        /// Get App store app configuration
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="executeConfigurationActionRequest"></param>
+        /// <returns>Task of RestApiResultExecuteConfigurationActionResult</returns>
+        System.Threading.Tasks.Task<RestApiResultExecuteConfigurationActionResult> ExecuteConfigurationActionAsync (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest);
+
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>Task of AppStoreAppConfiguration</returns>
-        System.Threading.Tasks.Task<AppStoreAppConfiguration> GetAppStoreConfigAsync (string appId, string appStoreAppId, string configId);
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="executeConfigurationActionRequest"></param>
+        /// <returns>Task of ApiResponse (RestApiResultExecuteConfigurationActionResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultExecuteConfigurationActionResult>> ExecuteConfigurationActionAsyncWithHttpInfo (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>Task of RestApiResultAppStoreAppConfiguration</returns>
+        System.Threading.Tasks.Task<RestApiResultAppStoreAppConfiguration> GetAppStoreConfigAsync (string appId, string appStoreAppId, string configId);
 
         /// <summary>
-        /// Get App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>Task of ApiResponse (AppStoreAppConfiguration)</returns>
-        System.Threading.Tasks.Task<ApiResponse<AppStoreAppConfiguration>> GetAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId);
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreAppConfiguration)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppConfiguration>> GetAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId);
         /// <summary>
-        /// Get list of App store app configurations for one App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [ALPHA - this endpoint is not ready to be consumed]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of RestApiArrayResultAppStoreAppConfigurationSummary</returns>
         System.Threading.Tasks.Task<RestApiArrayResultAppStoreAppConfigurationSummary> GetConfiguredAppSingleAppAsync (string appId, string appStoreAppId);
 
         /// <summary>
-        /// Get list of App store app configurations for one App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [ALPHA - this endpoint is not ready to be consumed]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultAppStoreAppConfigurationSummary)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreAppConfigurationSummary>> GetConfiguredAppSingleAppAsyncWithHttpInfo (string appId, string appStoreAppId);
         /// <summary>
-        /// Get list of App store apps which have been configured
+        /// 
         /// </summary>
         /// <remarks>
-        /// [ALPHA - this endpoint is not ready to be consumed]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <returns>Task of RestApiArrayResultAppStoreAppConfigurationHeader</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultAppStoreAppConfigurationHeader> GetConfiguredAppsAsync (string appId);
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiArrayResultAppStoreAppSummary</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultAppStoreAppSummary> GetConfiguredAppsAsync (string appId);
 
         /// <summary>
-        /// Get list of App store apps which have been configured
+        /// 
         /// </summary>
         /// <remarks>
-        /// [ALPHA - this endpoint is not ready to be consumed]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultAppStoreAppConfigurationHeader)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreAppConfigurationHeader>> GetConfiguredAppsAsyncWithHttpInfo (string appId);
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultAppStoreAppSummary)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreAppSummary>> GetConfiguredAppsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Update App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <param name="updateAppStoreAppConfiguration">Update App store app configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfiguration"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateAppStoreConfigAsync (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration);
 
         /// <summary>
-        /// Update App store app configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <param name="updateAppStoreAppConfiguration">Update App store app configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfiguration"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfigurationValues"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UpdateAppStoreConfigSettingValuesAsync (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfigurationValues"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreConfigSettingValuesAsyncWithHttpInfo (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues);
         #endregion Asynchronous Operations
     }
 
@@ -415,11 +565,162 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create App store app configuration [BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Object</returns>
+        public Object AppStoreConfigurationsAppStoreHandleOauthResponseCode (string appStoreAppId)
+        {
+             ApiResponse<Object> localVarResponse = AppStoreConfigurationsAppStoreHandleOauthResponseCodeWithHttpInfo(appStoreAppId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > AppStoreConfigurationsAppStoreHandleOauthResponseCodeWithHttpInfo (string appStoreAppId)
+        {
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->AppStoreConfigurationsAppStoreHandleOauthResponseCode");
+
+            var localVarPath = "./api/v1.0/appstore/oauthresponse/{appStoreAppId}/responsecode";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AppStoreConfigurationsAppStoreHandleOauthResponseCode", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> AppStoreConfigurationsAppStoreHandleOauthResponseCodeAsync (string appStoreAppId)
+        {
+             ApiResponse<Object> localVarResponse = await AppStoreConfigurationsAppStoreHandleOauthResponseCodeAsyncWithHttpInfo(appStoreAppId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> AppStoreConfigurationsAppStoreHandleOauthResponseCodeAsyncWithHttpInfo (string appStoreAppId)
+        {
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->AppStoreConfigurationsAppStoreHandleOauthResponseCode");
+
+            var localVarPath = "./api/v1.0/appstore/oauthresponse/{appStoreAppId}/responsecode";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AppStoreConfigurationsAppStoreHandleOauthResponseCode", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>RestApiResultAppStoreAppConfiguration</returns>
         public RestApiResultAppStoreAppConfiguration CreateAppStoreConfig (string appId, string appStoreAppId)
         {
@@ -428,22 +729,190 @@ public RestApiResultAppStoreAppConfiguration CreateAppStoreConfig (string appId,
         }
 
         /// <summary>
-        /// Create App store app configuration [BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>ApiResponse of RestApiResultAppStoreAppConfiguration</returns>
         public ApiResponse< RestApiResultAppStoreAppConfiguration > CreateAppStoreConfigWithHttpInfo (string appId, string appStoreAppId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->CreateAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->CreateAppStoreConfig");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->CreateAppStoreConfig");
+
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateAppStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppStoreAppConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreAppConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreAppConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of RestApiResultAppStoreAppConfiguration</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppStoreAppConfiguration> CreateAppStoreConfigAsync (string appId, string appStoreAppId)
+        {
+             ApiResponse<RestApiResultAppStoreAppConfiguration> localVarResponse = await CreateAppStoreConfigAsyncWithHttpInfo(appId, appStoreAppId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreAppConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppConfiguration>> CreateAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->CreateAppStoreConfig");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->CreateAppStoreConfig");
+
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateAppStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppStoreAppConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreAppConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreAppConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult DeleteAppStoreConfig (string appId, string appStoreAppId, string configId)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = DeleteAppStoreConfigWithHttpInfo(appId, appStoreAppId, configId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > DeleteAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
             // verify the required parameter 'appStoreAppId' is set
             if (appStoreAppId == null)
-                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->CreateAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
+            // verify the required parameter 'configId' is set
+            if (configId == null)
+                throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -469,6 +938,7 @@ public ApiResponse< RestApiResultAppStoreAppConfiguration > CreateAppStoreConfig
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (configId != null) localVarPathParams.Add("configId", this.Configuration.ApiClient.ParameterToString(configId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -479,53 +949,58 @@ public ApiResponse< RestApiResultAppStoreAppConfiguration > CreateAppStoreConfig
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("CreateAppStoreConfig", localVarResponse);
+                Exception exception = ExceptionFactory("DeleteAppStoreConfig", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultAppStoreAppConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultAppStoreAppConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreAppConfiguration)));
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Create App store app configuration [BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>Task of RestApiResultAppStoreAppConfiguration</returns>
-        public async System.Threading.Tasks.Task<RestApiResultAppStoreAppConfiguration> CreateAppStoreConfigAsync (string appId, string appStoreAppId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> DeleteAppStoreConfigAsync (string appId, string appStoreAppId, string configId)
         {
-             ApiResponse<RestApiResultAppStoreAppConfiguration> localVarResponse = await CreateAppStoreConfigAsyncWithHttpInfo(appId, appStoreAppId);
+             ApiResponse<RestApiStringResult> localVarResponse = await DeleteAppStoreConfigAsyncWithHttpInfo(appId, appStoreAppId, configId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Create App store app configuration [BETA - this endpoint is under development, do not use it in your production system] This adds an Application to a Whitelabel that can later be configured to specific stores
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <returns>Task of ApiResponse (RestApiResultAppStoreAppConfiguration)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppConfiguration>> CreateAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> DeleteAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->CreateAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
             // verify the required parameter 'appStoreAppId' is set
             if (appStoreAppId == null)
-                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->CreateAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
+            // verify the required parameter 'configId' is set
+            if (configId == null)
+                throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -551,6 +1026,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppCon
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (configId != null) localVarPathParams.Add("configId", this.Configuration.ApiClient.ParameterToString(configId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -561,57 +1037,62 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppCon
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("CreateAppStoreConfig", localVarResponse);
+                Exception exception = ExceptionFactory("DeleteAppStoreConfig", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultAppStoreAppConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultAppStoreAppConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreAppConfiguration)));
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Delete App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>RestApiStringResult</returns>
-        public RestApiStringResult DeleteAppStoreConfig (string appId, string appStoreAppId, string configId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="executeConfigurationActionRequest"></param>
+        /// <returns>RestApiResultExecuteConfigurationActionResult</returns>
+        public RestApiResultExecuteConfigurationActionResult ExecuteConfigurationAction (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = DeleteAppStoreConfigWithHttpInfo(appId, appStoreAppId, configId);
+             ApiResponse<RestApiResultExecuteConfigurationActionResult> localVarResponse = ExecuteConfigurationActionWithHttpInfo(appId, appStoreAppId, configId, executeConfigurationActionRequest);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Delete App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        public ApiResponse< RestApiStringResult > DeleteAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="executeConfigurationActionRequest"></param>
+        /// <returns>ApiResponse of RestApiResultExecuteConfigurationActionResult</returns>
+        public ApiResponse< RestApiResultExecuteConfigurationActionResult > ExecuteConfigurationActionWithHttpInfo (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->ExecuteConfigurationAction");
             // verify the required parameter 'appStoreAppId' is set
             if (appStoreAppId == null)
-                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->ExecuteConfigurationAction");
             // verify the required parameter 'configId' is set
             if (configId == null)
-                throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->ExecuteConfigurationAction");
+            // verify the required parameter 'executeConfigurationActionRequest' is set
+            if (executeConfigurationActionRequest == null)
+                throw new ApiException(400, "Missing required parameter 'executeConfigurationActionRequest' when calling AppStoreConfigurationsApi->ExecuteConfigurationAction");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}/action";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -621,6 +1102,11 @@ public ApiResponse< RestApiStringResult > DeleteAppStoreConfigWithHttpInfo (stri
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -638,6 +1124,14 @@ public ApiResponse< RestApiStringResult > DeleteAppStoreConfigWithHttpInfo (stri
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
             if (configId != null) localVarPathParams.Add("configId", this.Configuration.ApiClient.ParameterToString(configId)); // path parameter
+            if (executeConfigurationActionRequest != null && executeConfigurationActionRequest.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(executeConfigurationActionRequest); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = executeConfigurationActionRequest; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -648,58 +1142,63 @@ public ApiResponse< RestApiStringResult > DeleteAppStoreConfigWithHttpInfo (stri
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DeleteAppStoreConfig", localVarResponse);
+                Exception exception = ExceptionFactory("ExecuteConfigurationAction", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiResultExecuteConfigurationActionResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultExecuteConfigurationActionResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultExecuteConfigurationActionResult)));
         }
 
         /// <summary>
-        /// Delete App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>Task of RestApiStringResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringResult> DeleteAppStoreConfigAsync (string appId, string appStoreAppId, string configId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="executeConfigurationActionRequest"></param>
+        /// <returns>Task of RestApiResultExecuteConfigurationActionResult</returns>
+        public async System.Threading.Tasks.Task<RestApiResultExecuteConfigurationActionResult> ExecuteConfigurationActionAsync (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = await DeleteAppStoreConfigAsyncWithHttpInfo(appId, appStoreAppId, configId);
+             ApiResponse<RestApiResultExecuteConfigurationActionResult> localVarResponse = await ExecuteConfigurationActionAsyncWithHttpInfo(appId, appStoreAppId, configId, executeConfigurationActionRequest);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Delete App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> DeleteAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="executeConfigurationActionRequest"></param>
+        /// <returns>Task of ApiResponse (RestApiResultExecuteConfigurationActionResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultExecuteConfigurationActionResult>> ExecuteConfigurationActionAsyncWithHttpInfo (string appId, string appStoreAppId, string configId, ExecuteConfigurationActionRequest executeConfigurationActionRequest)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->ExecuteConfigurationAction");
             // verify the required parameter 'appStoreAppId' is set
             if (appStoreAppId == null)
-                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->ExecuteConfigurationAction");
             // verify the required parameter 'configId' is set
             if (configId == null)
-                throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->DeleteAppStoreConfig");
+                throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->ExecuteConfigurationAction");
+            // verify the required parameter 'executeConfigurationActionRequest' is set
+            if (executeConfigurationActionRequest == null)
+                throw new ApiException(400, "Missing required parameter 'executeConfigurationActionRequest' when calling AppStoreConfigurationsApi->ExecuteConfigurationAction");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}/action";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -709,6 +1208,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Delet
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -726,6 +1230,14 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Delet
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
             if (configId != null) localVarPathParams.Add("configId", this.Configuration.ApiClient.ParameterToString(configId)); // path parameter
+            if (executeConfigurationActionRequest != null && executeConfigurationActionRequest.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(executeConfigurationActionRequest); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = executeConfigurationActionRequest; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -736,45 +1248,45 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Delet
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DeleteAppStoreConfig", localVarResponse);
+                Exception exception = ExceptionFactory("ExecuteConfigurationAction", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiResultExecuteConfigurationActionResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultExecuteConfigurationActionResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultExecuteConfigurationActionResult)));
         }
 
         /// <summary>
-        /// Get App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>AppStoreAppConfiguration</returns>
-        public AppStoreAppConfiguration GetAppStoreConfig (string appId, string appStoreAppId, string configId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>RestApiResultAppStoreAppConfiguration</returns>
+        public RestApiResultAppStoreAppConfiguration GetAppStoreConfig (string appId, string appStoreAppId, string configId)
         {
-             ApiResponse<AppStoreAppConfiguration> localVarResponse = GetAppStoreConfigWithHttpInfo(appId, appStoreAppId, configId);
+             ApiResponse<RestApiResultAppStoreAppConfiguration> localVarResponse = GetAppStoreConfigWithHttpInfo(appId, appStoreAppId, configId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>ApiResponse of AppStoreAppConfiguration</returns>
-        public ApiResponse< AppStoreAppConfiguration > GetAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>ApiResponse of RestApiResultAppStoreAppConfiguration</returns>
+        public ApiResponse< RestApiResultAppStoreAppConfiguration > GetAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
@@ -786,7 +1298,7 @@ public ApiResponse< AppStoreAppConfiguration > GetAppStoreConfigWithHttpInfo (st
             if (configId == null)
                 throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->GetAppStoreConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -834,35 +1346,35 @@ public ApiResponse< AppStoreAppConfiguration > GetAppStoreConfigWithHttpInfo (st
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<AppStoreAppConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (AppStoreAppConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(AppStoreAppConfiguration)));
+            return new ApiResponse<RestApiResultAppStoreAppConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreAppConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreAppConfiguration)));
         }
 
         /// <summary>
-        /// Get App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>Task of AppStoreAppConfiguration</returns>
-        public async System.Threading.Tasks.Task<AppStoreAppConfiguration> GetAppStoreConfigAsync (string appId, string appStoreAppId, string configId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>Task of RestApiResultAppStoreAppConfiguration</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppStoreAppConfiguration> GetAppStoreConfigAsync (string appId, string appStoreAppId, string configId)
         {
-             ApiResponse<AppStoreAppConfiguration> localVarResponse = await GetAppStoreConfigAsyncWithHttpInfo(appId, appStoreAppId, configId);
+             ApiResponse<RestApiResultAppStoreAppConfiguration> localVarResponse = await GetAppStoreConfigAsyncWithHttpInfo(appId, appStoreAppId, configId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <returns>Task of ApiResponse (AppStoreAppConfiguration)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<AppStoreAppConfiguration>> GetAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId)
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreAppConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppConfiguration>> GetAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
@@ -874,7 +1386,7 @@ public async System.Threading.Tasks.Task<ApiResponse<AppStoreAppConfiguration>>
             if (configId == null)
                 throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->GetAppStoreConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -922,17 +1434,17 @@ public async System.Threading.Tasks.Task<ApiResponse<AppStoreAppConfiguration>>
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<AppStoreAppConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (AppStoreAppConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(AppStoreAppConfiguration)));
+            return new ApiResponse<RestApiResultAppStoreAppConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreAppConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreAppConfiguration)));
         }
 
         /// <summary>
-        /// Get list of App store app configurations for one App store app [ALPHA - this endpoint is not ready to be consumed]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>RestApiArrayResultAppStoreAppConfigurationSummary</returns>
         public RestApiArrayResultAppStoreAppConfigurationSummary GetConfiguredAppSingleApp (string appId, string appStoreAppId)
         {
@@ -941,11 +1453,11 @@ public RestApiArrayResultAppStoreAppConfigurationSummary GetConfiguredAppSingleA
         }
 
         /// <summary>
-        /// Get list of App store app configurations for one App store app [ALPHA - this endpoint is not ready to be consumed]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>ApiResponse of RestApiArrayResultAppStoreAppConfigurationSummary</returns>
         public ApiResponse< RestApiArrayResultAppStoreAppConfigurationSummary > GetConfiguredAppSingleAppWithHttpInfo (string appId, string appStoreAppId)
         {
@@ -956,7 +1468,7 @@ public ApiResponse< RestApiArrayResultAppStoreAppConfigurationSummary > GetConfi
             if (appStoreAppId == null)
                 throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->GetConfiguredAppSingleApp");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1004,16 +1516,16 @@ public ApiResponse< RestApiArrayResultAppStoreAppConfigurationSummary > GetConfi
             }
 
             return new ApiResponse<RestApiArrayResultAppStoreAppConfigurationSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultAppStoreAppConfigurationSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAppStoreAppConfigurationSummary)));
         }
 
         /// <summary>
-        /// Get list of App store app configurations for one App store app [ALPHA - this endpoint is not ready to be consumed]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of RestApiArrayResultAppStoreAppConfigurationSummary</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultAppStoreAppConfigurationSummary> GetConfiguredAppSingleAppAsync (string appId, string appStoreAppId)
         {
@@ -1023,11 +1535,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultAppStoreAppConfigurat
         }
 
         /// <summary>
-        /// Get list of App store app configurations for one App store app [ALPHA - this endpoint is not ready to be consumed]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultAppStoreAppConfigurationSummary)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreAppConfigurationSummary>> GetConfiguredAppSingleAppAsyncWithHttpInfo (string appId, string appStoreAppId)
         {
@@ -1038,7 +1550,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreA
             if (appStoreAppId == null)
                 throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->GetConfiguredAppSingleApp");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1086,35 +1598,35 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreA
             }
 
             return new ApiResponse<RestApiArrayResultAppStoreAppConfigurationSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultAppStoreAppConfigurationSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAppStoreAppConfigurationSummary)));
         }
 
         /// <summary>
-        /// Get list of App store apps which have been configured [ALPHA - this endpoint is not ready to be consumed]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <returns>RestApiArrayResultAppStoreAppConfigurationHeader</returns>
-        public RestApiArrayResultAppStoreAppConfigurationHeader GetConfiguredApps (string appId)
+        /// <param name="appId"></param>
+        /// <returns>RestApiArrayResultAppStoreAppSummary</returns>
+        public RestApiArrayResultAppStoreAppSummary GetConfiguredApps (string appId)
         {
-             ApiResponse<RestApiArrayResultAppStoreAppConfigurationHeader> localVarResponse = GetConfiguredAppsWithHttpInfo(appId);
+             ApiResponse<RestApiArrayResultAppStoreAppSummary> localVarResponse = GetConfiguredAppsWithHttpInfo(appId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get list of App store apps which have been configured [ALPHA - this endpoint is not ready to be consumed]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <returns>ApiResponse of RestApiArrayResultAppStoreAppConfigurationHeader</returns>
-        public ApiResponse< RestApiArrayResultAppStoreAppConfigurationHeader > GetConfiguredAppsWithHttpInfo (string appId)
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultAppStoreAppSummary</returns>
+        public ApiResponse< RestApiArrayResultAppStoreAppSummary > GetConfiguredAppsWithHttpInfo (string appId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->GetConfiguredApps");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1160,37 +1672,37 @@ public ApiResponse< RestApiArrayResultAppStoreAppConfigurationHeader > GetConfig
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultAppStoreAppConfigurationHeader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultAppStoreAppConfigurationHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAppStoreAppConfigurationHeader)));
+            return new ApiResponse<RestApiArrayResultAppStoreAppSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultAppStoreAppSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAppStoreAppSummary)));
         }
 
         /// <summary>
-        /// Get list of App store apps which have been configured [ALPHA - this endpoint is not ready to be consumed]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <returns>Task of RestApiArrayResultAppStoreAppConfigurationHeader</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultAppStoreAppConfigurationHeader> GetConfiguredAppsAsync (string appId)
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiArrayResultAppStoreAppSummary</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultAppStoreAppSummary> GetConfiguredAppsAsync (string appId)
         {
-             ApiResponse<RestApiArrayResultAppStoreAppConfigurationHeader> localVarResponse = await GetConfiguredAppsAsyncWithHttpInfo(appId);
+             ApiResponse<RestApiArrayResultAppStoreAppSummary> localVarResponse = await GetConfiguredAppsAsyncWithHttpInfo(appId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get list of App store apps which have been configured [ALPHA - this endpoint is not ready to be consumed]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultAppStoreAppConfigurationHeader)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreAppConfigurationHeader>> GetConfiguredAppsAsyncWithHttpInfo (string appId)
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultAppStoreAppSummary)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreAppSummary>> GetConfiguredAppsAsyncWithHttpInfo (string appId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->GetConfiguredApps");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1236,19 +1748,19 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAppStoreA
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultAppStoreAppConfigurationHeader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultAppStoreAppConfigurationHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAppStoreAppConfigurationHeader)));
+            return new ApiResponse<RestApiArrayResultAppStoreAppSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultAppStoreAppSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAppStoreAppSummary)));
         }
 
         /// <summary>
-        /// Update App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <param name="updateAppStoreAppConfiguration">Update App store app configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfiguration"></param>
         /// <returns></returns>
         public void UpdateAppStoreConfig (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration)
         {
@@ -1256,13 +1768,13 @@ public void UpdateAppStoreConfig (string appId, string appStoreAppId, string con
         }
 
         /// <summary>
-        /// Update App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <param name="updateAppStoreAppConfiguration">Update App store app configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfiguration"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateAppStoreConfigWithHttpInfo (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration)
         {
@@ -1279,7 +1791,7 @@ public ApiResponse<Object> UpdateAppStoreConfigWithHttpInfo (string appId, strin
             if (updateAppStoreAppConfiguration == null)
                 throw new ApiException(400, "Missing required parameter 'updateAppStoreAppConfiguration' when calling AppStoreConfigurationsApi->UpdateAppStoreConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1341,18 +1853,18 @@ public ApiResponse<Object> UpdateAppStoreConfigWithHttpInfo (string appId, strin
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <param name="updateAppStoreAppConfiguration">Update App store app configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfiguration"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateAppStoreConfigAsync (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration)
         {
@@ -1361,13 +1873,13 @@ public async System.Threading.Tasks.Task UpdateAppStoreConfigAsync (string appId
         }
 
         /// <summary>
-        /// Update App store app configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="configId">App store app configuration id</param>
-        /// <param name="updateAppStoreAppConfiguration">Update App store app configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfiguration"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreConfigAsyncWithHttpInfo (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfiguration updateAppStoreAppConfiguration)
         {
@@ -1384,7 +1896,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreConf
             if (updateAppStoreAppConfiguration == null)
                 throw new ApiException(400, "Missing required parameter 'updateAppStoreAppConfiguration' when calling AppStoreConfigurationsApi->UpdateAppStoreConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1446,7 +1958,216 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreConf
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfigurationValues"></param>
+        /// <returns></returns>
+        public void UpdateAppStoreConfigSettingValues (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues)
+        {
+             UpdateAppStoreConfigSettingValuesWithHttpInfo(appId, appStoreAppId, configId, updateAppStoreAppConfigurationValues);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfigurationValues"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdateAppStoreConfigSettingValuesWithHttpInfo (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->UpdateAppStoreConfigSettingValues");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->UpdateAppStoreConfigSettingValues");
+            // verify the required parameter 'configId' is set
+            if (configId == null)
+                throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->UpdateAppStoreConfigSettingValues");
+            // verify the required parameter 'updateAppStoreAppConfigurationValues' is set
+            if (updateAppStoreAppConfigurationValues == null)
+                throw new ApiException(400, "Missing required parameter 'updateAppStoreAppConfigurationValues' when calling AppStoreConfigurationsApi->UpdateAppStoreConfigSettingValues");
+
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}/updatesettings";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (configId != null) localVarPathParams.Add("configId", this.Configuration.ApiClient.ParameterToString(configId)); // path parameter
+            if (updateAppStoreAppConfigurationValues != null && updateAppStoreAppConfigurationValues.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(updateAppStoreAppConfigurationValues); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = updateAppStoreAppConfigurationValues; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateAppStoreConfigSettingValues", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfigurationValues"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdateAppStoreConfigSettingValuesAsync (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues)
+        {
+             await UpdateAppStoreConfigSettingValuesAsyncWithHttpInfo(appId, appStoreAppId, configId, updateAppStoreAppConfigurationValues);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateAppStoreAppConfigurationValues"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreConfigSettingValuesAsyncWithHttpInfo (string appId, string appStoreAppId, string configId, UpdateAppStoreAppConfigurationValuesBatch updateAppStoreAppConfigurationValues)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreConfigurationsApi->UpdateAppStoreConfigSettingValues");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreConfigurationsApi->UpdateAppStoreConfigSettingValues");
+            // verify the required parameter 'configId' is set
+            if (configId == null)
+                throw new ApiException(400, "Missing required parameter 'configId' when calling AppStoreConfigurationsApi->UpdateAppStoreConfigSettingValues");
+            // verify the required parameter 'updateAppStoreAppConfigurationValues' is set
+            if (updateAppStoreAppConfigurationValues == null)
+                throw new ApiException(400, "Missing required parameter 'updateAppStoreAppConfigurationValues' when calling AppStoreConfigurationsApi->UpdateAppStoreConfigSettingValues");
+
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/config/{configId}/updatesettings";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (configId != null) localVarPathParams.Add("configId", this.Configuration.ApiClient.ParameterToString(configId)); // path parameter
+            if (updateAppStoreAppConfigurationValues != null && updateAppStoreAppConfigurationValues.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(updateAppStoreAppConfigurationValues); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = updateAppStoreAppConfigurationValues; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateAppStoreConfigSettingValues", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/AppStoreDeveloperApi.cs b/src/Flipdish/Api/AppStoreDeveloperApi.cs
index fa01c361..ec2c06d0 100644
--- a/src/Flipdish/Api/AppStoreDeveloperApi.cs
+++ b/src/Flipdish/Api/AppStoreDeveloperApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,246 +25,388 @@ public interface IAppStoreDeveloperApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Update App store app verification
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="verificationStatus">New verification status</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="verificationStatus"></param>
         /// <returns></returns>
         void AppVerificationUpdate (string oauthAppId, string appStoreAppId, string verificationStatus);
 
         /// <summary>
-        /// Update App store app verification
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="verificationStatus">New verification status</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="verificationStatus"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> AppVerificationUpdateWithHttpInfo (string oauthAppId, string appStoreAppId, string verificationStatus);
         /// <summary>
-        /// Create App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="createAppStoreApp">App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="createAppStoreApp"></param>
         /// <returns>RestApiResultAppStoreApp</returns>
         RestApiResultAppStoreApp CreateAppStoreApp (string oauthAppId, CreateAppStoreApp createAppStoreApp);
 
         /// <summary>
-        /// Create App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="createAppStoreApp">App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="createAppStoreApp"></param>
         /// <returns>ApiResponse of RestApiResultAppStoreApp</returns>
         ApiResponse<RestApiResultAppStoreApp> CreateAppStoreAppWithHttpInfo (string oauthAppId, CreateAppStoreApp createAppStoreApp);
         /// <summary>
-        /// Delete App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>RestApiStringResult</returns>
         RestApiStringResult DeleteAppStoreApp (string oauthAppId, string appStoreAppId);
 
         /// <summary>
-        /// Delete App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         ApiResponse<RestApiStringResult> DeleteAppStoreAppWithHttpInfo (string oauthAppId, string appStoreAppId);
         /// <summary>
-        /// Update App store app
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns></returns>
+        void GetAppExternalProduct (string oauthAppId, string appStoreAppId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> GetAppExternalProductWithHttpInfo (string oauthAppId, string appStoreAppId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>RestApiStringResult</returns>
+        RestApiStringResult GetExternalFunctionSigningKey (string oauthAppId, string appStoreAppId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        ApiResponse<RestApiStringResult> GetExternalFunctionSigningKeyWithHttpInfo (string oauthAppId, string appStoreAppId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="appStoreApp">Update App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreApp"></param>
         /// <returns></returns>
         void UpdateAppStoreApp (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp);
 
         /// <summary>
-        /// Update App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="appStoreApp">Update App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreApp"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateAppStoreAppWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp);
         /// <summary>
-        /// Upload the App store app logo \\ icon
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreAppExternalProduct"></param>
+        /// <returns></returns>
+        void UpdateExternalProduct (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreAppExternalProduct"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdateExternalProductWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <param name="image">App Store App Logo</param>
         /// <returns></returns>
         void UploadAppStoreAppLogo (string oauthAppId, string appStoreAppId, System.IO.Stream image);
 
         /// <summary>
-        /// Upload the App store app logo \\ icon
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <param name="image">App Store App Logo</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UploadAppStoreAppLogoWithHttpInfo (string oauthAppId, string appStoreAppId, System.IO.Stream image);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Update App store app verification
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="verificationStatus">New verification status</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="verificationStatus"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task AppVerificationUpdateAsync (string oauthAppId, string appStoreAppId, string verificationStatus);
 
         /// <summary>
-        /// Update App store app verification
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="verificationStatus">New verification status</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="verificationStatus"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AppVerificationUpdateAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, string verificationStatus);
         /// <summary>
-        /// Create App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="createAppStoreApp">App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="createAppStoreApp"></param>
         /// <returns>Task of RestApiResultAppStoreApp</returns>
         System.Threading.Tasks.Task<RestApiResultAppStoreApp> CreateAppStoreAppAsync (string oauthAppId, CreateAppStoreApp createAppStoreApp);
 
         /// <summary>
-        /// Create App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="createAppStoreApp">App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="createAppStoreApp"></param>
         /// <returns>Task of ApiResponse (RestApiResultAppStoreApp)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreApp>> CreateAppStoreAppAsyncWithHttpInfo (string oauthAppId, CreateAppStoreApp createAppStoreApp);
         /// <summary>
-        /// Delete App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         System.Threading.Tasks.Task<RestApiStringResult> DeleteAppStoreAppAsync (string oauthAppId, string appStoreAppId);
 
         /// <summary>
-        /// Delete App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> DeleteAppStoreAppAsyncWithHttpInfo (string oauthAppId, string appStoreAppId);
         /// <summary>
-        /// Update App store app
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task GetAppExternalProductAsync (string oauthAppId, string appStoreAppId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> GetAppExternalProductAsyncWithHttpInfo (string oauthAppId, string appStoreAppId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        System.Threading.Tasks.Task<RestApiStringResult> GetExternalFunctionSigningKeyAsync (string oauthAppId, string appStoreAppId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetExternalFunctionSigningKeyAsyncWithHttpInfo (string oauthAppId, string appStoreAppId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="appStoreApp">Update App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreApp"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateAppStoreAppAsync (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp);
 
         /// <summary>
-        /// Update App store app
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="appStoreApp">Update App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreApp"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreAppAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp);
         /// <summary>
-        /// Upload the App store app logo \\ icon
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreAppExternalProduct"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UpdateExternalProductAsync (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreAppExternalProduct"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateExternalProductAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <param name="image">App Store App Logo</param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UploadAppStoreAppLogoAsync (string oauthAppId, string appStoreAppId, System.IO.Stream image);
 
         /// <summary>
-        /// Upload the App store app logo \\ icon
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <param name="image">App Store App Logo</param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppStoreAppLogoAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, System.IO.Stream image);
@@ -369,12 +511,12 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Update App store app verification [BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="verificationStatus">New verification status</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="verificationStatus"></param>
         /// <returns></returns>
         public void AppVerificationUpdate (string oauthAppId, string appStoreAppId, string verificationStatus)
         {
@@ -382,12 +524,12 @@ public void AppVerificationUpdate (string oauthAppId, string appStoreAppId, stri
         }
 
         /// <summary>
-        /// Update App store app verification [BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="verificationStatus">New verification status</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="verificationStatus"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> AppVerificationUpdateWithHttpInfo (string oauthAppId, string appStoreAppId, string verificationStatus)
         {
@@ -401,7 +543,7 @@ public ApiResponse<Object> AppVerificationUpdateWithHttpInfo (string oauthAppId,
             if (verificationStatus == null)
                 throw new ApiException(400, "Missing required parameter 'verificationStatus' when calling AppStoreDeveloperApi->AppVerificationUpdate");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/verification";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/verification";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -450,17 +592,17 @@ public ApiResponse<Object> AppVerificationUpdateWithHttpInfo (string oauthAppId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update App store app verification [BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="verificationStatus">New verification status</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="verificationStatus"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task AppVerificationUpdateAsync (string oauthAppId, string appStoreAppId, string verificationStatus)
         {
@@ -469,12 +611,12 @@ public async System.Threading.Tasks.Task AppVerificationUpdateAsync (string oaut
         }
 
         /// <summary>
-        /// Update App store app verification [BETA - this endpoint is under development, do not use it in your production system][Note: Only Flipdish staff can verify apps]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="verificationStatus">New verification status</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="verificationStatus"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> AppVerificationUpdateAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, string verificationStatus)
         {
@@ -488,7 +630,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AppVerificationUpd
             if (verificationStatus == null)
                 throw new ApiException(400, "Missing required parameter 'verificationStatus' when calling AppStoreDeveloperApi->AppVerificationUpdate");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/verification";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/verification";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -537,16 +679,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AppVerificationUpd
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Create App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="createAppStoreApp">App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="createAppStoreApp"></param>
         /// <returns>RestApiResultAppStoreApp</returns>
         public RestApiResultAppStoreApp CreateAppStoreApp (string oauthAppId, CreateAppStoreApp createAppStoreApp)
         {
@@ -555,11 +697,11 @@ public RestApiResultAppStoreApp CreateAppStoreApp (string oauthAppId, CreateAppS
         }
 
         /// <summary>
-        /// Create App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="createAppStoreApp">App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="createAppStoreApp"></param>
         /// <returns>ApiResponse of RestApiResultAppStoreApp</returns>
         public ApiResponse< RestApiResultAppStoreApp > CreateAppStoreAppWithHttpInfo (string oauthAppId, CreateAppStoreApp createAppStoreApp)
         {
@@ -570,7 +712,7 @@ public ApiResponse< RestApiResultAppStoreApp > CreateAppStoreAppWithHttpInfo (st
             if (createAppStoreApp == null)
                 throw new ApiException(400, "Missing required parameter 'createAppStoreApp' when calling AppStoreDeveloperApi->CreateAppStoreApp");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -630,16 +772,16 @@ public ApiResponse< RestApiResultAppStoreApp > CreateAppStoreAppWithHttpInfo (st
             }
 
             return new ApiResponse<RestApiResultAppStoreApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAppStoreApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreApp)));
         }
 
         /// <summary>
-        /// Create App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="createAppStoreApp">App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="createAppStoreApp"></param>
         /// <returns>Task of RestApiResultAppStoreApp</returns>
         public async System.Threading.Tasks.Task<RestApiResultAppStoreApp> CreateAppStoreAppAsync (string oauthAppId, CreateAppStoreApp createAppStoreApp)
         {
@@ -649,11 +791,11 @@ public async System.Threading.Tasks.Task<RestApiResultAppStoreApp> CreateAppStor
         }
 
         /// <summary>
-        /// Create App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="createAppStoreApp">App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="createAppStoreApp"></param>
         /// <returns>Task of ApiResponse (RestApiResultAppStoreApp)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreApp>> CreateAppStoreAppAsyncWithHttpInfo (string oauthAppId, CreateAppStoreApp createAppStoreApp)
         {
@@ -664,7 +806,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreApp>>
             if (createAppStoreApp == null)
                 throw new ApiException(400, "Missing required parameter 'createAppStoreApp' when calling AppStoreDeveloperApi->CreateAppStoreApp");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -724,16 +866,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreApp>>
             }
 
             return new ApiResponse<RestApiResultAppStoreApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAppStoreApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreApp)));
         }
 
         /// <summary>
-        /// Delete App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>RestApiStringResult</returns>
         public RestApiStringResult DeleteAppStoreApp (string oauthAppId, string appStoreAppId)
         {
@@ -742,11 +884,11 @@ public RestApiStringResult DeleteAppStoreApp (string oauthAppId, string appStore
         }
 
         /// <summary>
-        /// Delete App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         public ApiResponse< RestApiStringResult > DeleteAppStoreAppWithHttpInfo (string oauthAppId, string appStoreAppId)
         {
@@ -757,7 +899,7 @@ public ApiResponse< RestApiStringResult > DeleteAppStoreAppWithHttpInfo (string
             if (appStoreAppId == null)
                 throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->DeleteAppStoreApp");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -805,16 +947,16 @@ public ApiResponse< RestApiStringResult > DeleteAppStoreAppWithHttpInfo (string
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Delete App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         public async System.Threading.Tasks.Task<RestApiStringResult> DeleteAppStoreAppAsync (string oauthAppId, string appStoreAppId)
         {
@@ -824,11 +966,11 @@ public async System.Threading.Tasks.Task<RestApiStringResult> DeleteAppStoreAppA
         }
 
         /// <summary>
-        /// Delete App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> DeleteAppStoreAppAsyncWithHttpInfo (string oauthAppId, string appStoreAppId)
         {
@@ -839,7 +981,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Delet
             if (appStoreAppId == null)
                 throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->DeleteAppStoreApp");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -887,44 +1029,39 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Delet
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Update App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="appStoreApp">Update App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns></returns>
-        public void UpdateAppStoreApp (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
+        public void GetAppExternalProduct (string oauthAppId, string appStoreAppId)
         {
-             UpdateAppStoreAppWithHttpInfo(oauthAppId, appStoreAppId, appStoreApp);
+             GetAppExternalProductWithHttpInfo(oauthAppId, appStoreAppId);
         }
 
         /// <summary>
-        /// Update App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="appStoreApp">Update App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UpdateAppStoreAppWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
+        public ApiResponse<Object> GetAppExternalProductWithHttpInfo (string oauthAppId, string appStoreAppId)
         {
             // verify the required parameter 'oauthAppId' is set
             if (oauthAppId == null)
-                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->GetAppExternalProduct");
             // verify the required parameter 'appStoreAppId' is set
             if (appStoreAppId == null)
-                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
-            // verify the required parameter 'appStoreApp' is set
-            if (appStoreApp == null)
-                throw new ApiException(400, "Missing required parameter 'appStoreApp' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->GetAppExternalProduct");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_product";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -934,11 +1071,6 @@ public ApiResponse<Object> UpdateAppStoreAppWithHttpInfo (string oauthAppId, str
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -955,14 +1087,6 @@ public ApiResponse<Object> UpdateAppStoreAppWithHttpInfo (string oauthAppId, str
 
             if (oauthAppId != null) localVarPathParams.Add("oauthAppId", this.Configuration.ApiClient.ParameterToString(oauthAppId)); // path parameter
             if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
-            if (appStoreApp != null && appStoreApp.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreApp); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = appStoreApp; // byte array
-            }
 
             // authentication (oauth2) required
             // oauth required
@@ -973,57 +1097,52 @@ public ApiResponse<Object> UpdateAppStoreAppWithHttpInfo (string oauthAppId, str
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("UpdateAppStoreApp", localVarResponse);
+                Exception exception = ExceptionFactory("GetAppExternalProduct", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="appStoreApp">Update App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UpdateAppStoreAppAsync (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
+        public async System.Threading.Tasks.Task GetAppExternalProductAsync (string oauthAppId, string appStoreAppId)
         {
-             await UpdateAppStoreAppAsyncWithHttpInfo(oauthAppId, appStoreAppId, appStoreApp);
+             await GetAppExternalProductAsyncWithHttpInfo(oauthAppId, appStoreAppId);
 
         }
 
         /// <summary>
-        /// Update App store app [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
-        /// <param name="appStoreApp">Update App store app</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreAppAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> GetAppExternalProductAsyncWithHttpInfo (string oauthAppId, string appStoreAppId)
         {
             // verify the required parameter 'oauthAppId' is set
             if (oauthAppId == null)
-                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->GetAppExternalProduct");
             // verify the required parameter 'appStoreAppId' is set
             if (appStoreAppId == null)
-                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
-            // verify the required parameter 'appStoreApp' is set
-            if (appStoreApp == null)
-                throw new ApiException(400, "Missing required parameter 'appStoreApp' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->GetAppExternalProduct");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_product";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1033,11 +1152,6 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreAppA
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1054,15 +1168,88 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreAppA
 
             if (oauthAppId != null) localVarPathParams.Add("oauthAppId", this.Configuration.ApiClient.ParameterToString(oauthAppId)); // path parameter
             if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
-            if (appStoreApp != null && appStoreApp.GetType() != typeof(byte[]))
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreApp); // http body (model) parameter
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
             }
-            else
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
             {
-                localVarPostBody = appStoreApp; // byte array
+                Exception exception = ExceptionFactory("GetAppExternalProduct", localVarResponse);
+                if (exception != null) throw exception;
             }
 
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult GetExternalFunctionSigningKey (string oauthAppId, string appStoreAppId)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = GetExternalFunctionSigningKeyWithHttpInfo(oauthAppId, appStoreAppId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > GetExternalFunctionSigningKeyWithHttpInfo (string oauthAppId, string appStoreAppId)
+        {
+            // verify the required parameter 'oauthAppId' is set
+            if (oauthAppId == null)
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->GetExternalFunctionSigningKey");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->GetExternalFunctionSigningKey");
+
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_function_signing_key";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (oauthAppId != null) localVarPathParams.Add("oauthAppId", this.Configuration.ApiClient.ParameterToString(oauthAppId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+
             // authentication (oauth2) required
             // oauth required
             if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
@@ -1071,29 +1258,505 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreAppA
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("UpdateAppStoreApp", localVarResponse);
+                Exception exception = ExceptionFactory("GetExternalFunctionSigningKey", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> GetExternalFunctionSigningKeyAsync (string oauthAppId, string appStoreAppId)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = await GetExternalFunctionSigningKeyAsyncWithHttpInfo(oauthAppId, appStoreAppId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetExternalFunctionSigningKeyAsyncWithHttpInfo (string oauthAppId, string appStoreAppId)
+        {
+            // verify the required parameter 'oauthAppId' is set
+            if (oauthAppId == null)
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->GetExternalFunctionSigningKey");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->GetExternalFunctionSigningKey");
+
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_function_signing_key";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (oauthAppId != null) localVarPathParams.Add("oauthAppId", this.Configuration.ApiClient.ParameterToString(oauthAppId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetExternalFunctionSigningKey", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreApp"></param>
+        /// <returns></returns>
+        public void UpdateAppStoreApp (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
+        {
+             UpdateAppStoreAppWithHttpInfo(oauthAppId, appStoreAppId, appStoreApp);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreApp"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdateAppStoreAppWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
+        {
+            // verify the required parameter 'oauthAppId' is set
+            if (oauthAppId == null)
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+            // verify the required parameter 'appStoreApp' is set
+            if (appStoreApp == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreApp' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (oauthAppId != null) localVarPathParams.Add("oauthAppId", this.Configuration.ApiClient.ParameterToString(oauthAppId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (appStoreApp != null && appStoreApp.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreApp); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appStoreApp; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateAppStoreApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreApp"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdateAppStoreAppAsync (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
+        {
+             await UpdateAppStoreAppAsyncWithHttpInfo(oauthAppId, appStoreAppId, appStoreApp);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreApp"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateAppStoreAppAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreApp appStoreApp)
+        {
+            // verify the required parameter 'oauthAppId' is set
+            if (oauthAppId == null)
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+            // verify the required parameter 'appStoreApp' is set
+            if (appStoreApp == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreApp' when calling AppStoreDeveloperApi->UpdateAppStoreApp");
+
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (oauthAppId != null) localVarPathParams.Add("oauthAppId", this.Configuration.ApiClient.ParameterToString(oauthAppId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (appStoreApp != null && appStoreApp.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreApp); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appStoreApp; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateAppStoreApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreAppExternalProduct"></param>
+        /// <returns></returns>
+        public void UpdateExternalProduct (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct)
+        {
+             UpdateExternalProductWithHttpInfo(oauthAppId, appStoreAppId, appStoreAppExternalProduct);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreAppExternalProduct"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdateExternalProductWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct)
+        {
+            // verify the required parameter 'oauthAppId' is set
+            if (oauthAppId == null)
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->UpdateExternalProduct");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->UpdateExternalProduct");
+            // verify the required parameter 'appStoreAppExternalProduct' is set
+            if (appStoreAppExternalProduct == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppExternalProduct' when calling AppStoreDeveloperApi->UpdateExternalProduct");
+
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_product";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (oauthAppId != null) localVarPathParams.Add("oauthAppId", this.Configuration.ApiClient.ParameterToString(oauthAppId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (appStoreAppExternalProduct != null && appStoreAppExternalProduct.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreAppExternalProduct); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appStoreAppExternalProduct; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateExternalProduct", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreAppExternalProduct"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdateExternalProductAsync (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct)
+        {
+             await UpdateExternalProductAsyncWithHttpInfo(oauthAppId, appStoreAppId, appStoreAppExternalProduct);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <param name="appStoreAppExternalProduct"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateExternalProductAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, UpdateAppStoreAppExternalProduct appStoreAppExternalProduct)
+        {
+            // verify the required parameter 'oauthAppId' is set
+            if (oauthAppId == null)
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling AppStoreDeveloperApi->UpdateExternalProduct");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreDeveloperApi->UpdateExternalProduct");
+            // verify the required parameter 'appStoreAppExternalProduct' is set
+            if (appStoreAppExternalProduct == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppExternalProduct' when calling AppStoreDeveloperApi->UpdateExternalProduct");
+
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/external_product";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (oauthAppId != null) localVarPathParams.Add("oauthAppId", this.Configuration.ApiClient.ParameterToString(oauthAppId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+            if (appStoreAppExternalProduct != null && appStoreAppExternalProduct.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreAppExternalProduct); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appStoreAppExternalProduct; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateExternalProduct", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Upload the App store app logo \\ icon 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <param name="image">App Store App Logo</param>
         /// <returns></returns>
         public void UploadAppStoreAppLogo (string oauthAppId, string appStoreAppId, System.IO.Stream image)
@@ -1102,11 +1765,11 @@ public void UploadAppStoreAppLogo (string oauthAppId, string appStoreAppId, Syst
         }
 
         /// <summary>
-        /// Upload the App store app logo \\ icon 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <param name="image">App Store App Logo</param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UploadAppStoreAppLogoWithHttpInfo (string oauthAppId, string appStoreAppId, System.IO.Stream image)
@@ -1121,7 +1784,7 @@ public ApiResponse<Object> UploadAppStoreAppLogoWithHttpInfo (string oauthAppId,
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling AppStoreDeveloperApi->UploadAppStoreAppLogo");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/logo";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/logo";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1171,16 +1834,16 @@ public ApiResponse<Object> UploadAppStoreAppLogoWithHttpInfo (string oauthAppId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Upload the App store app logo \\ icon 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <param name="image">App Store App Logo</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UploadAppStoreAppLogoAsync (string oauthAppId, string appStoreAppId, System.IO.Stream image)
@@ -1190,11 +1853,11 @@ public async System.Threading.Tasks.Task UploadAppStoreAppLogoAsync (string oaut
         }
 
         /// <summary>
-        /// Upload the App store app logo \\ icon 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="appStoreAppId">App store app id</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="appStoreAppId"></param>
         /// <param name="image">App Store App Logo</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppStoreAppLogoAsyncWithHttpInfo (string oauthAppId, string appStoreAppId, System.IO.Stream image)
@@ -1209,7 +1872,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppStoreAppL
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling AppStoreDeveloperApi->UploadAppStoreAppLogo");
 
-            var localVarPath = "/api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/logo";
+            var localVarPath = "./api/v1.0/oauthclients/{oauthAppId}/appstore/apps/{appStoreAppId}/logo";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1259,7 +1922,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppStoreAppL
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/AppStoreEntitlementsApi.cs b/src/Flipdish/Api/AppStoreEntitlementsApi.cs
new file mode 100644
index 00000000..1b64627e
--- /dev/null
+++ b/src/Flipdish/Api/AppStoreEntitlementsApi.cs
@@ -0,0 +1,339 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IAppStoreEntitlementsApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>RestApiResultAppStoreAppEntitlements</returns>
+        RestApiResultAppStoreAppEntitlements GetAppStoreAppEntitlements (string appId, string appStoreAppId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>ApiResponse of RestApiResultAppStoreAppEntitlements</returns>
+        ApiResponse<RestApiResultAppStoreAppEntitlements> GetAppStoreAppEntitlementsWithHttpInfo (string appId, string appStoreAppId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of RestApiResultAppStoreAppEntitlements</returns>
+        System.Threading.Tasks.Task<RestApiResultAppStoreAppEntitlements> GetAppStoreAppEntitlementsAsync (string appId, string appStoreAppId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreAppEntitlements)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppEntitlements>> GetAppStoreAppEntitlementsAsyncWithHttpInfo (string appId, string appStoreAppId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class AppStoreEntitlementsApi : IAppStoreEntitlementsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppStoreEntitlementsApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public AppStoreEntitlementsApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppStoreEntitlementsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public AppStoreEntitlementsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>RestApiResultAppStoreAppEntitlements</returns>
+        public RestApiResultAppStoreAppEntitlements GetAppStoreAppEntitlements (string appId, string appStoreAppId)
+        {
+             ApiResponse<RestApiResultAppStoreAppEntitlements> localVarResponse = GetAppStoreAppEntitlementsWithHttpInfo(appId, appStoreAppId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>ApiResponse of RestApiResultAppStoreAppEntitlements</returns>
+        public ApiResponse< RestApiResultAppStoreAppEntitlements > GetAppStoreAppEntitlementsWithHttpInfo (string appId, string appStoreAppId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreEntitlementsApi->GetAppStoreAppEntitlements");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreEntitlementsApi->GetAppStoreAppEntitlements");
+
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/entitlements";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppStoreAppEntitlements", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppStoreAppEntitlements>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreAppEntitlements) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreAppEntitlements)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of RestApiResultAppStoreAppEntitlements</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppStoreAppEntitlements> GetAppStoreAppEntitlementsAsync (string appId, string appStoreAppId)
+        {
+             ApiResponse<RestApiResultAppStoreAppEntitlements> localVarResponse = await GetAppStoreAppEntitlementsAsyncWithHttpInfo(appId, appStoreAppId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreAppId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreAppEntitlements)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreAppEntitlements>> GetAppStoreAppEntitlementsAsyncWithHttpInfo (string appId, string appStoreAppId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppStoreEntitlementsApi->GetAppStoreAppEntitlements");
+            // verify the required parameter 'appStoreAppId' is set
+            if (appStoreAppId == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreAppId' when calling AppStoreEntitlementsApi->GetAppStoreAppEntitlements");
+
+            var localVarPath = "./api/v1.0/{appId}/appstore/apps/{appStoreAppId}/entitlements";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appStoreAppId != null) localVarPathParams.Add("appStoreAppId", this.Configuration.ApiClient.ParameterToString(appStoreAppId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppStoreAppEntitlements", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppStoreAppEntitlements>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreAppEntitlements) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreAppEntitlements)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/AppsApi.cs b/src/Flipdish/Api/AppsApi.cs
index 6532c707..ed52631f 100644
--- a/src/Flipdish/Api/AppsApi.cs
+++ b/src/Flipdish/Api/AppsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,49 +25,114 @@ public interface IAppsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get the application configuration
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="orgId"></param>
+        /// <returns>Object</returns>
+        Object AppsSetPropertyId (string appId, string orgId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="orgId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> AppsSetPropertyIdWithHttpInfo (string appId, string orgId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="parameters"></param>
+        /// <returns>RestApiStringResult</returns>
+        RestApiStringResult CreateApp (CreateAppParameters parameters);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="parameters"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        ApiResponse<RestApiStringResult> CreateAppWithHttpInfo (CreateAppParameters parameters);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultApp</returns>
         RestApiResultApp GetApp (string appId);
 
         /// <summary>
-        /// Get the application configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultApp</returns>
         ApiResponse<RestApiResultApp> GetAppWithHttpInfo (string appId);
         /// <summary>
-        /// Get the application hostname DNS delegation states for A and CNAME records.
+        /// 
         /// </summary>
         /// <remarks>
-        /// A domain might be ready but still need 10 minutes to work properly because of HAProxy.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultDnsRecordInformation</returns>
         RestApiResultDnsRecordInformation GetAppHostnameStatus (string appId);
 
         /// <summary>
-        /// Get the application hostname DNS delegation states for A and CNAME records.
+        /// 
         /// </summary>
         /// <remarks>
-        /// A domain might be ready but still need 10 minutes to work properly because of HAProxy.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultDnsRecordInformation</returns>
         ApiResponse<RestApiResultDnsRecordInformation> GetAppHostnameStatusWithHttpInfo (string appId);
         /// <summary>
-        /// Get Apps
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiStringResult</returns>
+        RestApiStringResult GetAppName (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        ApiResponse<RestApiStringResult> GetAppNameWithHttpInfo (string appId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -80,7 +145,7 @@ public interface IAppsApi : IApiAccessor
         RestApiPaginationResultApp GetApps (string nameFilter = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get Apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -92,49 +157,49 @@ public interface IAppsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultApp</returns>
         ApiResponse<RestApiPaginationResultApp> GetAppsWithHttpInfo (string nameFilter = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Get the application compliance configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultAppCompliance</returns>
         RestApiResultAppCompliance GetCompliance (string appId);
 
         /// <summary>
-        /// Get the application compliance configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultAppCompliance</returns>
         ApiResponse<RestApiResultAppCompliance> GetComplianceWithHttpInfo (string appId);
         /// <summary>
-        /// Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiStringResult</returns>
         RestApiStringResult GetPanaceaVanityUrl (string appId);
 
         /// <summary>
-        /// Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         ApiResponse<RestApiStringResult> GetPanaceaVanityUrlWithHttpInfo (string appId);
         /// <summary>
-        /// Get all supported countries.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -144,7 +209,7 @@ public interface IAppsApi : IApiAccessor
         RestApiArrayResultSupportedCountry GetSupportedCountries ();
 
         /// <summary>
-        /// Get all supported countries.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -153,586 +218,2134 @@ public interface IAppsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultSupportedCountry</returns>
         ApiResponse<RestApiArrayResultSupportedCountry> GetSupportedCountriesWithHttpInfo ();
         /// <summary>
-        /// Is panacea vanity url available
+        /// 
         /// </summary>
         /// <remarks>
-        /// Minimum length of 3 characters
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="vanityUrl">Vanity url to check</param>
+        /// <param name="vanityUrl"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiStringResult</returns>
         RestApiStringResult IsPanaceaVanityUrlAvailable (string vanityUrl, string appId);
 
         /// <summary>
-        /// Is panacea vanity url available
+        /// 
         /// </summary>
         /// <remarks>
-        /// Minimum length of 3 characters
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="vanityUrl">Vanity url to check</param>
+        /// <param name="vanityUrl"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         ApiResponse<RestApiStringResult> IsPanaceaVanityUrlAvailableWithHttpInfo (string vanityUrl, string appId);
         /// <summary>
-        /// Set the application configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="appConfigUpdate">Changes to the configuration</param>
-        /// <returns>RestApiResultApp</returns>
-        RestApiResultApp SetAppConfig (string appId, AppConfigUpdateModel appConfigUpdate);
+        /// <param name="whitelabelId"></param>
+        /// <returns>AppLookup</returns>
+        AppLookup LookupByWhitelabelId (int? whitelabelId);
 
         /// <summary>
-        /// Set the application configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="appConfigUpdate">Changes to the configuration</param>
-        /// <returns>ApiResponse of RestApiResultApp</returns>
-        ApiResponse<RestApiResultApp> SetAppConfigWithHttpInfo (string appId, AppConfigUpdateModel appConfigUpdate);
+        /// <param name="whitelabelId"></param>
+        /// <returns>ApiResponse of AppLookup</returns>
+        ApiResponse<AppLookup> LookupByWhitelabelIdWithHttpInfo (int? whitelabelId);
         /// <summary>
-        /// Set the application hostname.
+        /// 
         /// </summary>
         /// <remarks>
-        /// If no subdomain is specified in {hostname} &#39;www&#39; will be prepended.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="hostname">The new Hostname.</param>
-        /// <param name="isEmbed">Will the website be embedded (optional)</param>
-        /// <returns>RestApiStringResult</returns>
-        RestApiStringResult SetAppHostname (string appId, string hostname, bool? isEmbed = null);
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        void SendPushNotification (string appId, int? customerId, string message);
 
         /// <summary>
-        /// Set the application hostname.
+        /// 
         /// </summary>
         /// <remarks>
-        /// If no subdomain is specified in {hostname} &#39;www&#39; will be prepended.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="hostname">The new Hostname.</param>
-        /// <param name="isEmbed">Will the website be embedded (optional)</param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        ApiResponse<RestApiStringResult> SetAppHostnameWithHttpInfo (string appId, string hostname, bool? isEmbed = null);
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="message"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SendPushNotificationWithHttpInfo (string appId, int? customerId, string message);
         /// <summary>
-        /// Set the application languages
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="languages">New list of languages</param>
+        /// <param name="appId"></param>
+        /// <param name="appConfigUpdate"></param>
         /// <returns>RestApiResultApp</returns>
-        RestApiResultApp SetAppLanguages (string appId, List<Language> languages);
+        RestApiResultApp SetAppConfig (string appId, AppConfigUpdateModel appConfigUpdate);
 
         /// <summary>
-        /// Set the application languages
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="languages">New list of languages</param>
+        /// <param name="appId"></param>
+        /// <param name="appConfigUpdate"></param>
         /// <returns>ApiResponse of RestApiResultApp</returns>
-        ApiResponse<RestApiResultApp> SetAppLanguagesWithHttpInfo (string appId, List<Language> languages);
+        ApiResponse<RestApiResultApp> SetAppConfigWithHttpInfo (string appId, AppConfigUpdateModel appConfigUpdate);
         /// <summary>
-        /// Set the application compliance configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="complianceType">Compliance type</param>
-        /// <returns>RestApiResultAppCompliance</returns>
-        RestApiResultAppCompliance SetCompliance (string appId, string complianceType);
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="isEmbed"> (optional)</param>
+        /// <returns>RestApiStringResult</returns>
+        RestApiStringResult SetAppHostname (string appId, string hostname, bool? isEmbed = null);
 
         /// <summary>
-        /// Set the application compliance configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="complianceType">Compliance type</param>
-        /// <returns>ApiResponse of RestApiResultAppCompliance</returns>
-        ApiResponse<RestApiResultAppCompliance> SetComplianceWithHttpInfo (string appId, string complianceType);
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="isEmbed"> (optional)</param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        ApiResponse<RestApiStringResult> SetAppHostnameWithHttpInfo (string appId, string hostname, bool? isEmbed = null);
         /// <summary>
-        /// Set panacea vanity url
+        /// 
         /// </summary>
         /// <remarks>
-        /// Minimum length of 3 characters
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="vanityUrl">Vanity url</param>
-        /// <returns>RestApiStringResult</returns>
-        RestApiStringResult SetPanaceaVanityUrl (string appId, string vanityUrl);
+        /// <param name="appId"></param>
+        /// <param name="languages"></param>
+        /// <returns>RestApiResultApp</returns>
+        RestApiResultApp SetAppLanguages (string appId, List<Language> languages);
 
         /// <summary>
-        /// Set panacea vanity url
+        /// 
         /// </summary>
         /// <remarks>
-        /// Minimum length of 3 characters
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="vanityUrl">Vanity url</param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        ApiResponse<RestApiStringResult> SetPanaceaVanityUrlWithHttpInfo (string appId, string vanityUrl);
+        /// <param name="appId"></param>
+        /// <param name="languages"></param>
+        /// <returns>ApiResponse of RestApiResultApp</returns>
+        ApiResponse<RestApiResultApp> SetAppLanguagesWithHttpInfo (string appId, List<Language> languages);
         /// <summary>
-        /// Set the application logo \\ icon
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="image">App Logo</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreName"></param>
         /// <returns></returns>
-        void UploadAppLogo (string appId, System.IO.Stream image);
+        void SetAppStoreName (string appId, string appStoreName);
 
         /// <summary>
-        /// Set the application logo \\ icon
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="image">App Logo</param>
+        /// <param name="appId"></param>
+        /// <param name="appStoreName"></param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UploadAppLogoWithHttpInfo (string appId, System.IO.Stream image);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
+        ApiResponse<Object> SetAppStoreNameWithHttpInfo (string appId, string appStoreName);
         /// <summary>
-        /// Get the application configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>Task of RestApiResultApp</returns>
-        System.Threading.Tasks.Task<RestApiResultApp> GetAppAsync (string appId);
+        /// <param name="appId"></param>
+        /// <param name="complianceType"></param>
+        /// <returns>RestApiResultAppCompliance</returns>
+        RestApiResultAppCompliance SetCompliance (string appId, string complianceType);
 
         /// <summary>
-        /// Get the application configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> GetAppAsyncWithHttpInfo (string appId);
+        /// <param name="appId"></param>
+        /// <param name="complianceType"></param>
+        /// <returns>ApiResponse of RestApiResultAppCompliance</returns>
+        ApiResponse<RestApiResultAppCompliance> SetComplianceWithHttpInfo (string appId, string complianceType);
         /// <summary>
-        /// Get the application hostname DNS delegation states for A and CNAME records.
+        /// 
         /// </summary>
         /// <remarks>
-        /// A domain might be ready but still need 10 minutes to work properly because of HAProxy.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>Task of RestApiResultDnsRecordInformation</returns>
-        System.Threading.Tasks.Task<RestApiResultDnsRecordInformation> GetAppHostnameStatusAsync (string appId);
+        /// <param name="appId"></param>
+        /// <param name="vanityUrl"></param>
+        /// <returns>RestApiStringResult</returns>
+        RestApiStringResult SetPanaceaVanityUrl (string appId, string vanityUrl);
 
         /// <summary>
-        /// Get the application hostname DNS delegation states for A and CNAME records.
+        /// 
         /// </summary>
         /// <remarks>
-        /// A domain might be ready but still need 10 minutes to work properly because of HAProxy.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>Task of ApiResponse (RestApiResultDnsRecordInformation)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultDnsRecordInformation>> GetAppHostnameStatusAsyncWithHttpInfo (string appId);
+        /// <param name="appId"></param>
+        /// <param name="vanityUrl"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        ApiResponse<RestApiStringResult> SetPanaceaVanityUrlWithHttpInfo (string appId, string vanityUrl);
         /// <summary>
-        /// Get Apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="nameFilter"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of RestApiPaginationResultApp</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultApp> GetAppsAsync (string nameFilter = null, int? page = null, int? limit = null);
+        /// <param name="appId"></param>
+        /// <param name="enabled"></param>
+        /// <returns></returns>
+        void SetThirdPartyIntegrations (string appId, bool? enabled);
 
         /// <summary>
-        /// Get Apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="nameFilter"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultApp)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultApp>> GetAppsAsyncWithHttpInfo (string nameFilter = null, int? page = null, int? limit = null);
+        /// <param name="appId"></param>
+        /// <param name="enabled"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SetThirdPartyIntegrationsWithHttpInfo (string appId, bool? enabled);
         /// <summary>
-        /// Get the application compliance configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>Task of RestApiResultAppCompliance</returns>
-        System.Threading.Tasks.Task<RestApiResultAppCompliance> GetComplianceAsync (string appId);
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="vanityUrl"></param>
+        /// <param name="isNextGenWeb"></param>
+        /// <returns>RestApiStringResult</returns>
+        RestApiStringResult ToggleNextGenWeb (string appId, string hostname, string vanityUrl, bool? isNextGenWeb);
 
         /// <summary>
-        /// Get the application compliance configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultAppCompliance)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>> GetComplianceAsyncWithHttpInfo (string appId);
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="vanityUrl"></param>
+        /// <param name="isNextGenWeb"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        ApiResponse<RestApiStringResult> ToggleNextGenWebWithHttpInfo (string appId, string hostname, string vanityUrl, bool? isNextGenWeb);
         /// <summary>
-        /// Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>Task of RestApiStringResult</returns>
-        System.Threading.Tasks.Task<RestApiStringResult> GetPanaceaVanityUrlAsync (string appId);
+        /// <param name="appId"></param>
+        /// <param name="image">App Logo</param>
+        /// <returns></returns>
+        void UploadAppLogo (string appId, System.IO.Stream image);
 
         /// <summary>
-        /// Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPanaceaVanityUrlAsyncWithHttpInfo (string appId);
+        /// <param name="appId"></param>
+        /// <param name="image">App Logo</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UploadAppLogoWithHttpInfo (string appId, System.IO.Stream image);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
         /// <summary>
-        /// Get all supported countries.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiArrayResultSupportedCountry</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultSupportedCountry> GetSupportedCountriesAsync ();
+        /// <param name="appId"></param>
+        /// <param name="orgId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> AppsSetPropertyIdAsync (string appId, string orgId);
 
         /// <summary>
-        /// Get all supported countries.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiArrayResultSupportedCountry)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSupportedCountry>> GetSupportedCountriesAsyncWithHttpInfo ();
+        /// <param name="appId"></param>
+        /// <param name="orgId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> AppsSetPropertyIdAsyncWithHttpInfo (string appId, string orgId);
         /// <summary>
-        /// Is panacea vanity url available
+        /// 
         /// </summary>
         /// <remarks>
-        /// Minimum length of 3 characters
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="vanityUrl">Vanity url to check</param>
-        /// <param name="appId"></param>
+        /// <param name="parameters"></param>
         /// <returns>Task of RestApiStringResult</returns>
-        System.Threading.Tasks.Task<RestApiStringResult> IsPanaceaVanityUrlAvailableAsync (string vanityUrl, string appId);
+        System.Threading.Tasks.Task<RestApiStringResult> CreateAppAsync (CreateAppParameters parameters);
 
         /// <summary>
-        /// Is panacea vanity url available
+        /// 
         /// </summary>
         /// <remarks>
-        /// Minimum length of 3 characters
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="vanityUrl">Vanity url to check</param>
-        /// <param name="appId"></param>
+        /// <param name="parameters"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> IsPanaceaVanityUrlAvailableAsyncWithHttpInfo (string vanityUrl, string appId);
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> CreateAppAsyncWithHttpInfo (CreateAppParameters parameters);
         /// <summary>
-        /// Set the application configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="appConfigUpdate">Changes to the configuration</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiResultApp</returns>
-        System.Threading.Tasks.Task<RestApiResultApp> SetAppConfigAsync (string appId, AppConfigUpdateModel appConfigUpdate);
+        System.Threading.Tasks.Task<RestApiResultApp> GetAppAsync (string appId);
 
         /// <summary>
-        /// Set the application configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="appConfigUpdate">Changes to the configuration</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppConfigAsyncWithHttpInfo (string appId, AppConfigUpdateModel appConfigUpdate);
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> GetAppAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Set the application hostname.
+        /// 
         /// </summary>
         /// <remarks>
-        /// If no subdomain is specified in {hostname} &#39;www&#39; will be prepended.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="hostname">The new Hostname.</param>
-        /// <param name="isEmbed">Will the website be embedded (optional)</param>
-        /// <returns>Task of RestApiStringResult</returns>
-        System.Threading.Tasks.Task<RestApiStringResult> SetAppHostnameAsync (string appId, string hostname, bool? isEmbed = null);
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultDnsRecordInformation</returns>
+        System.Threading.Tasks.Task<RestApiResultDnsRecordInformation> GetAppHostnameStatusAsync (string appId);
 
         /// <summary>
-        /// Set the application hostname.
+        /// 
         /// </summary>
         /// <remarks>
-        /// If no subdomain is specified in {hostname} &#39;www&#39; will be prepended.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="hostname">The new Hostname.</param>
-        /// <param name="isEmbed">Will the website be embedded (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetAppHostnameAsyncWithHttpInfo (string appId, string hostname, bool? isEmbed = null);
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultDnsRecordInformation)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultDnsRecordInformation>> GetAppHostnameStatusAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Set the application languages
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="languages">New list of languages</param>
-        /// <returns>Task of RestApiResultApp</returns>
-        System.Threading.Tasks.Task<RestApiResultApp> SetAppLanguagesAsync (string appId, List<Language> languages);
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        System.Threading.Tasks.Task<RestApiStringResult> GetAppNameAsync (string appId);
 
         /// <summary>
-        /// Set the application languages
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="languages">New list of languages</param>
-        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppLanguagesAsyncWithHttpInfo (string appId, List<Language> languages);
-        /// <summary>
-        /// Set the application compliance configuration
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetAppNameAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="nameFilter"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultApp</returns>
+        System.Threading.Tasks.Task<RestApiPaginationResultApp> GetAppsAsync (string nameFilter = null, int? page = null, int? limit = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="nameFilter"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultApp)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultApp>> GetAppsAsyncWithHttpInfo (string nameFilter = null, int? page = null, int? limit = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultAppCompliance</returns>
+        System.Threading.Tasks.Task<RestApiResultAppCompliance> GetComplianceAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppCompliance)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>> GetComplianceAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        System.Threading.Tasks.Task<RestApiStringResult> GetPanaceaVanityUrlAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPanaceaVanityUrlAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiArrayResultSupportedCountry</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultSupportedCountry> GetSupportedCountriesAsync ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiArrayResultSupportedCountry)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSupportedCountry>> GetSupportedCountriesAsyncWithHttpInfo ();
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="vanityUrl"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        System.Threading.Tasks.Task<RestApiStringResult> IsPanaceaVanityUrlAvailableAsync (string vanityUrl, string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="vanityUrl"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> IsPanaceaVanityUrlAvailableAsyncWithHttpInfo (string vanityUrl, string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>Task of AppLookup</returns>
+        System.Threading.Tasks.Task<AppLookup> LookupByWhitelabelIdAsync (int? whitelabelId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>Task of ApiResponse (AppLookup)</returns>
+        System.Threading.Tasks.Task<ApiResponse<AppLookup>> LookupByWhitelabelIdAsyncWithHttpInfo (int? whitelabelId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="message"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SendPushNotificationAsync (string appId, int? customerId, string message);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="message"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SendPushNotificationAsyncWithHttpInfo (string appId, int? customerId, string message);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appConfigUpdate"></param>
+        /// <returns>Task of RestApiResultApp</returns>
+        System.Threading.Tasks.Task<RestApiResultApp> SetAppConfigAsync (string appId, AppConfigUpdateModel appConfigUpdate);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appConfigUpdate"></param>
+        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppConfigAsyncWithHttpInfo (string appId, AppConfigUpdateModel appConfigUpdate);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="isEmbed"> (optional)</param>
+        /// <returns>Task of RestApiStringResult</returns>
+        System.Threading.Tasks.Task<RestApiStringResult> SetAppHostnameAsync (string appId, string hostname, bool? isEmbed = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="isEmbed"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetAppHostnameAsyncWithHttpInfo (string appId, string hostname, bool? isEmbed = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languages"></param>
+        /// <returns>Task of RestApiResultApp</returns>
+        System.Threading.Tasks.Task<RestApiResultApp> SetAppLanguagesAsync (string appId, List<Language> languages);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languages"></param>
+        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppLanguagesAsyncWithHttpInfo (string appId, List<Language> languages);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreName"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SetAppStoreNameAsync (string appId, string appStoreName);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreName"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetAppStoreNameAsyncWithHttpInfo (string appId, string appStoreName);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="complianceType">Compliance type</param>
+        /// <param name="appId"></param>
+        /// <param name="complianceType"></param>
         /// <returns>Task of RestApiResultAppCompliance</returns>
         System.Threading.Tasks.Task<RestApiResultAppCompliance> SetComplianceAsync (string appId, string complianceType);
 
         /// <summary>
-        /// Set the application compliance configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="complianceType">Compliance type</param>
+        /// <param name="appId"></param>
+        /// <param name="complianceType"></param>
         /// <returns>Task of ApiResponse (RestApiResultAppCompliance)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>> SetComplianceAsyncWithHttpInfo (string appId, string complianceType);
         /// <summary>
-        /// Set panacea vanity url
+        /// 
         /// </summary>
         /// <remarks>
-        /// Minimum length of 3 characters
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="vanityUrl">Vanity url</param>
+        /// <param name="appId"></param>
+        /// <param name="vanityUrl"></param>
         /// <returns>Task of RestApiStringResult</returns>
         System.Threading.Tasks.Task<RestApiStringResult> SetPanaceaVanityUrlAsync (string appId, string vanityUrl);
 
         /// <summary>
-        /// Set panacea vanity url
+        /// 
         /// </summary>
         /// <remarks>
-        /// Minimum length of 3 characters
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="vanityUrl">Vanity url</param>
+        /// <param name="appId"></param>
+        /// <param name="vanityUrl"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetPanaceaVanityUrlAsyncWithHttpInfo (string appId, string vanityUrl);
         /// <summary>
-        /// Set the application logo \\ icon
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="image">App Logo</param>
+        /// <param name="appId"></param>
+        /// <param name="enabled"></param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UploadAppLogoAsync (string appId, System.IO.Stream image);
+        System.Threading.Tasks.Task SetThirdPartyIntegrationsAsync (string appId, bool? enabled);
 
         /// <summary>
-        /// Set the application logo \\ icon
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="image">App Logo</param>
+        /// <param name="appId"></param>
+        /// <param name="enabled"></param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppLogoAsyncWithHttpInfo (string appId, System.IO.Stream image);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class AppsApi : IAppsApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetThirdPartyIntegrationsAsyncWithHttpInfo (string appId, bool? enabled);
         /// <summary>
-        /// Initializes a new instance of the <see cref="AppsApi"/> class.
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="vanityUrl"></param>
+        /// <param name="isNextGenWeb"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        System.Threading.Tasks.Task<RestApiStringResult> ToggleNextGenWebAsync (string appId, string hostname, string vanityUrl, bool? isNextGenWeb);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="vanityUrl"></param>
+        /// <param name="isNextGenWeb"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> ToggleNextGenWebAsyncWithHttpInfo (string appId, string hostname, string vanityUrl, bool? isNextGenWeb);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="image">App Logo</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UploadAppLogoAsync (string appId, System.IO.Stream image);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="image">App Logo</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppLogoAsyncWithHttpInfo (string appId, System.IO.Stream image);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class AppsApi : IAppsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppsApi"/> class.
         /// </summary>
         /// <returns></returns>
         public AppsApi(String basePath)
         {
             this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
 
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public AppsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="orgId"></param>
+        /// <returns>Object</returns>
+        public Object AppsSetPropertyId (string appId, string orgId)
+        {
+             ApiResponse<Object> localVarResponse = AppsSetPropertyIdWithHttpInfo(appId, orgId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="orgId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > AppsSetPropertyIdWithHttpInfo (string appId, string orgId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->AppsSetPropertyId");
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling AppsApi->AppsSetPropertyId");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/orgId/{orgId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AppsSetPropertyId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="orgId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> AppsSetPropertyIdAsync (string appId, string orgId)
+        {
+             ApiResponse<Object> localVarResponse = await AppsSetPropertyIdAsyncWithHttpInfo(appId, orgId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="orgId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> AppsSetPropertyIdAsyncWithHttpInfo (string appId, string orgId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->AppsSetPropertyId");
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling AppsApi->AppsSetPropertyId");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/orgId/{orgId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AppsSetPropertyId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="parameters"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult CreateApp (CreateAppParameters parameters)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = CreateAppWithHttpInfo(parameters);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="parameters"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > CreateAppWithHttpInfo (CreateAppParameters parameters)
+        {
+            // verify the required parameter 'parameters' is set
+            if (parameters == null)
+                throw new ApiException(400, "Missing required parameter 'parameters' when calling AppsApi->CreateApp");
+
+            var localVarPath = "./api/v1.0/apps";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (parameters != null && parameters.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(parameters); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = parameters; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="parameters"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> CreateAppAsync (CreateAppParameters parameters)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = await CreateAppAsyncWithHttpInfo(parameters);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="parameters"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> CreateAppAsyncWithHttpInfo (CreateAppParameters parameters)
+        {
+            // verify the required parameter 'parameters' is set
+            if (parameters == null)
+                throw new ApiException(400, "Missing required parameter 'parameters' when calling AppsApi->CreateApp");
+
+            var localVarPath = "./api/v1.0/apps";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (parameters != null && parameters.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(parameters); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = parameters; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultApp</returns>
+        public RestApiResultApp GetApp (string appId)
+        {
+             ApiResponse<RestApiResultApp> localVarResponse = GetAppWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultApp</returns>
+        public ApiResponse< RestApiResultApp > GetAppWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetApp");
+
+            var localVarPath = "./api/v1.0/apps/{appId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultApp</returns>
+        public async System.Threading.Tasks.Task<RestApiResultApp> GetAppAsync (string appId)
+        {
+             ApiResponse<RestApiResultApp> localVarResponse = await GetAppAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> GetAppAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetApp");
+
+            var localVarPath = "./api/v1.0/apps/{appId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultDnsRecordInformation</returns>
+        public RestApiResultDnsRecordInformation GetAppHostnameStatus (string appId)
+        {
+             ApiResponse<RestApiResultDnsRecordInformation> localVarResponse = GetAppHostnameStatusWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultDnsRecordInformation</returns>
+        public ApiResponse< RestApiResultDnsRecordInformation > GetAppHostnameStatusWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetAppHostnameStatus");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/hostnamestatus";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppHostnameStatus", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultDnsRecordInformation>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultDnsRecordInformation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDnsRecordInformation)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultDnsRecordInformation</returns>
+        public async System.Threading.Tasks.Task<RestApiResultDnsRecordInformation> GetAppHostnameStatusAsync (string appId)
+        {
+             ApiResponse<RestApiResultDnsRecordInformation> localVarResponse = await GetAppHostnameStatusAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultDnsRecordInformation)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDnsRecordInformation>> GetAppHostnameStatusAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetAppHostnameStatus");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/hostnamestatus";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppHostnameStatus", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultDnsRecordInformation>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultDnsRecordInformation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDnsRecordInformation)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult GetAppName (string appId)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = GetAppNameWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > GetAppNameWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetAppName");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/name";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppName", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> GetAppNameAsync (string appId)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = await GetAppNameAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetAppNameAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetAppName");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/name";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppName", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="nameFilter"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>RestApiPaginationResultApp</returns>
+        public RestApiPaginationResultApp GetApps (string nameFilter = null, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultApp> localVarResponse = GetAppsWithHttpInfo(nameFilter, page, limit);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="nameFilter"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultApp</returns>
+        public ApiResponse< RestApiPaginationResultApp > GetAppsWithHttpInfo (string nameFilter = null, int? page = null, int? limit = null)
+        {
+
+            var localVarPath = "./api/v1.0/apps";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (nameFilter != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "nameFilter", nameFilter)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetApps", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultApp)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="nameFilter"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultApp</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultApp> GetAppsAsync (string nameFilter = null, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultApp> localVarResponse = await GetAppsAsyncWithHttpInfo(nameFilter, page, limit);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="nameFilter"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultApp)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultApp>> GetAppsAsyncWithHttpInfo (string nameFilter = null, int? page = null, int? limit = null)
+        {
+
+            var localVarPath = "./api/v1.0/apps";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (nameFilter != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "nameFilter", nameFilter)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetApps", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultApp)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultAppCompliance</returns>
+        public RestApiResultAppCompliance GetCompliance (string appId)
+        {
+             ApiResponse<RestApiResultAppCompliance> localVarResponse = GetComplianceWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultAppCompliance</returns>
+        public ApiResponse< RestApiResultAppCompliance > GetComplianceWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetCompliance");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/compliance";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetCompliance", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppCompliance>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppCompliance) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppCompliance)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultAppCompliance</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppCompliance> GetComplianceAsync (string appId)
+        {
+             ApiResponse<RestApiResultAppCompliance> localVarResponse = await GetComplianceAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppCompliance)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>> GetComplianceAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetCompliance");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/compliance";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetCompliance", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppCompliance>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppCompliance) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppCompliance)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult GetPanaceaVanityUrl (string appId)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = GetPanaceaVanityUrlWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > GetPanaceaVanityUrlWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetPanaceaVanityUrl");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/panacea/url";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppsApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public AppsApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPanaceaVanityUrl", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Gets the base path of the API client.
+        ///  
         /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> GetPanaceaVanityUrlAsync (string appId)
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+             ApiResponse<RestApiStringResult> localVarResponse = await GetPanaceaVanityUrlAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
         }
 
         /// <summary>
-        /// Sets the base path of the API client.
+        ///  
         /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPanaceaVanityUrlAsyncWithHttpInfo (string appId)
         {
-            // do nothing
-        }
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetPanaceaVanityUrl");
 
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
+            var localVarPath = "./api/v1.0/apps/{appId}/panacea/url";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
 
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
             {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
             }
-            set { _exceptionFactory = value; }
-        }
 
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
 
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPanaceaVanityUrl", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get the application configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>RestApiResultApp</returns>
-        public RestApiResultApp GetApp (string appId)
+        /// <returns>RestApiArrayResultSupportedCountry</returns>
+        public RestApiArrayResultSupportedCountry GetSupportedCountries ()
         {
-             ApiResponse<RestApiResultApp> localVarResponse = GetAppWithHttpInfo(appId);
+             ApiResponse<RestApiArrayResultSupportedCountry> localVarResponse = GetSupportedCountriesWithHttpInfo();
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get the application configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>ApiResponse of RestApiResultApp</returns>
-        public ApiResponse< RestApiResultApp > GetAppWithHttpInfo (string appId)
+        /// <returns>ApiResponse of RestApiArrayResultSupportedCountry</returns>
+        public ApiResponse< RestApiArrayResultSupportedCountry > GetSupportedCountriesWithHttpInfo ()
         {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetApp");
 
-            var localVarPath = "/api/v1.0/apps/{appId}";
+            var localVarPath = "./api/v1.0/apps/supportedcountries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -756,7 +2369,6 @@ public ApiResponse< RestApiResultApp > GetAppWithHttpInfo (string appId)
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -774,41 +2386,36 @@ public ApiResponse< RestApiResultApp > GetAppWithHttpInfo (string appId)
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetApp", localVarResponse);
+                Exception exception = ExceptionFactory("GetSupportedCountries", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
+            return new ApiResponse<RestApiArrayResultSupportedCountry>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultSupportedCountry) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSupportedCountry)));
         }
 
         /// <summary>
-        /// Get the application configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>Task of RestApiResultApp</returns>
-        public async System.Threading.Tasks.Task<RestApiResultApp> GetAppAsync (string appId)
+        /// <returns>Task of RestApiArrayResultSupportedCountry</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultSupportedCountry> GetSupportedCountriesAsync ()
         {
-             ApiResponse<RestApiResultApp> localVarResponse = await GetAppAsyncWithHttpInfo(appId);
+             ApiResponse<RestApiArrayResultSupportedCountry> localVarResponse = await GetSupportedCountriesAsyncWithHttpInfo();
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get the application configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> GetAppAsyncWithHttpInfo (string appId)
+        /// <returns>Task of ApiResponse (RestApiArrayResultSupportedCountry)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSupportedCountry>> GetSupportedCountriesAsyncWithHttpInfo ()
         {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetApp");
 
-            var localVarPath = "/api/v1.0/apps/{appId}";
+            var localVarPath = "./api/v1.0/apps/supportedcountries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -832,7 +2439,6 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> GetAppAs
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -850,40 +2456,45 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> GetAppAs
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetApp", localVarResponse);
+                Exception exception = ExceptionFactory("GetSupportedCountries", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
+            return new ApiResponse<RestApiArrayResultSupportedCountry>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultSupportedCountry) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSupportedCountry)));
         }
 
         /// <summary>
-        /// Get the application hostname DNS delegation states for A and CNAME records. A domain might be ready but still need 10 minutes to work properly because of HAProxy.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>RestApiResultDnsRecordInformation</returns>
-        public RestApiResultDnsRecordInformation GetAppHostnameStatus (string appId)
+        /// <param name="vanityUrl"></param>
+        /// <param name="appId"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult IsPanaceaVanityUrlAvailable (string vanityUrl, string appId)
         {
-             ApiResponse<RestApiResultDnsRecordInformation> localVarResponse = GetAppHostnameStatusWithHttpInfo(appId);
+             ApiResponse<RestApiStringResult> localVarResponse = IsPanaceaVanityUrlAvailableWithHttpInfo(vanityUrl, appId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get the application hostname DNS delegation states for A and CNAME records. A domain might be ready but still need 10 minutes to work properly because of HAProxy.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>ApiResponse of RestApiResultDnsRecordInformation</returns>
-        public ApiResponse< RestApiResultDnsRecordInformation > GetAppHostnameStatusWithHttpInfo (string appId)
+        /// <param name="vanityUrl"></param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > IsPanaceaVanityUrlAvailableWithHttpInfo (string vanityUrl, string appId)
         {
+            // verify the required parameter 'vanityUrl' is set
+            if (vanityUrl == null)
+                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->IsPanaceaVanityUrlAvailable");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetAppHostnameStatus");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->IsPanaceaVanityUrlAvailable");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/hostnamestatus";
+            var localVarPath = "./api/v1.0/apps/{appId}/panacea/url/available";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -908,6 +2519,7 @@ public ApiResponse< RestApiResultDnsRecordInformation > GetAppHostnameStatusWith
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (vanityUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "vanityUrl", vanityUrl)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -925,41 +2537,46 @@ public ApiResponse< RestApiResultDnsRecordInformation > GetAppHostnameStatusWith
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetAppHostnameStatus", localVarResponse);
+                Exception exception = ExceptionFactory("IsPanaceaVanityUrlAvailable", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultDnsRecordInformation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultDnsRecordInformation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDnsRecordInformation)));
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get the application hostname DNS delegation states for A and CNAME records. A domain might be ready but still need 10 minutes to work properly because of HAProxy.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>Task of RestApiResultDnsRecordInformation</returns>
-        public async System.Threading.Tasks.Task<RestApiResultDnsRecordInformation> GetAppHostnameStatusAsync (string appId)
+        /// <param name="vanityUrl"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> IsPanaceaVanityUrlAvailableAsync (string vanityUrl, string appId)
         {
-             ApiResponse<RestApiResultDnsRecordInformation> localVarResponse = await GetAppHostnameStatusAsyncWithHttpInfo(appId);
+             ApiResponse<RestApiStringResult> localVarResponse = await IsPanaceaVanityUrlAvailableAsyncWithHttpInfo(vanityUrl, appId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get the application hostname DNS delegation states for A and CNAME records. A domain might be ready but still need 10 minutes to work properly because of HAProxy.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>Task of ApiResponse (RestApiResultDnsRecordInformation)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDnsRecordInformation>> GetAppHostnameStatusAsyncWithHttpInfo (string appId)
+        /// <param name="vanityUrl"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> IsPanaceaVanityUrlAvailableAsyncWithHttpInfo (string vanityUrl, string appId)
         {
+            // verify the required parameter 'vanityUrl' is set
+            if (vanityUrl == null)
+                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->IsPanaceaVanityUrlAvailable");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetAppHostnameStatus");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->IsPanaceaVanityUrlAvailable");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/hostnamestatus";
+            var localVarPath = "./api/v1.0/apps/{appId}/panacea/url/available";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -984,6 +2601,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDnsRecordInfor
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (vanityUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "vanityUrl", vanityUrl)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1001,41 +2619,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDnsRecordInfor
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetAppHostnameStatus", localVarResponse);
+                Exception exception = ExceptionFactory("IsPanaceaVanityUrlAvailable", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultDnsRecordInformation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultDnsRecordInformation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDnsRecordInformation)));
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get Apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="nameFilter"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>RestApiPaginationResultApp</returns>
-        public RestApiPaginationResultApp GetApps (string nameFilter = null, int? page = null, int? limit = null)
+        /// <param name="whitelabelId"></param>
+        /// <returns>AppLookup</returns>
+        public AppLookup LookupByWhitelabelId (int? whitelabelId)
         {
-             ApiResponse<RestApiPaginationResultApp> localVarResponse = GetAppsWithHttpInfo(nameFilter, page, limit);
+             ApiResponse<AppLookup> localVarResponse = LookupByWhitelabelIdWithHttpInfo(whitelabelId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get Apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="nameFilter"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultApp</returns>
-        public ApiResponse< RestApiPaginationResultApp > GetAppsWithHttpInfo (string nameFilter = null, int? page = null, int? limit = null)
+        /// <param name="whitelabelId"></param>
+        /// <returns>ApiResponse of AppLookup</returns>
+        public ApiResponse< AppLookup > LookupByWhitelabelIdWithHttpInfo (int? whitelabelId)
         {
+            // verify the required parameter 'whitelabelId' is set
+            if (whitelabelId == null)
+                throw new ApiException(400, "Missing required parameter 'whitelabelId' when calling AppsApi->LookupByWhitelabelId");
 
-            var localVarPath = "/api/v1.0/apps";
+            var localVarPath = "./api/v1.0/apps/{whitelabelId}/lookup";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1059,9 +2676,7 @@ public ApiResponse< RestApiPaginationResultApp > GetAppsWithHttpInfo (string nam
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (nameFilter != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "nameFilter", nameFilter)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (whitelabelId != null) localVarPathParams.Add("whitelabelId", this.Configuration.ApiClient.ParameterToString(whitelabelId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1079,42 +2694,41 @@ public ApiResponse< RestApiPaginationResultApp > GetAppsWithHttpInfo (string nam
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetApps", localVarResponse);
+                Exception exception = ExceptionFactory("LookupByWhitelabelId", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultApp)));
+            return new ApiResponse<AppLookup>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (AppLookup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(AppLookup)));
         }
 
         /// <summary>
-        /// Get Apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="nameFilter"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of RestApiPaginationResultApp</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultApp> GetAppsAsync (string nameFilter = null, int? page = null, int? limit = null)
+        /// <param name="whitelabelId"></param>
+        /// <returns>Task of AppLookup</returns>
+        public async System.Threading.Tasks.Task<AppLookup> LookupByWhitelabelIdAsync (int? whitelabelId)
         {
-             ApiResponse<RestApiPaginationResultApp> localVarResponse = await GetAppsAsyncWithHttpInfo(nameFilter, page, limit);
+             ApiResponse<AppLookup> localVarResponse = await LookupByWhitelabelIdAsyncWithHttpInfo(whitelabelId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get Apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="nameFilter"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultApp)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultApp>> GetAppsAsyncWithHttpInfo (string nameFilter = null, int? page = null, int? limit = null)
+        /// <param name="whitelabelId"></param>
+        /// <returns>Task of ApiResponse (AppLookup)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<AppLookup>> LookupByWhitelabelIdAsyncWithHttpInfo (int? whitelabelId)
         {
+            // verify the required parameter 'whitelabelId' is set
+            if (whitelabelId == null)
+                throw new ApiException(400, "Missing required parameter 'whitelabelId' when calling AppsApi->LookupByWhitelabelId");
 
-            var localVarPath = "/api/v1.0/apps";
+            var localVarPath = "./api/v1.0/apps/{whitelabelId}/lookup";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1138,9 +2752,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultApp>
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (nameFilter != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "nameFilter", nameFilter)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (whitelabelId != null) localVarPathParams.Add("whitelabelId", this.Configuration.ApiClient.ParameterToString(whitelabelId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1158,40 +2770,49 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultApp>
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetApps", localVarResponse);
+                Exception exception = ExceptionFactory("LookupByWhitelabelId", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultApp)));
+            return new ApiResponse<AppLookup>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (AppLookup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(AppLookup)));
         }
 
         /// <summary>
-        /// Get the application compliance configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>RestApiResultAppCompliance</returns>
-        public RestApiResultAppCompliance GetCompliance (string appId)
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        public void SendPushNotification (string appId, int? customerId, string message)
         {
-             ApiResponse<RestApiResultAppCompliance> localVarResponse = GetComplianceWithHttpInfo(appId);
-             return localVarResponse.Data;
+             SendPushNotificationWithHttpInfo(appId, customerId, message);
         }
 
         /// <summary>
-        /// Get the application compliance configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>ApiResponse of RestApiResultAppCompliance</returns>
-        public ApiResponse< RestApiResultAppCompliance > GetComplianceWithHttpInfo (string appId)
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="message"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SendPushNotificationWithHttpInfo (string appId, int? customerId, string message)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetCompliance");
-
-            var localVarPath = "/api/v1.0/apps/{appId}/compliance";
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SendPushNotification");
+            // verify the required parameter 'customerId' is set
+            if (customerId == null)
+                throw new ApiException(400, "Missing required parameter 'customerId' when calling AppsApi->SendPushNotification");
+            // verify the required parameter 'message' is set
+            if (message == null)
+                throw new ApiException(400, "Missing required parameter 'message' when calling AppsApi->SendPushNotification");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/SendPushNotification/{customerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1201,6 +2822,11 @@ public ApiResponse< RestApiResultAppCompliance > GetComplianceWithHttpInfo (stri
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1216,6 +2842,15 @@ public ApiResponse< RestApiResultAppCompliance > GetComplianceWithHttpInfo (stri
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (customerId != null) localVarPathParams.Add("customerId", this.Configuration.ApiClient.ParameterToString(customerId)); // path parameter
+            if (message != null && message.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(message); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = message; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1226,48 +2861,57 @@ public ApiResponse< RestApiResultAppCompliance > GetComplianceWithHttpInfo (stri
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetCompliance", localVarResponse);
+                Exception exception = ExceptionFactory("SendPushNotification", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultAppCompliance>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultAppCompliance) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppCompliance)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Get the application compliance configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>Task of RestApiResultAppCompliance</returns>
-        public async System.Threading.Tasks.Task<RestApiResultAppCompliance> GetComplianceAsync (string appId)
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="message"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SendPushNotificationAsync (string appId, int? customerId, string message)
         {
-             ApiResponse<RestApiResultAppCompliance> localVarResponse = await GetComplianceAsyncWithHttpInfo(appId);
-             return localVarResponse.Data;
+             await SendPushNotificationAsyncWithHttpInfo(appId, customerId, message);
 
         }
 
         /// <summary>
-        /// Get the application compliance configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultAppCompliance)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>> GetComplianceAsyncWithHttpInfo (string appId)
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="message"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SendPushNotificationAsyncWithHttpInfo (string appId, int? customerId, string message)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetCompliance");
-
-            var localVarPath = "/api/v1.0/apps/{appId}/compliance";
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SendPushNotification");
+            // verify the required parameter 'customerId' is set
+            if (customerId == null)
+                throw new ApiException(400, "Missing required parameter 'customerId' when calling AppsApi->SendPushNotification");
+            // verify the required parameter 'message' is set
+            if (message == null)
+                throw new ApiException(400, "Missing required parameter 'message' when calling AppsApi->SendPushNotification");
+
+            var localVarPath = "./api/v1.0/apps/{appId}/SendPushNotification/{customerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1277,6 +2921,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1292,6 +2941,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (customerId != null) localVarPathParams.Add("customerId", this.Configuration.ApiClient.ParameterToString(customerId)); // path parameter
+            if (message != null && message.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(message); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = message; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1302,47 +2960,52 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetCompliance", localVarResponse);
+                Exception exception = ExceptionFactory("SendPushNotification", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultAppCompliance>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultAppCompliance) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppCompliance)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>RestApiStringResult</returns>
-        public RestApiStringResult GetPanaceaVanityUrl (string appId)
+        /// <param name="appId"></param>
+        /// <param name="appConfigUpdate"></param>
+        /// <returns>RestApiResultApp</returns>
+        public RestApiResultApp SetAppConfig (string appId, AppConfigUpdateModel appConfigUpdate)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = GetPanaceaVanityUrlWithHttpInfo(appId);
+             ApiResponse<RestApiResultApp> localVarResponse = SetAppConfigWithHttpInfo(appId, appConfigUpdate);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        public ApiResponse< RestApiStringResult > GetPanaceaVanityUrlWithHttpInfo (string appId)
+        /// <param name="appId"></param>
+        /// <param name="appConfigUpdate"></param>
+        /// <returns>ApiResponse of RestApiResultApp</returns>
+        public ApiResponse< RestApiResultApp > SetAppConfigWithHttpInfo (string appId, AppConfigUpdateModel appConfigUpdate)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetPanaceaVanityUrl");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppConfig");
+            // verify the required parameter 'appConfigUpdate' is set
+            if (appConfigUpdate == null)
+                throw new ApiException(400, "Missing required parameter 'appConfigUpdate' when calling AppsApi->SetAppConfig");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/panacea/url";
+            var localVarPath = "./api/v1.0/apps/{appId}/config";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1352,6 +3015,11 @@ public ApiResponse< RestApiStringResult > GetPanaceaVanityUrlWithHttpInfo (strin
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1367,6 +3035,14 @@ public ApiResponse< RestApiStringResult > GetPanaceaVanityUrlWithHttpInfo (strin
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appConfigUpdate != null && appConfigUpdate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appConfigUpdate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appConfigUpdate; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1377,48 +3053,53 @@ public ApiResponse< RestApiStringResult > GetPanaceaVanityUrlWithHttpInfo (strin
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetPanaceaVanityUrl", localVarResponse);
+                Exception exception = ExceptionFactory("SetAppConfig", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
         }
 
         /// <summary>
-        /// Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>Task of RestApiStringResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringResult> GetPanaceaVanityUrlAsync (string appId)
+        /// <param name="appId"></param>
+        /// <param name="appConfigUpdate"></param>
+        /// <returns>Task of RestApiResultApp</returns>
+        public async System.Threading.Tasks.Task<RestApiResultApp> SetAppConfigAsync (string appId, AppConfigUpdateModel appConfigUpdate)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = await GetPanaceaVanityUrlAsyncWithHttpInfo(appId);
+             ApiResponse<RestApiResultApp> localVarResponse = await SetAppConfigAsyncWithHttpInfo(appId, appConfigUpdate);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get panacea vanity url. This sets the URL which the Panacea website is available at. ie. my.flipdish.com/[vanityurl] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPanaceaVanityUrlAsyncWithHttpInfo (string appId)
+        /// <param name="appId"></param>
+        /// <param name="appConfigUpdate"></param>
+        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppConfigAsyncWithHttpInfo (string appId, AppConfigUpdateModel appConfigUpdate)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->GetPanaceaVanityUrl");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppConfig");
+            // verify the required parameter 'appConfigUpdate' is set
+            if (appConfigUpdate == null)
+                throw new ApiException(400, "Missing required parameter 'appConfigUpdate' when calling AppsApi->SetAppConfig");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/panacea/url";
+            var localVarPath = "./api/v1.0/apps/{appId}/config";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1428,6 +3109,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPa
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1443,6 +3129,14 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPa
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appConfigUpdate != null && appConfigUpdate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appConfigUpdate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appConfigUpdate; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1453,42 +3147,54 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPa
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetPanaceaVanityUrl", localVarResponse);
+                Exception exception = ExceptionFactory("SetAppConfig", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
         }
 
         /// <summary>
-        /// Get all supported countries. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiArrayResultSupportedCountry</returns>
-        public RestApiArrayResultSupportedCountry GetSupportedCountries ()
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="isEmbed"> (optional)</param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult SetAppHostname (string appId, string hostname, bool? isEmbed = null)
         {
-             ApiResponse<RestApiArrayResultSupportedCountry> localVarResponse = GetSupportedCountriesWithHttpInfo();
+             ApiResponse<RestApiStringResult> localVarResponse = SetAppHostnameWithHttpInfo(appId, hostname, isEmbed);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get all supported countries. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiArrayResultSupportedCountry</returns>
-        public ApiResponse< RestApiArrayResultSupportedCountry > GetSupportedCountriesWithHttpInfo ()
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="isEmbed"> (optional)</param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > SetAppHostnameWithHttpInfo (string appId, string hostname, bool? isEmbed = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppHostname");
+            // verify the required parameter 'hostname' is set
+            if (hostname == null)
+                throw new ApiException(400, "Missing required parameter 'hostname' when calling AppsApi->SetAppHostname");
 
-            var localVarPath = "/api/v1.0/apps/supportedcountries";
+            var localVarPath = "./api/v1.0/apps/{appId}/hostname";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1512,6 +3218,9 @@ public ApiResponse< RestApiArrayResultSupportedCountry > GetSupportedCountriesWi
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (hostname != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "hostname", hostname)); // query parameter
+            if (isEmbed != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "isEmbed", isEmbed)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1522,43 +3231,55 @@ public ApiResponse< RestApiArrayResultSupportedCountry > GetSupportedCountriesWi
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetSupportedCountries", localVarResponse);
+                Exception exception = ExceptionFactory("SetAppHostname", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultSupportedCountry>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultSupportedCountry) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSupportedCountry)));
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get all supported countries. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiArrayResultSupportedCountry</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultSupportedCountry> GetSupportedCountriesAsync ()
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="isEmbed"> (optional)</param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> SetAppHostnameAsync (string appId, string hostname, bool? isEmbed = null)
         {
-             ApiResponse<RestApiArrayResultSupportedCountry> localVarResponse = await GetSupportedCountriesAsyncWithHttpInfo();
+             ApiResponse<RestApiStringResult> localVarResponse = await SetAppHostnameAsyncWithHttpInfo(appId, hostname, isEmbed);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get all supported countries. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiArrayResultSupportedCountry)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSupportedCountry>> GetSupportedCountriesAsyncWithHttpInfo ()
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="isEmbed"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetAppHostnameAsyncWithHttpInfo (string appId, string hostname, bool? isEmbed = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppHostname");
+            // verify the required parameter 'hostname' is set
+            if (hostname == null)
+                throw new ApiException(400, "Missing required parameter 'hostname' when calling AppsApi->SetAppHostname");
 
-            var localVarPath = "/api/v1.0/apps/supportedcountries";
+            var localVarPath = "./api/v1.0/apps/{appId}/hostname";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1582,6 +3303,9 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSupported
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (hostname != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "hostname", hostname)); // query parameter
+            if (isEmbed != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "isEmbed", isEmbed)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1592,52 +3316,52 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSupported
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetSupportedCountries", localVarResponse);
+                Exception exception = ExceptionFactory("SetAppHostname", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultSupportedCountry>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultSupportedCountry) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSupportedCountry)));
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Is panacea vanity url available Minimum length of 3 characters
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="vanityUrl">Vanity url to check</param>
         /// <param name="appId"></param>
-        /// <returns>RestApiStringResult</returns>
-        public RestApiStringResult IsPanaceaVanityUrlAvailable (string vanityUrl, string appId)
+        /// <param name="languages"></param>
+        /// <returns>RestApiResultApp</returns>
+        public RestApiResultApp SetAppLanguages (string appId, List<Language> languages)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = IsPanaceaVanityUrlAvailableWithHttpInfo(vanityUrl, appId);
+             ApiResponse<RestApiResultApp> localVarResponse = SetAppLanguagesWithHttpInfo(appId, languages);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Is panacea vanity url available Minimum length of 3 characters
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="vanityUrl">Vanity url to check</param>
         /// <param name="appId"></param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        public ApiResponse< RestApiStringResult > IsPanaceaVanityUrlAvailableWithHttpInfo (string vanityUrl, string appId)
+        /// <param name="languages"></param>
+        /// <returns>ApiResponse of RestApiResultApp</returns>
+        public ApiResponse< RestApiResultApp > SetAppLanguagesWithHttpInfo (string appId, List<Language> languages)
         {
-            // verify the required parameter 'vanityUrl' is set
-            if (vanityUrl == null)
-                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->IsPanaceaVanityUrlAvailable");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->IsPanaceaVanityUrlAvailable");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppLanguages");
+            // verify the required parameter 'languages' is set
+            if (languages == null)
+                throw new ApiException(400, "Missing required parameter 'languages' when calling AppsApi->SetAppLanguages");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/panacea/url/available";
+            var localVarPath = "./api/v1.0/apps/{appId}/config/languages";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1647,6 +3371,11 @@ public ApiResponse< RestApiStringResult > IsPanaceaVanityUrlAvailableWithHttpInf
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1662,7 +3391,14 @@ public ApiResponse< RestApiStringResult > IsPanaceaVanityUrlAvailableWithHttpInf
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (vanityUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "vanityUrl", vanityUrl)); // query parameter
+            if (languages != null && languages.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(languages); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = languages; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1673,53 +3409,53 @@ public ApiResponse< RestApiStringResult > IsPanaceaVanityUrlAvailableWithHttpInf
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("IsPanaceaVanityUrlAvailable", localVarResponse);
+                Exception exception = ExceptionFactory("SetAppLanguages", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
         }
 
         /// <summary>
-        /// Is panacea vanity url available Minimum length of 3 characters
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="vanityUrl">Vanity url to check</param>
         /// <param name="appId"></param>
-        /// <returns>Task of RestApiStringResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringResult> IsPanaceaVanityUrlAvailableAsync (string vanityUrl, string appId)
+        /// <param name="languages"></param>
+        /// <returns>Task of RestApiResultApp</returns>
+        public async System.Threading.Tasks.Task<RestApiResultApp> SetAppLanguagesAsync (string appId, List<Language> languages)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = await IsPanaceaVanityUrlAvailableAsyncWithHttpInfo(vanityUrl, appId);
+             ApiResponse<RestApiResultApp> localVarResponse = await SetAppLanguagesAsyncWithHttpInfo(appId, languages);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Is panacea vanity url available Minimum length of 3 characters
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="vanityUrl">Vanity url to check</param>
         /// <param name="appId"></param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> IsPanaceaVanityUrlAvailableAsyncWithHttpInfo (string vanityUrl, string appId)
+        /// <param name="languages"></param>
+        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppLanguagesAsyncWithHttpInfo (string appId, List<Language> languages)
         {
-            // verify the required parameter 'vanityUrl' is set
-            if (vanityUrl == null)
-                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->IsPanaceaVanityUrlAvailable");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->IsPanaceaVanityUrlAvailable");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppLanguages");
+            // verify the required parameter 'languages' is set
+            if (languages == null)
+                throw new ApiException(400, "Missing required parameter 'languages' when calling AppsApi->SetAppLanguages");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/panacea/url/available";
+            var localVarPath = "./api/v1.0/apps/{appId}/config/languages";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1729,6 +3465,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> IsPan
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1744,7 +3485,14 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> IsPan
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (vanityUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "vanityUrl", vanityUrl)); // query parameter
+            if (languages != null && languages.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(languages); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = languages; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1755,52 +3503,51 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> IsPan
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("IsPanaceaVanityUrlAvailable", localVarResponse);
+                Exception exception = ExceptionFactory("SetAppLanguages", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
         }
 
         /// <summary>
-        /// Set the application configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="appConfigUpdate">Changes to the configuration</param>
-        /// <returns>RestApiResultApp</returns>
-        public RestApiResultApp SetAppConfig (string appId, AppConfigUpdateModel appConfigUpdate)
+        /// <param name="appId"></param>
+        /// <param name="appStoreName"></param>
+        /// <returns></returns>
+        public void SetAppStoreName (string appId, string appStoreName)
         {
-             ApiResponse<RestApiResultApp> localVarResponse = SetAppConfigWithHttpInfo(appId, appConfigUpdate);
-             return localVarResponse.Data;
+             SetAppStoreNameWithHttpInfo(appId, appStoreName);
         }
 
         /// <summary>
-        /// Set the application configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="appConfigUpdate">Changes to the configuration</param>
-        /// <returns>ApiResponse of RestApiResultApp</returns>
-        public ApiResponse< RestApiResultApp > SetAppConfigWithHttpInfo (string appId, AppConfigUpdateModel appConfigUpdate)
+        /// <param name="appId"></param>
+        /// <param name="appStoreName"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetAppStoreNameWithHttpInfo (string appId, string appStoreName)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppConfig");
-            // verify the required parameter 'appConfigUpdate' is set
-            if (appConfigUpdate == null)
-                throw new ApiException(400, "Missing required parameter 'appConfigUpdate' when calling AppsApi->SetAppConfig");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppStoreName");
+            // verify the required parameter 'appStoreName' is set
+            if (appStoreName == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreName' when calling AppsApi->SetAppStoreName");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/config";
+            var localVarPath = "./api/v1.0/apps/{appId}/appstorename";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1830,13 +3577,13 @@ public ApiResponse< RestApiResultApp > SetAppConfigWithHttpInfo (string appId, A
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (appConfigUpdate != null && appConfigUpdate.GetType() != typeof(byte[]))
+            if (appStoreName != null && appStoreName.GetType() != typeof(byte[]))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(appConfigUpdate); // http body (model) parameter
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreName); // http body (model) parameter
             }
             else
             {
-                localVarPostBody = appConfigUpdate; // byte array
+                localVarPostBody = appStoreName; // byte array
             }
 
             // authentication (oauth2) required
@@ -1855,46 +3602,45 @@ public ApiResponse< RestApiResultApp > SetAppConfigWithHttpInfo (string appId, A
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetAppConfig", localVarResponse);
+                Exception exception = ExceptionFactory("SetAppStoreName", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Set the application configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="appConfigUpdate">Changes to the configuration</param>
-        /// <returns>Task of RestApiResultApp</returns>
-        public async System.Threading.Tasks.Task<RestApiResultApp> SetAppConfigAsync (string appId, AppConfigUpdateModel appConfigUpdate)
+        /// <param name="appId"></param>
+        /// <param name="appStoreName"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetAppStoreNameAsync (string appId, string appStoreName)
         {
-             ApiResponse<RestApiResultApp> localVarResponse = await SetAppConfigAsyncWithHttpInfo(appId, appConfigUpdate);
-             return localVarResponse.Data;
+             await SetAppStoreNameAsyncWithHttpInfo(appId, appStoreName);
 
         }
 
         /// <summary>
-        /// Set the application configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="appConfigUpdate">Changes to the configuration</param>
-        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppConfigAsyncWithHttpInfo (string appId, AppConfigUpdateModel appConfigUpdate)
+        /// <param name="appId"></param>
+        /// <param name="appStoreName"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetAppStoreNameAsyncWithHttpInfo (string appId, string appStoreName)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppConfig");
-            // verify the required parameter 'appConfigUpdate' is set
-            if (appConfigUpdate == null)
-                throw new ApiException(400, "Missing required parameter 'appConfigUpdate' when calling AppsApi->SetAppConfig");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppStoreName");
+            // verify the required parameter 'appStoreName' is set
+            if (appStoreName == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreName' when calling AppsApi->SetAppStoreName");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/config";
+            var localVarPath = "./api/v1.0/apps/{appId}/appstorename";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1924,13 +3670,13 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppCo
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (appConfigUpdate != null && appConfigUpdate.GetType() != typeof(byte[]))
+            if (appStoreName != null && appStoreName.GetType() != typeof(byte[]))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(appConfigUpdate); // http body (model) parameter
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreName); // http body (model) parameter
             }
             else
             {
-                localVarPostBody = appConfigUpdate; // byte array
+                localVarPostBody = appStoreName; // byte array
             }
 
             // authentication (oauth2) required
@@ -1949,47 +3695,45 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppCo
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetAppConfig", localVarResponse);
+                Exception exception = ExceptionFactory("SetAppStoreName", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Set the application hostname. If no subdomain is specified in {hostname} &#39;www&#39; will be prepended.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="hostname">The new Hostname.</param>
-        /// <param name="isEmbed">Will the website be embedded (optional)</param>
-        /// <returns>RestApiStringResult</returns>
-        public RestApiStringResult SetAppHostname (string appId, string hostname, bool? isEmbed = null)
+        /// <param name="appId"></param>
+        /// <param name="complianceType"></param>
+        /// <returns>RestApiResultAppCompliance</returns>
+        public RestApiResultAppCompliance SetCompliance (string appId, string complianceType)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = SetAppHostnameWithHttpInfo(appId, hostname, isEmbed);
+             ApiResponse<RestApiResultAppCompliance> localVarResponse = SetComplianceWithHttpInfo(appId, complianceType);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Set the application hostname. If no subdomain is specified in {hostname} &#39;www&#39; will be prepended.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="hostname">The new Hostname.</param>
-        /// <param name="isEmbed">Will the website be embedded (optional)</param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        public ApiResponse< RestApiStringResult > SetAppHostnameWithHttpInfo (string appId, string hostname, bool? isEmbed = null)
+        /// <param name="appId"></param>
+        /// <param name="complianceType"></param>
+        /// <returns>ApiResponse of RestApiResultAppCompliance</returns>
+        public ApiResponse< RestApiResultAppCompliance > SetComplianceWithHttpInfo (string appId, string complianceType)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppHostname");
-            // verify the required parameter 'hostname' is set
-            if (hostname == null)
-                throw new ApiException(400, "Missing required parameter 'hostname' when calling AppsApi->SetAppHostname");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetCompliance");
+            // verify the required parameter 'complianceType' is set
+            if (complianceType == null)
+                throw new ApiException(400, "Missing required parameter 'complianceType' when calling AppsApi->SetCompliance");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/hostname";
+            var localVarPath = "./api/v1.0/apps/{appId}/compliance";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2014,8 +3758,7 @@ public ApiResponse< RestApiStringResult > SetAppHostnameWithHttpInfo (string app
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (hostname != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "hostname", hostname)); // query parameter
-            if (isEmbed != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "isEmbed", isEmbed)); // query parameter
+            if (complianceType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "complianceType", complianceType)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2033,48 +3776,46 @@ public ApiResponse< RestApiStringResult > SetAppHostnameWithHttpInfo (string app
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetAppHostname", localVarResponse);
+                Exception exception = ExceptionFactory("SetCompliance", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiResultAppCompliance>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppCompliance) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppCompliance)));
         }
 
         /// <summary>
-        /// Set the application hostname. If no subdomain is specified in {hostname} &#39;www&#39; will be prepended.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="hostname">The new Hostname.</param>
-        /// <param name="isEmbed">Will the website be embedded (optional)</param>
-        /// <returns>Task of RestApiStringResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringResult> SetAppHostnameAsync (string appId, string hostname, bool? isEmbed = null)
+        /// <param name="appId"></param>
+        /// <param name="complianceType"></param>
+        /// <returns>Task of RestApiResultAppCompliance</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppCompliance> SetComplianceAsync (string appId, string complianceType)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = await SetAppHostnameAsyncWithHttpInfo(appId, hostname, isEmbed);
+             ApiResponse<RestApiResultAppCompliance> localVarResponse = await SetComplianceAsyncWithHttpInfo(appId, complianceType);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Set the application hostname. If no subdomain is specified in {hostname} &#39;www&#39; will be prepended.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="hostname">The new Hostname.</param>
-        /// <param name="isEmbed">Will the website be embedded (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetAppHostnameAsyncWithHttpInfo (string appId, string hostname, bool? isEmbed = null)
+        /// <param name="appId"></param>
+        /// <param name="complianceType"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppCompliance)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>> SetComplianceAsyncWithHttpInfo (string appId, string complianceType)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppHostname");
-            // verify the required parameter 'hostname' is set
-            if (hostname == null)
-                throw new ApiException(400, "Missing required parameter 'hostname' when calling AppsApi->SetAppHostname");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetCompliance");
+            // verify the required parameter 'complianceType' is set
+            if (complianceType == null)
+                throw new ApiException(400, "Missing required parameter 'complianceType' when calling AppsApi->SetCompliance");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/hostname";
+            var localVarPath = "./api/v1.0/apps/{appId}/compliance";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2099,8 +3840,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetAp
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (hostname != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "hostname", hostname)); // query parameter
-            if (isEmbed != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "isEmbed", isEmbed)); // query parameter
+            if (complianceType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "complianceType", complianceType)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2118,45 +3858,45 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetAp
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetAppHostname", localVarResponse);
+                Exception exception = ExceptionFactory("SetCompliance", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiResultAppCompliance>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppCompliance) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppCompliance)));
         }
 
         /// <summary>
-        /// Set the application languages 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="languages">New list of languages</param>
-        /// <returns>RestApiResultApp</returns>
-        public RestApiResultApp SetAppLanguages (string appId, List<Language> languages)
+        /// <param name="appId"></param>
+        /// <param name="vanityUrl"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult SetPanaceaVanityUrl (string appId, string vanityUrl)
         {
-             ApiResponse<RestApiResultApp> localVarResponse = SetAppLanguagesWithHttpInfo(appId, languages);
+             ApiResponse<RestApiStringResult> localVarResponse = SetPanaceaVanityUrlWithHttpInfo(appId, vanityUrl);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Set the application languages 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="languages">New list of languages</param>
-        /// <returns>ApiResponse of RestApiResultApp</returns>
-        public ApiResponse< RestApiResultApp > SetAppLanguagesWithHttpInfo (string appId, List<Language> languages)
+        /// <param name="appId"></param>
+        /// <param name="vanityUrl"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > SetPanaceaVanityUrlWithHttpInfo (string appId, string vanityUrl)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppLanguages");
-            // verify the required parameter 'languages' is set
-            if (languages == null)
-                throw new ApiException(400, "Missing required parameter 'languages' when calling AppsApi->SetAppLanguages");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetPanaceaVanityUrl");
+            // verify the required parameter 'vanityUrl' is set
+            if (vanityUrl == null)
+                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->SetPanaceaVanityUrl");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/config/languages";
+            var localVarPath = "./api/v1.0/apps/{appId}/panacea/url";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2166,11 +3906,6 @@ public ApiResponse< RestApiResultApp > SetAppLanguagesWithHttpInfo (string appId
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -2186,14 +3921,7 @@ public ApiResponse< RestApiResultApp > SetAppLanguagesWithHttpInfo (string appId
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (languages != null && languages.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(languages); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = languages; // byte array
-            }
+            if (vanityUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "vanityUrl", vanityUrl)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2211,46 +3939,46 @@ public ApiResponse< RestApiResultApp > SetAppLanguagesWithHttpInfo (string appId
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetAppLanguages", localVarResponse);
+                Exception exception = ExceptionFactory("SetPanaceaVanityUrl", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Set the application languages 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="languages">New list of languages</param>
-        /// <returns>Task of RestApiResultApp</returns>
-        public async System.Threading.Tasks.Task<RestApiResultApp> SetAppLanguagesAsync (string appId, List<Language> languages)
+        /// <param name="appId"></param>
+        /// <param name="vanityUrl"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> SetPanaceaVanityUrlAsync (string appId, string vanityUrl)
         {
-             ApiResponse<RestApiResultApp> localVarResponse = await SetAppLanguagesAsyncWithHttpInfo(appId, languages);
+             ApiResponse<RestApiStringResult> localVarResponse = await SetPanaceaVanityUrlAsyncWithHttpInfo(appId, vanityUrl);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Set the application languages 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="languages">New list of languages</param>
-        /// <returns>Task of ApiResponse (RestApiResultApp)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppLanguagesAsyncWithHttpInfo (string appId, List<Language> languages)
+        /// <param name="appId"></param>
+        /// <param name="vanityUrl"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetPanaceaVanityUrlAsyncWithHttpInfo (string appId, string vanityUrl)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetAppLanguages");
-            // verify the required parameter 'languages' is set
-            if (languages == null)
-                throw new ApiException(400, "Missing required parameter 'languages' when calling AppsApi->SetAppLanguages");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetPanaceaVanityUrl");
+            // verify the required parameter 'vanityUrl' is set
+            if (vanityUrl == null)
+                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->SetPanaceaVanityUrl");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/config/languages";
+            var localVarPath = "./api/v1.0/apps/{appId}/panacea/url";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2260,11 +3988,6 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppLa
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -2280,14 +4003,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppLa
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (languages != null && languages.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(languages); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = languages; // byte array
-            }
+            if (vanityUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "vanityUrl", vanityUrl)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2305,45 +4021,44 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultApp>> SetAppLa
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetAppLanguages", localVarResponse);
+                Exception exception = ExceptionFactory("SetPanaceaVanityUrl", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultApp)));
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Set the application compliance configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="complianceType">Compliance type</param>
-        /// <returns>RestApiResultAppCompliance</returns>
-        public RestApiResultAppCompliance SetCompliance (string appId, string complianceType)
+        /// <param name="appId"></param>
+        /// <param name="enabled"></param>
+        /// <returns></returns>
+        public void SetThirdPartyIntegrations (string appId, bool? enabled)
         {
-             ApiResponse<RestApiResultAppCompliance> localVarResponse = SetComplianceWithHttpInfo(appId, complianceType);
-             return localVarResponse.Data;
+             SetThirdPartyIntegrationsWithHttpInfo(appId, enabled);
         }
 
         /// <summary>
-        /// Set the application compliance configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="complianceType">Compliance type</param>
-        /// <returns>ApiResponse of RestApiResultAppCompliance</returns>
-        public ApiResponse< RestApiResultAppCompliance > SetComplianceWithHttpInfo (string appId, string complianceType)
+        /// <param name="appId"></param>
+        /// <param name="enabled"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetThirdPartyIntegrationsWithHttpInfo (string appId, bool? enabled)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetCompliance");
-            // verify the required parameter 'complianceType' is set
-            if (complianceType == null)
-                throw new ApiException(400, "Missing required parameter 'complianceType' when calling AppsApi->SetCompliance");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetThirdPartyIntegrations");
+            // verify the required parameter 'enabled' is set
+            if (enabled == null)
+                throw new ApiException(400, "Missing required parameter 'enabled' when calling AppsApi->SetThirdPartyIntegrations");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/compliance";
+            var localVarPath = "./api/v1.0/apps/{appId}/third-party-integrations";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2368,7 +4083,7 @@ public ApiResponse< RestApiResultAppCompliance > SetComplianceWithHttpInfo (stri
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (complianceType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "complianceType", complianceType)); // query parameter
+            if (enabled != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enabled", enabled)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2386,46 +4101,45 @@ public ApiResponse< RestApiResultAppCompliance > SetComplianceWithHttpInfo (stri
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetCompliance", localVarResponse);
+                Exception exception = ExceptionFactory("SetThirdPartyIntegrations", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultAppCompliance>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultAppCompliance) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppCompliance)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Set the application compliance configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="complianceType">Compliance type</param>
-        /// <returns>Task of RestApiResultAppCompliance</returns>
-        public async System.Threading.Tasks.Task<RestApiResultAppCompliance> SetComplianceAsync (string appId, string complianceType)
+        /// <param name="appId"></param>
+        /// <param name="enabled"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetThirdPartyIntegrationsAsync (string appId, bool? enabled)
         {
-             ApiResponse<RestApiResultAppCompliance> localVarResponse = await SetComplianceAsyncWithHttpInfo(appId, complianceType);
-             return localVarResponse.Data;
+             await SetThirdPartyIntegrationsAsyncWithHttpInfo(appId, enabled);
 
         }
 
         /// <summary>
-        /// Set the application compliance configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="complianceType">Compliance type</param>
-        /// <returns>Task of ApiResponse (RestApiResultAppCompliance)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>> SetComplianceAsyncWithHttpInfo (string appId, string complianceType)
+        /// <param name="appId"></param>
+        /// <param name="enabled"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetThirdPartyIntegrationsAsyncWithHttpInfo (string appId, bool? enabled)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetCompliance");
-            // verify the required parameter 'complianceType' is set
-            if (complianceType == null)
-                throw new ApiException(400, "Missing required parameter 'complianceType' when calling AppsApi->SetCompliance");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetThirdPartyIntegrations");
+            // verify the required parameter 'enabled' is set
+            if (enabled == null)
+                throw new ApiException(400, "Missing required parameter 'enabled' when calling AppsApi->SetThirdPartyIntegrations");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/compliance";
+            var localVarPath = "./api/v1.0/apps/{appId}/third-party-integrations";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2450,7 +4164,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (complianceType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "complianceType", complianceType)); // query parameter
+            if (enabled != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enabled", enabled)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2468,45 +4182,55 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppCompliance>
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetCompliance", localVarResponse);
+                Exception exception = ExceptionFactory("SetThirdPartyIntegrations", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultAppCompliance>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultAppCompliance) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppCompliance)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Set panacea vanity url Minimum length of 3 characters
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="vanityUrl">Vanity url</param>
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="vanityUrl"></param>
+        /// <param name="isNextGenWeb"></param>
         /// <returns>RestApiStringResult</returns>
-        public RestApiStringResult SetPanaceaVanityUrl (string appId, string vanityUrl)
+        public RestApiStringResult ToggleNextGenWeb (string appId, string hostname, string vanityUrl, bool? isNextGenWeb)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = SetPanaceaVanityUrlWithHttpInfo(appId, vanityUrl);
+             ApiResponse<RestApiStringResult> localVarResponse = ToggleNextGenWebWithHttpInfo(appId, hostname, vanityUrl, isNextGenWeb);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Set panacea vanity url Minimum length of 3 characters
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="vanityUrl">Vanity url</param>
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="vanityUrl"></param>
+        /// <param name="isNextGenWeb"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
-        public ApiResponse< RestApiStringResult > SetPanaceaVanityUrlWithHttpInfo (string appId, string vanityUrl)
+        public ApiResponse< RestApiStringResult > ToggleNextGenWebWithHttpInfo (string appId, string hostname, string vanityUrl, bool? isNextGenWeb)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetPanaceaVanityUrl");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->ToggleNextGenWeb");
+            // verify the required parameter 'hostname' is set
+            if (hostname == null)
+                throw new ApiException(400, "Missing required parameter 'hostname' when calling AppsApi->ToggleNextGenWeb");
             // verify the required parameter 'vanityUrl' is set
             if (vanityUrl == null)
-                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->SetPanaceaVanityUrl");
+                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->ToggleNextGenWeb");
+            // verify the required parameter 'isNextGenWeb' is set
+            if (isNextGenWeb == null)
+                throw new ApiException(400, "Missing required parameter 'isNextGenWeb' when calling AppsApi->ToggleNextGenWeb");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/panacea/url";
+            var localVarPath = "./api/v1.0/apps/{appId}/nextgenweb";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2531,7 +4255,9 @@ public ApiResponse< RestApiStringResult > SetPanaceaVanityUrlWithHttpInfo (strin
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (hostname != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "hostname", hostname)); // query parameter
             if (vanityUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "vanityUrl", vanityUrl)); // query parameter
+            if (isNextGenWeb != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "isNextGenWeb", isNextGenWeb)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2549,46 +4275,56 @@ public ApiResponse< RestApiStringResult > SetPanaceaVanityUrlWithHttpInfo (strin
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetPanaceaVanityUrl", localVarResponse);
+                Exception exception = ExceptionFactory("ToggleNextGenWeb", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Set panacea vanity url Minimum length of 3 characters
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="vanityUrl">Vanity url</param>
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="vanityUrl"></param>
+        /// <param name="isNextGenWeb"></param>
         /// <returns>Task of RestApiStringResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringResult> SetPanaceaVanityUrlAsync (string appId, string vanityUrl)
+        public async System.Threading.Tasks.Task<RestApiStringResult> ToggleNextGenWebAsync (string appId, string hostname, string vanityUrl, bool? isNextGenWeb)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = await SetPanaceaVanityUrlAsyncWithHttpInfo(appId, vanityUrl);
+             ApiResponse<RestApiStringResult> localVarResponse = await ToggleNextGenWebAsyncWithHttpInfo(appId, hostname, vanityUrl, isNextGenWeb);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Set panacea vanity url Minimum length of 3 characters
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier.</param>
-        /// <param name="vanityUrl">Vanity url</param>
+        /// <param name="appId"></param>
+        /// <param name="hostname"></param>
+        /// <param name="vanityUrl"></param>
+        /// <param name="isNextGenWeb"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetPanaceaVanityUrlAsyncWithHttpInfo (string appId, string vanityUrl)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> ToggleNextGenWebAsyncWithHttpInfo (string appId, string hostname, string vanityUrl, bool? isNextGenWeb)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->SetPanaceaVanityUrl");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling AppsApi->ToggleNextGenWeb");
+            // verify the required parameter 'hostname' is set
+            if (hostname == null)
+                throw new ApiException(400, "Missing required parameter 'hostname' when calling AppsApi->ToggleNextGenWeb");
             // verify the required parameter 'vanityUrl' is set
             if (vanityUrl == null)
-                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->SetPanaceaVanityUrl");
+                throw new ApiException(400, "Missing required parameter 'vanityUrl' when calling AppsApi->ToggleNextGenWeb");
+            // verify the required parameter 'isNextGenWeb' is set
+            if (isNextGenWeb == null)
+                throw new ApiException(400, "Missing required parameter 'isNextGenWeb' when calling AppsApi->ToggleNextGenWeb");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/panacea/url";
+            var localVarPath = "./api/v1.0/apps/{appId}/nextgenweb";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2613,7 +4349,9 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetPa
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (hostname != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "hostname", hostname)); // query parameter
             if (vanityUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "vanityUrl", vanityUrl)); // query parameter
+            if (isNextGenWeb != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "isNextGenWeb", isNextGenWeb)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2631,20 +4369,20 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetPa
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetPanaceaVanityUrl", localVarResponse);
+                Exception exception = ExceptionFactory("ToggleNextGenWeb", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Set the application logo \\ icon 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <param name="image">App Logo</param>
         /// <returns></returns>
         public void UploadAppLogo (string appId, System.IO.Stream image)
@@ -2653,10 +4391,10 @@ public void UploadAppLogo (string appId, System.IO.Stream image)
         }
 
         /// <summary>
-        /// Set the application logo \\ icon 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <param name="image">App Logo</param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UploadAppLogoWithHttpInfo (string appId, System.IO.Stream image)
@@ -2668,7 +4406,7 @@ public ApiResponse<Object> UploadAppLogoWithHttpInfo (string appId, System.IO.St
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling AppsApi->UploadAppLogo");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/logo";
+            var localVarPath = "./api/v1.0/apps/{appId}/logo";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2717,15 +4455,15 @@ public ApiResponse<Object> UploadAppLogoWithHttpInfo (string appId, System.IO.St
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Set the application logo \\ icon 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <param name="image">App Logo</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UploadAppLogoAsync (string appId, System.IO.Stream image)
@@ -2735,10 +4473,10 @@ public async System.Threading.Tasks.Task UploadAppLogoAsync (string appId, Syste
         }
 
         /// <summary>
-        /// Set the application logo \\ icon 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <param name="image">App Logo</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppLogoAsyncWithHttpInfo (string appId, System.IO.Stream image)
@@ -2750,7 +4488,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppLogoAsync
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling AppsApi->UploadAppLogo");
 
-            var localVarPath = "/api/v1.0/apps/{appId}/logo";
+            var localVarPath = "./api/v1.0/apps/{appId}/logo";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2799,7 +4537,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadAppLogoAsync
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/AuditLogsApi.cs b/src/Flipdish/Api/AuditLogsApi.cs
index d79e1fcd..20777290 100644
--- a/src/Flipdish/Api/AuditLogsApi.cs
+++ b/src/Flipdish/Api/AuditLogsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,10 +25,10 @@ public interface IAuditLogsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create an order audit log event
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -37,10 +37,10 @@ public interface IAuditLogsApi : IApiAccessor
         void AddOrderAuditLog (int? orderId, List<ExternalStoreAuditLog> externalEventCreate);
 
         /// <summary>
-        /// Create an order audit log event
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -48,10 +48,10 @@ public interface IAuditLogsApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> AddOrderAuditLogWithHttpInfo (int? orderId, List<ExternalStoreAuditLog> externalEventCreate);
         /// <summary>
-        /// Create a store audit log event
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
@@ -60,10 +60,10 @@ public interface IAuditLogsApi : IApiAccessor
         void AddStoreAuditLogEvent (int? storeId, List<ExternalStoreAuditLog> externalEventCreate);
 
         /// <summary>
-        /// Create a store audit log event
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
@@ -73,10 +73,10 @@ public interface IAuditLogsApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create an order audit log event
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -85,10 +85,10 @@ public interface IAuditLogsApi : IApiAccessor
         System.Threading.Tasks.Task AddOrderAuditLogAsync (int? orderId, List<ExternalStoreAuditLog> externalEventCreate);
 
         /// <summary>
-        /// Create an order audit log event
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -96,10 +96,10 @@ public interface IAuditLogsApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AddOrderAuditLogAsyncWithHttpInfo (int? orderId, List<ExternalStoreAuditLog> externalEventCreate);
         /// <summary>
-        /// Create a store audit log event
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
@@ -108,10 +108,10 @@ public interface IAuditLogsApi : IApiAccessor
         System.Threading.Tasks.Task AddStoreAuditLogEventAsync (int? storeId, List<ExternalStoreAuditLog> externalEventCreate);
 
         /// <summary>
-        /// Create a store audit log event
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
@@ -219,7 +219,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create an order audit log event [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -231,7 +231,7 @@ public void AddOrderAuditLog (int? orderId, List<ExternalStoreAuditLog> external
         }
 
         /// <summary>
-        /// Create an order audit log event [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -246,7 +246,7 @@ public ApiResponse<Object> AddOrderAuditLogWithHttpInfo (int? orderId, List<Exte
             if (externalEventCreate == null)
                 throw new ApiException(400, "Missing required parameter 'externalEventCreate' when calling AuditLogsApi->AddOrderAuditLog");
 
-            var localVarPath = "/api/v1.0/auditlogs/orders/{orderId}";
+            var localVarPath = "./api/v1.0/auditlogs/orders/{orderId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -306,12 +306,12 @@ public ApiResponse<Object> AddOrderAuditLogWithHttpInfo (int? orderId, List<Exte
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Create an order audit log event [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -324,7 +324,7 @@ public async System.Threading.Tasks.Task AddOrderAuditLogAsync (int? orderId, Li
         }
 
         /// <summary>
-        /// Create an order audit log event [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -339,7 +339,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AddOrderAuditLogAs
             if (externalEventCreate == null)
                 throw new ApiException(400, "Missing required parameter 'externalEventCreate' when calling AuditLogsApi->AddOrderAuditLog");
 
-            var localVarPath = "/api/v1.0/auditlogs/orders/{orderId}";
+            var localVarPath = "./api/v1.0/auditlogs/orders/{orderId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -399,12 +399,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AddOrderAuditLogAs
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Create a store audit log event [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
@@ -416,7 +416,7 @@ public void AddStoreAuditLogEvent (int? storeId, List<ExternalStoreAuditLog> ext
         }
 
         /// <summary>
-        /// Create a store audit log event [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
@@ -431,7 +431,7 @@ public ApiResponse<Object> AddStoreAuditLogEventWithHttpInfo (int? storeId, List
             if (externalEventCreate == null)
                 throw new ApiException(400, "Missing required parameter 'externalEventCreate' when calling AuditLogsApi->AddStoreAuditLogEvent");
 
-            var localVarPath = "/api/v1.0/auditlogs/stores/{storeId}";
+            var localVarPath = "./api/v1.0/auditlogs/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -491,12 +491,12 @@ public ApiResponse<Object> AddStoreAuditLogEventWithHttpInfo (int? storeId, List
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Create a store audit log event [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
@@ -509,7 +509,7 @@ public async System.Threading.Tasks.Task AddStoreAuditLogEventAsync (int? storeI
         }
 
         /// <summary>
-        /// Create a store audit log event [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
@@ -524,7 +524,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AddStoreAuditLogEv
             if (externalEventCreate == null)
                 throw new ApiException(400, "Missing required parameter 'externalEventCreate' when calling AuditLogsApi->AddStoreAuditLogEvent");
 
-            var localVarPath = "/api/v1.0/auditlogs/stores/{storeId}";
+            var localVarPath = "./api/v1.0/auditlogs/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -584,7 +584,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AddStoreAuditLogEv
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/AuthorizationTokensApi.cs b/src/Flipdish/Api/AuthorizationTokensApi.cs
index a8263a59..e3bd4370 100644
--- a/src/Flipdish/Api/AuthorizationTokensApi.cs
+++ b/src/Flipdish/Api/AuthorizationTokensApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,104 +25,104 @@ public interface IAuthorizationTokensApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get authorization tokens
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Client identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultOAuthTokenModel</returns>
         RestApiPaginationResultOAuthTokenModel GetAuthorizationTokens (string oauthAppId, string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get authorization tokens
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Client identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultOAuthTokenModel</returns>
         ApiResponse<RestApiPaginationResultOAuthTokenModel> GetAuthorizationTokensWithHttpInfo (string oauthAppId, string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// Revoke token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="key">Token identifier key</param>
+        /// <param name="key"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void RevokeToken (string key, string appId);
 
         /// <summary>
-        /// Revoke token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="key">Token identifier key</param>
+        /// <param name="key"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RevokeTokenWithHttpInfo (string key, string appId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get authorization tokens
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Client identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultOAuthTokenModel</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultOAuthTokenModel> GetAuthorizationTokensAsync (string oauthAppId, string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get authorization tokens
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Client identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultOAuthTokenModel)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOAuthTokenModel>> GetAuthorizationTokensAsyncWithHttpInfo (string oauthAppId, string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// Revoke token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="key">Token identifier key</param>
+        /// <param name="key"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task RevokeTokenAsync (string key, string appId);
 
         /// <summary>
-        /// Revoke token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="key">Token identifier key</param>
+        /// <param name="key"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RevokeTokenAsyncWithHttpInfo (string key, string appId);
@@ -227,13 +227,13 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get authorization tokens 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Client identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultOAuthTokenModel</returns>
         public RestApiPaginationResultOAuthTokenModel GetAuthorizationTokens (string oauthAppId, string appId, int? page = null, int? limit = null)
         {
@@ -242,13 +242,13 @@ public RestApiPaginationResultOAuthTokenModel GetAuthorizationTokens (string oau
         }
 
         /// <summary>
-        /// Get authorization tokens 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Client identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultOAuthTokenModel</returns>
         public ApiResponse< RestApiPaginationResultOAuthTokenModel > GetAuthorizationTokensWithHttpInfo (string oauthAppId, string appId, int? page = null, int? limit = null)
         {
@@ -259,7 +259,7 @@ public ApiResponse< RestApiPaginationResultOAuthTokenModel > GetAuthorizationTok
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling AuthorizationTokensApi->GetAuthorizationTokens");
 
-            var localVarPath = "/api/v1.0/{appId}/authorizationtokens/{oauthAppId}";
+            var localVarPath = "./api/v1.0/{appId}/authorizationtokens/{oauthAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -309,18 +309,18 @@ public ApiResponse< RestApiPaginationResultOAuthTokenModel > GetAuthorizationTok
             }
 
             return new ApiResponse<RestApiPaginationResultOAuthTokenModel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultOAuthTokenModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultOAuthTokenModel)));
         }
 
         /// <summary>
-        /// Get authorization tokens 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Client identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultOAuthTokenModel</returns>
         public async System.Threading.Tasks.Task<RestApiPaginationResultOAuthTokenModel> GetAuthorizationTokensAsync (string oauthAppId, string appId, int? page = null, int? limit = null)
         {
@@ -330,13 +330,13 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultOAuthTokenModel>
         }
 
         /// <summary>
-        /// Get authorization tokens 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Client identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultOAuthTokenModel)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOAuthTokenModel>> GetAuthorizationTokensAsyncWithHttpInfo (string oauthAppId, string appId, int? page = null, int? limit = null)
         {
@@ -347,7 +347,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOAut
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling AuthorizationTokensApi->GetAuthorizationTokens");
 
-            var localVarPath = "/api/v1.0/{appId}/authorizationtokens/{oauthAppId}";
+            var localVarPath = "./api/v1.0/{appId}/authorizationtokens/{oauthAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -397,15 +397,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOAut
             }
 
             return new ApiResponse<RestApiPaginationResultOAuthTokenModel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultOAuthTokenModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultOAuthTokenModel)));
         }
 
         /// <summary>
-        /// Revoke token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="key">Token identifier key</param>
+        /// <param name="key"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void RevokeToken (string key, string appId)
@@ -414,10 +414,10 @@ public void RevokeToken (string key, string appId)
         }
 
         /// <summary>
-        /// Revoke token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="key">Token identifier key</param>
+        /// <param name="key"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> RevokeTokenWithHttpInfo (string key, string appId)
@@ -429,7 +429,7 @@ public ApiResponse<Object> RevokeTokenWithHttpInfo (string key, string appId)
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling AuthorizationTokensApi->RevokeToken");
 
-            var localVarPath = "/api/v1.0/{appId}/authorizationtokens/{key}";
+            var localVarPath = "./api/v1.0/{appId}/authorizationtokens/{key}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -477,15 +477,15 @@ public ApiResponse<Object> RevokeTokenWithHttpInfo (string key, string appId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Revoke token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="key">Token identifier key</param>
+        /// <param name="key"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task RevokeTokenAsync (string key, string appId)
@@ -495,10 +495,10 @@ public async System.Threading.Tasks.Task RevokeTokenAsync (string key, string ap
         }
 
         /// <summary>
-        /// Revoke token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="key">Token identifier key</param>
+        /// <param name="key"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> RevokeTokenAsyncWithHttpInfo (string key, string appId)
@@ -510,7 +510,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RevokeTokenAsyncWi
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling AuthorizationTokensApi->RevokeToken");
 
-            var localVarPath = "/api/v1.0/{appId}/authorizationtokens/{key}";
+            var localVarPath = "./api/v1.0/{appId}/authorizationtokens/{key}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -558,7 +558,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RevokeTokenAsyncWi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/BankAccountApi.cs b/src/Flipdish/Api/BankAccountApi.cs
index ad76c50e..3a422fdd 100644
--- a/src/Flipdish/Api/BankAccountApi.cs
+++ b/src/Flipdish/Api/BankAccountApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,122 +25,124 @@ public interface IBankAccountApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// [PRIVATE API] Attach Bank Account to Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="storeId">Store to be attached to Bank account</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="skipBankAccountUpdateWarningEmail"> (optional)</param>
         /// <returns></returns>
-        void AttachBankAccountToStore (string appId, int? bankAccountId, int? storeId);
+        void AttachBankAccountToStore (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null);
 
         /// <summary>
-        /// [PRIVATE API] Attach Bank Account to Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="storeId">Store to be attached to Bank account</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="skipBankAccountUpdateWarningEmail"> (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> AttachBankAccountToStoreWithHttpInfo (string appId, int? bankAccountId, int? storeId);
+        ApiResponse<Object> AttachBankAccountToStoreWithHttpInfo (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null);
         /// <summary>
-        /// Create a new Bank Account and attach to this App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>RestApiResultBankAccountDetail</returns>
         RestApiResultBankAccountDetail CreateBankAccount (string appId, BankAccountCreate account);
 
         /// <summary>
-        /// Create a new Bank Account and attach to this App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
         ApiResponse<RestApiResultBankAccountDetail> CreateBankAccountWithHttpInfo (string appId, BankAccountCreate account);
         /// <summary>
-        /// Delete BankAccount
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be marked as deleted</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns></returns>
         void DeleteBankAccount (string appId, int? bankAccountId);
 
         /// <summary>
-        /// Delete BankAccount
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be marked as deleted</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteBankAccountWithHttpInfo (string appId, int? bankAccountId);
         /// <summary>
-        /// Get BankAccount Detail by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="bankAccountId">Id of account</param>
+        /// <param name="bankAccountId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiResultBankAccountDetail</returns>
         RestApiResultBankAccountDetail GetBankAccountById (int? bankAccountId, string appId);
 
         /// <summary>
-        /// Get BankAccount Detail by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="bankAccountId">Id of account</param>
+        /// <param name="bankAccountId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
         ApiResponse<RestApiResultBankAccountDetail> GetBankAccountByIdWithHttpInfo (int? bankAccountId, string appId);
         /// <summary>
-        /// Get List of BankAccounts for WL
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultBankAccountSummary</returns>
         RestApiArrayResultBankAccountSummary GetBankAccounts (string appId);
 
         /// <summary>
-        /// Get List of BankAccounts for WL
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultBankAccountSummary</returns>
         ApiResponse<RestApiArrayResultBankAccountSummary> GetBankAccountsWithHttpInfo (string appId);
         /// <summary>
-        /// Get bank account fields definitions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -151,7 +153,7 @@ public interface IBankAccountApi : IApiAccessor
         RestApiArrayResultCountryWithAccountFieldsDefinitions GetCountriesWithFieldDefinitions (string appId);
 
         /// <summary>
-        /// Get bank account fields definitions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -161,7 +163,7 @@ public interface IBankAccountApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultCountryWithAccountFieldsDefinitions</returns>
         ApiResponse<RestApiArrayResultCountryWithAccountFieldsDefinitions> GetCountriesWithFieldDefinitionsWithHttpInfo (string appId);
         /// <summary>
-        /// Get bank account fields definitions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -172,7 +174,7 @@ public interface IBankAccountApi : IApiAccessor
         RestApiResultAccountFieldsDefinitions GetFieldDefinitions (string appId);
 
         /// <summary>
-        /// Get bank account fields definitions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -182,176 +184,178 @@ public interface IBankAccountApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultAccountFieldsDefinitions</returns>
         ApiResponse<RestApiResultAccountFieldsDefinitions> GetFieldDefinitionsWithHttpInfo (string appId);
         /// <summary>
-        /// Update BankAccount
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="account">Details to update account with</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="account"></param>
         /// <returns></returns>
         void UpdateBankAccount (string appId, int? bankAccountId, BankAccountCreate account);
 
         /// <summary>
-        /// Update BankAccount
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="account">Details to update account with</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="account"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateBankAccountWithHttpInfo (string appId, int? bankAccountId, BankAccountCreate account);
         /// <summary>
-        /// [PRIVATE API] Update State of Bank Account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="state">New state</param>
-        /// <param name="reason">Reason for state change, Mandatory for rejections</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="state"></param>
+        /// <param name="reason"></param>
         /// <returns></returns>
         void UpdateBankAccountState (string appId, int? bankAccountId, string state, string reason);
 
         /// <summary>
-        /// [PRIVATE API] Update State of Bank Account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="state">New state</param>
-        /// <param name="reason">Reason for state change, Mandatory for rejections</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="state"></param>
+        /// <param name="reason"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateBankAccountStateWithHttpInfo (string appId, int? bankAccountId, string state, string reason);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// [PRIVATE API] Attach Bank Account to Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="storeId">Store to be attached to Bank account</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="skipBankAccountUpdateWarningEmail"> (optional)</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task AttachBankAccountToStoreAsync (string appId, int? bankAccountId, int? storeId);
+        System.Threading.Tasks.Task AttachBankAccountToStoreAsync (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null);
 
         /// <summary>
-        /// [PRIVATE API] Attach Bank Account to Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="storeId">Store to be attached to Bank account</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="skipBankAccountUpdateWarningEmail"> (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> AttachBankAccountToStoreAsyncWithHttpInfo (string appId, int? bankAccountId, int? storeId);
+        System.Threading.Tasks.Task<ApiResponse<Object>> AttachBankAccountToStoreAsyncWithHttpInfo (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null);
         /// <summary>
-        /// Create a new Bank Account and attach to this App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of RestApiResultBankAccountDetail</returns>
         System.Threading.Tasks.Task<RestApiResultBankAccountDetail> CreateBankAccountAsync (string appId, BankAccountCreate account);
 
         /// <summary>
-        /// Create a new Bank Account and attach to this App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> CreateBankAccountAsyncWithHttpInfo (string appId, BankAccountCreate account);
         /// <summary>
-        /// Delete BankAccount
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be marked as deleted</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeleteBankAccountAsync (string appId, int? bankAccountId);
 
         /// <summary>
-        /// Delete BankAccount
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be marked as deleted</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteBankAccountAsyncWithHttpInfo (string appId, int? bankAccountId);
         /// <summary>
-        /// Get BankAccount Detail by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="bankAccountId">Id of account</param>
+        /// <param name="bankAccountId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiResultBankAccountDetail</returns>
         System.Threading.Tasks.Task<RestApiResultBankAccountDetail> GetBankAccountByIdAsync (int? bankAccountId, string appId);
 
         /// <summary>
-        /// Get BankAccount Detail by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="bankAccountId">Id of account</param>
+        /// <param name="bankAccountId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> GetBankAccountByIdAsyncWithHttpInfo (int? bankAccountId, string appId);
         /// <summary>
-        /// Get List of BankAccounts for WL
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultBankAccountSummary</returns>
         System.Threading.Tasks.Task<RestApiArrayResultBankAccountSummary> GetBankAccountsAsync (string appId);
 
         /// <summary>
-        /// Get List of BankAccounts for WL
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultBankAccountSummary)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultBankAccountSummary>> GetBankAccountsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Get bank account fields definitions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -362,7 +366,7 @@ public interface IBankAccountApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultCountryWithAccountFieldsDefinitions> GetCountriesWithFieldDefinitionsAsync (string appId);
 
         /// <summary>
-        /// Get bank account fields definitions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -372,7 +376,7 @@ public interface IBankAccountApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultCountryWithAccountFieldsDefinitions)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultCountryWithAccountFieldsDefinitions>> GetCountriesWithFieldDefinitionsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Get bank account fields definitions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -383,7 +387,7 @@ public interface IBankAccountApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultAccountFieldsDefinitions> GetFieldDefinitionsAsync (string appId);
 
         /// <summary>
-        /// Get bank account fields definitions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -393,55 +397,55 @@ public interface IBankAccountApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultAccountFieldsDefinitions)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAccountFieldsDefinitions>> GetFieldDefinitionsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Update BankAccount
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="account">Details to update account with</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateBankAccountAsync (string appId, int? bankAccountId, BankAccountCreate account);
 
         /// <summary>
-        /// Update BankAccount
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="account">Details to update account with</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateBankAccountAsyncWithHttpInfo (string appId, int? bankAccountId, BankAccountCreate account);
         /// <summary>
-        /// [PRIVATE API] Update State of Bank Account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="state">New state</param>
-        /// <param name="reason">Reason for state change, Mandatory for rejections</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="state"></param>
+        /// <param name="reason"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateBankAccountStateAsync (string appId, int? bankAccountId, string state, string reason);
 
         /// <summary>
-        /// [PRIVATE API] Update State of Bank Account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="state">New state</param>
-        /// <param name="reason">Reason for state change, Mandatory for rejections</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="state"></param>
+        /// <param name="reason"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateBankAccountStateAsyncWithHttpInfo (string appId, int? bankAccountId, string state, string reason);
         #endregion Asynchronous Operations
@@ -545,27 +549,29 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// [PRIVATE API] Attach Bank Account to Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="storeId">Store to be attached to Bank account</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="skipBankAccountUpdateWarningEmail"> (optional)</param>
         /// <returns></returns>
-        public void AttachBankAccountToStore (string appId, int? bankAccountId, int? storeId)
+        public void AttachBankAccountToStore (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null)
         {
-             AttachBankAccountToStoreWithHttpInfo(appId, bankAccountId, storeId);
+             AttachBankAccountToStoreWithHttpInfo(appId, bankAccountId, storeId, skipBankAccountUpdateWarningEmail);
         }
 
         /// <summary>
-        /// [PRIVATE API] Attach Bank Account to Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="storeId">Store to be attached to Bank account</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="skipBankAccountUpdateWarningEmail"> (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> AttachBankAccountToStoreWithHttpInfo (string appId, int? bankAccountId, int? storeId)
+        public ApiResponse<Object> AttachBankAccountToStoreWithHttpInfo (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
@@ -577,7 +583,7 @@ public ApiResponse<Object> AttachBankAccountToStoreWithHttpInfo (string appId, i
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling BankAccountApi->AttachBankAccountToStore");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/store/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -604,6 +610,7 @@ public ApiResponse<Object> AttachBankAccountToStoreWithHttpInfo (string appId, i
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (skipBankAccountUpdateWarningEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "skipBankAccountUpdateWarningEmail", skipBankAccountUpdateWarningEmail)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -626,33 +633,35 @@ public ApiResponse<Object> AttachBankAccountToStoreWithHttpInfo (string appId, i
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API] Attach Bank Account to Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="storeId">Store to be attached to Bank account</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="skipBankAccountUpdateWarningEmail"> (optional)</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task AttachBankAccountToStoreAsync (string appId, int? bankAccountId, int? storeId)
+        public async System.Threading.Tasks.Task AttachBankAccountToStoreAsync (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null)
         {
-             await AttachBankAccountToStoreAsyncWithHttpInfo(appId, bankAccountId, storeId);
+             await AttachBankAccountToStoreAsyncWithHttpInfo(appId, bankAccountId, storeId, skipBankAccountUpdateWarningEmail);
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Attach Bank Account to Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="storeId">Store to be attached to Bank account</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="skipBankAccountUpdateWarningEmail"> (optional)</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> AttachBankAccountToStoreAsyncWithHttpInfo (string appId, int? bankAccountId, int? storeId)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> AttachBankAccountToStoreAsyncWithHttpInfo (string appId, int? bankAccountId, int? storeId, bool? skipBankAccountUpdateWarningEmail = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
@@ -664,7 +673,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AttachBankAccountT
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling BankAccountApi->AttachBankAccountToStore");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/store/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -691,6 +700,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AttachBankAccountT
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (skipBankAccountUpdateWarningEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "skipBankAccountUpdateWarningEmail", skipBankAccountUpdateWarningEmail)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -713,16 +723,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AttachBankAccountT
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Create a new Bank Account and attach to this App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>RestApiResultBankAccountDetail</returns>
         public RestApiResultBankAccountDetail CreateBankAccount (string appId, BankAccountCreate account)
         {
@@ -731,11 +741,11 @@ public RestApiResultBankAccountDetail CreateBankAccount (string appId, BankAccou
         }
 
         /// <summary>
-        /// Create a new Bank Account and attach to this App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
         public ApiResponse< RestApiResultBankAccountDetail > CreateBankAccountWithHttpInfo (string appId, BankAccountCreate account)
         {
@@ -746,7 +756,7 @@ public ApiResponse< RestApiResultBankAccountDetail > CreateBankAccountWithHttpIn
             if (account == null)
                 throw new ApiException(400, "Missing required parameter 'account' when calling BankAccountApi->CreateBankAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -806,16 +816,16 @@ public ApiResponse< RestApiResultBankAccountDetail > CreateBankAccountWithHttpIn
             }
 
             return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
         }
 
         /// <summary>
-        /// Create a new Bank Account and attach to this App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of RestApiResultBankAccountDetail</returns>
         public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> CreateBankAccountAsync (string appId, BankAccountCreate account)
         {
@@ -825,11 +835,11 @@ public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> CreateB
         }
 
         /// <summary>
-        /// Create a new Bank Account and attach to this App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> CreateBankAccountAsyncWithHttpInfo (string appId, BankAccountCreate account)
         {
@@ -840,7 +850,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDet
             if (account == null)
                 throw new ApiException(400, "Missing required parameter 'account' when calling BankAccountApi->CreateBankAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -900,16 +910,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDet
             }
 
             return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
         }
 
         /// <summary>
-        /// Delete BankAccount 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be marked as deleted</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns></returns>
         public void DeleteBankAccount (string appId, int? bankAccountId)
         {
@@ -917,11 +927,11 @@ public void DeleteBankAccount (string appId, int? bankAccountId)
         }
 
         /// <summary>
-        /// Delete BankAccount 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be marked as deleted</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteBankAccountWithHttpInfo (string appId, int? bankAccountId)
         {
@@ -932,7 +942,7 @@ public ApiResponse<Object> DeleteBankAccountWithHttpInfo (string appId, int? ban
             if (bankAccountId == null)
                 throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling BankAccountApi->DeleteBankAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -980,16 +990,16 @@ public ApiResponse<Object> DeleteBankAccountWithHttpInfo (string appId, int? ban
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete BankAccount 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be marked as deleted</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeleteBankAccountAsync (string appId, int? bankAccountId)
         {
@@ -998,11 +1008,11 @@ public async System.Threading.Tasks.Task DeleteBankAccountAsync (string appId, i
         }
 
         /// <summary>
-        /// Delete BankAccount 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be marked as deleted</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteBankAccountAsyncWithHttpInfo (string appId, int? bankAccountId)
         {
@@ -1013,7 +1023,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteBankAccountA
             if (bankAccountId == null)
                 throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling BankAccountApi->DeleteBankAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1061,15 +1071,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteBankAccountA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Get BankAccount Detail by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="bankAccountId">Id of account</param>
+        /// <param name="bankAccountId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiResultBankAccountDetail</returns>
         public RestApiResultBankAccountDetail GetBankAccountById (int? bankAccountId, string appId)
@@ -1079,10 +1089,10 @@ public RestApiResultBankAccountDetail GetBankAccountById (int? bankAccountId, st
         }
 
         /// <summary>
-        /// Get BankAccount Detail by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="bankAccountId">Id of account</param>
+        /// <param name="bankAccountId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
         public ApiResponse< RestApiResultBankAccountDetail > GetBankAccountByIdWithHttpInfo (int? bankAccountId, string appId)
@@ -1094,7 +1104,7 @@ public ApiResponse< RestApiResultBankAccountDetail > GetBankAccountByIdWithHttpI
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling BankAccountApi->GetBankAccountById");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1142,15 +1152,15 @@ public ApiResponse< RestApiResultBankAccountDetail > GetBankAccountByIdWithHttpI
             }
 
             return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
         }
 
         /// <summary>
-        /// Get BankAccount Detail by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="bankAccountId">Id of account</param>
+        /// <param name="bankAccountId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiResultBankAccountDetail</returns>
         public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> GetBankAccountByIdAsync (int? bankAccountId, string appId)
@@ -1161,10 +1171,10 @@ public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> GetBank
         }
 
         /// <summary>
-        /// Get BankAccount Detail by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="bankAccountId">Id of account</param>
+        /// <param name="bankAccountId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> GetBankAccountByIdAsyncWithHttpInfo (int? bankAccountId, string appId)
@@ -1176,7 +1186,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDet
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling BankAccountApi->GetBankAccountById");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1224,15 +1234,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDet
             }
 
             return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
         }
 
         /// <summary>
-        /// Get List of BankAccounts for WL 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultBankAccountSummary</returns>
         public RestApiArrayResultBankAccountSummary GetBankAccounts (string appId)
         {
@@ -1241,10 +1251,10 @@ public RestApiArrayResultBankAccountSummary GetBankAccounts (string appId)
         }
 
         /// <summary>
-        /// Get List of BankAccounts for WL 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultBankAccountSummary</returns>
         public ApiResponse< RestApiArrayResultBankAccountSummary > GetBankAccountsWithHttpInfo (string appId)
         {
@@ -1252,7 +1262,7 @@ public ApiResponse< RestApiArrayResultBankAccountSummary > GetBankAccountsWithHt
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling BankAccountApi->GetBankAccounts");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1299,15 +1309,15 @@ public ApiResponse< RestApiArrayResultBankAccountSummary > GetBankAccountsWithHt
             }
 
             return new ApiResponse<RestApiArrayResultBankAccountSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultBankAccountSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultBankAccountSummary)));
         }
 
         /// <summary>
-        /// Get List of BankAccounts for WL 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultBankAccountSummary</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultBankAccountSummary> GetBankAccountsAsync (string appId)
         {
@@ -1317,10 +1327,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultBankAccountSummary> G
         }
 
         /// <summary>
-        /// Get List of BankAccounts for WL 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultBankAccountSummary)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultBankAccountSummary>> GetBankAccountsAsyncWithHttpInfo (string appId)
         {
@@ -1328,7 +1338,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultBankAccou
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling BankAccountApi->GetBankAccounts");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1375,12 +1385,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultBankAccou
             }
 
             return new ApiResponse<RestApiArrayResultBankAccountSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultBankAccountSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultBankAccountSummary)));
         }
 
         /// <summary>
-        /// Get bank account fields definitions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1392,7 +1402,7 @@ public RestApiArrayResultCountryWithAccountFieldsDefinitions GetCountriesWithFie
         }
 
         /// <summary>
-        /// Get bank account fields definitions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1403,7 +1413,7 @@ public ApiResponse< RestApiArrayResultCountryWithAccountFieldsDefinitions > GetC
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling BankAccountApi->GetCountriesWithFieldDefinitions");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/countries-field-definitions";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/countries-field-definitions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1450,12 +1460,12 @@ public ApiResponse< RestApiArrayResultCountryWithAccountFieldsDefinitions > GetC
             }
 
             return new ApiResponse<RestApiArrayResultCountryWithAccountFieldsDefinitions>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultCountryWithAccountFieldsDefinitions) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultCountryWithAccountFieldsDefinitions)));
         }
 
         /// <summary>
-        /// Get bank account fields definitions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1468,7 +1478,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultCountryWithAccountFie
         }
 
         /// <summary>
-        /// Get bank account fields definitions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1479,7 +1489,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultCountryWi
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling BankAccountApi->GetCountriesWithFieldDefinitions");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/countries-field-definitions";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/countries-field-definitions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1526,12 +1536,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultCountryWi
             }
 
             return new ApiResponse<RestApiArrayResultCountryWithAccountFieldsDefinitions>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultCountryWithAccountFieldsDefinitions) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultCountryWithAccountFieldsDefinitions)));
         }
 
         /// <summary>
-        /// Get bank account fields definitions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1543,7 +1553,7 @@ public RestApiResultAccountFieldsDefinitions GetFieldDefinitions (string appId)
         }
 
         /// <summary>
-        /// Get bank account fields definitions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1554,7 +1564,7 @@ public ApiResponse< RestApiResultAccountFieldsDefinitions > GetFieldDefinitionsW
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling BankAccountApi->GetFieldDefinitions");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/field-definitions";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/field-definitions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1601,12 +1611,12 @@ public ApiResponse< RestApiResultAccountFieldsDefinitions > GetFieldDefinitionsW
             }
 
             return new ApiResponse<RestApiResultAccountFieldsDefinitions>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAccountFieldsDefinitions) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAccountFieldsDefinitions)));
         }
 
         /// <summary>
-        /// Get bank account fields definitions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1619,7 +1629,7 @@ public async System.Threading.Tasks.Task<RestApiResultAccountFieldsDefinitions>
         }
 
         /// <summary>
-        /// Get bank account fields definitions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1630,7 +1640,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAccountFieldsD
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling BankAccountApi->GetFieldDefinitions");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/field-definitions";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/field-definitions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1677,17 +1687,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAccountFieldsD
             }
 
             return new ApiResponse<RestApiResultAccountFieldsDefinitions>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAccountFieldsDefinitions) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAccountFieldsDefinitions)));
         }
 
         /// <summary>
-        /// Update BankAccount 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="account">Details to update account with</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="account"></param>
         /// <returns></returns>
         public void UpdateBankAccount (string appId, int? bankAccountId, BankAccountCreate account)
         {
@@ -1695,12 +1705,12 @@ public void UpdateBankAccount (string appId, int? bankAccountId, BankAccountCrea
         }
 
         /// <summary>
-        /// Update BankAccount 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="account">Details to update account with</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="account"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateBankAccountWithHttpInfo (string appId, int? bankAccountId, BankAccountCreate account)
         {
@@ -1714,7 +1724,7 @@ public ApiResponse<Object> UpdateBankAccountWithHttpInfo (string appId, int? ban
             if (account == null)
                 throw new ApiException(400, "Missing required parameter 'account' when calling BankAccountApi->UpdateBankAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1775,17 +1785,17 @@ public ApiResponse<Object> UpdateBankAccountWithHttpInfo (string appId, int? ban
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update BankAccount 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="account">Details to update account with</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateBankAccountAsync (string appId, int? bankAccountId, BankAccountCreate account)
         {
@@ -1794,12 +1804,12 @@ public async System.Threading.Tasks.Task UpdateBankAccountAsync (string appId, i
         }
 
         /// <summary>
-        /// Update BankAccount 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="account">Details to update account with</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateBankAccountAsyncWithHttpInfo (string appId, int? bankAccountId, BankAccountCreate account)
         {
@@ -1813,7 +1823,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateBankAccountA
             if (account == null)
                 throw new ApiException(400, "Missing required parameter 'account' when calling BankAccountApi->UpdateBankAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1874,18 +1884,18 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateBankAccountA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API] Update State of Bank Account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="state">New state</param>
-        /// <param name="reason">Reason for state change, Mandatory for rejections</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="state"></param>
+        /// <param name="reason"></param>
         /// <returns></returns>
         public void UpdateBankAccountState (string appId, int? bankAccountId, string state, string reason)
         {
@@ -1893,13 +1903,13 @@ public void UpdateBankAccountState (string appId, int? bankAccountId, string sta
         }
 
         /// <summary>
-        /// [PRIVATE API] Update State of Bank Account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="state">New state</param>
-        /// <param name="reason">Reason for state change, Mandatory for rejections</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="state"></param>
+        /// <param name="reason"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateBankAccountStateWithHttpInfo (string appId, int? bankAccountId, string state, string reason)
         {
@@ -1916,7 +1926,7 @@ public ApiResponse<Object> UpdateBankAccountStateWithHttpInfo (string appId, int
             if (reason == null)
                 throw new ApiException(400, "Missing required parameter 'reason' when calling BankAccountApi->UpdateBankAccountState");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/state/{state}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/state/{state}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1978,18 +1988,18 @@ public ApiResponse<Object> UpdateBankAccountStateWithHttpInfo (string appId, int
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API] Update State of Bank Account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="state">New state</param>
-        /// <param name="reason">Reason for state change, Mandatory for rejections</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="state"></param>
+        /// <param name="reason"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateBankAccountStateAsync (string appId, int? bankAccountId, string state, string reason)
         {
@@ -1998,13 +2008,13 @@ public async System.Threading.Tasks.Task UpdateBankAccountStateAsync (string app
         }
 
         /// <summary>
-        /// [PRIVATE API] Update State of Bank Account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Id of account to be updated</param>
-        /// <param name="state">New state</param>
-        /// <param name="reason">Reason for state change, Mandatory for rejections</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="state"></param>
+        /// <param name="reason"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateBankAccountStateAsyncWithHttpInfo (string appId, int? bankAccountId, string state, string reason)
         {
@@ -2021,7 +2031,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateBankAccountS
             if (reason == null)
                 throw new ApiException(400, "Missing required parameter 'reason' when calling BankAccountApi->UpdateBankAccountState");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/state/{state}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/state/{state}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2083,7 +2093,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateBankAccountS
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/CampaignsApi.cs b/src/Flipdish/Api/CampaignsApi.cs
index 911868a8..a6ed0dee 100644
--- a/src/Flipdish/Api/CampaignsApi.cs
+++ b/src/Flipdish/Api/CampaignsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,465 +25,465 @@ public interface ICampaignsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Creates loyalty campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>RestApiResultLoyaltyCampaign</returns>
         RestApiResultLoyaltyCampaign CreateLoyaltyCampaign (string appId, LoyaltyCampaignBase campaign);
 
         /// <summary>
-        /// Creates loyalty campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>ApiResponse of RestApiResultLoyaltyCampaign</returns>
         ApiResponse<RestApiResultLoyaltyCampaign> CreateLoyaltyCampaignWithHttpInfo (string appId, LoyaltyCampaignBase campaign);
         /// <summary>
-        /// Creates retention campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>RestApiResultRetentionCampaign</returns>
         RestApiResultRetentionCampaign CreateRetentionCampaign (string appId, RetentionCampaignBase campaign);
 
         /// <summary>
-        /// Creates retention campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>ApiResponse of RestApiResultRetentionCampaign</returns>
         ApiResponse<RestApiResultRetentionCampaign> CreateRetentionCampaignWithHttpInfo (string appId, RetentionCampaignBase campaign);
         /// <summary>
-        /// Gets loyalty campaigns for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultLoyaltyCampaign</returns>
         RestApiArrayResultLoyaltyCampaign GetLoyaltyCampaignsForApp (string appId);
 
         /// <summary>
-        /// Gets loyalty campaigns for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultLoyaltyCampaign</returns>
         ApiResponse<RestApiArrayResultLoyaltyCampaign> GetLoyaltyCampaignsForAppWithHttpInfo (string appId);
         /// <summary>
-        /// Gets loyalty campaigns for store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultLoyaltyCampaign</returns>
         RestApiArrayResultLoyaltyCampaign GetLoyaltyCampaignsForStore (string appId, int? storeId);
 
         /// <summary>
-        /// Gets loyalty campaigns for store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultLoyaltyCampaign</returns>
         ApiResponse<RestApiArrayResultLoyaltyCampaign> GetLoyaltyCampaignsForStoreWithHttpInfo (string appId, int? storeId);
         /// <summary>
-        /// Gets retention campaigns for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultRetentionCampaign</returns>
         RestApiArrayResultRetentionCampaign GetRetentionCampaignsForApp (string appId);
 
         /// <summary>
-        /// Gets retention campaigns for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultRetentionCampaign</returns>
         ApiResponse<RestApiArrayResultRetentionCampaign> GetRetentionCampaignsForAppWithHttpInfo (string appId);
         /// <summary>
-        /// Gets retention campaigns for store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultRetentionCampaign</returns>
         RestApiArrayResultRetentionCampaign GetRetentionCampaignsForStore (string appId, int? storeId);
 
         /// <summary>
-        /// Gets retention campaigns for store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultRetentionCampaign</returns>
         ApiResponse<RestApiArrayResultRetentionCampaign> GetRetentionCampaignsForStoreWithHttpInfo (string appId, int? storeId);
         /// <summary>
-        /// Gets list of stores for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="onlyPublished"> (optional)</param>
         /// <returns>RestApiArrayResultStoreListItem</returns>
         RestApiArrayResultStoreListItem GetStoreList (string appId, bool? onlyPublished = null);
 
         /// <summary>
-        /// Gets list of stores for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="onlyPublished"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultStoreListItem</returns>
         ApiResponse<RestApiArrayResultStoreListItem> GetStoreListWithHttpInfo (string appId, bool? onlyPublished = null);
         /// <summary>
-        /// Deletes a campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Campaign Id</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
         /// <returns></returns>
         void RemoveCampaign (string appId, int? campaignId);
 
         /// <summary>
-        /// Deletes a campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Campaign Id</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RemoveCampaignWithHttpInfo (string appId, int? campaignId);
         /// <summary>
-        /// Updates loyalty campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Loyalty campaign Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>RestApiResultLoyaltyCampaign</returns>
         RestApiResultLoyaltyCampaign UpdateLoyaltyCampaign (string appId, int? campaignId, LoyaltyCampaignBase campaign);
 
         /// <summary>
-        /// Updates loyalty campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Loyalty campaign Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>ApiResponse of RestApiResultLoyaltyCampaign</returns>
         ApiResponse<RestApiResultLoyaltyCampaign> UpdateLoyaltyCampaignWithHttpInfo (string appId, int? campaignId, LoyaltyCampaignBase campaign);
         /// <summary>
-        /// Updates retention campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Retention campaign Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>RestApiResultRetentionCampaign</returns>
         RestApiResultRetentionCampaign UpdateRetentionCampaign (string appId, int? campaignId, RetentionCampaignBase campaign);
 
         /// <summary>
-        /// Updates retention campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Retention campaign Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>ApiResponse of RestApiResultRetentionCampaign</returns>
         ApiResponse<RestApiResultRetentionCampaign> UpdateRetentionCampaignWithHttpInfo (string appId, int? campaignId, RetentionCampaignBase campaign);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Creates loyalty campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of RestApiResultLoyaltyCampaign</returns>
         System.Threading.Tasks.Task<RestApiResultLoyaltyCampaign> CreateLoyaltyCampaignAsync (string appId, LoyaltyCampaignBase campaign);
 
         /// <summary>
-        /// Creates loyalty campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of ApiResponse (RestApiResultLoyaltyCampaign)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultLoyaltyCampaign>> CreateLoyaltyCampaignAsyncWithHttpInfo (string appId, LoyaltyCampaignBase campaign);
         /// <summary>
-        /// Creates retention campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of RestApiResultRetentionCampaign</returns>
         System.Threading.Tasks.Task<RestApiResultRetentionCampaign> CreateRetentionCampaignAsync (string appId, RetentionCampaignBase campaign);
 
         /// <summary>
-        /// Creates retention campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of ApiResponse (RestApiResultRetentionCampaign)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultRetentionCampaign>> CreateRetentionCampaignAsyncWithHttpInfo (string appId, RetentionCampaignBase campaign);
         /// <summary>
-        /// Gets loyalty campaigns for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultLoyaltyCampaign</returns>
         System.Threading.Tasks.Task<RestApiArrayResultLoyaltyCampaign> GetLoyaltyCampaignsForAppAsync (string appId);
 
         /// <summary>
-        /// Gets loyalty campaigns for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultLoyaltyCampaign)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLoyaltyCampaign>> GetLoyaltyCampaignsForAppAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Gets loyalty campaigns for store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultLoyaltyCampaign</returns>
         System.Threading.Tasks.Task<RestApiArrayResultLoyaltyCampaign> GetLoyaltyCampaignsForStoreAsync (string appId, int? storeId);
 
         /// <summary>
-        /// Gets loyalty campaigns for store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultLoyaltyCampaign)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLoyaltyCampaign>> GetLoyaltyCampaignsForStoreAsyncWithHttpInfo (string appId, int? storeId);
         /// <summary>
-        /// Gets retention campaigns for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultRetentionCampaign</returns>
         System.Threading.Tasks.Task<RestApiArrayResultRetentionCampaign> GetRetentionCampaignsForAppAsync (string appId);
 
         /// <summary>
-        /// Gets retention campaigns for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRetentionCampaign)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRetentionCampaign>> GetRetentionCampaignsForAppAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Gets retention campaigns for store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultRetentionCampaign</returns>
         System.Threading.Tasks.Task<RestApiArrayResultRetentionCampaign> GetRetentionCampaignsForStoreAsync (string appId, int? storeId);
 
         /// <summary>
-        /// Gets retention campaigns for store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRetentionCampaign)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRetentionCampaign>> GetRetentionCampaignsForStoreAsyncWithHttpInfo (string appId, int? storeId);
         /// <summary>
-        /// Gets list of stores for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="onlyPublished"> (optional)</param>
         /// <returns>Task of RestApiArrayResultStoreListItem</returns>
         System.Threading.Tasks.Task<RestApiArrayResultStoreListItem> GetStoreListAsync (string appId, bool? onlyPublished = null);
 
         /// <summary>
-        /// Gets list of stores for app
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="onlyPublished"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultStoreListItem)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreListItem>> GetStoreListAsyncWithHttpInfo (string appId, bool? onlyPublished = null);
         /// <summary>
-        /// Deletes a campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Campaign Id</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task RemoveCampaignAsync (string appId, int? campaignId);
 
         /// <summary>
-        /// Deletes a campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Campaign Id</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RemoveCampaignAsyncWithHttpInfo (string appId, int? campaignId);
         /// <summary>
-        /// Updates loyalty campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Loyalty campaign Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of RestApiResultLoyaltyCampaign</returns>
         System.Threading.Tasks.Task<RestApiResultLoyaltyCampaign> UpdateLoyaltyCampaignAsync (string appId, int? campaignId, LoyaltyCampaignBase campaign);
 
         /// <summary>
-        /// Updates loyalty campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Loyalty campaign Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of ApiResponse (RestApiResultLoyaltyCampaign)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultLoyaltyCampaign>> UpdateLoyaltyCampaignAsyncWithHttpInfo (string appId, int? campaignId, LoyaltyCampaignBase campaign);
         /// <summary>
-        /// Updates retention campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Retention campaign Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of RestApiResultRetentionCampaign</returns>
         System.Threading.Tasks.Task<RestApiResultRetentionCampaign> UpdateRetentionCampaignAsync (string appId, int? campaignId, RetentionCampaignBase campaign);
 
         /// <summary>
-        /// Updates retention campaign
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Retention campaign Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of ApiResponse (RestApiResultRetentionCampaign)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultRetentionCampaign>> UpdateRetentionCampaignAsyncWithHttpInfo (string appId, int? campaignId, RetentionCampaignBase campaign);
         #endregion Asynchronous Operations
@@ -587,11 +587,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Creates loyalty campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>RestApiResultLoyaltyCampaign</returns>
         public RestApiResultLoyaltyCampaign CreateLoyaltyCampaign (string appId, LoyaltyCampaignBase campaign)
         {
@@ -600,11 +600,11 @@ public RestApiResultLoyaltyCampaign CreateLoyaltyCampaign (string appId, Loyalty
         }
 
         /// <summary>
-        /// Creates loyalty campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>ApiResponse of RestApiResultLoyaltyCampaign</returns>
         public ApiResponse< RestApiResultLoyaltyCampaign > CreateLoyaltyCampaignWithHttpInfo (string appId, LoyaltyCampaignBase campaign)
         {
@@ -615,7 +615,7 @@ public ApiResponse< RestApiResultLoyaltyCampaign > CreateLoyaltyCampaignWithHttp
             if (campaign == null)
                 throw new ApiException(400, "Missing required parameter 'campaign' when calling CampaignsApi->CreateLoyaltyCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/loyalty";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/loyalty";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -675,16 +675,16 @@ public ApiResponse< RestApiResultLoyaltyCampaign > CreateLoyaltyCampaignWithHttp
             }
 
             return new ApiResponse<RestApiResultLoyaltyCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLoyaltyCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLoyaltyCampaign)));
         }
 
         /// <summary>
-        /// Creates loyalty campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of RestApiResultLoyaltyCampaign</returns>
         public async System.Threading.Tasks.Task<RestApiResultLoyaltyCampaign> CreateLoyaltyCampaignAsync (string appId, LoyaltyCampaignBase campaign)
         {
@@ -694,11 +694,11 @@ public async System.Threading.Tasks.Task<RestApiResultLoyaltyCampaign> CreateLoy
         }
 
         /// <summary>
-        /// Creates loyalty campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of ApiResponse (RestApiResultLoyaltyCampaign)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLoyaltyCampaign>> CreateLoyaltyCampaignAsyncWithHttpInfo (string appId, LoyaltyCampaignBase campaign)
         {
@@ -709,7 +709,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLoyaltyCampaig
             if (campaign == null)
                 throw new ApiException(400, "Missing required parameter 'campaign' when calling CampaignsApi->CreateLoyaltyCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/loyalty";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/loyalty";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -769,16 +769,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLoyaltyCampaig
             }
 
             return new ApiResponse<RestApiResultLoyaltyCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLoyaltyCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLoyaltyCampaign)));
         }
 
         /// <summary>
-        /// Creates retention campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>RestApiResultRetentionCampaign</returns>
         public RestApiResultRetentionCampaign CreateRetentionCampaign (string appId, RetentionCampaignBase campaign)
         {
@@ -787,11 +787,11 @@ public RestApiResultRetentionCampaign CreateRetentionCampaign (string appId, Ret
         }
 
         /// <summary>
-        /// Creates retention campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>ApiResponse of RestApiResultRetentionCampaign</returns>
         public ApiResponse< RestApiResultRetentionCampaign > CreateRetentionCampaignWithHttpInfo (string appId, RetentionCampaignBase campaign)
         {
@@ -802,7 +802,7 @@ public ApiResponse< RestApiResultRetentionCampaign > CreateRetentionCampaignWith
             if (campaign == null)
                 throw new ApiException(400, "Missing required parameter 'campaign' when calling CampaignsApi->CreateRetentionCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/retention";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/retention";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -862,16 +862,16 @@ public ApiResponse< RestApiResultRetentionCampaign > CreateRetentionCampaignWith
             }
 
             return new ApiResponse<RestApiResultRetentionCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultRetentionCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRetentionCampaign)));
         }
 
         /// <summary>
-        /// Creates retention campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of RestApiResultRetentionCampaign</returns>
         public async System.Threading.Tasks.Task<RestApiResultRetentionCampaign> CreateRetentionCampaignAsync (string appId, RetentionCampaignBase campaign)
         {
@@ -881,11 +881,11 @@ public async System.Threading.Tasks.Task<RestApiResultRetentionCampaign> CreateR
         }
 
         /// <summary>
-        /// Creates retention campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of ApiResponse (RestApiResultRetentionCampaign)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRetentionCampaign>> CreateRetentionCampaignAsyncWithHttpInfo (string appId, RetentionCampaignBase campaign)
         {
@@ -896,7 +896,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRetentionCampa
             if (campaign == null)
                 throw new ApiException(400, "Missing required parameter 'campaign' when calling CampaignsApi->CreateRetentionCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/retention";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/retention";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -956,15 +956,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRetentionCampa
             }
 
             return new ApiResponse<RestApiResultRetentionCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultRetentionCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRetentionCampaign)));
         }
 
         /// <summary>
-        /// Gets loyalty campaigns for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultLoyaltyCampaign</returns>
         public RestApiArrayResultLoyaltyCampaign GetLoyaltyCampaignsForApp (string appId)
         {
@@ -973,10 +973,10 @@ public RestApiArrayResultLoyaltyCampaign GetLoyaltyCampaignsForApp (string appId
         }
 
         /// <summary>
-        /// Gets loyalty campaigns for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultLoyaltyCampaign</returns>
         public ApiResponse< RestApiArrayResultLoyaltyCampaign > GetLoyaltyCampaignsForAppWithHttpInfo (string appId)
         {
@@ -984,7 +984,7 @@ public ApiResponse< RestApiArrayResultLoyaltyCampaign > GetLoyaltyCampaignsForAp
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CampaignsApi->GetLoyaltyCampaignsForApp");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/loyalty";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/loyalty";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1031,15 +1031,15 @@ public ApiResponse< RestApiArrayResultLoyaltyCampaign > GetLoyaltyCampaignsForAp
             }
 
             return new ApiResponse<RestApiArrayResultLoyaltyCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultLoyaltyCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultLoyaltyCampaign)));
         }
 
         /// <summary>
-        /// Gets loyalty campaigns for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultLoyaltyCampaign</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultLoyaltyCampaign> GetLoyaltyCampaignsForAppAsync (string appId)
         {
@@ -1049,10 +1049,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultLoyaltyCampaign> GetL
         }
 
         /// <summary>
-        /// Gets loyalty campaigns for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultLoyaltyCampaign)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLoyaltyCampaign>> GetLoyaltyCampaignsForAppAsyncWithHttpInfo (string appId)
         {
@@ -1060,7 +1060,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLoyaltyCa
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CampaignsApi->GetLoyaltyCampaignsForApp");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/loyalty";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/loyalty";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1107,16 +1107,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLoyaltyCa
             }
 
             return new ApiResponse<RestApiArrayResultLoyaltyCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultLoyaltyCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultLoyaltyCampaign)));
         }
 
         /// <summary>
-        /// Gets loyalty campaigns for store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultLoyaltyCampaign</returns>
         public RestApiArrayResultLoyaltyCampaign GetLoyaltyCampaignsForStore (string appId, int? storeId)
         {
@@ -1125,11 +1125,11 @@ public RestApiArrayResultLoyaltyCampaign GetLoyaltyCampaignsForStore (string app
         }
 
         /// <summary>
-        /// Gets loyalty campaigns for store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultLoyaltyCampaign</returns>
         public ApiResponse< RestApiArrayResultLoyaltyCampaign > GetLoyaltyCampaignsForStoreWithHttpInfo (string appId, int? storeId)
         {
@@ -1140,7 +1140,7 @@ public ApiResponse< RestApiArrayResultLoyaltyCampaign > GetLoyaltyCampaignsForSt
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling CampaignsApi->GetLoyaltyCampaignsForStore");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/loyalty/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/loyalty/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1188,16 +1188,16 @@ public ApiResponse< RestApiArrayResultLoyaltyCampaign > GetLoyaltyCampaignsForSt
             }
 
             return new ApiResponse<RestApiArrayResultLoyaltyCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultLoyaltyCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultLoyaltyCampaign)));
         }
 
         /// <summary>
-        /// Gets loyalty campaigns for store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultLoyaltyCampaign</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultLoyaltyCampaign> GetLoyaltyCampaignsForStoreAsync (string appId, int? storeId)
         {
@@ -1207,11 +1207,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultLoyaltyCampaign> GetL
         }
 
         /// <summary>
-        /// Gets loyalty campaigns for store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultLoyaltyCampaign)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLoyaltyCampaign>> GetLoyaltyCampaignsForStoreAsyncWithHttpInfo (string appId, int? storeId)
         {
@@ -1222,7 +1222,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLoyaltyCa
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling CampaignsApi->GetLoyaltyCampaignsForStore");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/loyalty/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/loyalty/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1270,15 +1270,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLoyaltyCa
             }
 
             return new ApiResponse<RestApiArrayResultLoyaltyCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultLoyaltyCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultLoyaltyCampaign)));
         }
 
         /// <summary>
-        /// Gets retention campaigns for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultRetentionCampaign</returns>
         public RestApiArrayResultRetentionCampaign GetRetentionCampaignsForApp (string appId)
         {
@@ -1287,10 +1287,10 @@ public RestApiArrayResultRetentionCampaign GetRetentionCampaignsForApp (string a
         }
 
         /// <summary>
-        /// Gets retention campaigns for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultRetentionCampaign</returns>
         public ApiResponse< RestApiArrayResultRetentionCampaign > GetRetentionCampaignsForAppWithHttpInfo (string appId)
         {
@@ -1298,7 +1298,7 @@ public ApiResponse< RestApiArrayResultRetentionCampaign > GetRetentionCampaignsF
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CampaignsApi->GetRetentionCampaignsForApp");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/retention";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/retention";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1345,15 +1345,15 @@ public ApiResponse< RestApiArrayResultRetentionCampaign > GetRetentionCampaignsF
             }
 
             return new ApiResponse<RestApiArrayResultRetentionCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultRetentionCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRetentionCampaign)));
         }
 
         /// <summary>
-        /// Gets retention campaigns for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultRetentionCampaign</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultRetentionCampaign> GetRetentionCampaignsForAppAsync (string appId)
         {
@@ -1363,10 +1363,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultRetentionCampaign> Ge
         }
 
         /// <summary>
-        /// Gets retention campaigns for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRetentionCampaign)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRetentionCampaign>> GetRetentionCampaignsForAppAsyncWithHttpInfo (string appId)
         {
@@ -1374,7 +1374,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRetention
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CampaignsApi->GetRetentionCampaignsForApp");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/retention";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/retention";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1421,16 +1421,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRetention
             }
 
             return new ApiResponse<RestApiArrayResultRetentionCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultRetentionCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRetentionCampaign)));
         }
 
         /// <summary>
-        /// Gets retention campaigns for store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultRetentionCampaign</returns>
         public RestApiArrayResultRetentionCampaign GetRetentionCampaignsForStore (string appId, int? storeId)
         {
@@ -1439,11 +1439,11 @@ public RestApiArrayResultRetentionCampaign GetRetentionCampaignsForStore (string
         }
 
         /// <summary>
-        /// Gets retention campaigns for store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultRetentionCampaign</returns>
         public ApiResponse< RestApiArrayResultRetentionCampaign > GetRetentionCampaignsForStoreWithHttpInfo (string appId, int? storeId)
         {
@@ -1454,7 +1454,7 @@ public ApiResponse< RestApiArrayResultRetentionCampaign > GetRetentionCampaignsF
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling CampaignsApi->GetRetentionCampaignsForStore");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/retention/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/retention/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1502,16 +1502,16 @@ public ApiResponse< RestApiArrayResultRetentionCampaign > GetRetentionCampaignsF
             }
 
             return new ApiResponse<RestApiArrayResultRetentionCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultRetentionCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRetentionCampaign)));
         }
 
         /// <summary>
-        /// Gets retention campaigns for store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultRetentionCampaign</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultRetentionCampaign> GetRetentionCampaignsForStoreAsync (string appId, int? storeId)
         {
@@ -1521,11 +1521,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultRetentionCampaign> Ge
         }
 
         /// <summary>
-        /// Gets retention campaigns for store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRetentionCampaign)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRetentionCampaign>> GetRetentionCampaignsForStoreAsyncWithHttpInfo (string appId, int? storeId)
         {
@@ -1536,7 +1536,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRetention
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling CampaignsApi->GetRetentionCampaignsForStore");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/retention/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/retention/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1584,15 +1584,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRetention
             }
 
             return new ApiResponse<RestApiArrayResultRetentionCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultRetentionCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRetentionCampaign)));
         }
 
         /// <summary>
-        /// Gets list of stores for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="onlyPublished"> (optional)</param>
         /// <returns>RestApiArrayResultStoreListItem</returns>
         public RestApiArrayResultStoreListItem GetStoreList (string appId, bool? onlyPublished = null)
@@ -1602,10 +1602,10 @@ public RestApiArrayResultStoreListItem GetStoreList (string appId, bool? onlyPub
         }
 
         /// <summary>
-        /// Gets list of stores for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="onlyPublished"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultStoreListItem</returns>
         public ApiResponse< RestApiArrayResultStoreListItem > GetStoreListWithHttpInfo (string appId, bool? onlyPublished = null)
@@ -1614,7 +1614,7 @@ public ApiResponse< RestApiArrayResultStoreListItem > GetStoreListWithHttpInfo (
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CampaignsApi->GetStoreList");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/stores";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1662,15 +1662,15 @@ public ApiResponse< RestApiArrayResultStoreListItem > GetStoreListWithHttpInfo (
             }
 
             return new ApiResponse<RestApiArrayResultStoreListItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultStoreListItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreListItem)));
         }
 
         /// <summary>
-        /// Gets list of stores for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="onlyPublished"> (optional)</param>
         /// <returns>Task of RestApiArrayResultStoreListItem</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultStoreListItem> GetStoreListAsync (string appId, bool? onlyPublished = null)
@@ -1681,10 +1681,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultStoreListItem> GetSto
         }
 
         /// <summary>
-        /// Gets list of stores for app 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="onlyPublished"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultStoreListItem)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreListItem>> GetStoreListAsyncWithHttpInfo (string appId, bool? onlyPublished = null)
@@ -1693,7 +1693,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreList
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CampaignsApi->GetStoreList");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/stores";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1741,16 +1741,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreList
             }
 
             return new ApiResponse<RestApiArrayResultStoreListItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultStoreListItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreListItem)));
         }
 
         /// <summary>
-        /// Deletes a campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Campaign Id</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
         /// <returns></returns>
         public void RemoveCampaign (string appId, int? campaignId)
         {
@@ -1758,11 +1758,11 @@ public void RemoveCampaign (string appId, int? campaignId)
         }
 
         /// <summary>
-        /// Deletes a campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Campaign Id</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> RemoveCampaignWithHttpInfo (string appId, int? campaignId)
         {
@@ -1773,7 +1773,7 @@ public ApiResponse<Object> RemoveCampaignWithHttpInfo (string appId, int? campai
             if (campaignId == null)
                 throw new ApiException(400, "Missing required parameter 'campaignId' when calling CampaignsApi->RemoveCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/{campaignId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/{campaignId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1821,16 +1821,16 @@ public ApiResponse<Object> RemoveCampaignWithHttpInfo (string appId, int? campai
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Deletes a campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Campaign Id</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task RemoveCampaignAsync (string appId, int? campaignId)
         {
@@ -1839,11 +1839,11 @@ public async System.Threading.Tasks.Task RemoveCampaignAsync (string appId, int?
         }
 
         /// <summary>
-        /// Deletes a campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Campaign Id</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveCampaignAsyncWithHttpInfo (string appId, int? campaignId)
         {
@@ -1854,7 +1854,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveCampaignAsyn
             if (campaignId == null)
                 throw new ApiException(400, "Missing required parameter 'campaignId' when calling CampaignsApi->RemoveCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/{campaignId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/{campaignId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1902,17 +1902,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveCampaignAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Updates loyalty campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Loyalty campaign Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>RestApiResultLoyaltyCampaign</returns>
         public RestApiResultLoyaltyCampaign UpdateLoyaltyCampaign (string appId, int? campaignId, LoyaltyCampaignBase campaign)
         {
@@ -1921,12 +1921,12 @@ public RestApiResultLoyaltyCampaign UpdateLoyaltyCampaign (string appId, int? ca
         }
 
         /// <summary>
-        /// Updates loyalty campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Loyalty campaign Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>ApiResponse of RestApiResultLoyaltyCampaign</returns>
         public ApiResponse< RestApiResultLoyaltyCampaign > UpdateLoyaltyCampaignWithHttpInfo (string appId, int? campaignId, LoyaltyCampaignBase campaign)
         {
@@ -1940,7 +1940,7 @@ public ApiResponse< RestApiResultLoyaltyCampaign > UpdateLoyaltyCampaignWithHttp
             if (campaign == null)
                 throw new ApiException(400, "Missing required parameter 'campaign' when calling CampaignsApi->UpdateLoyaltyCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/loyalty/{campaignId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/loyalty/{campaignId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2001,17 +2001,17 @@ public ApiResponse< RestApiResultLoyaltyCampaign > UpdateLoyaltyCampaignWithHttp
             }
 
             return new ApiResponse<RestApiResultLoyaltyCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLoyaltyCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLoyaltyCampaign)));
         }
 
         /// <summary>
-        /// Updates loyalty campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Loyalty campaign Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of RestApiResultLoyaltyCampaign</returns>
         public async System.Threading.Tasks.Task<RestApiResultLoyaltyCampaign> UpdateLoyaltyCampaignAsync (string appId, int? campaignId, LoyaltyCampaignBase campaign)
         {
@@ -2021,12 +2021,12 @@ public async System.Threading.Tasks.Task<RestApiResultLoyaltyCampaign> UpdateLoy
         }
 
         /// <summary>
-        /// Updates loyalty campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Loyalty campaign Id</param>
-        /// <param name="campaign">Loyalty campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of ApiResponse (RestApiResultLoyaltyCampaign)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLoyaltyCampaign>> UpdateLoyaltyCampaignAsyncWithHttpInfo (string appId, int? campaignId, LoyaltyCampaignBase campaign)
         {
@@ -2040,7 +2040,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLoyaltyCampaig
             if (campaign == null)
                 throw new ApiException(400, "Missing required parameter 'campaign' when calling CampaignsApi->UpdateLoyaltyCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/loyalty/{campaignId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/loyalty/{campaignId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2101,17 +2101,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLoyaltyCampaig
             }
 
             return new ApiResponse<RestApiResultLoyaltyCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLoyaltyCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLoyaltyCampaign)));
         }
 
         /// <summary>
-        /// Updates retention campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Retention campaign Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>RestApiResultRetentionCampaign</returns>
         public RestApiResultRetentionCampaign UpdateRetentionCampaign (string appId, int? campaignId, RetentionCampaignBase campaign)
         {
@@ -2120,12 +2120,12 @@ public RestApiResultRetentionCampaign UpdateRetentionCampaign (string appId, int
         }
 
         /// <summary>
-        /// Updates retention campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Retention campaign Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>ApiResponse of RestApiResultRetentionCampaign</returns>
         public ApiResponse< RestApiResultRetentionCampaign > UpdateRetentionCampaignWithHttpInfo (string appId, int? campaignId, RetentionCampaignBase campaign)
         {
@@ -2139,7 +2139,7 @@ public ApiResponse< RestApiResultRetentionCampaign > UpdateRetentionCampaignWith
             if (campaign == null)
                 throw new ApiException(400, "Missing required parameter 'campaign' when calling CampaignsApi->UpdateRetentionCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/retention/{campaignId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/retention/{campaignId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2200,17 +2200,17 @@ public ApiResponse< RestApiResultRetentionCampaign > UpdateRetentionCampaignWith
             }
 
             return new ApiResponse<RestApiResultRetentionCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultRetentionCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRetentionCampaign)));
         }
 
         /// <summary>
-        /// Updates retention campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Retention campaign Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of RestApiResultRetentionCampaign</returns>
         public async System.Threading.Tasks.Task<RestApiResultRetentionCampaign> UpdateRetentionCampaignAsync (string appId, int? campaignId, RetentionCampaignBase campaign)
         {
@@ -2220,12 +2220,12 @@ public async System.Threading.Tasks.Task<RestApiResultRetentionCampaign> UpdateR
         }
 
         /// <summary>
-        /// Updates retention campaign 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="campaignId">Retention campaign Id</param>
-        /// <param name="campaign">Retention campaign details</param>
+        /// <param name="appId"></param>
+        /// <param name="campaignId"></param>
+        /// <param name="campaign"></param>
         /// <returns>Task of ApiResponse (RestApiResultRetentionCampaign)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRetentionCampaign>> UpdateRetentionCampaignAsyncWithHttpInfo (string appId, int? campaignId, RetentionCampaignBase campaign)
         {
@@ -2239,7 +2239,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRetentionCampa
             if (campaign == null)
                 throw new ApiException(400, "Missing required parameter 'campaign' when calling CampaignsApi->UpdateRetentionCampaign");
 
-            var localVarPath = "/api/v1.0/{appId}/campaigns/retention/{campaignId}";
+            var localVarPath = "./api/v1.0/{appId}/campaigns/retention/{campaignId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2300,7 +2300,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRetentionCampa
             }
 
             return new ApiResponse<RestApiResultRetentionCampaign>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultRetentionCampaign) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRetentionCampaign)));
         }
 
diff --git a/src/Flipdish/Api/CardReadersApi.cs b/src/Flipdish/Api/CardReadersApi.cs
index 667dbd25..14346b3c 100644
--- a/src/Flipdish/Api/CardReadersApi.cs
+++ b/src/Flipdish/Api/CardReadersApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,31 +25,10 @@ public interface ICardReadersApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get Authorization Key for Stripe Terminal
-        /// </summary>
-        /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <returns>RestApiResultStripeTerminalPrivateKey</returns>
-        RestApiResultStripeTerminalPrivateKey AuthorizeStripeTerminal (string appId);
-
-        /// <summary>
-        /// Get Authorization Key for Stripe Terminal
-        /// </summary>
-        /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <returns>ApiResponse of RestApiResultStripeTerminalPrivateKey</returns>
-        ApiResponse<RestApiResultStripeTerminalPrivateKey> AuthorizeStripeTerminalWithHttpInfo (string appId);
-        /// <summary>
-        /// Cancel currently initiated install update for bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -59,10 +38,10 @@ public interface ICardReadersApi : IApiAccessor
         void CancelCurrentlyInitiatedBluetoothDeviceUpdate (string appId, string deviceId, string terminalType);
 
         /// <summary>
-        /// Cancel currently initiated install update for bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -71,10 +50,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> CancelCurrentlyInitiatedBluetoothDeviceUpdateWithHttpInfo (string appId, string deviceId, string terminalType);
         /// <summary>
-        /// Cancel terminals action
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -83,10 +62,10 @@ public interface ICardReadersApi : IApiAccessor
         RestApiResultCardReader CancelReaderAction (string readerId, string appId);
 
         /// <summary>
-        /// Cancel terminals action
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -94,10 +73,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultCardReader</returns>
         ApiResponse<RestApiResultCardReader> CancelReaderActionWithHttpInfo (string readerId, string appId);
         /// <summary>
-        /// Get reader
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -106,10 +85,10 @@ public interface ICardReadersApi : IApiAccessor
         RestApiResultCardReader CardReadersGetReader (string readerId, string appId);
 
         /// <summary>
-        /// Get reader
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -117,10 +96,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultCardReader</returns>
         ApiResponse<RestApiResultCardReader> CardReadersGetReaderWithHttpInfo (string readerId, string appId);
         /// <summary>
-        /// Get Location ID for Stripe Terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="geoPointRequest"></param>
@@ -129,10 +108,10 @@ public interface ICardReadersApi : IApiAccessor
         RestApiResultStripeTerminalLocation GenerateStripeTerminalLocation (GeoPointRequest geoPointRequest, string appId);
 
         /// <summary>
-        /// Get Location ID for Stripe Terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="geoPointRequest"></param>
@@ -140,10 +119,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultStripeTerminalLocation</returns>
         ApiResponse<RestApiResultStripeTerminalLocation> GenerateStripeTerminalLocationWithHttpInfo (GeoPointRequest geoPointRequest, string appId);
         /// <summary>
-        /// Get the status of the bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -152,10 +131,10 @@ public interface ICardReadersApi : IApiAccessor
         RestApiResultBluetoothTerminalStatus GetBluetoothTerminalStatus (string appId, string deviceId);
 
         /// <summary>
-        /// Get the status of the bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -163,10 +142,33 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultBluetoothTerminalStatus</returns>
         ApiResponse<RestApiResultBluetoothTerminalStatus> GetBluetoothTerminalStatusWithHttpInfo (string appId, string deviceId);
         /// <summary>
-        /// Get Connection Token For a Stripe Terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>RestApiResultKioskStripeLocation</returns>
+        RestApiResultKioskStripeLocation GetKioskStripeLocation (string appId, string deviceId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>ApiResponse of RestApiResultKioskStripeLocation</returns>
+        ApiResponse<RestApiResultKioskStripeLocation> GetKioskStripeLocationWithHttpInfo (string appId, string deviceId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -174,20 +176,20 @@ public interface ICardReadersApi : IApiAccessor
         RestApiResultStripeTerminalConnectionToken GetStripeConnectionToken (string appId);
 
         /// <summary>
-        /// Get Connection Token For a Stripe Terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultStripeTerminalConnectionToken</returns>
         ApiResponse<RestApiResultStripeTerminalConnectionToken> GetStripeConnectionTokenWithHttpInfo (string appId);
         /// <summary>
-        /// Trigger check for Bluetooth device update on Kiosk
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -197,10 +199,10 @@ public interface ICardReadersApi : IApiAccessor
         void InitiateBluetoothTerminalDeviceUpdateCheck (string appId, string deviceId, string terminalType);
 
         /// <summary>
-        /// Trigger check for Bluetooth device update on Kiosk
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -209,10 +211,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> InitiateBluetoothTerminalDeviceUpdateCheckWithHttpInfo (string appId, string deviceId, string terminalType);
         /// <summary>
-        /// Initiate stripe terminal pairing mode
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -222,10 +224,10 @@ public interface ICardReadersApi : IApiAccessor
         void InitiateKioskBluetoothPairingMode (string appId, string deviceId, string terminalType);
 
         /// <summary>
-        /// Initiate stripe terminal pairing mode
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -234,10 +236,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> InitiateKioskBluetoothPairingModeWithHttpInfo (string appId, string deviceId, string terminalType);
         /// <summary>
-        /// Initiate Kiosk Update Install for bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -247,10 +249,10 @@ public interface ICardReadersApi : IApiAccessor
         void InitiateKioskBluetoothUpdateInstall (string appId, string deviceId, string terminalType);
 
         /// <summary>
-        /// Initiate Kiosk Update Install for bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -259,10 +261,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> InitiateKioskBluetoothUpdateInstallWithHttpInfo (string appId, string deviceId, string terminalType);
         /// <summary>
-        /// Initiate Stripe terminal to Process Payment Intent
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -272,10 +274,10 @@ public interface ICardReadersApi : IApiAccessor
         RestApiResultCardReader InitiateReaderProcessPaymentIntent (ProcessPaymentIntentRequest request, string readerId, string appId);
 
         /// <summary>
-        /// Initiate Stripe terminal to Process Payment Intent
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -307,10 +309,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultCardReader</returns>
         ApiResponse<RestApiResultCardReader> RegisterStripeTerminalWithHttpInfo (CardReaderRegistrationRequest request, string appId);
         /// <summary>
-        /// Un-register terminal by deleting it from stripe
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -319,10 +321,10 @@ public interface ICardReadersApi : IApiAccessor
         RestApiResultCardReader UnRegisterTerminal (UnRegisterCardReaderRequest request, string appId);
 
         /// <summary>
-        /// Un-register terminal by deleting it from stripe
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -330,10 +332,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultCardReader</returns>
         ApiResponse<RestApiResultCardReader> UnRegisterTerminalWithHttpInfo (UnRegisterCardReaderRequest request, string appId);
         /// <summary>
-        /// Unpair the currently paired stripe terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -342,10 +344,10 @@ public interface ICardReadersApi : IApiAccessor
         void UnpairCurrentlyPairedBluetoothDevice (string appId, string deviceId);
 
         /// <summary>
-        /// Unpair the currently paired stripe terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -355,31 +357,10 @@ public interface ICardReadersApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get Authorization Key for Stripe Terminal
-        /// </summary>
-        /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <returns>Task of RestApiResultStripeTerminalPrivateKey</returns>
-        System.Threading.Tasks.Task<RestApiResultStripeTerminalPrivateKey> AuthorizeStripeTerminalAsync (string appId);
-
-        /// <summary>
-        /// Get Authorization Key for Stripe Terminal
-        /// </summary>
-        /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultStripeTerminalPrivateKey)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeTerminalPrivateKey>> AuthorizeStripeTerminalAsyncWithHttpInfo (string appId);
-        /// <summary>
-        /// Cancel currently initiated install update for bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -389,10 +370,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task CancelCurrentlyInitiatedBluetoothDeviceUpdateAsync (string appId, string deviceId, string terminalType);
 
         /// <summary>
-        /// Cancel currently initiated install update for bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -401,10 +382,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> CancelCurrentlyInitiatedBluetoothDeviceUpdateAsyncWithHttpInfo (string appId, string deviceId, string terminalType);
         /// <summary>
-        /// Cancel terminals action
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -413,10 +394,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultCardReader> CancelReaderActionAsync (string readerId, string appId);
 
         /// <summary>
-        /// Cancel terminals action
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -424,10 +405,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultCardReader)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> CancelReaderActionAsyncWithHttpInfo (string readerId, string appId);
         /// <summary>
-        /// Get reader
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -436,10 +417,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultCardReader> CardReadersGetReaderAsync (string readerId, string appId);
 
         /// <summary>
-        /// Get reader
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -447,10 +428,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultCardReader)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> CardReadersGetReaderAsyncWithHttpInfo (string readerId, string appId);
         /// <summary>
-        /// Get Location ID for Stripe Terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="geoPointRequest"></param>
@@ -459,10 +440,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultStripeTerminalLocation> GenerateStripeTerminalLocationAsync (GeoPointRequest geoPointRequest, string appId);
 
         /// <summary>
-        /// Get Location ID for Stripe Terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="geoPointRequest"></param>
@@ -470,10 +451,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultStripeTerminalLocation)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeTerminalLocation>> GenerateStripeTerminalLocationAsyncWithHttpInfo (GeoPointRequest geoPointRequest, string appId);
         /// <summary>
-        /// Get the status of the bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -482,10 +463,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultBluetoothTerminalStatus> GetBluetoothTerminalStatusAsync (string appId, string deviceId);
 
         /// <summary>
-        /// Get the status of the bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -493,10 +474,33 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultBluetoothTerminalStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultBluetoothTerminalStatus>> GetBluetoothTerminalStatusAsyncWithHttpInfo (string appId, string deviceId);
         /// <summary>
-        /// Get Connection Token For a Stripe Terminal
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of RestApiResultKioskStripeLocation</returns>
+        System.Threading.Tasks.Task<RestApiResultKioskStripeLocation> GetKioskStripeLocationAsync (string appId, string deviceId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultKioskStripeLocation)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskStripeLocation>> GetKioskStripeLocationAsyncWithHttpInfo (string appId, string deviceId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -504,20 +508,20 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultStripeTerminalConnectionToken> GetStripeConnectionTokenAsync (string appId);
 
         /// <summary>
-        /// Get Connection Token For a Stripe Terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStripeTerminalConnectionToken)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeTerminalConnectionToken>> GetStripeConnectionTokenAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Trigger check for Bluetooth device update on Kiosk
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -527,10 +531,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task InitiateBluetoothTerminalDeviceUpdateCheckAsync (string appId, string deviceId, string terminalType);
 
         /// <summary>
-        /// Trigger check for Bluetooth device update on Kiosk
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -539,10 +543,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> InitiateBluetoothTerminalDeviceUpdateCheckAsyncWithHttpInfo (string appId, string deviceId, string terminalType);
         /// <summary>
-        /// Initiate stripe terminal pairing mode
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -552,10 +556,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task InitiateKioskBluetoothPairingModeAsync (string appId, string deviceId, string terminalType);
 
         /// <summary>
-        /// Initiate stripe terminal pairing mode
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -564,10 +568,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> InitiateKioskBluetoothPairingModeAsyncWithHttpInfo (string appId, string deviceId, string terminalType);
         /// <summary>
-        /// Initiate Kiosk Update Install for bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -577,10 +581,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task InitiateKioskBluetoothUpdateInstallAsync (string appId, string deviceId, string terminalType);
 
         /// <summary>
-        /// Initiate Kiosk Update Install for bluetooth terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -589,10 +593,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> InitiateKioskBluetoothUpdateInstallAsyncWithHttpInfo (string appId, string deviceId, string terminalType);
         /// <summary>
-        /// Initiate Stripe terminal to Process Payment Intent
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -602,10 +606,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultCardReader> InitiateReaderProcessPaymentIntentAsync (ProcessPaymentIntentRequest request, string readerId, string appId);
 
         /// <summary>
-        /// Initiate Stripe terminal to Process Payment Intent
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -637,10 +641,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultCardReader)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> RegisterStripeTerminalAsyncWithHttpInfo (CardReaderRegistrationRequest request, string appId);
         /// <summary>
-        /// Un-register terminal by deleting it from stripe
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -649,10 +653,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultCardReader> UnRegisterTerminalAsync (UnRegisterCardReaderRequest request, string appId);
 
         /// <summary>
-        /// Un-register terminal by deleting it from stripe
+        /// 
         /// </summary>
         /// <remarks>
-        /// Can only be called by Kiosk
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -660,10 +664,10 @@ public interface ICardReadersApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultCardReader)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> UnRegisterTerminalAsyncWithHttpInfo (UnRegisterCardReaderRequest request, string appId);
         /// <summary>
-        /// Unpair the currently paired stripe terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -672,10 +676,10 @@ public interface ICardReadersApi : IApiAccessor
         System.Threading.Tasks.Task UnpairCurrentlyPairedBluetoothDeviceAsync (string appId, string deviceId);
 
         /// <summary>
-        /// Unpair the currently paired stripe terminal
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -783,158 +787,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get Authorization Key for Stripe Terminal Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <returns>RestApiResultStripeTerminalPrivateKey</returns>
-        public RestApiResultStripeTerminalPrivateKey AuthorizeStripeTerminal (string appId)
-        {
-             ApiResponse<RestApiResultStripeTerminalPrivateKey> localVarResponse = AuthorizeStripeTerminalWithHttpInfo(appId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Get Authorization Key for Stripe Terminal Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <returns>ApiResponse of RestApiResultStripeTerminalPrivateKey</returns>
-        public ApiResponse< RestApiResultStripeTerminalPrivateKey > AuthorizeStripeTerminalWithHttpInfo (string appId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->AuthorizeStripeTerminal");
-
-            var localVarPath = "/api/v1.0/{appId}/stripeterminal/authorize";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("AuthorizeStripeTerminal", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultStripeTerminalPrivateKey>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultStripeTerminalPrivateKey) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeTerminalPrivateKey)));
-        }
-
-        /// <summary>
-        /// Get Authorization Key for Stripe Terminal Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <returns>Task of RestApiResultStripeTerminalPrivateKey</returns>
-        public async System.Threading.Tasks.Task<RestApiResultStripeTerminalPrivateKey> AuthorizeStripeTerminalAsync (string appId)
-        {
-             ApiResponse<RestApiResultStripeTerminalPrivateKey> localVarResponse = await AuthorizeStripeTerminalAsyncWithHttpInfo(appId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Get Authorization Key for Stripe Terminal Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultStripeTerminalPrivateKey)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeTerminalPrivateKey>> AuthorizeStripeTerminalAsyncWithHttpInfo (string appId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->AuthorizeStripeTerminal");
-
-            var localVarPath = "/api/v1.0/{appId}/stripeterminal/authorize";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("AuthorizeStripeTerminal", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultStripeTerminalPrivateKey>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultStripeTerminalPrivateKey) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeTerminalPrivateKey)));
-        }
-
-        /// <summary>
-        /// Cancel currently initiated install update for bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -947,7 +800,7 @@ public void CancelCurrentlyInitiatedBluetoothDeviceUpdate (string appId, string
         }
 
         /// <summary>
-        /// Cancel currently initiated install update for bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -966,7 +819,7 @@ public ApiResponse<Object> CancelCurrentlyInitiatedBluetoothDeviceUpdateWithHttp
             if (terminalType == null)
                 throw new ApiException(400, "Missing required parameter 'terminalType' when calling CardReadersApi->CancelCurrentlyInitiatedBluetoothDeviceUpdate");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/cancelUpdate";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/cancelUpdate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1015,12 +868,12 @@ public ApiResponse<Object> CancelCurrentlyInitiatedBluetoothDeviceUpdateWithHttp
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Cancel currently initiated install update for bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1034,7 +887,7 @@ public async System.Threading.Tasks.Task CancelCurrentlyInitiatedBluetoothDevice
         }
 
         /// <summary>
-        /// Cancel currently initiated install update for bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1053,7 +906,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CancelCurrentlyIni
             if (terminalType == null)
                 throw new ApiException(400, "Missing required parameter 'terminalType' when calling CardReadersApi->CancelCurrentlyInitiatedBluetoothDeviceUpdate");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/cancelUpdate";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/cancelUpdate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1102,12 +955,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CancelCurrentlyIni
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Cancel terminals action Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -1120,7 +973,7 @@ public RestApiResultCardReader CancelReaderAction (string readerId, string appId
         }
 
         /// <summary>
-        /// Cancel terminals action Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -1135,7 +988,7 @@ public ApiResponse< RestApiResultCardReader > CancelReaderActionWithHttpInfo (st
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->CancelReaderAction");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/{readerId}/cancel_action";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/{readerId}/cancel_action";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1183,12 +1036,12 @@ public ApiResponse< RestApiResultCardReader > CancelReaderActionWithHttpInfo (st
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
         /// <summary>
-        /// Cancel terminals action Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -1202,7 +1055,7 @@ public async System.Threading.Tasks.Task<RestApiResultCardReader> CancelReaderAc
         }
 
         /// <summary>
-        /// Cancel terminals action Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -1217,7 +1070,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> C
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->CancelReaderAction");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/{readerId}/cancel_action";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/{readerId}/cancel_action";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1265,12 +1118,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> C
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
         /// <summary>
-        /// Get reader Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -1283,7 +1136,7 @@ public RestApiResultCardReader CardReadersGetReader (string readerId, string app
         }
 
         /// <summary>
-        /// Get reader Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -1298,7 +1151,7 @@ public ApiResponse< RestApiResultCardReader > CardReadersGetReaderWithHttpInfo (
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->CardReadersGetReader");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/{readerId}";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/{readerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1346,12 +1199,12 @@ public ApiResponse< RestApiResultCardReader > CardReadersGetReaderWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
         /// <summary>
-        /// Get reader Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -1365,7 +1218,7 @@ public async System.Threading.Tasks.Task<RestApiResultCardReader> CardReadersGet
         }
 
         /// <summary>
-        /// Get reader Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="readerId"></param>
@@ -1380,7 +1233,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> C
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->CardReadersGetReader");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/{readerId}";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/{readerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1428,12 +1281,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> C
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
         /// <summary>
-        /// Get Location ID for Stripe Terminal Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="geoPointRequest"></param>
@@ -1446,7 +1299,7 @@ public RestApiResultStripeTerminalLocation GenerateStripeTerminalLocation (GeoPo
         }
 
         /// <summary>
-        /// Get Location ID for Stripe Terminal Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="geoPointRequest"></param>
@@ -1461,7 +1314,7 @@ public ApiResponse< RestApiResultStripeTerminalLocation > GenerateStripeTerminal
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->GenerateStripeTerminalLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stripeterminal/location";
+            var localVarPath = "./api/v1.0/{appId}/stripeterminal/location";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1521,12 +1374,12 @@ public ApiResponse< RestApiResultStripeTerminalLocation > GenerateStripeTerminal
             }
 
             return new ApiResponse<RestApiResultStripeTerminalLocation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeTerminalLocation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeTerminalLocation)));
         }
 
         /// <summary>
-        /// Get Location ID for Stripe Terminal Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="geoPointRequest"></param>
@@ -1540,7 +1393,7 @@ public async System.Threading.Tasks.Task<RestApiResultStripeTerminalLocation> Ge
         }
 
         /// <summary>
-        /// Get Location ID for Stripe Terminal Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="geoPointRequest"></param>
@@ -1555,7 +1408,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeTerminal
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->GenerateStripeTerminalLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stripeterminal/location";
+            var localVarPath = "./api/v1.0/{appId}/stripeterminal/location";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1615,12 +1468,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeTerminal
             }
 
             return new ApiResponse<RestApiResultStripeTerminalLocation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeTerminalLocation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeTerminalLocation)));
         }
 
         /// <summary>
-        /// Get the status of the bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1633,7 +1486,7 @@ public RestApiResultBluetoothTerminalStatus GetBluetoothTerminalStatus (string a
         }
 
         /// <summary>
-        /// Get the status of the bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1648,7 +1501,7 @@ public ApiResponse< RestApiResultBluetoothTerminalStatus > GetBluetoothTerminalS
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling CardReadersApi->GetBluetoothTerminalStatus");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/status";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/status";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1696,12 +1549,12 @@ public ApiResponse< RestApiResultBluetoothTerminalStatus > GetBluetoothTerminalS
             }
 
             return new ApiResponse<RestApiResultBluetoothTerminalStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBluetoothTerminalStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBluetoothTerminalStatus)));
         }
 
         /// <summary>
-        /// Get the status of the bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1715,7 +1568,7 @@ public async System.Threading.Tasks.Task<RestApiResultBluetoothTerminalStatus> G
         }
 
         /// <summary>
-        /// Get the status of the bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1730,7 +1583,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBluetoothTermi
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling CardReadersApi->GetBluetoothTerminalStatus");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/status";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/status";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1778,12 +1631,175 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBluetoothTermi
             }
 
             return new ApiResponse<RestApiResultBluetoothTerminalStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBluetoothTerminalStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBluetoothTerminalStatus)));
         }
 
         /// <summary>
-        /// Get Connection Token For a Stripe Terminal Can only be called by Kiosk
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>RestApiResultKioskStripeLocation</returns>
+        public RestApiResultKioskStripeLocation GetKioskStripeLocation (string appId, string deviceId)
+        {
+             ApiResponse<RestApiResultKioskStripeLocation> localVarResponse = GetKioskStripeLocationWithHttpInfo(appId, deviceId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>ApiResponse of RestApiResultKioskStripeLocation</returns>
+        public ApiResponse< RestApiResultKioskStripeLocation > GetKioskStripeLocationWithHttpInfo (string appId, string deviceId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->GetKioskStripeLocation");
+            // verify the required parameter 'deviceId' is set
+            if (deviceId == null)
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling CardReadersApi->GetKioskStripeLocation");
+
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/stripe-location";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceId != null) localVarPathParams.Add("deviceId", this.Configuration.ApiClient.ParameterToString(deviceId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetKioskStripeLocation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultKioskStripeLocation>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultKioskStripeLocation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskStripeLocation)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of RestApiResultKioskStripeLocation</returns>
+        public async System.Threading.Tasks.Task<RestApiResultKioskStripeLocation> GetKioskStripeLocationAsync (string appId, string deviceId)
+        {
+             ApiResponse<RestApiResultKioskStripeLocation> localVarResponse = await GetKioskStripeLocationAsyncWithHttpInfo(appId, deviceId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultKioskStripeLocation)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskStripeLocation>> GetKioskStripeLocationAsyncWithHttpInfo (string appId, string deviceId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->GetKioskStripeLocation");
+            // verify the required parameter 'deviceId' is set
+            if (deviceId == null)
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling CardReadersApi->GetKioskStripeLocation");
+
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/stripe-location";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceId != null) localVarPathParams.Add("deviceId", this.Configuration.ApiClient.ParameterToString(deviceId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetKioskStripeLocation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultKioskStripeLocation>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultKioskStripeLocation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskStripeLocation)));
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1795,7 +1811,7 @@ public RestApiResultStripeTerminalConnectionToken GetStripeConnectionToken (stri
         }
 
         /// <summary>
-        /// Get Connection Token For a Stripe Terminal Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1806,7 +1822,7 @@ public ApiResponse< RestApiResultStripeTerminalConnectionToken > GetStripeConnec
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->GetStripeConnectionToken");
 
-            var localVarPath = "/api/v1.0/{appId}/stripeterminal/connectiontoken";
+            var localVarPath = "./api/v1.0/{appId}/stripeterminal/connectiontoken";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1853,12 +1869,12 @@ public ApiResponse< RestApiResultStripeTerminalConnectionToken > GetStripeConnec
             }
 
             return new ApiResponse<RestApiResultStripeTerminalConnectionToken>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeTerminalConnectionToken) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeTerminalConnectionToken)));
         }
 
         /// <summary>
-        /// Get Connection Token For a Stripe Terminal Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1871,7 +1887,7 @@ public async System.Threading.Tasks.Task<RestApiResultStripeTerminalConnectionTo
         }
 
         /// <summary>
-        /// Get Connection Token For a Stripe Terminal Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1882,7 +1898,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeTerminal
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->GetStripeConnectionToken");
 
-            var localVarPath = "/api/v1.0/{appId}/stripeterminal/connectiontoken";
+            var localVarPath = "./api/v1.0/{appId}/stripeterminal/connectiontoken";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1929,12 +1945,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeTerminal
             }
 
             return new ApiResponse<RestApiResultStripeTerminalConnectionToken>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeTerminalConnectionToken) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeTerminalConnectionToken)));
         }
 
         /// <summary>
-        /// Trigger check for Bluetooth device update on Kiosk [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1947,7 +1963,7 @@ public void InitiateBluetoothTerminalDeviceUpdateCheck (string appId, string dev
         }
 
         /// <summary>
-        /// Trigger check for Bluetooth device update on Kiosk [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1966,7 +1982,7 @@ public ApiResponse<Object> InitiateBluetoothTerminalDeviceUpdateCheckWithHttpInf
             if (terminalType == null)
                 throw new ApiException(400, "Missing required parameter 'terminalType' when calling CardReadersApi->InitiateBluetoothTerminalDeviceUpdateCheck");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/checkForUpdate";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/checkForUpdate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2015,12 +2031,12 @@ public ApiResponse<Object> InitiateBluetoothTerminalDeviceUpdateCheckWithHttpInf
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Trigger check for Bluetooth device update on Kiosk [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2034,7 +2050,7 @@ public async System.Threading.Tasks.Task InitiateBluetoothTerminalDeviceUpdateCh
         }
 
         /// <summary>
-        /// Trigger check for Bluetooth device update on Kiosk [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2053,7 +2069,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> InitiateBluetoothT
             if (terminalType == null)
                 throw new ApiException(400, "Missing required parameter 'terminalType' when calling CardReadersApi->InitiateBluetoothTerminalDeviceUpdateCheck");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/checkForUpdate";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/checkForUpdate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2102,12 +2118,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> InitiateBluetoothT
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Initiate stripe terminal pairing mode [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2120,7 +2136,7 @@ public void InitiateKioskBluetoothPairingMode (string appId, string deviceId, st
         }
 
         /// <summary>
-        /// Initiate stripe terminal pairing mode [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2139,7 +2155,7 @@ public ApiResponse<Object> InitiateKioskBluetoothPairingModeWithHttpInfo (string
             if (terminalType == null)
                 throw new ApiException(400, "Missing required parameter 'terminalType' when calling CardReadersApi->InitiateKioskBluetoothPairingMode");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/pair";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/pair";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2188,12 +2204,12 @@ public ApiResponse<Object> InitiateKioskBluetoothPairingModeWithHttpInfo (string
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Initiate stripe terminal pairing mode [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2207,7 +2223,7 @@ public async System.Threading.Tasks.Task InitiateKioskBluetoothPairingModeAsync
         }
 
         /// <summary>
-        /// Initiate stripe terminal pairing mode [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2226,7 +2242,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> InitiateKioskBluet
             if (terminalType == null)
                 throw new ApiException(400, "Missing required parameter 'terminalType' when calling CardReadersApi->InitiateKioskBluetoothPairingMode");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/pair";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/pair";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2275,12 +2291,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> InitiateKioskBluet
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Initiate Kiosk Update Install for bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2293,7 +2309,7 @@ public void InitiateKioskBluetoothUpdateInstall (string appId, string deviceId,
         }
 
         /// <summary>
-        /// Initiate Kiosk Update Install for bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2312,7 +2328,7 @@ public ApiResponse<Object> InitiateKioskBluetoothUpdateInstallWithHttpInfo (stri
             if (terminalType == null)
                 throw new ApiException(400, "Missing required parameter 'terminalType' when calling CardReadersApi->InitiateKioskBluetoothUpdateInstall");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/installUpdate";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/installUpdate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2361,12 +2377,12 @@ public ApiResponse<Object> InitiateKioskBluetoothUpdateInstallWithHttpInfo (stri
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Initiate Kiosk Update Install for bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2380,7 +2396,7 @@ public async System.Threading.Tasks.Task InitiateKioskBluetoothUpdateInstallAsyn
         }
 
         /// <summary>
-        /// Initiate Kiosk Update Install for bluetooth terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2399,7 +2415,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> InitiateKioskBluet
             if (terminalType == null)
                 throw new ApiException(400, "Missing required parameter 'terminalType' when calling CardReadersApi->InitiateKioskBluetoothUpdateInstall");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/installUpdate";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/{terminalType}/installUpdate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2448,12 +2464,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> InitiateKioskBluet
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Initiate Stripe terminal to Process Payment Intent Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -2467,7 +2483,7 @@ public RestApiResultCardReader InitiateReaderProcessPaymentIntent (ProcessPaymen
         }
 
         /// <summary>
-        /// Initiate Stripe terminal to Process Payment Intent Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -2486,7 +2502,7 @@ public ApiResponse< RestApiResultCardReader > InitiateReaderProcessPaymentIntent
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->InitiateReaderProcessPaymentIntent");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/{readerId}/processPaymentIntent";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/{readerId}/processPaymentIntent";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2547,12 +2563,12 @@ public ApiResponse< RestApiResultCardReader > InitiateReaderProcessPaymentIntent
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
         /// <summary>
-        /// Initiate Stripe terminal to Process Payment Intent Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -2567,7 +2583,7 @@ public async System.Threading.Tasks.Task<RestApiResultCardReader> InitiateReader
         }
 
         /// <summary>
-        /// Initiate Stripe terminal to Process Payment Intent Can only be called by Kiosk  [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -2586,7 +2602,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> I
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->InitiateReaderProcessPaymentIntent");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/{readerId}/processPaymentIntent";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/{readerId}/processPaymentIntent";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2647,7 +2663,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> I
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
@@ -2680,7 +2696,7 @@ public ApiResponse< RestApiResultCardReader > RegisterStripeTerminalWithHttpInfo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->RegisterStripeTerminal");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/register";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/register";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2740,7 +2756,7 @@ public ApiResponse< RestApiResultCardReader > RegisterStripeTerminalWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
@@ -2774,7 +2790,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> R
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->RegisterStripeTerminal");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/register";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/register";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2834,12 +2850,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> R
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
         /// <summary>
-        /// Un-register terminal by deleting it from stripe Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -2852,7 +2868,7 @@ public RestApiResultCardReader UnRegisterTerminal (UnRegisterCardReaderRequest r
         }
 
         /// <summary>
-        /// Un-register terminal by deleting it from stripe Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -2867,7 +2883,7 @@ public ApiResponse< RestApiResultCardReader > UnRegisterTerminalWithHttpInfo (Un
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->UnRegisterTerminal");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/unregister";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/unregister";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2927,12 +2943,12 @@ public ApiResponse< RestApiResultCardReader > UnRegisterTerminalWithHttpInfo (Un
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
         /// <summary>
-        /// Un-register terminal by deleting it from stripe Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -2946,7 +2962,7 @@ public async System.Threading.Tasks.Task<RestApiResultCardReader> UnRegisterTerm
         }
 
         /// <summary>
-        /// Un-register terminal by deleting it from stripe Can only be called by Kiosk
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="request"></param>
@@ -2961,7 +2977,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> U
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CardReadersApi->UnRegisterTerminal");
 
-            var localVarPath = "/api/v1.0/{appId}/payments/terminals/stripe/unregister";
+            var localVarPath = "./api/v1.0/{appId}/payments/terminals/stripe/unregister";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3021,12 +3037,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCardReader>> U
             }
 
             return new ApiResponse<RestApiResultCardReader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCardReader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCardReader)));
         }
 
         /// <summary>
-        /// Unpair the currently paired stripe terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3038,7 +3054,7 @@ public void UnpairCurrentlyPairedBluetoothDevice (string appId, string deviceId)
         }
 
         /// <summary>
-        /// Unpair the currently paired stripe terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3053,7 +3069,7 @@ public ApiResponse<Object> UnpairCurrentlyPairedBluetoothDeviceWithHttpInfo (str
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling CardReadersApi->UnpairCurrentlyPairedBluetoothDevice");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/unpair";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/unpair";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3101,12 +3117,12 @@ public ApiResponse<Object> UnpairCurrentlyPairedBluetoothDeviceWithHttpInfo (str
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Unpair the currently paired stripe terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3119,7 +3135,7 @@ public async System.Threading.Tasks.Task UnpairCurrentlyPairedBluetoothDeviceAsy
         }
 
         /// <summary>
-        /// Unpair the currently paired stripe terminal [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3134,7 +3150,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnpairCurrentlyPai
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling CardReadersApi->UnpairCurrentlyPairedBluetoothDevice");
 
-            var localVarPath = "/api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/unpair";
+            var localVarPath = "./api/v1.0/{appId}/cardreaders/kiosk/{deviceId}/bluetooth/unpair";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3182,7 +3198,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnpairCurrentlyPai
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/CatalogChangesApi.cs b/src/Flipdish/Api/CatalogChangesApi.cs
index 68573d46..0ed6a159 100644
--- a/src/Flipdish/Api/CatalogChangesApi.cs
+++ b/src/Flipdish/Api/CatalogChangesApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -304,7 +304,7 @@ public ApiResponse< RestApiPaginationResultPendingMenuChanges > GetPendingMenuCh
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CatalogChangesApi->GetPendingMenuChanges");
 
-            var localVarPath = "/api/v1.0/{appId}/menus/catalog-changes";
+            var localVarPath = "./api/v1.0/{appId}/menus/catalog-changes";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -355,7 +355,7 @@ public ApiResponse< RestApiPaginationResultPendingMenuChanges > GetPendingMenuCh
             }
 
             return new ApiResponse<RestApiPaginationResultPendingMenuChanges>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPendingMenuChanges) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPendingMenuChanges)));
         }
 
@@ -392,7 +392,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPend
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CatalogChangesApi->GetPendingMenuChanges");
 
-            var localVarPath = "/api/v1.0/{appId}/menus/catalog-changes";
+            var localVarPath = "./api/v1.0/{appId}/menus/catalog-changes";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -443,7 +443,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPend
             }
 
             return new ApiResponse<RestApiPaginationResultPendingMenuChanges>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPendingMenuChanges) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPendingMenuChanges)));
         }
 
@@ -471,7 +471,7 @@ public ApiResponse< RestApiArrayResultPendingMenuChangesSummaries > GetPendingMe
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CatalogChangesApi->GetPendingMenuChangesSummaries");
 
-            var localVarPath = "/api/v1.0/{appId}/menus/catalog-changes/summaries";
+            var localVarPath = "./api/v1.0/{appId}/menus/catalog-changes/summaries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -518,7 +518,7 @@ public ApiResponse< RestApiArrayResultPendingMenuChangesSummaries > GetPendingMe
             }
 
             return new ApiResponse<RestApiArrayResultPendingMenuChangesSummaries>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultPendingMenuChangesSummaries) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultPendingMenuChangesSummaries)));
         }
 
@@ -547,7 +547,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPendingMe
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling CatalogChangesApi->GetPendingMenuChangesSummaries");
 
-            var localVarPath = "/api/v1.0/{appId}/menus/catalog-changes/summaries";
+            var localVarPath = "./api/v1.0/{appId}/menus/catalog-changes/summaries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -594,7 +594,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPendingMe
             }
 
             return new ApiResponse<RestApiArrayResultPendingMenuChangesSummaries>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultPendingMenuChangesSummaries) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultPendingMenuChangesSummaries)));
         }
 
@@ -626,7 +626,7 @@ public ApiResponse<Object> PublishPendingMenuChangesWithHttpInfo (string appId,
             if (publishMenuChanges == null)
                 throw new ApiException(400, "Missing required parameter 'publishMenuChanges' when calling CatalogChangesApi->PublishPendingMenuChanges");
 
-            var localVarPath = "/api/v1.0/{appId}/menus/catalog-changes/publish";
+            var localVarPath = "./api/v1.0/{appId}/menus/catalog-changes/publish";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -686,7 +686,7 @@ public ApiResponse<Object> PublishPendingMenuChangesWithHttpInfo (string appId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -719,7 +719,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PublishPendingMenu
             if (publishMenuChanges == null)
                 throw new ApiException(400, "Missing required parameter 'publishMenuChanges' when calling CatalogChangesApi->PublishPendingMenuChanges");
 
-            var localVarPath = "/api/v1.0/{appId}/menus/catalog-changes/publish";
+            var localVarPath = "./api/v1.0/{appId}/menus/catalog-changes/publish";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -779,7 +779,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PublishPendingMenu
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/CatalogGroupsApi.cs b/src/Flipdish/Api/CatalogGroupsApi.cs
index 8acd3808..9ab74c01 100644
--- a/src/Flipdish/Api/CatalogGroupsApi.cs
+++ b/src/Flipdish/Api/CatalogGroupsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -446,7 +446,7 @@ public ApiResponse<Object> ArchiveGroupWithHttpInfo (string appId, string catalo
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogGroupsApi->ArchiveGroup");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups/{catalogItemId}/archive";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups/{catalogItemId}/archive";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -494,7 +494,7 @@ public ApiResponse<Object> ArchiveGroupWithHttpInfo (string appId, string catalo
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -527,7 +527,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveGroupAsyncW
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogGroupsApi->ArchiveGroup");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups/{catalogItemId}/archive";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups/{catalogItemId}/archive";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -575,7 +575,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveGroupAsyncW
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -608,7 +608,7 @@ public ApiResponse< RestApiResultGroup > CreateGroupWithHttpInfo (string appId,
             if (createGroup == null)
                 throw new ApiException(400, "Missing required parameter 'createGroup' when calling CatalogGroupsApi->CreateGroup");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -668,7 +668,7 @@ public ApiResponse< RestApiResultGroup > CreateGroupWithHttpInfo (string appId,
             }
 
             return new ApiResponse<RestApiResultGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultGroup)));
         }
 
@@ -702,7 +702,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultGroup>> Create
             if (createGroup == null)
                 throw new ApiException(400, "Missing required parameter 'createGroup' when calling CatalogGroupsApi->CreateGroup");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -762,7 +762,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultGroup>> Create
             }
 
             return new ApiResponse<RestApiResultGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultGroup)));
         }
 
@@ -794,7 +794,7 @@ public ApiResponse<Object> DuplicateGroupWithHttpInfo (string appId, string cata
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogGroupsApi->DuplicateGroup");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups/{catalogItemId}/duplicate";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups/{catalogItemId}/duplicate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -842,7 +842,7 @@ public ApiResponse<Object> DuplicateGroupWithHttpInfo (string appId, string cata
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -875,7 +875,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DuplicateGroupAsyn
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogGroupsApi->DuplicateGroup");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups/{catalogItemId}/duplicate";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups/{catalogItemId}/duplicate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -923,7 +923,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DuplicateGroupAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -956,7 +956,7 @@ public ApiResponse< Group > GetGroupByIdWithHttpInfo (string appId, string catal
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogGroupsApi->GetGroupById");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1004,7 +1004,7 @@ public ApiResponse< Group > GetGroupByIdWithHttpInfo (string appId, string catal
             }
 
             return new ApiResponse<Group>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Group) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Group)));
         }
 
@@ -1038,7 +1038,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Group>> GetGroupByIdAsyncWi
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogGroupsApi->GetGroupById");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1086,7 +1086,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Group>> GetGroupByIdAsyncWi
             }
 
             return new ApiResponse<Group>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Group) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Group)));
         }
 
@@ -1125,7 +1125,7 @@ public ApiResponse< RestApiPaginationResultGroup > GetGroupsWithHttpInfo (string
             if (groupTypes == null)
                 throw new ApiException(400, "Missing required parameter 'groupTypes' when calling CatalogGroupsApi->GetGroups");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1176,7 +1176,7 @@ public ApiResponse< RestApiPaginationResultGroup > GetGroupsWithHttpInfo (string
             }
 
             return new ApiResponse<RestApiPaginationResultGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultGroup)));
         }
 
@@ -1216,7 +1216,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultGrou
             if (groupTypes == null)
                 throw new ApiException(400, "Missing required parameter 'groupTypes' when calling CatalogGroupsApi->GetGroups");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1267,7 +1267,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultGrou
             }
 
             return new ApiResponse<RestApiPaginationResultGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultGroup)));
         }
 
@@ -1304,7 +1304,7 @@ public ApiResponse<Object> UpdateGroupWithHttpInfo (string appId, string catalog
             if (updateGroup == null)
                 throw new ApiException(400, "Missing required parameter 'updateGroup' when calling CatalogGroupsApi->UpdateGroup");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1365,7 +1365,7 @@ public ApiResponse<Object> UpdateGroupWithHttpInfo (string appId, string catalog
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1403,7 +1403,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateGroupAsyncWi
             if (updateGroup == null)
                 throw new ApiException(400, "Missing required parameter 'updateGroup' when calling CatalogGroupsApi->UpdateGroup");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/groups/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/groups/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1464,7 +1464,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateGroupAsyncWi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/CatalogImagesApi.cs b/src/Flipdish/Api/CatalogImagesApi.cs
index dca9b3f6..3bd35ddc 100644
--- a/src/Flipdish/Api/CatalogImagesApi.cs
+++ b/src/Flipdish/Api/CatalogImagesApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -201,7 +201,7 @@ public ApiResponse< CatalogImage > UploadCatalogImageWithHttpInfo (string appId,
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling CatalogImagesApi->UploadCatalogImage");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/images";
+            var localVarPath = "./api/v1.0/{appId}/catalog/images";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -250,7 +250,7 @@ public ApiResponse< CatalogImage > UploadCatalogImageWithHttpInfo (string appId,
             }
 
             return new ApiResponse<CatalogImage>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (CatalogImage) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(CatalogImage)));
         }
 
@@ -284,7 +284,7 @@ public async System.Threading.Tasks.Task<ApiResponse<CatalogImage>> UploadCatalo
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling CatalogImagesApi->UploadCatalogImage");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/images";
+            var localVarPath = "./api/v1.0/{appId}/catalog/images";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -333,7 +333,7 @@ public async System.Threading.Tasks.Task<ApiResponse<CatalogImage>> UploadCatalo
             }
 
             return new ApiResponse<CatalogImage>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (CatalogImage) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(CatalogImage)));
         }
 
diff --git a/src/Flipdish/Api/CatalogItemsApi.cs b/src/Flipdish/Api/CatalogItemsApi.cs
index 1d737f8a..bd78c9cc 100644
--- a/src/Flipdish/Api/CatalogItemsApi.cs
+++ b/src/Flipdish/Api/CatalogItemsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -446,7 +446,7 @@ public ApiResponse<Object> ArchiveCatalogItemWithHttpInfo (string appId, string
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogItemsApi->ArchiveCatalogItem");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items/{catalogItemId}/archive";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items/{catalogItemId}/archive";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -494,7 +494,7 @@ public ApiResponse<Object> ArchiveCatalogItemWithHttpInfo (string appId, string
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -527,7 +527,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveCatalogItem
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogItemsApi->ArchiveCatalogItem");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items/{catalogItemId}/archive";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items/{catalogItemId}/archive";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -575,7 +575,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveCatalogItem
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -608,7 +608,7 @@ public ApiResponse< RestApiResultCatalogItem > CreateCatalogItemWithHttpInfo (st
             if (createCatalogItem == null)
                 throw new ApiException(400, "Missing required parameter 'createCatalogItem' when calling CatalogItemsApi->CreateCatalogItem");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -668,7 +668,7 @@ public ApiResponse< RestApiResultCatalogItem > CreateCatalogItemWithHttpInfo (st
             }
 
             return new ApiResponse<RestApiResultCatalogItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCatalogItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCatalogItem)));
         }
 
@@ -702,7 +702,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCatalogItem>>
             if (createCatalogItem == null)
                 throw new ApiException(400, "Missing required parameter 'createCatalogItem' when calling CatalogItemsApi->CreateCatalogItem");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -762,7 +762,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCatalogItem>>
             }
 
             return new ApiResponse<RestApiResultCatalogItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCatalogItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCatalogItem)));
         }
 
@@ -794,7 +794,7 @@ public ApiResponse<Object> DuplicateCatalogItemWithHttpInfo (string appId, strin
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogItemsApi->DuplicateCatalogItem");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items/{catalogItemId}/duplicate";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items/{catalogItemId}/duplicate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -842,7 +842,7 @@ public ApiResponse<Object> DuplicateCatalogItemWithHttpInfo (string appId, strin
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -875,7 +875,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DuplicateCatalogIt
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogItemsApi->DuplicateCatalogItem");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items/{catalogItemId}/duplicate";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items/{catalogItemId}/duplicate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -923,7 +923,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DuplicateCatalogIt
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -956,7 +956,7 @@ public ApiResponse< CatalogItem > GetCatalogItemByIdWithHttpInfo (string appId,
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogItemsApi->GetCatalogItemById");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1004,7 +1004,7 @@ public ApiResponse< CatalogItem > GetCatalogItemByIdWithHttpInfo (string appId,
             }
 
             return new ApiResponse<CatalogItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (CatalogItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(CatalogItem)));
         }
 
@@ -1038,7 +1038,7 @@ public async System.Threading.Tasks.Task<ApiResponse<CatalogItem>> GetCatalogIte
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogItemsApi->GetCatalogItemById");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1086,7 +1086,7 @@ public async System.Threading.Tasks.Task<ApiResponse<CatalogItem>> GetCatalogIte
             }
 
             return new ApiResponse<CatalogItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (CatalogItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(CatalogItem)));
         }
 
@@ -1125,7 +1125,7 @@ public ApiResponse< RestApiPaginationResultCatalogItem > GetItemsWithHttpInfo (s
             if (itemTypes == null)
                 throw new ApiException(400, "Missing required parameter 'itemTypes' when calling CatalogItemsApi->GetItems");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1176,7 +1176,7 @@ public ApiResponse< RestApiPaginationResultCatalogItem > GetItemsWithHttpInfo (s
             }
 
             return new ApiResponse<RestApiPaginationResultCatalogItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultCatalogItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultCatalogItem)));
         }
 
@@ -1216,7 +1216,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultCata
             if (itemTypes == null)
                 throw new ApiException(400, "Missing required parameter 'itemTypes' when calling CatalogItemsApi->GetItems");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1267,7 +1267,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultCata
             }
 
             return new ApiResponse<RestApiPaginationResultCatalogItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultCatalogItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultCatalogItem)));
         }
 
@@ -1304,7 +1304,7 @@ public ApiResponse<Object> UpdateCatalogItemWithHttpInfo (string appId, string c
             if (updateCatalogItem == null)
                 throw new ApiException(400, "Missing required parameter 'updateCatalogItem' when calling CatalogItemsApi->UpdateCatalogItem");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1365,7 +1365,7 @@ public ApiResponse<Object> UpdateCatalogItemWithHttpInfo (string appId, string c
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1403,7 +1403,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateCatalogItemA
             if (updateCatalogItem == null)
                 throw new ApiException(400, "Missing required parameter 'updateCatalogItem' when calling CatalogItemsApi->UpdateCatalogItem");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/items/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/items/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1464,7 +1464,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateCatalogItemA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/CatalogProductsApi.cs b/src/Flipdish/Api/CatalogProductsApi.cs
index 84f364b7..b61867f7 100644
--- a/src/Flipdish/Api/CatalogProductsApi.cs
+++ b/src/Flipdish/Api/CatalogProductsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -446,7 +446,7 @@ public ApiResponse<Object> ArchiveProductWithHttpInfo (string appId, string cata
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogProductsApi->ArchiveProduct");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{catalogItemId}/archive";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products/{catalogItemId}/archive";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -494,7 +494,7 @@ public ApiResponse<Object> ArchiveProductWithHttpInfo (string appId, string cata
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -527,7 +527,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveProductAsyn
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogProductsApi->ArchiveProduct");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{catalogItemId}/archive";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products/{catalogItemId}/archive";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -575,7 +575,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveProductAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -608,7 +608,7 @@ public ApiResponse< RestApiResultProduct > CreateProductWithHttpInfo (string app
             if (createProduct == null)
                 throw new ApiException(400, "Missing required parameter 'createProduct' when calling CatalogProductsApi->CreateProduct");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -668,7 +668,7 @@ public ApiResponse< RestApiResultProduct > CreateProductWithHttpInfo (string app
             }
 
             return new ApiResponse<RestApiResultProduct>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultProduct) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultProduct)));
         }
 
@@ -702,7 +702,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultProduct>> Crea
             if (createProduct == null)
                 throw new ApiException(400, "Missing required parameter 'createProduct' when calling CatalogProductsApi->CreateProduct");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -762,7 +762,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultProduct>> Crea
             }
 
             return new ApiResponse<RestApiResultProduct>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultProduct) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultProduct)));
         }
 
@@ -794,7 +794,7 @@ public ApiResponse<Object> DuplicateProductWithHttpInfo (string appId, string ca
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogProductsApi->DuplicateProduct");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{catalogItemId}/duplicate";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products/{catalogItemId}/duplicate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -842,7 +842,7 @@ public ApiResponse<Object> DuplicateProductWithHttpInfo (string appId, string ca
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -875,7 +875,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DuplicateProductAs
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogProductsApi->DuplicateProduct");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{catalogItemId}/duplicate";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products/{catalogItemId}/duplicate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -923,7 +923,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DuplicateProductAs
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -956,7 +956,7 @@ public ApiResponse< Product > GetProductByIdWithHttpInfo (string appId, string c
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogProductsApi->GetProductById");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1004,7 +1004,7 @@ public ApiResponse< Product > GetProductByIdWithHttpInfo (string appId, string c
             }
 
             return new ApiResponse<Product>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Product) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Product)));
         }
 
@@ -1038,7 +1038,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Product>> GetProductByIdAsy
             if (catalogItemId == null)
                 throw new ApiException(400, "Missing required parameter 'catalogItemId' when calling CatalogProductsApi->GetProductById");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1086,7 +1086,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Product>> GetProductByIdAsy
             }
 
             return new ApiResponse<Product>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Product) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Product)));
         }
 
@@ -1125,7 +1125,7 @@ public ApiResponse< RestApiPaginationResultProduct > GetProductsWithHttpInfo (st
             if (productTypes == null)
                 throw new ApiException(400, "Missing required parameter 'productTypes' when calling CatalogProductsApi->GetProducts");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1176,7 +1176,7 @@ public ApiResponse< RestApiPaginationResultProduct > GetProductsWithHttpInfo (st
             }
 
             return new ApiResponse<RestApiPaginationResultProduct>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultProduct) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultProduct)));
         }
 
@@ -1216,7 +1216,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultProd
             if (productTypes == null)
                 throw new ApiException(400, "Missing required parameter 'productTypes' when calling CatalogProductsApi->GetProducts");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1267,7 +1267,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultProd
             }
 
             return new ApiResponse<RestApiPaginationResultProduct>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultProduct) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultProduct)));
         }
 
@@ -1304,7 +1304,7 @@ public ApiResponse<Object> UpdateProductWithHttpInfo (string appId, string catal
             if (updateProduct == null)
                 throw new ApiException(400, "Missing required parameter 'updateProduct' when calling CatalogProductsApi->UpdateProduct");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1365,7 +1365,7 @@ public ApiResponse<Object> UpdateProductWithHttpInfo (string appId, string catal
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1403,7 +1403,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateProductAsync
             if (updateProduct == null)
                 throw new ApiException(400, "Missing required parameter 'updateProduct' when calling CatalogProductsApi->UpdateProduct");
 
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{catalogItemId}";
+            var localVarPath = "./api/v1.0/{appId}/catalog/products/{catalogItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1464,7 +1464,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateProductAsync
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/ChannelsApi.cs b/src/Flipdish/Api/ChannelsApi.cs
index 444d28d2..0b907603 100644
--- a/src/Flipdish/Api/ChannelsApi.cs
+++ b/src/Flipdish/Api/ChannelsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,193 +25,193 @@ public interface IChannelsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Assign a given AppId to a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Object</returns>
         Object AssignAppIdToSalesChannel (string appId, int? channelId);
 
         /// <summary>
-        /// Assign a given AppId to a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> AssignAppIdToSalesChannelWithHttpInfo (string appId, int? channelId);
         /// <summary>
-        /// Assign a Store to a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Object</returns>
         Object AssignStoreToChannel (int? storeId, string appId, int? channelId);
 
         /// <summary>
-        /// Assign a Store to a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> AssignStoreToChannelWithHttpInfo (int? storeId, string appId, int? channelId);
         /// <summary>
-        /// Attachs the specified store to the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to attach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         Object AttachStoreToSalesChannel (string appId, int? channelId, int? storeId);
 
         /// <summary>
-        /// Attachs the specified store to the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to attach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> AttachStoreToSalesChannelWithHttpInfo (string appId, int? channelId, int? storeId);
         /// <summary>
-        /// Detaches all the stores from the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Object</returns>
         Object DetachAllStoresFromSalesChannel (string appId, int? channelId);
 
         /// <summary>
-        /// Detaches all the stores from the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> DetachAllStoresFromSalesChannelWithHttpInfo (string appId, int? channelId);
         /// <summary>
-        /// Detaches the specified store from the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to detach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         Object DetachStoreFromSalesChannel (string appId, int? channelId, int? storeId);
 
         /// <summary>
-        /// Detaches the specified store from the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to detach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> DetachStoreFromSalesChannelWithHttpInfo (string appId, int? channelId, int? storeId);
         /// <summary>
-        /// Returns a list of sales channels that are assigned to a given AppId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultChannel</returns>
         RestApiArrayResultChannel GetAssignedChannels (string appId);
 
         /// <summary>
-        /// Returns a list of sales channels that are assigned to a given AppId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultChannel</returns>
         ApiResponse<RestApiArrayResultChannel> GetAssignedChannelsWithHttpInfo (string appId);
         /// <summary>
-        /// Returns a list of sales channels that are not yet assigned to a given AppId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultChannel</returns>
         RestApiArrayResultChannel GetAvailableChannels (string appId);
 
         /// <summary>
-        /// Returns a list of sales channels that are not yet assigned to a given AppId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultChannel</returns>
         ApiResponse<RestApiArrayResultChannel> GetAvailableChannelsWithHttpInfo (string appId);
         /// <summary>
-        /// Returns a Sales Channel by Id.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">ChannelId</param>
-        /// <param name="appId">AppId</param>
+        /// <param name="id"></param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultChannel</returns>
         RestApiResultChannel GetChannel (int? id, string appId);
 
         /// <summary>
-        /// Returns a Sales Channel by Id.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">ChannelId</param>
-        /// <param name="appId">AppId</param>
+        /// <param name="id"></param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultChannel</returns>
         ApiResponse<RestApiResultChannel> GetChannelWithHttpInfo (int? id, string appId);
         /// <summary>
-        /// Returns a list of enabled Channels
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -222,7 +222,7 @@ public interface IChannelsApi : IApiAccessor
         RestApiArrayResultChannel GetChannels (string appId);
 
         /// <summary>
-        /// Returns a list of enabled Channels
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -232,266 +232,266 @@ public interface IChannelsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultChannel</returns>
         ApiResponse<RestApiArrayResultChannel> GetChannelsWithHttpInfo (string appId);
         /// <summary>
-        /// Returns a list of stores of an AppId that are assigned to a given Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>RestApiArrayResultStoreChannelAssignment</returns>
         RestApiArrayResultStoreChannelAssignment GetStoresAssignedToChannel (string appId, int? channelId);
 
         /// <summary>
-        /// Returns a list of stores of an AppId that are assigned to a given Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of RestApiArrayResultStoreChannelAssignment</returns>
         ApiResponse<RestApiArrayResultStoreChannelAssignment> GetStoresAssignedToChannelWithHttpInfo (string appId, int? channelId);
         /// <summary>
-        /// Returns a list of store ids attached to the given channel type for the specified app.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Response</returns>
         Response GetStoresBySalesChannel (string appId, int? channelId);
 
         /// <summary>
-        /// Returns a list of store ids attached to the given channel type for the specified app.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Response</returns>
         ApiResponse<Response> GetStoresBySalesChannelWithHttpInfo (string appId, int? channelId);
         /// <summary>
-        /// Unassign a Store from a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Object</returns>
         Object UnassignStoreFromChannel (int? storeId, string appId, int? channelId);
 
         /// <summary>
-        /// Unassign a Store from a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> UnassignStoreFromChannelWithHttpInfo (int? storeId, string appId, int? channelId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Assign a given AppId to a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> AssignAppIdToSalesChannelAsync (string appId, int? channelId);
 
         /// <summary>
-        /// Assign a given AppId to a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AssignAppIdToSalesChannelAsyncWithHttpInfo (string appId, int? channelId);
         /// <summary>
-        /// Assign a Store to a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> AssignStoreToChannelAsync (int? storeId, string appId, int? channelId);
 
         /// <summary>
-        /// Assign a Store to a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AssignStoreToChannelAsyncWithHttpInfo (int? storeId, string appId, int? channelId);
         /// <summary>
-        /// Attachs the specified store to the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to attach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> AttachStoreToSalesChannelAsync (string appId, int? channelId, int? storeId);
 
         /// <summary>
-        /// Attachs the specified store to the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to attach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AttachStoreToSalesChannelAsyncWithHttpInfo (string appId, int? channelId, int? storeId);
         /// <summary>
-        /// Detaches all the stores from the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> DetachAllStoresFromSalesChannelAsync (string appId, int? channelId);
 
         /// <summary>
-        /// Detaches all the stores from the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DetachAllStoresFromSalesChannelAsyncWithHttpInfo (string appId, int? channelId);
         /// <summary>
-        /// Detaches the specified store from the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to detach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> DetachStoreFromSalesChannelAsync (string appId, int? channelId, int? storeId);
 
         /// <summary>
-        /// Detaches the specified store from the given sales channel.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to detach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DetachStoreFromSalesChannelAsyncWithHttpInfo (string appId, int? channelId, int? storeId);
         /// <summary>
-        /// Returns a list of sales channels that are assigned to a given AppId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultChannel</returns>
         System.Threading.Tasks.Task<RestApiArrayResultChannel> GetAssignedChannelsAsync (string appId);
 
         /// <summary>
-        /// Returns a list of sales channels that are assigned to a given AppId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultChannel)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>> GetAssignedChannelsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Returns a list of sales channels that are not yet assigned to a given AppId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultChannel</returns>
         System.Threading.Tasks.Task<RestApiArrayResultChannel> GetAvailableChannelsAsync (string appId);
 
         /// <summary>
-        /// Returns a list of sales channels that are not yet assigned to a given AppId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultChannel)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>> GetAvailableChannelsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Returns a Sales Channel by Id.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">ChannelId</param>
-        /// <param name="appId">AppId</param>
+        /// <param name="id"></param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiResultChannel</returns>
         System.Threading.Tasks.Task<RestApiResultChannel> GetChannelAsync (int? id, string appId);
 
         /// <summary>
-        /// Returns a Sales Channel by Id.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">ChannelId</param>
-        /// <param name="appId">AppId</param>
+        /// <param name="id"></param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultChannel)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultChannel>> GetChannelAsyncWithHttpInfo (int? id, string appId);
         /// <summary>
-        /// Returns a list of enabled Channels
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -502,7 +502,7 @@ public interface IChannelsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultChannel> GetChannelsAsync (string appId);
 
         /// <summary>
-        /// Returns a list of enabled Channels
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -512,74 +512,74 @@ public interface IChannelsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultChannel)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>> GetChannelsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Returns a list of stores of an AppId that are assigned to a given Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of RestApiArrayResultStoreChannelAssignment</returns>
         System.Threading.Tasks.Task<RestApiArrayResultStoreChannelAssignment> GetStoresAssignedToChannelAsync (string appId, int? channelId);
 
         /// <summary>
-        /// Returns a list of stores of an AppId that are assigned to a given Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultStoreChannelAssignment)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreChannelAssignment>> GetStoresAssignedToChannelAsyncWithHttpInfo (string appId, int? channelId);
         /// <summary>
-        /// Returns a list of store ids attached to the given channel type for the specified app.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Response</returns>
         System.Threading.Tasks.Task<Response> GetStoresBySalesChannelAsync (string appId, int? channelId);
 
         /// <summary>
-        /// Returns a list of store ids attached to the given channel type for the specified app.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Response)</returns>
         System.Threading.Tasks.Task<ApiResponse<Response>> GetStoresBySalesChannelAsyncWithHttpInfo (string appId, int? channelId);
         /// <summary>
-        /// Unassign a Store from a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> UnassignStoreFromChannelAsync (int? storeId, string appId, int? channelId);
 
         /// <summary>
-        /// Unassign a Store from a Sales Channel
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UnassignStoreFromChannelAsyncWithHttpInfo (int? storeId, string appId, int? channelId);
         #endregion Asynchronous Operations
@@ -683,11 +683,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Assign a given AppId to a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Object</returns>
         public Object AssignAppIdToSalesChannel (string appId, int? channelId)
         {
@@ -696,11 +696,11 @@ public Object AssignAppIdToSalesChannel (string appId, int? channelId)
         }
 
         /// <summary>
-        /// Assign a given AppId to a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > AssignAppIdToSalesChannelWithHttpInfo (string appId, int? channelId)
         {
@@ -711,7 +711,7 @@ public ApiResponse< Object > AssignAppIdToSalesChannelWithHttpInfo (string appId
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->AssignAppIdToSalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/assign-appId";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/assign-appId";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -759,16 +759,16 @@ public ApiResponse< Object > AssignAppIdToSalesChannelWithHttpInfo (string appId
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Assign a given AppId to a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> AssignAppIdToSalesChannelAsync (string appId, int? channelId)
         {
@@ -778,11 +778,11 @@ public async System.Threading.Tasks.Task<Object> AssignAppIdToSalesChannelAsync
         }
 
         /// <summary>
-        /// Assign a given AppId to a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignAppIdToSalesChannelAsyncWithHttpInfo (string appId, int? channelId)
         {
@@ -793,7 +793,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignAppIdToSales
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->AssignAppIdToSalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/assign-appId";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/assign-appId";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -841,17 +841,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignAppIdToSales
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Assign a Store to a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Object</returns>
         public Object AssignStoreToChannel (int? storeId, string appId, int? channelId)
         {
@@ -860,12 +860,12 @@ public Object AssignStoreToChannel (int? storeId, string appId, int? channelId)
         }
 
         /// <summary>
-        /// Assign a Store to a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > AssignStoreToChannelWithHttpInfo (int? storeId, string appId, int? channelId)
         {
@@ -879,7 +879,7 @@ public ApiResponse< Object > AssignStoreToChannelWithHttpInfo (int? storeId, str
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->AssignStoreToChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/assign-store";
+            var localVarPath = "./api/v1.0/{appId}/channels/assign-store";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -928,17 +928,17 @@ public ApiResponse< Object > AssignStoreToChannelWithHttpInfo (int? storeId, str
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Assign a Store to a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> AssignStoreToChannelAsync (int? storeId, string appId, int? channelId)
         {
@@ -948,12 +948,12 @@ public async System.Threading.Tasks.Task<Object> AssignStoreToChannelAsync (int?
         }
 
         /// <summary>
-        /// Assign a Store to a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignStoreToChannelAsyncWithHttpInfo (int? storeId, string appId, int? channelId)
         {
@@ -967,7 +967,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignStoreToChann
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->AssignStoreToChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/assign-store";
+            var localVarPath = "./api/v1.0/{appId}/channels/assign-store";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1016,17 +1016,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignStoreToChann
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Attachs the specified store to the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to attach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         public Object AttachStoreToSalesChannel (string appId, int? channelId, int? storeId)
         {
@@ -1035,12 +1035,12 @@ public Object AttachStoreToSalesChannel (string appId, int? channelId, int? stor
         }
 
         /// <summary>
-        /// Attachs the specified store to the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to attach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > AttachStoreToSalesChannelWithHttpInfo (string appId, int? channelId, int? storeId)
         {
@@ -1054,7 +1054,7 @@ public ApiResponse< Object > AttachStoreToSalesChannelWithHttpInfo (string appId
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling ChannelsApi->AttachStoreToSalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/stores/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1103,17 +1103,17 @@ public ApiResponse< Object > AttachStoreToSalesChannelWithHttpInfo (string appId
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Attachs the specified store to the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to attach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> AttachStoreToSalesChannelAsync (string appId, int? channelId, int? storeId)
         {
@@ -1123,12 +1123,12 @@ public async System.Threading.Tasks.Task<Object> AttachStoreToSalesChannelAsync
         }
 
         /// <summary>
-        /// Attachs the specified store to the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to attach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> AttachStoreToSalesChannelAsyncWithHttpInfo (string appId, int? channelId, int? storeId)
         {
@@ -1142,7 +1142,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AttachStoreToSales
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling ChannelsApi->AttachStoreToSalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/stores/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1191,16 +1191,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AttachStoreToSales
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Detaches all the stores from the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Object</returns>
         public Object DetachAllStoresFromSalesChannel (string appId, int? channelId)
         {
@@ -1209,11 +1209,11 @@ public Object DetachAllStoresFromSalesChannel (string appId, int? channelId)
         }
 
         /// <summary>
-        /// Detaches all the stores from the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > DetachAllStoresFromSalesChannelWithHttpInfo (string appId, int? channelId)
         {
@@ -1224,7 +1224,7 @@ public ApiResponse< Object > DetachAllStoresFromSalesChannelWithHttpInfo (string
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->DetachAllStoresFromSalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/stores";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1272,16 +1272,16 @@ public ApiResponse< Object > DetachAllStoresFromSalesChannelWithHttpInfo (string
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Detaches all the stores from the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> DetachAllStoresFromSalesChannelAsync (string appId, int? channelId)
         {
@@ -1291,11 +1291,11 @@ public async System.Threading.Tasks.Task<Object> DetachAllStoresFromSalesChannel
         }
 
         /// <summary>
-        /// Detaches all the stores from the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DetachAllStoresFromSalesChannelAsyncWithHttpInfo (string appId, int? channelId)
         {
@@ -1306,7 +1306,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DetachAllStoresFro
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->DetachAllStoresFromSalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/stores";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1354,17 +1354,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DetachAllStoresFro
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Detaches the specified store from the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to detach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         public Object DetachStoreFromSalesChannel (string appId, int? channelId, int? storeId)
         {
@@ -1373,12 +1373,12 @@ public Object DetachStoreFromSalesChannel (string appId, int? channelId, int? st
         }
 
         /// <summary>
-        /// Detaches the specified store from the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to detach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > DetachStoreFromSalesChannelWithHttpInfo (string appId, int? channelId, int? storeId)
         {
@@ -1392,7 +1392,7 @@ public ApiResponse< Object > DetachStoreFromSalesChannelWithHttpInfo (string app
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling ChannelsApi->DetachStoreFromSalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/stores/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1441,17 +1441,17 @@ public ApiResponse< Object > DetachStoreFromSalesChannelWithHttpInfo (string app
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Detaches the specified store from the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to detach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> DetachStoreFromSalesChannelAsync (string appId, int? channelId, int? storeId)
         {
@@ -1461,12 +1461,12 @@ public async System.Threading.Tasks.Task<Object> DetachStoreFromSalesChannelAsyn
         }
 
         /// <summary>
-        /// Detaches the specified store from the given sales channel. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
-        /// <param name="storeId">Store Id (Phyisical Restaurant) to detach.</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DetachStoreFromSalesChannelAsyncWithHttpInfo (string appId, int? channelId, int? storeId)
         {
@@ -1480,7 +1480,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DetachStoreFromSal
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling ChannelsApi->DetachStoreFromSalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/stores/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1529,15 +1529,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DetachStoreFromSal
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Returns a list of sales channels that are assigned to a given AppId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultChannel</returns>
         public RestApiArrayResultChannel GetAssignedChannels (string appId)
         {
@@ -1546,10 +1546,10 @@ public RestApiArrayResultChannel GetAssignedChannels (string appId)
         }
 
         /// <summary>
-        /// Returns a list of sales channels that are assigned to a given AppId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultChannel</returns>
         public ApiResponse< RestApiArrayResultChannel > GetAssignedChannelsWithHttpInfo (string appId)
         {
@@ -1557,7 +1557,7 @@ public ApiResponse< RestApiArrayResultChannel > GetAssignedChannelsWithHttpInfo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsApi->GetAssignedChannels");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/assigned-channels";
+            var localVarPath = "./api/v1.0/{appId}/channels/assigned-channels";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1604,15 +1604,15 @@ public ApiResponse< RestApiArrayResultChannel > GetAssignedChannelsWithHttpInfo
             }
 
             return new ApiResponse<RestApiArrayResultChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultChannel)));
         }
 
         /// <summary>
-        /// Returns a list of sales channels that are assigned to a given AppId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultChannel</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultChannel> GetAssignedChannelsAsync (string appId)
         {
@@ -1622,10 +1622,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultChannel> GetAssignedC
         }
 
         /// <summary>
-        /// Returns a list of sales channels that are assigned to a given AppId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultChannel)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>> GetAssignedChannelsAsyncWithHttpInfo (string appId)
         {
@@ -1633,7 +1633,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsApi->GetAssignedChannels");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/assigned-channels";
+            var localVarPath = "./api/v1.0/{appId}/channels/assigned-channels";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1680,15 +1680,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>>
             }
 
             return new ApiResponse<RestApiArrayResultChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultChannel)));
         }
 
         /// <summary>
-        /// Returns a list of sales channels that are not yet assigned to a given AppId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultChannel</returns>
         public RestApiArrayResultChannel GetAvailableChannels (string appId)
         {
@@ -1697,10 +1697,10 @@ public RestApiArrayResultChannel GetAvailableChannels (string appId)
         }
 
         /// <summary>
-        /// Returns a list of sales channels that are not yet assigned to a given AppId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultChannel</returns>
         public ApiResponse< RestApiArrayResultChannel > GetAvailableChannelsWithHttpInfo (string appId)
         {
@@ -1708,7 +1708,7 @@ public ApiResponse< RestApiArrayResultChannel > GetAvailableChannelsWithHttpInfo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsApi->GetAvailableChannels");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/available-channels";
+            var localVarPath = "./api/v1.0/{appId}/channels/available-channels";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1755,15 +1755,15 @@ public ApiResponse< RestApiArrayResultChannel > GetAvailableChannelsWithHttpInfo
             }
 
             return new ApiResponse<RestApiArrayResultChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultChannel)));
         }
 
         /// <summary>
-        /// Returns a list of sales channels that are not yet assigned to a given AppId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultChannel</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultChannel> GetAvailableChannelsAsync (string appId)
         {
@@ -1773,10 +1773,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultChannel> GetAvailable
         }
 
         /// <summary>
-        /// Returns a list of sales channels that are not yet assigned to a given AppId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameIdxxx)</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultChannel)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>> GetAvailableChannelsAsyncWithHttpInfo (string appId)
         {
@@ -1784,7 +1784,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsApi->GetAvailableChannels");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/available-channels";
+            var localVarPath = "./api/v1.0/{appId}/channels/available-channels";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1831,16 +1831,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>>
             }
 
             return new ApiResponse<RestApiArrayResultChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultChannel)));
         }
 
         /// <summary>
-        /// Returns a Sales Channel by Id. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">ChannelId</param>
-        /// <param name="appId">AppId</param>
+        /// <param name="id"></param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultChannel</returns>
         public RestApiResultChannel GetChannel (int? id, string appId)
         {
@@ -1849,11 +1849,11 @@ public RestApiResultChannel GetChannel (int? id, string appId)
         }
 
         /// <summary>
-        /// Returns a Sales Channel by Id. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">ChannelId</param>
-        /// <param name="appId">AppId</param>
+        /// <param name="id"></param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultChannel</returns>
         public ApiResponse< RestApiResultChannel > GetChannelWithHttpInfo (int? id, string appId)
         {
@@ -1864,7 +1864,7 @@ public ApiResponse< RestApiResultChannel > GetChannelWithHttpInfo (int? id, stri
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsApi->GetChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{id}";
+            var localVarPath = "./api/v1.0/{appId}/channels/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1912,16 +1912,16 @@ public ApiResponse< RestApiResultChannel > GetChannelWithHttpInfo (int? id, stri
             }
 
             return new ApiResponse<RestApiResultChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultChannel)));
         }
 
         /// <summary>
-        /// Returns a Sales Channel by Id. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">ChannelId</param>
-        /// <param name="appId">AppId</param>
+        /// <param name="id"></param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiResultChannel</returns>
         public async System.Threading.Tasks.Task<RestApiResultChannel> GetChannelAsync (int? id, string appId)
         {
@@ -1931,11 +1931,11 @@ public async System.Threading.Tasks.Task<RestApiResultChannel> GetChannelAsync (
         }
 
         /// <summary>
-        /// Returns a Sales Channel by Id. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">ChannelId</param>
-        /// <param name="appId">AppId</param>
+        /// <param name="id"></param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultChannel)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultChannel>> GetChannelAsyncWithHttpInfo (int? id, string appId)
         {
@@ -1946,7 +1946,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultChannel>> GetC
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsApi->GetChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{id}";
+            var localVarPath = "./api/v1.0/{appId}/channels/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1994,12 +1994,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultChannel>> GetC
             }
 
             return new ApiResponse<RestApiResultChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultChannel)));
         }
 
         /// <summary>
-        /// Returns a list of enabled Channels 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2011,7 +2011,7 @@ public RestApiArrayResultChannel GetChannels (string appId)
         }
 
         /// <summary>
-        /// Returns a list of enabled Channels 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2022,7 +2022,7 @@ public ApiResponse< RestApiArrayResultChannel > GetChannelsWithHttpInfo (string
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsApi->GetChannels");
 
-            var localVarPath = "/api/v1.0/{appId}/channels";
+            var localVarPath = "./api/v1.0/{appId}/channels";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2069,12 +2069,12 @@ public ApiResponse< RestApiArrayResultChannel > GetChannelsWithHttpInfo (string
             }
 
             return new ApiResponse<RestApiArrayResultChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultChannel)));
         }
 
         /// <summary>
-        /// Returns a list of enabled Channels 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2087,7 +2087,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultChannel> GetChannelsA
         }
 
         /// <summary>
-        /// Returns a list of enabled Channels 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2098,7 +2098,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsApi->GetChannels");
 
-            var localVarPath = "/api/v1.0/{appId}/channels";
+            var localVarPath = "./api/v1.0/{appId}/channels";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2145,16 +2145,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultChannel>>
             }
 
             return new ApiResponse<RestApiArrayResultChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultChannel)));
         }
 
         /// <summary>
-        /// Returns a list of stores of an AppId that are assigned to a given Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>RestApiArrayResultStoreChannelAssignment</returns>
         public RestApiArrayResultStoreChannelAssignment GetStoresAssignedToChannel (string appId, int? channelId)
         {
@@ -2163,11 +2163,11 @@ public RestApiArrayResultStoreChannelAssignment GetStoresAssignedToChannel (stri
         }
 
         /// <summary>
-        /// Returns a list of stores of an AppId that are assigned to a given Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of RestApiArrayResultStoreChannelAssignment</returns>
         public ApiResponse< RestApiArrayResultStoreChannelAssignment > GetStoresAssignedToChannelWithHttpInfo (string appId, int? channelId)
         {
@@ -2178,7 +2178,7 @@ public ApiResponse< RestApiArrayResultStoreChannelAssignment > GetStoresAssigned
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->GetStoresAssignedToChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/assigned-stores";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/assigned-stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2226,16 +2226,16 @@ public ApiResponse< RestApiArrayResultStoreChannelAssignment > GetStoresAssigned
             }
 
             return new ApiResponse<RestApiArrayResultStoreChannelAssignment>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultStoreChannelAssignment) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreChannelAssignment)));
         }
 
         /// <summary>
-        /// Returns a list of stores of an AppId that are assigned to a given Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of RestApiArrayResultStoreChannelAssignment</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultStoreChannelAssignment> GetStoresAssignedToChannelAsync (string appId, int? channelId)
         {
@@ -2245,11 +2245,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultStoreChannelAssignmen
         }
 
         /// <summary>
-        /// Returns a list of stores of an AppId that are assigned to a given Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultStoreChannelAssignment)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreChannelAssignment>> GetStoresAssignedToChannelAsyncWithHttpInfo (string appId, int? channelId)
         {
@@ -2260,7 +2260,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreChan
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->GetStoresAssignedToChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/assigned-stores";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/assigned-stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2308,16 +2308,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreChan
             }
 
             return new ApiResponse<RestApiArrayResultStoreChannelAssignment>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultStoreChannelAssignment) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreChannelAssignment)));
         }
 
         /// <summary>
-        /// Returns a list of store ids attached to the given channel type for the specified app. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Response</returns>
         public Response GetStoresBySalesChannel (string appId, int? channelId)
         {
@@ -2326,11 +2326,11 @@ public Response GetStoresBySalesChannel (string appId, int? channelId)
         }
 
         /// <summary>
-        /// Returns a list of store ids attached to the given channel type for the specified app. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Response</returns>
         public ApiResponse< Response > GetStoresBySalesChannelWithHttpInfo (string appId, int? channelId)
         {
@@ -2341,7 +2341,7 @@ public ApiResponse< Response > GetStoresBySalesChannelWithHttpInfo (string appId
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->GetStoresBySalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/stores";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2389,16 +2389,16 @@ public ApiResponse< Response > GetStoresBySalesChannelWithHttpInfo (string appId
             }
 
             return new ApiResponse<Response>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Response) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Response)));
         }
 
         /// <summary>
-        /// Returns a list of store ids attached to the given channel type for the specified app. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Response</returns>
         public async System.Threading.Tasks.Task<Response> GetStoresBySalesChannelAsync (string appId, int? channelId)
         {
@@ -2408,11 +2408,11 @@ public async System.Threading.Tasks.Task<Response> GetStoresBySalesChannelAsync
         }
 
         /// <summary>
-        /// Returns a list of store ids attached to the given channel type for the specified app. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id (AppNameId)</param>
-        /// <param name="channelId">Type of sales channel (Android, IOS, Web, etc.)</param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Response)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Response>> GetStoresBySalesChannelAsyncWithHttpInfo (string appId, int? channelId)
         {
@@ -2423,7 +2423,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Response>> GetStoresBySales
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->GetStoresBySalesChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/{channelId}/stores";
+            var localVarPath = "./api/v1.0/{appId}/channels/{channelId}/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2471,17 +2471,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Response>> GetStoresBySales
             }
 
             return new ApiResponse<Response>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Response) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Response)));
         }
 
         /// <summary>
-        /// Unassign a Store from a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Object</returns>
         public Object UnassignStoreFromChannel (int? storeId, string appId, int? channelId)
         {
@@ -2490,12 +2490,12 @@ public Object UnassignStoreFromChannel (int? storeId, string appId, int? channel
         }
 
         /// <summary>
-        /// Unassign a Store from a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > UnassignStoreFromChannelWithHttpInfo (int? storeId, string appId, int? channelId)
         {
@@ -2509,7 +2509,7 @@ public ApiResponse< Object > UnassignStoreFromChannelWithHttpInfo (int? storeId,
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->UnassignStoreFromChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/unassign-store";
+            var localVarPath = "./api/v1.0/{appId}/channels/unassign-store";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2558,17 +2558,17 @@ public ApiResponse< Object > UnassignStoreFromChannelWithHttpInfo (int? storeId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Unassign a Store from a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> UnassignStoreFromChannelAsync (int? storeId, string appId, int? channelId)
         {
@@ -2578,12 +2578,12 @@ public async System.Threading.Tasks.Task<Object> UnassignStoreFromChannelAsync (
         }
 
         /// <summary>
-        /// Unassign a Store from a Sales Channel 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id (123, 456)</param>
-        /// <param name="appId">AppId (AppNameIdxxx)</param>
-        /// <param name="channelId">Channel Id (123, 456)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="channelId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UnassignStoreFromChannelAsyncWithHttpInfo (int? storeId, string appId, int? channelId)
         {
@@ -2597,7 +2597,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnassignStoreFromC
             if (channelId == null)
                 throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsApi->UnassignStoreFromChannel");
 
-            var localVarPath = "/api/v1.0/{appId}/channels/unassign-store";
+            var localVarPath = "./api/v1.0/{appId}/channels/unassign-store";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2646,7 +2646,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnassignStoreFromC
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
diff --git a/src/Flipdish/Api/ChannelsStoreMappingApi.cs b/src/Flipdish/Api/ChannelsStoreMappingApi.cs
deleted file mode 100644
index 83046035..00000000
--- a/src/Flipdish/Api/ChannelsStoreMappingApi.cs
+++ /dev/null
@@ -1,588 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IChannelsStoreMappingApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <returns>RestApiArrayResultStoreChannelStoreMapping</returns>
-        RestApiArrayResultStoreChannelStoreMapping ChannelsGetStoreChannelStoreMapping (string appId, int? channelId);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <returns>ApiResponse of RestApiArrayResultStoreChannelStoreMapping</returns>
-        ApiResponse<RestApiArrayResultStoreChannelStoreMapping> ChannelsGetStoreChannelStoreMappingWithHttpInfo (string appId, int? channelId);
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <param name="stores"></param>
-        /// <returns>RestApiArrayResultStoreChannelStoreMapping</returns>
-        RestApiArrayResultStoreChannelStoreMapping ChannelsSetStoreChannelStoreMapping (string appId, int? channelId, List<ChannelStoreMapping> stores);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <param name="stores"></param>
-        /// <returns>ApiResponse of RestApiArrayResultStoreChannelStoreMapping</returns>
-        ApiResponse<RestApiArrayResultStoreChannelStoreMapping> ChannelsSetStoreChannelStoreMappingWithHttpInfo (string appId, int? channelId, List<ChannelStoreMapping> stores);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <returns>Task of RestApiArrayResultStoreChannelStoreMapping</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultStoreChannelStoreMapping> ChannelsGetStoreChannelStoreMappingAsync (string appId, int? channelId);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultStoreChannelStoreMapping)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreChannelStoreMapping>> ChannelsGetStoreChannelStoreMappingAsyncWithHttpInfo (string appId, int? channelId);
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <param name="stores"></param>
-        /// <returns>Task of RestApiArrayResultStoreChannelStoreMapping</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultStoreChannelStoreMapping> ChannelsSetStoreChannelStoreMappingAsync (string appId, int? channelId, List<ChannelStoreMapping> stores);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <param name="stores"></param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultStoreChannelStoreMapping)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreChannelStoreMapping>> ChannelsSetStoreChannelStoreMappingAsyncWithHttpInfo (string appId, int? channelId, List<ChannelStoreMapping> stores);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class ChannelsStoreMappingApi : IChannelsStoreMappingApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChannelsStoreMappingApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public ChannelsStoreMappingApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChannelsStoreMappingApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public ChannelsStoreMappingApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <returns>RestApiArrayResultStoreChannelStoreMapping</returns>
-        public RestApiArrayResultStoreChannelStoreMapping ChannelsGetStoreChannelStoreMapping (string appId, int? channelId)
-        {
-             ApiResponse<RestApiArrayResultStoreChannelStoreMapping> localVarResponse = ChannelsGetStoreChannelStoreMappingWithHttpInfo(appId, channelId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <returns>ApiResponse of RestApiArrayResultStoreChannelStoreMapping</returns>
-        public ApiResponse< RestApiArrayResultStoreChannelStoreMapping > ChannelsGetStoreChannelStoreMappingWithHttpInfo (string appId, int? channelId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsStoreMappingApi->ChannelsGetStoreChannelStoreMapping");
-            // verify the required parameter 'channelId' is set
-            if (channelId == null)
-                throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsStoreMappingApi->ChannelsGetStoreChannelStoreMapping");
-
-            var localVarPath = "/api/v1.0/{appId}/channels/storemappings";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (channelId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "channelId", channelId)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ChannelsGetStoreChannelStoreMapping", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiArrayResultStoreChannelStoreMapping>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultStoreChannelStoreMapping) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreChannelStoreMapping)));
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <returns>Task of RestApiArrayResultStoreChannelStoreMapping</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultStoreChannelStoreMapping> ChannelsGetStoreChannelStoreMappingAsync (string appId, int? channelId)
-        {
-             ApiResponse<RestApiArrayResultStoreChannelStoreMapping> localVarResponse = await ChannelsGetStoreChannelStoreMappingAsyncWithHttpInfo(appId, channelId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultStoreChannelStoreMapping)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreChannelStoreMapping>> ChannelsGetStoreChannelStoreMappingAsyncWithHttpInfo (string appId, int? channelId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsStoreMappingApi->ChannelsGetStoreChannelStoreMapping");
-            // verify the required parameter 'channelId' is set
-            if (channelId == null)
-                throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsStoreMappingApi->ChannelsGetStoreChannelStoreMapping");
-
-            var localVarPath = "/api/v1.0/{appId}/channels/storemappings";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (channelId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "channelId", channelId)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ChannelsGetStoreChannelStoreMapping", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiArrayResultStoreChannelStoreMapping>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultStoreChannelStoreMapping) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreChannelStoreMapping)));
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <param name="stores"></param>
-        /// <returns>RestApiArrayResultStoreChannelStoreMapping</returns>
-        public RestApiArrayResultStoreChannelStoreMapping ChannelsSetStoreChannelStoreMapping (string appId, int? channelId, List<ChannelStoreMapping> stores)
-        {
-             ApiResponse<RestApiArrayResultStoreChannelStoreMapping> localVarResponse = ChannelsSetStoreChannelStoreMappingWithHttpInfo(appId, channelId, stores);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <param name="stores"></param>
-        /// <returns>ApiResponse of RestApiArrayResultStoreChannelStoreMapping</returns>
-        public ApiResponse< RestApiArrayResultStoreChannelStoreMapping > ChannelsSetStoreChannelStoreMappingWithHttpInfo (string appId, int? channelId, List<ChannelStoreMapping> stores)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsStoreMappingApi->ChannelsSetStoreChannelStoreMapping");
-            // verify the required parameter 'channelId' is set
-            if (channelId == null)
-                throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsStoreMappingApi->ChannelsSetStoreChannelStoreMapping");
-            // verify the required parameter 'stores' is set
-            if (stores == null)
-                throw new ApiException(400, "Missing required parameter 'stores' when calling ChannelsStoreMappingApi->ChannelsSetStoreChannelStoreMapping");
-
-            var localVarPath = "/api/v1.0/{appId}/channels/storemappings";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (channelId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "channelId", channelId)); // query parameter
-            if (stores != null && stores.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(stores); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = stores; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ChannelsSetStoreChannelStoreMapping", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiArrayResultStoreChannelStoreMapping>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultStoreChannelStoreMapping) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreChannelStoreMapping)));
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <param name="stores"></param>
-        /// <returns>Task of RestApiArrayResultStoreChannelStoreMapping</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultStoreChannelStoreMapping> ChannelsSetStoreChannelStoreMappingAsync (string appId, int? channelId, List<ChannelStoreMapping> stores)
-        {
-             ApiResponse<RestApiArrayResultStoreChannelStoreMapping> localVarResponse = await ChannelsSetStoreChannelStoreMappingAsyncWithHttpInfo(appId, channelId, stores);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="channelId"></param>
-        /// <param name="stores"></param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultStoreChannelStoreMapping)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreChannelStoreMapping>> ChannelsSetStoreChannelStoreMappingAsyncWithHttpInfo (string appId, int? channelId, List<ChannelStoreMapping> stores)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ChannelsStoreMappingApi->ChannelsSetStoreChannelStoreMapping");
-            // verify the required parameter 'channelId' is set
-            if (channelId == null)
-                throw new ApiException(400, "Missing required parameter 'channelId' when calling ChannelsStoreMappingApi->ChannelsSetStoreChannelStoreMapping");
-            // verify the required parameter 'stores' is set
-            if (stores == null)
-                throw new ApiException(400, "Missing required parameter 'stores' when calling ChannelsStoreMappingApi->ChannelsSetStoreChannelStoreMapping");
-
-            var localVarPath = "/api/v1.0/{appId}/channels/storemappings";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (channelId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "channelId", channelId)); // query parameter
-            if (stores != null && stores.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(stores); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = stores; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ChannelsSetStoreChannelStoreMapping", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiArrayResultStoreChannelStoreMapping>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultStoreChannelStoreMapping) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreChannelStoreMapping)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/ClientsApi.cs b/src/Flipdish/Api/ClientsApi.cs
new file mode 100644
index 00000000..811d5176
--- /dev/null
+++ b/src/Flipdish/Api/ClientsApi.cs
@@ -0,0 +1,783 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IClientsApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <returns></returns>
+        void GetClient (int? clientId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> GetClientWithHttpInfo (int? clientId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="salesForceContactId"></param>
+        /// <returns></returns>
+        void SetSalesForceContactId (int? clientId, string salesForceContactId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="salesForceContactId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SetSalesForceContactIdWithHttpInfo (int? clientId, string salesForceContactId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="stripeCustomerId"></param>
+        /// <returns></returns>
+        void SetStripeCustomerId (int? clientId, string stripeCustomerId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="stripeCustomerId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SetStripeCustomerIdWithHttpInfo (int? clientId, string stripeCustomerId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task GetClientAsync (int? clientId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> GetClientAsyncWithHttpInfo (int? clientId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="salesForceContactId"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SetSalesForceContactIdAsync (int? clientId, string salesForceContactId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="salesForceContactId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetSalesForceContactIdAsyncWithHttpInfo (int? clientId, string salesForceContactId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="stripeCustomerId"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SetStripeCustomerIdAsync (int? clientId, string stripeCustomerId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="stripeCustomerId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetStripeCustomerIdAsyncWithHttpInfo (int? clientId, string stripeCustomerId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class ClientsApi : IClientsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClientsApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public ClientsApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClientsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public ClientsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <returns></returns>
+        public void GetClient (int? clientId)
+        {
+             GetClientWithHttpInfo(clientId);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> GetClientWithHttpInfo (int? clientId)
+        {
+            // verify the required parameter 'clientId' is set
+            if (clientId == null)
+                throw new ApiException(400, "Missing required parameter 'clientId' when calling ClientsApi->GetClient");
+
+            var localVarPath = "./api/v1.0/clients/{clientId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (clientId != null) localVarPathParams.Add("clientId", this.Configuration.ApiClient.ParameterToString(clientId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetClient", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task GetClientAsync (int? clientId)
+        {
+             await GetClientAsyncWithHttpInfo(clientId);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> GetClientAsyncWithHttpInfo (int? clientId)
+        {
+            // verify the required parameter 'clientId' is set
+            if (clientId == null)
+                throw new ApiException(400, "Missing required parameter 'clientId' when calling ClientsApi->GetClient");
+
+            var localVarPath = "./api/v1.0/clients/{clientId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (clientId != null) localVarPathParams.Add("clientId", this.Configuration.ApiClient.ParameterToString(clientId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetClient", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="salesForceContactId"></param>
+        /// <returns></returns>
+        public void SetSalesForceContactId (int? clientId, string salesForceContactId)
+        {
+             SetSalesForceContactIdWithHttpInfo(clientId, salesForceContactId);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="salesForceContactId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetSalesForceContactIdWithHttpInfo (int? clientId, string salesForceContactId)
+        {
+            // verify the required parameter 'clientId' is set
+            if (clientId == null)
+                throw new ApiException(400, "Missing required parameter 'clientId' when calling ClientsApi->SetSalesForceContactId");
+            // verify the required parameter 'salesForceContactId' is set
+            if (salesForceContactId == null)
+                throw new ApiException(400, "Missing required parameter 'salesForceContactId' when calling ClientsApi->SetSalesForceContactId");
+
+            var localVarPath = "./api/v1.0/clients/{clientId}/salesforcecontactid";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (clientId != null) localVarPathParams.Add("clientId", this.Configuration.ApiClient.ParameterToString(clientId)); // path parameter
+            if (salesForceContactId != null && salesForceContactId.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(salesForceContactId); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = salesForceContactId; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetSalesForceContactId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="salesForceContactId"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetSalesForceContactIdAsync (int? clientId, string salesForceContactId)
+        {
+             await SetSalesForceContactIdAsyncWithHttpInfo(clientId, salesForceContactId);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="salesForceContactId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetSalesForceContactIdAsyncWithHttpInfo (int? clientId, string salesForceContactId)
+        {
+            // verify the required parameter 'clientId' is set
+            if (clientId == null)
+                throw new ApiException(400, "Missing required parameter 'clientId' when calling ClientsApi->SetSalesForceContactId");
+            // verify the required parameter 'salesForceContactId' is set
+            if (salesForceContactId == null)
+                throw new ApiException(400, "Missing required parameter 'salesForceContactId' when calling ClientsApi->SetSalesForceContactId");
+
+            var localVarPath = "./api/v1.0/clients/{clientId}/salesforcecontactid";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (clientId != null) localVarPathParams.Add("clientId", this.Configuration.ApiClient.ParameterToString(clientId)); // path parameter
+            if (salesForceContactId != null && salesForceContactId.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(salesForceContactId); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = salesForceContactId; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetSalesForceContactId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="stripeCustomerId"></param>
+        /// <returns></returns>
+        public void SetStripeCustomerId (int? clientId, string stripeCustomerId)
+        {
+             SetStripeCustomerIdWithHttpInfo(clientId, stripeCustomerId);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="stripeCustomerId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetStripeCustomerIdWithHttpInfo (int? clientId, string stripeCustomerId)
+        {
+            // verify the required parameter 'clientId' is set
+            if (clientId == null)
+                throw new ApiException(400, "Missing required parameter 'clientId' when calling ClientsApi->SetStripeCustomerId");
+            // verify the required parameter 'stripeCustomerId' is set
+            if (stripeCustomerId == null)
+                throw new ApiException(400, "Missing required parameter 'stripeCustomerId' when calling ClientsApi->SetStripeCustomerId");
+
+            var localVarPath = "./api/v1.0/clients/{clientId}/stripecustomerid";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (clientId != null) localVarPathParams.Add("clientId", this.Configuration.ApiClient.ParameterToString(clientId)); // path parameter
+            if (stripeCustomerId != null && stripeCustomerId.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(stripeCustomerId); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = stripeCustomerId; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetStripeCustomerId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="stripeCustomerId"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetStripeCustomerIdAsync (int? clientId, string stripeCustomerId)
+        {
+             await SetStripeCustomerIdAsyncWithHttpInfo(clientId, stripeCustomerId);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="clientId"></param>
+        /// <param name="stripeCustomerId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetStripeCustomerIdAsyncWithHttpInfo (int? clientId, string stripeCustomerId)
+        {
+            // verify the required parameter 'clientId' is set
+            if (clientId == null)
+                throw new ApiException(400, "Missing required parameter 'clientId' when calling ClientsApi->SetStripeCustomerId");
+            // verify the required parameter 'stripeCustomerId' is set
+            if (stripeCustomerId == null)
+                throw new ApiException(400, "Missing required parameter 'stripeCustomerId' when calling ClientsApi->SetStripeCustomerId");
+
+            var localVarPath = "./api/v1.0/clients/{clientId}/stripecustomerid";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (clientId != null) localVarPathParams.Add("clientId", this.Configuration.ApiClient.ParameterToString(clientId)); // path parameter
+            if (stripeCustomerId != null && stripeCustomerId.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(stripeCustomerId); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = stripeCustomerId; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetStripeCustomerId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/ContentSecurityPolicyApi.cs b/src/Flipdish/Api/ContentSecurityPolicyApi.cs
index 18b931f2..99ca6d47 100644
--- a/src/Flipdish/Api/ContentSecurityPolicyApi.cs
+++ b/src/Flipdish/Api/ContentSecurityPolicyApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -192,7 +192,7 @@ public ApiResponse< Object > ContentSecurityPolicyReportWithHttpInfo (CspReportR
             if (request == null)
                 throw new ApiException(400, "Missing required parameter 'request' when calling ContentSecurityPolicyApi->ContentSecurityPolicyReport");
 
-            var localVarPath = "/api/v1.0/csp/report";
+            var localVarPath = "./api/v1.0/csp/report";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -251,7 +251,7 @@ public ApiResponse< Object > ContentSecurityPolicyReportWithHttpInfo (CspReportR
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -280,7 +280,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ContentSecurityPol
             if (request == null)
                 throw new ApiException(400, "Missing required parameter 'request' when calling ContentSecurityPolicyApi->ContentSecurityPolicyReport");
 
-            var localVarPath = "/api/v1.0/csp/report";
+            var localVarPath = "./api/v1.0/csp/report";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -339,7 +339,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ContentSecurityPol
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
diff --git a/src/Flipdish/Api/CrossSellApi.cs b/src/Flipdish/Api/CrossSellApi.cs
new file mode 100644
index 00000000..3525d0b5
--- /dev/null
+++ b/src/Flipdish/Api/CrossSellApi.cs
@@ -0,0 +1,387 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface ICrossSellApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
+        /// <param name="menuItemId"></param>
+        /// <param name="limit"></param>
+        /// <param name="totalValue"></param>
+        /// <returns>RestApiResultCrossSellMenuItems</returns>
+        RestApiResultCrossSellMenuItems GetCrossSellMenuItems (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
+        /// <param name="menuItemId"></param>
+        /// <param name="limit"></param>
+        /// <param name="totalValue"></param>
+        /// <returns>ApiResponse of RestApiResultCrossSellMenuItems</returns>
+        ApiResponse<RestApiResultCrossSellMenuItems> GetCrossSellMenuItemsWithHttpInfo (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
+        /// <param name="menuItemId"></param>
+        /// <param name="limit"></param>
+        /// <param name="totalValue"></param>
+        /// <returns>Task of RestApiResultCrossSellMenuItems</returns>
+        System.Threading.Tasks.Task<RestApiResultCrossSellMenuItems> GetCrossSellMenuItemsAsync (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
+        /// <param name="menuItemId"></param>
+        /// <param name="limit"></param>
+        /// <param name="totalValue"></param>
+        /// <returns>Task of ApiResponse (RestApiResultCrossSellMenuItems)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultCrossSellMenuItems>> GetCrossSellMenuItemsAsyncWithHttpInfo (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class CrossSellApi : ICrossSellApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CrossSellApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public CrossSellApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CrossSellApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public CrossSellApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
+        /// <param name="menuItemId"></param>
+        /// <param name="limit"></param>
+        /// <param name="totalValue"></param>
+        /// <returns>RestApiResultCrossSellMenuItems</returns>
+        public RestApiResultCrossSellMenuItems GetCrossSellMenuItems (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue)
+        {
+             ApiResponse<RestApiResultCrossSellMenuItems> localVarResponse = GetCrossSellMenuItemsWithHttpInfo(appId, menuId, menuItemId, limit, totalValue);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
+        /// <param name="menuItemId"></param>
+        /// <param name="limit"></param>
+        /// <param name="totalValue"></param>
+        /// <returns>ApiResponse of RestApiResultCrossSellMenuItems</returns>
+        public ApiResponse< RestApiResultCrossSellMenuItems > GetCrossSellMenuItemsWithHttpInfo (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling CrossSellApi->GetCrossSellMenuItems");
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling CrossSellApi->GetCrossSellMenuItems");
+            // verify the required parameter 'menuItemId' is set
+            if (menuItemId == null)
+                throw new ApiException(400, "Missing required parameter 'menuItemId' when calling CrossSellApi->GetCrossSellMenuItems");
+            // verify the required parameter 'limit' is set
+            if (limit == null)
+                throw new ApiException(400, "Missing required parameter 'limit' when calling CrossSellApi->GetCrossSellMenuItems");
+            // verify the required parameter 'totalValue' is set
+            if (totalValue == null)
+                throw new ApiException(400, "Missing required parameter 'totalValue' when calling CrossSellApi->GetCrossSellMenuItems");
+
+            var localVarPath = "./api/v1.0/{appId}/crossSell/menuItems";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (menuItemId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "menuItemId", menuItemId)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (totalValue != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "totalValue", totalValue)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetCrossSellMenuItems", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultCrossSellMenuItems>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultCrossSellMenuItems) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCrossSellMenuItems)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
+        /// <param name="menuItemId"></param>
+        /// <param name="limit"></param>
+        /// <param name="totalValue"></param>
+        /// <returns>Task of RestApiResultCrossSellMenuItems</returns>
+        public async System.Threading.Tasks.Task<RestApiResultCrossSellMenuItems> GetCrossSellMenuItemsAsync (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue)
+        {
+             ApiResponse<RestApiResultCrossSellMenuItems> localVarResponse = await GetCrossSellMenuItemsAsyncWithHttpInfo(appId, menuId, menuItemId, limit, totalValue);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
+        /// <param name="menuItemId"></param>
+        /// <param name="limit"></param>
+        /// <param name="totalValue"></param>
+        /// <returns>Task of ApiResponse (RestApiResultCrossSellMenuItems)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCrossSellMenuItems>> GetCrossSellMenuItemsAsyncWithHttpInfo (string appId, int? menuId, List<int?> menuItemId, int? limit, double? totalValue)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling CrossSellApi->GetCrossSellMenuItems");
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling CrossSellApi->GetCrossSellMenuItems");
+            // verify the required parameter 'menuItemId' is set
+            if (menuItemId == null)
+                throw new ApiException(400, "Missing required parameter 'menuItemId' when calling CrossSellApi->GetCrossSellMenuItems");
+            // verify the required parameter 'limit' is set
+            if (limit == null)
+                throw new ApiException(400, "Missing required parameter 'limit' when calling CrossSellApi->GetCrossSellMenuItems");
+            // verify the required parameter 'totalValue' is set
+            if (totalValue == null)
+                throw new ApiException(400, "Missing required parameter 'totalValue' when calling CrossSellApi->GetCrossSellMenuItems");
+
+            var localVarPath = "./api/v1.0/{appId}/crossSell/menuItems";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (menuItemId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "menuItemId", menuItemId)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (totalValue != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "totalValue", totalValue)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetCrossSellMenuItems", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultCrossSellMenuItems>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultCrossSellMenuItems) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCrossSellMenuItems)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/CustomersApi.cs b/src/Flipdish/Api/CustomersApi.cs
index 17961adb..8dc9681d 100644
--- a/src/Flipdish/Api/CustomersApi.cs
+++ b/src/Flipdish/Api/CustomersApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,101 +25,193 @@ public interface ICustomersApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get customer of an app by Id
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerCreateModel"></param>
+        /// <returns>RestApiResultCustomer</returns>
+        RestApiResultCustomer CreateCustomer (string appId, CustomerCreateModel customerCreateModel);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerCreateModel"></param>
+        /// <returns>ApiResponse of RestApiResultCustomer</returns>
+        ApiResponse<RestApiResultCustomer> CreateCustomerWithHttpInfo (string appId, CustomerCreateModel customerCreateModel);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <returns>RestApiResultCustomer</returns>
         RestApiResultCustomer GetCustomerById (string appId, int? customerId);
 
         /// <summary>
-        /// Get customer of an app by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <returns>ApiResponse of RestApiResultCustomer</returns>
         ApiResponse<RestApiResultCustomer> GetCustomerByIdWithHttpInfo (string appId, int? customerId);
         /// <summary>
-        /// Update customer of an app by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
-        /// <param name="updateCustomer">Updated customer information</param>
+        /// <param name="appId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>RestApiResultCustomers</returns>
+        RestApiResultCustomers GetCustomers (string appId, string phoneNumber);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>ApiResponse of RestApiResultCustomers</returns>
+        ApiResponse<RestApiResultCustomers> GetCustomersWithHttpInfo (string appId, string phoneNumber);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="updateCustomer"></param>
         /// <returns>RestApiResultCustomer</returns>
         RestApiResultCustomer UpdateCustomerById (string appId, int? customerId, CustomerUpdateModel updateCustomer);
 
         /// <summary>
-        /// Update customer of an app by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
-        /// <param name="updateCustomer">Updated customer information</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="updateCustomer"></param>
         /// <returns>ApiResponse of RestApiResultCustomer</returns>
         ApiResponse<RestApiResultCustomer> UpdateCustomerByIdWithHttpInfo (string appId, int? customerId, CustomerUpdateModel updateCustomer);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get customer of an app by Id
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerCreateModel"></param>
+        /// <returns>Task of RestApiResultCustomer</returns>
+        System.Threading.Tasks.Task<RestApiResultCustomer> CreateCustomerAsync (string appId, CustomerCreateModel customerCreateModel);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerCreateModel"></param>
+        /// <returns>Task of ApiResponse (RestApiResultCustomer)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> CreateCustomerAsyncWithHttpInfo (string appId, CustomerCreateModel customerCreateModel);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <returns>Task of RestApiResultCustomer</returns>
         System.Threading.Tasks.Task<RestApiResultCustomer> GetCustomerByIdAsync (string appId, int? customerId);
 
         /// <summary>
-        /// Get customer of an app by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <returns>Task of ApiResponse (RestApiResultCustomer)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> GetCustomerByIdAsyncWithHttpInfo (string appId, int? customerId);
         /// <summary>
-        /// Update customer of an app by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
-        /// <param name="updateCustomer">Updated customer information</param>
+        /// <param name="appId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Task of RestApiResultCustomers</returns>
+        System.Threading.Tasks.Task<RestApiResultCustomers> GetCustomersAsync (string appId, string phoneNumber);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Task of ApiResponse (RestApiResultCustomers)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomers>> GetCustomersAsyncWithHttpInfo (string appId, string phoneNumber);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="updateCustomer"></param>
         /// <returns>Task of RestApiResultCustomer</returns>
         System.Threading.Tasks.Task<RestApiResultCustomer> UpdateCustomerByIdAsync (string appId, int? customerId, CustomerUpdateModel updateCustomer);
 
         /// <summary>
-        /// Update customer of an app by Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
-        /// <param name="updateCustomer">Updated customer information</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="updateCustomer"></param>
         /// <returns>Task of ApiResponse (RestApiResultCustomer)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> UpdateCustomerByIdAsyncWithHttpInfo (string appId, int? customerId, CustomerUpdateModel updateCustomer);
         #endregion Asynchronous Operations
@@ -223,11 +315,198 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get customer of an app by Id 
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerCreateModel"></param>
+        /// <returns>RestApiResultCustomer</returns>
+        public RestApiResultCustomer CreateCustomer (string appId, CustomerCreateModel customerCreateModel)
+        {
+             ApiResponse<RestApiResultCustomer> localVarResponse = CreateCustomerWithHttpInfo(appId, customerCreateModel);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerCreateModel"></param>
+        /// <returns>ApiResponse of RestApiResultCustomer</returns>
+        public ApiResponse< RestApiResultCustomer > CreateCustomerWithHttpInfo (string appId, CustomerCreateModel customerCreateModel)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling CustomersApi->CreateCustomer");
+            // verify the required parameter 'customerCreateModel' is set
+            if (customerCreateModel == null)
+                throw new ApiException(400, "Missing required parameter 'customerCreateModel' when calling CustomersApi->CreateCustomer");
+
+            var localVarPath = "./api/v1.0/{appId}/customers";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (customerCreateModel != null && customerCreateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(customerCreateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = customerCreateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateCustomer", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultCustomer>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultCustomer) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCustomer)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerCreateModel"></param>
+        /// <returns>Task of RestApiResultCustomer</returns>
+        public async System.Threading.Tasks.Task<RestApiResultCustomer> CreateCustomerAsync (string appId, CustomerCreateModel customerCreateModel)
+        {
+             ApiResponse<RestApiResultCustomer> localVarResponse = await CreateCustomerAsyncWithHttpInfo(appId, customerCreateModel);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerCreateModel"></param>
+        /// <returns>Task of ApiResponse (RestApiResultCustomer)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> CreateCustomerAsyncWithHttpInfo (string appId, CustomerCreateModel customerCreateModel)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling CustomersApi->CreateCustomer");
+            // verify the required parameter 'customerCreateModel' is set
+            if (customerCreateModel == null)
+                throw new ApiException(400, "Missing required parameter 'customerCreateModel' when calling CustomersApi->CreateCustomer");
+
+            var localVarPath = "./api/v1.0/{appId}/customers";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (customerCreateModel != null && customerCreateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(customerCreateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = customerCreateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateCustomer", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultCustomer>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultCustomer) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCustomer)));
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <returns>RestApiResultCustomer</returns>
         public RestApiResultCustomer GetCustomerById (string appId, int? customerId)
         {
@@ -236,11 +515,11 @@ public RestApiResultCustomer GetCustomerById (string appId, int? customerId)
         }
 
         /// <summary>
-        /// Get customer of an app by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <returns>ApiResponse of RestApiResultCustomer</returns>
         public ApiResponse< RestApiResultCustomer > GetCustomerByIdWithHttpInfo (string appId, int? customerId)
         {
@@ -251,7 +530,7 @@ public ApiResponse< RestApiResultCustomer > GetCustomerByIdWithHttpInfo (string
             if (customerId == null)
                 throw new ApiException(400, "Missing required parameter 'customerId' when calling CustomersApi->GetCustomerById");
 
-            var localVarPath = "/api/v1.0/{appId}/customers/{customerId}";
+            var localVarPath = "./api/v1.0/{appId}/customers/{customerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -299,16 +578,16 @@ public ApiResponse< RestApiResultCustomer > GetCustomerByIdWithHttpInfo (string
             }
 
             return new ApiResponse<RestApiResultCustomer>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCustomer) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCustomer)));
         }
 
         /// <summary>
-        /// Get customer of an app by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <returns>Task of RestApiResultCustomer</returns>
         public async System.Threading.Tasks.Task<RestApiResultCustomer> GetCustomerByIdAsync (string appId, int? customerId)
         {
@@ -318,11 +597,11 @@ public async System.Threading.Tasks.Task<RestApiResultCustomer> GetCustomerByIdA
         }
 
         /// <summary>
-        /// Get customer of an app by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <returns>Task of ApiResponse (RestApiResultCustomer)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> GetCustomerByIdAsyncWithHttpInfo (string appId, int? customerId)
         {
@@ -333,7 +612,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> Get
             if (customerId == null)
                 throw new ApiException(400, "Missing required parameter 'customerId' when calling CustomersApi->GetCustomerById");
 
-            var localVarPath = "/api/v1.0/{appId}/customers/{customerId}";
+            var localVarPath = "./api/v1.0/{appId}/customers/{customerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -381,17 +660,180 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> Get
             }
 
             return new ApiResponse<RestApiResultCustomer>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCustomer) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCustomer)));
         }
 
         /// <summary>
-        /// Update customer of an app by Id 
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>RestApiResultCustomers</returns>
+        public RestApiResultCustomers GetCustomers (string appId, string phoneNumber)
+        {
+             ApiResponse<RestApiResultCustomers> localVarResponse = GetCustomersWithHttpInfo(appId, phoneNumber);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>ApiResponse of RestApiResultCustomers</returns>
+        public ApiResponse< RestApiResultCustomers > GetCustomersWithHttpInfo (string appId, string phoneNumber)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling CustomersApi->GetCustomers");
+            // verify the required parameter 'phoneNumber' is set
+            if (phoneNumber == null)
+                throw new ApiException(400, "Missing required parameter 'phoneNumber' when calling CustomersApi->GetCustomers");
+
+            var localVarPath = "./api/v1.0/{appId}/customers";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (phoneNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "phoneNumber", phoneNumber)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetCustomers", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultCustomers>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultCustomers) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCustomers)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Task of RestApiResultCustomers</returns>
+        public async System.Threading.Tasks.Task<RestApiResultCustomers> GetCustomersAsync (string appId, string phoneNumber)
+        {
+             ApiResponse<RestApiResultCustomers> localVarResponse = await GetCustomersAsyncWithHttpInfo(appId, phoneNumber);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Task of ApiResponse (RestApiResultCustomers)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomers>> GetCustomersAsyncWithHttpInfo (string appId, string phoneNumber)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling CustomersApi->GetCustomers");
+            // verify the required parameter 'phoneNumber' is set
+            if (phoneNumber == null)
+                throw new ApiException(400, "Missing required parameter 'phoneNumber' when calling CustomersApi->GetCustomers");
+
+            var localVarPath = "./api/v1.0/{appId}/customers";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (phoneNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "phoneNumber", phoneNumber)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetCustomers", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultCustomers>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultCustomers) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCustomers)));
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
-        /// <param name="updateCustomer">Updated customer information</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="updateCustomer"></param>
         /// <returns>RestApiResultCustomer</returns>
         public RestApiResultCustomer UpdateCustomerById (string appId, int? customerId, CustomerUpdateModel updateCustomer)
         {
@@ -400,12 +842,12 @@ public RestApiResultCustomer UpdateCustomerById (string appId, int? customerId,
         }
 
         /// <summary>
-        /// Update customer of an app by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
-        /// <param name="updateCustomer">Updated customer information</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="updateCustomer"></param>
         /// <returns>ApiResponse of RestApiResultCustomer</returns>
         public ApiResponse< RestApiResultCustomer > UpdateCustomerByIdWithHttpInfo (string appId, int? customerId, CustomerUpdateModel updateCustomer)
         {
@@ -419,7 +861,7 @@ public ApiResponse< RestApiResultCustomer > UpdateCustomerByIdWithHttpInfo (stri
             if (updateCustomer == null)
                 throw new ApiException(400, "Missing required parameter 'updateCustomer' when calling CustomersApi->UpdateCustomerById");
 
-            var localVarPath = "/api/v1.0/{appId}/customers/{customerId}";
+            var localVarPath = "./api/v1.0/{appId}/customers/{customerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -480,17 +922,17 @@ public ApiResponse< RestApiResultCustomer > UpdateCustomerByIdWithHttpInfo (stri
             }
 
             return new ApiResponse<RestApiResultCustomer>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCustomer) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCustomer)));
         }
 
         /// <summary>
-        /// Update customer of an app by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
-        /// <param name="updateCustomer">Updated customer information</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="updateCustomer"></param>
         /// <returns>Task of RestApiResultCustomer</returns>
         public async System.Threading.Tasks.Task<RestApiResultCustomer> UpdateCustomerByIdAsync (string appId, int? customerId, CustomerUpdateModel updateCustomer)
         {
@@ -500,12 +942,12 @@ public async System.Threading.Tasks.Task<RestApiResultCustomer> UpdateCustomerBy
         }
 
         /// <summary>
-        /// Update customer of an app by Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="customerId">Customer Id</param>
-        /// <param name="updateCustomer">Updated customer information</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <param name="updateCustomer"></param>
         /// <returns>Task of ApiResponse (RestApiResultCustomer)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> UpdateCustomerByIdAsyncWithHttpInfo (string appId, int? customerId, CustomerUpdateModel updateCustomer)
         {
@@ -519,7 +961,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> Upd
             if (updateCustomer == null)
                 throw new ApiException(400, "Missing required parameter 'updateCustomer' when calling CustomersApi->UpdateCustomerById");
 
-            var localVarPath = "/api/v1.0/{appId}/customers/{customerId}";
+            var localVarPath = "./api/v1.0/{appId}/customers/{customerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -580,7 +1022,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCustomer>> Upd
             }
 
             return new ApiResponse<RestApiResultCustomer>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCustomer) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCustomer)));
         }
 
diff --git a/src/Flipdish/Api/DeliveryTrackingApi.cs b/src/Flipdish/Api/DeliveryTrackingApi.cs
deleted file mode 100644
index 6316a452..00000000
--- a/src/Flipdish/Api/DeliveryTrackingApi.cs
+++ /dev/null
@@ -1,1480 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IDeliveryTrackingApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// [PRIVATE] Assign driver to order
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns></returns>
-        void AssignDriverToOrder (string appId, int? orderId, int? driverId);
-
-        /// <summary>
-        /// [PRIVATE] Assign driver to order
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> AssignDriverToOrderWithHttpInfo (string appId, int? orderId, int? driverId);
-        /// <summary>
-        /// Assign driver to multiple orders
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <param name="orderIdAndSequenceNumbers">Array of object containing OrderId and Sequence</param>
-        /// <returns></returns>
-        void AssignDriverToOrders (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers);
-
-        /// <summary>
-        /// Assign driver to multiple orders
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <param name="orderIdAndSequenceNumbers">Array of object containing OrderId and Sequence</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> AssignDriverToOrdersWithHttpInfo (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers);
-        /// <summary>
-        /// [PRIVATE] Get drivers by App
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="name">Driver&#39;s username (optional)</param>
-        /// <param name="phoneNumber">Driver&#39;s phone number (optional)</param>
-        /// <param name="storeId">Store Id (optional)</param>
-        /// <param name="presence">Offline/Online (optional)</param>
-        /// <returns>RestApiArrayResultDriver</returns>
-        RestApiArrayResultDriver GetDrivers (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null);
-
-        /// <summary>
-        /// [PRIVATE] Get drivers by App
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="name">Driver&#39;s username (optional)</param>
-        /// <param name="phoneNumber">Driver&#39;s phone number (optional)</param>
-        /// <param name="storeId">Store Id (optional)</param>
-        /// <param name="presence">Offline/Online (optional)</param>
-        /// <returns>ApiResponse of RestApiArrayResultDriver</returns>
-        ApiResponse<RestApiArrayResultDriver> GetDriversWithHttpInfo (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null);
-        /// <summary>
-        /// [PRIVATE] Invite driver
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverInvitation">Driver invitation model</param>
-        /// <returns>RestApiResultDriver</returns>
-        RestApiResultDriver InviteDriverToApp (string appId, DriverInvitation driverInvitation);
-
-        /// <summary>
-        /// [PRIVATE] Invite driver
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverInvitation">Driver invitation model</param>
-        /// <returns>ApiResponse of RestApiResultDriver</returns>
-        ApiResponse<RestApiResultDriver> InviteDriverToAppWithHttpInfo (string appId, DriverInvitation driverInvitation);
-        /// <summary>
-        /// [PRIVATE] Unassign driver from app
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns></returns>
-        void RemoveDriverFromApp (string appId, int? driverId);
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from app
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> RemoveDriverFromAppWithHttpInfo (string appId, int? driverId);
-        /// <summary>
-        /// [PRIVATE] Unassign driver from order
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <returns></returns>
-        void UnassignDriverFromOrder (string appId, int? orderId);
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from order
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UnassignDriverFromOrderWithHttpInfo (string appId, int? orderId);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// [PRIVATE] Assign driver to order
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task AssignDriverToOrderAsync (string appId, int? orderId, int? driverId);
-
-        /// <summary>
-        /// [PRIVATE] Assign driver to order
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> AssignDriverToOrderAsyncWithHttpInfo (string appId, int? orderId, int? driverId);
-        /// <summary>
-        /// Assign driver to multiple orders
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <param name="orderIdAndSequenceNumbers">Array of object containing OrderId and Sequence</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task AssignDriverToOrdersAsync (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers);
-
-        /// <summary>
-        /// Assign driver to multiple orders
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <param name="orderIdAndSequenceNumbers">Array of object containing OrderId and Sequence</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> AssignDriverToOrdersAsyncWithHttpInfo (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers);
-        /// <summary>
-        /// [PRIVATE] Get drivers by App
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="name">Driver&#39;s username (optional)</param>
-        /// <param name="phoneNumber">Driver&#39;s phone number (optional)</param>
-        /// <param name="storeId">Store Id (optional)</param>
-        /// <param name="presence">Offline/Online (optional)</param>
-        /// <returns>Task of RestApiArrayResultDriver</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultDriver> GetDriversAsync (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null);
-
-        /// <summary>
-        /// [PRIVATE] Get drivers by App
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="name">Driver&#39;s username (optional)</param>
-        /// <param name="phoneNumber">Driver&#39;s phone number (optional)</param>
-        /// <param name="storeId">Store Id (optional)</param>
-        /// <param name="presence">Offline/Online (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultDriver)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDriver>> GetDriversAsyncWithHttpInfo (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null);
-        /// <summary>
-        /// [PRIVATE] Invite driver
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverInvitation">Driver invitation model</param>
-        /// <returns>Task of RestApiResultDriver</returns>
-        System.Threading.Tasks.Task<RestApiResultDriver> InviteDriverToAppAsync (string appId, DriverInvitation driverInvitation);
-
-        /// <summary>
-        /// [PRIVATE] Invite driver
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverInvitation">Driver invitation model</param>
-        /// <returns>Task of ApiResponse (RestApiResultDriver)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultDriver>> InviteDriverToAppAsyncWithHttpInfo (string appId, DriverInvitation driverInvitation);
-        /// <summary>
-        /// [PRIVATE] Unassign driver from app
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task RemoveDriverFromAppAsync (string appId, int? driverId);
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from app
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDriverFromAppAsyncWithHttpInfo (string appId, int? driverId);
-        /// <summary>
-        /// [PRIVATE] Unassign driver from order
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UnassignDriverFromOrderAsync (string appId, int? orderId);
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from order
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UnassignDriverFromOrderAsyncWithHttpInfo (string appId, int? orderId);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class DeliveryTrackingApi : IDeliveryTrackingApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeliveryTrackingApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public DeliveryTrackingApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeliveryTrackingApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public DeliveryTrackingApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Assign driver to order 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns></returns>
-        public void AssignDriverToOrder (string appId, int? orderId, int? driverId)
-        {
-             AssignDriverToOrderWithHttpInfo(appId, orderId, driverId);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Assign driver to order 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> AssignDriverToOrderWithHttpInfo (string appId, int? orderId, int? driverId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->AssignDriverToOrder");
-            // verify the required parameter 'orderId' is set
-            if (orderId == null)
-                throw new ApiException(400, "Missing required parameter 'orderId' when calling DeliveryTrackingApi->AssignDriverToOrder");
-            // verify the required parameter 'driverId' is set
-            if (driverId == null)
-                throw new ApiException(400, "Missing required parameter 'driverId' when calling DeliveryTrackingApi->AssignDriverToOrder");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers/{driverId}/orders/{orderId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-            if (driverId != null) localVarPathParams.Add("driverId", this.Configuration.ApiClient.ParameterToString(driverId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("AssignDriverToOrder", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Assign driver to order 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task AssignDriverToOrderAsync (string appId, int? orderId, int? driverId)
-        {
-             await AssignDriverToOrderAsyncWithHttpInfo(appId, orderId, driverId);
-
-        }
-
-        /// <summary>
-        /// [PRIVATE] Assign driver to order 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignDriverToOrderAsyncWithHttpInfo (string appId, int? orderId, int? driverId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->AssignDriverToOrder");
-            // verify the required parameter 'orderId' is set
-            if (orderId == null)
-                throw new ApiException(400, "Missing required parameter 'orderId' when calling DeliveryTrackingApi->AssignDriverToOrder");
-            // verify the required parameter 'driverId' is set
-            if (driverId == null)
-                throw new ApiException(400, "Missing required parameter 'driverId' when calling DeliveryTrackingApi->AssignDriverToOrder");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers/{driverId}/orders/{orderId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-            if (driverId != null) localVarPathParams.Add("driverId", this.Configuration.ApiClient.ParameterToString(driverId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("AssignDriverToOrder", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// Assign driver to multiple orders 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <param name="orderIdAndSequenceNumbers">Array of object containing OrderId and Sequence</param>
-        /// <returns></returns>
-        public void AssignDriverToOrders (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers)
-        {
-             AssignDriverToOrdersWithHttpInfo(appId, driverId, orderIdAndSequenceNumbers);
-        }
-
-        /// <summary>
-        /// Assign driver to multiple orders 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <param name="orderIdAndSequenceNumbers">Array of object containing OrderId and Sequence</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> AssignDriverToOrdersWithHttpInfo (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->AssignDriverToOrders");
-            // verify the required parameter 'driverId' is set
-            if (driverId == null)
-                throw new ApiException(400, "Missing required parameter 'driverId' when calling DeliveryTrackingApi->AssignDriverToOrders");
-            // verify the required parameter 'orderIdAndSequenceNumbers' is set
-            if (orderIdAndSequenceNumbers == null)
-                throw new ApiException(400, "Missing required parameter 'orderIdAndSequenceNumbers' when calling DeliveryTrackingApi->AssignDriverToOrders");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers/{driverId}/orders";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (driverId != null) localVarPathParams.Add("driverId", this.Configuration.ApiClient.ParameterToString(driverId)); // path parameter
-            if (orderIdAndSequenceNumbers != null && orderIdAndSequenceNumbers.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(orderIdAndSequenceNumbers); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = orderIdAndSequenceNumbers; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("AssignDriverToOrders", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// Assign driver to multiple orders 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <param name="orderIdAndSequenceNumbers">Array of object containing OrderId and Sequence</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task AssignDriverToOrdersAsync (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers)
-        {
-             await AssignDriverToOrdersAsyncWithHttpInfo(appId, driverId, orderIdAndSequenceNumbers);
-
-        }
-
-        /// <summary>
-        /// Assign driver to multiple orders 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <param name="orderIdAndSequenceNumbers">Array of object containing OrderId and Sequence</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignDriverToOrdersAsyncWithHttpInfo (string appId, int? driverId, List<OrderIdAndSequenceNumber> orderIdAndSequenceNumbers)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->AssignDriverToOrders");
-            // verify the required parameter 'driverId' is set
-            if (driverId == null)
-                throw new ApiException(400, "Missing required parameter 'driverId' when calling DeliveryTrackingApi->AssignDriverToOrders");
-            // verify the required parameter 'orderIdAndSequenceNumbers' is set
-            if (orderIdAndSequenceNumbers == null)
-                throw new ApiException(400, "Missing required parameter 'orderIdAndSequenceNumbers' when calling DeliveryTrackingApi->AssignDriverToOrders");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers/{driverId}/orders";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (driverId != null) localVarPathParams.Add("driverId", this.Configuration.ApiClient.ParameterToString(driverId)); // path parameter
-            if (orderIdAndSequenceNumbers != null && orderIdAndSequenceNumbers.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(orderIdAndSequenceNumbers); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = orderIdAndSequenceNumbers; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("AssignDriverToOrders", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Get drivers by App 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="name">Driver&#39;s username (optional)</param>
-        /// <param name="phoneNumber">Driver&#39;s phone number (optional)</param>
-        /// <param name="storeId">Store Id (optional)</param>
-        /// <param name="presence">Offline/Online (optional)</param>
-        /// <returns>RestApiArrayResultDriver</returns>
-        public RestApiArrayResultDriver GetDrivers (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null)
-        {
-             ApiResponse<RestApiArrayResultDriver> localVarResponse = GetDriversWithHttpInfo(appId, name, phoneNumber, storeId, presence);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// [PRIVATE] Get drivers by App 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="name">Driver&#39;s username (optional)</param>
-        /// <param name="phoneNumber">Driver&#39;s phone number (optional)</param>
-        /// <param name="storeId">Store Id (optional)</param>
-        /// <param name="presence">Offline/Online (optional)</param>
-        /// <returns>ApiResponse of RestApiArrayResultDriver</returns>
-        public ApiResponse< RestApiArrayResultDriver > GetDriversWithHttpInfo (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->GetDrivers");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (name != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "name", name)); // query parameter
-            if (phoneNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "phoneNumber", phoneNumber)); // query parameter
-            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
-            if (presence != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "presence", presence)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetDrivers", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiArrayResultDriver>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultDriver) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultDriver)));
-        }
-
-        /// <summary>
-        /// [PRIVATE] Get drivers by App 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="name">Driver&#39;s username (optional)</param>
-        /// <param name="phoneNumber">Driver&#39;s phone number (optional)</param>
-        /// <param name="storeId">Store Id (optional)</param>
-        /// <param name="presence">Offline/Online (optional)</param>
-        /// <returns>Task of RestApiArrayResultDriver</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultDriver> GetDriversAsync (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null)
-        {
-             ApiResponse<RestApiArrayResultDriver> localVarResponse = await GetDriversAsyncWithHttpInfo(appId, name, phoneNumber, storeId, presence);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// [PRIVATE] Get drivers by App 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="name">Driver&#39;s username (optional)</param>
-        /// <param name="phoneNumber">Driver&#39;s phone number (optional)</param>
-        /// <param name="storeId">Store Id (optional)</param>
-        /// <param name="presence">Offline/Online (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultDriver)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDriver>> GetDriversAsyncWithHttpInfo (string appId, string name = null, string phoneNumber = null, int? storeId = null, string presence = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->GetDrivers");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (name != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "name", name)); // query parameter
-            if (phoneNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "phoneNumber", phoneNumber)); // query parameter
-            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
-            if (presence != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "presence", presence)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetDrivers", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiArrayResultDriver>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultDriver) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultDriver)));
-        }
-
-        /// <summary>
-        /// [PRIVATE] Invite driver 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverInvitation">Driver invitation model</param>
-        /// <returns>RestApiResultDriver</returns>
-        public RestApiResultDriver InviteDriverToApp (string appId, DriverInvitation driverInvitation)
-        {
-             ApiResponse<RestApiResultDriver> localVarResponse = InviteDriverToAppWithHttpInfo(appId, driverInvitation);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// [PRIVATE] Invite driver 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverInvitation">Driver invitation model</param>
-        /// <returns>ApiResponse of RestApiResultDriver</returns>
-        public ApiResponse< RestApiResultDriver > InviteDriverToAppWithHttpInfo (string appId, DriverInvitation driverInvitation)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->InviteDriverToApp");
-            // verify the required parameter 'driverInvitation' is set
-            if (driverInvitation == null)
-                throw new ApiException(400, "Missing required parameter 'driverInvitation' when calling DeliveryTrackingApi->InviteDriverToApp");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (driverInvitation != null && driverInvitation.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(driverInvitation); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = driverInvitation; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("InviteDriverToApp", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultDriver>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultDriver) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDriver)));
-        }
-
-        /// <summary>
-        /// [PRIVATE] Invite driver 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverInvitation">Driver invitation model</param>
-        /// <returns>Task of RestApiResultDriver</returns>
-        public async System.Threading.Tasks.Task<RestApiResultDriver> InviteDriverToAppAsync (string appId, DriverInvitation driverInvitation)
-        {
-             ApiResponse<RestApiResultDriver> localVarResponse = await InviteDriverToAppAsyncWithHttpInfo(appId, driverInvitation);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// [PRIVATE] Invite driver 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverInvitation">Driver invitation model</param>
-        /// <returns>Task of ApiResponse (RestApiResultDriver)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDriver>> InviteDriverToAppAsyncWithHttpInfo (string appId, DriverInvitation driverInvitation)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->InviteDriverToApp");
-            // verify the required parameter 'driverInvitation' is set
-            if (driverInvitation == null)
-                throw new ApiException(400, "Missing required parameter 'driverInvitation' when calling DeliveryTrackingApi->InviteDriverToApp");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (driverInvitation != null && driverInvitation.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(driverInvitation); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = driverInvitation; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("InviteDriverToApp", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultDriver>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultDriver) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDriver)));
-        }
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from app 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns></returns>
-        public void RemoveDriverFromApp (string appId, int? driverId)
-        {
-             RemoveDriverFromAppWithHttpInfo(appId, driverId);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from app 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> RemoveDriverFromAppWithHttpInfo (string appId, int? driverId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->RemoveDriverFromApp");
-            // verify the required parameter 'driverId' is set
-            if (driverId == null)
-                throw new ApiException(400, "Missing required parameter 'driverId' when calling DeliveryTrackingApi->RemoveDriverFromApp");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers/{driverId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (driverId != null) localVarPathParams.Add("driverId", this.Configuration.ApiClient.ParameterToString(driverId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("RemoveDriverFromApp", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from app 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task RemoveDriverFromAppAsync (string appId, int? driverId)
-        {
-             await RemoveDriverFromAppAsyncWithHttpInfo(appId, driverId);
-
-        }
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from app 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="driverId">Driver Id</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDriverFromAppAsyncWithHttpInfo (string appId, int? driverId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->RemoveDriverFromApp");
-            // verify the required parameter 'driverId' is set
-            if (driverId == null)
-                throw new ApiException(400, "Missing required parameter 'driverId' when calling DeliveryTrackingApi->RemoveDriverFromApp");
-
-            var localVarPath = "/api/v1.0/{appId}/drivers/{driverId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (driverId != null) localVarPathParams.Add("driverId", this.Configuration.ApiClient.ParameterToString(driverId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("RemoveDriverFromApp", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from order 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <returns></returns>
-        public void UnassignDriverFromOrder (string appId, int? orderId)
-        {
-             UnassignDriverFromOrderWithHttpInfo(appId, orderId);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from order 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UnassignDriverFromOrderWithHttpInfo (string appId, int? orderId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->UnassignDriverFromOrder");
-            // verify the required parameter 'orderId' is set
-            if (orderId == null)
-                throw new ApiException(400, "Missing required parameter 'orderId' when calling DeliveryTrackingApi->UnassignDriverFromOrder");
-
-            var localVarPath = "/api/v1.0/{appId}/orders/{orderId}/driver";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("UnassignDriverFromOrder", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from order 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UnassignDriverFromOrderAsync (string appId, int? orderId)
-        {
-             await UnassignDriverFromOrderAsyncWithHttpInfo(appId, orderId);
-
-        }
-
-        /// <summary>
-        /// [PRIVATE] Unassign driver from order 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="orderId">Order Id</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UnassignDriverFromOrderAsyncWithHttpInfo (string appId, int? orderId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling DeliveryTrackingApi->UnassignDriverFromOrder");
-            // verify the required parameter 'orderId' is set
-            if (orderId == null)
-                throw new ApiException(400, "Missing required parameter 'orderId' when calling DeliveryTrackingApi->UnassignDriverFromOrder");
-
-            var localVarPath = "/api/v1.0/{appId}/orders/{orderId}/driver";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("UnassignDriverFromOrder", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/DeliveryZoneApi.cs b/src/Flipdish/Api/DeliveryZoneApi.cs
index 0817fad0..6f4f7002 100644
--- a/src/Flipdish/Api/DeliveryZoneApi.cs
+++ b/src/Flipdish/Api/DeliveryZoneApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,189 +25,189 @@ public interface IDeliveryZoneApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Adds a delivery zone to the store id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone will be added</param>
-        /// <param name="deliveryZoneBase">Optional delivery zone, if not supplied will create a default zone</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneBase"></param>
         /// <returns>RestApiResultDeliveryZone</returns>
         RestApiResultDeliveryZone AddDeliveryZone (int? storeId, DeliveryZoneBase deliveryZoneBase);
 
         /// <summary>
-        /// Adds a delivery zone to the store id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone will be added</param>
-        /// <param name="deliveryZoneBase">Optional delivery zone, if not supplied will create a default zone</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneBase"></param>
         /// <returns>ApiResponse of RestApiResultDeliveryZone</returns>
         ApiResponse<RestApiResultDeliveryZone> AddDeliveryZoneWithHttpInfo (int? storeId, DeliveryZoneBase deliveryZoneBase);
         /// <summary>
-        /// Get all the delivery zones associated with a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zones are associated</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultDeliveryZone</returns>
         RestApiArrayResultDeliveryZone GetDeliveryZones (int? storeId);
 
         /// <summary>
-        /// Get all the delivery zones associated with a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zones are associated</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultDeliveryZone</returns>
         ApiResponse<RestApiArrayResultDeliveryZone> GetDeliveryZonesWithHttpInfo (int? storeId);
         /// <summary>
-        /// Removes the existing delivery zone
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be removed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
         /// <returns></returns>
         void RemoveDeliveryZone (int? storeId, int? deliveryZoneId);
 
         /// <summary>
-        /// Removes the existing delivery zone
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be removed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RemoveDeliveryZoneWithHttpInfo (int? storeId, int? deliveryZoneId);
         /// <summary>
-        /// Updates the existing delivery zone
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be updated</param>
-        /// <param name="deliveryZone">Delta of delivery zone parameters that need to be changed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
+        /// <param name="deliveryZone"></param>
         /// <returns>RestApiResultDeliveryZone</returns>
         RestApiResultDeliveryZone UpdateDeliveryZone (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone);
 
         /// <summary>
-        /// Updates the existing delivery zone
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be updated</param>
-        /// <param name="deliveryZone">Delta of delivery zone parameters that need to be changed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
+        /// <param name="deliveryZone"></param>
         /// <returns>ApiResponse of RestApiResultDeliveryZone</returns>
         ApiResponse<RestApiResultDeliveryZone> UpdateDeliveryZoneWithHttpInfo (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Adds a delivery zone to the store id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone will be added</param>
-        /// <param name="deliveryZoneBase">Optional delivery zone, if not supplied will create a default zone</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneBase"></param>
         /// <returns>Task of RestApiResultDeliveryZone</returns>
         System.Threading.Tasks.Task<RestApiResultDeliveryZone> AddDeliveryZoneAsync (int? storeId, DeliveryZoneBase deliveryZoneBase);
 
         /// <summary>
-        /// Adds a delivery zone to the store id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone will be added</param>
-        /// <param name="deliveryZoneBase">Optional delivery zone, if not supplied will create a default zone</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneBase"></param>
         /// <returns>Task of ApiResponse (RestApiResultDeliveryZone)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultDeliveryZone>> AddDeliveryZoneAsyncWithHttpInfo (int? storeId, DeliveryZoneBase deliveryZoneBase);
         /// <summary>
-        /// Get all the delivery zones associated with a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zones are associated</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultDeliveryZone</returns>
         System.Threading.Tasks.Task<RestApiArrayResultDeliveryZone> GetDeliveryZonesAsync (int? storeId);
 
         /// <summary>
-        /// Get all the delivery zones associated with a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zones are associated</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultDeliveryZone)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDeliveryZone>> GetDeliveryZonesAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Removes the existing delivery zone
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be removed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task RemoveDeliveryZoneAsync (int? storeId, int? deliveryZoneId);
 
         /// <summary>
-        /// Removes the existing delivery zone
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be removed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDeliveryZoneAsyncWithHttpInfo (int? storeId, int? deliveryZoneId);
         /// <summary>
-        /// Updates the existing delivery zone
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be updated</param>
-        /// <param name="deliveryZone">Delta of delivery zone parameters that need to be changed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
+        /// <param name="deliveryZone"></param>
         /// <returns>Task of RestApiResultDeliveryZone</returns>
         System.Threading.Tasks.Task<RestApiResultDeliveryZone> UpdateDeliveryZoneAsync (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone);
 
         /// <summary>
-        /// Updates the existing delivery zone
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be updated</param>
-        /// <param name="deliveryZone">Delta of delivery zone parameters that need to be changed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
+        /// <param name="deliveryZone"></param>
         /// <returns>Task of ApiResponse (RestApiResultDeliveryZone)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultDeliveryZone>> UpdateDeliveryZoneAsyncWithHttpInfo (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone);
         #endregion Asynchronous Operations
@@ -311,11 +311,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Adds a delivery zone to the store id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone will be added</param>
-        /// <param name="deliveryZoneBase">Optional delivery zone, if not supplied will create a default zone</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneBase"></param>
         /// <returns>RestApiResultDeliveryZone</returns>
         public RestApiResultDeliveryZone AddDeliveryZone (int? storeId, DeliveryZoneBase deliveryZoneBase)
         {
@@ -324,11 +324,11 @@ public RestApiResultDeliveryZone AddDeliveryZone (int? storeId, DeliveryZoneBase
         }
 
         /// <summary>
-        /// Adds a delivery zone to the store id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone will be added</param>
-        /// <param name="deliveryZoneBase">Optional delivery zone, if not supplied will create a default zone</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneBase"></param>
         /// <returns>ApiResponse of RestApiResultDeliveryZone</returns>
         public ApiResponse< RestApiResultDeliveryZone > AddDeliveryZoneWithHttpInfo (int? storeId, DeliveryZoneBase deliveryZoneBase)
         {
@@ -339,7 +339,7 @@ public ApiResponse< RestApiResultDeliveryZone > AddDeliveryZoneWithHttpInfo (int
             if (deliveryZoneBase == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryZoneBase' when calling DeliveryZoneApi->AddDeliveryZone");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/deliveryzones";
+            var localVarPath = "./api/v1.0/stores/{storeId}/deliveryzones";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -399,16 +399,16 @@ public ApiResponse< RestApiResultDeliveryZone > AddDeliveryZoneWithHttpInfo (int
             }
 
             return new ApiResponse<RestApiResultDeliveryZone>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultDeliveryZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDeliveryZone)));
         }
 
         /// <summary>
-        /// Adds a delivery zone to the store id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone will be added</param>
-        /// <param name="deliveryZoneBase">Optional delivery zone, if not supplied will create a default zone</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneBase"></param>
         /// <returns>Task of RestApiResultDeliveryZone</returns>
         public async System.Threading.Tasks.Task<RestApiResultDeliveryZone> AddDeliveryZoneAsync (int? storeId, DeliveryZoneBase deliveryZoneBase)
         {
@@ -418,11 +418,11 @@ public async System.Threading.Tasks.Task<RestApiResultDeliveryZone> AddDeliveryZ
         }
 
         /// <summary>
-        /// Adds a delivery zone to the store id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone will be added</param>
-        /// <param name="deliveryZoneBase">Optional delivery zone, if not supplied will create a default zone</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneBase"></param>
         /// <returns>Task of ApiResponse (RestApiResultDeliveryZone)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDeliveryZone>> AddDeliveryZoneAsyncWithHttpInfo (int? storeId, DeliveryZoneBase deliveryZoneBase)
         {
@@ -433,7 +433,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDeliveryZone>>
             if (deliveryZoneBase == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryZoneBase' when calling DeliveryZoneApi->AddDeliveryZone");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/deliveryzones";
+            var localVarPath = "./api/v1.0/stores/{storeId}/deliveryzones";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -493,15 +493,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDeliveryZone>>
             }
 
             return new ApiResponse<RestApiResultDeliveryZone>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultDeliveryZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDeliveryZone)));
         }
 
         /// <summary>
-        /// Get all the delivery zones associated with a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zones are associated</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultDeliveryZone</returns>
         public RestApiArrayResultDeliveryZone GetDeliveryZones (int? storeId)
         {
@@ -510,10 +510,10 @@ public RestApiArrayResultDeliveryZone GetDeliveryZones (int? storeId)
         }
 
         /// <summary>
-        /// Get all the delivery zones associated with a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zones are associated</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultDeliveryZone</returns>
         public ApiResponse< RestApiArrayResultDeliveryZone > GetDeliveryZonesWithHttpInfo (int? storeId)
         {
@@ -521,7 +521,7 @@ public ApiResponse< RestApiArrayResultDeliveryZone > GetDeliveryZonesWithHttpInf
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling DeliveryZoneApi->GetDeliveryZones");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/deliveryzones";
+            var localVarPath = "./api/v1.0/stores/{storeId}/deliveryzones";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -568,15 +568,15 @@ public ApiResponse< RestApiArrayResultDeliveryZone > GetDeliveryZonesWithHttpInf
             }
 
             return new ApiResponse<RestApiArrayResultDeliveryZone>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultDeliveryZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultDeliveryZone)));
         }
 
         /// <summary>
-        /// Get all the delivery zones associated with a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zones are associated</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultDeliveryZone</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultDeliveryZone> GetDeliveryZonesAsync (int? storeId)
         {
@@ -586,10 +586,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultDeliveryZone> GetDeli
         }
 
         /// <summary>
-        /// Get all the delivery zones associated with a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zones are associated</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultDeliveryZone)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDeliveryZone>> GetDeliveryZonesAsyncWithHttpInfo (int? storeId)
         {
@@ -597,7 +597,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDeliveryZ
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling DeliveryZoneApi->GetDeliveryZones");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/deliveryzones";
+            var localVarPath = "./api/v1.0/stores/{storeId}/deliveryzones";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -644,16 +644,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDeliveryZ
             }
 
             return new ApiResponse<RestApiArrayResultDeliveryZone>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultDeliveryZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultDeliveryZone)));
         }
 
         /// <summary>
-        /// Removes the existing delivery zone 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be removed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
         /// <returns></returns>
         public void RemoveDeliveryZone (int? storeId, int? deliveryZoneId)
         {
@@ -661,11 +661,11 @@ public void RemoveDeliveryZone (int? storeId, int? deliveryZoneId)
         }
 
         /// <summary>
-        /// Removes the existing delivery zone 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be removed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> RemoveDeliveryZoneWithHttpInfo (int? storeId, int? deliveryZoneId)
         {
@@ -676,7 +676,7 @@ public ApiResponse<Object> RemoveDeliveryZoneWithHttpInfo (int? storeId, int? de
             if (deliveryZoneId == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryZoneId' when calling DeliveryZoneApi->RemoveDeliveryZone");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -724,16 +724,16 @@ public ApiResponse<Object> RemoveDeliveryZoneWithHttpInfo (int? storeId, int? de
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Removes the existing delivery zone 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be removed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task RemoveDeliveryZoneAsync (int? storeId, int? deliveryZoneId)
         {
@@ -742,11 +742,11 @@ public async System.Threading.Tasks.Task RemoveDeliveryZoneAsync (int? storeId,
         }
 
         /// <summary>
-        /// Removes the existing delivery zone 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be removed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDeliveryZoneAsyncWithHttpInfo (int? storeId, int? deliveryZoneId)
         {
@@ -757,7 +757,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDeliveryZone
             if (deliveryZoneId == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryZoneId' when calling DeliveryZoneApi->RemoveDeliveryZone");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -805,17 +805,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDeliveryZone
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Updates the existing delivery zone 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be updated</param>
-        /// <param name="deliveryZone">Delta of delivery zone parameters that need to be changed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
+        /// <param name="deliveryZone"></param>
         /// <returns>RestApiResultDeliveryZone</returns>
         public RestApiResultDeliveryZone UpdateDeliveryZone (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone)
         {
@@ -824,12 +824,12 @@ public RestApiResultDeliveryZone UpdateDeliveryZone (int? storeId, int? delivery
         }
 
         /// <summary>
-        /// Updates the existing delivery zone 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be updated</param>
-        /// <param name="deliveryZone">Delta of delivery zone parameters that need to be changed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
+        /// <param name="deliveryZone"></param>
         /// <returns>ApiResponse of RestApiResultDeliveryZone</returns>
         public ApiResponse< RestApiResultDeliveryZone > UpdateDeliveryZoneWithHttpInfo (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone)
         {
@@ -843,7 +843,7 @@ public ApiResponse< RestApiResultDeliveryZone > UpdateDeliveryZoneWithHttpInfo (
             if (deliveryZone == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryZone' when calling DeliveryZoneApi->UpdateDeliveryZone");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -904,17 +904,17 @@ public ApiResponse< RestApiResultDeliveryZone > UpdateDeliveryZoneWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultDeliveryZone>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultDeliveryZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDeliveryZone)));
         }
 
         /// <summary>
-        /// Updates the existing delivery zone 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be updated</param>
-        /// <param name="deliveryZone">Delta of delivery zone parameters that need to be changed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
+        /// <param name="deliveryZone"></param>
         /// <returns>Task of RestApiResultDeliveryZone</returns>
         public async System.Threading.Tasks.Task<RestApiResultDeliveryZone> UpdateDeliveryZoneAsync (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone)
         {
@@ -924,12 +924,12 @@ public async System.Threading.Tasks.Task<RestApiResultDeliveryZone> UpdateDelive
         }
 
         /// <summary>
-        /// Updates the existing delivery zone 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id to which the delivery zone belongs</param>
-        /// <param name="deliveryZoneId">Delivery zone id to be updated</param>
-        /// <param name="deliveryZone">Delta of delivery zone parameters that need to be changed</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryZoneId"></param>
+        /// <param name="deliveryZone"></param>
         /// <returns>Task of ApiResponse (RestApiResultDeliveryZone)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDeliveryZone>> UpdateDeliveryZoneAsyncWithHttpInfo (int? storeId, int? deliveryZoneId, DeliveryZoneBase deliveryZone)
         {
@@ -943,7 +943,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDeliveryZone>>
             if (deliveryZone == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryZone' when calling DeliveryZoneApi->UpdateDeliveryZone");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/deliveryzones/{deliveryZoneId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1004,7 +1004,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDeliveryZone>>
             }
 
             return new ApiResponse<RestApiResultDeliveryZone>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultDeliveryZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDeliveryZone)));
         }
 
diff --git a/src/Flipdish/Api/DeviceApi.cs b/src/Flipdish/Api/DeviceApi.cs
new file mode 100644
index 00000000..a1c9a021
--- /dev/null
+++ b/src/Flipdish/Api/DeviceApi.cs
@@ -0,0 +1,1034 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IDeviceApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="assignDeviceRequest"></param>
+        /// <returns>RestApiResultClientDeviceEnrollmentResult</returns>
+        RestApiResultClientDeviceEnrollmentResult AssignDevice (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="assignDeviceRequest"></param>
+        /// <returns>ApiResponse of RestApiResultClientDeviceEnrollmentResult</returns>
+        ApiResponse<RestApiResultClientDeviceEnrollmentResult> AssignDeviceWithHttpInfo (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceEnrollmentRequest"></param>
+        /// <returns>RestApiResultClientDeviceEnrollmentResult</returns>
+        RestApiResultClientDeviceEnrollmentResult EnrollDevice (string appId, ClientDeviceEnroll deviceEnrollmentRequest);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceEnrollmentRequest"></param>
+        /// <returns>ApiResponse of RestApiResultClientDeviceEnrollmentResult</returns>
+        ApiResponse<RestApiResultClientDeviceEnrollmentResult> EnrollDeviceWithHttpInfo (string appId, ClientDeviceEnroll deviceEnrollmentRequest);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceModel"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>RestApiResultClientDevice</returns>
+        RestApiResultClientDevice GetDeviceDetails (string appId, string deviceModel, string deviceId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceModel"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>ApiResponse of RestApiResultClientDevice</returns>
+        ApiResponse<RestApiResultClientDevice> GetDeviceDetailsWithHttpInfo (string appId, string deviceModel, string deviceId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="deviceModel"> (optional)</param>
+        /// <returns>RestApiArrayResultClientDeviceSummary</returns>
+        RestApiArrayResultClientDeviceSummary SearchDevices (string appId, int? storeId = null, string deviceModel = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="deviceModel"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultClientDeviceSummary</returns>
+        ApiResponse<RestApiArrayResultClientDeviceSummary> SearchDevicesWithHttpInfo (string appId, int? storeId = null, string deviceModel = null);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="assignDeviceRequest"></param>
+        /// <returns>Task of RestApiResultClientDeviceEnrollmentResult</returns>
+        System.Threading.Tasks.Task<RestApiResultClientDeviceEnrollmentResult> AssignDeviceAsync (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="assignDeviceRequest"></param>
+        /// <returns>Task of ApiResponse (RestApiResultClientDeviceEnrollmentResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultClientDeviceEnrollmentResult>> AssignDeviceAsyncWithHttpInfo (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceEnrollmentRequest"></param>
+        /// <returns>Task of RestApiResultClientDeviceEnrollmentResult</returns>
+        System.Threading.Tasks.Task<RestApiResultClientDeviceEnrollmentResult> EnrollDeviceAsync (string appId, ClientDeviceEnroll deviceEnrollmentRequest);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceEnrollmentRequest"></param>
+        /// <returns>Task of ApiResponse (RestApiResultClientDeviceEnrollmentResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultClientDeviceEnrollmentResult>> EnrollDeviceAsyncWithHttpInfo (string appId, ClientDeviceEnroll deviceEnrollmentRequest);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceModel"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of RestApiResultClientDevice</returns>
+        System.Threading.Tasks.Task<RestApiResultClientDevice> GetDeviceDetailsAsync (string appId, string deviceModel, string deviceId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceModel"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultClientDevice)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultClientDevice>> GetDeviceDetailsAsyncWithHttpInfo (string appId, string deviceModel, string deviceId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="deviceModel"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultClientDeviceSummary</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultClientDeviceSummary> SearchDevicesAsync (string appId, int? storeId = null, string deviceModel = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="deviceModel"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultClientDeviceSummary)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultClientDeviceSummary>> SearchDevicesAsyncWithHttpInfo (string appId, int? storeId = null, string deviceModel = null);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class DeviceApi : IDeviceApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public DeviceApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public DeviceApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="assignDeviceRequest"></param>
+        /// <returns>RestApiResultClientDeviceEnrollmentResult</returns>
+        public RestApiResultClientDeviceEnrollmentResult AssignDevice (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest)
+        {
+             ApiResponse<RestApiResultClientDeviceEnrollmentResult> localVarResponse = AssignDeviceWithHttpInfo(appId, assignDeviceRequest);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="assignDeviceRequest"></param>
+        /// <returns>ApiResponse of RestApiResultClientDeviceEnrollmentResult</returns>
+        public ApiResponse< RestApiResultClientDeviceEnrollmentResult > AssignDeviceWithHttpInfo (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling DeviceApi->AssignDevice");
+            // verify the required parameter 'assignDeviceRequest' is set
+            if (assignDeviceRequest == null)
+                throw new ApiException(400, "Missing required parameter 'assignDeviceRequest' when calling DeviceApi->AssignDevice");
+
+            var localVarPath = "./api/v1.0/{appId}/devices/assign";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (assignDeviceRequest != null && assignDeviceRequest.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(assignDeviceRequest); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = assignDeviceRequest; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AssignDevice", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultClientDeviceEnrollmentResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultClientDeviceEnrollmentResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultClientDeviceEnrollmentResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="assignDeviceRequest"></param>
+        /// <returns>Task of RestApiResultClientDeviceEnrollmentResult</returns>
+        public async System.Threading.Tasks.Task<RestApiResultClientDeviceEnrollmentResult> AssignDeviceAsync (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest)
+        {
+             ApiResponse<RestApiResultClientDeviceEnrollmentResult> localVarResponse = await AssignDeviceAsyncWithHttpInfo(appId, assignDeviceRequest);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="assignDeviceRequest"></param>
+        /// <returns>Task of ApiResponse (RestApiResultClientDeviceEnrollmentResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultClientDeviceEnrollmentResult>> AssignDeviceAsyncWithHttpInfo (string appId, ClientDeviceAssignEnrolledDevice assignDeviceRequest)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling DeviceApi->AssignDevice");
+            // verify the required parameter 'assignDeviceRequest' is set
+            if (assignDeviceRequest == null)
+                throw new ApiException(400, "Missing required parameter 'assignDeviceRequest' when calling DeviceApi->AssignDevice");
+
+            var localVarPath = "./api/v1.0/{appId}/devices/assign";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (assignDeviceRequest != null && assignDeviceRequest.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(assignDeviceRequest); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = assignDeviceRequest; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AssignDevice", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultClientDeviceEnrollmentResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultClientDeviceEnrollmentResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultClientDeviceEnrollmentResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceEnrollmentRequest"></param>
+        /// <returns>RestApiResultClientDeviceEnrollmentResult</returns>
+        public RestApiResultClientDeviceEnrollmentResult EnrollDevice (string appId, ClientDeviceEnroll deviceEnrollmentRequest)
+        {
+             ApiResponse<RestApiResultClientDeviceEnrollmentResult> localVarResponse = EnrollDeviceWithHttpInfo(appId, deviceEnrollmentRequest);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceEnrollmentRequest"></param>
+        /// <returns>ApiResponse of RestApiResultClientDeviceEnrollmentResult</returns>
+        public ApiResponse< RestApiResultClientDeviceEnrollmentResult > EnrollDeviceWithHttpInfo (string appId, ClientDeviceEnroll deviceEnrollmentRequest)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling DeviceApi->EnrollDevice");
+            // verify the required parameter 'deviceEnrollmentRequest' is set
+            if (deviceEnrollmentRequest == null)
+                throw new ApiException(400, "Missing required parameter 'deviceEnrollmentRequest' when calling DeviceApi->EnrollDevice");
+
+            var localVarPath = "./api/v1.0/{appId}/devices/enroll";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceEnrollmentRequest != null && deviceEnrollmentRequest.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(deviceEnrollmentRequest); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = deviceEnrollmentRequest; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("EnrollDevice", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultClientDeviceEnrollmentResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultClientDeviceEnrollmentResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultClientDeviceEnrollmentResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceEnrollmentRequest"></param>
+        /// <returns>Task of RestApiResultClientDeviceEnrollmentResult</returns>
+        public async System.Threading.Tasks.Task<RestApiResultClientDeviceEnrollmentResult> EnrollDeviceAsync (string appId, ClientDeviceEnroll deviceEnrollmentRequest)
+        {
+             ApiResponse<RestApiResultClientDeviceEnrollmentResult> localVarResponse = await EnrollDeviceAsyncWithHttpInfo(appId, deviceEnrollmentRequest);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceEnrollmentRequest"></param>
+        /// <returns>Task of ApiResponse (RestApiResultClientDeviceEnrollmentResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultClientDeviceEnrollmentResult>> EnrollDeviceAsyncWithHttpInfo (string appId, ClientDeviceEnroll deviceEnrollmentRequest)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling DeviceApi->EnrollDevice");
+            // verify the required parameter 'deviceEnrollmentRequest' is set
+            if (deviceEnrollmentRequest == null)
+                throw new ApiException(400, "Missing required parameter 'deviceEnrollmentRequest' when calling DeviceApi->EnrollDevice");
+
+            var localVarPath = "./api/v1.0/{appId}/devices/enroll";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceEnrollmentRequest != null && deviceEnrollmentRequest.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(deviceEnrollmentRequest); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = deviceEnrollmentRequest; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("EnrollDevice", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultClientDeviceEnrollmentResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultClientDeviceEnrollmentResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultClientDeviceEnrollmentResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceModel"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>RestApiResultClientDevice</returns>
+        public RestApiResultClientDevice GetDeviceDetails (string appId, string deviceModel, string deviceId)
+        {
+             ApiResponse<RestApiResultClientDevice> localVarResponse = GetDeviceDetailsWithHttpInfo(appId, deviceModel, deviceId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceModel"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>ApiResponse of RestApiResultClientDevice</returns>
+        public ApiResponse< RestApiResultClientDevice > GetDeviceDetailsWithHttpInfo (string appId, string deviceModel, string deviceId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling DeviceApi->GetDeviceDetails");
+            // verify the required parameter 'deviceModel' is set
+            if (deviceModel == null)
+                throw new ApiException(400, "Missing required parameter 'deviceModel' when calling DeviceApi->GetDeviceDetails");
+            // verify the required parameter 'deviceId' is set
+            if (deviceId == null)
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling DeviceApi->GetDeviceDetails");
+
+            var localVarPath = "./api/v1.0/{appId}/devices/device/{deviceModel}/{deviceId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceModel != null) localVarPathParams.Add("deviceModel", this.Configuration.ApiClient.ParameterToString(deviceModel)); // path parameter
+            if (deviceId != null) localVarPathParams.Add("deviceId", this.Configuration.ApiClient.ParameterToString(deviceId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetDeviceDetails", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultClientDevice>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultClientDevice) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultClientDevice)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceModel"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of RestApiResultClientDevice</returns>
+        public async System.Threading.Tasks.Task<RestApiResultClientDevice> GetDeviceDetailsAsync (string appId, string deviceModel, string deviceId)
+        {
+             ApiResponse<RestApiResultClientDevice> localVarResponse = await GetDeviceDetailsAsyncWithHttpInfo(appId, deviceModel, deviceId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceModel"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultClientDevice)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultClientDevice>> GetDeviceDetailsAsyncWithHttpInfo (string appId, string deviceModel, string deviceId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling DeviceApi->GetDeviceDetails");
+            // verify the required parameter 'deviceModel' is set
+            if (deviceModel == null)
+                throw new ApiException(400, "Missing required parameter 'deviceModel' when calling DeviceApi->GetDeviceDetails");
+            // verify the required parameter 'deviceId' is set
+            if (deviceId == null)
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling DeviceApi->GetDeviceDetails");
+
+            var localVarPath = "./api/v1.0/{appId}/devices/device/{deviceModel}/{deviceId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceModel != null) localVarPathParams.Add("deviceModel", this.Configuration.ApiClient.ParameterToString(deviceModel)); // path parameter
+            if (deviceId != null) localVarPathParams.Add("deviceId", this.Configuration.ApiClient.ParameterToString(deviceId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetDeviceDetails", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultClientDevice>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultClientDevice) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultClientDevice)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="deviceModel"> (optional)</param>
+        /// <returns>RestApiArrayResultClientDeviceSummary</returns>
+        public RestApiArrayResultClientDeviceSummary SearchDevices (string appId, int? storeId = null, string deviceModel = null)
+        {
+             ApiResponse<RestApiArrayResultClientDeviceSummary> localVarResponse = SearchDevicesWithHttpInfo(appId, storeId, deviceModel);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="deviceModel"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultClientDeviceSummary</returns>
+        public ApiResponse< RestApiArrayResultClientDeviceSummary > SearchDevicesWithHttpInfo (string appId, int? storeId = null, string deviceModel = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling DeviceApi->SearchDevices");
+
+            var localVarPath = "./api/v1.0/{appId}/devices/search";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (deviceModel != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "deviceModel", deviceModel)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SearchDevices", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultClientDeviceSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultClientDeviceSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultClientDeviceSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="deviceModel"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultClientDeviceSummary</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultClientDeviceSummary> SearchDevicesAsync (string appId, int? storeId = null, string deviceModel = null)
+        {
+             ApiResponse<RestApiArrayResultClientDeviceSummary> localVarResponse = await SearchDevicesAsyncWithHttpInfo(appId, storeId, deviceModel);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="deviceModel"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultClientDeviceSummary)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultClientDeviceSummary>> SearchDevicesAsyncWithHttpInfo (string appId, int? storeId = null, string deviceModel = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling DeviceApi->SearchDevices");
+
+            var localVarPath = "./api/v1.0/{appId}/devices/search";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (deviceModel != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "deviceModel", deviceModel)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SearchDevices", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultClientDeviceSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultClientDeviceSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultClientDeviceSummary)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/DriversApi.cs b/src/Flipdish/Api/DriversApi.cs
index 84f491d8..1416f5f1 100644
--- a/src/Flipdish/Api/DriversApi.cs
+++ b/src/Flipdish/Api/DriversApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,146 +25,146 @@ public interface IDriversApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Add driver token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="updateDriverToken"></param>
-        /// <returns></returns>
-        void AddDriverNotificationToken (UpdateDriverNotificationToken updateDriverToken);
+        /// <returns>Object</returns>
+        Object DriversAddDriverNotificationToken (UpdateDriverNotificationToken updateDriverToken);
 
         /// <summary>
-        /// Add driver token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="updateDriverToken"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> AddDriverNotificationTokenWithHttpInfo (UpdateDriverNotificationToken updateDriverToken);
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversAddDriverNotificationTokenWithHttpInfo (UpdateDriverNotificationToken updateDriverToken);
         /// <summary>
-        /// Delete driver profile image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns></returns>
-        void DeleteDriverProfileImage ();
+        /// <returns>Object</returns>
+        Object DriversDeleteDriverProfileImage ();
 
         /// <summary>
-        /// Delete driver profile image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> DeleteDriverProfileImageWithHttpInfo ();
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversDeleteDriverProfileImageWithHttpInfo ();
         /// <summary>
-        /// [PRIVATE] Login with phone number and pin
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverLoginModel">Driver request login code model</param>
-        /// <returns></returns>
-        void DriverLogin (DriverLoginModel driverLoginModel);
+        /// <param name="driverLoginModel"></param>
+        /// <returns>Object</returns>
+        Object DriversDriverLogin (DriverLoginModel driverLoginModel);
 
         /// <summary>
-        /// [PRIVATE] Login with phone number and pin
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverLoginModel">Driver request login code model</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> DriverLoginWithHttpInfo (DriverLoginModel driverLoginModel);
+        /// <param name="driverLoginModel"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversDriverLoginWithHttpInfo (DriverLoginModel driverLoginModel);
         /// <summary>
-        /// [PRIVATE] Request an SMS to be sent to the driver with their login code
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverRequestLoginPinModel">Driver request login code model</param>
-        /// <returns></returns>
-        void DriverRequestLoginCodeSms (DriverRequestLoginPinModel driverRequestLoginPinModel);
+        /// <param name="driverRequestLoginPinModel"></param>
+        /// <returns>Object</returns>
+        Object DriversDriverRequestLoginCodeSms (DriverRequestLoginPinModel driverRequestLoginPinModel);
 
         /// <summary>
-        /// [PRIVATE] Request an SMS to be sent to the driver with their login code
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverRequestLoginPinModel">Driver request login code model</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> DriverRequestLoginCodeSmsWithHttpInfo (DriverRequestLoginPinModel driverRequestLoginPinModel);
+        /// <param name="driverRequestLoginPinModel"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversDriverRequestLoginCodeSmsWithHttpInfo (DriverRequestLoginPinModel driverRequestLoginPinModel);
         /// <summary>
-        /// Get driver profile
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiResultDriver</returns>
-        RestApiResultDriver GetDriverProfile ();
+        /// <returns>Object</returns>
+        Object DriversGetDriverProfile ();
 
         /// <summary>
-        /// Get driver profile
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiResultDriver</returns>
-        ApiResponse<RestApiResultDriver> GetDriverProfileWithHttpInfo ();
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversGetDriverProfileWithHttpInfo ();
         /// <summary>
-        /// Get stores for driver
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiArrayResultDriverStore</returns>
-        RestApiArrayResultDriverStore GetStoresForDriver ();
+        /// <returns>Object</returns>
+        Object DriversGetStoresForDriver ();
 
         /// <summary>
-        /// Get stores for driver
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiArrayResultDriverStore</returns>
-        ApiResponse<RestApiArrayResultDriverStore> GetStoresForDriverWithHttpInfo ();
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversGetStoresForDriverWithHttpInfo ();
         /// <summary>
-        /// Delete driver token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="removeDriverToken"></param>
-        /// <returns></returns>
-        void RemoveDriverNotificationToken (UpdateDriverNotificationToken removeDriverToken);
+        /// <returns>Object</returns>
+        Object DriversRemoveDriverNotificationToken (UpdateDriverNotificationToken removeDriverToken);
 
         /// <summary>
-        /// Delete driver token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="removeDriverToken"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> RemoveDriverNotificationTokenWithHttpInfo (UpdateDriverNotificationToken removeDriverToken);
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversRemoveDriverNotificationTokenWithHttpInfo (UpdateDriverNotificationToken removeDriverToken);
         /// <summary>
         /// 
         /// </summary>
@@ -174,8 +174,8 @@ public interface IDriversApi : IApiAccessor
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
         /// <param name="presence"></param>
-        /// <returns></returns>
-        void SetDriverPresenceForStore (int? storeId, string presence);
+        /// <returns>Object</returns>
+        Object DriversSetDriverPresenceForStore (int? storeId, string presence);
 
         /// <summary>
         /// 
@@ -186,214 +186,214 @@ public interface IDriversApi : IApiAccessor
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
         /// <param name="presence"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> SetDriverPresenceForStoreWithHttpInfo (int? storeId, string presence);
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversSetDriverPresenceForStoreWithHttpInfo (int? storeId, string presence);
         /// <summary>
-        /// Set driver profile image and returns it&#39;s url
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiStringResult</returns>
-        RestApiStringResult SetDriverProfileImage ();
+        /// <returns>Object</returns>
+        Object DriversSetDriverProfileImage ();
 
         /// <summary>
-        /// Set driver profile image and returns it&#39;s url
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        ApiResponse<RestApiStringResult> SetDriverProfileImageWithHttpInfo ();
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversSetDriverProfileImageWithHttpInfo ();
         /// <summary>
-        /// Change delivery tracking status and return the updated status.
+        /// 
         /// </summary>
         /// <remarks>
-        /// ...
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <param name="deliveryTrackingStatus"></param>
-        /// <returns>RestApiStringResult</returns>
-        RestApiStringResult UpdateDeliveryTrackingStatus (int? orderId, string deliveryTrackingStatus);
+        /// <returns>Object</returns>
+        Object DriversUpdateDeliveryTrackingStatus (int? orderId, string deliveryTrackingStatus);
 
         /// <summary>
-        /// Change delivery tracking status and return the updated status.
+        /// 
         /// </summary>
         /// <remarks>
-        /// ...
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <param name="deliveryTrackingStatus"></param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        ApiResponse<RestApiStringResult> UpdateDeliveryTrackingStatusWithHttpInfo (int? orderId, string deliveryTrackingStatus);
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversUpdateDeliveryTrackingStatusWithHttpInfo (int? orderId, string deliveryTrackingStatus);
         /// <summary>
-        /// Update driver profile
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateDriverProfile">Update the driver profile (i.e Name)</param>
-        /// <returns></returns>
-        void UpdateDriverProfile (UpdateDriverProfileModel updateDriverProfile);
+        /// <param name="updateDriverProfile"></param>
+        /// <returns>Object</returns>
+        Object DriversUpdateDriverProfile (UpdateDriverProfileModel updateDriverProfile);
 
         /// <summary>
-        /// Update driver profile
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateDriverProfile">Update the driver profile (i.e Name)</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UpdateDriverProfileWithHttpInfo (UpdateDriverProfileModel updateDriverProfile);
+        /// <param name="updateDriverProfile"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DriversUpdateDriverProfileWithHttpInfo (UpdateDriverProfileModel updateDriverProfile);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Add driver token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="updateDriverToken"></param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task AddDriverNotificationTokenAsync (UpdateDriverNotificationToken updateDriverToken);
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversAddDriverNotificationTokenAsync (UpdateDriverNotificationToken updateDriverToken);
 
         /// <summary>
-        /// Add driver token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="updateDriverToken"></param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> AddDriverNotificationTokenAsyncWithHttpInfo (UpdateDriverNotificationToken updateDriverToken);
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversAddDriverNotificationTokenAsyncWithHttpInfo (UpdateDriverNotificationToken updateDriverToken);
         /// <summary>
-        /// Delete driver profile image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task DeleteDriverProfileImageAsync ();
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversDeleteDriverProfileImageAsync ();
 
         /// <summary>
-        /// Delete driver profile image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> DeleteDriverProfileImageAsyncWithHttpInfo ();
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversDeleteDriverProfileImageAsyncWithHttpInfo ();
         /// <summary>
-        /// [PRIVATE] Login with phone number and pin
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverLoginModel">Driver request login code model</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task DriverLoginAsync (DriverLoginModel driverLoginModel);
+        /// <param name="driverLoginModel"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversDriverLoginAsync (DriverLoginModel driverLoginModel);
 
         /// <summary>
-        /// [PRIVATE] Login with phone number and pin
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverLoginModel">Driver request login code model</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> DriverLoginAsyncWithHttpInfo (DriverLoginModel driverLoginModel);
+        /// <param name="driverLoginModel"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversDriverLoginAsyncWithHttpInfo (DriverLoginModel driverLoginModel);
         /// <summary>
-        /// [PRIVATE] Request an SMS to be sent to the driver with their login code
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverRequestLoginPinModel">Driver request login code model</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task DriverRequestLoginCodeSmsAsync (DriverRequestLoginPinModel driverRequestLoginPinModel);
+        /// <param name="driverRequestLoginPinModel"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversDriverRequestLoginCodeSmsAsync (DriverRequestLoginPinModel driverRequestLoginPinModel);
 
         /// <summary>
-        /// [PRIVATE] Request an SMS to be sent to the driver with their login code
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverRequestLoginPinModel">Driver request login code model</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> DriverRequestLoginCodeSmsAsyncWithHttpInfo (DriverRequestLoginPinModel driverRequestLoginPinModel);
+        /// <param name="driverRequestLoginPinModel"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversDriverRequestLoginCodeSmsAsyncWithHttpInfo (DriverRequestLoginPinModel driverRequestLoginPinModel);
         /// <summary>
-        /// Get driver profile
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiResultDriver</returns>
-        System.Threading.Tasks.Task<RestApiResultDriver> GetDriverProfileAsync ();
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversGetDriverProfileAsync ();
 
         /// <summary>
-        /// Get driver profile
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiResultDriver)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultDriver>> GetDriverProfileAsyncWithHttpInfo ();
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversGetDriverProfileAsyncWithHttpInfo ();
         /// <summary>
-        /// Get stores for driver
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiArrayResultDriverStore</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultDriverStore> GetStoresForDriverAsync ();
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversGetStoresForDriverAsync ();
 
         /// <summary>
-        /// Get stores for driver
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiArrayResultDriverStore)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDriverStore>> GetStoresForDriverAsyncWithHttpInfo ();
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversGetStoresForDriverAsyncWithHttpInfo ();
         /// <summary>
-        /// Delete driver token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="removeDriverToken"></param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task RemoveDriverNotificationTokenAsync (UpdateDriverNotificationToken removeDriverToken);
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversRemoveDriverNotificationTokenAsync (UpdateDriverNotificationToken removeDriverToken);
 
         /// <summary>
-        /// Delete driver token
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="removeDriverToken"></param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDriverNotificationTokenAsyncWithHttpInfo (UpdateDriverNotificationToken removeDriverToken);
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversRemoveDriverNotificationTokenAsyncWithHttpInfo (UpdateDriverNotificationToken removeDriverToken);
         /// <summary>
         /// 
         /// </summary>
@@ -403,8 +403,8 @@ public interface IDriversApi : IApiAccessor
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
         /// <param name="presence"></param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task SetDriverPresenceForStoreAsync (int? storeId, string presence);
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversSetDriverPresenceForStoreAsync (int? storeId, string presence);
 
         /// <summary>
         /// 
@@ -415,71 +415,71 @@ public interface IDriversApi : IApiAccessor
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
         /// <param name="presence"></param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> SetDriverPresenceForStoreAsyncWithHttpInfo (int? storeId, string presence);
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversSetDriverPresenceForStoreAsyncWithHttpInfo (int? storeId, string presence);
         /// <summary>
-        /// Set driver profile image and returns it&#39;s url
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiStringResult</returns>
-        System.Threading.Tasks.Task<RestApiStringResult> SetDriverProfileImageAsync ();
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversSetDriverProfileImageAsync ();
 
         /// <summary>
-        /// Set driver profile image and returns it&#39;s url
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetDriverProfileImageAsyncWithHttpInfo ();
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversSetDriverProfileImageAsyncWithHttpInfo ();
         /// <summary>
-        /// Change delivery tracking status and return the updated status.
+        /// 
         /// </summary>
         /// <remarks>
-        /// ...
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <param name="deliveryTrackingStatus"></param>
-        /// <returns>Task of RestApiStringResult</returns>
-        System.Threading.Tasks.Task<RestApiStringResult> UpdateDeliveryTrackingStatusAsync (int? orderId, string deliveryTrackingStatus);
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversUpdateDeliveryTrackingStatusAsync (int? orderId, string deliveryTrackingStatus);
 
         /// <summary>
-        /// Change delivery tracking status and return the updated status.
+        /// 
         /// </summary>
         /// <remarks>
-        /// ...
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <param name="deliveryTrackingStatus"></param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> UpdateDeliveryTrackingStatusAsyncWithHttpInfo (int? orderId, string deliveryTrackingStatus);
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversUpdateDeliveryTrackingStatusAsyncWithHttpInfo (int? orderId, string deliveryTrackingStatus);
         /// <summary>
-        /// Update driver profile
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateDriverProfile">Update the driver profile (i.e Name)</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task UpdateDriverProfileAsync (UpdateDriverProfileModel updateDriverProfile);
+        /// <param name="updateDriverProfile"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DriversUpdateDriverProfileAsync (UpdateDriverProfileModel updateDriverProfile);
 
         /// <summary>
-        /// Update driver profile
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateDriverProfile">Update the driver profile (i.e Name)</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateDriverProfileAsyncWithHttpInfo (UpdateDriverProfileModel updateDriverProfile);
+        /// <param name="updateDriverProfile"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DriversUpdateDriverProfileAsyncWithHttpInfo (UpdateDriverProfileModel updateDriverProfile);
         #endregion Asynchronous Operations
     }
 
@@ -581,29 +581,30 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Add driver token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="updateDriverToken"></param>
-        /// <returns></returns>
-        public void AddDriverNotificationToken (UpdateDriverNotificationToken updateDriverToken)
+        /// <returns>Object</returns>
+        public Object DriversAddDriverNotificationToken (UpdateDriverNotificationToken updateDriverToken)
         {
-             AddDriverNotificationTokenWithHttpInfo(updateDriverToken);
+             ApiResponse<Object> localVarResponse = DriversAddDriverNotificationTokenWithHttpInfo(updateDriverToken);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Add driver token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="updateDriverToken"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> AddDriverNotificationTokenWithHttpInfo (UpdateDriverNotificationToken updateDriverToken)
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversAddDriverNotificationTokenWithHttpInfo (UpdateDriverNotificationToken updateDriverToken)
         {
             // verify the required parameter 'updateDriverToken' is set
             if (updateDriverToken == null)
-                throw new ApiException(400, "Missing required parameter 'updateDriverToken' when calling DriversApi->AddDriverNotificationToken");
+                throw new ApiException(400, "Missing required parameter 'updateDriverToken' when calling DriversApi->DriversAddDriverNotificationToken");
 
-            var localVarPath = "/api/v1.0/drivers/token";
+            var localVarPath = "./api/v1.0/drivers/token";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -657,40 +658,41 @@ public ApiResponse<Object> AddDriverNotificationTokenWithHttpInfo (UpdateDriverN
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("AddDriverNotificationToken", localVarResponse);
+                Exception exception = ExceptionFactory("DriversAddDriverNotificationToken", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Add driver token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="updateDriverToken"></param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task AddDriverNotificationTokenAsync (UpdateDriverNotificationToken updateDriverToken)
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversAddDriverNotificationTokenAsync (UpdateDriverNotificationToken updateDriverToken)
         {
-             await AddDriverNotificationTokenAsyncWithHttpInfo(updateDriverToken);
+             ApiResponse<Object> localVarResponse = await DriversAddDriverNotificationTokenAsyncWithHttpInfo(updateDriverToken);
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Add driver token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="updateDriverToken"></param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> AddDriverNotificationTokenAsyncWithHttpInfo (UpdateDriverNotificationToken updateDriverToken)
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversAddDriverNotificationTokenAsyncWithHttpInfo (UpdateDriverNotificationToken updateDriverToken)
         {
             // verify the required parameter 'updateDriverToken' is set
             if (updateDriverToken == null)
-                throw new ApiException(400, "Missing required parameter 'updateDriverToken' when calling DriversApi->AddDriverNotificationToken");
+                throw new ApiException(400, "Missing required parameter 'updateDriverToken' when calling DriversApi->DriversAddDriverNotificationToken");
 
-            var localVarPath = "/api/v1.0/drivers/token";
+            var localVarPath = "./api/v1.0/drivers/token";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -744,34 +746,35 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AddDriverNotificat
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("AddDriverNotificationToken", localVarResponse);
+                Exception exception = ExceptionFactory("DriversAddDriverNotificationToken", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Delete driver profile image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns></returns>
-        public void DeleteDriverProfileImage ()
+        /// <returns>Object</returns>
+        public Object DriversDeleteDriverProfileImage ()
         {
-             DeleteDriverProfileImageWithHttpInfo();
+             ApiResponse<Object> localVarResponse = DriversDeleteDriverProfileImageWithHttpInfo();
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Delete driver profile image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> DeleteDriverProfileImageWithHttpInfo ()
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversDeleteDriverProfileImageWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/drivers/profile/image";
+            var localVarPath = "./api/v1.0/drivers/profile/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -812,35 +815,36 @@ public ApiResponse<Object> DeleteDriverProfileImageWithHttpInfo ()
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DeleteDriverProfileImage", localVarResponse);
+                Exception exception = ExceptionFactory("DriversDeleteDriverProfileImage", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Delete driver profile image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task DeleteDriverProfileImageAsync ()
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversDeleteDriverProfileImageAsync ()
         {
-             await DeleteDriverProfileImageAsyncWithHttpInfo();
+             ApiResponse<Object> localVarResponse = await DriversDeleteDriverProfileImageAsyncWithHttpInfo();
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Delete driver profile image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteDriverProfileImageAsyncWithHttpInfo ()
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversDeleteDriverProfileImageAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/drivers/profile/image";
+            var localVarPath = "./api/v1.0/drivers/profile/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -881,39 +885,40 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteDriverProfil
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DeleteDriverProfileImage", localVarResponse);
+                Exception exception = ExceptionFactory("DriversDeleteDriverProfileImage", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [PRIVATE] Login with phone number and pin 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverLoginModel">Driver request login code model</param>
-        /// <returns></returns>
-        public void DriverLogin (DriverLoginModel driverLoginModel)
+        /// <param name="driverLoginModel"></param>
+        /// <returns>Object</returns>
+        public Object DriversDriverLogin (DriverLoginModel driverLoginModel)
         {
-             DriverLoginWithHttpInfo(driverLoginModel);
+             ApiResponse<Object> localVarResponse = DriversDriverLoginWithHttpInfo(driverLoginModel);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE] Login with phone number and pin 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverLoginModel">Driver request login code model</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> DriverLoginWithHttpInfo (DriverLoginModel driverLoginModel)
+        /// <param name="driverLoginModel"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversDriverLoginWithHttpInfo (DriverLoginModel driverLoginModel)
         {
             // verify the required parameter 'driverLoginModel' is set
             if (driverLoginModel == null)
-                throw new ApiException(400, "Missing required parameter 'driverLoginModel' when calling DriversApi->DriverLogin");
+                throw new ApiException(400, "Missing required parameter 'driverLoginModel' when calling DriversApi->DriversDriverLogin");
 
-            var localVarPath = "/api/v1.0/drivers/login";
+            var localVarPath = "./api/v1.0/drivers/login";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -967,40 +972,41 @@ public ApiResponse<Object> DriverLoginWithHttpInfo (DriverLoginModel driverLogin
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DriverLogin", localVarResponse);
+                Exception exception = ExceptionFactory("DriversDriverLogin", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [PRIVATE] Login with phone number and pin 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverLoginModel">Driver request login code model</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task DriverLoginAsync (DriverLoginModel driverLoginModel)
+        /// <param name="driverLoginModel"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversDriverLoginAsync (DriverLoginModel driverLoginModel)
         {
-             await DriverLoginAsyncWithHttpInfo(driverLoginModel);
+             ApiResponse<Object> localVarResponse = await DriversDriverLoginAsyncWithHttpInfo(driverLoginModel);
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE] Login with phone number and pin 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverLoginModel">Driver request login code model</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriverLoginAsyncWithHttpInfo (DriverLoginModel driverLoginModel)
+        /// <param name="driverLoginModel"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversDriverLoginAsyncWithHttpInfo (DriverLoginModel driverLoginModel)
         {
             // verify the required parameter 'driverLoginModel' is set
             if (driverLoginModel == null)
-                throw new ApiException(400, "Missing required parameter 'driverLoginModel' when calling DriversApi->DriverLogin");
+                throw new ApiException(400, "Missing required parameter 'driverLoginModel' when calling DriversApi->DriversDriverLogin");
 
-            var localVarPath = "/api/v1.0/drivers/login";
+            var localVarPath = "./api/v1.0/drivers/login";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1054,39 +1060,40 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DriverLoginAsyncWi
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DriverLogin", localVarResponse);
+                Exception exception = ExceptionFactory("DriversDriverLogin", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [PRIVATE] Request an SMS to be sent to the driver with their login code 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverRequestLoginPinModel">Driver request login code model</param>
-        /// <returns></returns>
-        public void DriverRequestLoginCodeSms (DriverRequestLoginPinModel driverRequestLoginPinModel)
+        /// <param name="driverRequestLoginPinModel"></param>
+        /// <returns>Object</returns>
+        public Object DriversDriverRequestLoginCodeSms (DriverRequestLoginPinModel driverRequestLoginPinModel)
         {
-             DriverRequestLoginCodeSmsWithHttpInfo(driverRequestLoginPinModel);
+             ApiResponse<Object> localVarResponse = DriversDriverRequestLoginCodeSmsWithHttpInfo(driverRequestLoginPinModel);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE] Request an SMS to be sent to the driver with their login code 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverRequestLoginPinModel">Driver request login code model</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> DriverRequestLoginCodeSmsWithHttpInfo (DriverRequestLoginPinModel driverRequestLoginPinModel)
+        /// <param name="driverRequestLoginPinModel"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversDriverRequestLoginCodeSmsWithHttpInfo (DriverRequestLoginPinModel driverRequestLoginPinModel)
         {
             // verify the required parameter 'driverRequestLoginPinModel' is set
             if (driverRequestLoginPinModel == null)
-                throw new ApiException(400, "Missing required parameter 'driverRequestLoginPinModel' when calling DriversApi->DriverRequestLoginCodeSms");
+                throw new ApiException(400, "Missing required parameter 'driverRequestLoginPinModel' when calling DriversApi->DriversDriverRequestLoginCodeSms");
 
-            var localVarPath = "/api/v1.0/drivers/pin";
+            var localVarPath = "./api/v1.0/drivers/pin";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1140,40 +1147,41 @@ public ApiResponse<Object> DriverRequestLoginCodeSmsWithHttpInfo (DriverRequestL
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DriverRequestLoginCodeSms", localVarResponse);
+                Exception exception = ExceptionFactory("DriversDriverRequestLoginCodeSms", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [PRIVATE] Request an SMS to be sent to the driver with their login code 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverRequestLoginPinModel">Driver request login code model</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task DriverRequestLoginCodeSmsAsync (DriverRequestLoginPinModel driverRequestLoginPinModel)
+        /// <param name="driverRequestLoginPinModel"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversDriverRequestLoginCodeSmsAsync (DriverRequestLoginPinModel driverRequestLoginPinModel)
         {
-             await DriverRequestLoginCodeSmsAsyncWithHttpInfo(driverRequestLoginPinModel);
+             ApiResponse<Object> localVarResponse = await DriversDriverRequestLoginCodeSmsAsyncWithHttpInfo(driverRequestLoginPinModel);
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE] Request an SMS to be sent to the driver with their login code 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="driverRequestLoginPinModel">Driver request login code model</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriverRequestLoginCodeSmsAsyncWithHttpInfo (DriverRequestLoginPinModel driverRequestLoginPinModel)
+        /// <param name="driverRequestLoginPinModel"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversDriverRequestLoginCodeSmsAsyncWithHttpInfo (DriverRequestLoginPinModel driverRequestLoginPinModel)
         {
             // verify the required parameter 'driverRequestLoginPinModel' is set
             if (driverRequestLoginPinModel == null)
-                throw new ApiException(400, "Missing required parameter 'driverRequestLoginPinModel' when calling DriversApi->DriverRequestLoginCodeSms");
+                throw new ApiException(400, "Missing required parameter 'driverRequestLoginPinModel' when calling DriversApi->DriversDriverRequestLoginCodeSms");
 
-            var localVarPath = "/api/v1.0/drivers/pin";
+            var localVarPath = "./api/v1.0/drivers/pin";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1227,35 +1235,35 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DriverRequestLogin
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DriverRequestLoginCodeSms", localVarResponse);
+                Exception exception = ExceptionFactory("DriversDriverRequestLoginCodeSms", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Get driver profile 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiResultDriver</returns>
-        public RestApiResultDriver GetDriverProfile ()
+        /// <returns>Object</returns>
+        public Object DriversGetDriverProfile ()
         {
-             ApiResponse<RestApiResultDriver> localVarResponse = GetDriverProfileWithHttpInfo();
+             ApiResponse<Object> localVarResponse = DriversGetDriverProfileWithHttpInfo();
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get driver profile 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiResultDriver</returns>
-        public ApiResponse< RestApiResultDriver > GetDriverProfileWithHttpInfo ()
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversGetDriverProfileWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/drivers/profile";
+            var localVarPath = "./api/v1.0/drivers/profile";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1296,36 +1304,36 @@ public ApiResponse< RestApiResultDriver > GetDriverProfileWithHttpInfo ()
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetDriverProfile", localVarResponse);
+                Exception exception = ExceptionFactory("DriversGetDriverProfile", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultDriver>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultDriver) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDriver)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Get driver profile 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiResultDriver</returns>
-        public async System.Threading.Tasks.Task<RestApiResultDriver> GetDriverProfileAsync ()
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversGetDriverProfileAsync ()
         {
-             ApiResponse<RestApiResultDriver> localVarResponse = await GetDriverProfileAsyncWithHttpInfo();
+             ApiResponse<Object> localVarResponse = await DriversGetDriverProfileAsyncWithHttpInfo();
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get driver profile 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiResultDriver)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDriver>> GetDriverProfileAsyncWithHttpInfo ()
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversGetDriverProfileAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/drivers/profile";
+            var localVarPath = "./api/v1.0/drivers/profile";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1366,35 +1374,35 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultDriver>> GetDr
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetDriverProfile", localVarResponse);
+                Exception exception = ExceptionFactory("DriversGetDriverProfile", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultDriver>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultDriver) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultDriver)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Get stores for driver 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiArrayResultDriverStore</returns>
-        public RestApiArrayResultDriverStore GetStoresForDriver ()
+        /// <returns>Object</returns>
+        public Object DriversGetStoresForDriver ()
         {
-             ApiResponse<RestApiArrayResultDriverStore> localVarResponse = GetStoresForDriverWithHttpInfo();
+             ApiResponse<Object> localVarResponse = DriversGetStoresForDriverWithHttpInfo();
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get stores for driver 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiArrayResultDriverStore</returns>
-        public ApiResponse< RestApiArrayResultDriverStore > GetStoresForDriverWithHttpInfo ()
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversGetStoresForDriverWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/drivers/assignedstores";
+            var localVarPath = "./api/v1.0/drivers/assignedstores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1435,36 +1443,36 @@ public ApiResponse< RestApiArrayResultDriverStore > GetStoresForDriverWithHttpIn
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoresForDriver", localVarResponse);
+                Exception exception = ExceptionFactory("DriversGetStoresForDriver", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultDriverStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultDriverStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultDriverStore)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Get stores for driver 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiArrayResultDriverStore</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultDriverStore> GetStoresForDriverAsync ()
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversGetStoresForDriverAsync ()
         {
-             ApiResponse<RestApiArrayResultDriverStore> localVarResponse = await GetStoresForDriverAsyncWithHttpInfo();
+             ApiResponse<Object> localVarResponse = await DriversGetStoresForDriverAsyncWithHttpInfo();
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get stores for driver 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiArrayResultDriverStore)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDriverStore>> GetStoresForDriverAsyncWithHttpInfo ()
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversGetStoresForDriverAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/drivers/assignedstores";
+            var localVarPath = "./api/v1.0/drivers/assignedstores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1505,39 +1513,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultDriverSto
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoresForDriver", localVarResponse);
+                Exception exception = ExceptionFactory("DriversGetStoresForDriver", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultDriverStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultDriverStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultDriverStore)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Delete driver token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="removeDriverToken"></param>
-        /// <returns></returns>
-        public void RemoveDriverNotificationToken (UpdateDriverNotificationToken removeDriverToken)
+        /// <returns>Object</returns>
+        public Object DriversRemoveDriverNotificationToken (UpdateDriverNotificationToken removeDriverToken)
         {
-             RemoveDriverNotificationTokenWithHttpInfo(removeDriverToken);
+             ApiResponse<Object> localVarResponse = DriversRemoveDriverNotificationTokenWithHttpInfo(removeDriverToken);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Delete driver token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="removeDriverToken"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> RemoveDriverNotificationTokenWithHttpInfo (UpdateDriverNotificationToken removeDriverToken)
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversRemoveDriverNotificationTokenWithHttpInfo (UpdateDriverNotificationToken removeDriverToken)
         {
             // verify the required parameter 'removeDriverToken' is set
             if (removeDriverToken == null)
-                throw new ApiException(400, "Missing required parameter 'removeDriverToken' when calling DriversApi->RemoveDriverNotificationToken");
+                throw new ApiException(400, "Missing required parameter 'removeDriverToken' when calling DriversApi->DriversRemoveDriverNotificationToken");
 
-            var localVarPath = "/api/v1.0/drivers/token";
+            var localVarPath = "./api/v1.0/drivers/token";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1591,40 +1600,41 @@ public ApiResponse<Object> RemoveDriverNotificationTokenWithHttpInfo (UpdateDriv
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("RemoveDriverNotificationToken", localVarResponse);
+                Exception exception = ExceptionFactory("DriversRemoveDriverNotificationToken", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Delete driver token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="removeDriverToken"></param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task RemoveDriverNotificationTokenAsync (UpdateDriverNotificationToken removeDriverToken)
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversRemoveDriverNotificationTokenAsync (UpdateDriverNotificationToken removeDriverToken)
         {
-             await RemoveDriverNotificationTokenAsyncWithHttpInfo(removeDriverToken);
+             ApiResponse<Object> localVarResponse = await DriversRemoveDriverNotificationTokenAsyncWithHttpInfo(removeDriverToken);
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Delete driver token 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="removeDriverToken"></param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDriverNotificationTokenAsyncWithHttpInfo (UpdateDriverNotificationToken removeDriverToken)
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversRemoveDriverNotificationTokenAsyncWithHttpInfo (UpdateDriverNotificationToken removeDriverToken)
         {
             // verify the required parameter 'removeDriverToken' is set
             if (removeDriverToken == null)
-                throw new ApiException(400, "Missing required parameter 'removeDriverToken' when calling DriversApi->RemoveDriverNotificationToken");
+                throw new ApiException(400, "Missing required parameter 'removeDriverToken' when calling DriversApi->DriversRemoveDriverNotificationToken");
 
-            var localVarPath = "/api/v1.0/drivers/token";
+            var localVarPath = "./api/v1.0/drivers/token";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1678,13 +1688,13 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDriverNotifi
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("RemoveDriverNotificationToken", localVarResponse);
+                Exception exception = ExceptionFactory("DriversRemoveDriverNotificationToken", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
@@ -1693,10 +1703,11 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveDriverNotifi
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
         /// <param name="presence"></param>
-        /// <returns></returns>
-        public void SetDriverPresenceForStore (int? storeId, string presence)
+        /// <returns>Object</returns>
+        public Object DriversSetDriverPresenceForStore (int? storeId, string presence)
         {
-             SetDriverPresenceForStoreWithHttpInfo(storeId, presence);
+             ApiResponse<Object> localVarResponse = DriversSetDriverPresenceForStoreWithHttpInfo(storeId, presence);
+             return localVarResponse.Data;
         }
 
         /// <summary>
@@ -1705,17 +1716,17 @@ public void SetDriverPresenceForStore (int? storeId, string presence)
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
         /// <param name="presence"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> SetDriverPresenceForStoreWithHttpInfo (int? storeId, string presence)
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversSetDriverPresenceForStoreWithHttpInfo (int? storeId, string presence)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling DriversApi->SetDriverPresenceForStore");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling DriversApi->DriversSetDriverPresenceForStore");
             // verify the required parameter 'presence' is set
             if (presence == null)
-                throw new ApiException(400, "Missing required parameter 'presence' when calling DriversApi->SetDriverPresenceForStore");
+                throw new ApiException(400, "Missing required parameter 'presence' when calling DriversApi->DriversSetDriverPresenceForStore");
 
-            var localVarPath = "/api/v1.0/drivers/stores/{storeId}/presence/{presence}";
+            var localVarPath = "./api/v1.0/drivers/stores/{storeId}/presence/{presence}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1758,13 +1769,13 @@ public ApiResponse<Object> SetDriverPresenceForStoreWithHttpInfo (int? storeId,
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetDriverPresenceForStore", localVarResponse);
+                Exception exception = ExceptionFactory("DriversSetDriverPresenceForStore", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
@@ -1773,10 +1784,11 @@ public ApiResponse<Object> SetDriverPresenceForStoreWithHttpInfo (int? storeId,
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
         /// <param name="presence"></param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task SetDriverPresenceForStoreAsync (int? storeId, string presence)
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversSetDriverPresenceForStoreAsync (int? storeId, string presence)
         {
-             await SetDriverPresenceForStoreAsyncWithHttpInfo(storeId, presence);
+             ApiResponse<Object> localVarResponse = await DriversSetDriverPresenceForStoreAsyncWithHttpInfo(storeId, presence);
+             return localVarResponse.Data;
 
         }
 
@@ -1786,17 +1798,17 @@ public async System.Threading.Tasks.Task SetDriverPresenceForStoreAsync (int? st
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="storeId"></param>
         /// <param name="presence"></param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetDriverPresenceForStoreAsyncWithHttpInfo (int? storeId, string presence)
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversSetDriverPresenceForStoreAsyncWithHttpInfo (int? storeId, string presence)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling DriversApi->SetDriverPresenceForStore");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling DriversApi->DriversSetDriverPresenceForStore");
             // verify the required parameter 'presence' is set
             if (presence == null)
-                throw new ApiException(400, "Missing required parameter 'presence' when calling DriversApi->SetDriverPresenceForStore");
+                throw new ApiException(400, "Missing required parameter 'presence' when calling DriversApi->DriversSetDriverPresenceForStore");
 
-            var localVarPath = "/api/v1.0/drivers/stores/{storeId}/presence/{presence}";
+            var localVarPath = "./api/v1.0/drivers/stores/{storeId}/presence/{presence}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1839,35 +1851,35 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetDriverPresenceF
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetDriverPresenceForStore", localVarResponse);
+                Exception exception = ExceptionFactory("DriversSetDriverPresenceForStore", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Set driver profile image and returns it&#39;s url 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiStringResult</returns>
-        public RestApiStringResult SetDriverProfileImage ()
+        /// <returns>Object</returns>
+        public Object DriversSetDriverProfileImage ()
         {
-             ApiResponse<RestApiStringResult> localVarResponse = SetDriverProfileImageWithHttpInfo();
+             ApiResponse<Object> localVarResponse = DriversSetDriverProfileImageWithHttpInfo();
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Set driver profile image and returns it&#39;s url 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        public ApiResponse< RestApiStringResult > SetDriverProfileImageWithHttpInfo ()
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversSetDriverProfileImageWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/drivers/profile/image";
+            var localVarPath = "./api/v1.0/drivers/profile/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1908,36 +1920,36 @@ public ApiResponse< RestApiStringResult > SetDriverProfileImageWithHttpInfo ()
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetDriverProfileImage", localVarResponse);
+                Exception exception = ExceptionFactory("DriversSetDriverProfileImage", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Set driver profile image and returns it&#39;s url 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiStringResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringResult> SetDriverProfileImageAsync ()
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversSetDriverProfileImageAsync ()
         {
-             ApiResponse<RestApiStringResult> localVarResponse = await SetDriverProfileImageAsyncWithHttpInfo();
+             ApiResponse<Object> localVarResponse = await DriversSetDriverProfileImageAsyncWithHttpInfo();
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Set driver profile image and returns it&#39;s url 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetDriverProfileImageAsyncWithHttpInfo ()
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversSetDriverProfileImageAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/drivers/profile/image";
+            var localVarPath = "./api/v1.0/drivers/profile/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1978,45 +1990,45 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> SetDr
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetDriverProfileImage", localVarResponse);
+                Exception exception = ExceptionFactory("DriversSetDriverProfileImage", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Change delivery tracking status and return the updated status. ...
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <param name="deliveryTrackingStatus"></param>
-        /// <returns>RestApiStringResult</returns>
-        public RestApiStringResult UpdateDeliveryTrackingStatus (int? orderId, string deliveryTrackingStatus)
+        /// <returns>Object</returns>
+        public Object DriversUpdateDeliveryTrackingStatus (int? orderId, string deliveryTrackingStatus)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = UpdateDeliveryTrackingStatusWithHttpInfo(orderId, deliveryTrackingStatus);
+             ApiResponse<Object> localVarResponse = DriversUpdateDeliveryTrackingStatusWithHttpInfo(orderId, deliveryTrackingStatus);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Change delivery tracking status and return the updated status. ...
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <param name="deliveryTrackingStatus"></param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        public ApiResponse< RestApiStringResult > UpdateDeliveryTrackingStatusWithHttpInfo (int? orderId, string deliveryTrackingStatus)
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversUpdateDeliveryTrackingStatusWithHttpInfo (int? orderId, string deliveryTrackingStatus)
         {
             // verify the required parameter 'orderId' is set
             if (orderId == null)
-                throw new ApiException(400, "Missing required parameter 'orderId' when calling DriversApi->UpdateDeliveryTrackingStatus");
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling DriversApi->DriversUpdateDeliveryTrackingStatus");
             // verify the required parameter 'deliveryTrackingStatus' is set
             if (deliveryTrackingStatus == null)
-                throw new ApiException(400, "Missing required parameter 'deliveryTrackingStatus' when calling DriversApi->UpdateDeliveryTrackingStatus");
+                throw new ApiException(400, "Missing required parameter 'deliveryTrackingStatus' when calling DriversApi->DriversUpdateDeliveryTrackingStatus");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/tracking/{deliveryTrackingStatus}";
+            var localVarPath = "./api/v1.0/orders/{orderId}/tracking/{deliveryTrackingStatus}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2059,46 +2071,46 @@ public ApiResponse< RestApiStringResult > UpdateDeliveryTrackingStatusWithHttpIn
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("UpdateDeliveryTrackingStatus", localVarResponse);
+                Exception exception = ExceptionFactory("DriversUpdateDeliveryTrackingStatus", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Change delivery tracking status and return the updated status. ...
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <param name="deliveryTrackingStatus"></param>
-        /// <returns>Task of RestApiStringResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringResult> UpdateDeliveryTrackingStatusAsync (int? orderId, string deliveryTrackingStatus)
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversUpdateDeliveryTrackingStatusAsync (int? orderId, string deliveryTrackingStatus)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = await UpdateDeliveryTrackingStatusAsyncWithHttpInfo(orderId, deliveryTrackingStatus);
+             ApiResponse<Object> localVarResponse = await DriversUpdateDeliveryTrackingStatusAsyncWithHttpInfo(orderId, deliveryTrackingStatus);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Change delivery tracking status and return the updated status. ...
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <param name="deliveryTrackingStatus"></param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> UpdateDeliveryTrackingStatusAsyncWithHttpInfo (int? orderId, string deliveryTrackingStatus)
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversUpdateDeliveryTrackingStatusAsyncWithHttpInfo (int? orderId, string deliveryTrackingStatus)
         {
             // verify the required parameter 'orderId' is set
             if (orderId == null)
-                throw new ApiException(400, "Missing required parameter 'orderId' when calling DriversApi->UpdateDeliveryTrackingStatus");
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling DriversApi->DriversUpdateDeliveryTrackingStatus");
             // verify the required parameter 'deliveryTrackingStatus' is set
             if (deliveryTrackingStatus == null)
-                throw new ApiException(400, "Missing required parameter 'deliveryTrackingStatus' when calling DriversApi->UpdateDeliveryTrackingStatus");
+                throw new ApiException(400, "Missing required parameter 'deliveryTrackingStatus' when calling DriversApi->DriversUpdateDeliveryTrackingStatus");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/tracking/{deliveryTrackingStatus}";
+            var localVarPath = "./api/v1.0/orders/{orderId}/tracking/{deliveryTrackingStatus}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2141,39 +2153,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Updat
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("UpdateDeliveryTrackingStatus", localVarResponse);
+                Exception exception = ExceptionFactory("DriversUpdateDeliveryTrackingStatus", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Update driver profile 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateDriverProfile">Update the driver profile (i.e Name)</param>
-        /// <returns></returns>
-        public void UpdateDriverProfile (UpdateDriverProfileModel updateDriverProfile)
+        /// <param name="updateDriverProfile"></param>
+        /// <returns>Object</returns>
+        public Object DriversUpdateDriverProfile (UpdateDriverProfileModel updateDriverProfile)
         {
-             UpdateDriverProfileWithHttpInfo(updateDriverProfile);
+             ApiResponse<Object> localVarResponse = DriversUpdateDriverProfileWithHttpInfo(updateDriverProfile);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Update driver profile 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateDriverProfile">Update the driver profile (i.e Name)</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> UpdateDriverProfileWithHttpInfo (UpdateDriverProfileModel updateDriverProfile)
+        /// <param name="updateDriverProfile"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DriversUpdateDriverProfileWithHttpInfo (UpdateDriverProfileModel updateDriverProfile)
         {
             // verify the required parameter 'updateDriverProfile' is set
             if (updateDriverProfile == null)
-                throw new ApiException(400, "Missing required parameter 'updateDriverProfile' when calling DriversApi->UpdateDriverProfile");
+                throw new ApiException(400, "Missing required parameter 'updateDriverProfile' when calling DriversApi->DriversUpdateDriverProfile");
 
-            var localVarPath = "/api/v1.0/drivers/profile";
+            var localVarPath = "./api/v1.0/drivers/profile";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2227,40 +2240,41 @@ public ApiResponse<Object> UpdateDriverProfileWithHttpInfo (UpdateDriverProfileM
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("UpdateDriverProfile", localVarResponse);
+                Exception exception = ExceptionFactory("DriversUpdateDriverProfile", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Update driver profile 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateDriverProfile">Update the driver profile (i.e Name)</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task UpdateDriverProfileAsync (UpdateDriverProfileModel updateDriverProfile)
+        /// <param name="updateDriverProfile"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DriversUpdateDriverProfileAsync (UpdateDriverProfileModel updateDriverProfile)
         {
-             await UpdateDriverProfileAsyncWithHttpInfo(updateDriverProfile);
+             ApiResponse<Object> localVarResponse = await DriversUpdateDriverProfileAsyncWithHttpInfo(updateDriverProfile);
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Update driver profile 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateDriverProfile">Update the driver profile (i.e Name)</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateDriverProfileAsyncWithHttpInfo (UpdateDriverProfileModel updateDriverProfile)
+        /// <param name="updateDriverProfile"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DriversUpdateDriverProfileAsyncWithHttpInfo (UpdateDriverProfileModel updateDriverProfile)
         {
             // verify the required parameter 'updateDriverProfile' is set
             if (updateDriverProfile == null)
-                throw new ApiException(400, "Missing required parameter 'updateDriverProfile' when calling DriversApi->UpdateDriverProfile");
+                throw new ApiException(400, "Missing required parameter 'updateDriverProfile' when calling DriversApi->DriversUpdateDriverProfile");
 
-            var localVarPath = "/api/v1.0/drivers/profile";
+            var localVarPath = "./api/v1.0/drivers/profile";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2314,13 +2328,13 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateDriverProfil
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("UpdateDriverProfile", localVarResponse);
+                Exception exception = ExceptionFactory("DriversUpdateDriverProfile", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
     }
diff --git a/src/Flipdish/Api/EndUserFeesApi.cs b/src/Flipdish/Api/EndUserFeesApi.cs
new file mode 100644
index 00000000..f7b3894b
--- /dev/null
+++ b/src/Flipdish/Api/EndUserFeesApi.cs
@@ -0,0 +1,837 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IEndUserFeesApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Object</returns>
+        Object CreateEndUserFeeConfig (CreateEndUserFeeConfig input, string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> CreateEndUserFeeConfigWithHttpInfo (CreateEndUserFeeConfig input, string appId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultGetEndUserFeeConfigsResponse</returns>
+        RestApiResultGetEndUserFeeConfigsResponse GetEndUserFeesForStore (string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultGetEndUserFeeConfigsResponse</returns>
+        ApiResponse<RestApiResultGetEndUserFeeConfigsResponse> GetEndUserFeesForStoreWithHttpInfo (string appId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultSetV2FeeCalculationRequest</returns>
+        RestApiResultSetV2FeeCalculationRequest SetV2FeeCalculation (SetV2FeeCalculationRequest input, string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultSetV2FeeCalculationRequest</returns>
+        ApiResponse<RestApiResultSetV2FeeCalculationRequest> SetV2FeeCalculationWithHttpInfo (SetV2FeeCalculationRequest input, string appId, int? storeId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> CreateEndUserFeeConfigAsync (CreateEndUserFeeConfig input, string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateEndUserFeeConfigAsyncWithHttpInfo (CreateEndUserFeeConfig input, string appId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiResultGetEndUserFeeConfigsResponse</returns>
+        System.Threading.Tasks.Task<RestApiResultGetEndUserFeeConfigsResponse> GetEndUserFeesForStoreAsync (string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultGetEndUserFeeConfigsResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultGetEndUserFeeConfigsResponse>> GetEndUserFeesForStoreAsyncWithHttpInfo (string appId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiResultSetV2FeeCalculationRequest</returns>
+        System.Threading.Tasks.Task<RestApiResultSetV2FeeCalculationRequest> SetV2FeeCalculationAsync (SetV2FeeCalculationRequest input, string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultSetV2FeeCalculationRequest)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultSetV2FeeCalculationRequest>> SetV2FeeCalculationAsyncWithHttpInfo (SetV2FeeCalculationRequest input, string appId, int? storeId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class EndUserFeesApi : IEndUserFeesApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EndUserFeesApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public EndUserFeesApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EndUserFeesApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public EndUserFeesApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Object</returns>
+        public Object CreateEndUserFeeConfig (CreateEndUserFeeConfig input, string appId, int? storeId)
+        {
+             ApiResponse<Object> localVarResponse = CreateEndUserFeeConfigWithHttpInfo(input, appId, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > CreateEndUserFeeConfigWithHttpInfo (CreateEndUserFeeConfig input, string appId, int? storeId)
+        {
+            // verify the required parameter 'input' is set
+            if (input == null)
+                throw new ApiException(400, "Missing required parameter 'input' when calling EndUserFeesApi->CreateEndUserFeeConfig");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EndUserFeesApi->CreateEndUserFeeConfig");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling EndUserFeesApi->CreateEndUserFeeConfig");
+
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/end-user-fees";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (input != null && input.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(input); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = input; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateEndUserFeeConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> CreateEndUserFeeConfigAsync (CreateEndUserFeeConfig input, string appId, int? storeId)
+        {
+             ApiResponse<Object> localVarResponse = await CreateEndUserFeeConfigAsyncWithHttpInfo(input, appId, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateEndUserFeeConfigAsyncWithHttpInfo (CreateEndUserFeeConfig input, string appId, int? storeId)
+        {
+            // verify the required parameter 'input' is set
+            if (input == null)
+                throw new ApiException(400, "Missing required parameter 'input' when calling EndUserFeesApi->CreateEndUserFeeConfig");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EndUserFeesApi->CreateEndUserFeeConfig");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling EndUserFeesApi->CreateEndUserFeeConfig");
+
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/end-user-fees";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (input != null && input.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(input); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = input; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateEndUserFeeConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultGetEndUserFeeConfigsResponse</returns>
+        public RestApiResultGetEndUserFeeConfigsResponse GetEndUserFeesForStore (string appId, int? storeId)
+        {
+             ApiResponse<RestApiResultGetEndUserFeeConfigsResponse> localVarResponse = GetEndUserFeesForStoreWithHttpInfo(appId, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultGetEndUserFeeConfigsResponse</returns>
+        public ApiResponse< RestApiResultGetEndUserFeeConfigsResponse > GetEndUserFeesForStoreWithHttpInfo (string appId, int? storeId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EndUserFeesApi->GetEndUserFeesForStore");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling EndUserFeesApi->GetEndUserFeesForStore");
+
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/end-user-fees";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetEndUserFeesForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultGetEndUserFeeConfigsResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultGetEndUserFeeConfigsResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultGetEndUserFeeConfigsResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiResultGetEndUserFeeConfigsResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiResultGetEndUserFeeConfigsResponse> GetEndUserFeesForStoreAsync (string appId, int? storeId)
+        {
+             ApiResponse<RestApiResultGetEndUserFeeConfigsResponse> localVarResponse = await GetEndUserFeesForStoreAsyncWithHttpInfo(appId, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultGetEndUserFeeConfigsResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultGetEndUserFeeConfigsResponse>> GetEndUserFeesForStoreAsyncWithHttpInfo (string appId, int? storeId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EndUserFeesApi->GetEndUserFeesForStore");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling EndUserFeesApi->GetEndUserFeesForStore");
+
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/end-user-fees";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetEndUserFeesForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultGetEndUserFeeConfigsResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultGetEndUserFeeConfigsResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultGetEndUserFeeConfigsResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultSetV2FeeCalculationRequest</returns>
+        public RestApiResultSetV2FeeCalculationRequest SetV2FeeCalculation (SetV2FeeCalculationRequest input, string appId, int? storeId)
+        {
+             ApiResponse<RestApiResultSetV2FeeCalculationRequest> localVarResponse = SetV2FeeCalculationWithHttpInfo(input, appId, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultSetV2FeeCalculationRequest</returns>
+        public ApiResponse< RestApiResultSetV2FeeCalculationRequest > SetV2FeeCalculationWithHttpInfo (SetV2FeeCalculationRequest input, string appId, int? storeId)
+        {
+            // verify the required parameter 'input' is set
+            if (input == null)
+                throw new ApiException(400, "Missing required parameter 'input' when calling EndUserFeesApi->SetV2FeeCalculation");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EndUserFeesApi->SetV2FeeCalculation");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling EndUserFeesApi->SetV2FeeCalculation");
+
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/end-user-fees/v2-fee-calculation";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (input != null && input.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(input); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = input; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetV2FeeCalculation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultSetV2FeeCalculationRequest>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSetV2FeeCalculationRequest) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSetV2FeeCalculationRequest)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiResultSetV2FeeCalculationRequest</returns>
+        public async System.Threading.Tasks.Task<RestApiResultSetV2FeeCalculationRequest> SetV2FeeCalculationAsync (SetV2FeeCalculationRequest input, string appId, int? storeId)
+        {
+             ApiResponse<RestApiResultSetV2FeeCalculationRequest> localVarResponse = await SetV2FeeCalculationAsyncWithHttpInfo(input, appId, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="input"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultSetV2FeeCalculationRequest)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSetV2FeeCalculationRequest>> SetV2FeeCalculationAsyncWithHttpInfo (SetV2FeeCalculationRequest input, string appId, int? storeId)
+        {
+            // verify the required parameter 'input' is set
+            if (input == null)
+                throw new ApiException(400, "Missing required parameter 'input' when calling EndUserFeesApi->SetV2FeeCalculation");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EndUserFeesApi->SetV2FeeCalculation");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling EndUserFeesApi->SetV2FeeCalculation");
+
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/end-user-fees/v2-fee-calculation";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (input != null && input.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(input); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = input; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetV2FeeCalculation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultSetV2FeeCalculationRequest>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSetV2FeeCalculationRequest) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSetV2FeeCalculationRequest)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/EventsApi.cs b/src/Flipdish/Api/EventsApi.cs
index 3cc719c0..ff7f7f1f 100644
--- a/src/Flipdish/Api/EventsApi.cs
+++ b/src/Flipdish/Api/EventsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,805 +25,937 @@ public interface IEventsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get customer events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        RestApiEventSearchPaginationResult GetCustomerEvents (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        RestApiEventSearchPaginationResult GetCustomerEvents (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get customer events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        ApiResponse<RestApiEventSearchPaginationResult> GetCustomerEventsWithHttpInfo (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        ApiResponse<RestApiEventSearchPaginationResult> GetCustomerEventsWithHttpInfo (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whiteLabelId">White Label Id (optional)</param>
-        /// <param name="customerId">Customer Id (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <param name="customerId"> (optional)</param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        RestApiEventSearchPaginationResult GetEvents (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        RestApiEventSearchPaginationResult GetEvents (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whiteLabelId">White Label Id (optional)</param>
-        /// <param name="customerId">Customer Id (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <param name="customerId"> (optional)</param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        ApiResponse<RestApiEventSearchPaginationResult> GetEventsWithHttpInfo (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        ApiResponse<RestApiEventSearchPaginationResult> GetEventsWithHttpInfo (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get event by Id  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="eventId">Event identifier (Guid)</param>
+        /// <param name="eventId"></param>
+        /// <param name="appId"></param>
         /// <returns>EventSearchResult</returns>
-        EventSearchResult GetEventsById (Guid? eventId);
+        EventSearchResult GetEventsById (Guid? eventId, string appId);
 
         /// <summary>
-        /// Get event by Id  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="eventId">Event identifier (Guid)</param>
+        /// <param name="eventId"></param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of EventSearchResult</returns>
-        ApiResponse<EventSearchResult> GetEventsByIdWithHttpInfo (Guid? eventId);
+        ApiResponse<EventSearchResult> GetEventsByIdWithHttpInfo (Guid? eventId, string appId);
         /// <summary>
-        /// Get menu events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId">Menu Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId2">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        RestApiEventSearchPaginationResult GetMenuEvents (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        RestApiEventSearchPaginationResult GetMenuEvents (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get menu events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId">Menu Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId2">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        ApiResponse<RestApiEventSearchPaginationResult> GetMenuEventsWithHttpInfo (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        ApiResponse<RestApiEventSearchPaginationResult> GetMenuEventsWithHttpInfo (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get order events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="orderId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId2">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        RestApiEventSearchPaginationResult GetOrderEvents (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        RestApiEventSearchPaginationResult GetOrderEvents (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get order events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="orderId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId2">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        ApiResponse<RestApiEventSearchPaginationResult> GetOrderEventsWithHttpInfo (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        ApiResponse<RestApiEventSearchPaginationResult> GetOrderEventsWithHttpInfo (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get order events by customer  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        RestApiEventSearchPaginationResult GetOrderEventsByCustomer (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        RestApiEventSearchPaginationResult GetOrderEventsByCustomer (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get order events by customer  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        ApiResponse<RestApiEventSearchPaginationResult> GetOrderEventsByCustomerWithHttpInfo (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        ApiResponse<RestApiEventSearchPaginationResult> GetOrderEventsByCustomerWithHttpInfo (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get store events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Id of the store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId2">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        RestApiEventSearchPaginationResult GetStoreEvents (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        RestApiEventSearchPaginationResult GetStoreEvents (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get store events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Id of the store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId2">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        ApiResponse<RestApiEventSearchPaginationResult> GetStoreEventsWithHttpInfo (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        ApiResponse<RestApiEventSearchPaginationResult> GetStoreEventsWithHttpInfo (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get user events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="userId">User identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="userId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId2">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        RestApiEventSearchPaginationResult GetUserEvents (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        RestApiEventSearchPaginationResult GetUserEvents (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get user events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="userId">User identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="userId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId2">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        ApiResponse<RestApiEventSearchPaginationResult> GetUserEventsWithHttpInfo (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        ApiResponse<RestApiEventSearchPaginationResult> GetUserEventsWithHttpInfo (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whitelabelId">White Label Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="whitelabelId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        RestApiEventSearchPaginationResult GetWhiteLabelEvents (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        RestApiEventSearchPaginationResult GetWhiteLabelEvents (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whitelabelId">White Label Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="whitelabelId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        ApiResponse<RestApiEventSearchPaginationResult> GetWhiteLabelEventsWithHttpInfo (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        ApiResponse<RestApiEventSearchPaginationResult> GetWhiteLabelEventsWithHttpInfo (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get customer events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetCustomerEventsAsync (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetCustomerEventsAsync (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get customer events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetCustomerEventsAsyncWithHttpInfo (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetCustomerEventsAsyncWithHttpInfo (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whiteLabelId">White Label Id (optional)</param>
-        /// <param name="customerId">Customer Id (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <param name="customerId"> (optional)</param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetEventsAsync (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetEventsAsync (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whiteLabelId">White Label Id (optional)</param>
-        /// <param name="customerId">Customer Id (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <param name="customerId"> (optional)</param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetEventsAsyncWithHttpInfo (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetEventsAsyncWithHttpInfo (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get event by Id  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="eventId">Event identifier (Guid)</param>
+        /// <param name="eventId"></param>
+        /// <param name="appId"></param>
         /// <returns>Task of EventSearchResult</returns>
-        System.Threading.Tasks.Task<EventSearchResult> GetEventsByIdAsync (Guid? eventId);
+        System.Threading.Tasks.Task<EventSearchResult> GetEventsByIdAsync (Guid? eventId, string appId);
 
         /// <summary>
-        /// Get event by Id  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="eventId">Event identifier (Guid)</param>
+        /// <param name="eventId"></param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (EventSearchResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<EventSearchResult>> GetEventsByIdAsyncWithHttpInfo (Guid? eventId);
+        System.Threading.Tasks.Task<ApiResponse<EventSearchResult>> GetEventsByIdAsyncWithHttpInfo (Guid? eventId, string appId);
         /// <summary>
-        /// Get menu events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId">Menu Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId2">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetMenuEventsAsync (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetMenuEventsAsync (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get menu events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId">Menu Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId2">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetMenuEventsAsyncWithHttpInfo (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetMenuEventsAsyncWithHttpInfo (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get order events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="orderId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId2">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetOrderEventsAsync (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetOrderEventsAsync (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get order events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="orderId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId2">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetOrderEventsAsyncWithHttpInfo (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetOrderEventsAsyncWithHttpInfo (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get order events by customer  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetOrderEventsByCustomerAsync (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetOrderEventsByCustomerAsync (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get order events by customer  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetOrderEventsByCustomerAsyncWithHttpInfo (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetOrderEventsByCustomerAsyncWithHttpInfo (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get store events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Id of the store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId2">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetStoreEventsAsync (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetStoreEventsAsync (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get store events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Id of the store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId2">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetStoreEventsAsyncWithHttpInfo (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetStoreEventsAsyncWithHttpInfo (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get user events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="userId">User identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="userId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId2">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetUserEventsAsync (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetUserEventsAsync (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get user events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="userId">User identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="userId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId2">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetUserEventsAsyncWithHttpInfo (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetUserEventsAsyncWithHttpInfo (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         /// <summary>
-        /// Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whitelabelId">White Label Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="whitelabelId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetWhiteLabelEventsAsync (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetWhiteLabelEventsAsync (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
 
         /// <summary>
-        /// Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whitelabelId">White Label Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="whitelabelId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetWhiteLabelEventsAsyncWithHttpInfo (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetWhiteLabelEventsAsyncWithHttpInfo (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null);
         #endregion Asynchronous Operations
     }
 
@@ -925,56 +1057,67 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get customer events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        public RestApiEventSearchPaginationResult GetCustomerEvents (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public RestApiEventSearchPaginationResult GetCustomerEvents (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetCustomerEventsWithHttpInfo(customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetCustomerEventsWithHttpInfo(appId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get customer events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        public ApiResponse< RestApiEventSearchPaginationResult > GetCustomerEventsWithHttpInfo (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public ApiResponse< RestApiEventSearchPaginationResult > GetCustomerEventsWithHttpInfo (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetCustomerEvents");
             // verify the required parameter 'customerId' is set
             if (customerId == null)
                 throw new ApiException(400, "Missing required parameter 'customerId' when calling EventsApi->GetCustomerEvents");
 
-            var localVarPath = "/api/v1.0/events/customer/{customerId}";
+            var localVarPath = "./api/v1.0/{appId}/events/customer/{customerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -998,6 +1141,7 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetCustomerEventsWithHt
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (customerId != null) localVarPathParams.Add("customerId", this.Configuration.ApiClient.ParameterToString(customerId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -1005,8 +1149,11 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetCustomerEventsWithHt
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -1034,62 +1181,73 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetCustomerEventsWithHt
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get customer events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetCustomerEventsAsync (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetCustomerEventsAsync (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetCustomerEventsAsyncWithHttpInfo(customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetCustomerEventsAsyncWithHttpInfo(appId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get customer events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetCustomerEventsAsyncWithHttpInfo (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetCustomerEventsAsyncWithHttpInfo (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetCustomerEvents");
             // verify the required parameter 'customerId' is set
             if (customerId == null)
                 throw new ApiException(400, "Missing required parameter 'customerId' when calling EventsApi->GetCustomerEvents");
 
-            var localVarPath = "/api/v1.0/events/customer/{customerId}";
+            var localVarPath = "./api/v1.0/{appId}/events/customer/{customerId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1113,6 +1271,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (customerId != null) localVarPathParams.Add("customerId", this.Configuration.ApiClient.ParameterToString(customerId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -1120,8 +1279,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -1149,60 +1311,71 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whiteLabelId">White Label Id (optional)</param>
-        /// <param name="customerId">Customer Id (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <param name="customerId"> (optional)</param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        public RestApiEventSearchPaginationResult GetEvents (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public RestApiEventSearchPaginationResult GetEvents (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetEventsWithHttpInfo(whiteLabelId, customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetEventsWithHttpInfo(appId, whiteLabelId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whiteLabelId">White Label Id (optional)</param>
-        /// <param name="customerId">Customer Id (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <param name="customerId"> (optional)</param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        public ApiResponse< RestApiEventSearchPaginationResult > GetEventsWithHttpInfo (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public ApiResponse< RestApiEventSearchPaginationResult > GetEventsWithHttpInfo (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetEvents");
 
-            var localVarPath = "/api/v1.0/events";
+            var localVarPath = "./api/v1.0/{appId}/events";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1226,6 +1399,7 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetEventsWithHttpInfo (
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (whiteLabelId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "whiteLabelId", whiteLabelId)); // query parameter
             if (customerId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "customerId", customerId)); // query parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
@@ -1234,8 +1408,11 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetEventsWithHttpInfo (
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -1263,61 +1440,72 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetEventsWithHttpInfo (
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whiteLabelId">White Label Id (optional)</param>
-        /// <param name="customerId">Customer Id (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <param name="customerId"> (optional)</param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetEventsAsync (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetEventsAsync (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetEventsAsyncWithHttpInfo(whiteLabelId, customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetEventsAsyncWithHttpInfo(appId, whiteLabelId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whiteLabelId">White Label Id (optional)</param>
-        /// <param name="customerId">Customer Id (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <param name="customerId"> (optional)</param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetEventsAsyncWithHttpInfo (int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetEventsAsyncWithHttpInfo (string appId, int? whiteLabelId = null, int? customerId = null, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetEvents");
 
-            var localVarPath = "/api/v1.0/events";
+            var localVarPath = "./api/v1.0/{appId}/events";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1341,6 +1529,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (whiteLabelId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "whiteLabelId", whiteLabelId)); // query parameter
             if (customerId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "customerId", customerId)); // query parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
@@ -1349,8 +1538,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -1378,35 +1570,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get event by Id  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="eventId">Event identifier (Guid)</param>
+        /// <param name="eventId"></param>
+        /// <param name="appId"></param>
         /// <returns>EventSearchResult</returns>
-        public EventSearchResult GetEventsById (Guid? eventId)
+        public EventSearchResult GetEventsById (Guid? eventId, string appId)
         {
-             ApiResponse<EventSearchResult> localVarResponse = GetEventsByIdWithHttpInfo(eventId);
+             ApiResponse<EventSearchResult> localVarResponse = GetEventsByIdWithHttpInfo(eventId, appId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get event by Id  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="eventId">Event identifier (Guid)</param>
+        /// <param name="eventId"></param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of EventSearchResult</returns>
-        public ApiResponse< EventSearchResult > GetEventsByIdWithHttpInfo (Guid? eventId)
+        public ApiResponse< EventSearchResult > GetEventsByIdWithHttpInfo (Guid? eventId, string appId)
         {
             // verify the required parameter 'eventId' is set
             if (eventId == null)
                 throw new ApiException(400, "Missing required parameter 'eventId' when calling EventsApi->GetEventsById");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetEventsById");
 
-            var localVarPath = "/api/v1.0/events/{eventId}";
+            var localVarPath = "./api/v1.0/{appId}/events/{eventId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1431,6 +1628,7 @@ public ApiResponse< EventSearchResult > GetEventsByIdWithHttpInfo (Guid? eventId
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (eventId != null) localVarPathParams.Add("eventId", this.Configuration.ApiClient.ParameterToString(eventId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1453,36 +1651,41 @@ public ApiResponse< EventSearchResult > GetEventsByIdWithHttpInfo (Guid? eventId
             }
 
             return new ApiResponse<EventSearchResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (EventSearchResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(EventSearchResult)));
         }
 
         /// <summary>
-        /// Get event by Id  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="eventId">Event identifier (Guid)</param>
+        /// <param name="eventId"></param>
+        /// <param name="appId"></param>
         /// <returns>Task of EventSearchResult</returns>
-        public async System.Threading.Tasks.Task<EventSearchResult> GetEventsByIdAsync (Guid? eventId)
+        public async System.Threading.Tasks.Task<EventSearchResult> GetEventsByIdAsync (Guid? eventId, string appId)
         {
-             ApiResponse<EventSearchResult> localVarResponse = await GetEventsByIdAsyncWithHttpInfo(eventId);
+             ApiResponse<EventSearchResult> localVarResponse = await GetEventsByIdAsyncWithHttpInfo(eventId, appId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get event by Id  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="eventId">Event identifier (Guid)</param>
+        /// <param name="eventId"></param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (EventSearchResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<EventSearchResult>> GetEventsByIdAsyncWithHttpInfo (Guid? eventId)
+        public async System.Threading.Tasks.Task<ApiResponse<EventSearchResult>> GetEventsByIdAsyncWithHttpInfo (Guid? eventId, string appId)
         {
             // verify the required parameter 'eventId' is set
             if (eventId == null)
                 throw new ApiException(400, "Missing required parameter 'eventId' when calling EventsApi->GetEventsById");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetEventsById");
 
-            var localVarPath = "/api/v1.0/events/{eventId}";
+            var localVarPath = "./api/v1.0/{appId}/events/{eventId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1507,6 +1710,7 @@ public async System.Threading.Tasks.Task<ApiResponse<EventSearchResult>> GetEven
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (eventId != null) localVarPathParams.Add("eventId", this.Configuration.ApiClient.ParameterToString(eventId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1529,61 +1733,72 @@ public async System.Threading.Tasks.Task<ApiResponse<EventSearchResult>> GetEven
             }
 
             return new ApiResponse<EventSearchResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (EventSearchResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(EventSearchResult)));
         }
 
         /// <summary>
-        /// Get menu events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId">Menu Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId2">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        public RestApiEventSearchPaginationResult GetMenuEvents (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public RestApiEventSearchPaginationResult GetMenuEvents (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetMenuEventsWithHttpInfo(menuId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetMenuEventsWithHttpInfo(appId, menuId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId2, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get menu events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId">Menu Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId2">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        public ApiResponse< RestApiEventSearchPaginationResult > GetMenuEventsWithHttpInfo (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public ApiResponse< RestApiEventSearchPaginationResult > GetMenuEventsWithHttpInfo (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetMenuEvents");
             // verify the required parameter 'menuId' is set
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling EventsApi->GetMenuEvents");
 
-            var localVarPath = "/api/v1.0/events/menu/{menuId}";
+            var localVarPath = "./api/v1.0/{appId}/events/menu/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1607,6 +1822,7 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetMenuEventsWithHttpIn
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -1614,8 +1830,11 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetMenuEventsWithHttpIn
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId2 != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId2)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -1643,62 +1862,73 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetMenuEventsWithHttpIn
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get menu events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId">Menu Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId2">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetMenuEventsAsync (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetMenuEventsAsync (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetMenuEventsAsyncWithHttpInfo(menuId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetMenuEventsAsyncWithHttpInfo(appId, menuId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId2, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get menu events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId">Menu Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="menuId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId2">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetMenuEventsAsyncWithHttpInfo (int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetMenuEventsAsyncWithHttpInfo (string appId, int? menuId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId2 = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetMenuEvents");
             // verify the required parameter 'menuId' is set
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling EventsApi->GetMenuEvents");
 
-            var localVarPath = "/api/v1.0/events/menu/{menuId}";
+            var localVarPath = "./api/v1.0/{appId}/events/menu/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1722,6 +1952,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -1729,8 +1960,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId2 != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId2)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -1758,61 +1992,72 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get order events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="orderId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId2">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        public RestApiEventSearchPaginationResult GetOrderEvents (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public RestApiEventSearchPaginationResult GetOrderEvents (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetOrderEventsWithHttpInfo(orderId, limit, page, start, end, orderId2, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetOrderEventsWithHttpInfo(appId, orderId, limit, page, start, end, orderId2, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get order events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="orderId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId2">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsWithHttpInfo (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsWithHttpInfo (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetOrderEvents");
             // verify the required parameter 'orderId' is set
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling EventsApi->GetOrderEvents");
 
-            var localVarPath = "/api/v1.0/events/order/{orderId}";
+            var localVarPath = "./api/v1.0/{appId}/events/order/{orderId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1836,6 +2081,7 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsWithHttpI
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -1843,8 +2089,11 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsWithHttpI
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId2 != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId2)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -1872,62 +2121,73 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsWithHttpI
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get order events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="orderId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId2">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetOrderEventsAsync (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetOrderEventsAsync (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetOrderEventsAsyncWithHttpInfo(orderId, limit, page, start, end, orderId2, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetOrderEventsAsyncWithHttpInfo(appId, orderId, limit, page, start, end, orderId2, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get order events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="orderId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId2">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetOrderEventsAsyncWithHttpInfo (int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetOrderEventsAsyncWithHttpInfo (string appId, int? orderId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId2 = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetOrderEvents");
             // verify the required parameter 'orderId' is set
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling EventsApi->GetOrderEvents");
 
-            var localVarPath = "/api/v1.0/events/order/{orderId}";
+            var localVarPath = "./api/v1.0/{appId}/events/order/{orderId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1951,6 +2211,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -1958,8 +2219,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId2 != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId2)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -1987,61 +2251,72 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get order events by customer  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        public RestApiEventSearchPaginationResult GetOrderEventsByCustomer (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public RestApiEventSearchPaginationResult GetOrderEventsByCustomer (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetOrderEventsByCustomerWithHttpInfo(customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetOrderEventsByCustomerWithHttpInfo(appId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get order events by customer  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsByCustomerWithHttpInfo (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsByCustomerWithHttpInfo (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetOrderEventsByCustomer");
             // verify the required parameter 'customerId' is set
             if (customerId == null)
                 throw new ApiException(400, "Missing required parameter 'customerId' when calling EventsApi->GetOrderEventsByCustomer");
 
-            var localVarPath = "/api/v1.0/events/order";
+            var localVarPath = "./api/v1.0/{appId}/events/order";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2065,6 +2340,7 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsByCustome
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (customerId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "customerId", customerId)); // query parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -2072,8 +2348,11 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsByCustome
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -2101,62 +2380,73 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetOrderEventsByCustome
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get order events by customer  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetOrderEventsByCustomerAsync (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetOrderEventsByCustomerAsync (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetOrderEventsByCustomerAsyncWithHttpInfo(customerId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetOrderEventsByCustomerAsyncWithHttpInfo(appId, customerId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get order events by customer  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="customerId">Customer identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetOrderEventsByCustomerAsyncWithHttpInfo (int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetOrderEventsByCustomerAsyncWithHttpInfo (string appId, int? customerId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetOrderEventsByCustomer");
             // verify the required parameter 'customerId' is set
             if (customerId == null)
                 throw new ApiException(400, "Missing required parameter 'customerId' when calling EventsApi->GetOrderEventsByCustomer");
 
-            var localVarPath = "/api/v1.0/events/order";
+            var localVarPath = "./api/v1.0/{appId}/events/order";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2180,6 +2470,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (customerId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "customerId", customerId)); // query parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -2187,8 +2478,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -2216,61 +2510,72 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get store events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Id of the store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId2">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        public RestApiEventSearchPaginationResult GetStoreEvents (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public RestApiEventSearchPaginationResult GetStoreEvents (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetStoreEventsWithHttpInfo(storeId, limit, page, start, end, orderId, storeId2, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetStoreEventsWithHttpInfo(appId, storeId, limit, page, start, end, orderId, storeId2, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get store events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Id of the store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId2">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        public ApiResponse< RestApiEventSearchPaginationResult > GetStoreEventsWithHttpInfo (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public ApiResponse< RestApiEventSearchPaginationResult > GetStoreEventsWithHttpInfo (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetStoreEvents");
             // verify the required parameter 'storeId' is set
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling EventsApi->GetStoreEvents");
 
-            var localVarPath = "/api/v1.0/events/store/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/events/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2294,6 +2599,7 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetStoreEventsWithHttpI
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -2301,8 +2607,11 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetStoreEventsWithHttpI
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId2 != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId2)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -2330,62 +2639,73 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetStoreEventsWithHttpI
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get store events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Id of the store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId2">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetStoreEventsAsync (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetStoreEventsAsync (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetStoreEventsAsyncWithHttpInfo(storeId, limit, page, start, end, orderId, storeId2, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetStoreEventsAsyncWithHttpInfo(appId, storeId, limit, page, start, end, orderId, storeId2, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get store events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Id of the store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId2">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetStoreEventsAsyncWithHttpInfo (int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetStoreEventsAsyncWithHttpInfo (string appId, int? storeId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId2 = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetStoreEvents");
             // verify the required parameter 'storeId' is set
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling EventsApi->GetStoreEvents");
 
-            var localVarPath = "/api/v1.0/events/store/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/events/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2409,6 +2729,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -2416,8 +2737,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId2 != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId2)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -2445,61 +2769,72 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get user events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="userId">User identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="userId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId2">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        public RestApiEventSearchPaginationResult GetUserEvents (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public RestApiEventSearchPaginationResult GetUserEvents (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetUserEventsWithHttpInfo(userId, limit, page, start, end, orderId, storeId, storeGroupId, userId2, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetUserEventsWithHttpInfo(appId, userId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId2, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get user events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="userId">User identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="userId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId2">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        public ApiResponse< RestApiEventSearchPaginationResult > GetUserEventsWithHttpInfo (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public ApiResponse< RestApiEventSearchPaginationResult > GetUserEventsWithHttpInfo (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetUserEvents");
             // verify the required parameter 'userId' is set
             if (userId == null)
                 throw new ApiException(400, "Missing required parameter 'userId' when calling EventsApi->GetUserEvents");
 
-            var localVarPath = "/api/v1.0/events/user/{userId}";
+            var localVarPath = "./api/v1.0/{appId}/events/user/{userId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2523,6 +2858,7 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetUserEventsWithHttpIn
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -2530,8 +2866,11 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetUserEventsWithHttpIn
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId2 != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId2)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -2559,62 +2898,73 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetUserEventsWithHttpIn
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get user events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="userId">User identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="userId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId2">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetUserEventsAsync (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetUserEventsAsync (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetUserEventsAsyncWithHttpInfo(userId, limit, page, start, end, orderId, storeId, storeGroupId, userId2, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetUserEventsAsyncWithHttpInfo(appId, userId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId2, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get user events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="userId">User identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="userId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId2">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetUserEventsAsyncWithHttpInfo (int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId2 = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetUserEventsAsyncWithHttpInfo (string appId, int? userId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId2 = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetUserEvents");
             // verify the required parameter 'userId' is set
             if (userId == null)
                 throw new ApiException(400, "Missing required parameter 'userId' when calling EventsApi->GetUserEvents");
 
-            var localVarPath = "/api/v1.0/events/user/{userId}";
+            var localVarPath = "./api/v1.0/{appId}/events/user/{userId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2638,6 +2988,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -2645,8 +2996,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId2 != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId2)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -2674,61 +3028,72 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whitelabelId">White Label Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="whitelabelId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>RestApiEventSearchPaginationResult</returns>
-        public RestApiEventSearchPaginationResult GetWhiteLabelEvents (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public RestApiEventSearchPaginationResult GetWhiteLabelEvents (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetWhiteLabelEventsWithHttpInfo(whitelabelId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = GetWhiteLabelEventsWithHttpInfo(appId, whitelabelId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whitelabelId">White Label Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="whitelabelId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>ApiResponse of RestApiEventSearchPaginationResult</returns>
-        public ApiResponse< RestApiEventSearchPaginationResult > GetWhiteLabelEventsWithHttpInfo (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public ApiResponse< RestApiEventSearchPaginationResult > GetWhiteLabelEventsWithHttpInfo (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetWhiteLabelEvents");
             // verify the required parameter 'whitelabelId' is set
             if (whitelabelId == null)
                 throw new ApiException(400, "Missing required parameter 'whitelabelId' when calling EventsApi->GetWhiteLabelEvents");
 
-            var localVarPath = "/api/v1.0/events/whitelabel/{whitelabelId}";
+            var localVarPath = "./api/v1.0/{appId}/events/whitelabel/{whitelabelId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2752,6 +3117,7 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetWhiteLabelEventsWith
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (whitelabelId != null) localVarPathParams.Add("whitelabelId", this.Configuration.ApiClient.ParameterToString(whitelabelId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -2759,8 +3125,11 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetWhiteLabelEventsWith
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -2788,62 +3157,73 @@ public ApiResponse< RestApiEventSearchPaginationResult > GetWhiteLabelEventsWith
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
         /// <summary>
-        /// Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whitelabelId">White Label Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="whitelabelId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of RestApiEventSearchPaginationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetWhiteLabelEventsAsync (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<RestApiEventSearchPaginationResult> GetWhiteLabelEventsAsync (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
-             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetWhiteLabelEventsAsyncWithHttpInfo(whitelabelId, limit, page, start, end, orderId, storeId, storeGroupId, userId, userEmail, userName, voucherCode, eventType, flipdishEventId);
+             ApiResponse<RestApiEventSearchPaginationResult> localVarResponse = await GetWhiteLabelEventsAsyncWithHttpInfo(appId, whitelabelId, limit, page, start, end, orderId, storeId, storeIdList, storeGroupId, userId, menuId, campaignId, userEmail, userName, voucherCode, eventType, flipdishEventId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get WhiteLabel events  For technical reasons, the number of records returned is limited to 100. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="whitelabelId">White Label Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="whitelabelId"></param>
         /// <param name="limit">The maximum elements to return (optional)</param>
         /// <param name="page">The index of the page to return, starting by 1 (optional)</param>
         /// <param name="start">Start date (optional)</param>
         /// <param name="end">End date (optional)</param>
         /// <param name="orderId">Events that have Order Id (optional)</param>
         /// <param name="storeId">Events that have Store Id (optional)</param>
+        /// <param name="storeIdList">Events that have Store Id List (optional)</param>
         /// <param name="storeGroupId">Events that have Store Group Id (optional)</param>
         /// <param name="userId">Events that have User Id (optional)</param>
+        /// <param name="menuId">Events that have Menu Id (optional)</param>
+        /// <param name="campaignId">Events that have Campaign Id (optional)</param>
         /// <param name="userEmail">Events that have User Email (optional)</param>
         /// <param name="userName">Events that have User Name (optional)</param>
         /// <param name="voucherCode">Events that have voucher code (optional)</param>
         /// <param name="eventType">Events that have event type\\s (optional)</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored. (optional)</param>
         /// <returns>Task of ApiResponse (RestApiEventSearchPaginationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetWhiteLabelEventsAsyncWithHttpInfo (int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, int? storeGroupId = null, int? userId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginationResult>> GetWhiteLabelEventsAsyncWithHttpInfo (string appId, int? whitelabelId, int? limit = null, int? page = null, DateTime? start = null, DateTime? end = null, int? orderId = null, int? storeId = null, List<int?> storeIdList = null, int? storeGroupId = null, int? userId = null, int? menuId = null, int? campaignId = null, string userEmail = null, string userName = null, string voucherCode = null, List<string> eventType = null, string flipdishEventId = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling EventsApi->GetWhiteLabelEvents");
             // verify the required parameter 'whitelabelId' is set
             if (whitelabelId == null)
                 throw new ApiException(400, "Missing required parameter 'whitelabelId' when calling EventsApi->GetWhiteLabelEvents");
 
-            var localVarPath = "/api/v1.0/events/whitelabel/{whitelabelId}";
+            var localVarPath = "./api/v1.0/{appId}/events/whitelabel/{whitelabelId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2867,6 +3247,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (whitelabelId != null) localVarPathParams.Add("whitelabelId", this.Configuration.ApiClient.ParameterToString(whitelabelId)); // path parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
@@ -2874,8 +3255,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
             if (orderId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderId", orderId)); // query parameter
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (storeIdList != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIdList", storeIdList)); // query parameter
             if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
             if (userId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userId", userId)); // query parameter
+            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
+            if (campaignId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "campaignId", campaignId)); // query parameter
             if (userEmail != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userEmail", userEmail)); // query parameter
             if (userName != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userName", userName)); // query parameter
             if (voucherCode != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "voucherCode", voucherCode)); // query parameter
@@ -2903,7 +3287,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiEventSearchPaginatio
             }
 
             return new ApiResponse<RestApiEventSearchPaginationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiEventSearchPaginationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiEventSearchPaginationResult)));
         }
 
diff --git a/src/Flipdish/Api/FeaturesApi.cs b/src/Flipdish/Api/FeaturesApi.cs
new file mode 100644
index 00000000..2b67c003
--- /dev/null
+++ b/src/Flipdish/Api/FeaturesApi.cs
@@ -0,0 +1,596 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IFeaturesApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>RestApiStringArrayResult</returns>
+        RestApiStringArrayResult DisableFeatures (string appId, List<string> features);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>ApiResponse of RestApiStringArrayResult</returns>
+        ApiResponse<RestApiStringArrayResult> DisableFeaturesWithHttpInfo (string appId, List<string> features);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>RestApiStringArrayResult</returns>
+        RestApiStringArrayResult EnableFeatures (string appId, List<string> features);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>ApiResponse of RestApiStringArrayResult</returns>
+        ApiResponse<RestApiStringArrayResult> EnableFeaturesWithHttpInfo (string appId, List<string> features);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>Task of RestApiStringArrayResult</returns>
+        System.Threading.Tasks.Task<RestApiStringArrayResult> DisableFeaturesAsync (string appId, List<string> features);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> DisableFeaturesAsyncWithHttpInfo (string appId, List<string> features);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>Task of RestApiStringArrayResult</returns>
+        System.Threading.Tasks.Task<RestApiStringArrayResult> EnableFeaturesAsync (string appId, List<string> features);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> EnableFeaturesAsyncWithHttpInfo (string appId, List<string> features);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class FeaturesApi : IFeaturesApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FeaturesApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public FeaturesApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FeaturesApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public FeaturesApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>RestApiStringArrayResult</returns>
+        public RestApiStringArrayResult DisableFeatures (string appId, List<string> features)
+        {
+             ApiResponse<RestApiStringArrayResult> localVarResponse = DisableFeaturesWithHttpInfo(appId, features);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>ApiResponse of RestApiStringArrayResult</returns>
+        public ApiResponse< RestApiStringArrayResult > DisableFeaturesWithHttpInfo (string appId, List<string> features)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling FeaturesApi->DisableFeatures");
+            // verify the required parameter 'features' is set
+            if (features == null)
+                throw new ApiException(400, "Missing required parameter 'features' when calling FeaturesApi->DisableFeatures");
+
+            var localVarPath = "./api/v1.0/{appId}/features/disable";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (features != null && features.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(features); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = features; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DisableFeatures", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>Task of RestApiStringArrayResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringArrayResult> DisableFeaturesAsync (string appId, List<string> features)
+        {
+             ApiResponse<RestApiStringArrayResult> localVarResponse = await DisableFeaturesAsyncWithHttpInfo(appId, features);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> DisableFeaturesAsyncWithHttpInfo (string appId, List<string> features)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling FeaturesApi->DisableFeatures");
+            // verify the required parameter 'features' is set
+            if (features == null)
+                throw new ApiException(400, "Missing required parameter 'features' when calling FeaturesApi->DisableFeatures");
+
+            var localVarPath = "./api/v1.0/{appId}/features/disable";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (features != null && features.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(features); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = features; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DisableFeatures", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>RestApiStringArrayResult</returns>
+        public RestApiStringArrayResult EnableFeatures (string appId, List<string> features)
+        {
+             ApiResponse<RestApiStringArrayResult> localVarResponse = EnableFeaturesWithHttpInfo(appId, features);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>ApiResponse of RestApiStringArrayResult</returns>
+        public ApiResponse< RestApiStringArrayResult > EnableFeaturesWithHttpInfo (string appId, List<string> features)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling FeaturesApi->EnableFeatures");
+            // verify the required parameter 'features' is set
+            if (features == null)
+                throw new ApiException(400, "Missing required parameter 'features' when calling FeaturesApi->EnableFeatures");
+
+            var localVarPath = "./api/v1.0/{appId}/features/enable";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (features != null && features.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(features); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = features; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("EnableFeatures", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>Task of RestApiStringArrayResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringArrayResult> EnableFeaturesAsync (string appId, List<string> features)
+        {
+             ApiResponse<RestApiStringArrayResult> localVarResponse = await EnableFeaturesAsyncWithHttpInfo(appId, features);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="features"></param>
+        /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> EnableFeaturesAsyncWithHttpInfo (string appId, List<string> features)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling FeaturesApi->EnableFeatures");
+            // verify the required parameter 'features' is set
+            if (features == null)
+                throw new ApiException(400, "Missing required parameter 'features' when calling FeaturesApi->EnableFeatures");
+
+            var localVarPath = "./api/v1.0/{appId}/features/enable";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (features != null && features.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(features); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = features; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("EnableFeatures", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/FilesApi.cs b/src/Flipdish/Api/FilesApi.cs
deleted file mode 100644
index c2b9edfc..00000000
--- a/src/Flipdish/Api/FilesApi.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IFilesApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Get file from storage
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="fileId"></param>
-        /// <returns>string</returns>
-        string DownloadFile (string appId, string fileId);
-
-        /// <summary>
-        /// Get file from storage
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="fileId"></param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> DownloadFileWithHttpInfo (string appId, string fileId);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Get file from storage
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="fileId"></param>
-        /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> DownloadFileAsync (string appId, string fileId);
-
-        /// <summary>
-        /// Get file from storage
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="fileId"></param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> DownloadFileAsyncWithHttpInfo (string appId, string fileId);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class FilesApi : IFilesApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FilesApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public FilesApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FilesApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public FilesApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Get file from storage 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="fileId"></param>
-        /// <returns>string</returns>
-        public string DownloadFile (string appId, string fileId)
-        {
-             ApiResponse<string> localVarResponse = DownloadFileWithHttpInfo(appId, fileId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Get file from storage 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="fileId"></param>
-        /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > DownloadFileWithHttpInfo (string appId, string fileId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling FilesApi->DownloadFile");
-            // verify the required parameter 'fileId' is set
-            if (fileId == null)
-                throw new ApiException(400, "Missing required parameter 'fileId' when calling FilesApi->DownloadFile");
-
-            var localVarPath = "/api/v1.0/{appId}/files/download/{fileId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (fileId != null) localVarPathParams.Add("fileId", this.Configuration.ApiClient.ParameterToString(fileId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("DownloadFile", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Get file from storage 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="fileId"></param>
-        /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> DownloadFileAsync (string appId, string fileId)
-        {
-             ApiResponse<string> localVarResponse = await DownloadFileAsyncWithHttpInfo(appId, fileId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Get file from storage 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="fileId"></param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> DownloadFileAsyncWithHttpInfo (string appId, string fileId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling FilesApi->DownloadFile");
-            // verify the required parameter 'fileId' is set
-            if (fileId == null)
-                throw new ApiException(400, "Missing required parameter 'fileId' when calling FilesApi->DownloadFile");
-
-            var localVarPath = "/api/v1.0/{appId}/files/download/{fileId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (fileId != null) localVarPathParams.Add("fileId", this.Configuration.ApiClient.ParameterToString(fileId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("DownloadFile", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/FirebaseAppsApi.cs b/src/Flipdish/Api/FirebaseAppsApi.cs
new file mode 100644
index 00000000..89074585
--- /dev/null
+++ b/src/Flipdish/Api/FirebaseAppsApi.cs
@@ -0,0 +1,733 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IFirebaseAppsApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="firebaseApp"></param>
+        /// <returns>Object</returns>
+        Object FirebaseAppsAddFirebaseApp (FirebaseApp firebaseApp);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="firebaseApp"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> FirebaseAppsAddFirebaseAppWithHttpInfo (FirebaseApp firebaseApp);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelId"></param>
+        /// <returns>Object</returns>
+        Object FirebaseAppsDeleteFirebaseApp (int? whiteLabelId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> FirebaseAppsDeleteFirebaseAppWithHttpInfo (int? whiteLabelId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>Object</returns>
+        Object FirebaseAppsGetFirebaseApp (int? whitelabelId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> FirebaseAppsGetFirebaseAppWithHttpInfo (int? whitelabelId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="firebaseApp"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> FirebaseAppsAddFirebaseAppAsync (FirebaseApp firebaseApp);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="firebaseApp"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> FirebaseAppsAddFirebaseAppAsyncWithHttpInfo (FirebaseApp firebaseApp);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> FirebaseAppsDeleteFirebaseAppAsync (int? whiteLabelId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> FirebaseAppsDeleteFirebaseAppAsyncWithHttpInfo (int? whiteLabelId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> FirebaseAppsGetFirebaseAppAsync (int? whitelabelId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> FirebaseAppsGetFirebaseAppAsyncWithHttpInfo (int? whitelabelId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class FirebaseAppsApi : IFirebaseAppsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FirebaseAppsApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public FirebaseAppsApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FirebaseAppsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public FirebaseAppsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="firebaseApp"></param>
+        /// <returns>Object</returns>
+        public Object FirebaseAppsAddFirebaseApp (FirebaseApp firebaseApp)
+        {
+             ApiResponse<Object> localVarResponse = FirebaseAppsAddFirebaseAppWithHttpInfo(firebaseApp);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="firebaseApp"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > FirebaseAppsAddFirebaseAppWithHttpInfo (FirebaseApp firebaseApp)
+        {
+            // verify the required parameter 'firebaseApp' is set
+            if (firebaseApp == null)
+                throw new ApiException(400, "Missing required parameter 'firebaseApp' when calling FirebaseAppsApi->FirebaseAppsAddFirebaseApp");
+
+            var localVarPath = "./api/v1.0/FirebaseApp";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (firebaseApp != null && firebaseApp.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(firebaseApp); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = firebaseApp; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FirebaseAppsAddFirebaseApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="firebaseApp"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> FirebaseAppsAddFirebaseAppAsync (FirebaseApp firebaseApp)
+        {
+             ApiResponse<Object> localVarResponse = await FirebaseAppsAddFirebaseAppAsyncWithHttpInfo(firebaseApp);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="firebaseApp"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> FirebaseAppsAddFirebaseAppAsyncWithHttpInfo (FirebaseApp firebaseApp)
+        {
+            // verify the required parameter 'firebaseApp' is set
+            if (firebaseApp == null)
+                throw new ApiException(400, "Missing required parameter 'firebaseApp' when calling FirebaseAppsApi->FirebaseAppsAddFirebaseApp");
+
+            var localVarPath = "./api/v1.0/FirebaseApp";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (firebaseApp != null && firebaseApp.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(firebaseApp); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = firebaseApp; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FirebaseAppsAddFirebaseApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelId"></param>
+        /// <returns>Object</returns>
+        public Object FirebaseAppsDeleteFirebaseApp (int? whiteLabelId)
+        {
+             ApiResponse<Object> localVarResponse = FirebaseAppsDeleteFirebaseAppWithHttpInfo(whiteLabelId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > FirebaseAppsDeleteFirebaseAppWithHttpInfo (int? whiteLabelId)
+        {
+            // verify the required parameter 'whiteLabelId' is set
+            if (whiteLabelId == null)
+                throw new ApiException(400, "Missing required parameter 'whiteLabelId' when calling FirebaseAppsApi->FirebaseAppsDeleteFirebaseApp");
+
+            var localVarPath = "./api/v1.0/FirebaseApp/{whiteLabelId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (whiteLabelId != null) localVarPathParams.Add("whiteLabelId", this.Configuration.ApiClient.ParameterToString(whiteLabelId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FirebaseAppsDeleteFirebaseApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> FirebaseAppsDeleteFirebaseAppAsync (int? whiteLabelId)
+        {
+             ApiResponse<Object> localVarResponse = await FirebaseAppsDeleteFirebaseAppAsyncWithHttpInfo(whiteLabelId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> FirebaseAppsDeleteFirebaseAppAsyncWithHttpInfo (int? whiteLabelId)
+        {
+            // verify the required parameter 'whiteLabelId' is set
+            if (whiteLabelId == null)
+                throw new ApiException(400, "Missing required parameter 'whiteLabelId' when calling FirebaseAppsApi->FirebaseAppsDeleteFirebaseApp");
+
+            var localVarPath = "./api/v1.0/FirebaseApp/{whiteLabelId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (whiteLabelId != null) localVarPathParams.Add("whiteLabelId", this.Configuration.ApiClient.ParameterToString(whiteLabelId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FirebaseAppsDeleteFirebaseApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>Object</returns>
+        public Object FirebaseAppsGetFirebaseApp (int? whitelabelId)
+        {
+             ApiResponse<Object> localVarResponse = FirebaseAppsGetFirebaseAppWithHttpInfo(whitelabelId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > FirebaseAppsGetFirebaseAppWithHttpInfo (int? whitelabelId)
+        {
+            // verify the required parameter 'whitelabelId' is set
+            if (whitelabelId == null)
+                throw new ApiException(400, "Missing required parameter 'whitelabelId' when calling FirebaseAppsApi->FirebaseAppsGetFirebaseApp");
+
+            var localVarPath = "./api/v1.0/FirebaseApp/{whitelabelId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (whitelabelId != null) localVarPathParams.Add("whitelabelId", this.Configuration.ApiClient.ParameterToString(whitelabelId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FirebaseAppsGetFirebaseApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> FirebaseAppsGetFirebaseAppAsync (int? whitelabelId)
+        {
+             ApiResponse<Object> localVarResponse = await FirebaseAppsGetFirebaseAppAsyncWithHttpInfo(whitelabelId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whitelabelId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> FirebaseAppsGetFirebaseAppAsyncWithHttpInfo (int? whitelabelId)
+        {
+            // verify the required parameter 'whitelabelId' is set
+            if (whitelabelId == null)
+                throw new ApiException(400, "Missing required parameter 'whitelabelId' when calling FirebaseAppsApi->FirebaseAppsGetFirebaseApp");
+
+            var localVarPath = "./api/v1.0/FirebaseApp/{whitelabelId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (whitelabelId != null) localVarPathParams.Add("whitelabelId", this.Configuration.ApiClient.ParameterToString(whitelabelId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FirebaseAppsGetFirebaseApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/FpmApi.cs b/src/Flipdish/Api/FpmApi.cs
new file mode 100644
index 00000000..69f0676a
--- /dev/null
+++ b/src/Flipdish/Api/FpmApi.cs
@@ -0,0 +1,954 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IFpmApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Object</returns>
+        Object CreateFpmForStore (int? storeId, string phoneNumber);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> CreateFpmForStoreWithHttpInfo (int? storeId, string phoneNumber);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns></returns>
+        void DeleteFpmForStore (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> DeleteFpmForStoreWithHttpInfo (int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="telephonyConfig"></param>
+        /// <returns></returns>
+        void EditFpmForStore (int? storeId, TelephonyConfig telephonyConfig);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="telephonyConfig"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> EditFpmForStoreWithHttpInfo (int? storeId, TelephonyConfig telephonyConfig);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>TelephonyConfig</returns>
+        TelephonyConfig GetFpmForStore (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of TelephonyConfig</returns>
+        ApiResponse<TelephonyConfig> GetFpmForStoreWithHttpInfo (int? storeId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> CreateFpmForStoreAsync (int? storeId, string phoneNumber);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateFpmForStoreAsyncWithHttpInfo (int? storeId, string phoneNumber);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task DeleteFpmForStoreAsync (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DeleteFpmForStoreAsyncWithHttpInfo (int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="telephonyConfig"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task EditFpmForStoreAsync (int? storeId, TelephonyConfig telephonyConfig);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="telephonyConfig"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> EditFpmForStoreAsyncWithHttpInfo (int? storeId, TelephonyConfig telephonyConfig);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of TelephonyConfig</returns>
+        System.Threading.Tasks.Task<TelephonyConfig> GetFpmForStoreAsync (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (TelephonyConfig)</returns>
+        System.Threading.Tasks.Task<ApiResponse<TelephonyConfig>> GetFpmForStoreAsyncWithHttpInfo (int? storeId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class FpmApi : IFpmApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FpmApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public FpmApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FpmApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public FpmApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Object</returns>
+        public Object CreateFpmForStore (int? storeId, string phoneNumber)
+        {
+             ApiResponse<Object> localVarResponse = CreateFpmForStoreWithHttpInfo(storeId, phoneNumber);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > CreateFpmForStoreWithHttpInfo (int? storeId, string phoneNumber)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling FpmApi->CreateFpmForStore");
+            // verify the required parameter 'phoneNumber' is set
+            if (phoneNumber == null)
+                throw new ApiException(400, "Missing required parameter 'phoneNumber' when calling FpmApi->CreateFpmForStore");
+
+            var localVarPath = "./api/v1.0/{storeId}/fpm";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (phoneNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "phoneNumber", phoneNumber)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateFpmForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> CreateFpmForStoreAsync (int? storeId, string phoneNumber)
+        {
+             ApiResponse<Object> localVarResponse = await CreateFpmForStoreAsyncWithHttpInfo(storeId, phoneNumber);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="phoneNumber"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateFpmForStoreAsyncWithHttpInfo (int? storeId, string phoneNumber)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling FpmApi->CreateFpmForStore");
+            // verify the required parameter 'phoneNumber' is set
+            if (phoneNumber == null)
+                throw new ApiException(400, "Missing required parameter 'phoneNumber' when calling FpmApi->CreateFpmForStore");
+
+            var localVarPath = "./api/v1.0/{storeId}/fpm";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (phoneNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "phoneNumber", phoneNumber)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateFpmForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns></returns>
+        public void DeleteFpmForStore (int? storeId)
+        {
+             DeleteFpmForStoreWithHttpInfo(storeId);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> DeleteFpmForStoreWithHttpInfo (int? storeId)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling FpmApi->DeleteFpmForStore");
+
+            var localVarPath = "./api/v1.0/{storeId}/fpm";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteFpmForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task DeleteFpmForStoreAsync (int? storeId)
+        {
+             await DeleteFpmForStoreAsyncWithHttpInfo(storeId);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteFpmForStoreAsyncWithHttpInfo (int? storeId)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling FpmApi->DeleteFpmForStore");
+
+            var localVarPath = "./api/v1.0/{storeId}/fpm";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteFpmForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="telephonyConfig"></param>
+        /// <returns></returns>
+        public void EditFpmForStore (int? storeId, TelephonyConfig telephonyConfig)
+        {
+             EditFpmForStoreWithHttpInfo(storeId, telephonyConfig);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="telephonyConfig"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> EditFpmForStoreWithHttpInfo (int? storeId, TelephonyConfig telephonyConfig)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling FpmApi->EditFpmForStore");
+            // verify the required parameter 'telephonyConfig' is set
+            if (telephonyConfig == null)
+                throw new ApiException(400, "Missing required parameter 'telephonyConfig' when calling FpmApi->EditFpmForStore");
+
+            var localVarPath = "./api/v1.0/{storeId}/fpm/edit";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (telephonyConfig != null && telephonyConfig.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(telephonyConfig); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = telephonyConfig; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("EditFpmForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="telephonyConfig"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task EditFpmForStoreAsync (int? storeId, TelephonyConfig telephonyConfig)
+        {
+             await EditFpmForStoreAsyncWithHttpInfo(storeId, telephonyConfig);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="telephonyConfig"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> EditFpmForStoreAsyncWithHttpInfo (int? storeId, TelephonyConfig telephonyConfig)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling FpmApi->EditFpmForStore");
+            // verify the required parameter 'telephonyConfig' is set
+            if (telephonyConfig == null)
+                throw new ApiException(400, "Missing required parameter 'telephonyConfig' when calling FpmApi->EditFpmForStore");
+
+            var localVarPath = "./api/v1.0/{storeId}/fpm/edit";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (telephonyConfig != null && telephonyConfig.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(telephonyConfig); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = telephonyConfig; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("EditFpmForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>TelephonyConfig</returns>
+        public TelephonyConfig GetFpmForStore (int? storeId)
+        {
+             ApiResponse<TelephonyConfig> localVarResponse = GetFpmForStoreWithHttpInfo(storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of TelephonyConfig</returns>
+        public ApiResponse< TelephonyConfig > GetFpmForStoreWithHttpInfo (int? storeId)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling FpmApi->GetFpmForStore");
+
+            var localVarPath = "./api/v1.0/{storeId}/fpm";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetFpmForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<TelephonyConfig>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (TelephonyConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(TelephonyConfig)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of TelephonyConfig</returns>
+        public async System.Threading.Tasks.Task<TelephonyConfig> GetFpmForStoreAsync (int? storeId)
+        {
+             ApiResponse<TelephonyConfig> localVarResponse = await GetFpmForStoreAsyncWithHttpInfo(storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (TelephonyConfig)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<TelephonyConfig>> GetFpmForStoreAsyncWithHttpInfo (int? storeId)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling FpmApi->GetFpmForStore");
+
+            var localVarPath = "./api/v1.0/{storeId}/fpm";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetFpmForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<TelephonyConfig>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (TelephonyConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(TelephonyConfig)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/FulfillmentStateConfigurationApi.cs b/src/Flipdish/Api/FulfillmentStateConfigurationApi.cs
index fe0addc9..aeb65e67 100644
--- a/src/Flipdish/Api/FulfillmentStateConfigurationApi.cs
+++ b/src/Flipdish/Api/FulfillmentStateConfigurationApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,235 +25,277 @@ public interface IFulfillmentStateConfigurationApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="fulfillmentStateConfiguration">Fulfillment state configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="fulfillmentStateConfiguration"></param>
         /// <returns>RestApiResultFulfillmentStatesConfiguration</returns>
-        RestApiResultFulfillmentStatesConfiguration CreateFulfillmentStatesConfig (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration);
+        RestApiResultFulfillmentStatesConfiguration CreateFulfillmentStatesConfig (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration);
 
         /// <summary>
-        /// Create fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="fulfillmentStateConfiguration">Fulfillment state configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="fulfillmentStateConfiguration"></param>
         /// <returns>ApiResponse of RestApiResultFulfillmentStatesConfiguration</returns>
-        ApiResponse<RestApiResultFulfillmentStatesConfiguration> CreateFulfillmentStatesConfigWithHttpInfo (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration);
+        ApiResponse<RestApiResultFulfillmentStatesConfiguration> CreateFulfillmentStatesConfigWithHttpInfo (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration);
         /// <summary>
-        /// Delete fulfillment states configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>RestApiStringResult</returns>
         RestApiStringResult DeleteFulfillmentStatesConfig (string appId, string configId);
 
         /// <summary>
-        /// Delete fulfillment states configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         ApiResponse<RestApiStringResult> DeleteFulfillmentStatesConfigWithHttpInfo (string appId, string configId);
         /// <summary>
-        /// Get fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>FulfillmentStatesConfiguration</returns>
         FulfillmentStatesConfiguration GetFulfillmentStatesConfiguration (string appId, string configId);
 
         /// <summary>
-        /// Get fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>ApiResponse of FulfillmentStatesConfiguration</returns>
         ApiResponse<FulfillmentStatesConfiguration> GetFulfillmentStatesConfigurationWithHttpInfo (string appId, string configId);
         /// <summary>
-        /// List fulfillment configurations for AppId
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
+        /// <param name="appId"></param>
+        /// <returns>FulfillmentStatesConfiguration</returns>
+        FulfillmentStatesConfiguration GetFulfillmentStatesConfigurationTemplate (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of FulfillmentStatesConfiguration</returns>
+        ApiResponse<FulfillmentStatesConfiguration> GetFulfillmentStatesConfigurationTemplateWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultFulfillmentStatesConfigurationSummary</returns>
         RestApiArrayResultFulfillmentStatesConfigurationSummary SearchFulfillmentStatesConfigurations (string appId);
 
         /// <summary>
-        /// List fulfillment configurations for AppId
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultFulfillmentStatesConfigurationSummary</returns>
         ApiResponse<RestApiArrayResultFulfillmentStatesConfigurationSummary> SearchFulfillmentStatesConfigurationsWithHttpInfo (string appId);
         /// <summary>
-        /// Update fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
-        /// <param name="updateFulfillmentStatesConfiguration">Update fulfillment states configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateFulfillmentStatesConfiguration"></param>
         /// <returns></returns>
         void UpdateFulfillmentStatesConfig (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration);
 
         /// <summary>
-        /// Update fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
-        /// <param name="updateFulfillmentStatesConfiguration">Update fulfillment states configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateFulfillmentStatesConfiguration"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateFulfillmentStatesConfigWithHttpInfo (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="fulfillmentStateConfiguration">Fulfillment state configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="fulfillmentStateConfiguration"></param>
         /// <returns>Task of RestApiResultFulfillmentStatesConfiguration</returns>
-        System.Threading.Tasks.Task<RestApiResultFulfillmentStatesConfiguration> CreateFulfillmentStatesConfigAsync (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration);
+        System.Threading.Tasks.Task<RestApiResultFulfillmentStatesConfiguration> CreateFulfillmentStatesConfigAsync (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration);
 
         /// <summary>
-        /// Create fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="fulfillmentStateConfiguration">Fulfillment state configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="fulfillmentStateConfiguration"></param>
         /// <returns>Task of ApiResponse (RestApiResultFulfillmentStatesConfiguration)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultFulfillmentStatesConfiguration>> CreateFulfillmentStatesConfigAsyncWithHttpInfo (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration);
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultFulfillmentStatesConfiguration>> CreateFulfillmentStatesConfigAsyncWithHttpInfo (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration);
         /// <summary>
-        /// Delete fulfillment states configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         System.Threading.Tasks.Task<RestApiStringResult> DeleteFulfillmentStatesConfigAsync (string appId, string configId);
 
         /// <summary>
-        /// Delete fulfillment states configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> DeleteFulfillmentStatesConfigAsyncWithHttpInfo (string appId, string configId);
         /// <summary>
-        /// Get fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of FulfillmentStatesConfiguration</returns>
         System.Threading.Tasks.Task<FulfillmentStatesConfiguration> GetFulfillmentStatesConfigurationAsync (string appId, string configId);
 
         /// <summary>
-        /// Get fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of ApiResponse (FulfillmentStatesConfiguration)</returns>
         System.Threading.Tasks.Task<ApiResponse<FulfillmentStatesConfiguration>> GetFulfillmentStatesConfigurationAsyncWithHttpInfo (string appId, string configId);
         /// <summary>
-        /// List fulfillment configurations for AppId
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of FulfillmentStatesConfiguration</returns>
+        System.Threading.Tasks.Task<FulfillmentStatesConfiguration> GetFulfillmentStatesConfigurationTemplateAsync (string appId);
+
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (FulfillmentStatesConfiguration)</returns>
+        System.Threading.Tasks.Task<ApiResponse<FulfillmentStatesConfiguration>> GetFulfillmentStatesConfigurationTemplateAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultFulfillmentStatesConfigurationSummary</returns>
         System.Threading.Tasks.Task<RestApiArrayResultFulfillmentStatesConfigurationSummary> SearchFulfillmentStatesConfigurationsAsync (string appId);
 
         /// <summary>
-        /// List fulfillment configurations for AppId
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultFulfillmentStatesConfigurationSummary)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultFulfillmentStatesConfigurationSummary>> SearchFulfillmentStatesConfigurationsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Update fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
-        /// <param name="updateFulfillmentStatesConfiguration">Update fulfillment states configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateFulfillmentStatesConfiguration"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateFulfillmentStatesConfigAsync (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration);
 
         /// <summary>
-        /// Update fulfillment configuration
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
-        /// <param name="updateFulfillmentStatesConfiguration">Update fulfillment states configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateFulfillmentStatesConfiguration"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateFulfillmentStatesConfigAsyncWithHttpInfo (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration);
         #endregion Asynchronous Operations
@@ -357,26 +399,26 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="fulfillmentStateConfiguration">Fulfillment state configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="fulfillmentStateConfiguration"></param>
         /// <returns>RestApiResultFulfillmentStatesConfiguration</returns>
-        public RestApiResultFulfillmentStatesConfiguration CreateFulfillmentStatesConfig (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration)
+        public RestApiResultFulfillmentStatesConfiguration CreateFulfillmentStatesConfig (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration)
         {
              ApiResponse<RestApiResultFulfillmentStatesConfiguration> localVarResponse = CreateFulfillmentStatesConfigWithHttpInfo(appId, fulfillmentStateConfiguration);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Create fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="fulfillmentStateConfiguration">Fulfillment state configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="fulfillmentStateConfiguration"></param>
         /// <returns>ApiResponse of RestApiResultFulfillmentStatesConfiguration</returns>
-        public ApiResponse< RestApiResultFulfillmentStatesConfiguration > CreateFulfillmentStatesConfigWithHttpInfo (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration)
+        public ApiResponse< RestApiResultFulfillmentStatesConfiguration > CreateFulfillmentStatesConfigWithHttpInfo (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
@@ -385,7 +427,7 @@ public ApiResponse< RestApiResultFulfillmentStatesConfiguration > CreateFulfillm
             if (fulfillmentStateConfiguration == null)
                 throw new ApiException(400, "Missing required parameter 'fulfillmentStateConfiguration' when calling FulfillmentStateConfigurationApi->CreateFulfillmentStatesConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -445,18 +487,18 @@ public ApiResponse< RestApiResultFulfillmentStatesConfiguration > CreateFulfillm
             }
 
             return new ApiResponse<RestApiResultFulfillmentStatesConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultFulfillmentStatesConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultFulfillmentStatesConfiguration)));
         }
 
         /// <summary>
-        /// Create fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="fulfillmentStateConfiguration">Fulfillment state configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="fulfillmentStateConfiguration"></param>
         /// <returns>Task of RestApiResultFulfillmentStatesConfiguration</returns>
-        public async System.Threading.Tasks.Task<RestApiResultFulfillmentStatesConfiguration> CreateFulfillmentStatesConfigAsync (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration)
+        public async System.Threading.Tasks.Task<RestApiResultFulfillmentStatesConfiguration> CreateFulfillmentStatesConfigAsync (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration)
         {
              ApiResponse<RestApiResultFulfillmentStatesConfiguration> localVarResponse = await CreateFulfillmentStatesConfigAsyncWithHttpInfo(appId, fulfillmentStateConfiguration);
              return localVarResponse.Data;
@@ -464,13 +506,13 @@ public async System.Threading.Tasks.Task<RestApiResultFulfillmentStatesConfigura
         }
 
         /// <summary>
-        /// Create fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="fulfillmentStateConfiguration">Fulfillment state configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="fulfillmentStateConfiguration"></param>
         /// <returns>Task of ApiResponse (RestApiResultFulfillmentStatesConfiguration)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultFulfillmentStatesConfiguration>> CreateFulfillmentStatesConfigAsyncWithHttpInfo (string appId, FulfillmentStatesConfigurationCreateBase fulfillmentStateConfiguration)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultFulfillmentStatesConfiguration>> CreateFulfillmentStatesConfigAsyncWithHttpInfo (string appId, CreateFulfillmentStatesConfiguration fulfillmentStateConfiguration)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
@@ -479,7 +521,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultFulfillmentSta
             if (fulfillmentStateConfiguration == null)
                 throw new ApiException(400, "Missing required parameter 'fulfillmentStateConfiguration' when calling FulfillmentStateConfigurationApi->CreateFulfillmentStatesConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -539,16 +581,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultFulfillmentSta
             }
 
             return new ApiResponse<RestApiResultFulfillmentStatesConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultFulfillmentStatesConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultFulfillmentStatesConfiguration)));
         }
 
         /// <summary>
-        /// Delete fulfillment states configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>RestApiStringResult</returns>
         public RestApiStringResult DeleteFulfillmentStatesConfig (string appId, string configId)
         {
@@ -557,11 +599,11 @@ public RestApiStringResult DeleteFulfillmentStatesConfig (string appId, string c
         }
 
         /// <summary>
-        /// Delete fulfillment states configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         public ApiResponse< RestApiStringResult > DeleteFulfillmentStatesConfigWithHttpInfo (string appId, string configId)
         {
@@ -572,7 +614,7 @@ public ApiResponse< RestApiStringResult > DeleteFulfillmentStatesConfigWithHttpI
             if (configId == null)
                 throw new ApiException(400, "Missing required parameter 'configId' when calling FulfillmentStateConfigurationApi->DeleteFulfillmentStatesConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -620,16 +662,16 @@ public ApiResponse< RestApiStringResult > DeleteFulfillmentStatesConfigWithHttpI
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Delete fulfillment states configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         public async System.Threading.Tasks.Task<RestApiStringResult> DeleteFulfillmentStatesConfigAsync (string appId, string configId)
         {
@@ -639,11 +681,11 @@ public async System.Threading.Tasks.Task<RestApiStringResult> DeleteFulfillmentS
         }
 
         /// <summary>
-        /// Delete fulfillment states configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> DeleteFulfillmentStatesConfigAsyncWithHttpInfo (string appId, string configId)
         {
@@ -654,7 +696,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Delet
             if (configId == null)
                 throw new ApiException(400, "Missing required parameter 'configId' when calling FulfillmentStateConfigurationApi->DeleteFulfillmentStatesConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -702,16 +744,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Delet
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>FulfillmentStatesConfiguration</returns>
         public FulfillmentStatesConfiguration GetFulfillmentStatesConfiguration (string appId, string configId)
         {
@@ -720,11 +762,11 @@ public FulfillmentStatesConfiguration GetFulfillmentStatesConfiguration (string
         }
 
         /// <summary>
-        /// Get fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>ApiResponse of FulfillmentStatesConfiguration</returns>
         public ApiResponse< FulfillmentStatesConfiguration > GetFulfillmentStatesConfigurationWithHttpInfo (string appId, string configId)
         {
@@ -735,7 +777,7 @@ public ApiResponse< FulfillmentStatesConfiguration > GetFulfillmentStatesConfigu
             if (configId == null)
                 throw new ApiException(400, "Missing required parameter 'configId' when calling FulfillmentStateConfigurationApi->GetFulfillmentStatesConfiguration");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -783,16 +825,16 @@ public ApiResponse< FulfillmentStatesConfiguration > GetFulfillmentStatesConfigu
             }
 
             return new ApiResponse<FulfillmentStatesConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (FulfillmentStatesConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(FulfillmentStatesConfiguration)));
         }
 
         /// <summary>
-        /// Get fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of FulfillmentStatesConfiguration</returns>
         public async System.Threading.Tasks.Task<FulfillmentStatesConfiguration> GetFulfillmentStatesConfigurationAsync (string appId, string configId)
         {
@@ -802,11 +844,11 @@ public async System.Threading.Tasks.Task<FulfillmentStatesConfiguration> GetFulf
         }
 
         /// <summary>
-        /// Get fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">App store app configuration id</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
         /// <returns>Task of ApiResponse (FulfillmentStatesConfiguration)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<FulfillmentStatesConfiguration>> GetFulfillmentStatesConfigurationAsyncWithHttpInfo (string appId, string configId)
         {
@@ -817,7 +859,7 @@ public async System.Threading.Tasks.Task<ApiResponse<FulfillmentStatesConfigurat
             if (configId == null)
                 throw new ApiException(400, "Missing required parameter 'configId' when calling FulfillmentStateConfigurationApi->GetFulfillmentStatesConfiguration");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -865,15 +907,166 @@ public async System.Threading.Tasks.Task<ApiResponse<FulfillmentStatesConfigurat
             }
 
             return new ApiResponse<FulfillmentStatesConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (FulfillmentStatesConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(FulfillmentStatesConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>FulfillmentStatesConfiguration</returns>
+        public FulfillmentStatesConfiguration GetFulfillmentStatesConfigurationTemplate (string appId)
+        {
+             ApiResponse<FulfillmentStatesConfiguration> localVarResponse = GetFulfillmentStatesConfigurationTemplateWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of FulfillmentStatesConfiguration</returns>
+        public ApiResponse< FulfillmentStatesConfiguration > GetFulfillmentStatesConfigurationTemplateWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling FulfillmentStateConfigurationApi->GetFulfillmentStatesConfigurationTemplate");
+
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states_template";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetFulfillmentStatesConfigurationTemplate", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<FulfillmentStatesConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (FulfillmentStatesConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(FulfillmentStatesConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of FulfillmentStatesConfiguration</returns>
+        public async System.Threading.Tasks.Task<FulfillmentStatesConfiguration> GetFulfillmentStatesConfigurationTemplateAsync (string appId)
+        {
+             ApiResponse<FulfillmentStatesConfiguration> localVarResponse = await GetFulfillmentStatesConfigurationTemplateAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (FulfillmentStatesConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<FulfillmentStatesConfiguration>> GetFulfillmentStatesConfigurationTemplateAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling FulfillmentStateConfigurationApi->GetFulfillmentStatesConfigurationTemplate");
+
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states_template";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetFulfillmentStatesConfigurationTemplate", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<FulfillmentStatesConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (FulfillmentStatesConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(FulfillmentStatesConfiguration)));
         }
 
         /// <summary>
-        /// List fulfillment configurations for AppId [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiArrayResultFulfillmentStatesConfigurationSummary</returns>
         public RestApiArrayResultFulfillmentStatesConfigurationSummary SearchFulfillmentStatesConfigurations (string appId)
         {
@@ -882,10 +1075,10 @@ public RestApiArrayResultFulfillmentStatesConfigurationSummary SearchFulfillment
         }
 
         /// <summary>
-        /// List fulfillment configurations for AppId [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultFulfillmentStatesConfigurationSummary</returns>
         public ApiResponse< RestApiArrayResultFulfillmentStatesConfigurationSummary > SearchFulfillmentStatesConfigurationsWithHttpInfo (string appId)
         {
@@ -893,7 +1086,7 @@ public ApiResponse< RestApiArrayResultFulfillmentStatesConfigurationSummary > Se
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling FulfillmentStateConfigurationApi->SearchFulfillmentStatesConfigurations");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -940,15 +1133,15 @@ public ApiResponse< RestApiArrayResultFulfillmentStatesConfigurationSummary > Se
             }
 
             return new ApiResponse<RestApiArrayResultFulfillmentStatesConfigurationSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultFulfillmentStatesConfigurationSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultFulfillmentStatesConfigurationSummary)));
         }
 
         /// <summary>
-        /// List fulfillment configurations for AppId [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultFulfillmentStatesConfigurationSummary</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultFulfillmentStatesConfigurationSummary> SearchFulfillmentStatesConfigurationsAsync (string appId)
         {
@@ -958,10 +1151,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultFulfillmentStatesConf
         }
 
         /// <summary>
-        /// List fulfillment configurations for AppId [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultFulfillmentStatesConfigurationSummary)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultFulfillmentStatesConfigurationSummary>> SearchFulfillmentStatesConfigurationsAsyncWithHttpInfo (string appId)
         {
@@ -969,7 +1162,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultFulfillme
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling FulfillmentStateConfigurationApi->SearchFulfillmentStatesConfigurations");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1016,17 +1209,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultFulfillme
             }
 
             return new ApiResponse<RestApiArrayResultFulfillmentStatesConfigurationSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultFulfillmentStatesConfigurationSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultFulfillmentStatesConfigurationSummary)));
         }
 
         /// <summary>
-        /// Update fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
-        /// <param name="updateFulfillmentStatesConfiguration">Update fulfillment states configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateFulfillmentStatesConfiguration"></param>
         /// <returns></returns>
         public void UpdateFulfillmentStatesConfig (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration)
         {
@@ -1034,12 +1227,12 @@ public void UpdateFulfillmentStatesConfig (string appId, string configId, Update
         }
 
         /// <summary>
-        /// Update fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
-        /// <param name="updateFulfillmentStatesConfiguration">Update fulfillment states configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateFulfillmentStatesConfiguration"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateFulfillmentStatesConfigWithHttpInfo (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration)
         {
@@ -1053,7 +1246,7 @@ public ApiResponse<Object> UpdateFulfillmentStatesConfigWithHttpInfo (string app
             if (updateFulfillmentStatesConfiguration == null)
                 throw new ApiException(400, "Missing required parameter 'updateFulfillmentStatesConfiguration' when calling FulfillmentStateConfigurationApi->UpdateFulfillmentStatesConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1114,17 +1307,17 @@ public ApiResponse<Object> UpdateFulfillmentStatesConfigWithHttpInfo (string app
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
-        /// <param name="updateFulfillmentStatesConfiguration">Update fulfillment states configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateFulfillmentStatesConfiguration"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateFulfillmentStatesConfigAsync (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration)
         {
@@ -1133,12 +1326,12 @@ public async System.Threading.Tasks.Task UpdateFulfillmentStatesConfigAsync (str
         }
 
         /// <summary>
-        /// Update fulfillment configuration [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App id</param>
-        /// <param name="configId">Fulfillment states configuration id</param>
-        /// <param name="updateFulfillmentStatesConfiguration">Update fulfillment states configuration</param>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="updateFulfillmentStatesConfiguration"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateFulfillmentStatesConfigAsyncWithHttpInfo (string appId, string configId, UpdateFulfillmentStatesConfiguration updateFulfillmentStatesConfiguration)
         {
@@ -1152,7 +1345,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateFulfillmentS
             if (updateFulfillmentStatesConfiguration == null)
                 throw new ApiException(400, "Missing required parameter 'updateFulfillmentStatesConfiguration' when calling FulfillmentStateConfigurationApi->UpdateFulfillmentStatesConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
+            var localVarPath = "./api/v1.0/{appId}/fulfillment/configuration/states/{configId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1213,7 +1406,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateFulfillmentS
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/HealthApi.cs b/src/Flipdish/Api/HealthApi.cs
deleted file mode 100644
index 50321ff0..00000000
--- a/src/Flipdish/Api/HealthApi.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IHealthApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Object</returns>
-        Object HealthCheck ();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> HealthCheckWithHttpInfo ();
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> HealthCheckAsync ();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> HealthCheckAsyncWithHttpInfo ();
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class HealthApi : IHealthApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HealthApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public HealthApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HealthApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public HealthApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Object</returns>
-        public Object HealthCheck ()
-        {
-             ApiResponse<Object> localVarResponse = HealthCheckWithHttpInfo();
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > HealthCheckWithHttpInfo ()
-        {
-
-            var localVarPath = "/api/v1.0/health/HealthCheck";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("HealthCheck", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> HealthCheckAsync ()
-        {
-             ApiResponse<Object> localVarResponse = await HealthCheckAsyncWithHttpInfo();
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> HealthCheckAsyncWithHttpInfo ()
-        {
-
-            var localVarPath = "/api/v1.0/health/HealthCheck";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("HealthCheck", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/HeartbeatApi.cs b/src/Flipdish/Api/HeartbeatApi.cs
index 3521cc65..824beba1 100644
--- a/src/Flipdish/Api/HeartbeatApi.cs
+++ b/src/Flipdish/Api/HeartbeatApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -297,7 +297,7 @@ public Object HeadHostname ()
         public ApiResponse< Object > HeadHostnameWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/heartbeat/Hostname";
+            var localVarPath = "./api/v1.0/heartbeat/Hostname";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -343,7 +343,7 @@ public ApiResponse< Object > HeadHostnameWithHttpInfo ()
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -367,7 +367,7 @@ public async System.Threading.Tasks.Task<Object> HeadHostnameAsync ()
         public async System.Threading.Tasks.Task<ApiResponse<Object>> HeadHostnameAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/heartbeat/Hostname";
+            var localVarPath = "./api/v1.0/heartbeat/Hostname";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -413,7 +413,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> HeadHostnameAsyncW
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -436,7 +436,7 @@ public RestApiStringResult HeadPing ()
         public ApiResponse< RestApiStringResult > HeadPingWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/heartbeat";
+            var localVarPath = "./api/v1.0/heartbeat";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -482,7 +482,7 @@ public ApiResponse< RestApiStringResult > HeadPingWithHttpInfo ()
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -506,7 +506,7 @@ public async System.Threading.Tasks.Task<RestApiStringResult> HeadPingAsync ()
         public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> HeadPingAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/heartbeat";
+            var localVarPath = "./api/v1.0/heartbeat";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -552,7 +552,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> HeadP
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -575,7 +575,7 @@ public Object Hostname ()
         public ApiResponse< Object > HostnameWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/heartbeat/Hostname";
+            var localVarPath = "./api/v1.0/heartbeat/Hostname";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -621,7 +621,7 @@ public ApiResponse< Object > HostnameWithHttpInfo ()
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -645,7 +645,7 @@ public async System.Threading.Tasks.Task<Object> HostnameAsync ()
         public async System.Threading.Tasks.Task<ApiResponse<Object>> HostnameAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/heartbeat/Hostname";
+            var localVarPath = "./api/v1.0/heartbeat/Hostname";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -691,7 +691,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> HostnameAsyncWithH
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -714,7 +714,7 @@ public RestApiStringResult Ping ()
         public ApiResponse< RestApiStringResult > PingWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/heartbeat";
+            var localVarPath = "./api/v1.0/heartbeat";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -760,7 +760,7 @@ public ApiResponse< RestApiStringResult > PingWithHttpInfo ()
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -784,7 +784,7 @@ public async System.Threading.Tasks.Task<RestApiStringResult> PingAsync ()
         public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> PingAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/heartbeat";
+            var localVarPath = "./api/v1.0/heartbeat";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -830,7 +830,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> PingA
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
diff --git a/src/Flipdish/Api/HomeApi.cs b/src/Flipdish/Api/HomeApi.cs
index 69a6e735..35a8e6e5 100644
--- a/src/Flipdish/Api/HomeApi.cs
+++ b/src/Flipdish/Api/HomeApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,179 +25,179 @@ public interface IHomeApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// [PRIVATE API] Complete Home Action
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="homeActionId">Id of the action</param>
+        /// <param name="appId"></param>
+        /// <param name="homeActionId"></param>
         /// <param name="isDismissed"></param>
         /// <returns>Object</returns>
         Object CompleteHomeAction (string appId, int? homeActionId, bool? isDismissed);
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="homeActionId">Id of the action</param>
+        /// <param name="appId"></param>
+        /// <param name="homeActionId"></param>
         /// <param name="isDismissed"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> CompleteHomeActionWithHttpInfo (string appId, int? homeActionId, bool? isDismissed);
         /// <summary>
-        /// [PRIVATE API] Complete Home Action
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Object</returns>
-        Object DismissOldPortalAction ();
+        /// <param name="appId"></param>
+        /// <returns>RestApiArrayResultHomeAction</returns>
+        RestApiArrayResultHomeAction GetHomeActions (string appId);
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> DismissOldPortalActionWithHttpInfo ();
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultHomeAction</returns>
+        ApiResponse<RestApiArrayResultHomeAction> GetHomeActionsWithHttpInfo (string appId);
         /// <summary>
-        /// [PRIVATE API] Get Home Actions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>RestApiArrayResultHomeAction</returns>
-        RestApiArrayResultHomeAction GetHomeActions (string appId);
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultHomeStatistics</returns>
+        RestApiResultHomeStatistics GetHomeStatistics (string appId);
 
         /// <summary>
-        /// [PRIVATE API] Get Home Actions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>ApiResponse of RestApiArrayResultHomeAction</returns>
-        ApiResponse<RestApiArrayResultHomeAction> GetHomeActionsWithHttpInfo (string appId);
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultHomeStatistics</returns>
+        ApiResponse<RestApiResultHomeStatistics> GetHomeStatisticsWithHttpInfo (string appId);
         /// <summary>
-        /// [PRIVATE API] Get Home Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>RestApiResultHomeStatistics</returns>
-        RestApiResultHomeStatistics GetHomeStatistics (string appId);
+        /// <returns>RestApiResultOktaPortalFeatureFlag</returns>
+        RestApiResultOktaPortalFeatureFlag GetOktaPortalFeatureFlag ();
 
         /// <summary>
-        /// [PRIVATE API] Get Home Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>ApiResponse of RestApiResultHomeStatistics</returns>
-        ApiResponse<RestApiResultHomeStatistics> GetHomeStatisticsWithHttpInfo (string appId);
+        /// <returns>ApiResponse of RestApiResultOktaPortalFeatureFlag</returns>
+        ApiResponse<RestApiResultOktaPortalFeatureFlag> GetOktaPortalFeatureFlagWithHttpInfo ();
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// [PRIVATE API] Complete Home Action
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="homeActionId">Id of the action</param>
+        /// <param name="appId"></param>
+        /// <param name="homeActionId"></param>
         /// <param name="isDismissed"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> CompleteHomeActionAsync (string appId, int? homeActionId, bool? isDismissed);
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="homeActionId">Id of the action</param>
+        /// <param name="appId"></param>
+        /// <param name="homeActionId"></param>
         /// <param name="isDismissed"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> CompleteHomeActionAsyncWithHttpInfo (string appId, int? homeActionId, bool? isDismissed);
         /// <summary>
-        /// [PRIVATE API] Complete Home Action
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> DismissOldPortalActionAsync ();
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiArrayResultHomeAction</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultHomeAction> GetHomeActionsAsync (string appId);
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> DismissOldPortalActionAsyncWithHttpInfo ();
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultHomeAction)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultHomeAction>> GetHomeActionsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// [PRIVATE API] Get Home Actions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of RestApiArrayResultHomeAction</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultHomeAction> GetHomeActionsAsync (string appId);
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultHomeStatistics</returns>
+        System.Threading.Tasks.Task<RestApiResultHomeStatistics> GetHomeStatisticsAsync (string appId);
 
         /// <summary>
-        /// [PRIVATE API] Get Home Actions
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultHomeAction)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultHomeAction>> GetHomeActionsAsyncWithHttpInfo (string appId);
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultHomeStatistics)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultHomeStatistics>> GetHomeStatisticsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// [PRIVATE API] Get Home Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of RestApiResultHomeStatistics</returns>
-        System.Threading.Tasks.Task<RestApiResultHomeStatistics> GetHomeStatisticsAsync (string appId);
+        /// <returns>Task of RestApiResultOktaPortalFeatureFlag</returns>
+        System.Threading.Tasks.Task<RestApiResultOktaPortalFeatureFlag> GetOktaPortalFeatureFlagAsync ();
 
         /// <summary>
-        /// [PRIVATE API] Get Home Statistics
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of ApiResponse (RestApiResultHomeStatistics)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultHomeStatistics>> GetHomeStatisticsAsyncWithHttpInfo (string appId);
+        /// <returns>Task of ApiResponse (RestApiResultOktaPortalFeatureFlag)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultOktaPortalFeatureFlag>> GetOktaPortalFeatureFlagAsyncWithHttpInfo ();
         #endregion Asynchronous Operations
     }
 
@@ -299,11 +299,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="homeActionId">Id of the action</param>
+        /// <param name="appId"></param>
+        /// <param name="homeActionId"></param>
         /// <param name="isDismissed"></param>
         /// <returns>Object</returns>
         public Object CompleteHomeAction (string appId, int? homeActionId, bool? isDismissed)
@@ -313,11 +313,11 @@ public Object CompleteHomeAction (string appId, int? homeActionId, bool? isDismi
         }
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="homeActionId">Id of the action</param>
+        /// <param name="appId"></param>
+        /// <param name="homeActionId"></param>
         /// <param name="isDismissed"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > CompleteHomeActionWithHttpInfo (string appId, int? homeActionId, bool? isDismissed)
@@ -332,7 +332,7 @@ public ApiResponse< Object > CompleteHomeActionWithHttpInfo (string appId, int?
             if (isDismissed == null)
                 throw new ApiException(400, "Missing required parameter 'isDismissed' when calling HomeApi->CompleteHomeAction");
 
-            var localVarPath = "/api/v1.0/{appId}/home/{homeActionId}";
+            var localVarPath = "./api/v1.0/{appId}/home/{homeActionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -381,16 +381,16 @@ public ApiResponse< Object > CompleteHomeActionWithHttpInfo (string appId, int?
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="homeActionId">Id of the action</param>
+        /// <param name="appId"></param>
+        /// <param name="homeActionId"></param>
         /// <param name="isDismissed"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> CompleteHomeActionAsync (string appId, int? homeActionId, bool? isDismissed)
@@ -401,11 +401,11 @@ public async System.Threading.Tasks.Task<Object> CompleteHomeActionAsync (string
         }
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="homeActionId">Id of the action</param>
+        /// <param name="appId"></param>
+        /// <param name="homeActionId"></param>
         /// <param name="isDismissed"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> CompleteHomeActionAsyncWithHttpInfo (string appId, int? homeActionId, bool? isDismissed)
@@ -420,7 +420,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CompleteHomeAction
             if (isDismissed == null)
                 throw new ApiException(400, "Missing required parameter 'isDismissed' when calling HomeApi->CompleteHomeAction");
 
-            var localVarPath = "/api/v1.0/{appId}/home/{homeActionId}";
+            var localVarPath = "./api/v1.0/{appId}/home/{homeActionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -469,30 +469,35 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CompleteHomeAction
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Object</returns>
-        public Object DismissOldPortalAction ()
+        /// <param name="appId"></param>
+        /// <returns>RestApiArrayResultHomeAction</returns>
+        public RestApiArrayResultHomeAction GetHomeActions (string appId)
         {
-             ApiResponse<Object> localVarResponse = DismissOldPortalActionWithHttpInfo();
+             ApiResponse<RestApiArrayResultHomeAction> localVarResponse = GetHomeActionsWithHttpInfo(appId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > DismissOldPortalActionWithHttpInfo ()
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultHomeAction</returns>
+        public ApiResponse< RestApiArrayResultHomeAction > GetHomeActionsWithHttpInfo (string appId)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HomeApi->GetHomeActions");
 
-            var localVarPath = "/api/v1.0/home/dismissoldportalaction";
+            var localVarPath = "./api/v1.0/{appId}/home";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -516,6 +521,7 @@ public ApiResponse< Object > DismissOldPortalActionWithHttpInfo ()
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -526,43 +532,48 @@ public ApiResponse< Object > DismissOldPortalActionWithHttpInfo ()
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DismissOldPortalAction", localVarResponse);
+                Exception exception = ExceptionFactory("GetHomeActions", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+            return new ApiResponse<RestApiArrayResultHomeAction>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultHomeAction) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultHomeAction)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> DismissOldPortalActionAsync ()
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiArrayResultHomeAction</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultHomeAction> GetHomeActionsAsync (string appId)
         {
-             ApiResponse<Object> localVarResponse = await DismissOldPortalActionAsyncWithHttpInfo();
+             ApiResponse<RestApiArrayResultHomeAction> localVarResponse = await GetHomeActionsAsyncWithHttpInfo(appId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Complete Home Action 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> DismissOldPortalActionAsyncWithHttpInfo ()
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultHomeAction)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultHomeAction>> GetHomeActionsAsyncWithHttpInfo (string appId)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HomeApi->GetHomeActions");
 
-            var localVarPath = "/api/v1.0/home/dismissoldportalaction";
+            var localVarPath = "./api/v1.0/{appId}/home";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -586,6 +597,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DismissOldPortalAc
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -596,47 +608,47 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DismissOldPortalAc
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DismissOldPortalAction", localVarResponse);
+                Exception exception = ExceptionFactory("GetHomeActions", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+            return new ApiResponse<RestApiArrayResultHomeAction>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultHomeAction) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultHomeAction)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Home Actions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>RestApiArrayResultHomeAction</returns>
-        public RestApiArrayResultHomeAction GetHomeActions (string appId)
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultHomeStatistics</returns>
+        public RestApiResultHomeStatistics GetHomeStatistics (string appId)
         {
-             ApiResponse<RestApiArrayResultHomeAction> localVarResponse = GetHomeActionsWithHttpInfo(appId);
+             ApiResponse<RestApiResultHomeStatistics> localVarResponse = GetHomeStatisticsWithHttpInfo(appId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Home Actions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>ApiResponse of RestApiArrayResultHomeAction</returns>
-        public ApiResponse< RestApiArrayResultHomeAction > GetHomeActionsWithHttpInfo (string appId)
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultHomeStatistics</returns>
+        public ApiResponse< RestApiResultHomeStatistics > GetHomeStatisticsWithHttpInfo (string appId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HomeApi->GetHomeActions");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HomeApi->GetHomeStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/home";
+            var localVarPath = "./api/v1.0/{appId}/home/stats";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -678,41 +690,41 @@ public ApiResponse< RestApiArrayResultHomeAction > GetHomeActionsWithHttpInfo (s
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetHomeActions", localVarResponse);
+                Exception exception = ExceptionFactory("GetHomeStatistics", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultHomeAction>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultHomeAction) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultHomeAction)));
+            return new ApiResponse<RestApiResultHomeStatistics>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultHomeStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHomeStatistics)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Home Actions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of RestApiArrayResultHomeAction</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultHomeAction> GetHomeActionsAsync (string appId)
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultHomeStatistics</returns>
+        public async System.Threading.Tasks.Task<RestApiResultHomeStatistics> GetHomeStatisticsAsync (string appId)
         {
-             ApiResponse<RestApiArrayResultHomeAction> localVarResponse = await GetHomeActionsAsyncWithHttpInfo(appId);
+             ApiResponse<RestApiResultHomeStatistics> localVarResponse = await GetHomeStatisticsAsyncWithHttpInfo(appId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Home Actions 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultHomeAction)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultHomeAction>> GetHomeActionsAsyncWithHttpInfo (string appId)
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultHomeStatistics)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHomeStatistics>> GetHomeStatisticsAsyncWithHttpInfo (string appId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HomeApi->GetHomeActions");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HomeApi->GetHomeStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/home";
+            var localVarPath = "./api/v1.0/{appId}/home/stats";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -754,40 +766,35 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultHomeActio
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetHomeActions", localVarResponse);
+                Exception exception = ExceptionFactory("GetHomeStatistics", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultHomeAction>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultHomeAction) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultHomeAction)));
+            return new ApiResponse<RestApiResultHomeStatistics>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultHomeStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHomeStatistics)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Home Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>RestApiResultHomeStatistics</returns>
-        public RestApiResultHomeStatistics GetHomeStatistics (string appId)
+        /// <returns>RestApiResultOktaPortalFeatureFlag</returns>
+        public RestApiResultOktaPortalFeatureFlag GetOktaPortalFeatureFlag ()
         {
-             ApiResponse<RestApiResultHomeStatistics> localVarResponse = GetHomeStatisticsWithHttpInfo(appId);
+             ApiResponse<RestApiResultOktaPortalFeatureFlag> localVarResponse = GetOktaPortalFeatureFlagWithHttpInfo();
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Home Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>ApiResponse of RestApiResultHomeStatistics</returns>
-        public ApiResponse< RestApiResultHomeStatistics > GetHomeStatisticsWithHttpInfo (string appId)
+        /// <returns>ApiResponse of RestApiResultOktaPortalFeatureFlag</returns>
+        public ApiResponse< RestApiResultOktaPortalFeatureFlag > GetOktaPortalFeatureFlagWithHttpInfo ()
         {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HomeApi->GetHomeStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/home/stats";
+            var localVarPath = "./api/v1.0/home/okta-portal";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -811,7 +818,6 @@ public ApiResponse< RestApiResultHomeStatistics > GetHomeStatisticsWithHttpInfo
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -829,41 +835,36 @@ public ApiResponse< RestApiResultHomeStatistics > GetHomeStatisticsWithHttpInfo
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetHomeStatistics", localVarResponse);
+                Exception exception = ExceptionFactory("GetOktaPortalFeatureFlag", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultHomeStatistics>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultHomeStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHomeStatistics)));
+            return new ApiResponse<RestApiResultOktaPortalFeatureFlag>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultOktaPortalFeatureFlag) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOktaPortalFeatureFlag)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Home Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of RestApiResultHomeStatistics</returns>
-        public async System.Threading.Tasks.Task<RestApiResultHomeStatistics> GetHomeStatisticsAsync (string appId)
+        /// <returns>Task of RestApiResultOktaPortalFeatureFlag</returns>
+        public async System.Threading.Tasks.Task<RestApiResultOktaPortalFeatureFlag> GetOktaPortalFeatureFlagAsync ()
         {
-             ApiResponse<RestApiResultHomeStatistics> localVarResponse = await GetHomeStatisticsAsyncWithHttpInfo(appId);
+             ApiResponse<RestApiResultOktaPortalFeatureFlag> localVarResponse = await GetOktaPortalFeatureFlagAsyncWithHttpInfo();
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Get Home Statistics 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of ApiResponse (RestApiResultHomeStatistics)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHomeStatistics>> GetHomeStatisticsAsyncWithHttpInfo (string appId)
+        /// <returns>Task of ApiResponse (RestApiResultOktaPortalFeatureFlag)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOktaPortalFeatureFlag>> GetOktaPortalFeatureFlagAsyncWithHttpInfo ()
         {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HomeApi->GetHomeStatistics");
 
-            var localVarPath = "/api/v1.0/{appId}/home/stats";
+            var localVarPath = "./api/v1.0/home/okta-portal";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -887,7 +888,6 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHomeStatistics
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -905,13 +905,13 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHomeStatistics
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetHomeStatistics", localVarResponse);
+                Exception exception = ExceptionFactory("GetOktaPortalFeatureFlag", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultHomeStatistics>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultHomeStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHomeStatistics)));
+            return new ApiResponse<RestApiResultOktaPortalFeatureFlag>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultOktaPortalFeatureFlag) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOktaPortalFeatureFlag)));
         }
 
     }
diff --git a/src/Flipdish/Api/HttpRequestResponseLogsApi.cs b/src/Flipdish/Api/HttpRequestResponseLogsApi.cs
deleted file mode 100644
index 43a9aa98..00000000
--- a/src/Flipdish/Api/HttpRequestResponseLogsApi.cs
+++ /dev/null
@@ -1,395 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IHttpRequestResponseLogsApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Get API interaction logs
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="start">Start date time</param>
-        /// <param name="end">End date time</param>
-        /// <param name="appId"></param>
-        /// <param name="filterByUserId">User id (optional) (optional)</param>
-        /// <param name="guid">Id of the log (optional)</param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
-        /// <returns>RestApiPaginationResultHttpRequestAndResponseLog</returns>
-        RestApiPaginationResultHttpRequestAndResponseLog GetLogs (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null);
-
-        /// <summary>
-        /// Get API interaction logs
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="start">Start date time</param>
-        /// <param name="end">End date time</param>
-        /// <param name="appId"></param>
-        /// <param name="filterByUserId">User id (optional) (optional)</param>
-        /// <param name="guid">Id of the log (optional)</param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultHttpRequestAndResponseLog</returns>
-        ApiResponse<RestApiPaginationResultHttpRequestAndResponseLog> GetLogsWithHttpInfo (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Get API interaction logs
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="start">Start date time</param>
-        /// <param name="end">End date time</param>
-        /// <param name="appId"></param>
-        /// <param name="filterByUserId">User id (optional) (optional)</param>
-        /// <param name="guid">Id of the log (optional)</param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
-        /// <returns>Task of RestApiPaginationResultHttpRequestAndResponseLog</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultHttpRequestAndResponseLog> GetLogsAsync (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null);
-
-        /// <summary>
-        /// Get API interaction logs
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="start">Start date time</param>
-        /// <param name="end">End date time</param>
-        /// <param name="appId"></param>
-        /// <param name="filterByUserId">User id (optional) (optional)</param>
-        /// <param name="guid">Id of the log (optional)</param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultHttpRequestAndResponseLog)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultHttpRequestAndResponseLog>> GetLogsAsyncWithHttpInfo (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class HttpRequestResponseLogsApi : IHttpRequestResponseLogsApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpRequestResponseLogsApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public HttpRequestResponseLogsApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpRequestResponseLogsApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public HttpRequestResponseLogsApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Get API interaction logs 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="start">Start date time</param>
-        /// <param name="end">End date time</param>
-        /// <param name="appId"></param>
-        /// <param name="filterByUserId">User id (optional) (optional)</param>
-        /// <param name="guid">Id of the log (optional)</param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
-        /// <returns>RestApiPaginationResultHttpRequestAndResponseLog</returns>
-        public RestApiPaginationResultHttpRequestAndResponseLog GetLogs (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null)
-        {
-             ApiResponse<RestApiPaginationResultHttpRequestAndResponseLog> localVarResponse = GetLogsWithHttpInfo(start, end, appId, filterByUserId, guid, page, limit);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Get API interaction logs 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="start">Start date time</param>
-        /// <param name="end">End date time</param>
-        /// <param name="appId"></param>
-        /// <param name="filterByUserId">User id (optional) (optional)</param>
-        /// <param name="guid">Id of the log (optional)</param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultHttpRequestAndResponseLog</returns>
-        public ApiResponse< RestApiPaginationResultHttpRequestAndResponseLog > GetLogsWithHttpInfo (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null)
-        {
-            // verify the required parameter 'start' is set
-            if (start == null)
-                throw new ApiException(400, "Missing required parameter 'start' when calling HttpRequestResponseLogsApi->GetLogs");
-            // verify the required parameter 'end' is set
-            if (end == null)
-                throw new ApiException(400, "Missing required parameter 'end' when calling HttpRequestResponseLogsApi->GetLogs");
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HttpRequestResponseLogsApi->GetLogs");
-
-            var localVarPath = "/api/v1.0/{appId}/interactions/logs";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (start != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "start", start)); // query parameter
-            if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
-            if (filterByUserId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "filterByUserId", filterByUserId)); // query parameter
-            if (guid != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "guid", guid)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetLogs", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiPaginationResultHttpRequestAndResponseLog>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultHttpRequestAndResponseLog) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultHttpRequestAndResponseLog)));
-        }
-
-        /// <summary>
-        /// Get API interaction logs 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="start">Start date time</param>
-        /// <param name="end">End date time</param>
-        /// <param name="appId"></param>
-        /// <param name="filterByUserId">User id (optional) (optional)</param>
-        /// <param name="guid">Id of the log (optional)</param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
-        /// <returns>Task of RestApiPaginationResultHttpRequestAndResponseLog</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultHttpRequestAndResponseLog> GetLogsAsync (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null)
-        {
-             ApiResponse<RestApiPaginationResultHttpRequestAndResponseLog> localVarResponse = await GetLogsAsyncWithHttpInfo(start, end, appId, filterByUserId, guid, page, limit);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Get API interaction logs 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="start">Start date time</param>
-        /// <param name="end">End date time</param>
-        /// <param name="appId"></param>
-        /// <param name="filterByUserId">User id (optional) (optional)</param>
-        /// <param name="guid">Id of the log (optional)</param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultHttpRequestAndResponseLog)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultHttpRequestAndResponseLog>> GetLogsAsyncWithHttpInfo (DateTime? start, DateTime? end, string appId, int? filterByUserId = null, string guid = null, int? page = null, int? limit = null)
-        {
-            // verify the required parameter 'start' is set
-            if (start == null)
-                throw new ApiException(400, "Missing required parameter 'start' when calling HttpRequestResponseLogsApi->GetLogs");
-            // verify the required parameter 'end' is set
-            if (end == null)
-                throw new ApiException(400, "Missing required parameter 'end' when calling HttpRequestResponseLogsApi->GetLogs");
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HttpRequestResponseLogsApi->GetLogs");
-
-            var localVarPath = "/api/v1.0/{appId}/interactions/logs";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (start != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "start", start)); // query parameter
-            if (end != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "end", end)); // query parameter
-            if (filterByUserId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "filterByUserId", filterByUserId)); // query parameter
-            if (guid != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "guid", guid)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetLogs", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiPaginationResultHttpRequestAndResponseLog>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultHttpRequestAndResponseLog) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultHttpRequestAndResponseLog)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/HydraApi.cs b/src/Flipdish/Api/HydraApi.cs
index fa0b4c41..e00f8e10 100644
--- a/src/Flipdish/Api/HydraApi.cs
+++ b/src/Flipdish/Api/HydraApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,7 +25,7 @@ public interface IHydraApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Assign an EMV terminal to a kiosk
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -38,7 +38,7 @@ public interface IHydraApi : IApiAccessor
         void AssignEmv (string appId, int? hydraConfigId, int? emvTerminalId);
 
         /// <summary>
-        /// Assign an EMV terminal to a kiosk
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -50,7 +50,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> AssignEmvWithHttpInfo (string appId, int? hydraConfigId, int? emvTerminalId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -63,7 +63,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultHydraStatus AttachStoreToKiosk (string appId, int? storeId, string deviceId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -75,7 +75,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultHydraStatus</returns>
         ApiResponse<RestApiResultHydraStatus> AttachStoreToKioskWithHttpInfo (string appId, int? storeId, string deviceId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -88,7 +88,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultHydraStatus AttachStoreToTerminal (string appId, string deviceId, int? storeId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -123,7 +123,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> CancelEmvPaymentWithHttpInfo (int? orderId, string appId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -136,7 +136,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultHydraStatus DetachStoreFromTerminal (string appId, string deviceId, int? storeId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -148,7 +148,26 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultHydraStatus</returns>
         ApiResponse<RestApiResultHydraStatus> DetachStoreFromTerminalWithHttpInfo (string appId, string deviceId, int? storeId);
         /// <summary>
-        /// [Private]
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns></returns>
+        void GetAblyToken ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> GetAblyTokenWithHttpInfo ();
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -161,7 +180,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultHydraDeviceDetails GetAttachedDevice (string appId, string deviceType, string deviceId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -173,7 +192,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultHydraDeviceDetails</returns>
         ApiResponse<RestApiResultHydraDeviceDetails> GetAttachedDeviceWithHttpInfo (string appId, string deviceType, string deviceId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -190,7 +209,7 @@ public interface IHydraApi : IApiAccessor
         RestApiPaginationResultHydraDeviceDetails GetAttachedDevices (string appId, string deviceType, int? pageIndex = null, int? pageSize = null, int? storeId = null, string deviceName = null, string deviceSerial = null);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -206,7 +225,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultHydraDeviceDetails</returns>
         ApiResponse<RestApiPaginationResultHydraDeviceDetails> GetAttachedDevicesWithHttpInfo (string appId, string deviceType, int? pageIndex = null, int? pageSize = null, int? storeId = null, string deviceName = null, string deviceSerial = null);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -217,7 +236,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultPaymentTerminalDetails GetEMVTerminalDetails (string appId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -227,7 +246,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultPaymentTerminalDetails</returns>
         ApiResponse<RestApiResultPaymentTerminalDetails> GetEMVTerminalDetailsWithHttpInfo (string appId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -239,7 +258,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultPaymentTerminalTransactionDetails GetEmvOrderState (int? orderId, string appId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -250,10 +269,10 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultPaymentTerminalTransactionDetails</returns>
         ApiResponse<RestApiResultPaymentTerminalTransactionDetails> GetEmvOrderStateWithHttpInfo (int? orderId, string appId);
         /// <summary>
-        /// Get the status of Cash Payment Methon on Kisok
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -262,10 +281,10 @@ public interface IHydraApi : IApiAccessor
         RestApiArrayResultKioskCashPaymentSettings GetKioskCashPaymentSettings (string appId, string deviceId);
 
         /// <summary>
-        /// Get the status of Cash Payment Methon on Kisok
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -279,6 +298,29 @@ public interface IHydraApi : IApiAccessor
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>RestApiResultKioskSettings</returns>
+        RestApiResultKioskSettings GetKioskSettings (string appId, string deviceId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>ApiResponse of RestApiResultKioskSettings</returns>
+        ApiResponse<RestApiResultKioskSettings> GetKioskSettingsWithHttpInfo (string appId, string deviceId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>RestApiResultHydraStatus</returns>
         RestApiResultHydraStatus GetRegistration ();
 
@@ -292,7 +334,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultHydraStatus</returns>
         ApiResponse<RestApiResultHydraStatus> GetRegistrationWithHttpInfo ();
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -302,7 +344,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultHydraConfig GetSettings ();
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -311,7 +353,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultHydraConfig</returns>
         ApiResponse<RestApiResultHydraConfig> GetSettingsWithHttpInfo ();
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -323,7 +365,7 @@ public interface IHydraApi : IApiAccessor
         Object HydraCreateEmv (string appId, EmvTerminal emv);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -334,7 +376,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> HydraCreateEmvWithHttpInfo (string appId, EmvTerminal emv);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -346,7 +388,7 @@ public interface IHydraApi : IApiAccessor
         Object HydraDeleteEmv (string appId, int? id);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -357,7 +399,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> HydraDeleteEmvWithHttpInfo (string appId, int? id);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -370,7 +412,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultHydraStatus HydraDetachStoreFromKiosk (string appId, int? storeId, string deviceId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -382,7 +424,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultHydraStatus</returns>
         ApiResponse<RestApiResultHydraStatus> HydraDetachStoreFromKioskWithHttpInfo (string appId, int? storeId, string deviceId);
         /// <summary>
-        /// List EMV terminals belonging to the given AppNameId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -393,7 +435,7 @@ public interface IHydraApi : IApiAccessor
         RestApiArrayResultEmvTerminalWithAssignments HydraGetEmvsForAppId (string appId);
 
         /// <summary>
-        /// List EMV terminals belonging to the given AppNameId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -403,7 +445,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultEmvTerminalWithAssignments</returns>
         ApiResponse<RestApiArrayResultEmvTerminalWithAssignments> HydraGetEmvsForAppIdWithHttpInfo (string appId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -416,7 +458,7 @@ public interface IHydraApi : IApiAccessor
         void LoginWithDeviceId (string deviceId, string hydraUserType = null, string serialNumber = null);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -428,7 +470,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> LoginWithDeviceIdWithHttpInfo (string deviceId, string hydraUserType = null, string serialNumber = null);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -440,7 +482,7 @@ public interface IHydraApi : IApiAccessor
         RestApiResultHydraStatus Register (string appId, HydraRegistrationRequest hydraRegistration);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -451,7 +493,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultHydraStatus</returns>
         ApiResponse<RestApiResultHydraStatus> RegisterWithHttpInfo (string appId, HydraRegistrationRequest hydraRegistration);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -463,7 +505,7 @@ public interface IHydraApi : IApiAccessor
         void UnAssign (string appId, string deviceId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -474,7 +516,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UnAssignWithHttpInfo (string appId, string deviceId);
         /// <summary>
-        /// Unassign the currently assigned EMV terminal from a kiosk
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -486,7 +528,7 @@ public interface IHydraApi : IApiAccessor
         void UnassignEmv (string appId, int? hydraConfigId);
 
         /// <summary>
-        /// Unassign the currently assigned EMV terminal from a kiosk
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -497,10 +539,10 @@ public interface IHydraApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UnassignEmvWithHttpInfo (string appId, int? hydraConfigId);
         /// <summary>
-        /// Update the Cash Payment Methon Visiability on Kisok
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -510,10 +552,10 @@ public interface IHydraApi : IApiAccessor
         void UpdateKioskCashVisibilitySettings (string appId, string deviceId, bool? isCashEnabled);
 
         /// <summary>
-        /// Update the Cash Payment Methon Visiability on Kisok
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -521,10 +563,35 @@ public interface IHydraApi : IApiAccessor
         /// <param name="isCashEnabled"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateKioskCashVisibilitySettingsWithHttpInfo (string appId, string deviceId, bool? isCashEnabled);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <param name="settings"></param>
+        /// <returns></returns>
+        void UpdateKioskSettings (string appId, string deviceId, KioskSettings settings);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <param name="settings"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdateKioskSettingsWithHttpInfo (string appId, string deviceId, KioskSettings settings);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Assign an EMV terminal to a kiosk
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -537,7 +604,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task AssignEmvAsync (string appId, int? hydraConfigId, int? emvTerminalId);
 
         /// <summary>
-        /// Assign an EMV terminal to a kiosk
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -549,7 +616,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AssignEmvAsyncWithHttpInfo (string appId, int? hydraConfigId, int? emvTerminalId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -562,7 +629,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultHydraStatus> AttachStoreToKioskAsync (string appId, int? storeId, string deviceId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -574,7 +641,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultHydraStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>> AttachStoreToKioskAsyncWithHttpInfo (string appId, int? storeId, string deviceId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -587,7 +654,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultHydraStatus> AttachStoreToTerminalAsync (string appId, string deviceId, int? storeId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -622,7 +689,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> CancelEmvPaymentAsyncWithHttpInfo (int? orderId, string appId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -635,7 +702,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultHydraStatus> DetachStoreFromTerminalAsync (string appId, string deviceId, int? storeId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -647,7 +714,26 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultHydraStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>> DetachStoreFromTerminalAsyncWithHttpInfo (string appId, string deviceId, int? storeId);
         /// <summary>
-        /// [Private]
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task GetAblyTokenAsync ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> GetAblyTokenAsyncWithHttpInfo ();
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -660,7 +746,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultHydraDeviceDetails> GetAttachedDeviceAsync (string appId, string deviceType, string deviceId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -672,7 +758,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultHydraDeviceDetails)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraDeviceDetails>> GetAttachedDeviceAsyncWithHttpInfo (string appId, string deviceType, string deviceId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -689,7 +775,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultHydraDeviceDetails> GetAttachedDevicesAsync (string appId, string deviceType, int? pageIndex = null, int? pageSize = null, int? storeId = null, string deviceName = null, string deviceSerial = null);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -705,7 +791,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiPaginationResultHydraDeviceDetails)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultHydraDeviceDetails>> GetAttachedDevicesAsyncWithHttpInfo (string appId, string deviceType, int? pageIndex = null, int? pageSize = null, int? storeId = null, string deviceName = null, string deviceSerial = null);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -716,7 +802,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultPaymentTerminalDetails> GetEMVTerminalDetailsAsync (string appId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -726,7 +812,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultPaymentTerminalDetails)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentTerminalDetails>> GetEMVTerminalDetailsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -738,7 +824,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultPaymentTerminalTransactionDetails> GetEmvOrderStateAsync (int? orderId, string appId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -749,10 +835,10 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultPaymentTerminalTransactionDetails)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentTerminalTransactionDetails>> GetEmvOrderStateAsyncWithHttpInfo (int? orderId, string appId);
         /// <summary>
-        /// Get the status of Cash Payment Methon on Kisok
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -761,10 +847,10 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultKioskCashPaymentSettings> GetKioskCashPaymentSettingsAsync (string appId, string deviceId);
 
         /// <summary>
-        /// Get the status of Cash Payment Methon on Kisok
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -778,6 +864,29 @@ public interface IHydraApi : IApiAccessor
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of RestApiResultKioskSettings</returns>
+        System.Threading.Tasks.Task<RestApiResultKioskSettings> GetKioskSettingsAsync (string appId, string deviceId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultKioskSettings)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskSettings>> GetKioskSettingsAsyncWithHttpInfo (string appId, string deviceId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of RestApiResultHydraStatus</returns>
         System.Threading.Tasks.Task<RestApiResultHydraStatus> GetRegistrationAsync ();
 
@@ -791,7 +900,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultHydraStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>> GetRegistrationAsyncWithHttpInfo ();
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -801,7 +910,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultHydraConfig> GetSettingsAsync ();
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -810,7 +919,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultHydraConfig)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraConfig>> GetSettingsAsyncWithHttpInfo ();
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -822,7 +931,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<Object> HydraCreateEmvAsync (string appId, EmvTerminal emv);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -833,7 +942,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> HydraCreateEmvAsyncWithHttpInfo (string appId, EmvTerminal emv);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -845,7 +954,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<Object> HydraDeleteEmvAsync (string appId, int? id);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -856,7 +965,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> HydraDeleteEmvAsyncWithHttpInfo (string appId, int? id);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -869,7 +978,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultHydraStatus> HydraDetachStoreFromKioskAsync (string appId, int? storeId, string deviceId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -881,7 +990,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultHydraStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>> HydraDetachStoreFromKioskAsyncWithHttpInfo (string appId, int? storeId, string deviceId);
         /// <summary>
-        /// List EMV terminals belonging to the given AppNameId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -892,7 +1001,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultEmvTerminalWithAssignments> HydraGetEmvsForAppIdAsync (string appId);
 
         /// <summary>
-        /// List EMV terminals belonging to the given AppNameId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -902,7 +1011,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultEmvTerminalWithAssignments)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultEmvTerminalWithAssignments>> HydraGetEmvsForAppIdAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -915,7 +1024,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task LoginWithDeviceIdAsync (string deviceId, string hydraUserType = null, string serialNumber = null);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -927,7 +1036,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> LoginWithDeviceIdAsyncWithHttpInfo (string deviceId, string hydraUserType = null, string serialNumber = null);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -939,7 +1048,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultHydraStatus> RegisterAsync (string appId, HydraRegistrationRequest hydraRegistration);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -950,7 +1059,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultHydraStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>> RegisterAsyncWithHttpInfo (string appId, HydraRegistrationRequest hydraRegistration);
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -962,7 +1071,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task UnAssignAsync (string appId, string deviceId);
 
         /// <summary>
-        /// [Private]
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -973,7 +1082,7 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UnAssignAsyncWithHttpInfo (string appId, string deviceId);
         /// <summary>
-        /// Unassign the currently assigned EMV terminal from a kiosk
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -985,7 +1094,7 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task UnassignEmvAsync (string appId, int? hydraConfigId);
 
         /// <summary>
-        /// Unassign the currently assigned EMV terminal from a kiosk
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -996,10 +1105,10 @@ public interface IHydraApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UnassignEmvAsyncWithHttpInfo (string appId, int? hydraConfigId);
         /// <summary>
-        /// Update the Cash Payment Methon Visiability on Kisok
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1009,10 +1118,10 @@ public interface IHydraApi : IApiAccessor
         System.Threading.Tasks.Task UpdateKioskCashVisibilitySettingsAsync (string appId, string deviceId, bool? isCashEnabled);
 
         /// <summary>
-        /// Update the Cash Payment Methon Visiability on Kisok
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1020,6 +1129,31 @@ public interface IHydraApi : IApiAccessor
         /// <param name="isCashEnabled"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateKioskCashVisibilitySettingsAsyncWithHttpInfo (string appId, string deviceId, bool? isCashEnabled);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <param name="settings"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UpdateKioskSettingsAsync (string appId, string deviceId, KioskSettings settings);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <param name="settings"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateKioskSettingsAsyncWithHttpInfo (string appId, string deviceId, KioskSettings settings);
         #endregion Asynchronous Operations
     }
 
@@ -1121,7 +1255,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Assign an EMV terminal to a kiosk 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1134,7 +1268,7 @@ public void AssignEmv (string appId, int? hydraConfigId, int? emvTerminalId)
         }
 
         /// <summary>
-        /// Assign an EMV terminal to a kiosk 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1153,7 +1287,7 @@ public ApiResponse<Object> AssignEmvWithHttpInfo (string appId, int? hydraConfig
             if (emvTerminalId == null)
                 throw new ApiException(400, "Missing required parameter 'emvTerminalId' when calling HydraApi->AssignEmv");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/emvterminal/assign/{hydraConfigId}/{emvTerminalId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/emvterminal/assign/{hydraConfigId}/{emvTerminalId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1202,12 +1336,12 @@ public ApiResponse<Object> AssignEmvWithHttpInfo (string appId, int? hydraConfig
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Assign an EMV terminal to a kiosk 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1221,7 +1355,7 @@ public async System.Threading.Tasks.Task AssignEmvAsync (string appId, int? hydr
         }
 
         /// <summary>
-        /// Assign an EMV terminal to a kiosk 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1240,7 +1374,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignEmvAsyncWith
             if (emvTerminalId == null)
                 throw new ApiException(400, "Missing required parameter 'emvTerminalId' when calling HydraApi->AssignEmv");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/emvterminal/assign/{hydraConfigId}/{emvTerminalId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/emvterminal/assign/{hydraConfigId}/{emvTerminalId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1289,12 +1423,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignEmvAsyncWith
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1308,7 +1442,7 @@ public RestApiResultHydraStatus AttachStoreToKiosk (string appId, int? storeId,
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1327,7 +1461,7 @@ public ApiResponse< RestApiResultHydraStatus > AttachStoreToKioskWithHttpInfo (s
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->AttachStoreToKiosk");
 
-            var localVarPath = "/api/v1.0/{appId}/AttachStoreToKiosk/{deviceId}/store/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/AttachStoreToKiosk/{deviceId}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1376,12 +1510,12 @@ public ApiResponse< RestApiResultHydraStatus > AttachStoreToKioskWithHttpInfo (s
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1396,7 +1530,7 @@ public async System.Threading.Tasks.Task<RestApiResultHydraStatus> AttachStoreTo
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1415,7 +1549,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->AttachStoreToKiosk");
 
-            var localVarPath = "/api/v1.0/{appId}/AttachStoreToKiosk/{deviceId}/store/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/AttachStoreToKiosk/{deviceId}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1464,12 +1598,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1483,7 +1617,7 @@ public RestApiResultHydraStatus AttachStoreToTerminal (string appId, string devi
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1502,7 +1636,7 @@ public ApiResponse< RestApiResultHydraStatus > AttachStoreToTerminalWithHttpInfo
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling HydraApi->AttachStoreToTerminal");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceId}/attach/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceId}/attach/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1551,12 +1685,12 @@ public ApiResponse< RestApiResultHydraStatus > AttachStoreToTerminalWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1571,7 +1705,7 @@ public async System.Threading.Tasks.Task<RestApiResultHydraStatus> AttachStoreTo
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1590,7 +1724,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling HydraApi->AttachStoreToTerminal");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceId}/attach/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceId}/attach/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1639,7 +1773,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
@@ -1671,7 +1805,7 @@ public ApiResponse<Object> CancelEmvPaymentWithHttpInfo (int? orderId, string ap
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->CancelEmvPayment");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/cancelemvpayment/{orderId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/cancelemvpayment/{orderId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1719,7 +1853,7 @@ public ApiResponse<Object> CancelEmvPaymentWithHttpInfo (int? orderId, string ap
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1752,7 +1886,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CancelEmvPaymentAs
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->CancelEmvPayment");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/cancelemvpayment/{orderId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/cancelemvpayment/{orderId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1800,12 +1934,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CancelEmvPaymentAs
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1819,7 +1953,7 @@ public RestApiResultHydraStatus DetachStoreFromTerminal (string appId, string de
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1838,7 +1972,7 @@ public ApiResponse< RestApiResultHydraStatus > DetachStoreFromTerminalWithHttpIn
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling HydraApi->DetachStoreFromTerminal");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceId}/detach/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceId}/detach/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1887,12 +2021,12 @@ public ApiResponse< RestApiResultHydraStatus > DetachStoreFromTerminalWithHttpIn
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1907,7 +2041,7 @@ public async System.Threading.Tasks.Task<RestApiResultHydraStatus> DetachStoreFr
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1926,7 +2060,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling HydraApi->DetachStoreFromTerminal");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceId}/detach/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceId}/detach/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1975,12 +2109,149 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns></returns>
+        public void GetAblyToken ()
+        {
+             GetAblyTokenWithHttpInfo();
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> GetAblyTokenWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/hydra/ably_token";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAblyToken", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task GetAblyTokenAsync ()
+        {
+             await GetAblyTokenAsyncWithHttpInfo();
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> GetAblyTokenAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/hydra/ably_token";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAblyToken", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1994,7 +2265,7 @@ public RestApiResultHydraDeviceDetails GetAttachedDevice (string appId, string d
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2013,7 +2284,7 @@ public ApiResponse< RestApiResultHydraDeviceDetails > GetAttachedDeviceWithHttpI
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->GetAttachedDevice");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceType}/{deviceId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceType}/{deviceId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2062,12 +2333,12 @@ public ApiResponse< RestApiResultHydraDeviceDetails > GetAttachedDeviceWithHttpI
             }
 
             return new ApiResponse<RestApiResultHydraDeviceDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraDeviceDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraDeviceDetails)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2082,7 +2353,7 @@ public async System.Threading.Tasks.Task<RestApiResultHydraDeviceDetails> GetAtt
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2101,7 +2372,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraDeviceDet
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->GetAttachedDevice");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceType}/{deviceId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceType}/{deviceId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2150,12 +2421,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraDeviceDet
             }
 
             return new ApiResponse<RestApiResultHydraDeviceDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraDeviceDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraDeviceDetails)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2173,7 +2444,7 @@ public RestApiPaginationResultHydraDeviceDetails GetAttachedDevices (string appI
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2193,7 +2464,7 @@ public ApiResponse< RestApiPaginationResultHydraDeviceDetails > GetAttachedDevic
             if (deviceType == null)
                 throw new ApiException(400, "Missing required parameter 'deviceType' when calling HydraApi->GetAttachedDevices");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceType}/list";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceType}/list";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2246,12 +2517,12 @@ public ApiResponse< RestApiPaginationResultHydraDeviceDetails > GetAttachedDevic
             }
 
             return new ApiResponse<RestApiPaginationResultHydraDeviceDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultHydraDeviceDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultHydraDeviceDetails)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2270,7 +2541,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultHydraDeviceDetai
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2290,7 +2561,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultHydr
             if (deviceType == null)
                 throw new ApiException(400, "Missing required parameter 'deviceType' when calling HydraApi->GetAttachedDevices");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceType}/list";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceType}/list";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2343,12 +2614,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultHydr
             }
 
             return new ApiResponse<RestApiPaginationResultHydraDeviceDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultHydraDeviceDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultHydraDeviceDetails)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2360,7 +2631,7 @@ public RestApiResultPaymentTerminalDetails GetEMVTerminalDetails (string appId)
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2371,7 +2642,7 @@ public ApiResponse< RestApiResultPaymentTerminalDetails > GetEMVTerminalDetailsW
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetEMVTerminalDetails");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/emvterminal";
+            var localVarPath = "./api/v1.0/{appId}/hydra/emvterminal";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2418,12 +2689,12 @@ public ApiResponse< RestApiResultPaymentTerminalDetails > GetEMVTerminalDetailsW
             }
 
             return new ApiResponse<RestApiResultPaymentTerminalDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPaymentTerminalDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPaymentTerminalDetails)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2436,7 +2707,7 @@ public async System.Threading.Tasks.Task<RestApiResultPaymentTerminalDetails> Ge
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -2447,7 +2718,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentTermina
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetEMVTerminalDetails");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/emvterminal";
+            var localVarPath = "./api/v1.0/{appId}/hydra/emvterminal";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2494,12 +2765,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentTermina
             }
 
             return new ApiResponse<RestApiResultPaymentTerminalDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPaymentTerminalDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPaymentTerminalDetails)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -2512,7 +2783,7 @@ public RestApiResultPaymentTerminalTransactionDetails GetEmvOrderState (int? ord
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -2527,7 +2798,7 @@ public ApiResponse< RestApiResultPaymentTerminalTransactionDetails > GetEmvOrder
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetEmvOrderState");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/emvorderstate/{orderId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/emvorderstate/{orderId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2575,12 +2846,12 @@ public ApiResponse< RestApiResultPaymentTerminalTransactionDetails > GetEmvOrder
             }
 
             return new ApiResponse<RestApiResultPaymentTerminalTransactionDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPaymentTerminalTransactionDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPaymentTerminalTransactionDetails)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="orderId"></param>
@@ -2588,28 +2859,191 @@ public ApiResponse< RestApiResultPaymentTerminalTransactionDetails > GetEmvOrder
         /// <returns>Task of RestApiResultPaymentTerminalTransactionDetails</returns>
         public async System.Threading.Tasks.Task<RestApiResultPaymentTerminalTransactionDetails> GetEmvOrderStateAsync (int? orderId, string appId)
         {
-             ApiResponse<RestApiResultPaymentTerminalTransactionDetails> localVarResponse = await GetEmvOrderStateAsyncWithHttpInfo(orderId, appId);
+             ApiResponse<RestApiResultPaymentTerminalTransactionDetails> localVarResponse = await GetEmvOrderStateAsyncWithHttpInfo(orderId, appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultPaymentTerminalTransactionDetails)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentTerminalTransactionDetails>> GetEmvOrderStateAsyncWithHttpInfo (int? orderId, string appId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling HydraApi->GetEmvOrderState");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetEmvOrderState");
+
+            var localVarPath = "./api/v1.0/{appId}/hydra/emvorderstate/{orderId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetEmvOrderState", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPaymentTerminalTransactionDetails>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPaymentTerminalTransactionDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPaymentTerminalTransactionDetails)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>RestApiArrayResultKioskCashPaymentSettings</returns>
+        public RestApiArrayResultKioskCashPaymentSettings GetKioskCashPaymentSettings (string appId, string deviceId)
+        {
+             ApiResponse<RestApiArrayResultKioskCashPaymentSettings> localVarResponse = GetKioskCashPaymentSettingsWithHttpInfo(appId, deviceId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultKioskCashPaymentSettings</returns>
+        public ApiResponse< RestApiArrayResultKioskCashPaymentSettings > GetKioskCashPaymentSettingsWithHttpInfo (string appId, string deviceId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetKioskCashPaymentSettings");
+            // verify the required parameter 'deviceId' is set
+            if (deviceId == null)
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->GetKioskCashPaymentSettings");
+
+            var localVarPath = "./api/v1.0/{appId}/kioskcashsettings/{deviceId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceId != null) localVarPathParams.Add("deviceId", this.Configuration.ApiClient.ParameterToString(deviceId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetKioskCashPaymentSettings", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultKioskCashPaymentSettings>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultKioskCashPaymentSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultKioskCashPaymentSettings)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <returns>Task of RestApiArrayResultKioskCashPaymentSettings</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultKioskCashPaymentSettings> GetKioskCashPaymentSettingsAsync (string appId, string deviceId)
+        {
+             ApiResponse<RestApiArrayResultKioskCashPaymentSettings> localVarResponse = await GetKioskCashPaymentSettingsAsyncWithHttpInfo(appId, deviceId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId"></param>
         /// <param name="appId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultPaymentTerminalTransactionDetails)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentTerminalTransactionDetails>> GetEmvOrderStateAsyncWithHttpInfo (int? orderId, string appId)
+        /// <param name="deviceId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultKioskCashPaymentSettings)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultKioskCashPaymentSettings>> GetKioskCashPaymentSettingsAsyncWithHttpInfo (string appId, string deviceId)
         {
-            // verify the required parameter 'orderId' is set
-            if (orderId == null)
-                throw new ApiException(400, "Missing required parameter 'orderId' when calling HydraApi->GetEmvOrderState");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetEmvOrderState");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetKioskCashPaymentSettings");
+            // verify the required parameter 'deviceId' is set
+            if (deviceId == null)
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->GetKioskCashPaymentSettings");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/emvorderstate/{orderId}";
+            var localVarPath = "./api/v1.0/{appId}/kioskcashsettings/{deviceId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2633,8 +3067,8 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentTermina
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceId != null) localVarPathParams.Add("deviceId", this.Configuration.ApiClient.ParameterToString(deviceId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2652,45 +3086,45 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentTermina
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetEmvOrderState", localVarResponse);
+                Exception exception = ExceptionFactory("GetKioskCashPaymentSettings", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultPaymentTerminalTransactionDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultPaymentTerminalTransactionDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPaymentTerminalTransactionDetails)));
+            return new ApiResponse<RestApiArrayResultKioskCashPaymentSettings>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultKioskCashPaymentSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultKioskCashPaymentSettings)));
         }
 
         /// <summary>
-        /// Get the status of Cash Payment Methon on Kisok [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <param name="deviceId"></param>
-        /// <returns>RestApiArrayResultKioskCashPaymentSettings</returns>
-        public RestApiArrayResultKioskCashPaymentSettings GetKioskCashPaymentSettings (string appId, string deviceId)
+        /// <returns>RestApiResultKioskSettings</returns>
+        public RestApiResultKioskSettings GetKioskSettings (string appId, string deviceId)
         {
-             ApiResponse<RestApiArrayResultKioskCashPaymentSettings> localVarResponse = GetKioskCashPaymentSettingsWithHttpInfo(appId, deviceId);
+             ApiResponse<RestApiResultKioskSettings> localVarResponse = GetKioskSettingsWithHttpInfo(appId, deviceId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get the status of Cash Payment Methon on Kisok [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <param name="deviceId"></param>
-        /// <returns>ApiResponse of RestApiArrayResultKioskCashPaymentSettings</returns>
-        public ApiResponse< RestApiArrayResultKioskCashPaymentSettings > GetKioskCashPaymentSettingsWithHttpInfo (string appId, string deviceId)
+        /// <returns>ApiResponse of RestApiResultKioskSettings</returns>
+        public ApiResponse< RestApiResultKioskSettings > GetKioskSettingsWithHttpInfo (string appId, string deviceId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetKioskCashPaymentSettings");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetKioskSettings");
             // verify the required parameter 'deviceId' is set
             if (deviceId == null)
-                throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->GetKioskCashPaymentSettings");
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->GetKioskSettings");
 
-            var localVarPath = "/api/v1.0/{appId}/kioskcashsettings/{deviceId}";
+            var localVarPath = "./api/v1.0/{appId}/kiosksettings/{deviceId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2733,46 +3167,46 @@ public ApiResponse< RestApiArrayResultKioskCashPaymentSettings > GetKioskCashPay
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetKioskCashPaymentSettings", localVarResponse);
+                Exception exception = ExceptionFactory("GetKioskSettings", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultKioskCashPaymentSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultKioskCashPaymentSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultKioskCashPaymentSettings)));
+            return new ApiResponse<RestApiResultKioskSettings>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultKioskSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskSettings)));
         }
 
         /// <summary>
-        /// Get the status of Cash Payment Methon on Kisok [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <param name="deviceId"></param>
-        /// <returns>Task of RestApiArrayResultKioskCashPaymentSettings</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultKioskCashPaymentSettings> GetKioskCashPaymentSettingsAsync (string appId, string deviceId)
+        /// <returns>Task of RestApiResultKioskSettings</returns>
+        public async System.Threading.Tasks.Task<RestApiResultKioskSettings> GetKioskSettingsAsync (string appId, string deviceId)
         {
-             ApiResponse<RestApiArrayResultKioskCashPaymentSettings> localVarResponse = await GetKioskCashPaymentSettingsAsyncWithHttpInfo(appId, deviceId);
+             ApiResponse<RestApiResultKioskSettings> localVarResponse = await GetKioskSettingsAsyncWithHttpInfo(appId, deviceId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get the status of Cash Payment Methon on Kisok [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <param name="deviceId"></param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultKioskCashPaymentSettings)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultKioskCashPaymentSettings>> GetKioskCashPaymentSettingsAsyncWithHttpInfo (string appId, string deviceId)
+        /// <returns>Task of ApiResponse (RestApiResultKioskSettings)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskSettings>> GetKioskSettingsAsyncWithHttpInfo (string appId, string deviceId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetKioskCashPaymentSettings");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->GetKioskSettings");
             // verify the required parameter 'deviceId' is set
             if (deviceId == null)
-                throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->GetKioskCashPaymentSettings");
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->GetKioskSettings");
 
-            var localVarPath = "/api/v1.0/{appId}/kioskcashsettings/{deviceId}";
+            var localVarPath = "./api/v1.0/{appId}/kiosksettings/{deviceId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2815,13 +3249,13 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultKioskCash
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetKioskCashPaymentSettings", localVarResponse);
+                Exception exception = ExceptionFactory("GetKioskSettings", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultKioskCashPaymentSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultKioskCashPaymentSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultKioskCashPaymentSettings)));
+            return new ApiResponse<RestApiResultKioskSettings>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultKioskSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskSettings)));
         }
 
         /// <summary>
@@ -2843,7 +3277,7 @@ public RestApiResultHydraStatus GetRegistration ()
         public ApiResponse< RestApiResultHydraStatus > GetRegistrationWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/hydra/registration";
+            var localVarPath = "./api/v1.0/hydra/registration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2889,7 +3323,7 @@ public ApiResponse< RestApiResultHydraStatus > GetRegistrationWithHttpInfo ()
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
@@ -2913,7 +3347,7 @@ public async System.Threading.Tasks.Task<RestApiResultHydraStatus> GetRegistrati
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>> GetRegistrationAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/hydra/registration";
+            var localVarPath = "./api/v1.0/hydra/registration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2959,12 +3393,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>RestApiResultHydraConfig</returns>
@@ -2975,14 +3409,14 @@ public RestApiResultHydraConfig GetSettings ()
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of RestApiResultHydraConfig</returns>
         public ApiResponse< RestApiResultHydraConfig > GetSettingsWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/hydra/settings";
+            var localVarPath = "./api/v1.0/hydra/settings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3028,12 +3462,12 @@ public ApiResponse< RestApiResultHydraConfig > GetSettingsWithHttpInfo ()
             }
 
             return new ApiResponse<RestApiResultHydraConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraConfig)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of RestApiResultHydraConfig</returns>
@@ -3045,14 +3479,14 @@ public async System.Threading.Tasks.Task<RestApiResultHydraConfig> GetSettingsAs
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of ApiResponse (RestApiResultHydraConfig)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraConfig>> GetSettingsAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/hydra/settings";
+            var localVarPath = "./api/v1.0/hydra/settings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3098,12 +3532,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraConfig>>
             }
 
             return new ApiResponse<RestApiResultHydraConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraConfig)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3116,7 +3550,7 @@ public Object HydraCreateEmv (string appId, EmvTerminal emv)
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3131,7 +3565,7 @@ public ApiResponse< Object > HydraCreateEmvWithHttpInfo (string appId, EmvTermin
             if (emv == null)
                 throw new ApiException(400, "Missing required parameter 'emv' when calling HydraApi->HydraCreateEmv");
 
-            var localVarPath = "/api/v1.0/{appId}/emvterminals";
+            var localVarPath = "./api/v1.0/{appId}/emvterminals";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3191,12 +3625,12 @@ public ApiResponse< Object > HydraCreateEmvWithHttpInfo (string appId, EmvTermin
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3210,7 +3644,7 @@ public async System.Threading.Tasks.Task<Object> HydraCreateEmvAsync (string app
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3225,7 +3659,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> HydraCreateEmvAsyn
             if (emv == null)
                 throw new ApiException(400, "Missing required parameter 'emv' when calling HydraApi->HydraCreateEmv");
 
-            var localVarPath = "/api/v1.0/{appId}/emvterminals";
+            var localVarPath = "./api/v1.0/{appId}/emvterminals";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3285,12 +3719,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> HydraCreateEmvAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3303,7 +3737,7 @@ public Object HydraDeleteEmv (string appId, int? id)
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3318,7 +3752,7 @@ public ApiResponse< Object > HydraDeleteEmvWithHttpInfo (string appId, int? id)
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling HydraApi->HydraDeleteEmv");
 
-            var localVarPath = "/api/v1.0/{appId}/emvterminals/{id}";
+            var localVarPath = "./api/v1.0/{appId}/emvterminals/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3366,12 +3800,12 @@ public ApiResponse< Object > HydraDeleteEmvWithHttpInfo (string appId, int? id)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3385,7 +3819,7 @@ public async System.Threading.Tasks.Task<Object> HydraDeleteEmvAsync (string app
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3400,7 +3834,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> HydraDeleteEmvAsyn
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling HydraApi->HydraDeleteEmv");
 
-            var localVarPath = "/api/v1.0/{appId}/emvterminals/{id}";
+            var localVarPath = "./api/v1.0/{appId}/emvterminals/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3448,12 +3882,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> HydraDeleteEmvAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3467,7 +3901,7 @@ public RestApiResultHydraStatus HydraDetachStoreFromKiosk (string appId, int? st
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3486,7 +3920,7 @@ public ApiResponse< RestApiResultHydraStatus > HydraDetachStoreFromKioskWithHttp
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->HydraDetachStoreFromKiosk");
 
-            var localVarPath = "/api/v1.0/{appId}/DetachStoreFromKiosk/{deviceId}/store/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/DetachStoreFromKiosk/{deviceId}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3535,12 +3969,12 @@ public ApiResponse< RestApiResultHydraStatus > HydraDetachStoreFromKioskWithHttp
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3555,7 +3989,7 @@ public async System.Threading.Tasks.Task<RestApiResultHydraStatus> HydraDetachSt
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3574,7 +4008,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->HydraDetachStoreFromKiosk");
 
-            var localVarPath = "/api/v1.0/{appId}/DetachStoreFromKiosk/{deviceId}/store/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/DetachStoreFromKiosk/{deviceId}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3623,12 +4057,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// List EMV terminals belonging to the given AppNameId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3640,7 +4074,7 @@ public RestApiArrayResultEmvTerminalWithAssignments HydraGetEmvsForAppId (string
         }
 
         /// <summary>
-        /// List EMV terminals belonging to the given AppNameId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3651,7 +4085,7 @@ public ApiResponse< RestApiArrayResultEmvTerminalWithAssignments > HydraGetEmvsF
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->HydraGetEmvsForAppId");
 
-            var localVarPath = "/api/v1.0/{appId}/emvterminals";
+            var localVarPath = "./api/v1.0/{appId}/emvterminals";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3698,12 +4132,12 @@ public ApiResponse< RestApiArrayResultEmvTerminalWithAssignments > HydraGetEmvsF
             }
 
             return new ApiResponse<RestApiArrayResultEmvTerminalWithAssignments>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultEmvTerminalWithAssignments) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultEmvTerminalWithAssignments)));
         }
 
         /// <summary>
-        /// List EMV terminals belonging to the given AppNameId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3716,7 +4150,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultEmvTerminalWithAssign
         }
 
         /// <summary>
-        /// List EMV terminals belonging to the given AppNameId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3727,7 +4161,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultEmvTermin
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->HydraGetEmvsForAppId");
 
-            var localVarPath = "/api/v1.0/{appId}/emvterminals";
+            var localVarPath = "./api/v1.0/{appId}/emvterminals";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3774,12 +4208,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultEmvTermin
             }
 
             return new ApiResponse<RestApiArrayResultEmvTerminalWithAssignments>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultEmvTerminalWithAssignments) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultEmvTerminalWithAssignments)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="deviceId"></param>
@@ -3792,7 +4226,7 @@ public void LoginWithDeviceId (string deviceId, string hydraUserType = null, str
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="deviceId"></param>
@@ -3805,7 +4239,7 @@ public ApiResponse<Object> LoginWithDeviceIdWithHttpInfo (string deviceId, strin
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->LoginWithDeviceId");
 
-            var localVarPath = "/api/v1.0/hydra/{deviceId}/login";
+            var localVarPath = "./api/v1.0/hydra/{deviceId}/login";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3854,12 +4288,12 @@ public ApiResponse<Object> LoginWithDeviceIdWithHttpInfo (string deviceId, strin
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="deviceId"></param>
@@ -3873,7 +4307,7 @@ public async System.Threading.Tasks.Task LoginWithDeviceIdAsync (string deviceId
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="deviceId"></param>
@@ -3886,7 +4320,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginWithDeviceIdA
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->LoginWithDeviceId");
 
-            var localVarPath = "/api/v1.0/hydra/{deviceId}/login";
+            var localVarPath = "./api/v1.0/hydra/{deviceId}/login";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3935,12 +4369,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LoginWithDeviceIdA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3953,7 +4387,7 @@ public RestApiResultHydraStatus Register (string appId, HydraRegistrationRequest
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -3968,7 +4402,7 @@ public ApiResponse< RestApiResultHydraStatus > RegisterWithHttpInfo (string appI
             if (hydraRegistration == null)
                 throw new ApiException(400, "Missing required parameter 'hydraRegistration' when calling HydraApi->Register");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/registration";
+            var localVarPath = "./api/v1.0/{appId}/hydra/registration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4028,12 +4462,12 @@ public ApiResponse< RestApiResultHydraStatus > RegisterWithHttpInfo (string appI
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4047,7 +4481,7 @@ public async System.Threading.Tasks.Task<RestApiResultHydraStatus> RegisterAsync
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4062,7 +4496,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             if (hydraRegistration == null)
                 throw new ApiException(400, "Missing required parameter 'hydraRegistration' when calling HydraApi->Register");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/registration";
+            var localVarPath = "./api/v1.0/{appId}/hydra/registration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4122,12 +4556,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHydraStatus>>
             }
 
             return new ApiResponse<RestApiResultHydraStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultHydraStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHydraStatus)));
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4139,7 +4573,7 @@ public void UnAssign (string appId, string deviceId)
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4154,7 +4588,7 @@ public ApiResponse<Object> UnAssignWithHttpInfo (string appId, string deviceId)
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->UnAssign");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceId}/registration";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceId}/registration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4202,12 +4636,12 @@ public ApiResponse<Object> UnAssignWithHttpInfo (string appId, string deviceId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4220,7 +4654,7 @@ public async System.Threading.Tasks.Task UnAssignAsync (string appId, string dev
         }
 
         /// <summary>
-        /// [Private] 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4235,7 +4669,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnAssignAsyncWithH
             if (deviceId == null)
                 throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->UnAssign");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/{deviceId}/registration";
+            var localVarPath = "./api/v1.0/{appId}/hydra/{deviceId}/registration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4283,12 +4717,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnAssignAsyncWithH
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Unassign the currently assigned EMV terminal from a kiosk 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4300,7 +4734,7 @@ public void UnassignEmv (string appId, int? hydraConfigId)
         }
 
         /// <summary>
-        /// Unassign the currently assigned EMV terminal from a kiosk 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4315,7 +4749,7 @@ public ApiResponse<Object> UnassignEmvWithHttpInfo (string appId, int? hydraConf
             if (hydraConfigId == null)
                 throw new ApiException(400, "Missing required parameter 'hydraConfigId' when calling HydraApi->UnassignEmv");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/emvterminal/unassign/{hydraConfigId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/emvterminal/unassign/{hydraConfigId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4363,12 +4797,12 @@ public ApiResponse<Object> UnassignEmvWithHttpInfo (string appId, int? hydraConf
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Unassign the currently assigned EMV terminal from a kiosk 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4381,7 +4815,7 @@ public async System.Threading.Tasks.Task UnassignEmvAsync (string appId, int? hy
         }
 
         /// <summary>
-        /// Unassign the currently assigned EMV terminal from a kiosk 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4396,7 +4830,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnassignEmvAsyncWi
             if (hydraConfigId == null)
                 throw new ApiException(400, "Missing required parameter 'hydraConfigId' when calling HydraApi->UnassignEmv");
 
-            var localVarPath = "/api/v1.0/{appId}/hydra/emvterminal/unassign/{hydraConfigId}";
+            var localVarPath = "./api/v1.0/{appId}/hydra/emvterminal/unassign/{hydraConfigId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4444,12 +4878,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnassignEmvAsyncWi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update the Cash Payment Methon Visiability on Kisok [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4462,7 +4896,7 @@ public void UpdateKioskCashVisibilitySettings (string appId, string deviceId, bo
         }
 
         /// <summary>
-        /// Update the Cash Payment Methon Visiability on Kisok [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4481,7 +4915,7 @@ public ApiResponse<Object> UpdateKioskCashVisibilitySettingsWithHttpInfo (string
             if (isCashEnabled == null)
                 throw new ApiException(400, "Missing required parameter 'isCashEnabled' when calling HydraApi->UpdateKioskCashVisibilitySettings");
 
-            var localVarPath = "/api/v1.0/{appId}/kioskupdatecashsettings";
+            var localVarPath = "./api/v1.0/{appId}/kioskupdatecashsettings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4530,12 +4964,12 @@ public ApiResponse<Object> UpdateKioskCashVisibilitySettingsWithHttpInfo (string
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update the Cash Payment Methon Visiability on Kisok [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4549,7 +4983,7 @@ public async System.Threading.Tasks.Task UpdateKioskCashVisibilitySettingsAsync
         }
 
         /// <summary>
-        /// Update the Cash Payment Methon Visiability on Kisok [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -4568,7 +5002,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateKioskCashVis
             if (isCashEnabled == null)
                 throw new ApiException(400, "Missing required parameter 'isCashEnabled' when calling HydraApi->UpdateKioskCashVisibilitySettings");
 
-            var localVarPath = "/api/v1.0/{appId}/kioskupdatecashsettings";
+            var localVarPath = "./api/v1.0/{appId}/kioskupdatecashsettings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4617,7 +5051,204 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateKioskCashVis
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <param name="settings"></param>
+        /// <returns></returns>
+        public void UpdateKioskSettings (string appId, string deviceId, KioskSettings settings)
+        {
+             UpdateKioskSettingsWithHttpInfo(appId, deviceId, settings);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <param name="settings"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdateKioskSettingsWithHttpInfo (string appId, string deviceId, KioskSettings settings)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->UpdateKioskSettings");
+            // verify the required parameter 'deviceId' is set
+            if (deviceId == null)
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->UpdateKioskSettings");
+            // verify the required parameter 'settings' is set
+            if (settings == null)
+                throw new ApiException(400, "Missing required parameter 'settings' when calling HydraApi->UpdateKioskSettings");
+
+            var localVarPath = "./api/v1.0/{appId}/kiosksettings/{deviceId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceId != null) localVarPathParams.Add("deviceId", this.Configuration.ApiClient.ParameterToString(deviceId)); // path parameter
+            if (settings != null && settings.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(settings); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = settings; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateKioskSettings", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <param name="settings"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdateKioskSettingsAsync (string appId, string deviceId, KioskSettings settings)
+        {
+             await UpdateKioskSettingsAsyncWithHttpInfo(appId, deviceId, settings);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="deviceId"></param>
+        /// <param name="settings"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateKioskSettingsAsyncWithHttpInfo (string appId, string deviceId, KioskSettings settings)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling HydraApi->UpdateKioskSettings");
+            // verify the required parameter 'deviceId' is set
+            if (deviceId == null)
+                throw new ApiException(400, "Missing required parameter 'deviceId' when calling HydraApi->UpdateKioskSettings");
+            // verify the required parameter 'settings' is set
+            if (settings == null)
+                throw new ApiException(400, "Missing required parameter 'settings' when calling HydraApi->UpdateKioskSettings");
+
+            var localVarPath = "./api/v1.0/{appId}/kiosksettings/{deviceId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (deviceId != null) localVarPathParams.Add("deviceId", this.Configuration.ApiClient.ParameterToString(deviceId)); // path parameter
+            if (settings != null && settings.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(settings); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = settings; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateKioskSettings", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/IntegrationMetadataCatalogueApi.cs b/src/Flipdish/Api/IntegrationMetadataCatalogueApi.cs
new file mode 100644
index 00000000..63a9c7d9
--- /dev/null
+++ b/src/Flipdish/Api/IntegrationMetadataCatalogueApi.cs
@@ -0,0 +1,353 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IIntegrationMetadataCatalogueApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="nameContains"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>RestApiResultPixelPointProductCatalogue</returns>
+        RestApiResultPixelPointProductCatalogue IntegrationMetadataCatalogueGetPixelPointProducts (int? storeId, string nameContains = null, int? page = null, int? pageSize = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="nameContains"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultPixelPointProductCatalogue</returns>
+        ApiResponse<RestApiResultPixelPointProductCatalogue> IntegrationMetadataCatalogueGetPixelPointProductsWithHttpInfo (int? storeId, string nameContains = null, int? page = null, int? pageSize = null);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="nameContains"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>Task of RestApiResultPixelPointProductCatalogue</returns>
+        System.Threading.Tasks.Task<RestApiResultPixelPointProductCatalogue> IntegrationMetadataCatalogueGetPixelPointProductsAsync (int? storeId, string nameContains = null, int? page = null, int? pageSize = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="nameContains"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultPixelPointProductCatalogue)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultPixelPointProductCatalogue>> IntegrationMetadataCatalogueGetPixelPointProductsAsyncWithHttpInfo (int? storeId, string nameContains = null, int? page = null, int? pageSize = null);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class IntegrationMetadataCatalogueApi : IIntegrationMetadataCatalogueApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntegrationMetadataCatalogueApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public IntegrationMetadataCatalogueApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntegrationMetadataCatalogueApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public IntegrationMetadataCatalogueApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="nameContains"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>RestApiResultPixelPointProductCatalogue</returns>
+        public RestApiResultPixelPointProductCatalogue IntegrationMetadataCatalogueGetPixelPointProducts (int? storeId, string nameContains = null, int? page = null, int? pageSize = null)
+        {
+             ApiResponse<RestApiResultPixelPointProductCatalogue> localVarResponse = IntegrationMetadataCatalogueGetPixelPointProductsWithHttpInfo(storeId, nameContains, page, pageSize);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="nameContains"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultPixelPointProductCatalogue</returns>
+        public ApiResponse< RestApiResultPixelPointProductCatalogue > IntegrationMetadataCatalogueGetPixelPointProductsWithHttpInfo (int? storeId, string nameContains = null, int? page = null, int? pageSize = null)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling IntegrationMetadataCatalogueApi->IntegrationMetadataCatalogueGetPixelPointProducts");
+
+            var localVarPath = "./api/v1.0/integrationmetadatacatalogue/pixelpoint/stores/{storeId}/products";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (nameContains != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "nameContains", nameContains)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (pageSize != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageSize", pageSize)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("IntegrationMetadataCatalogueGetPixelPointProducts", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPixelPointProductCatalogue>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPixelPointProductCatalogue) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPixelPointProductCatalogue)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="nameContains"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>Task of RestApiResultPixelPointProductCatalogue</returns>
+        public async System.Threading.Tasks.Task<RestApiResultPixelPointProductCatalogue> IntegrationMetadataCatalogueGetPixelPointProductsAsync (int? storeId, string nameContains = null, int? page = null, int? pageSize = null)
+        {
+             ApiResponse<RestApiResultPixelPointProductCatalogue> localVarResponse = await IntegrationMetadataCatalogueGetPixelPointProductsAsyncWithHttpInfo(storeId, nameContains, page, pageSize);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="nameContains"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultPixelPointProductCatalogue)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPixelPointProductCatalogue>> IntegrationMetadataCatalogueGetPixelPointProductsAsyncWithHttpInfo (int? storeId, string nameContains = null, int? page = null, int? pageSize = null)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling IntegrationMetadataCatalogueApi->IntegrationMetadataCatalogueGetPixelPointProducts");
+
+            var localVarPath = "./api/v1.0/integrationmetadatacatalogue/pixelpoint/stores/{storeId}/products";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (nameContains != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "nameContains", nameContains)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (pageSize != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageSize", pageSize)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("IntegrationMetadataCatalogueGetPixelPointProducts", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPixelPointProductCatalogue>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPixelPointProductCatalogue) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPixelPointProductCatalogue)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/IntercomApi.cs b/src/Flipdish/Api/IntercomApi.cs
new file mode 100644
index 00000000..071b3403
--- /dev/null
+++ b/src/Flipdish/Api/IntercomApi.cs
@@ -0,0 +1,307 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IIntercomApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>RestApiResultIntercomUserHash</returns>
+        RestApiResultIntercomUserHash UserHash ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of RestApiResultIntercomUserHash</returns>
+        ApiResponse<RestApiResultIntercomUserHash> UserHashWithHttpInfo ();
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiResultIntercomUserHash</returns>
+        System.Threading.Tasks.Task<RestApiResultIntercomUserHash> UserHashAsync ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiResultIntercomUserHash)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultIntercomUserHash>> UserHashAsyncWithHttpInfo ();
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class IntercomApi : IIntercomApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public IntercomApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public IntercomApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>RestApiResultIntercomUserHash</returns>
+        public RestApiResultIntercomUserHash UserHash ()
+        {
+             ApiResponse<RestApiResultIntercomUserHash> localVarResponse = UserHashWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of RestApiResultIntercomUserHash</returns>
+        public ApiResponse< RestApiResultIntercomUserHash > UserHashWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/intercom/userHash";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UserHash", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultIntercomUserHash>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultIntercomUserHash) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultIntercomUserHash)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiResultIntercomUserHash</returns>
+        public async System.Threading.Tasks.Task<RestApiResultIntercomUserHash> UserHashAsync ()
+        {
+             ApiResponse<RestApiResultIntercomUserHash> localVarResponse = await UserHashAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiResultIntercomUserHash)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultIntercomUserHash>> UserHashAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/intercom/userHash";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UserHash", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultIntercomUserHash>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultIntercomUserHash) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultIntercomUserHash)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/InvoicesApi.cs b/src/Flipdish/Api/InvoicesApi.cs
new file mode 100644
index 00000000..d591f75f
--- /dev/null
+++ b/src/Flipdish/Api/InvoicesApi.cs
@@ -0,0 +1,1112 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IInvoicesApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        RestApiFinanceSearchPaginationResultSubscriptionInvoice GetInvoices (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice> GetInvoicesWithHttpInfo (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="invoiceNumber"></param>
+        /// <param name="appId"></param>
+        /// <returns></returns>
+        void InvoicePdf (string invoiceNumber, string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="invoiceNumber"></param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> InvoicePdfWithHttpInfo (string invoiceNumber, string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <returns>RestApiFinanceSearchPaginationResultInvoice</returns>
+        RestApiFinanceSearchPaginationResultInvoice ListInvoices (int? storeId, string appId, int? limit = null, int? page = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <returns>ApiResponse of RestApiFinanceSearchPaginationResultInvoice</returns>
+        ApiResponse<RestApiFinanceSearchPaginationResultInvoice> ListInvoicesWithHttpInfo (int? storeId, string appId, int? limit = null, int? page = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        RestApiFinanceSearchPaginationResultSubscriptionInvoice ListSubscriptionInvoices (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice> ListSubscriptionInvoicesWithHttpInfo (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        System.Threading.Tasks.Task<RestApiFinanceSearchPaginationResultSubscriptionInvoice> GetInvoicesAsync (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiFinanceSearchPaginationResultSubscriptionInvoice)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice>> GetInvoicesAsyncWithHttpInfo (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="invoiceNumber"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task InvoicePdfAsync (string invoiceNumber, string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="invoiceNumber"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> InvoicePdfAsyncWithHttpInfo (string invoiceNumber, string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <returns>Task of RestApiFinanceSearchPaginationResultInvoice</returns>
+        System.Threading.Tasks.Task<RestApiFinanceSearchPaginationResultInvoice> ListInvoicesAsync (int? storeId, string appId, int? limit = null, int? page = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiFinanceSearchPaginationResultInvoice)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiFinanceSearchPaginationResultInvoice>> ListInvoicesAsyncWithHttpInfo (int? storeId, string appId, int? limit = null, int? page = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        System.Threading.Tasks.Task<RestApiFinanceSearchPaginationResultSubscriptionInvoice> ListSubscriptionInvoicesAsync (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiFinanceSearchPaginationResultSubscriptionInvoice)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice>> ListSubscriptionInvoicesAsyncWithHttpInfo (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class InvoicesApi : IInvoicesApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvoicesApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public InvoicesApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvoicesApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public InvoicesApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        public RestApiFinanceSearchPaginationResultSubscriptionInvoice GetInvoices (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+        {
+             ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice> localVarResponse = GetInvoicesWithHttpInfo(appId, subscriptionId, limit, pageId, excludeNotOwnedInvoices, dateFrom, dateTo, invoiceNumber, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        public ApiResponse< RestApiFinanceSearchPaginationResultSubscriptionInvoice > GetInvoicesWithHttpInfo (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling InvoicesApi->GetInvoices");
+
+            var localVarPath = "./api/v1.0/{appId}/invoices";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (subscriptionId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "subscriptionId", subscriptionId)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (pageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageId", pageId)); // query parameter
+            if (excludeNotOwnedInvoices != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeNotOwnedInvoices", excludeNotOwnedInvoices)); // query parameter
+            if (dateFrom != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dateFrom", dateFrom)); // query parameter
+            if (dateTo != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dateTo", dateTo)); // query parameter
+            if (invoiceNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "invoiceNumber", invoiceNumber)); // query parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetInvoices", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiFinanceSearchPaginationResultSubscriptionInvoice) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiFinanceSearchPaginationResultSubscriptionInvoice)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        public async System.Threading.Tasks.Task<RestApiFinanceSearchPaginationResultSubscriptionInvoice> GetInvoicesAsync (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+        {
+             ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice> localVarResponse = await GetInvoicesAsyncWithHttpInfo(appId, subscriptionId, limit, pageId, excludeNotOwnedInvoices, dateFrom, dateTo, invoiceNumber, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiFinanceSearchPaginationResultSubscriptionInvoice)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice>> GetInvoicesAsyncWithHttpInfo (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling InvoicesApi->GetInvoices");
+
+            var localVarPath = "./api/v1.0/{appId}/invoices";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (subscriptionId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "subscriptionId", subscriptionId)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (pageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageId", pageId)); // query parameter
+            if (excludeNotOwnedInvoices != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeNotOwnedInvoices", excludeNotOwnedInvoices)); // query parameter
+            if (dateFrom != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dateFrom", dateFrom)); // query parameter
+            if (dateTo != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dateTo", dateTo)); // query parameter
+            if (invoiceNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "invoiceNumber", invoiceNumber)); // query parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetInvoices", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiFinanceSearchPaginationResultSubscriptionInvoice) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiFinanceSearchPaginationResultSubscriptionInvoice)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="invoiceNumber"></param>
+        /// <param name="appId"></param>
+        /// <returns></returns>
+        public void InvoicePdf (string invoiceNumber, string appId)
+        {
+             InvoicePdfWithHttpInfo(invoiceNumber, appId);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="invoiceNumber"></param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> InvoicePdfWithHttpInfo (string invoiceNumber, string appId)
+        {
+            // verify the required parameter 'invoiceNumber' is set
+            if (invoiceNumber == null)
+                throw new ApiException(400, "Missing required parameter 'invoiceNumber' when calling InvoicesApi->InvoicePdf");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling InvoicesApi->InvoicePdf");
+
+            var localVarPath = "./api/v1.0/{appId}/invoices/InvoicePdf";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (invoiceNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "invoiceNumber", invoiceNumber)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("InvoicePdf", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="invoiceNumber"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task InvoicePdfAsync (string invoiceNumber, string appId)
+        {
+             await InvoicePdfAsyncWithHttpInfo(invoiceNumber, appId);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="invoiceNumber"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> InvoicePdfAsyncWithHttpInfo (string invoiceNumber, string appId)
+        {
+            // verify the required parameter 'invoiceNumber' is set
+            if (invoiceNumber == null)
+                throw new ApiException(400, "Missing required parameter 'invoiceNumber' when calling InvoicesApi->InvoicePdf");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling InvoicesApi->InvoicePdf");
+
+            var localVarPath = "./api/v1.0/{appId}/invoices/InvoicePdf";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (invoiceNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "invoiceNumber", invoiceNumber)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("InvoicePdf", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <returns>RestApiFinanceSearchPaginationResultInvoice</returns>
+        public RestApiFinanceSearchPaginationResultInvoice ListInvoices (int? storeId, string appId, int? limit = null, int? page = null)
+        {
+             ApiResponse<RestApiFinanceSearchPaginationResultInvoice> localVarResponse = ListInvoicesWithHttpInfo(storeId, appId, limit, page);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <returns>ApiResponse of RestApiFinanceSearchPaginationResultInvoice</returns>
+        public ApiResponse< RestApiFinanceSearchPaginationResultInvoice > ListInvoicesWithHttpInfo (int? storeId, string appId, int? limit = null, int? page = null)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling InvoicesApi->ListInvoices");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling InvoicesApi->ListInvoices");
+
+            var localVarPath = "./api/v1.0/{appId}/invoices/ListInvoices";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("ListInvoices", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiFinanceSearchPaginationResultInvoice>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiFinanceSearchPaginationResultInvoice) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiFinanceSearchPaginationResultInvoice)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <returns>Task of RestApiFinanceSearchPaginationResultInvoice</returns>
+        public async System.Threading.Tasks.Task<RestApiFinanceSearchPaginationResultInvoice> ListInvoicesAsync (int? storeId, string appId, int? limit = null, int? page = null)
+        {
+             ApiResponse<RestApiFinanceSearchPaginationResultInvoice> localVarResponse = await ListInvoicesAsyncWithHttpInfo(storeId, appId, limit, page);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiFinanceSearchPaginationResultInvoice)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiFinanceSearchPaginationResultInvoice>> ListInvoicesAsyncWithHttpInfo (int? storeId, string appId, int? limit = null, int? page = null)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling InvoicesApi->ListInvoices");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling InvoicesApi->ListInvoices");
+
+            var localVarPath = "./api/v1.0/{appId}/invoices/ListInvoices";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("ListInvoices", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiFinanceSearchPaginationResultInvoice>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiFinanceSearchPaginationResultInvoice) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiFinanceSearchPaginationResultInvoice)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        public RestApiFinanceSearchPaginationResultSubscriptionInvoice ListSubscriptionInvoices (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+        {
+             ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice> localVarResponse = ListSubscriptionInvoicesWithHttpInfo(appId, subscriptionId, limit, pageId, excludeNotOwnedInvoices, dateFrom, dateTo, invoiceNumber, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        public ApiResponse< RestApiFinanceSearchPaginationResultSubscriptionInvoice > ListSubscriptionInvoicesWithHttpInfo (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling InvoicesApi->ListSubscriptionInvoices");
+
+            var localVarPath = "./api/v1.0/{appId}/invoices/ListSubscriptionInvoices";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (subscriptionId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "subscriptionId", subscriptionId)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (pageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageId", pageId)); // query parameter
+            if (excludeNotOwnedInvoices != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeNotOwnedInvoices", excludeNotOwnedInvoices)); // query parameter
+            if (dateFrom != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dateFrom", dateFrom)); // query parameter
+            if (dateTo != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dateTo", dateTo)); // query parameter
+            if (invoiceNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "invoiceNumber", invoiceNumber)); // query parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("ListSubscriptionInvoices", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiFinanceSearchPaginationResultSubscriptionInvoice) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiFinanceSearchPaginationResultSubscriptionInvoice)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of RestApiFinanceSearchPaginationResultSubscriptionInvoice</returns>
+        public async System.Threading.Tasks.Task<RestApiFinanceSearchPaginationResultSubscriptionInvoice> ListSubscriptionInvoicesAsync (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+        {
+             ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice> localVarResponse = await ListSubscriptionInvoicesAsyncWithHttpInfo(appId, subscriptionId, limit, pageId, excludeNotOwnedInvoices, dateFrom, dateTo, invoiceNumber, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="pageId"> (optional)</param>
+        /// <param name="excludeNotOwnedInvoices"> (optional)</param>
+        /// <param name="dateFrom"> (optional)</param>
+        /// <param name="dateTo"> (optional)</param>
+        /// <param name="invoiceNumber"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiFinanceSearchPaginationResultSubscriptionInvoice)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice>> ListSubscriptionInvoicesAsyncWithHttpInfo (string appId, string subscriptionId = null, int? limit = null, string pageId = null, bool? excludeNotOwnedInvoices = null, DateTime? dateFrom = null, DateTime? dateTo = null, string invoiceNumber = null, List<int?> storeId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling InvoicesApi->ListSubscriptionInvoices");
+
+            var localVarPath = "./api/v1.0/{appId}/invoices/ListSubscriptionInvoices";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (subscriptionId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "subscriptionId", subscriptionId)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (pageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageId", pageId)); // query parameter
+            if (excludeNotOwnedInvoices != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeNotOwnedInvoices", excludeNotOwnedInvoices)); // query parameter
+            if (dateFrom != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dateFrom", dateFrom)); // query parameter
+            if (dateTo != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dateTo", dateTo)); // query parameter
+            if (invoiceNumber != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "invoiceNumber", invoiceNumber)); // query parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("ListSubscriptionInvoices", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiFinanceSearchPaginationResultSubscriptionInvoice>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiFinanceSearchPaginationResultSubscriptionInvoice) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiFinanceSearchPaginationResultSubscriptionInvoice)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/KioskEntitlementsApi.cs b/src/Flipdish/Api/KioskEntitlementsApi.cs
new file mode 100644
index 00000000..e73bca7c
--- /dev/null
+++ b/src/Flipdish/Api/KioskEntitlementsApi.cs
@@ -0,0 +1,323 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IKioskEntitlementsApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <returns>RestApiResultKioskEntitlementsResult</returns>
+        RestApiResultKioskEntitlementsResult QueryKioskEntitlementsByOrgId (string orgId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <returns>ApiResponse of RestApiResultKioskEntitlementsResult</returns>
+        ApiResponse<RestApiResultKioskEntitlementsResult> QueryKioskEntitlementsByOrgIdWithHttpInfo (string orgId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <returns>Task of RestApiResultKioskEntitlementsResult</returns>
+        System.Threading.Tasks.Task<RestApiResultKioskEntitlementsResult> QueryKioskEntitlementsByOrgIdAsync (string orgId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultKioskEntitlementsResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskEntitlementsResult>> QueryKioskEntitlementsByOrgIdAsyncWithHttpInfo (string orgId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class KioskEntitlementsApi : IKioskEntitlementsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="KioskEntitlementsApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public KioskEntitlementsApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="KioskEntitlementsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public KioskEntitlementsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <returns>RestApiResultKioskEntitlementsResult</returns>
+        public RestApiResultKioskEntitlementsResult QueryKioskEntitlementsByOrgId (string orgId)
+        {
+             ApiResponse<RestApiResultKioskEntitlementsResult> localVarResponse = QueryKioskEntitlementsByOrgIdWithHttpInfo(orgId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <returns>ApiResponse of RestApiResultKioskEntitlementsResult</returns>
+        public ApiResponse< RestApiResultKioskEntitlementsResult > QueryKioskEntitlementsByOrgIdWithHttpInfo (string orgId)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling KioskEntitlementsApi->QueryKioskEntitlementsByOrgId");
+
+            var localVarPath = "./api/v1.0/orgs/{orgId}/kiosk/entitlements";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("QueryKioskEntitlementsByOrgId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultKioskEntitlementsResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultKioskEntitlementsResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskEntitlementsResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <returns>Task of RestApiResultKioskEntitlementsResult</returns>
+        public async System.Threading.Tasks.Task<RestApiResultKioskEntitlementsResult> QueryKioskEntitlementsByOrgIdAsync (string orgId)
+        {
+             ApiResponse<RestApiResultKioskEntitlementsResult> localVarResponse = await QueryKioskEntitlementsByOrgIdAsyncWithHttpInfo(orgId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultKioskEntitlementsResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskEntitlementsResult>> QueryKioskEntitlementsByOrgIdAsyncWithHttpInfo (string orgId)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling KioskEntitlementsApi->QueryKioskEntitlementsByOrgId");
+
+            var localVarPath = "./api/v1.0/orgs/{orgId}/kiosk/entitlements";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("QueryKioskEntitlementsByOrgId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultKioskEntitlementsResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultKioskEntitlementsResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskEntitlementsResult)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/KioskIotApi.cs b/src/Flipdish/Api/KioskIotApi.cs
index 689436f4..699b3cf4 100644
--- a/src/Flipdish/Api/KioskIotApi.cs
+++ b/src/Flipdish/Api/KioskIotApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,29 +25,29 @@ public interface IKioskIotApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>RestApiResultKioskIotConnectionParameters</returns>
         RestApiResultKioskIotConnectionParameters GetKioskIotConnection ();
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of RestApiResultKioskIotConnectionParameters</returns>
         ApiResponse<RestApiResultKioskIotConnectionParameters> GetKioskIotConnectionWithHttpInfo ();
         /// <summary>
-        /// Get the IoT time series values for a given Kiosk Id, properties and time range
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -56,10 +56,10 @@ public interface IKioskIotApi : IApiAccessor
         RestApiResultTelemetrySeriesResult QueryTelemetrySeries (string appId, TelemetrySeriesQueryParameters queryParams);
 
         /// <summary>
-        /// Get the IoT time series values for a given Kiosk Id, properties and time range
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -69,29 +69,29 @@ public interface IKioskIotApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of RestApiResultKioskIotConnectionParameters</returns>
         System.Threading.Tasks.Task<RestApiResultKioskIotConnectionParameters> GetKioskIotConnectionAsync ();
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of ApiResponse (RestApiResultKioskIotConnectionParameters)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskIotConnectionParameters>> GetKioskIotConnectionAsyncWithHttpInfo ();
         /// <summary>
-        /// Get the IoT time series values for a given Kiosk Id, properties and time range
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -100,10 +100,10 @@ public interface IKioskIotApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultTelemetrySeriesResult> QueryTelemetrySeriesAsync (string appId, TelemetrySeriesQueryParameters queryParams);
 
         /// <summary>
-        /// Get the IoT time series values for a given Kiosk Id, properties and time range
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -211,7 +211,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>RestApiResultKioskIotConnectionParameters</returns>
@@ -222,14 +222,14 @@ public RestApiResultKioskIotConnectionParameters GetKioskIotConnection ()
         }
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of RestApiResultKioskIotConnectionParameters</returns>
         public ApiResponse< RestApiResultKioskIotConnectionParameters > GetKioskIotConnectionWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/kioskiot/connect";
+            var localVarPath = "./api/v1.0/kioskiot/connect";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -275,12 +275,12 @@ public ApiResponse< RestApiResultKioskIotConnectionParameters > GetKioskIotConne
             }
 
             return new ApiResponse<RestApiResultKioskIotConnectionParameters>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultKioskIotConnectionParameters) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskIotConnectionParameters)));
         }
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of RestApiResultKioskIotConnectionParameters</returns>
@@ -292,14 +292,14 @@ public async System.Threading.Tasks.Task<RestApiResultKioskIotConnectionParamete
         }
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of ApiResponse (RestApiResultKioskIotConnectionParameters)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskIotConnectionParameters>> GetKioskIotConnectionAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/kioskiot/connect";
+            var localVarPath = "./api/v1.0/kioskiot/connect";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -345,12 +345,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskIotConnec
             }
 
             return new ApiResponse<RestApiResultKioskIotConnectionParameters>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultKioskIotConnectionParameters) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskIotConnectionParameters)));
         }
 
         /// <summary>
-        /// Get the IoT time series values for a given Kiosk Id, properties and time range [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -363,7 +363,7 @@ public RestApiResultTelemetrySeriesResult QueryTelemetrySeries (string appId, Te
         }
 
         /// <summary>
-        /// Get the IoT time series values for a given Kiosk Id, properties and time range [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -378,7 +378,7 @@ public ApiResponse< RestApiResultTelemetrySeriesResult > QueryTelemetrySeriesWit
             if (queryParams == null)
                 throw new ApiException(400, "Missing required parameter 'queryParams' when calling KioskIotApi->QueryTelemetrySeries");
 
-            var localVarPath = "/api/v1.0/{appId}/kioskiot/timeseries/query";
+            var localVarPath = "./api/v1.0/{appId}/kioskiot/timeseries/query";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -438,12 +438,12 @@ public ApiResponse< RestApiResultTelemetrySeriesResult > QueryTelemetrySeriesWit
             }
 
             return new ApiResponse<RestApiResultTelemetrySeriesResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTelemetrySeriesResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTelemetrySeriesResult)));
         }
 
         /// <summary>
-        /// Get the IoT time series values for a given Kiosk Id, properties and time range [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -457,7 +457,7 @@ public async System.Threading.Tasks.Task<RestApiResultTelemetrySeriesResult> Que
         }
 
         /// <summary>
-        /// Get the IoT time series values for a given Kiosk Id, properties and time range [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -472,7 +472,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTelemetrySerie
             if (queryParams == null)
                 throw new ApiException(400, "Missing required parameter 'queryParams' when calling KioskIotApi->QueryTelemetrySeries");
 
-            var localVarPath = "/api/v1.0/{appId}/kioskiot/timeseries/query";
+            var localVarPath = "./api/v1.0/{appId}/kioskiot/timeseries/query";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -532,7 +532,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTelemetrySerie
             }
 
             return new ApiResponse<RestApiResultTelemetrySeriesResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTelemetrySeriesResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTelemetrySeriesResult)));
         }
 
diff --git a/src/Flipdish/Api/KioskStoreSettingsApi.cs b/src/Flipdish/Api/KioskStoreSettingsApi.cs
deleted file mode 100644
index 31ea309f..00000000
--- a/src/Flipdish/Api/KioskStoreSettingsApi.cs
+++ /dev/null
@@ -1,741 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IKioskStoreSettingsApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Get all kiosk settings associated with a store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>RestApiResultStoreKioskSettings</returns>
-        RestApiResultStoreKioskSettings GetAllKioskSettingsForStore (int? storeId, string appId);
-
-        /// <summary>
-        /// Get all kiosk settings associated with a store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>ApiResponse of RestApiResultStoreKioskSettings</returns>
-        ApiResponse<RestApiResultStoreKioskSettings> GetAllKioskSettingsForStoreWithHttpInfo (int? storeId, string appId);
-        /// <summary>
-        /// [For Kiosk use only] Get all stores connected to a Kiosk
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiResultKioskStoreSettings</returns>
-        RestApiResultKioskStoreSettings GetAllStoreSettingsForKioskHydra ();
-
-        /// <summary>
-        /// [For Kiosk use only] Get all stores connected to a Kiosk
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiResultKioskStoreSettings</returns>
-        ApiResponse<RestApiResultKioskStoreSettings> GetAllStoreSettingsForKioskHydraWithHttpInfo ();
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="isCashEnabled"></param>
-        /// <returns>RestApiResultKioskCashSetting</returns>
-        RestApiResultKioskCashSetting UpdateCashSettingForKiosk (string appId, string deviceId, bool? isCashEnabled);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="isCashEnabled"></param>
-        /// <returns>ApiResponse of RestApiResultKioskCashSetting</returns>
-        ApiResponse<RestApiResultKioskCashSetting> UpdateCashSettingForKioskWithHttpInfo (string appId, string deviceId, bool? isCashEnabled);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Get all kiosk settings associated with a store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of RestApiResultStoreKioskSettings</returns>
-        System.Threading.Tasks.Task<RestApiResultStoreKioskSettings> GetAllKioskSettingsForStoreAsync (int? storeId, string appId);
-
-        /// <summary>
-        /// Get all kiosk settings associated with a store
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of ApiResponse (RestApiResultStoreKioskSettings)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreKioskSettings>> GetAllKioskSettingsForStoreAsyncWithHttpInfo (int? storeId, string appId);
-        /// <summary>
-        /// [For Kiosk use only] Get all stores connected to a Kiosk
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiResultKioskStoreSettings</returns>
-        System.Threading.Tasks.Task<RestApiResultKioskStoreSettings> GetAllStoreSettingsForKioskHydraAsync ();
-
-        /// <summary>
-        /// [For Kiosk use only] Get all stores connected to a Kiosk
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiResultKioskStoreSettings)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskStoreSettings>> GetAllStoreSettingsForKioskHydraAsyncWithHttpInfo ();
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="isCashEnabled"></param>
-        /// <returns>Task of RestApiResultKioskCashSetting</returns>
-        System.Threading.Tasks.Task<RestApiResultKioskCashSetting> UpdateCashSettingForKioskAsync (string appId, string deviceId, bool? isCashEnabled);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="isCashEnabled"></param>
-        /// <returns>Task of ApiResponse (RestApiResultKioskCashSetting)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskCashSetting>> UpdateCashSettingForKioskAsyncWithHttpInfo (string appId, string deviceId, bool? isCashEnabled);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class KioskStoreSettingsApi : IKioskStoreSettingsApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="KioskStoreSettingsApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public KioskStoreSettingsApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="KioskStoreSettingsApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public KioskStoreSettingsApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Get all kiosk settings associated with a store 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>RestApiResultStoreKioskSettings</returns>
-        public RestApiResultStoreKioskSettings GetAllKioskSettingsForStore (int? storeId, string appId)
-        {
-             ApiResponse<RestApiResultStoreKioskSettings> localVarResponse = GetAllKioskSettingsForStoreWithHttpInfo(storeId, appId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Get all kiosk settings associated with a store 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>ApiResponse of RestApiResultStoreKioskSettings</returns>
-        public ApiResponse< RestApiResultStoreKioskSettings > GetAllKioskSettingsForStoreWithHttpInfo (int? storeId, string appId)
-        {
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling KioskStoreSettingsApi->GetAllKioskSettingsForStore");
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling KioskStoreSettingsApi->GetAllKioskSettingsForStore");
-
-            var localVarPath = "/api/v1.0/{appId}/kiosksettings/store/{storeId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetAllKioskSettingsForStore", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultStoreKioskSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultStoreKioskSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreKioskSettings)));
-        }
-
-        /// <summary>
-        /// Get all kiosk settings associated with a store 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of RestApiResultStoreKioskSettings</returns>
-        public async System.Threading.Tasks.Task<RestApiResultStoreKioskSettings> GetAllKioskSettingsForStoreAsync (int? storeId, string appId)
-        {
-             ApiResponse<RestApiResultStoreKioskSettings> localVarResponse = await GetAllKioskSettingsForStoreAsyncWithHttpInfo(storeId, appId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Get all kiosk settings associated with a store 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId">App Name Id</param>
-        /// <returns>Task of ApiResponse (RestApiResultStoreKioskSettings)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreKioskSettings>> GetAllKioskSettingsForStoreAsyncWithHttpInfo (int? storeId, string appId)
-        {
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling KioskStoreSettingsApi->GetAllKioskSettingsForStore");
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling KioskStoreSettingsApi->GetAllKioskSettingsForStore");
-
-            var localVarPath = "/api/v1.0/{appId}/kiosksettings/store/{storeId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetAllKioskSettingsForStore", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultStoreKioskSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultStoreKioskSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreKioskSettings)));
-        }
-
-        /// <summary>
-        /// [For Kiosk use only] Get all stores connected to a Kiosk 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiResultKioskStoreSettings</returns>
-        public RestApiResultKioskStoreSettings GetAllStoreSettingsForKioskHydra ()
-        {
-             ApiResponse<RestApiResultKioskStoreSettings> localVarResponse = GetAllStoreSettingsForKioskHydraWithHttpInfo();
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// [For Kiosk use only] Get all stores connected to a Kiosk 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiResultKioskStoreSettings</returns>
-        public ApiResponse< RestApiResultKioskStoreSettings > GetAllStoreSettingsForKioskHydraWithHttpInfo ()
-        {
-
-            var localVarPath = "/api/v1.0/kioskstoresettings";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetAllStoreSettingsForKioskHydra", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultKioskStoreSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultKioskStoreSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskStoreSettings)));
-        }
-
-        /// <summary>
-        /// [For Kiosk use only] Get all stores connected to a Kiosk 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiResultKioskStoreSettings</returns>
-        public async System.Threading.Tasks.Task<RestApiResultKioskStoreSettings> GetAllStoreSettingsForKioskHydraAsync ()
-        {
-             ApiResponse<RestApiResultKioskStoreSettings> localVarResponse = await GetAllStoreSettingsForKioskHydraAsyncWithHttpInfo();
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// [For Kiosk use only] Get all stores connected to a Kiosk 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiResultKioskStoreSettings)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskStoreSettings>> GetAllStoreSettingsForKioskHydraAsyncWithHttpInfo ()
-        {
-
-            var localVarPath = "/api/v1.0/kioskstoresettings";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetAllStoreSettingsForKioskHydra", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultKioskStoreSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultKioskStoreSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskStoreSettings)));
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="isCashEnabled"></param>
-        /// <returns>RestApiResultKioskCashSetting</returns>
-        public RestApiResultKioskCashSetting UpdateCashSettingForKiosk (string appId, string deviceId, bool? isCashEnabled)
-        {
-             ApiResponse<RestApiResultKioskCashSetting> localVarResponse = UpdateCashSettingForKioskWithHttpInfo(appId, deviceId, isCashEnabled);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="isCashEnabled"></param>
-        /// <returns>ApiResponse of RestApiResultKioskCashSetting</returns>
-        public ApiResponse< RestApiResultKioskCashSetting > UpdateCashSettingForKioskWithHttpInfo (string appId, string deviceId, bool? isCashEnabled)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling KioskStoreSettingsApi->UpdateCashSettingForKiosk");
-            // verify the required parameter 'deviceId' is set
-            if (deviceId == null)
-                throw new ApiException(400, "Missing required parameter 'deviceId' when calling KioskStoreSettingsApi->UpdateCashSettingForKiosk");
-            // verify the required parameter 'isCashEnabled' is set
-            if (isCashEnabled == null)
-                throw new ApiException(400, "Missing required parameter 'isCashEnabled' when calling KioskStoreSettingsApi->UpdateCashSettingForKiosk");
-
-            var localVarPath = "/api/v1.0/{appId}/kiosksettings/cash";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (deviceId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "deviceId", deviceId)); // query parameter
-            if (isCashEnabled != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "isCashEnabled", isCashEnabled)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("UpdateCashSettingForKiosk", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultKioskCashSetting>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultKioskCashSetting) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskCashSetting)));
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="isCashEnabled"></param>
-        /// <returns>Task of RestApiResultKioskCashSetting</returns>
-        public async System.Threading.Tasks.Task<RestApiResultKioskCashSetting> UpdateCashSettingForKioskAsync (string appId, string deviceId, bool? isCashEnabled)
-        {
-             ApiResponse<RestApiResultKioskCashSetting> localVarResponse = await UpdateCashSettingForKioskAsyncWithHttpInfo(appId, deviceId, isCashEnabled);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        ///  
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="isCashEnabled"></param>
-        /// <returns>Task of ApiResponse (RestApiResultKioskCashSetting)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskCashSetting>> UpdateCashSettingForKioskAsyncWithHttpInfo (string appId, string deviceId, bool? isCashEnabled)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling KioskStoreSettingsApi->UpdateCashSettingForKiosk");
-            // verify the required parameter 'deviceId' is set
-            if (deviceId == null)
-                throw new ApiException(400, "Missing required parameter 'deviceId' when calling KioskStoreSettingsApi->UpdateCashSettingForKiosk");
-            // verify the required parameter 'isCashEnabled' is set
-            if (isCashEnabled == null)
-                throw new ApiException(400, "Missing required parameter 'isCashEnabled' when calling KioskStoreSettingsApi->UpdateCashSettingForKiosk");
-
-            var localVarPath = "/api/v1.0/{appId}/kiosksettings/cash";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (deviceId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "deviceId", deviceId)); // query parameter
-            if (isCashEnabled != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "isCashEnabled", isCashEnabled)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("UpdateCashSettingForKiosk", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultKioskCashSetting>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultKioskCashSetting) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskCashSetting)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/LightspeedApi.cs b/src/Flipdish/Api/LightspeedApi.cs
index 5bcffffa..6c5149f7 100644
--- a/src/Flipdish/Api/LightspeedApi.cs
+++ b/src/Flipdish/Api/LightspeedApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -280,7 +280,7 @@ public ApiResponse< Object > LightspeedGenerateMenuWithHttpInfo (int? storeId)
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LightspeedApi->LightspeedGenerateMenu");
 
-            var localVarPath = "/api/v1.0/lightspeed/{storeId}/menu/generate";
+            var localVarPath = "./api/v1.0/lightspeed/{storeId}/menu/generate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -327,7 +327,7 @@ public ApiResponse< Object > LightspeedGenerateMenuWithHttpInfo (int? storeId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -356,7 +356,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LightspeedGenerate
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LightspeedApi->LightspeedGenerateMenu");
 
-            var localVarPath = "/api/v1.0/lightspeed/{storeId}/menu/generate";
+            var localVarPath = "./api/v1.0/lightspeed/{storeId}/menu/generate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -403,7 +403,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LightspeedGenerate
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -431,7 +431,7 @@ public ApiResponse< RestApiResultLightspeedSettings > LightspeedGetStoreSettings
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LightspeedApi->LightspeedGetStoreSettings");
 
-            var localVarPath = "/api/v1.0/lightspeed/{storeId}/settings";
+            var localVarPath = "./api/v1.0/lightspeed/{storeId}/settings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -478,7 +478,7 @@ public ApiResponse< RestApiResultLightspeedSettings > LightspeedGetStoreSettings
             }
 
             return new ApiResponse<RestApiResultLightspeedSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLightspeedSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLightspeedSettings)));
         }
 
@@ -507,7 +507,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLightspeedSett
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LightspeedApi->LightspeedGetStoreSettings");
 
-            var localVarPath = "/api/v1.0/lightspeed/{storeId}/settings";
+            var localVarPath = "./api/v1.0/lightspeed/{storeId}/settings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -554,7 +554,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLightspeedSett
             }
 
             return new ApiResponse<RestApiResultLightspeedSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLightspeedSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLightspeedSettings)));
         }
 
@@ -587,7 +587,7 @@ public ApiResponse< RestApiResultLightspeedSettings > LightspeedSaveStoreSetting
             if (lightspeedSettings == null)
                 throw new ApiException(400, "Missing required parameter 'lightspeedSettings' when calling LightspeedApi->LightspeedSaveStoreSettings");
 
-            var localVarPath = "/api/v1.0/lightspeed/{storeId}/settings";
+            var localVarPath = "./api/v1.0/lightspeed/{storeId}/settings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -647,7 +647,7 @@ public ApiResponse< RestApiResultLightspeedSettings > LightspeedSaveStoreSetting
             }
 
             return new ApiResponse<RestApiResultLightspeedSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLightspeedSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLightspeedSettings)));
         }
 
@@ -681,7 +681,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLightspeedSett
             if (lightspeedSettings == null)
                 throw new ApiException(400, "Missing required parameter 'lightspeedSettings' when calling LightspeedApi->LightspeedSaveStoreSettings");
 
-            var localVarPath = "/api/v1.0/lightspeed/{storeId}/settings";
+            var localVarPath = "./api/v1.0/lightspeed/{storeId}/settings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -741,7 +741,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLightspeedSett
             }
 
             return new ApiResponse<RestApiResultLightspeedSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLightspeedSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLightspeedSettings)));
         }
 
diff --git a/src/Flipdish/Api/LocationApi.cs b/src/Flipdish/Api/LocationApi.cs
index 75e6b18b..ccd0561c 100644
--- a/src/Flipdish/Api/LocationApi.cs
+++ b/src/Flipdish/Api/LocationApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,287 +25,287 @@ public interface ILocationApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create a Location i.e: Table, Hotel Room, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createLocationInput">Input data for creating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="createLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         Object CreateLocation (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId);
 
         /// <summary>
-        /// Create a Location i.e: Table, Hotel Room, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createLocationInput">Input data for creating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="createLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> CreateLocationWithHttpInfo (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId);
         /// <summary>
-        /// Set a Location as deleted
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         Object DeleteLocation (int? locationId, int? locationAreaId, string appId, int? storeId);
 
         /// <summary>
-        /// Set a Location as deleted
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> DeleteLocationWithHttpInfo (int? locationId, int? locationAreaId, string appId, int? storeId);
         /// <summary>
-        /// Set or unset External Location Id on a Location
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be mapped</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
-        /// <param name="externalLocationId">External Id to be mapped to the location (optional)</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="externalLocationId"> (optional)</param>
         /// <returns>RestApiResultMappedLocation</returns>
         RestApiResultMappedLocation MapLocationToExternalId (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null);
 
         /// <summary>
-        /// Set or unset External Location Id on a Location
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be mapped</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
-        /// <param name="externalLocationId">External Id to be mapped to the location (optional)</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="externalLocationId"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultMappedLocation</returns>
         ApiResponse<RestApiResultMappedLocation> MapLocationToExternalIdWithHttpInfo (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null);
         /// <summary>
-        /// Move a Location to a different location Area
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="newLocationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="newLocationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         Object MoveLocation (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId);
 
         /// <summary>
-        /// Move a Location to a different location Area
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="newLocationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="newLocationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> MoveLocationWithHttpInfo (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId);
         /// <summary>
-        /// Update a Location i.e: Table, Hotel Room, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateLocationInput">Input data for updating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="locationId">Id of the Location to be updated</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="updateLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="locationId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultLocationAreaLocation</returns>
         RestApiResultLocationAreaLocation UpdateLocation (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId);
 
         /// <summary>
-        /// Update a Location i.e: Table, Hotel Room, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateLocationInput">Input data for updating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="locationId">Id of the Location to be updated</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="updateLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="locationId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultLocationAreaLocation</returns>
         ApiResponse<RestApiResultLocationAreaLocation> UpdateLocationWithHttpInfo (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create a Location i.e: Table, Hotel Room, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createLocationInput">Input data for creating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="createLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> CreateLocationAsync (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId);
 
         /// <summary>
-        /// Create a Location i.e: Table, Hotel Room, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createLocationInput">Input data for creating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="createLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> CreateLocationAsyncWithHttpInfo (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId);
         /// <summary>
-        /// Set a Location as deleted
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> DeleteLocationAsync (int? locationId, int? locationAreaId, string appId, int? storeId);
 
         /// <summary>
-        /// Set a Location as deleted
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteLocationAsyncWithHttpInfo (int? locationId, int? locationAreaId, string appId, int? storeId);
         /// <summary>
-        /// Set or unset External Location Id on a Location
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be mapped</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
-        /// <param name="externalLocationId">External Id to be mapped to the location (optional)</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="externalLocationId"> (optional)</param>
         /// <returns>Task of RestApiResultMappedLocation</returns>
         System.Threading.Tasks.Task<RestApiResultMappedLocation> MapLocationToExternalIdAsync (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null);
 
         /// <summary>
-        /// Set or unset External Location Id on a Location
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be mapped</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
-        /// <param name="externalLocationId">External Id to be mapped to the location (optional)</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="externalLocationId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultMappedLocation)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultMappedLocation>> MapLocationToExternalIdAsyncWithHttpInfo (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null);
         /// <summary>
-        /// Move a Location to a different location Area
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="newLocationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="newLocationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> MoveLocationAsync (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId);
 
         /// <summary>
-        /// Move a Location to a different location Area
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="newLocationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="newLocationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> MoveLocationAsyncWithHttpInfo (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId);
         /// <summary>
-        /// Update a Location i.e: Table, Hotel Room, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateLocationInput">Input data for updating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="locationId">Id of the Location to be updated</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="updateLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="locationId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultLocationAreaLocation</returns>
         System.Threading.Tasks.Task<RestApiResultLocationAreaLocation> UpdateLocationAsync (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId);
 
         /// <summary>
-        /// Update a Location i.e: Table, Hotel Room, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateLocationInput">Input data for updating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="locationId">Id of the Location to be updated</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="updateLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="locationId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultLocationAreaLocation)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationAreaLocation>> UpdateLocationAsyncWithHttpInfo (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId);
         #endregion Asynchronous Operations
@@ -409,13 +409,13 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create a Location i.e: Table, Hotel Room, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createLocationInput">Input data for creating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="createLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         public Object CreateLocation (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId)
         {
@@ -424,13 +424,13 @@ public Object CreateLocation (List<CreateLocation> createLocationInput, int? loc
         }
 
         /// <summary>
-        /// Create a Location i.e: Table, Hotel Room, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createLocationInput">Input data for creating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="createLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > CreateLocationWithHttpInfo (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId)
         {
@@ -447,7 +447,7 @@ public ApiResponse< Object > CreateLocationWithHttpInfo (List<CreateLocation> cr
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->CreateLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -509,18 +509,18 @@ public ApiResponse< Object > CreateLocationWithHttpInfo (List<CreateLocation> cr
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Create a Location i.e: Table, Hotel Room, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createLocationInput">Input data for creating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="createLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> CreateLocationAsync (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId)
         {
@@ -530,13 +530,13 @@ public async System.Threading.Tasks.Task<Object> CreateLocationAsync (List<Creat
         }
 
         /// <summary>
-        /// Create a Location i.e: Table, Hotel Room, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="createLocationInput">Input data for creating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="createLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateLocationAsyncWithHttpInfo (List<CreateLocation> createLocationInput, int? locationAreaId, string appId, int? storeId)
         {
@@ -553,7 +553,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateLocationAsyn
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->CreateLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -615,18 +615,18 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateLocationAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Set a Location as deleted 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         public Object DeleteLocation (int? locationId, int? locationAreaId, string appId, int? storeId)
         {
@@ -635,13 +635,13 @@ public Object DeleteLocation (int? locationId, int? locationAreaId, string appId
         }
 
         /// <summary>
-        /// Set a Location as deleted 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > DeleteLocationWithHttpInfo (int? locationId, int? locationAreaId, string appId, int? storeId)
         {
@@ -658,7 +658,7 @@ public ApiResponse< Object > DeleteLocationWithHttpInfo (int? locationId, int? l
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->DeleteLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/delete";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/delete";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -708,18 +708,18 @@ public ApiResponse< Object > DeleteLocationWithHttpInfo (int? locationId, int? l
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Set a Location as deleted 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> DeleteLocationAsync (int? locationId, int? locationAreaId, string appId, int? storeId)
         {
@@ -729,13 +729,13 @@ public async System.Threading.Tasks.Task<Object> DeleteLocationAsync (int? locat
         }
 
         /// <summary>
-        /// Set a Location as deleted 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteLocationAsyncWithHttpInfo (int? locationId, int? locationAreaId, string appId, int? storeId)
         {
@@ -752,7 +752,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteLocationAsyn
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->DeleteLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/delete";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/delete";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -802,19 +802,19 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteLocationAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Set or unset External Location Id on a Location 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be mapped</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
-        /// <param name="externalLocationId">External Id to be mapped to the location (optional)</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="externalLocationId"> (optional)</param>
         /// <returns>RestApiResultMappedLocation</returns>
         public RestApiResultMappedLocation MapLocationToExternalId (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null)
         {
@@ -823,14 +823,14 @@ public RestApiResultMappedLocation MapLocationToExternalId (int? locationId, int
         }
 
         /// <summary>
-        /// Set or unset External Location Id on a Location 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be mapped</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
-        /// <param name="externalLocationId">External Id to be mapped to the location (optional)</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="externalLocationId"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultMappedLocation</returns>
         public ApiResponse< RestApiResultMappedLocation > MapLocationToExternalIdWithHttpInfo (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null)
         {
@@ -847,7 +847,7 @@ public ApiResponse< RestApiResultMappedLocation > MapLocationToExternalIdWithHtt
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->MapLocationToExternalId");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/map-external";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/map-external";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -898,19 +898,19 @@ public ApiResponse< RestApiResultMappedLocation > MapLocationToExternalIdWithHtt
             }
 
             return new ApiResponse<RestApiResultMappedLocation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMappedLocation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMappedLocation)));
         }
 
         /// <summary>
-        /// Set or unset External Location Id on a Location 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be mapped</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
-        /// <param name="externalLocationId">External Id to be mapped to the location (optional)</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="externalLocationId"> (optional)</param>
         /// <returns>Task of RestApiResultMappedLocation</returns>
         public async System.Threading.Tasks.Task<RestApiResultMappedLocation> MapLocationToExternalIdAsync (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null)
         {
@@ -920,14 +920,14 @@ public async System.Threading.Tasks.Task<RestApiResultMappedLocation> MapLocatio
         }
 
         /// <summary>
-        /// Set or unset External Location Id on a Location 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be mapped</param>
-        /// <param name="locationAreaId">Id of the Location Area that the Location belong</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
-        /// <param name="externalLocationId">External Id to be mapped to the location (optional)</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="externalLocationId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultMappedLocation)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMappedLocation>> MapLocationToExternalIdAsyncWithHttpInfo (int? locationId, int? locationAreaId, string appId, int? storeId, string externalLocationId = null)
         {
@@ -944,7 +944,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMappedLocation
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->MapLocationToExternalId");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/map-external";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/map-external";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -995,19 +995,19 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMappedLocation
             }
 
             return new ApiResponse<RestApiResultMappedLocation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMappedLocation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMappedLocation)));
         }
 
         /// <summary>
-        /// Move a Location to a different location Area 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="newLocationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="newLocationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         public Object MoveLocation (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId)
         {
@@ -1016,14 +1016,14 @@ public Object MoveLocation (int? locationId, int? locationAreaId, int? newLocati
         }
 
         /// <summary>
-        /// Move a Location to a different location Area 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="newLocationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="newLocationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > MoveLocationWithHttpInfo (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId)
         {
@@ -1043,7 +1043,7 @@ public ApiResponse< Object > MoveLocationWithHttpInfo (int? locationId, int? loc
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->MoveLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/move";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/move";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1094,19 +1094,19 @@ public ApiResponse< Object > MoveLocationWithHttpInfo (int? locationId, int? loc
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Move a Location to a different location Area 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="newLocationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="newLocationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> MoveLocationAsync (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId)
         {
@@ -1116,14 +1116,14 @@ public async System.Threading.Tasks.Task<Object> MoveLocationAsync (int? locatio
         }
 
         /// <summary>
-        /// Move a Location to a different location Area 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationId">Id of the Location that will be moved</param>
-        /// <param name="locationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="newLocationAreaId">Id of the new Location area that it should be moved to</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationId"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="newLocationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> MoveLocationAsyncWithHttpInfo (int? locationId, int? locationAreaId, int? newLocationAreaId, string appId, int? storeId)
         {
@@ -1143,7 +1143,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MoveLocationAsyncW
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->MoveLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/move";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/move";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1194,19 +1194,19 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MoveLocationAsyncW
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Update a Location i.e: Table, Hotel Room, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateLocationInput">Input data for updating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="locationId">Id of the Location to be updated</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="updateLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="locationId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultLocationAreaLocation</returns>
         public RestApiResultLocationAreaLocation UpdateLocation (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId)
         {
@@ -1215,14 +1215,14 @@ public RestApiResultLocationAreaLocation UpdateLocation (CreateLocation updateLo
         }
 
         /// <summary>
-        /// Update a Location i.e: Table, Hotel Room, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateLocationInput">Input data for updating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="locationId">Id of the Location to be updated</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="updateLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="locationId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultLocationAreaLocation</returns>
         public ApiResponse< RestApiResultLocationAreaLocation > UpdateLocationWithHttpInfo (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId)
         {
@@ -1242,7 +1242,7 @@ public ApiResponse< RestApiResultLocationAreaLocation > UpdateLocationWithHttpIn
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->UpdateLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/update";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/update";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1305,19 +1305,19 @@ public ApiResponse< RestApiResultLocationAreaLocation > UpdateLocationWithHttpIn
             }
 
             return new ApiResponse<RestApiResultLocationAreaLocation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLocationAreaLocation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLocationAreaLocation)));
         }
 
         /// <summary>
-        /// Update a Location i.e: Table, Hotel Room, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateLocationInput">Input data for updating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="locationId">Id of the Location to be updated</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="updateLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="locationId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultLocationAreaLocation</returns>
         public async System.Threading.Tasks.Task<RestApiResultLocationAreaLocation> UpdateLocationAsync (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId)
         {
@@ -1327,14 +1327,14 @@ public async System.Threading.Tasks.Task<RestApiResultLocationAreaLocation> Upda
         }
 
         /// <summary>
-        /// Update a Location i.e: Table, Hotel Room, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="updateLocationInput">Input data for updating the Location</param>
-        /// <param name="locationAreaId">Id of the Location area where the Location belongs</param>
-        /// <param name="locationId">Id of the Location to be updated</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="updateLocationInput"></param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="locationId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultLocationAreaLocation)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationAreaLocation>> UpdateLocationAsyncWithHttpInfo (CreateLocation updateLocationInput, int? locationAreaId, int? locationId, string appId, int? storeId)
         {
@@ -1354,7 +1354,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationAreaLo
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationApi->UpdateLocation");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/update";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/location/{locationId}/update";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1417,7 +1417,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationAreaLo
             }
 
             return new ApiResponse<RestApiResultLocationAreaLocation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLocationAreaLocation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLocationAreaLocation)));
         }
 
diff --git a/src/Flipdish/Api/LocationAreasApi.cs b/src/Flipdish/Api/LocationAreasApi.cs
index c37dffca..69b3c5e6 100644
--- a/src/Flipdish/Api/LocationAreasApi.cs
+++ b/src/Flipdish/Api/LocationAreasApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,204 +25,204 @@ public interface ILocationAreasApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create a Location Area, i.e: Room, Floor, Parking lot
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for creating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         Object CreateLocationArea (CreateLocationArea locationAreaInput, string appId, int? storeId);
 
         /// <summary>
-        /// Create a Location Area, i.e: Room, Floor, Parking lot
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for creating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> CreateLocationAreaWithHttpInfo (CreateLocationArea locationAreaInput, string appId, int? storeId);
         /// <summary>
-        /// Retrieve a Location Area
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaId">Id of the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultLocationAreaWithLocations</returns>
         RestApiResultLocationAreaWithLocations GetLocationArea (int? locationAreaId, string appId, int? storeId);
 
         /// <summary>
-        /// Retrieve a Location Area
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaId">Id of the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultLocationAreaWithLocations</returns>
         ApiResponse<RestApiResultLocationAreaWithLocations> GetLocationAreaWithHttpInfo (int? locationAreaId, string appId, int? storeId);
         /// <summary>
-        /// Retrieve all Location Areas for a Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultLocationAreaWithLocations</returns>
         RestApiArrayResultLocationAreaWithLocations GetLocationAreasForStore (string appId, int? storeId);
 
         /// <summary>
-        /// Retrieve all Location Areas for a Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultLocationAreaWithLocations</returns>
         ApiResponse<RestApiArrayResultLocationAreaWithLocations> GetLocationAreasForStoreWithHttpInfo (string appId, int? storeId);
         /// <summary>
-        /// Update a Location Area, i.e: Room, Floor, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for updating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="locationAreaId"></param>
         /// <returns>RestApiResultLocationArea</returns>
         RestApiResultLocationArea UpdateLocationArea (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId);
 
         /// <summary>
-        /// Update a Location Area, i.e: Room, Floor, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for updating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="locationAreaId"></param>
         /// <returns>ApiResponse of RestApiResultLocationArea</returns>
         ApiResponse<RestApiResultLocationArea> UpdateLocationAreaWithHttpInfo (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create a Location Area, i.e: Room, Floor, Parking lot
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for creating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> CreateLocationAreaAsync (CreateLocationArea locationAreaInput, string appId, int? storeId);
 
         /// <summary>
-        /// Create a Location Area, i.e: Room, Floor, Parking lot
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for creating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> CreateLocationAreaAsyncWithHttpInfo (CreateLocationArea locationAreaInput, string appId, int? storeId);
         /// <summary>
-        /// Retrieve a Location Area
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaId">Id of the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultLocationAreaWithLocations</returns>
         System.Threading.Tasks.Task<RestApiResultLocationAreaWithLocations> GetLocationAreaAsync (int? locationAreaId, string appId, int? storeId);
 
         /// <summary>
-        /// Retrieve a Location Area
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaId">Id of the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultLocationAreaWithLocations)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationAreaWithLocations>> GetLocationAreaAsyncWithHttpInfo (int? locationAreaId, string appId, int? storeId);
         /// <summary>
-        /// Retrieve all Location Areas for a Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultLocationAreaWithLocations</returns>
         System.Threading.Tasks.Task<RestApiArrayResultLocationAreaWithLocations> GetLocationAreasForStoreAsync (string appId, int? storeId);
 
         /// <summary>
-        /// Retrieve all Location Areas for a Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultLocationAreaWithLocations)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLocationAreaWithLocations>> GetLocationAreasForStoreAsyncWithHttpInfo (string appId, int? storeId);
         /// <summary>
-        /// Update a Location Area, i.e: Room, Floor, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for updating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="locationAreaId"></param>
         /// <returns>Task of RestApiResultLocationArea</returns>
         System.Threading.Tasks.Task<RestApiResultLocationArea> UpdateLocationAreaAsync (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId);
 
         /// <summary>
-        /// Update a Location Area, i.e: Room, Floor, Car park space
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for updating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="locationAreaId"></param>
         /// <returns>Task of ApiResponse (RestApiResultLocationArea)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationArea>> UpdateLocationAreaAsyncWithHttpInfo (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId);
@@ -327,12 +327,12 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create a Location Area, i.e: Room, Floor, Parking lot 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for creating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         public Object CreateLocationArea (CreateLocationArea locationAreaInput, string appId, int? storeId)
         {
@@ -341,12 +341,12 @@ public Object CreateLocationArea (CreateLocationArea locationAreaInput, string a
         }
 
         /// <summary>
-        /// Create a Location Area, i.e: Room, Floor, Parking lot 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for creating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > CreateLocationAreaWithHttpInfo (CreateLocationArea locationAreaInput, string appId, int? storeId)
         {
@@ -360,7 +360,7 @@ public ApiResponse< Object > CreateLocationAreaWithHttpInfo (CreateLocationArea
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationAreasApi->CreateLocationArea");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -421,17 +421,17 @@ public ApiResponse< Object > CreateLocationAreaWithHttpInfo (CreateLocationArea
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Create a Location Area, i.e: Room, Floor, Parking lot 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for creating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> CreateLocationAreaAsync (CreateLocationArea locationAreaInput, string appId, int? storeId)
         {
@@ -441,12 +441,12 @@ public async System.Threading.Tasks.Task<Object> CreateLocationAreaAsync (Create
         }
 
         /// <summary>
-        /// Create a Location Area, i.e: Room, Floor, Parking lot 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for creating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateLocationAreaAsyncWithHttpInfo (CreateLocationArea locationAreaInput, string appId, int? storeId)
         {
@@ -460,7 +460,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateLocationArea
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationAreasApi->CreateLocationArea");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -521,17 +521,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateLocationArea
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Retrieve a Location Area 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaId">Id of the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultLocationAreaWithLocations</returns>
         public RestApiResultLocationAreaWithLocations GetLocationArea (int? locationAreaId, string appId, int? storeId)
         {
@@ -540,12 +540,12 @@ public RestApiResultLocationAreaWithLocations GetLocationArea (int? locationArea
         }
 
         /// <summary>
-        /// Retrieve a Location Area 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaId">Id of the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultLocationAreaWithLocations</returns>
         public ApiResponse< RestApiResultLocationAreaWithLocations > GetLocationAreaWithHttpInfo (int? locationAreaId, string appId, int? storeId)
         {
@@ -559,7 +559,7 @@ public ApiResponse< RestApiResultLocationAreaWithLocations > GetLocationAreaWith
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationAreasApi->GetLocationArea");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -608,17 +608,17 @@ public ApiResponse< RestApiResultLocationAreaWithLocations > GetLocationAreaWith
             }
 
             return new ApiResponse<RestApiResultLocationAreaWithLocations>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLocationAreaWithLocations) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLocationAreaWithLocations)));
         }
 
         /// <summary>
-        /// Retrieve a Location Area 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaId">Id of the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultLocationAreaWithLocations</returns>
         public async System.Threading.Tasks.Task<RestApiResultLocationAreaWithLocations> GetLocationAreaAsync (int? locationAreaId, string appId, int? storeId)
         {
@@ -628,12 +628,12 @@ public async System.Threading.Tasks.Task<RestApiResultLocationAreaWithLocations>
         }
 
         /// <summary>
-        /// Retrieve a Location Area 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaId">Id of the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaId"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultLocationAreaWithLocations)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationAreaWithLocations>> GetLocationAreaAsyncWithHttpInfo (int? locationAreaId, string appId, int? storeId)
         {
@@ -647,7 +647,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationAreaWi
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationAreasApi->GetLocationArea");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -696,16 +696,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationAreaWi
             }
 
             return new ApiResponse<RestApiResultLocationAreaWithLocations>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLocationAreaWithLocations) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLocationAreaWithLocations)));
         }
 
         /// <summary>
-        /// Retrieve all Location Areas for a Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultLocationAreaWithLocations</returns>
         public RestApiArrayResultLocationAreaWithLocations GetLocationAreasForStore (string appId, int? storeId)
         {
@@ -714,11 +714,11 @@ public RestApiArrayResultLocationAreaWithLocations GetLocationAreasForStore (str
         }
 
         /// <summary>
-        /// Retrieve all Location Areas for a Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultLocationAreaWithLocations</returns>
         public ApiResponse< RestApiArrayResultLocationAreaWithLocations > GetLocationAreasForStoreWithHttpInfo (string appId, int? storeId)
         {
@@ -729,7 +729,7 @@ public ApiResponse< RestApiArrayResultLocationAreaWithLocations > GetLocationAre
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationAreasApi->GetLocationAreasForStore");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -777,16 +777,16 @@ public ApiResponse< RestApiArrayResultLocationAreaWithLocations > GetLocationAre
             }
 
             return new ApiResponse<RestApiArrayResultLocationAreaWithLocations>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultLocationAreaWithLocations) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultLocationAreaWithLocations)));
         }
 
         /// <summary>
-        /// Retrieve all Location Areas for a Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultLocationAreaWithLocations</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultLocationAreaWithLocations> GetLocationAreasForStoreAsync (string appId, int? storeId)
         {
@@ -796,11 +796,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultLocationAreaWithLocat
         }
 
         /// <summary>
-        /// Retrieve all Location Areas for a Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultLocationAreaWithLocations)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLocationAreaWithLocations>> GetLocationAreasForStoreAsyncWithHttpInfo (string appId, int? storeId)
         {
@@ -811,7 +811,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLocationA
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling LocationAreasApi->GetLocationAreasForStore");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -859,17 +859,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultLocationA
             }
 
             return new ApiResponse<RestApiArrayResultLocationAreaWithLocations>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultLocationAreaWithLocations) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultLocationAreaWithLocations)));
         }
 
         /// <summary>
-        /// Update a Location Area, i.e: Room, Floor, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for updating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="locationAreaId"></param>
         /// <returns>RestApiResultLocationArea</returns>
         public RestApiResultLocationArea UpdateLocationArea (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId)
@@ -879,12 +879,12 @@ public RestApiResultLocationArea UpdateLocationArea (UpdateLocationArea location
         }
 
         /// <summary>
-        /// Update a Location Area, i.e: Room, Floor, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for updating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="locationAreaId"></param>
         /// <returns>ApiResponse of RestApiResultLocationArea</returns>
         public ApiResponse< RestApiResultLocationArea > UpdateLocationAreaWithHttpInfo (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId)
@@ -902,7 +902,7 @@ public ApiResponse< RestApiResultLocationArea > UpdateLocationAreaWithHttpInfo (
             if (locationAreaId == null)
                 throw new ApiException(400, "Missing required parameter 'locationAreaId' when calling LocationAreasApi->UpdateLocationArea");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/update";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/update";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -964,17 +964,17 @@ public ApiResponse< RestApiResultLocationArea > UpdateLocationAreaWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultLocationArea>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLocationArea) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLocationArea)));
         }
 
         /// <summary>
-        /// Update a Location Area, i.e: Room, Floor, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for updating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="locationAreaId"></param>
         /// <returns>Task of RestApiResultLocationArea</returns>
         public async System.Threading.Tasks.Task<RestApiResultLocationArea> UpdateLocationAreaAsync (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId)
@@ -985,12 +985,12 @@ public async System.Threading.Tasks.Task<RestApiResultLocationArea> UpdateLocati
         }
 
         /// <summary>
-        /// Update a Location Area, i.e: Room, Floor, Car park space 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="locationAreaInput">Input data for updating the Location Area</param>
-        /// <param name="appId">AppId i.e: (fd1234)</param>
-        /// <param name="storeId">Id of the Store</param>
+        /// <param name="locationAreaInput"></param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <param name="locationAreaId"></param>
         /// <returns>Task of ApiResponse (RestApiResultLocationArea)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationArea>> UpdateLocationAreaAsyncWithHttpInfo (UpdateLocationArea locationAreaInput, string appId, int? storeId, string locationAreaId)
@@ -1008,7 +1008,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationArea>>
             if (locationAreaId == null)
                 throw new ApiException(400, "Missing required parameter 'locationAreaId' when calling LocationAreasApi->UpdateLocationArea");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/update";
+            var localVarPath = "./api/v1.0/{appId}/stores/{storeId}/location-areas/{locationAreaId}/update";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1070,7 +1070,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultLocationArea>>
             }
 
             return new ApiResponse<RestApiResultLocationArea>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultLocationArea) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultLocationArea)));
         }
 
diff --git a/src/Flipdish/Api/LookerDashboardApi.cs b/src/Flipdish/Api/LookerDashboardApi.cs
index 502e98f1..7e3bf522 100644
--- a/src/Flipdish/Api/LookerDashboardApi.cs
+++ b/src/Flipdish/Api/LookerDashboardApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,7 +25,7 @@ public interface ILookerDashboardApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get all dashboards
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -36,7 +36,7 @@ public interface ILookerDashboardApi : IApiAccessor
         void LookerDashboardGetAll (string appId);
 
         /// <summary>
-        /// Get all dashboards
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -48,7 +48,7 @@ public interface ILookerDashboardApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get all dashboards
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -59,7 +59,7 @@ public interface ILookerDashboardApi : IApiAccessor
         System.Threading.Tasks.Task LookerDashboardGetAllAsync (string appId);
 
         /// <summary>
-        /// Get all dashboards
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -169,7 +169,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get all dashboards 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -180,7 +180,7 @@ public void LookerDashboardGetAll (string appId)
         }
 
         /// <summary>
-        /// Get all dashboards 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -191,7 +191,7 @@ public ApiResponse<Object> LookerDashboardGetAllWithHttpInfo (string appId)
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling LookerDashboardApi->LookerDashboardGetAll");
 
-            var localVarPath = "/api/v1.0/{appId}/looker/dashboards";
+            var localVarPath = "./api/v1.0/{appId}/looker/dashboards";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -238,12 +238,12 @@ public ApiResponse<Object> LookerDashboardGetAllWithHttpInfo (string appId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Get all dashboards 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -255,7 +255,7 @@ public async System.Threading.Tasks.Task LookerDashboardGetAllAsync (string appI
         }
 
         /// <summary>
-        /// Get all dashboards 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -266,7 +266,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LookerDashboardGet
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling LookerDashboardApi->LookerDashboardGetAll");
 
-            var localVarPath = "/api/v1.0/{appId}/looker/dashboards";
+            var localVarPath = "./api/v1.0/{appId}/looker/dashboards";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -313,7 +313,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> LookerDashboardGet
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/LookerSingleSignOnApi.cs b/src/Flipdish/Api/LookerSingleSignOnApi.cs
index 483ec9f6..71112801 100644
--- a/src/Flipdish/Api/LookerSingleSignOnApi.cs
+++ b/src/Flipdish/Api/LookerSingleSignOnApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,55 +25,55 @@ public interface ILookerSingleSignOnApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get the generic single sign on embed URL for Looker dashboards
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppNameId</param>
-        /// <param name="embedPath">Embed URL of the dashboard</param>
-        /// <param name="filters">Filters that will be passed to the dashboard (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="embedPath"></param>
+        /// <param name="filters"> (optional)</param>
         /// <returns>DashboardEmbed</returns>
         DashboardEmbed GetSSOEndpoint (string appId, string embedPath, string filters = null);
 
         /// <summary>
-        /// Get the generic single sign on embed URL for Looker dashboards
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppNameId</param>
-        /// <param name="embedPath">Embed URL of the dashboard</param>
-        /// <param name="filters">Filters that will be passed to the dashboard (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="embedPath"></param>
+        /// <param name="filters"> (optional)</param>
         /// <returns>ApiResponse of DashboardEmbed</returns>
         ApiResponse<DashboardEmbed> GetSSOEndpointWithHttpInfo (string appId, string embedPath, string filters = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get the generic single sign on embed URL for Looker dashboards
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppNameId</param>
-        /// <param name="embedPath">Embed URL of the dashboard</param>
-        /// <param name="filters">Filters that will be passed to the dashboard (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="embedPath"></param>
+        /// <param name="filters"> (optional)</param>
         /// <returns>Task of DashboardEmbed</returns>
         System.Threading.Tasks.Task<DashboardEmbed> GetSSOEndpointAsync (string appId, string embedPath, string filters = null);
 
         /// <summary>
-        /// Get the generic single sign on embed URL for Looker dashboards
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppNameId</param>
-        /// <param name="embedPath">Embed URL of the dashboard</param>
-        /// <param name="filters">Filters that will be passed to the dashboard (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="embedPath"></param>
+        /// <param name="filters"> (optional)</param>
         /// <returns>Task of ApiResponse (DashboardEmbed)</returns>
         System.Threading.Tasks.Task<ApiResponse<DashboardEmbed>> GetSSOEndpointAsyncWithHttpInfo (string appId, string embedPath, string filters = null);
         #endregion Asynchronous Operations
@@ -177,12 +177,12 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get the generic single sign on embed URL for Looker dashboards 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppNameId</param>
-        /// <param name="embedPath">Embed URL of the dashboard</param>
-        /// <param name="filters">Filters that will be passed to the dashboard (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="embedPath"></param>
+        /// <param name="filters"> (optional)</param>
         /// <returns>DashboardEmbed</returns>
         public DashboardEmbed GetSSOEndpoint (string appId, string embedPath, string filters = null)
         {
@@ -191,12 +191,12 @@ public DashboardEmbed GetSSOEndpoint (string appId, string embedPath, string fil
         }
 
         /// <summary>
-        /// Get the generic single sign on embed URL for Looker dashboards 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppNameId</param>
-        /// <param name="embedPath">Embed URL of the dashboard</param>
-        /// <param name="filters">Filters that will be passed to the dashboard (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="embedPath"></param>
+        /// <param name="filters"> (optional)</param>
         /// <returns>ApiResponse of DashboardEmbed</returns>
         public ApiResponse< DashboardEmbed > GetSSOEndpointWithHttpInfo (string appId, string embedPath, string filters = null)
         {
@@ -207,7 +207,7 @@ public ApiResponse< DashboardEmbed > GetSSOEndpointWithHttpInfo (string appId, s
             if (embedPath == null)
                 throw new ApiException(400, "Missing required parameter 'embedPath' when calling LookerSingleSignOnApi->GetSSOEndpoint");
 
-            var localVarPath = "/api/v1.0/{appId}/looker/sso";
+            var localVarPath = "./api/v1.0/{appId}/looker/sso";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -256,17 +256,17 @@ public ApiResponse< DashboardEmbed > GetSSOEndpointWithHttpInfo (string appId, s
             }
 
             return new ApiResponse<DashboardEmbed>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (DashboardEmbed) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(DashboardEmbed)));
         }
 
         /// <summary>
-        /// Get the generic single sign on embed URL for Looker dashboards 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppNameId</param>
-        /// <param name="embedPath">Embed URL of the dashboard</param>
-        /// <param name="filters">Filters that will be passed to the dashboard (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="embedPath"></param>
+        /// <param name="filters"> (optional)</param>
         /// <returns>Task of DashboardEmbed</returns>
         public async System.Threading.Tasks.Task<DashboardEmbed> GetSSOEndpointAsync (string appId, string embedPath, string filters = null)
         {
@@ -276,12 +276,12 @@ public async System.Threading.Tasks.Task<DashboardEmbed> GetSSOEndpointAsync (st
         }
 
         /// <summary>
-        /// Get the generic single sign on embed URL for Looker dashboards 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">AppNameId</param>
-        /// <param name="embedPath">Embed URL of the dashboard</param>
-        /// <param name="filters">Filters that will be passed to the dashboard (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="embedPath"></param>
+        /// <param name="filters"> (optional)</param>
         /// <returns>Task of ApiResponse (DashboardEmbed)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<DashboardEmbed>> GetSSOEndpointAsyncWithHttpInfo (string appId, string embedPath, string filters = null)
         {
@@ -292,7 +292,7 @@ public async System.Threading.Tasks.Task<ApiResponse<DashboardEmbed>> GetSSOEndp
             if (embedPath == null)
                 throw new ApiException(400, "Missing required parameter 'embedPath' when calling LookerSingleSignOnApi->GetSSOEndpoint");
 
-            var localVarPath = "/api/v1.0/{appId}/looker/sso";
+            var localVarPath = "./api/v1.0/{appId}/looker/sso";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -341,7 +341,7 @@ public async System.Threading.Tasks.Task<ApiResponse<DashboardEmbed>> GetSSOEndp
             }
 
             return new ApiResponse<DashboardEmbed>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (DashboardEmbed) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(DashboardEmbed)));
         }
 
diff --git a/src/Flipdish/Api/MenuOptionSetItemsApi.cs b/src/Flipdish/Api/MenuOptionSetItemsApi.cs
index f5977dc4..dcba48fd 100644
--- a/src/Flipdish/Api/MenuOptionSetItemsApi.cs
+++ b/src/Flipdish/Api/MenuOptionSetItemsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -168,7 +168,7 @@ public interface IMenuOptionSetItemsApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RemoveMenuItemOptionSetItemWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId);
         /// <summary>
-        /// [Private API] Set Tax Rate on OptionSetItem
+        /// Set Tax Rate on OptionSetItem
         /// </summary>
         /// <remarks>
         /// 
@@ -184,7 +184,7 @@ public interface IMenuOptionSetItemsApi : IApiAccessor
         void SetOptionSetItemTax (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, int? taxRateId);
 
         /// <summary>
-        /// [Private API] Set Tax Rate on OptionSetItem
+        /// Set Tax Rate on OptionSetItem
         /// </summary>
         /// <remarks>
         /// 
@@ -211,7 +211,7 @@ public interface IMenuOptionSetItemsApi : IApiAccessor
         /// <param name="optionSetId">Option set identifier</param>
         /// <param name="menuItemOptionSetItemId">Option set item identifier</param>
         /// <param name="menuItemOptionSetItem">Option set item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone. (optional)</param>
         /// <returns></returns>
         void UpdateMenuItemOptionSetItem (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, MenuItemOptionSetItemBase menuItemOptionSetItem, double? undoAfter = null);
 
@@ -228,7 +228,7 @@ public interface IMenuOptionSetItemsApi : IApiAccessor
         /// <param name="optionSetId">Option set identifier</param>
         /// <param name="menuItemOptionSetItemId">Option set item identifier</param>
         /// <param name="menuItemOptionSetItem">Option set item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone. (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateMenuItemOptionSetItemWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, MenuItemOptionSetItemBase menuItemOptionSetItem, double? undoAfter = null);
         /// <summary>
@@ -408,7 +408,7 @@ public interface IMenuOptionSetItemsApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RemoveMenuItemOptionSetItemAsyncWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId);
         /// <summary>
-        /// [Private API] Set Tax Rate on OptionSetItem
+        /// Set Tax Rate on OptionSetItem
         /// </summary>
         /// <remarks>
         /// 
@@ -424,7 +424,7 @@ public interface IMenuOptionSetItemsApi : IApiAccessor
         System.Threading.Tasks.Task SetOptionSetItemTaxAsync (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, int? taxRateId);
 
         /// <summary>
-        /// [Private API] Set Tax Rate on OptionSetItem
+        /// Set Tax Rate on OptionSetItem
         /// </summary>
         /// <remarks>
         /// 
@@ -451,7 +451,7 @@ public interface IMenuOptionSetItemsApi : IApiAccessor
         /// <param name="optionSetId">Option set identifier</param>
         /// <param name="menuItemOptionSetItemId">Option set item identifier</param>
         /// <param name="menuItemOptionSetItem">Option set item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone. (optional)</param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateMenuItemOptionSetItemAsync (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, MenuItemOptionSetItemBase menuItemOptionSetItem, double? undoAfter = null);
 
@@ -468,7 +468,7 @@ public interface IMenuOptionSetItemsApi : IApiAccessor
         /// <param name="optionSetId">Option set identifier</param>
         /// <param name="menuItemOptionSetItemId">Option set item identifier</param>
         /// <param name="menuItemOptionSetItem">Option set item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone. (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuItemOptionSetItemAsyncWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, MenuItemOptionSetItemBase menuItemOptionSetItem, double? undoAfter = null);
         /// <summary>
@@ -646,7 +646,7 @@ public ApiResponse< Object > AddMenuItemOptionSetItemWithHttpInfo (int? menuId,
             if (menuItemOptionSetItem == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItem' when calling MenuOptionSetItemsApi->AddMenuItemOptionSetItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -709,7 +709,7 @@ public ApiResponse< Object > AddMenuItemOptionSetItemWithHttpInfo (int? menuId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -758,7 +758,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AddMenuItemOptionS
             if (menuItemOptionSetItem == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItem' when calling MenuOptionSetItemsApi->AddMenuItemOptionSetItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -821,7 +821,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AddMenuItemOptionS
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -868,7 +868,7 @@ public ApiResponse<Object> DeleteOptionSetItemImageWithHttpInfo (int? menuId, in
             if (menuItemOptionSetItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItemId' when calling MenuOptionSetItemsApi->DeleteOptionSetItemImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -919,7 +919,7 @@ public ApiResponse<Object> DeleteOptionSetItemImageWithHttpInfo (int? menuId, in
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -967,7 +967,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOptionSetIte
             if (menuItemOptionSetItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItemId' when calling MenuOptionSetItemsApi->DeleteOptionSetItemImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1018,7 +1018,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOptionSetIte
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1066,7 +1066,7 @@ public ApiResponse< RestApiResultMenuItemOptionSetItem > GetMenuItemOptionSetIte
             if (menuItemOptionSetItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItemId' when calling MenuOptionSetItemsApi->GetMenuItemOptionSetItemById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1117,7 +1117,7 @@ public ApiResponse< RestApiResultMenuItemOptionSetItem > GetMenuItemOptionSetIte
             }
 
             return new ApiResponse<RestApiResultMenuItemOptionSetItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuItemOptionSetItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuItemOptionSetItem)));
         }
 
@@ -1166,7 +1166,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuItemOption
             if (menuItemOptionSetItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItemId' when calling MenuOptionSetItemsApi->GetMenuItemOptionSetItemById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1217,7 +1217,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuItemOption
             }
 
             return new ApiResponse<RestApiResultMenuItemOptionSetItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuItemOptionSetItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuItemOptionSetItem)));
         }
 
@@ -1260,7 +1260,7 @@ public ApiResponse< RestApiArrayResultMenuItemOptionSetItem > GetMenuItemOptionS
             if (optionSetId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetId' when calling MenuOptionSetItemsApi->GetMenuItemOptionSetItems");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1310,7 +1310,7 @@ public ApiResponse< RestApiArrayResultMenuItemOptionSetItem > GetMenuItemOptionS
             }
 
             return new ApiResponse<RestApiArrayResultMenuItemOptionSetItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuItemOptionSetItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuItemOptionSetItem)));
         }
 
@@ -1354,7 +1354,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuItemO
             if (optionSetId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetId' when calling MenuOptionSetItemsApi->GetMenuItemOptionSetItems");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1404,7 +1404,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuItemO
             }
 
             return new ApiResponse<RestApiArrayResultMenuItemOptionSetItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuItemOptionSetItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuItemOptionSetItem)));
         }
 
@@ -1451,7 +1451,7 @@ public ApiResponse<Object> RemoveMenuItemOptionSetItemWithHttpInfo (int? menuId,
             if (menuItemOptionSetItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItemId' when calling MenuOptionSetItemsApi->RemoveMenuItemOptionSetItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1502,7 +1502,7 @@ public ApiResponse<Object> RemoveMenuItemOptionSetItemWithHttpInfo (int? menuId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1550,7 +1550,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveMenuItemOpti
             if (menuItemOptionSetItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItemId' when calling MenuOptionSetItemsApi->RemoveMenuItemOptionSetItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1601,12 +1601,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveMenuItemOpti
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [Private API] Set Tax Rate on OptionSetItem 
+        /// Set Tax Rate on OptionSetItem 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1622,7 +1622,7 @@ public void SetOptionSetItemTax (int? menuId, int? menuSectionId, int? menuSecti
         }
 
         /// <summary>
-        /// [Private API] Set Tax Rate on OptionSetItem 
+        /// Set Tax Rate on OptionSetItem 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1653,7 +1653,7 @@ public ApiResponse<Object> SetOptionSetItemTaxWithHttpInfo (int? menuId, int? me
             if (taxRateId == null)
                 throw new ApiException(400, "Missing required parameter 'taxRateId' when calling MenuOptionSetItemsApi->SetOptionSetItemTax");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/taxrate/{taxRateId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/taxrate/{taxRateId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1705,12 +1705,12 @@ public ApiResponse<Object> SetOptionSetItemTaxWithHttpInfo (int? menuId, int? me
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [Private API] Set Tax Rate on OptionSetItem 
+        /// Set Tax Rate on OptionSetItem 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1727,7 +1727,7 @@ public async System.Threading.Tasks.Task SetOptionSetItemTaxAsync (int? menuId,
         }
 
         /// <summary>
-        /// [Private API] Set Tax Rate on OptionSetItem 
+        /// Set Tax Rate on OptionSetItem 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1758,7 +1758,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetOptionSetItemTa
             if (taxRateId == null)
                 throw new ApiException(400, "Missing required parameter 'taxRateId' when calling MenuOptionSetItemsApi->SetOptionSetItemTax");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/taxrate/{taxRateId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/taxrate/{taxRateId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1810,7 +1810,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetOptionSetItemTa
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1824,7 +1824,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetOptionSetItemTa
         /// <param name="optionSetId">Option set identifier</param>
         /// <param name="menuItemOptionSetItemId">Option set item identifier</param>
         /// <param name="menuItemOptionSetItem">Option set item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone. (optional)</param>
         /// <returns></returns>
         public void UpdateMenuItemOptionSetItem (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, MenuItemOptionSetItemBase menuItemOptionSetItem, double? undoAfter = null)
         {
@@ -1841,7 +1841,7 @@ public void UpdateMenuItemOptionSetItem (int? menuId, int? menuSectionId, int? m
         /// <param name="optionSetId">Option set identifier</param>
         /// <param name="menuItemOptionSetItemId">Option set item identifier</param>
         /// <param name="menuItemOptionSetItem">Option set item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone. (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateMenuItemOptionSetItemWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, MenuItemOptionSetItemBase menuItemOptionSetItem, double? undoAfter = null)
         {
@@ -1864,7 +1864,7 @@ public ApiResponse<Object> UpdateMenuItemOptionSetItemWithHttpInfo (int? menuId,
             if (menuItemOptionSetItem == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItem' when calling MenuOptionSetItemsApi->UpdateMenuItemOptionSetItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1929,7 +1929,7 @@ public ApiResponse<Object> UpdateMenuItemOptionSetItemWithHttpInfo (int? menuId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1943,7 +1943,7 @@ public ApiResponse<Object> UpdateMenuItemOptionSetItemWithHttpInfo (int? menuId,
         /// <param name="optionSetId">Option set identifier</param>
         /// <param name="menuItemOptionSetItemId">Option set item identifier</param>
         /// <param name="menuItemOptionSetItem">Option set item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone. (optional)</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateMenuItemOptionSetItemAsync (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, MenuItemOptionSetItemBase menuItemOptionSetItem, double? undoAfter = null)
         {
@@ -1961,7 +1961,7 @@ public async System.Threading.Tasks.Task UpdateMenuItemOptionSetItemAsync (int?
         /// <param name="optionSetId">Option set identifier</param>
         /// <param name="menuItemOptionSetItemId">Option set item identifier</param>
         /// <param name="menuItemOptionSetItem">Option set item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone. (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuItemOptionSetItemAsyncWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, int? optionSetId, int? menuItemOptionSetItemId, MenuItemOptionSetItemBase menuItemOptionSetItem, double? undoAfter = null)
         {
@@ -1984,7 +1984,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuItemOpti
             if (menuItemOptionSetItem == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSetItem' when calling MenuOptionSetItemsApi->UpdateMenuItemOptionSetItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2049,7 +2049,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuItemOpti
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2102,7 +2102,7 @@ public ApiResponse< RestApiStringResult > UploadOptionSetItemImageWithHttpInfo (
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenuOptionSetItemsApi->UploadOptionSetItemImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2155,7 +2155,7 @@ public ApiResponse< RestApiStringResult > UploadOptionSetItemImageWithHttpInfo (
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -2209,7 +2209,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenuOptionSetItemsApi->UploadOptionSetItemImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/optionsetitems/{menuItemOptionSetItemId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2262,7 +2262,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
diff --git a/src/Flipdish/Api/MenuOptionSetsApi.cs b/src/Flipdish/Api/MenuOptionSetsApi.cs
index f4427780..4ed0c8f9 100644
--- a/src/Flipdish/Api/MenuOptionSetsApi.cs
+++ b/src/Flipdish/Api/MenuOptionSetsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -547,7 +547,7 @@ public ApiResponse< Object > CreateMenuItemOptionSetWithHttpInfo (int? menuId, i
             if (menuItemOptionSet == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSet' when calling MenuOptionSetsApi->CreateMenuItemOptionSet");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -609,7 +609,7 @@ public ApiResponse< Object > CreateMenuItemOptionSetWithHttpInfo (int? menuId, i
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -653,7 +653,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuItemOpti
             if (menuItemOptionSet == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSet' when calling MenuOptionSetsApi->CreateMenuItemOptionSet");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -715,7 +715,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuItemOpti
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -757,7 +757,7 @@ public ApiResponse<Object> DeleteMenuItemOptionSetWithHttpInfo (int? menuId, int
             if (optionSetId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetId' when calling MenuOptionSetsApi->DeleteMenuItemOptionSet");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -807,7 +807,7 @@ public ApiResponse<Object> DeleteMenuItemOptionSetWithHttpInfo (int? menuId, int
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -850,7 +850,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuItemOpti
             if (optionSetId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetId' when calling MenuOptionSetsApi->DeleteMenuItemOptionSet");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -900,7 +900,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuItemOpti
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -942,7 +942,7 @@ public ApiResponse<Object> DeleteOptionSetImageWithHttpInfo (int? menuId, int? m
             if (optionSetId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetId' when calling MenuOptionSetsApi->DeleteOptionSetImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -992,7 +992,7 @@ public ApiResponse<Object> DeleteOptionSetImageWithHttpInfo (int? menuId, int? m
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1035,7 +1035,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOptionSetIma
             if (optionSetId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetId' when calling MenuOptionSetsApi->DeleteOptionSetImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1085,7 +1085,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOptionSetIma
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1128,7 +1128,7 @@ public ApiResponse< RestApiResultMenuItemOptionSet > GetMenuItemOptionSetByIdWit
             if (optionSetId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetId' when calling MenuOptionSetsApi->GetMenuItemOptionSetById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1178,7 +1178,7 @@ public ApiResponse< RestApiResultMenuItemOptionSet > GetMenuItemOptionSetByIdWit
             }
 
             return new ApiResponse<RestApiResultMenuItemOptionSet>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuItemOptionSet) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuItemOptionSet)));
         }
 
@@ -1222,7 +1222,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuItemOption
             if (optionSetId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetId' when calling MenuOptionSetsApi->GetMenuItemOptionSetById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1272,7 +1272,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuItemOption
             }
 
             return new ApiResponse<RestApiResultMenuItemOptionSet>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuItemOptionSet) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuItemOptionSet)));
         }
 
@@ -1310,7 +1310,7 @@ public ApiResponse< RestApiArrayResultMenuItemOptionSet > GetMenuItemOptionSetsW
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuOptionSetsApi->GetMenuItemOptionSets");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1359,7 +1359,7 @@ public ApiResponse< RestApiArrayResultMenuItemOptionSet > GetMenuItemOptionSetsW
             }
 
             return new ApiResponse<RestApiArrayResultMenuItemOptionSet>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuItemOptionSet) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuItemOptionSet)));
         }
 
@@ -1398,7 +1398,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuItemO
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuOptionSetsApi->GetMenuItemOptionSets");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1447,7 +1447,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuItemO
             }
 
             return new ApiResponse<RestApiArrayResultMenuItemOptionSet>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuItemOptionSet) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuItemOptionSet)));
         }
 
@@ -1494,7 +1494,7 @@ public ApiResponse<Object> UpdateMenuItemOptionSetWithHttpInfo (int? menuId, int
             if (menuItemOptionSet == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSet' when calling MenuOptionSetsApi->UpdateMenuItemOptionSet");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1557,7 +1557,7 @@ public ApiResponse<Object> UpdateMenuItemOptionSetWithHttpInfo (int? menuId, int
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1605,7 +1605,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuItemOpti
             if (menuItemOptionSet == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemOptionSet' when calling MenuOptionSetsApi->UpdateMenuItemOptionSet");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1668,7 +1668,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuItemOpti
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1716,7 +1716,7 @@ public ApiResponse< RestApiStringResult > UploadOptionSetImageWithHttpInfo (int?
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenuOptionSetsApi->UploadOptionSetImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1768,7 +1768,7 @@ public ApiResponse< RestApiStringResult > UploadOptionSetImageWithHttpInfo (int?
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -1817,7 +1817,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenuOptionSetsApi->UploadOptionSetImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/optionsets/{optionSetId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1869,7 +1869,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
diff --git a/src/Flipdish/Api/MenuSectionItemsApi.cs b/src/Flipdish/Api/MenuSectionItemsApi.cs
index ac4cb7ae..647f21a1 100644
--- a/src/Flipdish/Api/MenuSectionItemsApi.cs
+++ b/src/Flipdish/Api/MenuSectionItemsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -198,7 +198,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultMenuSectionItem</returns>
         ApiResponse<RestApiArrayResultMenuSectionItem> GetMenuItemsWithHttpInfo (int? menuId, int? menuSectionId);
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu
+        /// Move an Item within a menu
         /// </summary>
         /// <remarks>
         /// 
@@ -212,7 +212,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         void MoveMenuItem (int? menuId, int? menuSectionId, int? menuSectionItemId, int? destinationDisplayOrder);
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu
+        /// Move an Item within a menu
         /// </summary>
         /// <remarks>
         /// 
@@ -225,7 +225,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> MoveMenuItemWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, int? destinationDisplayOrder);
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu
+        /// Set tax rate for menu item
         /// </summary>
         /// <remarks>
         /// 
@@ -239,7 +239,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         void SetSectionItemTax (int? menuId, int? menuSectionId, int? menuSectionItemId, int? taxRateId);
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu
+        /// Set tax rate for menu item
         /// </summary>
         /// <remarks>
         /// 
@@ -262,7 +262,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         /// <param name="menuSectionId">Menu section identifier</param>
         /// <param name="menuSectionItemId">Menu section item identifier</param>
         /// <param name="menuSectionItem">Menu section item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone (optional)</param>
         /// <returns></returns>
         void UpdateMenuSectionItem (int? menuId, int? menuSectionId, int? menuSectionItemId, MenuSectionItemBase menuSectionItem, double? undoAfter = null);
 
@@ -277,7 +277,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         /// <param name="menuSectionId">Menu section identifier</param>
         /// <param name="menuSectionItemId">Menu section item identifier</param>
         /// <param name="menuSectionItem">Menu section item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateMenuSectionItemWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, MenuSectionItemBase menuSectionItem, double? undoAfter = null);
         /// <summary>
@@ -483,7 +483,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuSectionItem)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuSectionItem>> GetMenuItemsAsyncWithHttpInfo (int? menuId, int? menuSectionId);
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu
+        /// Move an Item within a menu
         /// </summary>
         /// <remarks>
         /// 
@@ -497,7 +497,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         System.Threading.Tasks.Task MoveMenuItemAsync (int? menuId, int? menuSectionId, int? menuSectionItemId, int? destinationDisplayOrder);
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu
+        /// Move an Item within a menu
         /// </summary>
         /// <remarks>
         /// 
@@ -510,7 +510,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> MoveMenuItemAsyncWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, int? destinationDisplayOrder);
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu
+        /// Set tax rate for menu item
         /// </summary>
         /// <remarks>
         /// 
@@ -524,7 +524,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         System.Threading.Tasks.Task SetSectionItemTaxAsync (int? menuId, int? menuSectionId, int? menuSectionItemId, int? taxRateId);
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu
+        /// Set tax rate for menu item
         /// </summary>
         /// <remarks>
         /// 
@@ -547,7 +547,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         /// <param name="menuSectionId">Menu section identifier</param>
         /// <param name="menuSectionItemId">Menu section item identifier</param>
         /// <param name="menuSectionItem">Menu section item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone (optional)</param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateMenuSectionItemAsync (int? menuId, int? menuSectionId, int? menuSectionItemId, MenuSectionItemBase menuSectionItem, double? undoAfter = null);
 
@@ -562,7 +562,7 @@ public interface IMenuSectionItemsApi : IApiAccessor
         /// <param name="menuSectionId">Menu section identifier</param>
         /// <param name="menuSectionItemId">Menu section item identifier</param>
         /// <param name="menuSectionItem">Menu section item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuSectionItemAsyncWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, MenuSectionItemBase menuSectionItem, double? undoAfter = null);
         /// <summary>
@@ -726,7 +726,7 @@ public ApiResponse< RestApiResultMenuSectionItem > CloneMenuSectionItemWithHttpI
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuSectionItemsApi->CloneMenuSectionItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/clone";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/clone";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -775,7 +775,7 @@ public ApiResponse< RestApiResultMenuSectionItem > CloneMenuSectionItemWithHttpI
             }
 
             return new ApiResponse<RestApiResultMenuSectionItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuSectionItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuSectionItem)));
         }
 
@@ -814,7 +814,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuSectionIte
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuSectionItemsApi->CloneMenuSectionItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/clone";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/clone";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -863,7 +863,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuSectionIte
             }
 
             return new ApiResponse<RestApiResultMenuSectionItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuSectionItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuSectionItem)));
         }
 
@@ -901,7 +901,7 @@ public ApiResponse< Object > CreateMenuSectionItemWithHttpInfo (int? menuId, int
             if (menuSectionItem == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItem' when calling MenuSectionItemsApi->CreateMenuSectionItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -962,7 +962,7 @@ public ApiResponse< Object > CreateMenuSectionItemWithHttpInfo (int? menuId, int
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1001,7 +1001,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuSectionI
             if (menuSectionItem == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItem' when calling MenuSectionItemsApi->CreateMenuSectionItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1062,7 +1062,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuSectionI
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1100,7 +1100,7 @@ public ApiResponse< Object > CreateMenuSectionItemFromCatalogItemsWithHttpInfo (
             if (createFromCatalogItems == null)
                 throw new ApiException(400, "Missing required parameter 'createFromCatalogItems' when calling MenuSectionItemsApi->CreateMenuSectionItemFromCatalogItems");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/add-catalogitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/add-catalogitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1161,7 +1161,7 @@ public ApiResponse< Object > CreateMenuSectionItemFromCatalogItemsWithHttpInfo (
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1200,7 +1200,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuSectionI
             if (createFromCatalogItems == null)
                 throw new ApiException(400, "Missing required parameter 'createFromCatalogItems' when calling MenuSectionItemsApi->CreateMenuSectionItemFromCatalogItems");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/add-catalogitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/add-catalogitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1261,7 +1261,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuSectionI
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1298,7 +1298,7 @@ public ApiResponse<Object> DeleteMenuSectionItemWithHttpInfo (int? menuId, int?
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuSectionItemsApi->DeleteMenuSectionItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1347,7 +1347,7 @@ public ApiResponse<Object> DeleteMenuSectionItemWithHttpInfo (int? menuId, int?
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1385,7 +1385,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuSectionI
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuSectionItemsApi->DeleteMenuSectionItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1434,7 +1434,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuSectionI
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1471,7 +1471,7 @@ public ApiResponse<Object> DeleteMenuSectionItemImageWithHttpInfo (int? menuId,
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuSectionItemsApi->DeleteMenuSectionItemImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1520,7 +1520,7 @@ public ApiResponse<Object> DeleteMenuSectionItemImageWithHttpInfo (int? menuId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1558,7 +1558,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuSectionI
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuSectionItemsApi->DeleteMenuSectionItemImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1607,7 +1607,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuSectionI
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1645,7 +1645,7 @@ public ApiResponse< RestApiResultMenuSectionItem > GetMenuItemByIdWithHttpInfo (
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuSectionItemsApi->GetMenuItemById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1694,7 +1694,7 @@ public ApiResponse< RestApiResultMenuSectionItem > GetMenuItemByIdWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultMenuSectionItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuSectionItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuSectionItem)));
         }
 
@@ -1733,7 +1733,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuSectionIte
             if (menuSectionItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItemId' when calling MenuSectionItemsApi->GetMenuItemById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1782,7 +1782,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuSectionIte
             }
 
             return new ApiResponse<RestApiResultMenuSectionItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuSectionItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuSectionItem)));
         }
 
@@ -1815,7 +1815,7 @@ public ApiResponse< RestApiArrayResultMenuSectionItem > GetMenuItemsWithHttpInfo
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionItemsApi->GetMenuItems");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1863,7 +1863,7 @@ public ApiResponse< RestApiArrayResultMenuSectionItem > GetMenuItemsWithHttpInfo
             }
 
             return new ApiResponse<RestApiArrayResultMenuSectionItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuSectionItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuSectionItem)));
         }
 
@@ -1897,7 +1897,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuSecti
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionItemsApi->GetMenuItems");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1945,12 +1945,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuSecti
             }
 
             return new ApiResponse<RestApiArrayResultMenuSectionItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuSectionItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuSectionItem)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu 
+        /// Move an Item within a menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1964,7 +1964,7 @@ public void MoveMenuItem (int? menuId, int? menuSectionId, int? menuSectionItemI
         }
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu 
+        /// Move an Item within a menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1987,7 +1987,7 @@ public ApiResponse<Object> MoveMenuItemWithHttpInfo (int? menuId, int? menuSecti
             if (destinationDisplayOrder == null)
                 throw new ApiException(400, "Missing required parameter 'destinationDisplayOrder' when calling MenuSectionItemsApi->MoveMenuItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/setorder/{destinationDisplayOrder}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/setorder/{destinationDisplayOrder}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2037,12 +2037,12 @@ public ApiResponse<Object> MoveMenuItemWithHttpInfo (int? menuId, int? menuSecti
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu 
+        /// Move an Item within a menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -2057,7 +2057,7 @@ public async System.Threading.Tasks.Task MoveMenuItemAsync (int? menuId, int? me
         }
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu 
+        /// Move an Item within a menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -2080,7 +2080,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MoveMenuItemAsyncW
             if (destinationDisplayOrder == null)
                 throw new ApiException(400, "Missing required parameter 'destinationDisplayOrder' when calling MenuSectionItemsApi->MoveMenuItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/setorder/{destinationDisplayOrder}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/setorder/{destinationDisplayOrder}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2130,12 +2130,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MoveMenuItemAsyncW
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu 
+        /// Set tax rate for menu item 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -2149,7 +2149,7 @@ public void SetSectionItemTax (int? menuId, int? menuSectionId, int? menuSection
         }
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu 
+        /// Set tax rate for menu item 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -2172,7 +2172,7 @@ public ApiResponse<Object> SetSectionItemTaxWithHttpInfo (int? menuId, int? menu
             if (taxRateId == null)
                 throw new ApiException(400, "Missing required parameter 'taxRateId' when calling MenuSectionItemsApi->SetSectionItemTax");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/taxrate/{taxRateId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/taxrate/{taxRateId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2222,12 +2222,12 @@ public ApiResponse<Object> SetSectionItemTaxWithHttpInfo (int? menuId, int? menu
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu 
+        /// Set tax rate for menu item 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -2242,7 +2242,7 @@ public async System.Threading.Tasks.Task SetSectionItemTaxAsync (int? menuId, in
         }
 
         /// <summary>
-        /// [PRIVATE API]Move an Item within a menu 
+        /// Set tax rate for menu item 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -2265,7 +2265,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetSectionItemTaxA
             if (taxRateId == null)
                 throw new ApiException(400, "Missing required parameter 'taxRateId' when calling MenuSectionItemsApi->SetSectionItemTax");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/taxrate/{taxRateId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/taxrate/{taxRateId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2315,7 +2315,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetSectionItemTaxA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2327,7 +2327,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetSectionItemTaxA
         /// <param name="menuSectionId">Menu section identifier</param>
         /// <param name="menuSectionItemId">Menu section item identifier</param>
         /// <param name="menuSectionItem">Menu section item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone (optional)</param>
         /// <returns></returns>
         public void UpdateMenuSectionItem (int? menuId, int? menuSectionId, int? menuSectionItemId, MenuSectionItemBase menuSectionItem, double? undoAfter = null)
         {
@@ -2342,7 +2342,7 @@ public void UpdateMenuSectionItem (int? menuId, int? menuSectionId, int? menuSec
         /// <param name="menuSectionId">Menu section identifier</param>
         /// <param name="menuSectionItemId">Menu section item identifier</param>
         /// <param name="menuSectionItem">Menu section item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateMenuSectionItemWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, MenuSectionItemBase menuSectionItem, double? undoAfter = null)
         {
@@ -2359,7 +2359,7 @@ public ApiResponse<Object> UpdateMenuSectionItemWithHttpInfo (int? menuId, int?
             if (menuSectionItem == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItem' when calling MenuSectionItemsApi->UpdateMenuSectionItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2422,7 +2422,7 @@ public ApiResponse<Object> UpdateMenuSectionItemWithHttpInfo (int? menuId, int?
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2434,7 +2434,7 @@ public ApiResponse<Object> UpdateMenuSectionItemWithHttpInfo (int? menuId, int?
         /// <param name="menuSectionId">Menu section identifier</param>
         /// <param name="menuSectionItemId">Menu section item identifier</param>
         /// <param name="menuSectionItem">Menu section item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone (optional)</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateMenuSectionItemAsync (int? menuId, int? menuSectionId, int? menuSectionItemId, MenuSectionItemBase menuSectionItem, double? undoAfter = null)
         {
@@ -2450,7 +2450,7 @@ public async System.Threading.Tasks.Task UpdateMenuSectionItemAsync (int? menuId
         /// <param name="menuSectionId">Menu section identifier</param>
         /// <param name="menuSectionItemId">Menu section item identifier</param>
         /// <param name="menuSectionItem">Menu section item (delta)</param>
-        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operaton will be undone. (optional)</param>
+        /// <param name="undoAfter">An optional time period, in hours, after which the hide-section operation will be undone (optional)</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuSectionItemAsyncWithHttpInfo (int? menuId, int? menuSectionId, int? menuSectionItemId, MenuSectionItemBase menuSectionItem, double? undoAfter = null)
         {
@@ -2467,7 +2467,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuSectionI
             if (menuSectionItem == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionItem' when calling MenuSectionItemsApi->UpdateMenuSectionItem");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2530,7 +2530,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuSectionI
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2573,7 +2573,7 @@ public ApiResponse< RestApiStringResult > UploadMenuSectionItemImageWithHttpInfo
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenuSectionItemsApi->UploadMenuSectionItemImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2624,7 +2624,7 @@ public ApiResponse< RestApiStringResult > UploadMenuSectionItemImageWithHttpInfo
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -2668,7 +2668,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenuSectionItemsApi->UploadMenuSectionItemImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitems/{menuSectionItemId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2719,7 +2719,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
diff --git a/src/Flipdish/Api/MenuSectionsApi.cs b/src/Flipdish/Api/MenuSectionsApi.cs
index 8c99f1d2..f1d0331a 100644
--- a/src/Flipdish/Api/MenuSectionsApi.cs
+++ b/src/Flipdish/Api/MenuSectionsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -685,7 +685,7 @@ public ApiResponse< RestApiResultMenuSection > CloneMenuSectionWithHttpInfo (int
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionsApi->CloneMenuSection");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/clone";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/clone";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -733,7 +733,7 @@ public ApiResponse< RestApiResultMenuSection > CloneMenuSectionWithHttpInfo (int
             }
 
             return new ApiResponse<RestApiResultMenuSection>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuSection) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuSection)));
         }
 
@@ -767,7 +767,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuSection>>
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionsApi->CloneMenuSection");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/clone";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/clone";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -815,7 +815,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuSection>>
             }
 
             return new ApiResponse<RestApiResultMenuSection>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuSection) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuSection)));
         }
 
@@ -858,7 +858,7 @@ public ApiResponse< Object > CreateMenuAvailabilityForDayWithHttpInfo (int? menu
             if (businessHoursPeriod == null)
                 throw new ApiException(400, "Missing required parameter 'businessHoursPeriod' when calling MenuSectionsApi->CreateMenuAvailabilityForDay");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/availability/times/{dayOfWeek}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/availability/times/{dayOfWeek}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -920,7 +920,7 @@ public ApiResponse< Object > CreateMenuAvailabilityForDayWithHttpInfo (int? menu
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -964,7 +964,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuAvailabi
             if (businessHoursPeriod == null)
                 throw new ApiException(400, "Missing required parameter 'businessHoursPeriod' when calling MenuSectionsApi->CreateMenuAvailabilityForDay");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/availability/times/{dayOfWeek}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/availability/times/{dayOfWeek}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1026,7 +1026,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuAvailabi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1059,7 +1059,7 @@ public ApiResponse< Object > CreateMenuSectionWithHttpInfo (int? menuId, MenuSec
             if (menuSection == null)
                 throw new ApiException(400, "Missing required parameter 'menuSection' when calling MenuSectionsApi->CreateMenuSection");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1119,7 +1119,7 @@ public ApiResponse< Object > CreateMenuSectionWithHttpInfo (int? menuId, MenuSec
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1153,7 +1153,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuSectionA
             if (menuSection == null)
                 throw new ApiException(400, "Missing required parameter 'menuSection' when calling MenuSectionsApi->CreateMenuSection");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1213,7 +1213,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuSectionA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1251,7 +1251,7 @@ public ApiResponse< Object > CreateMenuSectionAvailabilityWithHttpInfo (int? men
             if (menuSectionAvailability == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionAvailability' when calling MenuSectionsApi->CreateMenuSectionAvailability");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/availability";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/availability";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1312,7 +1312,7 @@ public ApiResponse< Object > CreateMenuSectionAvailabilityWithHttpInfo (int? men
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1351,7 +1351,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuSectionA
             if (menuSectionAvailability == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionAvailability' when calling MenuSectionsApi->CreateMenuSectionAvailability");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/availability";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/availability";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1412,7 +1412,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateMenuSectionA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1444,7 +1444,7 @@ public ApiResponse<Object> DeleteMenuSectionWithHttpInfo (int? menuId, int? menu
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionsApi->DeleteMenuSection");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1492,7 +1492,7 @@ public ApiResponse<Object> DeleteMenuSectionWithHttpInfo (int? menuId, int? menu
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1525,7 +1525,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuSectionA
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionsApi->DeleteMenuSection");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1573,7 +1573,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuSectionA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1605,7 +1605,7 @@ public ApiResponse<Object> DeleteMenuSectionImageWithHttpInfo (int? menuId, int?
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionsApi->DeleteMenuSectionImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1653,7 +1653,7 @@ public ApiResponse<Object> DeleteMenuSectionImageWithHttpInfo (int? menuId, int?
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1686,7 +1686,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuSectionI
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionsApi->DeleteMenuSectionImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1734,7 +1734,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuSectionI
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -1767,7 +1767,7 @@ public ApiResponse< RestApiResultMenuSection > GetMenuSectionByIdWithHttpInfo (i
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionsApi->GetMenuSectionById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1815,7 +1815,7 @@ public ApiResponse< RestApiResultMenuSection > GetMenuSectionByIdWithHttpInfo (i
             }
 
             return new ApiResponse<RestApiResultMenuSection>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuSection) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuSection)));
         }
 
@@ -1849,7 +1849,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuSection>>
             if (menuSectionId == null)
                 throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuSectionsApi->GetMenuSectionById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1897,7 +1897,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuSection>>
             }
 
             return new ApiResponse<RestApiResultMenuSection>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenuSection) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuSection)));
         }
 
@@ -1925,7 +1925,7 @@ public ApiResponse< RestApiArrayResultMenuSection > GetMenuSectionsWithHttpInfo
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuSectionsApi->GetMenuSections");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1972,7 +1972,7 @@ public ApiResponse< RestApiArrayResultMenuSection > GetMenuSectionsWithHttpInfo
             }
 
             return new ApiResponse<RestApiArrayResultMenuSection>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuSection) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuSection)));
         }
 
@@ -2001,7 +2001,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuSecti
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuSectionsApi->GetMenuSections");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2048,7 +2048,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuSecti
             }
 
             return new ApiResponse<RestApiArrayResultMenuSection>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuSection) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuSection)));
         }
 
@@ -2085,7 +2085,7 @@ public ApiResponse<Object> MenuSectionsSetItemDisplayOrdersWithHttpInfo (int? me
             if (displayOrders == null)
                 throw new ApiException(400, "Missing required parameter 'displayOrders' when calling MenuSectionsApi->MenuSectionsSetItemDisplayOrders");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitemdisplayorders";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitemdisplayorders";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2146,7 +2146,7 @@ public ApiResponse<Object> MenuSectionsSetItemDisplayOrdersWithHttpInfo (int? me
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2184,7 +2184,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenuSectionsSetIte
             if (displayOrders == null)
                 throw new ApiException(400, "Missing required parameter 'displayOrders' when calling MenuSectionsApi->MenuSectionsSetItemDisplayOrders");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitemdisplayorders";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/sectionitemdisplayorders";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2245,7 +2245,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenuSectionsSetIte
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2284,7 +2284,7 @@ public ApiResponse<Object> UpdateMenuSectionWithHttpInfo (int? menuId, int? menu
             if (menuSection == null)
                 throw new ApiException(400, "Missing required parameter 'menuSection' when calling MenuSectionsApi->UpdateMenuSection");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2346,7 +2346,7 @@ public ApiResponse<Object> UpdateMenuSectionWithHttpInfo (int? menuId, int? menu
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2386,7 +2386,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuSectionA
             if (menuSection == null)
                 throw new ApiException(400, "Missing required parameter 'menuSection' when calling MenuSectionsApi->UpdateMenuSection");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2448,7 +2448,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuSectionA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2486,7 +2486,7 @@ public ApiResponse< RestApiStringResult > UploadMenuSectionImageWithHttpInfo (in
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenuSectionsApi->UploadMenuSectionImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2536,7 +2536,7 @@ public ApiResponse< RestApiStringResult > UploadMenuSectionImageWithHttpInfo (in
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -2575,7 +2575,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenuSectionsApi->UploadMenuSectionImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sections/{menuSectionId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sections/{menuSectionId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2625,7 +2625,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
diff --git a/src/Flipdish/Api/MenuZonesApi.cs b/src/Flipdish/Api/MenuZonesApi.cs
new file mode 100644
index 00000000..8fd17b7a
--- /dev/null
+++ b/src/Flipdish/Api/MenuZonesApi.cs
@@ -0,0 +1,2589 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IMenuZonesApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// Adds a new menu zone to a menu.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZone">The object containing the new zone. This is optional and not supplying it will generate an empty default zone.</param>
+        /// <returns>RestApiResultMenuZone</returns>
+        RestApiResultMenuZone AddMenuZone (int? menuId, MenuZone menuZone);
+
+        /// <summary>
+        /// Adds a new menu zone to a menu.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZone">The object containing the new zone. This is optional and not supplying it will generate an empty default zone.</param>
+        /// <returns>ApiResponse of RestApiResultMenuZone</returns>
+        ApiResponse<RestApiResultMenuZone> AddMenuZoneWithHttpInfo (int? menuId, MenuZone menuZone);
+        /// <summary>
+        /// Deletes a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns></returns>
+        void DeleteMenuZone (int? menuId, int? menuZoneId);
+
+        /// <summary>
+        /// Deletes a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> DeleteMenuZoneWithHttpInfo (int? menuId, int? menuZoneId);
+        /// <summary>
+        /// Deletes a menu zone image.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone Id/</param>
+        /// <returns></returns>
+        void DeleteMenuZoneImage (int? menuId, int? menuZoneId);
+
+        /// <summary>
+        /// Deletes a menu zone image.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone Id/</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> DeleteMenuZoneImageWithHttpInfo (int? menuId, int? menuZoneId);
+        /// <summary>
+        /// Flips the order of two menu zones.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId"></param>
+        /// <param name="menuZoneId">Source.</param>
+        /// <param name="menuZoneI2">Destination.</param>
+        /// <returns></returns>
+        void FlipMenuZones (int? menuId, int? menuZoneId, int? menuZoneI2);
+
+        /// <summary>
+        /// Flips the order of two menu zones.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId"></param>
+        /// <param name="menuZoneId">Source.</param>
+        /// <param name="menuZoneI2">Destination.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> FlipMenuZonesWithHttpInfo (int? menuId, int? menuZoneId, int? menuZoneI2);
+        /// <summary>
+        /// Gets a specific menu zone for a given zone id
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>RestApiResultMenuZone</returns>
+        RestApiResultMenuZone GetMenuZone (int? menuId, int? menuZoneId);
+
+        /// <summary>
+        /// Gets a specific menu zone for a given zone id
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>ApiResponse of RestApiResultMenuZone</returns>
+        ApiResponse<RestApiResultMenuZone> GetMenuZoneWithHttpInfo (int? menuId, int? menuZoneId);
+        /// <summary>
+        /// Gets all the menu zones for a menu
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id to load zones for</param>
+        /// <returns>RestApiArrayResultMenuZone</returns>
+        RestApiArrayResultMenuZone GetMenuZonesForMenuId (int? menuId);
+
+        /// <summary>
+        /// Gets all the menu zones for a menu
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id to load zones for</param>
+        /// <returns>ApiResponse of RestApiArrayResultMenuZone</returns>
+        ApiResponse<RestApiArrayResultMenuZone> GetMenuZonesForMenuIdWithHttpInfo (int? menuId);
+        /// <summary>
+        /// Assigns a zone to a menu section.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu id.</param>
+        /// <param name="menuSectionId">The menu section id.</param>
+        /// <returns></returns>
+        void SetMenuSectionMenuZone (int? menuId, int? menuZoneId, int? menuSectionId);
+
+        /// <summary>
+        /// Assigns a zone to a menu section.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu id.</param>
+        /// <param name="menuSectionId">The menu section id.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SetMenuSectionMenuZoneWithHttpInfo (int? menuId, int? menuZoneId, int? menuSectionId);
+        /// <summary>
+        /// Sets the description of a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="description">The new description. Add as a raw string in the request, without any JSON wrapper.</param>
+        /// <returns></returns>
+        void SetMenuZoneDescription (int? menuId, int? menuZoneId, string description);
+
+        /// <summary>
+        /// Sets the description of a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="description">The new description. Add as a raw string in the request, without any JSON wrapper.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SetMenuZoneDescriptionWithHttpInfo (int? menuId, int? menuZoneId, string description);
+        /// <summary>
+        /// Sets the name of a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZoneName">The new name.</param>
+        /// <returns></returns>
+        void SetMenuZoneName (int? menuId, int? menuZoneId, string menuZoneName);
+
+        /// <summary>
+        /// Sets the name of a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZoneName">The new name.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SetMenuZoneNameWithHttpInfo (int? menuId, int? menuZoneId, string menuZoneName);
+        /// <summary>
+        /// Updates a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZone">The object containing the updated values.</param>
+        /// <returns></returns>
+        void UpdateMenuZone (int? menuId, int? menuZoneId, MenuZone menuZone);
+
+        /// <summary>
+        /// Updates a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZone">The object containing the updated values.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdateMenuZoneWithHttpInfo (int? menuId, int? menuZoneId, MenuZone menuZone);
+        /// <summary>
+        /// Uploads an image for a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="_file">The file to upload.</param>
+        /// <returns></returns>
+        void UploadMenuZoneImage (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file);
+
+        /// <summary>
+        /// Uploads an image for a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="_file">The file to upload.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UploadMenuZoneImageWithHttpInfo (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// Adds a new menu zone to a menu.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZone">The object containing the new zone. This is optional and not supplying it will generate an empty default zone.</param>
+        /// <returns>Task of RestApiResultMenuZone</returns>
+        System.Threading.Tasks.Task<RestApiResultMenuZone> AddMenuZoneAsync (int? menuId, MenuZone menuZone);
+
+        /// <summary>
+        /// Adds a new menu zone to a menu.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZone">The object containing the new zone. This is optional and not supplying it will generate an empty default zone.</param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuZone)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuZone>> AddMenuZoneAsyncWithHttpInfo (int? menuId, MenuZone menuZone);
+        /// <summary>
+        /// Deletes a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task DeleteMenuZoneAsync (int? menuId, int? menuZoneId);
+
+        /// <summary>
+        /// Deletes a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuZoneAsyncWithHttpInfo (int? menuId, int? menuZoneId);
+        /// <summary>
+        /// Deletes a menu zone image.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone Id/</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task DeleteMenuZoneImageAsync (int? menuId, int? menuZoneId);
+
+        /// <summary>
+        /// Deletes a menu zone image.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone Id/</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuZoneImageAsyncWithHttpInfo (int? menuId, int? menuZoneId);
+        /// <summary>
+        /// Flips the order of two menu zones.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId"></param>
+        /// <param name="menuZoneId">Source.</param>
+        /// <param name="menuZoneI2">Destination.</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task FlipMenuZonesAsync (int? menuId, int? menuZoneId, int? menuZoneI2);
+
+        /// <summary>
+        /// Flips the order of two menu zones.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId"></param>
+        /// <param name="menuZoneId">Source.</param>
+        /// <param name="menuZoneI2">Destination.</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> FlipMenuZonesAsyncWithHttpInfo (int? menuId, int? menuZoneId, int? menuZoneI2);
+        /// <summary>
+        /// Gets a specific menu zone for a given zone id
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>Task of RestApiResultMenuZone</returns>
+        System.Threading.Tasks.Task<RestApiResultMenuZone> GetMenuZoneAsync (int? menuId, int? menuZoneId);
+
+        /// <summary>
+        /// Gets a specific menu zone for a given zone id
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuZone)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuZone>> GetMenuZoneAsyncWithHttpInfo (int? menuId, int? menuZoneId);
+        /// <summary>
+        /// Gets all the menu zones for a menu
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id to load zones for</param>
+        /// <returns>Task of RestApiArrayResultMenuZone</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultMenuZone> GetMenuZonesForMenuIdAsync (int? menuId);
+
+        /// <summary>
+        /// Gets all the menu zones for a menu
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id to load zones for</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultMenuZone)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuZone>> GetMenuZonesForMenuIdAsyncWithHttpInfo (int? menuId);
+        /// <summary>
+        /// Assigns a zone to a menu section.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu id.</param>
+        /// <param name="menuSectionId">The menu section id.</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SetMenuSectionMenuZoneAsync (int? menuId, int? menuZoneId, int? menuSectionId);
+
+        /// <summary>
+        /// Assigns a zone to a menu section.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu id.</param>
+        /// <param name="menuSectionId">The menu section id.</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuSectionMenuZoneAsyncWithHttpInfo (int? menuId, int? menuZoneId, int? menuSectionId);
+        /// <summary>
+        /// Sets the description of a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="description">The new description. Add as a raw string in the request, without any JSON wrapper.</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SetMenuZoneDescriptionAsync (int? menuId, int? menuZoneId, string description);
+
+        /// <summary>
+        /// Sets the description of a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="description">The new description. Add as a raw string in the request, without any JSON wrapper.</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuZoneDescriptionAsyncWithHttpInfo (int? menuId, int? menuZoneId, string description);
+        /// <summary>
+        /// Sets the name of a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZoneName">The new name.</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SetMenuZoneNameAsync (int? menuId, int? menuZoneId, string menuZoneName);
+
+        /// <summary>
+        /// Sets the name of a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZoneName">The new name.</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuZoneNameAsyncWithHttpInfo (int? menuId, int? menuZoneId, string menuZoneName);
+        /// <summary>
+        /// Updates a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZone">The object containing the updated values.</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UpdateMenuZoneAsync (int? menuId, int? menuZoneId, MenuZone menuZone);
+
+        /// <summary>
+        /// Updates a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZone">The object containing the updated values.</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuZoneAsyncWithHttpInfo (int? menuId, int? menuZoneId, MenuZone menuZone);
+        /// <summary>
+        /// Uploads an image for a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="_file">The file to upload.</param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UploadMenuZoneImageAsync (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file);
+
+        /// <summary>
+        /// Uploads an image for a menu zone.
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="_file">The file to upload.</param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UploadMenuZoneImageAsyncWithHttpInfo (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class MenuZonesApi : IMenuZonesApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenuZonesApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public MenuZonesApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenuZonesApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public MenuZonesApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        /// Adds a new menu zone to a menu. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZone">The object containing the new zone. This is optional and not supplying it will generate an empty default zone.</param>
+        /// <returns>RestApiResultMenuZone</returns>
+        public RestApiResultMenuZone AddMenuZone (int? menuId, MenuZone menuZone)
+        {
+             ApiResponse<RestApiResultMenuZone> localVarResponse = AddMenuZoneWithHttpInfo(menuId, menuZone);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Adds a new menu zone to a menu. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZone">The object containing the new zone. This is optional and not supplying it will generate an empty default zone.</param>
+        /// <returns>ApiResponse of RestApiResultMenuZone</returns>
+        public ApiResponse< RestApiResultMenuZone > AddMenuZoneWithHttpInfo (int? menuId, MenuZone menuZone)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->AddMenuZone");
+            // verify the required parameter 'menuZone' is set
+            if (menuZone == null)
+                throw new ApiException(400, "Missing required parameter 'menuZone' when calling MenuZonesApi->AddMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZone != null && menuZone.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(menuZone); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = menuZone; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuZone>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuZone)));
+        }
+
+        /// <summary>
+        /// Adds a new menu zone to a menu. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZone">The object containing the new zone. This is optional and not supplying it will generate an empty default zone.</param>
+        /// <returns>Task of RestApiResultMenuZone</returns>
+        public async System.Threading.Tasks.Task<RestApiResultMenuZone> AddMenuZoneAsync (int? menuId, MenuZone menuZone)
+        {
+             ApiResponse<RestApiResultMenuZone> localVarResponse = await AddMenuZoneAsyncWithHttpInfo(menuId, menuZone);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Adds a new menu zone to a menu. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZone">The object containing the new zone. This is optional and not supplying it will generate an empty default zone.</param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuZone)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuZone>> AddMenuZoneAsyncWithHttpInfo (int? menuId, MenuZone menuZone)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->AddMenuZone");
+            // verify the required parameter 'menuZone' is set
+            if (menuZone == null)
+                throw new ApiException(400, "Missing required parameter 'menuZone' when calling MenuZonesApi->AddMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZone != null && menuZone.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(menuZone); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = menuZone; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuZone>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuZone)));
+        }
+
+        /// <summary>
+        /// Deletes a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns></returns>
+        public void DeleteMenuZone (int? menuId, int? menuZoneId)
+        {
+             DeleteMenuZoneWithHttpInfo(menuId, menuZoneId);
+        }
+
+        /// <summary>
+        /// Deletes a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> DeleteMenuZoneWithHttpInfo (int? menuId, int? menuZoneId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->DeleteMenuZone");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->DeleteMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Deletes a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task DeleteMenuZoneAsync (int? menuId, int? menuZoneId)
+        {
+             await DeleteMenuZoneAsyncWithHttpInfo(menuId, menuZoneId);
+
+        }
+
+        /// <summary>
+        /// Deletes a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuZoneAsyncWithHttpInfo (int? menuId, int? menuZoneId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->DeleteMenuZone");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->DeleteMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Deletes a menu zone image. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone Id/</param>
+        /// <returns></returns>
+        public void DeleteMenuZoneImage (int? menuId, int? menuZoneId)
+        {
+             DeleteMenuZoneImageWithHttpInfo(menuId, menuZoneId);
+        }
+
+        /// <summary>
+        /// Deletes a menu zone image. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone Id/</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> DeleteMenuZoneImageWithHttpInfo (int? menuId, int? menuZoneId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->DeleteMenuZoneImage");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->DeleteMenuZoneImage");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/image";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteMenuZoneImage", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Deletes a menu zone image. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone Id/</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task DeleteMenuZoneImageAsync (int? menuId, int? menuZoneId)
+        {
+             await DeleteMenuZoneImageAsyncWithHttpInfo(menuId, menuZoneId);
+
+        }
+
+        /// <summary>
+        /// Deletes a menu zone image. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone Id/</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuZoneImageAsyncWithHttpInfo (int? menuId, int? menuZoneId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->DeleteMenuZoneImage");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->DeleteMenuZoneImage");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/image";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteMenuZoneImage", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Flips the order of two menu zones. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId"></param>
+        /// <param name="menuZoneId">Source.</param>
+        /// <param name="menuZoneI2">Destination.</param>
+        /// <returns></returns>
+        public void FlipMenuZones (int? menuId, int? menuZoneId, int? menuZoneI2)
+        {
+             FlipMenuZonesWithHttpInfo(menuId, menuZoneId, menuZoneI2);
+        }
+
+        /// <summary>
+        /// Flips the order of two menu zones. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId"></param>
+        /// <param name="menuZoneId">Source.</param>
+        /// <param name="menuZoneI2">Destination.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> FlipMenuZonesWithHttpInfo (int? menuId, int? menuZoneId, int? menuZoneI2)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->FlipMenuZones");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->FlipMenuZones");
+            // verify the required parameter 'menuZoneI2' is set
+            if (menuZoneI2 == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneI2' when calling MenuZonesApi->FlipMenuZones");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/flip/{menuZoneI2}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (menuZoneI2 != null) localVarPathParams.Add("menuZoneI2", this.Configuration.ApiClient.ParameterToString(menuZoneI2)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FlipMenuZones", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Flips the order of two menu zones. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId"></param>
+        /// <param name="menuZoneId">Source.</param>
+        /// <param name="menuZoneI2">Destination.</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task FlipMenuZonesAsync (int? menuId, int? menuZoneId, int? menuZoneI2)
+        {
+             await FlipMenuZonesAsyncWithHttpInfo(menuId, menuZoneId, menuZoneI2);
+
+        }
+
+        /// <summary>
+        /// Flips the order of two menu zones. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId"></param>
+        /// <param name="menuZoneId">Source.</param>
+        /// <param name="menuZoneI2">Destination.</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> FlipMenuZonesAsyncWithHttpInfo (int? menuId, int? menuZoneId, int? menuZoneI2)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->FlipMenuZones");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->FlipMenuZones");
+            // verify the required parameter 'menuZoneI2' is set
+            if (menuZoneI2 == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneI2' when calling MenuZonesApi->FlipMenuZones");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/flip/{menuZoneI2}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (menuZoneI2 != null) localVarPathParams.Add("menuZoneI2", this.Configuration.ApiClient.ParameterToString(menuZoneI2)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FlipMenuZones", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Gets a specific menu zone for a given zone id 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>RestApiResultMenuZone</returns>
+        public RestApiResultMenuZone GetMenuZone (int? menuId, int? menuZoneId)
+        {
+             ApiResponse<RestApiResultMenuZone> localVarResponse = GetMenuZoneWithHttpInfo(menuId, menuZoneId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Gets a specific menu zone for a given zone id 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>ApiResponse of RestApiResultMenuZone</returns>
+        public ApiResponse< RestApiResultMenuZone > GetMenuZoneWithHttpInfo (int? menuId, int? menuZoneId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->GetMenuZone");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->GetMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuZone>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuZone)));
+        }
+
+        /// <summary>
+        /// Gets a specific menu zone for a given zone id 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>Task of RestApiResultMenuZone</returns>
+        public async System.Threading.Tasks.Task<RestApiResultMenuZone> GetMenuZoneAsync (int? menuId, int? menuZoneId)
+        {
+             ApiResponse<RestApiResultMenuZone> localVarResponse = await GetMenuZoneAsyncWithHttpInfo(menuId, menuZoneId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Gets a specific menu zone for a given zone id 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuZone)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuZone>> GetMenuZoneAsyncWithHttpInfo (int? menuId, int? menuZoneId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->GetMenuZone");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->GetMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuZone>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuZone)));
+        }
+
+        /// <summary>
+        /// Gets all the menu zones for a menu 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id to load zones for</param>
+        /// <returns>RestApiArrayResultMenuZone</returns>
+        public RestApiArrayResultMenuZone GetMenuZonesForMenuId (int? menuId)
+        {
+             ApiResponse<RestApiArrayResultMenuZone> localVarResponse = GetMenuZonesForMenuIdWithHttpInfo(menuId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Gets all the menu zones for a menu 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id to load zones for</param>
+        /// <returns>ApiResponse of RestApiArrayResultMenuZone</returns>
+        public ApiResponse< RestApiArrayResultMenuZone > GetMenuZonesForMenuIdWithHttpInfo (int? menuId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->GetMenuZonesForMenuId");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetMenuZonesForMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultMenuZone>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultMenuZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuZone)));
+        }
+
+        /// <summary>
+        /// Gets all the menu zones for a menu 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id to load zones for</param>
+        /// <returns>Task of RestApiArrayResultMenuZone</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultMenuZone> GetMenuZonesForMenuIdAsync (int? menuId)
+        {
+             ApiResponse<RestApiArrayResultMenuZone> localVarResponse = await GetMenuZonesForMenuIdAsyncWithHttpInfo(menuId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Gets all the menu zones for a menu 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id to load zones for</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultMenuZone)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuZone>> GetMenuZonesForMenuIdAsyncWithHttpInfo (int? menuId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->GetMenuZonesForMenuId");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetMenuZonesForMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultMenuZone>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultMenuZone) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuZone)));
+        }
+
+        /// <summary>
+        /// Assigns a zone to a menu section. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu id.</param>
+        /// <param name="menuSectionId">The menu section id.</param>
+        /// <returns></returns>
+        public void SetMenuSectionMenuZone (int? menuId, int? menuZoneId, int? menuSectionId)
+        {
+             SetMenuSectionMenuZoneWithHttpInfo(menuId, menuZoneId, menuSectionId);
+        }
+
+        /// <summary>
+        /// Assigns a zone to a menu section. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu id.</param>
+        /// <param name="menuSectionId">The menu section id.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetMenuSectionMenuZoneWithHttpInfo (int? menuId, int? menuZoneId, int? menuSectionId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->SetMenuSectionMenuZone");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->SetMenuSectionMenuZone");
+            // verify the required parameter 'menuSectionId' is set
+            if (menuSectionId == null)
+                throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuZonesApi->SetMenuSectionMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/section/{menuSectionId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (menuSectionId != null) localVarPathParams.Add("menuSectionId", this.Configuration.ApiClient.ParameterToString(menuSectionId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetMenuSectionMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Assigns a zone to a menu section. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu id.</param>
+        /// <param name="menuSectionId">The menu section id.</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetMenuSectionMenuZoneAsync (int? menuId, int? menuZoneId, int? menuSectionId)
+        {
+             await SetMenuSectionMenuZoneAsyncWithHttpInfo(menuId, menuZoneId, menuSectionId);
+
+        }
+
+        /// <summary>
+        /// Assigns a zone to a menu section. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu id.</param>
+        /// <param name="menuSectionId">The menu section id.</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuSectionMenuZoneAsyncWithHttpInfo (int? menuId, int? menuZoneId, int? menuSectionId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->SetMenuSectionMenuZone");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->SetMenuSectionMenuZone");
+            // verify the required parameter 'menuSectionId' is set
+            if (menuSectionId == null)
+                throw new ApiException(400, "Missing required parameter 'menuSectionId' when calling MenuZonesApi->SetMenuSectionMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/section/{menuSectionId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (menuSectionId != null) localVarPathParams.Add("menuSectionId", this.Configuration.ApiClient.ParameterToString(menuSectionId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetMenuSectionMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Sets the description of a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="description">The new description. Add as a raw string in the request, without any JSON wrapper.</param>
+        /// <returns></returns>
+        public void SetMenuZoneDescription (int? menuId, int? menuZoneId, string description)
+        {
+             SetMenuZoneDescriptionWithHttpInfo(menuId, menuZoneId, description);
+        }
+
+        /// <summary>
+        /// Sets the description of a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="description">The new description. Add as a raw string in the request, without any JSON wrapper.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetMenuZoneDescriptionWithHttpInfo (int? menuId, int? menuZoneId, string description)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->SetMenuZoneDescription");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->SetMenuZoneDescription");
+            // verify the required parameter 'description' is set
+            if (description == null)
+                throw new ApiException(400, "Missing required parameter 'description' when calling MenuZonesApi->SetMenuZoneDescription");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/description";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (description != null && description.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(description); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = description; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetMenuZoneDescription", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Sets the description of a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="description">The new description. Add as a raw string in the request, without any JSON wrapper.</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetMenuZoneDescriptionAsync (int? menuId, int? menuZoneId, string description)
+        {
+             await SetMenuZoneDescriptionAsyncWithHttpInfo(menuId, menuZoneId, description);
+
+        }
+
+        /// <summary>
+        /// Sets the description of a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="description">The new description. Add as a raw string in the request, without any JSON wrapper.</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuZoneDescriptionAsyncWithHttpInfo (int? menuId, int? menuZoneId, string description)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->SetMenuZoneDescription");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->SetMenuZoneDescription");
+            // verify the required parameter 'description' is set
+            if (description == null)
+                throw new ApiException(400, "Missing required parameter 'description' when calling MenuZonesApi->SetMenuZoneDescription");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/description";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (description != null && description.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(description); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = description; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetMenuZoneDescription", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Sets the name of a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZoneName">The new name.</param>
+        /// <returns></returns>
+        public void SetMenuZoneName (int? menuId, int? menuZoneId, string menuZoneName)
+        {
+             SetMenuZoneNameWithHttpInfo(menuId, menuZoneId, menuZoneName);
+        }
+
+        /// <summary>
+        /// Sets the name of a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZoneName">The new name.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetMenuZoneNameWithHttpInfo (int? menuId, int? menuZoneId, string menuZoneName)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->SetMenuZoneName");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->SetMenuZoneName");
+            // verify the required parameter 'menuZoneName' is set
+            if (menuZoneName == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneName' when calling MenuZonesApi->SetMenuZoneName");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/name/{menuZoneName}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (menuZoneName != null) localVarPathParams.Add("menuZoneName", this.Configuration.ApiClient.ParameterToString(menuZoneName)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetMenuZoneName", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Sets the name of a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZoneName">The new name.</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetMenuZoneNameAsync (int? menuId, int? menuZoneId, string menuZoneName)
+        {
+             await SetMenuZoneNameAsyncWithHttpInfo(menuId, menuZoneId, menuZoneName);
+
+        }
+
+        /// <summary>
+        /// Sets the name of a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZoneName">The new name.</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuZoneNameAsyncWithHttpInfo (int? menuId, int? menuZoneId, string menuZoneName)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->SetMenuZoneName");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->SetMenuZoneName");
+            // verify the required parameter 'menuZoneName' is set
+            if (menuZoneName == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneName' when calling MenuZonesApi->SetMenuZoneName");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/name/{menuZoneName}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (menuZoneName != null) localVarPathParams.Add("menuZoneName", this.Configuration.ApiClient.ParameterToString(menuZoneName)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetMenuZoneName", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Updates a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZone">The object containing the updated values.</param>
+        /// <returns></returns>
+        public void UpdateMenuZone (int? menuId, int? menuZoneId, MenuZone menuZone)
+        {
+             UpdateMenuZoneWithHttpInfo(menuId, menuZoneId, menuZone);
+        }
+
+        /// <summary>
+        /// Updates a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZone">The object containing the updated values.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdateMenuZoneWithHttpInfo (int? menuId, int? menuZoneId, MenuZone menuZone)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->UpdateMenuZone");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->UpdateMenuZone");
+            // verify the required parameter 'menuZone' is set
+            if (menuZone == null)
+                throw new ApiException(400, "Missing required parameter 'menuZone' when calling MenuZonesApi->UpdateMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (menuZone != null && menuZone.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(menuZone); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = menuZone; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Updates a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZone">The object containing the updated values.</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdateMenuZoneAsync (int? menuId, int? menuZoneId, MenuZone menuZone)
+        {
+             await UpdateMenuZoneAsyncWithHttpInfo(menuId, menuZoneId, menuZone);
+
+        }
+
+        /// <summary>
+        /// Updates a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">The menu id.</param>
+        /// <param name="menuZoneId">The menu zone id.</param>
+        /// <param name="menuZone">The object containing the updated values.</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuZoneAsyncWithHttpInfo (int? menuId, int? menuZoneId, MenuZone menuZone)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->UpdateMenuZone");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->UpdateMenuZone");
+            // verify the required parameter 'menuZone' is set
+            if (menuZone == null)
+                throw new ApiException(400, "Missing required parameter 'menuZone' when calling MenuZonesApi->UpdateMenuZone");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (menuZone != null && menuZone.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(menuZone); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = menuZone; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateMenuZone", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Uploads an image for a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="_file">The file to upload.</param>
+        /// <returns></returns>
+        public void UploadMenuZoneImage (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file)
+        {
+             UploadMenuZoneImageWithHttpInfo(menuId, menuZoneId, _file);
+        }
+
+        /// <summary>
+        /// Uploads an image for a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="_file">The file to upload.</param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UploadMenuZoneImageWithHttpInfo (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->UploadMenuZoneImage");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->UploadMenuZoneImage");
+            // verify the required parameter '_file' is set
+            if (_file == null)
+                throw new ApiException(400, "Missing required parameter '_file' when calling MenuZonesApi->UploadMenuZoneImage");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/image";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (_file != null && _file.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(_file); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = _file; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadMenuZoneImage", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        /// Uploads an image for a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="_file">The file to upload.</param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UploadMenuZoneImageAsync (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file)
+        {
+             await UploadMenuZoneImageAsyncWithHttpInfo(menuId, menuZoneId, _file);
+
+        }
+
+        /// <summary>
+        /// Uploads an image for a menu zone. 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu id.</param>
+        /// <param name="menuZoneId">The zone id.</param>
+        /// <param name="_file">The file to upload.</param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UploadMenuZoneImageAsyncWithHttpInfo (int? menuId, int? menuZoneId, List<HttpPostedFileBase> _file)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenuZonesApi->UploadMenuZoneImage");
+            // verify the required parameter 'menuZoneId' is set
+            if (menuZoneId == null)
+                throw new ApiException(400, "Missing required parameter 'menuZoneId' when calling MenuZonesApi->UploadMenuZoneImage");
+            // verify the required parameter '_file' is set
+            if (_file == null)
+                throw new ApiException(400, "Missing required parameter '_file' when calling MenuZonesApi->UploadMenuZoneImage");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/zones/{menuZoneId}/image";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (menuZoneId != null) localVarPathParams.Add("menuZoneId", this.Configuration.ApiClient.ParameterToString(menuZoneId)); // path parameter
+            if (_file != null && _file.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(_file); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = _file; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadMenuZoneImage", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/MenusApi.cs b/src/Flipdish/Api/MenusApi.cs
index 3677b516..5c18ef69 100644
--- a/src/Flipdish/Api/MenusApi.cs
+++ b/src/Flipdish/Api/MenusApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,7 +25,7 @@ public interface IMenusApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// [PRIVATE API]Clone a menu, (without attaching stores)
+        /// Clone a menu, (without attaching stores)
         /// </summary>
         /// <remarks>
         /// 
@@ -37,7 +37,7 @@ public interface IMenusApi : IApiAccessor
         RestApiResultMenu CreateDraftMenuFromExistingMenu (int? menuId, string newName);
 
         /// <summary>
-        /// [PRIVATE API]Clone a menu, (without attaching stores)
+        /// Clone a menu, (without attaching stores)
         /// </summary>
         /// <remarks>
         /// 
@@ -48,30 +48,55 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultMenu</returns>
         ApiResponse<RestApiResultMenu> CreateDraftMenuFromExistingMenuWithHttpInfo (int? menuId, string newName);
         /// <summary>
-        /// Create a new menu. If request body is empty, the system will create a menu with default items.
+        /// Create a new menu asynchronously
         /// </summary>
         /// <remarks>
-        /// 
+        /// You must listen to the webhook menu.async_creation.completed to know when the menu is ready
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App identifier</param>
+        /// <param name="appId">App id</param>
+        /// <param name="menu">Menu</param>
+        /// <param name="orgId">Org id (optional)</param>
+        /// <returns>Object</returns>
+        Object CreateNewMenuAsync (string appId, CreateFullMenu menu, string orgId = null);
+
+        /// <summary>
+        /// Create a new menu asynchronously
+        /// </summary>
+        /// <remarks>
+        /// You must listen to the webhook menu.async_creation.completed to know when the menu is ready
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId">App id</param>
         /// <param name="menu">Menu</param>
+        /// <param name="orgId">Org id (optional)</param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> CreateNewMenuAsyncWithHttpInfo (string appId, CreateFullMenu menu, string orgId = null);
+        /// <summary>
+        /// Create a new menu
+        /// </summary>
+        /// <remarks>
+        /// [DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId">App identifier</param>
+        /// <param name="menu">Menu. If empty the system will create a menu with default items</param>
         /// <returns>int?</returns>
         int? CreateNewMenuForApp (string appId, CreateFullMenu menu);
 
         /// <summary>
-        /// Create a new menu. If request body is empty, the system will create a menu with default items.
+        /// Create a new menu
         /// </summary>
         /// <remarks>
-        /// 
+        /// [DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">App identifier</param>
-        /// <param name="menu">Menu</param>
+        /// <param name="menu">Menu. If empty the system will create a menu with default items</param>
         /// <returns>ApiResponse of int?</returns>
         ApiResponse<int?> CreateNewMenuForAppWithHttpInfo (string appId, CreateFullMenu menu);
         /// <summary>
-        /// [PRIVATE API]Mark a Menu as Deleted
+        /// Mark a Menu as Deleted
         /// </summary>
         /// <remarks>
         /// 
@@ -82,7 +107,7 @@ public interface IMenusApi : IApiAccessor
         void DeleteMenu (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Mark a Menu as Deleted
+        /// Mark a Menu as Deleted
         /// </summary>
         /// <remarks>
         /// 
@@ -219,8 +244,8 @@ public interface IMenusApi : IApiAccessor
         /// <param name="storeId">Store identifier</param>
         /// <param name="menuItemId">Menu item identifier</param>
         /// <param name="key">Metadata key</param>
-        /// <returns></returns>
-        void GetMenuItemMetadataByKey (int? menuId, int? storeId, int? menuItemId, string key);
+        /// <returns>RestApiResultMetadata</returns>
+        RestApiResultMetadata GetMenuItemMetadataByKey (int? menuId, int? storeId, int? menuItemId, string key);
 
         /// <summary>
         /// Get menu item metadata by key
@@ -233,8 +258,8 @@ public interface IMenusApi : IApiAccessor
         /// <param name="storeId">Store identifier</param>
         /// <param name="menuItemId">Menu item identifier</param>
         /// <param name="key">Metadata key</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> GetMenuItemMetadataByKeyWithHttpInfo (int? menuId, int? storeId, int? menuItemId, string key);
+        /// <returns>ApiResponse of RestApiResultMetadata</returns>
+        ApiResponse<RestApiResultMetadata> GetMenuItemMetadataByKeyWithHttpInfo (int? menuId, int? storeId, int? menuItemId, string key);
         /// <summary>
         /// Get menu item option set item metadata by key
         /// </summary>
@@ -261,28 +286,28 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultMetadata</returns>
         ApiResponse<RestApiResultMetadata> GetMenuItemOptionSetItemMetadataWithHttpInfo (int? menuId, int? storeId, int? optionSetItemId);
         /// <summary>
-        /// [PRIVATE API]Get Menus Name
+        /// Get Menus Name
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <returns></returns>
-        void GetMenuName (int? menuId);
+        /// <returns>string</returns>
+        string GetMenuName (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Get Menus Name
+        /// Get Menus Name
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> GetMenuNameWithHttpInfo (int? menuId);
+        /// <returns>ApiResponse of string</returns>
+        ApiResponse<string> GetMenuNameWithHttpInfo (int? menuId);
         /// <summary>
-        /// [PRIVATE API]Get menus store names
+        /// Get menus store names
         /// </summary>
         /// <remarks>
         /// 
@@ -293,7 +318,7 @@ public interface IMenusApi : IApiAccessor
         RestApiArrayResultMenuStoreNames GetMenuStoreNames (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Get menus store names
+        /// Get menus store names
         /// </summary>
         /// <remarks>
         /// 
@@ -303,7 +328,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultMenuStoreNames</returns>
         ApiResponse<RestApiArrayResultMenuStoreNames> GetMenuStoreNamesWithHttpInfo (int? menuId);
         /// <summary>
-        /// [PRIVATE API]Get menus tax details
+        /// Get menus tax details
         /// </summary>
         /// <remarks>
         /// 
@@ -314,7 +339,7 @@ public interface IMenusApi : IApiAccessor
         RestApiArrayResultMenuTaxDetails GetMenuTaxDetails (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Get menus tax details
+        /// Get menus tax details
         /// </summary>
         /// <remarks>
         /// 
@@ -324,7 +349,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultMenuTaxDetails</returns>
         ApiResponse<RestApiArrayResultMenuTaxDetails> GetMenuTaxDetailsWithHttpInfo (int? menuId);
         /// <summary>
-        /// [PRIVATE API]Get menus by appId
+        /// Get menus by appId
         /// </summary>
         /// <remarks>
         /// 
@@ -335,7 +360,7 @@ public interface IMenusApi : IApiAccessor
         RestApiArrayResultMenuSummary GetMenusByAppId (string appId);
 
         /// <summary>
-        /// [PRIVATE API]Get menus by appId
+        /// Get menus by appId
         /// </summary>
         /// <remarks>
         /// 
@@ -345,7 +370,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultMenuSummary</returns>
         ApiResponse<RestApiArrayResultMenuSummary> GetMenusByAppIdWithHttpInfo (string appId);
         /// <summary>
-        /// [PRIVATE API]Get a Menus Checkpoints
+        /// Get a Menus Checkpoints
         /// </summary>
         /// <remarks>
         /// 
@@ -356,7 +381,7 @@ public interface IMenusApi : IApiAccessor
         RestApiArrayResultMenuCheckpoint GetMenusCheckpoints (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Get a Menus Checkpoints
+        /// Get a Menus Checkpoints
         /// </summary>
         /// <remarks>
         /// 
@@ -366,7 +391,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultMenuCheckpoint</returns>
         ApiResponse<RestApiArrayResultMenuCheckpoint> GetMenusCheckpointsWithHttpInfo (int? menuId);
         /// <summary>
-        /// [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
+        /// Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
         /// </summary>
         /// <remarks>
         /// 
@@ -378,7 +403,7 @@ public interface IMenusApi : IApiAccessor
         void MenusDeleteTaxRate (int? menuId, int? taxId);
 
         /// <summary>
-        /// [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
+        /// Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
         /// </summary>
         /// <remarks>
         /// 
@@ -389,30 +414,30 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> MenusDeleteTaxRateWithHttpInfo (int? menuId, int? taxId);
         /// <summary>
-        /// 
+        /// Get bulk show/hide menu items and option set items
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>RestApiArrayResultMenuElementListResponse</returns>
         RestApiArrayResultMenuElementListResponse MenusGetMenuBulkShowHide (int? menuId, bool? isAvailable);
 
         /// <summary>
-        /// 
+        /// Get bulk show/hide menu items and option set items
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>ApiResponse of RestApiArrayResultMenuElementListResponse</returns>
         ApiResponse<RestApiArrayResultMenuElementListResponse> MenusGetMenuBulkShowHideWithHttpInfo (int? menuId, bool? isAvailable);
         /// <summary>
-        /// [PRIVATE API]Set if tax shows for a Menu
+        /// Set if tax shows for a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -424,7 +449,7 @@ public interface IMenusApi : IApiAccessor
         void MenusSetDisplayOnMenuTax (int? menuId, bool? show);
 
         /// <summary>
-        /// [PRIVATE API]Set if tax shows for a Menu
+        /// Set if tax shows for a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -435,7 +460,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> MenusSetDisplayOnMenuTaxWithHttpInfo (int? menuId, bool? show);
         /// <summary>
-        /// [PRIVATE API]Re-arrange Sections within a Menu
+        /// Re-arrange Sections within a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -447,7 +472,7 @@ public interface IMenusApi : IApiAccessor
         void MenusSetItemDisplayOrders (int? menuId, MenuObjectDisplayOrders displayOrders);
 
         /// <summary>
-        /// [PRIVATE API]Re-arrange Sections within a Menu
+        /// Re-arrange Sections within a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -458,32 +483,32 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> MenusSetItemDisplayOrdersWithHttpInfo (int? menuId, MenuObjectDisplayOrders displayOrders);
         /// <summary>
-        /// 
+        /// Bulk show/hide menu items or option set items
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="menuElements"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="menuElements">Elements to be show/hide</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>RestApiArrayResultMenuElementEditResponse</returns>
         RestApiArrayResultMenuElementEditResponse MenusShowHideBulkItems (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable);
 
         /// <summary>
-        /// 
+        /// Bulk show/hide menu items or option set items
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="menuElements"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="menuElements">Elements to be show/hide</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>ApiResponse of RestApiArrayResultMenuElementEditResponse</returns>
         ApiResponse<RestApiArrayResultMenuElementEditResponse> MenusShowHideBulkItemsWithHttpInfo (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable);
         /// <summary>
-        /// [PRIVATE API]Set the type of Tax on a Menu
+        /// Set the type of Tax on a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -495,7 +520,7 @@ public interface IMenusApi : IApiAccessor
         void MenusUpdateTaxType (int? menuId, string type);
 
         /// <summary>
-        /// [PRIVATE API]Set the type of Tax on a Menu
+        /// Set the type of Tax on a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -506,30 +531,30 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> MenusUpdateTaxTypeWithHttpInfo (int? menuId, string type);
         /// <summary>
-        /// [PRIVATE API]Add/Update a Tax Rate
+        /// Add/Update a Tax Rate
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="taxRate">Tax Rate to Add/Update</param>
+        /// <param name="taxRate">Tax rate to add/update</param>
         /// <returns>MenuTaxRate</returns>
         MenuTaxRate MenusUpsertTaxRate (int? menuId, MenuTaxRate taxRate);
 
         /// <summary>
-        /// [PRIVATE API]Add/Update a Tax Rate
+        /// Add/Update a Tax Rate
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="taxRate">Tax Rate to Add/Update</param>
+        /// <param name="taxRate">Tax rate to add/update</param>
         /// <returns>ApiResponse of MenuTaxRate</returns>
         ApiResponse<MenuTaxRate> MenusUpsertTaxRateWithHttpInfo (int? menuId, MenuTaxRate taxRate);
         /// <summary>
-        /// [PRIVATE API]Restore a Menu to a checkpoint
+        /// Restore a Menu to a checkpoint
         /// </summary>
         /// <remarks>
         /// 
@@ -541,7 +566,7 @@ public interface IMenusApi : IApiAccessor
         void RestoreAMenuCheckpoint (int? menuId, int? checkpointId);
 
         /// <summary>
-        /// [PRIVATE API]Restore a Menu to a checkpoint
+        /// Restore a Menu to a checkpoint
         /// </summary>
         /// <remarks>
         /// 
@@ -606,7 +631,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> SetMenuItemOptionSetItemMetadataWithHttpInfo (int? menuId, int? storeId, int? optionSetItemId, Metadata metadata);
         /// <summary>
-        /// [PRIVATE API]Lock/Unlock a Menu for Editing
+        /// Lock/Unlock a Menu for Editing
         /// </summary>
         /// <remarks>
         /// 
@@ -618,7 +643,7 @@ public interface IMenusApi : IApiAccessor
         void SetMenuLock (int? menuId, bool? locked);
 
         /// <summary>
-        /// [PRIVATE API]Lock/Unlock a Menu for Editing
+        /// Lock/Unlock a Menu for Editing
         /// </summary>
         /// <remarks>
         /// 
@@ -629,7 +654,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> SetMenuLockWithHttpInfo (int? menuId, bool? locked);
         /// <summary>
-        /// [PRIVATE API]Set Menus Name
+        /// Set Menus Name
         /// </summary>
         /// <remarks>
         /// 
@@ -641,7 +666,7 @@ public interface IMenusApi : IApiAccessor
         void SetMenuName (int? menuId, string name);
 
         /// <summary>
-        /// [PRIVATE API]Set Menus Name
+        /// Set Menus Name
         /// </summary>
         /// <remarks>
         /// 
@@ -659,7 +684,7 @@ public interface IMenusApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="menu">Menu (delta)</param>
+        /// <param name="menu">Full menu data</param>
         /// <returns></returns>
         void UpdateMenu (int? menuId, MenuBase menu);
 
@@ -671,7 +696,7 @@ public interface IMenusApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="menu">Menu (delta)</param>
+        /// <param name="menu">Full menu data</param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateMenuWithHttpInfo (int? menuId, MenuBase menu);
         /// <summary>
@@ -723,7 +748,7 @@ public interface IMenusApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// [PRIVATE API]Clone a menu, (without attaching stores)
+        /// Clone a menu, (without attaching stores)
         /// </summary>
         /// <remarks>
         /// 
@@ -735,7 +760,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultMenu> CreateDraftMenuFromExistingMenuAsync (int? menuId, string newName);
 
         /// <summary>
-        /// [PRIVATE API]Clone a menu, (without attaching stores)
+        /// Clone a menu, (without attaching stores)
         /// </summary>
         /// <remarks>
         /// 
@@ -746,30 +771,55 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultMenu)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateDraftMenuFromExistingMenuAsyncWithHttpInfo (int? menuId, string newName);
         /// <summary>
-        /// Create a new menu. If request body is empty, the system will create a menu with default items.
+        /// Create a new menu asynchronously
         /// </summary>
         /// <remarks>
-        /// 
+        /// You must listen to the webhook menu.async_creation.completed to know when the menu is ready
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App identifier</param>
+        /// <param name="appId">App id</param>
         /// <param name="menu">Menu</param>
+        /// <param name="orgId">Org id (optional)</param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> CreateNewMenuAsyncAsync (string appId, CreateFullMenu menu, string orgId = null);
+
+        /// <summary>
+        /// Create a new menu asynchronously
+        /// </summary>
+        /// <remarks>
+        /// You must listen to the webhook menu.async_creation.completed to know when the menu is ready
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId">App id</param>
+        /// <param name="menu">Menu</param>
+        /// <param name="orgId">Org id (optional)</param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> CreateNewMenuAsyncAsyncWithHttpInfo (string appId, CreateFullMenu menu, string orgId = null);
+        /// <summary>
+        /// Create a new menu
+        /// </summary>
+        /// <remarks>
+        /// [DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId">App identifier</param>
+        /// <param name="menu">Menu. If empty the system will create a menu with default items</param>
         /// <returns>Task of int?</returns>
         System.Threading.Tasks.Task<int?> CreateNewMenuForAppAsync (string appId, CreateFullMenu menu);
 
         /// <summary>
-        /// Create a new menu. If request body is empty, the system will create a menu with default items.
+        /// Create a new menu
         /// </summary>
         /// <remarks>
-        /// 
+        /// [DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">App identifier</param>
-        /// <param name="menu">Menu</param>
+        /// <param name="menu">Menu. If empty the system will create a menu with default items</param>
         /// <returns>Task of ApiResponse (int?)</returns>
         System.Threading.Tasks.Task<ApiResponse<int?>> CreateNewMenuForAppAsyncWithHttpInfo (string appId, CreateFullMenu menu);
         /// <summary>
-        /// [PRIVATE API]Mark a Menu as Deleted
+        /// Mark a Menu as Deleted
         /// </summary>
         /// <remarks>
         /// 
@@ -780,7 +830,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task DeleteMenuAsync (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Mark a Menu as Deleted
+        /// Mark a Menu as Deleted
         /// </summary>
         /// <remarks>
         /// 
@@ -917,8 +967,8 @@ public interface IMenusApi : IApiAccessor
         /// <param name="storeId">Store identifier</param>
         /// <param name="menuItemId">Menu item identifier</param>
         /// <param name="key">Metadata key</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task GetMenuItemMetadataByKeyAsync (int? menuId, int? storeId, int? menuItemId, string key);
+        /// <returns>Task of RestApiResultMetadata</returns>
+        System.Threading.Tasks.Task<RestApiResultMetadata> GetMenuItemMetadataByKeyAsync (int? menuId, int? storeId, int? menuItemId, string key);
 
         /// <summary>
         /// Get menu item metadata by key
@@ -931,8 +981,8 @@ public interface IMenusApi : IApiAccessor
         /// <param name="storeId">Store identifier</param>
         /// <param name="menuItemId">Menu item identifier</param>
         /// <param name="key">Metadata key</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> GetMenuItemMetadataByKeyAsyncWithHttpInfo (int? menuId, int? storeId, int? menuItemId, string key);
+        /// <returns>Task of ApiResponse (RestApiResultMetadata)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultMetadata>> GetMenuItemMetadataByKeyAsyncWithHttpInfo (int? menuId, int? storeId, int? menuItemId, string key);
         /// <summary>
         /// Get menu item option set item metadata by key
         /// </summary>
@@ -959,28 +1009,28 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultMetadata)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultMetadata>> GetMenuItemOptionSetItemMetadataAsyncWithHttpInfo (int? menuId, int? storeId, int? optionSetItemId);
         /// <summary>
-        /// [PRIVATE API]Get Menus Name
+        /// Get Menus Name
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task GetMenuNameAsync (int? menuId);
+        /// <returns>Task of string</returns>
+        System.Threading.Tasks.Task<string> GetMenuNameAsync (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Get Menus Name
+        /// Get Menus Name
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> GetMenuNameAsyncWithHttpInfo (int? menuId);
+        /// <returns>Task of ApiResponse (string)</returns>
+        System.Threading.Tasks.Task<ApiResponse<string>> GetMenuNameAsyncWithHttpInfo (int? menuId);
         /// <summary>
-        /// [PRIVATE API]Get menus store names
+        /// Get menus store names
         /// </summary>
         /// <remarks>
         /// 
@@ -991,7 +1041,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultMenuStoreNames> GetMenuStoreNamesAsync (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Get menus store names
+        /// Get menus store names
         /// </summary>
         /// <remarks>
         /// 
@@ -1001,7 +1051,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuStoreNames)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuStoreNames>> GetMenuStoreNamesAsyncWithHttpInfo (int? menuId);
         /// <summary>
-        /// [PRIVATE API]Get menus tax details
+        /// Get menus tax details
         /// </summary>
         /// <remarks>
         /// 
@@ -1012,7 +1062,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultMenuTaxDetails> GetMenuTaxDetailsAsync (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Get menus tax details
+        /// Get menus tax details
         /// </summary>
         /// <remarks>
         /// 
@@ -1022,7 +1072,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuTaxDetails)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuTaxDetails>> GetMenuTaxDetailsAsyncWithHttpInfo (int? menuId);
         /// <summary>
-        /// [PRIVATE API]Get menus by appId
+        /// Get menus by appId
         /// </summary>
         /// <remarks>
         /// 
@@ -1033,7 +1083,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultMenuSummary> GetMenusByAppIdAsync (string appId);
 
         /// <summary>
-        /// [PRIVATE API]Get menus by appId
+        /// Get menus by appId
         /// </summary>
         /// <remarks>
         /// 
@@ -1043,7 +1093,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuSummary)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuSummary>> GetMenusByAppIdAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// [PRIVATE API]Get a Menus Checkpoints
+        /// Get a Menus Checkpoints
         /// </summary>
         /// <remarks>
         /// 
@@ -1054,7 +1104,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultMenuCheckpoint> GetMenusCheckpointsAsync (int? menuId);
 
         /// <summary>
-        /// [PRIVATE API]Get a Menus Checkpoints
+        /// Get a Menus Checkpoints
         /// </summary>
         /// <remarks>
         /// 
@@ -1064,7 +1114,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuCheckpoint)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuCheckpoint>> GetMenusCheckpointsAsyncWithHttpInfo (int? menuId);
         /// <summary>
-        /// [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
+        /// Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
         /// </summary>
         /// <remarks>
         /// 
@@ -1076,7 +1126,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task MenusDeleteTaxRateAsync (int? menuId, int? taxId);
 
         /// <summary>
-        /// [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
+        /// Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached
         /// </summary>
         /// <remarks>
         /// 
@@ -1087,30 +1137,30 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> MenusDeleteTaxRateAsyncWithHttpInfo (int? menuId, int? taxId);
         /// <summary>
-        /// 
+        /// Get bulk show/hide menu items and option set items
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>Task of RestApiArrayResultMenuElementListResponse</returns>
         System.Threading.Tasks.Task<RestApiArrayResultMenuElementListResponse> MenusGetMenuBulkShowHideAsync (int? menuId, bool? isAvailable);
 
         /// <summary>
-        /// 
+        /// Get bulk show/hide menu items and option set items
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuElementListResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuElementListResponse>> MenusGetMenuBulkShowHideAsyncWithHttpInfo (int? menuId, bool? isAvailable);
         /// <summary>
-        /// [PRIVATE API]Set if tax shows for a Menu
+        /// Set if tax shows for a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -1122,7 +1172,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task MenusSetDisplayOnMenuTaxAsync (int? menuId, bool? show);
 
         /// <summary>
-        /// [PRIVATE API]Set if tax shows for a Menu
+        /// Set if tax shows for a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -1133,7 +1183,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> MenusSetDisplayOnMenuTaxAsyncWithHttpInfo (int? menuId, bool? show);
         /// <summary>
-        /// [PRIVATE API]Re-arrange Sections within a Menu
+        /// Re-arrange Sections within a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -1145,7 +1195,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task MenusSetItemDisplayOrdersAsync (int? menuId, MenuObjectDisplayOrders displayOrders);
 
         /// <summary>
-        /// [PRIVATE API]Re-arrange Sections within a Menu
+        /// Re-arrange Sections within a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -1156,32 +1206,32 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> MenusSetItemDisplayOrdersAsyncWithHttpInfo (int? menuId, MenuObjectDisplayOrders displayOrders);
         /// <summary>
-        /// 
+        /// Bulk show/hide menu items or option set items
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="menuElements"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="menuElements">Elements to be show/hide</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>Task of RestApiArrayResultMenuElementEditResponse</returns>
         System.Threading.Tasks.Task<RestApiArrayResultMenuElementEditResponse> MenusShowHideBulkItemsAsync (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable);
 
         /// <summary>
-        /// 
+        /// Bulk show/hide menu items or option set items
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="menuElements"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="menuElements">Elements to be show/hide</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuElementEditResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuElementEditResponse>> MenusShowHideBulkItemsAsyncWithHttpInfo (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable);
         /// <summary>
-        /// [PRIVATE API]Set the type of Tax on a Menu
+        /// Set the type of Tax on a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -1193,7 +1243,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task MenusUpdateTaxTypeAsync (int? menuId, string type);
 
         /// <summary>
-        /// [PRIVATE API]Set the type of Tax on a Menu
+        /// Set the type of Tax on a Menu
         /// </summary>
         /// <remarks>
         /// 
@@ -1204,30 +1254,30 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> MenusUpdateTaxTypeAsyncWithHttpInfo (int? menuId, string type);
         /// <summary>
-        /// [PRIVATE API]Add/Update a Tax Rate
+        /// Add/Update a Tax Rate
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="taxRate">Tax Rate to Add/Update</param>
+        /// <param name="taxRate">Tax rate to add/update</param>
         /// <returns>Task of MenuTaxRate</returns>
         System.Threading.Tasks.Task<MenuTaxRate> MenusUpsertTaxRateAsync (int? menuId, MenuTaxRate taxRate);
 
         /// <summary>
-        /// [PRIVATE API]Add/Update a Tax Rate
+        /// Add/Update a Tax Rate
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="taxRate">Tax Rate to Add/Update</param>
+        /// <param name="taxRate">Tax rate to add/update</param>
         /// <returns>Task of ApiResponse (MenuTaxRate)</returns>
         System.Threading.Tasks.Task<ApiResponse<MenuTaxRate>> MenusUpsertTaxRateAsyncWithHttpInfo (int? menuId, MenuTaxRate taxRate);
         /// <summary>
-        /// [PRIVATE API]Restore a Menu to a checkpoint
+        /// Restore a Menu to a checkpoint
         /// </summary>
         /// <remarks>
         /// 
@@ -1239,7 +1289,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task RestoreAMenuCheckpointAsync (int? menuId, int? checkpointId);
 
         /// <summary>
-        /// [PRIVATE API]Restore a Menu to a checkpoint
+        /// Restore a Menu to a checkpoint
         /// </summary>
         /// <remarks>
         /// 
@@ -1304,7 +1354,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuItemOptionSetItemMetadataAsyncWithHttpInfo (int? menuId, int? storeId, int? optionSetItemId, Metadata metadata);
         /// <summary>
-        /// [PRIVATE API]Lock/Unlock a Menu for Editing
+        /// Lock/Unlock a Menu for Editing
         /// </summary>
         /// <remarks>
         /// 
@@ -1316,7 +1366,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task SetMenuLockAsync (int? menuId, bool? locked);
 
         /// <summary>
-        /// [PRIVATE API]Lock/Unlock a Menu for Editing
+        /// Lock/Unlock a Menu for Editing
         /// </summary>
         /// <remarks>
         /// 
@@ -1327,7 +1377,7 @@ public interface IMenusApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuLockAsyncWithHttpInfo (int? menuId, bool? locked);
         /// <summary>
-        /// [PRIVATE API]Set Menus Name
+        /// Set Menus Name
         /// </summary>
         /// <remarks>
         /// 
@@ -1339,7 +1389,7 @@ public interface IMenusApi : IApiAccessor
         System.Threading.Tasks.Task SetMenuNameAsync (int? menuId, string name);
 
         /// <summary>
-        /// [PRIVATE API]Set Menus Name
+        /// Set Menus Name
         /// </summary>
         /// <remarks>
         /// 
@@ -1357,7 +1407,7 @@ public interface IMenusApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="menu">Menu (delta)</param>
+        /// <param name="menu">Full menu data</param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateMenuAsync (int? menuId, MenuBase menu);
 
@@ -1369,7 +1419,7 @@ public interface IMenusApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="menu">Menu (delta)</param>
+        /// <param name="menu">Full menu data</param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuAsyncWithHttpInfo (int? menuId, MenuBase menu);
         /// <summary>
@@ -1519,7 +1569,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// [PRIVATE API]Clone a menu, (without attaching stores) 
+        /// Clone a menu, (without attaching stores) 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1532,7 +1582,7 @@ public RestApiResultMenu CreateDraftMenuFromExistingMenu (int? menuId, string ne
         }
 
         /// <summary>
-        /// [PRIVATE API]Clone a menu, (without attaching stores) 
+        /// Clone a menu, (without attaching stores) 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1547,7 +1597,7 @@ public ApiResponse< RestApiResultMenu > CreateDraftMenuFromExistingMenuWithHttpI
             if (newName == null)
                 throw new ApiException(400, "Missing required parameter 'newName' when calling MenusApi->CreateDraftMenuFromExistingMenu");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/clone/{newName}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/clone/{newName}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1595,12 +1645,12 @@ public ApiResponse< RestApiResultMenu > CreateDraftMenuFromExistingMenuWithHttpI
             }
 
             return new ApiResponse<RestApiResultMenu>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenu) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenu)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Clone a menu, (without attaching stores) 
+        /// Clone a menu, (without attaching stores) 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1614,7 +1664,7 @@ public async System.Threading.Tasks.Task<RestApiResultMenu> CreateDraftMenuFromE
         }
 
         /// <summary>
-        /// [PRIVATE API]Clone a menu, (without attaching stores) 
+        /// Clone a menu, (without attaching stores) 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -1629,7 +1679,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateD
             if (newName == null)
                 throw new ApiException(400, "Missing required parameter 'newName' when calling MenusApi->CreateDraftMenuFromExistingMenu");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/clone/{newName}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/clone/{newName}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1677,16 +1727,209 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateD
             }
 
             return new ApiResponse<RestApiResultMenu>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenu) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenu)));
         }
 
         /// <summary>
-        /// Create a new menu. If request body is empty, the system will create a menu with default items. 
+        /// Create a new menu asynchronously You must listen to the webhook menu.async_creation.completed to know when the menu is ready
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App identifier</param>
+        /// <param name="appId">App id</param>
+        /// <param name="menu">Menu</param>
+        /// <param name="orgId">Org id (optional)</param>
+        /// <returns>Object</returns>
+        public Object CreateNewMenuAsync (string appId, CreateFullMenu menu, string orgId = null)
+        {
+             ApiResponse<Object> localVarResponse = CreateNewMenuAsyncWithHttpInfo(appId, menu, orgId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Create a new menu asynchronously You must listen to the webhook menu.async_creation.completed to know when the menu is ready
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId">App id</param>
         /// <param name="menu">Menu</param>
+        /// <param name="orgId">Org id (optional)</param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > CreateNewMenuAsyncWithHttpInfo (string appId, CreateFullMenu menu, string orgId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusApi->CreateNewMenuAsync");
+            // verify the required parameter 'menu' is set
+            if (menu == null)
+                throw new ApiException(400, "Missing required parameter 'menu' when calling MenusApi->CreateNewMenuAsync");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/async";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (orgId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orgId", orgId)); // query parameter
+            if (menu != null && menu.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(menu); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = menu; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateNewMenuAsync", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        /// Create a new menu asynchronously You must listen to the webhook menu.async_creation.completed to know when the menu is ready
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId">App id</param>
+        /// <param name="menu">Menu</param>
+        /// <param name="orgId">Org id (optional)</param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> CreateNewMenuAsyncAsync (string appId, CreateFullMenu menu, string orgId = null)
+        {
+             ApiResponse<Object> localVarResponse = await CreateNewMenuAsyncAsyncWithHttpInfo(appId, menu, orgId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Create a new menu asynchronously You must listen to the webhook menu.async_creation.completed to know when the menu is ready
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId">App id</param>
+        /// <param name="menu">Menu</param>
+        /// <param name="orgId">Org id (optional)</param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateNewMenuAsyncAsyncWithHttpInfo (string appId, CreateFullMenu menu, string orgId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusApi->CreateNewMenuAsync");
+            // verify the required parameter 'menu' is set
+            if (menu == null)
+                throw new ApiException(400, "Missing required parameter 'menu' when calling MenusApi->CreateNewMenuAsync");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/async";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (orgId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orgId", orgId)); // query parameter
+            if (menu != null && menu.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(menu); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = menu; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateNewMenuAsync", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        /// Create a new menu [DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId">App identifier</param>
+        /// <param name="menu">Menu. If empty the system will create a menu with default items</param>
         /// <returns>int?</returns>
         public int? CreateNewMenuForApp (string appId, CreateFullMenu menu)
         {
@@ -1695,11 +1938,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateD
         }
 
         /// <summary>
-        /// Create a new menu. If request body is empty, the system will create a menu with default items. 
+        /// Create a new menu [DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">App identifier</param>
-        /// <param name="menu">Menu</param>
+        /// <param name="menu">Menu. If empty the system will create a menu with default items</param>
         /// <returns>ApiResponse of int?</returns>
         public ApiResponse< int? > CreateNewMenuForAppWithHttpInfo (string appId, CreateFullMenu menu)
         {
@@ -1710,7 +1953,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateD
             if (menu == null)
                 throw new ApiException(400, "Missing required parameter 'menu' when calling MenusApi->CreateNewMenuForApp");
 
-            var localVarPath = "/api/v1.0/{appId}/menus";
+            var localVarPath = "./api/v1.0/{appId}/menus";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1770,16 +2013,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateD
             }
 
             return new ApiResponse<int?>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (int?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(int?)));
         }
 
         /// <summary>
-        /// Create a new menu. If request body is empty, the system will create a menu with default items. 
+        /// Create a new menu [DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">App identifier</param>
-        /// <param name="menu">Menu</param>
+        /// <param name="menu">Menu. If empty the system will create a menu with default items</param>
         /// <returns>Task of int?</returns>
         public async System.Threading.Tasks.Task<int?> CreateNewMenuForAppAsync (string appId, CreateFullMenu menu)
         {
@@ -1789,11 +2032,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateD
         }
 
         /// <summary>
-        /// Create a new menu. If request body is empty, the system will create a menu with default items. 
+        /// Create a new menu [DEPRECATED] - Please use the async version as this endpoint may timeout for large menus
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">App identifier</param>
-        /// <param name="menu">Menu</param>
+        /// <param name="menu">Menu. If empty the system will create a menu with default items</param>
         /// <returns>Task of ApiResponse (int?)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<int?>> CreateNewMenuForAppAsyncWithHttpInfo (string appId, CreateFullMenu menu)
         {
@@ -1804,7 +2047,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateD
             if (menu == null)
                 throw new ApiException(400, "Missing required parameter 'menu' when calling MenusApi->CreateNewMenuForApp");
 
-            var localVarPath = "/api/v1.0/{appId}/menus";
+            var localVarPath = "./api/v1.0/{appId}/menus";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1864,12 +2107,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> CreateD
             }
 
             return new ApiResponse<int?>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (int?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(int?)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Mark a Menu as Deleted 
+        /// Mark a Menu as Deleted 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu Identifier</param>
@@ -1880,7 +2123,7 @@ public void DeleteMenu (int? menuId)
         }
 
         /// <summary>
-        /// [PRIVATE API]Mark a Menu as Deleted 
+        /// Mark a Menu as Deleted 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu Identifier</param>
@@ -1891,7 +2134,7 @@ public ApiResponse<Object> DeleteMenuWithHttpInfo (int? menuId)
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->DeleteMenu");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1938,12 +2181,12 @@ public ApiResponse<Object> DeleteMenuWithHttpInfo (int? menuId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Mark a Menu as Deleted 
+        /// Mark a Menu as Deleted 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu Identifier</param>
@@ -1955,7 +2198,7 @@ public async System.Threading.Tasks.Task DeleteMenuAsync (int? menuId)
         }
 
         /// <summary>
-        /// [PRIVATE API]Mark a Menu as Deleted 
+        /// Mark a Menu as Deleted 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu Identifier</param>
@@ -1966,7 +2209,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuAsyncWit
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->DeleteMenu");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2013,7 +2256,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuAsyncWit
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2040,7 +2283,7 @@ public ApiResponse<Object> DeleteMenuImageWithHttpInfo (int? menuId)
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->DeleteMenuImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2087,7 +2330,7 @@ public ApiResponse<Object> DeleteMenuImageWithHttpInfo (int? menuId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2115,7 +2358,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuImageAsy
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->DeleteMenuImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2162,7 +2405,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuImageAsy
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2204,7 +2447,7 @@ public ApiResponse<Object> DeleteMenuItemMetadataWithHttpInfo (int? menuId, int?
             if (key == null)
                 throw new ApiException(400, "Missing required parameter 'key' when calling MenusApi->DeleteMenuItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2254,7 +2497,7 @@ public ApiResponse<Object> DeleteMenuItemMetadataWithHttpInfo (int? menuId, int?
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2297,7 +2540,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuItemMeta
             if (key == null)
                 throw new ApiException(400, "Missing required parameter 'key' when calling MenusApi->DeleteMenuItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2347,7 +2590,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuItemMeta
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -2380,7 +2623,7 @@ public ApiResponse< RestApiArrayResultAllMetadataResult > GetAllMenuMetadataByMe
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling MenusApi->GetAllMenuMetadataByMenuIdAndStoreId");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2428,7 +2671,7 @@ public ApiResponse< RestApiArrayResultAllMetadataResult > GetAllMenuMetadataByMe
             }
 
             return new ApiResponse<RestApiArrayResultAllMetadataResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultAllMetadataResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAllMetadataResult)));
         }
 
@@ -2462,7 +2705,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAllMetada
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling MenusApi->GetAllMenuMetadataByMenuIdAndStoreId");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2510,7 +2753,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAllMetada
             }
 
             return new ApiResponse<RestApiArrayResultAllMetadataResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultAllMetadataResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAllMetadataResult)));
         }
 
@@ -2538,7 +2781,7 @@ public ApiResponse< RestApiResultMenu > GetMenuByIdWithHttpInfo (int? menuId)
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenuById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2585,7 +2828,7 @@ public ApiResponse< RestApiResultMenu > GetMenuByIdWithHttpInfo (int? menuId)
             }
 
             return new ApiResponse<RestApiResultMenu>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenu) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenu)));
         }
 
@@ -2614,7 +2857,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> GetMenu
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenuById");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2661,7 +2904,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenu>> GetMenu
             }
 
             return new ApiResponse<RestApiResultMenu>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMenu) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenu)));
         }
 
@@ -2699,7 +2942,7 @@ public ApiResponse< RestApiArrayResultMetadata > GetMenuItemMetadataWithHttpInfo
             if (menuItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemId' when calling MenusApi->GetMenuItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2748,7 +2991,7 @@ public ApiResponse< RestApiArrayResultMetadata > GetMenuItemMetadataWithHttpInfo
             }
 
             return new ApiResponse<RestApiArrayResultMetadata>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMetadata) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMetadata)));
         }
 
@@ -2787,7 +3030,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMetadata>
             if (menuItemId == null)
                 throw new ApiException(400, "Missing required parameter 'menuItemId' when calling MenusApi->GetMenuItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2836,7 +3079,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMetadata>
             }
 
             return new ApiResponse<RestApiArrayResultMetadata>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMetadata) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMetadata)));
         }
 
@@ -2848,10 +3091,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMetadata>
         /// <param name="storeId">Store identifier</param>
         /// <param name="menuItemId">Menu item identifier</param>
         /// <param name="key">Metadata key</param>
-        /// <returns></returns>
-        public void GetMenuItemMetadataByKey (int? menuId, int? storeId, int? menuItemId, string key)
+        /// <returns>RestApiResultMetadata</returns>
+        public RestApiResultMetadata GetMenuItemMetadataByKey (int? menuId, int? storeId, int? menuItemId, string key)
         {
-             GetMenuItemMetadataByKeyWithHttpInfo(menuId, storeId, menuItemId, key);
+             ApiResponse<RestApiResultMetadata> localVarResponse = GetMenuItemMetadataByKeyWithHttpInfo(menuId, storeId, menuItemId, key);
+             return localVarResponse.Data;
         }
 
         /// <summary>
@@ -2862,8 +3106,8 @@ public void GetMenuItemMetadataByKey (int? menuId, int? storeId, int? menuItemId
         /// <param name="storeId">Store identifier</param>
         /// <param name="menuItemId">Menu item identifier</param>
         /// <param name="key">Metadata key</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> GetMenuItemMetadataByKeyWithHttpInfo (int? menuId, int? storeId, int? menuItemId, string key)
+        /// <returns>ApiResponse of RestApiResultMetadata</returns>
+        public ApiResponse< RestApiResultMetadata > GetMenuItemMetadataByKeyWithHttpInfo (int? menuId, int? storeId, int? menuItemId, string key)
         {
             // verify the required parameter 'menuId' is set
             if (menuId == null)
@@ -2878,7 +3122,7 @@ public ApiResponse<Object> GetMenuItemMetadataByKeyWithHttpInfo (int? menuId, in
             if (key == null)
                 throw new ApiException(400, "Missing required parameter 'key' when calling MenusApi->GetMenuItemMetadataByKey");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2927,9 +3171,9 @@ public ApiResponse<Object> GetMenuItemMetadataByKeyWithHttpInfo (int? menuId, in
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+            return new ApiResponse<RestApiResultMetadata>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMetadata) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetadata)));
         }
 
         /// <summary>
@@ -2940,10 +3184,11 @@ public ApiResponse<Object> GetMenuItemMetadataByKeyWithHttpInfo (int? menuId, in
         /// <param name="storeId">Store identifier</param>
         /// <param name="menuItemId">Menu item identifier</param>
         /// <param name="key">Metadata key</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task GetMenuItemMetadataByKeyAsync (int? menuId, int? storeId, int? menuItemId, string key)
+        /// <returns>Task of RestApiResultMetadata</returns>
+        public async System.Threading.Tasks.Task<RestApiResultMetadata> GetMenuItemMetadataByKeyAsync (int? menuId, int? storeId, int? menuItemId, string key)
         {
-             await GetMenuItemMetadataByKeyAsyncWithHttpInfo(menuId, storeId, menuItemId, key);
+             ApiResponse<RestApiResultMetadata> localVarResponse = await GetMenuItemMetadataByKeyAsyncWithHttpInfo(menuId, storeId, menuItemId, key);
+             return localVarResponse.Data;
 
         }
 
@@ -2955,8 +3200,8 @@ public async System.Threading.Tasks.Task GetMenuItemMetadataByKeyAsync (int? men
         /// <param name="storeId">Store identifier</param>
         /// <param name="menuItemId">Menu item identifier</param>
         /// <param name="key">Metadata key</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> GetMenuItemMetadataByKeyAsyncWithHttpInfo (int? menuId, int? storeId, int? menuItemId, string key)
+        /// <returns>Task of ApiResponse (RestApiResultMetadata)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetadata>> GetMenuItemMetadataByKeyAsyncWithHttpInfo (int? menuId, int? storeId, int? menuItemId, string key)
         {
             // verify the required parameter 'menuId' is set
             if (menuId == null)
@@ -2971,7 +3216,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> GetMenuItemMetadat
             if (key == null)
                 throw new ApiException(400, "Missing required parameter 'key' when calling MenusApi->GetMenuItemMetadataByKey");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/{key}/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3020,9 +3265,9 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> GetMenuItemMetadat
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+            return new ApiResponse<RestApiResultMetadata>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMetadata) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetadata)));
         }
 
         /// <summary>
@@ -3059,7 +3304,7 @@ public ApiResponse< RestApiResultMetadata > GetMenuItemOptionSetItemMetadataWith
             if (optionSetItemId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetItemId' when calling MenusApi->GetMenuItemOptionSetItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3108,7 +3353,7 @@ public ApiResponse< RestApiResultMetadata > GetMenuItemOptionSetItemMetadataWith
             }
 
             return new ApiResponse<RestApiResultMetadata>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMetadata) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetadata)));
         }
 
@@ -3147,7 +3392,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetadata>> Get
             if (optionSetItemId == null)
                 throw new ApiException(400, "Missing required parameter 'optionSetItemId' when calling MenusApi->GetMenuItemOptionSetItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3196,34 +3441,35 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetadata>> Get
             }
 
             return new ApiResponse<RestApiResultMetadata>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMetadata) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetadata)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get Menus Name 
+        /// Get Menus Name 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <returns></returns>
-        public void GetMenuName (int? menuId)
+        /// <returns>string</returns>
+        public string GetMenuName (int? menuId)
         {
-             GetMenuNameWithHttpInfo(menuId);
+             ApiResponse<string> localVarResponse = GetMenuNameWithHttpInfo(menuId);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API]Get Menus Name 
+        /// Get Menus Name 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> GetMenuNameWithHttpInfo (int? menuId)
+        /// <returns>ApiResponse of string</returns>
+        public ApiResponse< string > GetMenuNameWithHttpInfo (int? menuId)
         {
             // verify the required parameter 'menuId' is set
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenuName");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/name";
+            var localVarPath = "./api/v1.0/menus/{menuId}/name";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3269,36 +3515,37 @@ public ApiResponse<Object> GetMenuNameWithHttpInfo (int? menuId)
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get Menus Name 
+        /// Get Menus Name 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task GetMenuNameAsync (int? menuId)
+        /// <returns>Task of string</returns>
+        public async System.Threading.Tasks.Task<string> GetMenuNameAsync (int? menuId)
         {
-             await GetMenuNameAsyncWithHttpInfo(menuId);
+             ApiResponse<string> localVarResponse = await GetMenuNameAsyncWithHttpInfo(menuId);
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE API]Get Menus Name 
+        /// Get Menus Name 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> GetMenuNameAsyncWithHttpInfo (int? menuId)
+        /// <returns>Task of ApiResponse (string)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<string>> GetMenuNameAsyncWithHttpInfo (int? menuId)
         {
             // verify the required parameter 'menuId' is set
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenuName");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/name";
+            var localVarPath = "./api/v1.0/menus/{menuId}/name";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3344,13 +3591,13 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> GetMenuNameAsyncWi
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus store names 
+        /// Get menus store names 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3362,7 +3609,7 @@ public RestApiArrayResultMenuStoreNames GetMenuStoreNames (int? menuId)
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus store names 
+        /// Get menus store names 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3373,7 +3620,7 @@ public ApiResponse< RestApiArrayResultMenuStoreNames > GetMenuStoreNamesWithHttp
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenuStoreNames");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/stores";
+            var localVarPath = "./api/v1.0/menus/{menuId}/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3420,12 +3667,12 @@ public ApiResponse< RestApiArrayResultMenuStoreNames > GetMenuStoreNamesWithHttp
             }
 
             return new ApiResponse<RestApiArrayResultMenuStoreNames>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuStoreNames) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuStoreNames)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus store names 
+        /// Get menus store names 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3438,7 +3685,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultMenuStoreNames> GetMe
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus store names 
+        /// Get menus store names 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3449,7 +3696,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuStore
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenuStoreNames");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/stores";
+            var localVarPath = "./api/v1.0/menus/{menuId}/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3496,12 +3743,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuStore
             }
 
             return new ApiResponse<RestApiArrayResultMenuStoreNames>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuStoreNames) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuStoreNames)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus tax details 
+        /// Get menus tax details 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3513,7 +3760,7 @@ public RestApiArrayResultMenuTaxDetails GetMenuTaxDetails (int? menuId)
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus tax details 
+        /// Get menus tax details 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3524,7 +3771,7 @@ public ApiResponse< RestApiArrayResultMenuTaxDetails > GetMenuTaxDetailsWithHttp
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenuTaxDetails");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/tax";
+            var localVarPath = "./api/v1.0/menus/{menuId}/tax";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3571,12 +3818,12 @@ public ApiResponse< RestApiArrayResultMenuTaxDetails > GetMenuTaxDetailsWithHttp
             }
 
             return new ApiResponse<RestApiArrayResultMenuTaxDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuTaxDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuTaxDetails)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus tax details 
+        /// Get menus tax details 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3589,7 +3836,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultMenuTaxDetails> GetMe
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus tax details 
+        /// Get menus tax details 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3600,7 +3847,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuTaxDe
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenuTaxDetails");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/tax";
+            var localVarPath = "./api/v1.0/menus/{menuId}/tax";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3647,12 +3894,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuTaxDe
             }
 
             return new ApiResponse<RestApiArrayResultMenuTaxDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuTaxDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuTaxDetails)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus by appId 
+        /// Get menus by appId 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">Get Menus for this appId</param>
@@ -3664,7 +3911,7 @@ public RestApiArrayResultMenuSummary GetMenusByAppId (string appId)
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus by appId 
+        /// Get menus by appId 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">Get Menus for this appId</param>
@@ -3675,7 +3922,7 @@ public ApiResponse< RestApiArrayResultMenuSummary > GetMenusByAppIdWithHttpInfo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MenusApi->GetMenusByAppId");
 
-            var localVarPath = "/api/v1.0/{appId}/menus";
+            var localVarPath = "./api/v1.0/{appId}/menus";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3722,12 +3969,12 @@ public ApiResponse< RestApiArrayResultMenuSummary > GetMenusByAppIdWithHttpInfo
             }
 
             return new ApiResponse<RestApiArrayResultMenuSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuSummary)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus by appId 
+        /// Get menus by appId 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">Get Menus for this appId</param>
@@ -3740,7 +3987,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultMenuSummary> GetMenus
         }
 
         /// <summary>
-        /// [PRIVATE API]Get menus by appId 
+        /// Get menus by appId 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId">Get Menus for this appId</param>
@@ -3751,7 +3998,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuSumma
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MenusApi->GetMenusByAppId");
 
-            var localVarPath = "/api/v1.0/{appId}/menus";
+            var localVarPath = "./api/v1.0/{appId}/menus";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3798,12 +4045,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuSumma
             }
 
             return new ApiResponse<RestApiArrayResultMenuSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuSummary)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get a Menus Checkpoints 
+        /// Get a Menus Checkpoints 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3815,7 +4062,7 @@ public RestApiArrayResultMenuCheckpoint GetMenusCheckpoints (int? menuId)
         }
 
         /// <summary>
-        /// [PRIVATE API]Get a Menus Checkpoints 
+        /// Get a Menus Checkpoints 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3826,7 +4073,7 @@ public ApiResponse< RestApiArrayResultMenuCheckpoint > GetMenusCheckpointsWithHt
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenusCheckpoints");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/checkpoints";
+            var localVarPath = "./api/v1.0/menus/{menuId}/checkpoints";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3873,12 +4120,12 @@ public ApiResponse< RestApiArrayResultMenuCheckpoint > GetMenusCheckpointsWithHt
             }
 
             return new ApiResponse<RestApiArrayResultMenuCheckpoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuCheckpoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuCheckpoint)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Get a Menus Checkpoints 
+        /// Get a Menus Checkpoints 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3891,7 +4138,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultMenuCheckpoint> GetMe
         }
 
         /// <summary>
-        /// [PRIVATE API]Get a Menus Checkpoints 
+        /// Get a Menus Checkpoints 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3902,7 +4149,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuCheck
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusApi->GetMenusCheckpoints");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/checkpoints";
+            var localVarPath = "./api/v1.0/menus/{menuId}/checkpoints";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3949,12 +4196,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuCheck
             }
 
             return new ApiResponse<RestApiArrayResultMenuCheckpoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuCheckpoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuCheckpoint)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached 
+        /// Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3966,7 +4213,7 @@ public void MenusDeleteTaxRate (int? menuId, int? taxId)
         }
 
         /// <summary>
-        /// [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached 
+        /// Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -3981,7 +4228,7 @@ public ApiResponse<Object> MenusDeleteTaxRateWithHttpInfo (int? menuId, int? tax
             if (taxId == null)
                 throw new ApiException(400, "Missing required parameter 'taxId' when calling MenusApi->MenusDeleteTaxRate");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/tax/{taxId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/tax/{taxId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4029,12 +4276,12 @@ public ApiResponse<Object> MenusDeleteTaxRateWithHttpInfo (int? menuId, int? tax
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached 
+        /// Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4047,7 +4294,7 @@ public async System.Threading.Tasks.Task MenusDeleteTaxRateAsync (int? menuId, i
         }
 
         /// <summary>
-        /// [PRIVATE API]Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached 
+        /// Remove a Menus Tax Rate, can only remove a tax rate that does not have items/optionSetItems attached 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4062,7 +4309,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenusDeleteTaxRate
             if (taxId == null)
                 throw new ApiException(400, "Missing required parameter 'taxId' when calling MenusApi->MenusDeleteTaxRate");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/tax/{taxId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/tax/{taxId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4110,16 +4357,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenusDeleteTaxRate
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        ///  
+        /// Get bulk show/hide menu items and option set items 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>RestApiArrayResultMenuElementListResponse</returns>
         public RestApiArrayResultMenuElementListResponse MenusGetMenuBulkShowHide (int? menuId, bool? isAvailable)
         {
@@ -4128,11 +4375,11 @@ public RestApiArrayResultMenuElementListResponse MenusGetMenuBulkShowHide (int?
         }
 
         /// <summary>
-        ///  
+        /// Get bulk show/hide menu items and option set items 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>ApiResponse of RestApiArrayResultMenuElementListResponse</returns>
         public ApiResponse< RestApiArrayResultMenuElementListResponse > MenusGetMenuBulkShowHideWithHttpInfo (int? menuId, bool? isAvailable)
         {
@@ -4143,7 +4390,7 @@ public ApiResponse< RestApiArrayResultMenuElementListResponse > MenusGetMenuBulk
             if (isAvailable == null)
                 throw new ApiException(400, "Missing required parameter 'isAvailable' when calling MenusApi->MenusGetMenuBulkShowHide");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/bulkshowhide/list";
+            var localVarPath = "./api/v1.0/menus/{menuId}/bulkshowhide/list";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4191,16 +4438,16 @@ public ApiResponse< RestApiArrayResultMenuElementListResponse > MenusGetMenuBulk
             }
 
             return new ApiResponse<RestApiArrayResultMenuElementListResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuElementListResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuElementListResponse)));
         }
 
         /// <summary>
-        ///  
+        /// Get bulk show/hide menu items and option set items 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>Task of RestApiArrayResultMenuElementListResponse</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultMenuElementListResponse> MenusGetMenuBulkShowHideAsync (int? menuId, bool? isAvailable)
         {
@@ -4210,11 +4457,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultMenuElementListRespon
         }
 
         /// <summary>
-        ///  
+        /// Get bulk show/hide menu items and option set items 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuElementListResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuElementListResponse>> MenusGetMenuBulkShowHideAsyncWithHttpInfo (int? menuId, bool? isAvailable)
         {
@@ -4225,7 +4472,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuEleme
             if (isAvailable == null)
                 throw new ApiException(400, "Missing required parameter 'isAvailable' when calling MenusApi->MenusGetMenuBulkShowHide");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/bulkshowhide/list";
+            var localVarPath = "./api/v1.0/menus/{menuId}/bulkshowhide/list";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4273,12 +4520,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuEleme
             }
 
             return new ApiResponse<RestApiArrayResultMenuElementListResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuElementListResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuElementListResponse)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Set if tax shows for a Menu 
+        /// Set if tax shows for a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4290,7 +4537,7 @@ public void MenusSetDisplayOnMenuTax (int? menuId, bool? show)
         }
 
         /// <summary>
-        /// [PRIVATE API]Set if tax shows for a Menu 
+        /// Set if tax shows for a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4305,7 +4552,7 @@ public ApiResponse<Object> MenusSetDisplayOnMenuTaxWithHttpInfo (int? menuId, bo
             if (show == null)
                 throw new ApiException(400, "Missing required parameter 'show' when calling MenusApi->MenusSetDisplayOnMenuTax");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/tax/show/{show}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/tax/show/{show}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4353,12 +4600,12 @@ public ApiResponse<Object> MenusSetDisplayOnMenuTaxWithHttpInfo (int? menuId, bo
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Set if tax shows for a Menu 
+        /// Set if tax shows for a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4371,7 +4618,7 @@ public async System.Threading.Tasks.Task MenusSetDisplayOnMenuTaxAsync (int? men
         }
 
         /// <summary>
-        /// [PRIVATE API]Set if tax shows for a Menu 
+        /// Set if tax shows for a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4386,7 +4633,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenusSetDisplayOnM
             if (show == null)
                 throw new ApiException(400, "Missing required parameter 'show' when calling MenusApi->MenusSetDisplayOnMenuTax");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/tax/show/{show}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/tax/show/{show}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4434,12 +4681,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenusSetDisplayOnM
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Re-arrange Sections within a Menu 
+        /// Re-arrange Sections within a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4451,7 +4698,7 @@ public void MenusSetItemDisplayOrders (int? menuId, MenuObjectDisplayOrders disp
         }
 
         /// <summary>
-        /// [PRIVATE API]Re-arrange Sections within a Menu 
+        /// Re-arrange Sections within a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4466,7 +4713,7 @@ public ApiResponse<Object> MenusSetItemDisplayOrdersWithHttpInfo (int? menuId, M
             if (displayOrders == null)
                 throw new ApiException(400, "Missing required parameter 'displayOrders' when calling MenusApi->MenusSetItemDisplayOrders");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sectiondisplayorders";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sectiondisplayorders";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4526,12 +4773,12 @@ public ApiResponse<Object> MenusSetItemDisplayOrdersWithHttpInfo (int? menuId, M
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Re-arrange Sections within a Menu 
+        /// Re-arrange Sections within a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4544,7 +4791,7 @@ public async System.Threading.Tasks.Task MenusSetItemDisplayOrdersAsync (int? me
         }
 
         /// <summary>
-        /// [PRIVATE API]Re-arrange Sections within a Menu 
+        /// Re-arrange Sections within a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4559,7 +4806,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenusSetItemDispla
             if (displayOrders == null)
                 throw new ApiException(400, "Missing required parameter 'displayOrders' when calling MenusApi->MenusSetItemDisplayOrders");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/sectiondisplayorders";
+            var localVarPath = "./api/v1.0/menus/{menuId}/sectiondisplayorders";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4619,17 +4866,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenusSetItemDispla
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        ///  
+        /// Bulk show/hide menu items or option set items 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="menuElements"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="menuElements">Elements to be show/hide</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>RestApiArrayResultMenuElementEditResponse</returns>
         public RestApiArrayResultMenuElementEditResponse MenusShowHideBulkItems (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable)
         {
@@ -4638,12 +4885,12 @@ public RestApiArrayResultMenuElementEditResponse MenusShowHideBulkItems (int? me
         }
 
         /// <summary>
-        ///  
+        /// Bulk show/hide menu items or option set items 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="menuElements"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="menuElements">Elements to be show/hide</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>ApiResponse of RestApiArrayResultMenuElementEditResponse</returns>
         public ApiResponse< RestApiArrayResultMenuElementEditResponse > MenusShowHideBulkItemsWithHttpInfo (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable)
         {
@@ -4657,7 +4904,7 @@ public ApiResponse< RestApiArrayResultMenuElementEditResponse > MenusShowHideBul
             if (isAvailable == null)
                 throw new ApiException(400, "Missing required parameter 'isAvailable' when calling MenusApi->MenusShowHideBulkItems");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/bulkshowhide";
+            var localVarPath = "./api/v1.0/menus/{menuId}/bulkshowhide";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4718,17 +4965,17 @@ public ApiResponse< RestApiArrayResultMenuElementEditResponse > MenusShowHideBul
             }
 
             return new ApiResponse<RestApiArrayResultMenuElementEditResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuElementEditResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuElementEditResponse)));
         }
 
         /// <summary>
-        ///  
+        /// Bulk show/hide menu items or option set items 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="menuElements"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="menuElements">Elements to be show/hide</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>Task of RestApiArrayResultMenuElementEditResponse</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultMenuElementEditResponse> MenusShowHideBulkItemsAsync (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable)
         {
@@ -4738,12 +4985,12 @@ public async System.Threading.Tasks.Task<RestApiArrayResultMenuElementEditRespon
         }
 
         /// <summary>
-        ///  
+        /// Bulk show/hide menu items or option set items 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="menuId"></param>
-        /// <param name="menuElements"></param>
-        /// <param name="isAvailable"></param>
+        /// <param name="menuId">Menu id</param>
+        /// <param name="menuElements">Elements to be show/hide</param>
+        /// <param name="isAvailable">Is available flag</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultMenuElementEditResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuElementEditResponse>> MenusShowHideBulkItemsAsyncWithHttpInfo (int? menuId, List<MenuElementHide> menuElements, bool? isAvailable)
         {
@@ -4757,7 +5004,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuEleme
             if (isAvailable == null)
                 throw new ApiException(400, "Missing required parameter 'isAvailable' when calling MenusApi->MenusShowHideBulkItems");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/bulkshowhide";
+            var localVarPath = "./api/v1.0/menus/{menuId}/bulkshowhide";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4818,12 +5065,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMenuEleme
             }
 
             return new ApiResponse<RestApiArrayResultMenuElementEditResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMenuElementEditResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMenuElementEditResponse)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Set the type of Tax on a Menu 
+        /// Set the type of Tax on a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4835,7 +5082,7 @@ public void MenusUpdateTaxType (int? menuId, string type)
         }
 
         /// <summary>
-        /// [PRIVATE API]Set the type of Tax on a Menu 
+        /// Set the type of Tax on a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4850,7 +5097,7 @@ public ApiResponse<Object> MenusUpdateTaxTypeWithHttpInfo (int? menuId, string t
             if (type == null)
                 throw new ApiException(400, "Missing required parameter 'type' when calling MenusApi->MenusUpdateTaxType");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/tax/type/{type}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/tax/type/{type}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4898,12 +5145,12 @@ public ApiResponse<Object> MenusUpdateTaxTypeWithHttpInfo (int? menuId, string t
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Set the type of Tax on a Menu 
+        /// Set the type of Tax on a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4916,7 +5163,7 @@ public async System.Threading.Tasks.Task MenusUpdateTaxTypeAsync (int? menuId, s
         }
 
         /// <summary>
-        /// [PRIVATE API]Set the type of Tax on a Menu 
+        /// Set the type of Tax on a Menu 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -4931,7 +5178,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenusUpdateTaxType
             if (type == null)
                 throw new ApiException(400, "Missing required parameter 'type' when calling MenusApi->MenusUpdateTaxType");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/tax/type/{type}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/tax/type/{type}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4979,16 +5226,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> MenusUpdateTaxType
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Add/Update a Tax Rate 
+        /// Add/Update a Tax Rate 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="taxRate">Tax Rate to Add/Update</param>
+        /// <param name="taxRate">Tax rate to add/update</param>
         /// <returns>MenuTaxRate</returns>
         public MenuTaxRate MenusUpsertTaxRate (int? menuId, MenuTaxRate taxRate)
         {
@@ -4997,11 +5244,11 @@ public MenuTaxRate MenusUpsertTaxRate (int? menuId, MenuTaxRate taxRate)
         }
 
         /// <summary>
-        /// [PRIVATE API]Add/Update a Tax Rate 
+        /// Add/Update a Tax Rate 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="taxRate">Tax Rate to Add/Update</param>
+        /// <param name="taxRate">Tax rate to add/update</param>
         /// <returns>ApiResponse of MenuTaxRate</returns>
         public ApiResponse< MenuTaxRate > MenusUpsertTaxRateWithHttpInfo (int? menuId, MenuTaxRate taxRate)
         {
@@ -5012,7 +5259,7 @@ public ApiResponse< MenuTaxRate > MenusUpsertTaxRateWithHttpInfo (int? menuId, M
             if (taxRate == null)
                 throw new ApiException(400, "Missing required parameter 'taxRate' when calling MenusApi->MenusUpsertTaxRate");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/taxrate";
+            var localVarPath = "./api/v1.0/menus/{menuId}/taxrate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5072,16 +5319,16 @@ public ApiResponse< MenuTaxRate > MenusUpsertTaxRateWithHttpInfo (int? menuId, M
             }
 
             return new ApiResponse<MenuTaxRate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (MenuTaxRate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(MenuTaxRate)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Add/Update a Tax Rate 
+        /// Add/Update a Tax Rate 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="taxRate">Tax Rate to Add/Update</param>
+        /// <param name="taxRate">Tax rate to add/update</param>
         /// <returns>Task of MenuTaxRate</returns>
         public async System.Threading.Tasks.Task<MenuTaxRate> MenusUpsertTaxRateAsync (int? menuId, MenuTaxRate taxRate)
         {
@@ -5091,11 +5338,11 @@ public async System.Threading.Tasks.Task<MenuTaxRate> MenusUpsertTaxRateAsync (i
         }
 
         /// <summary>
-        /// [PRIVATE API]Add/Update a Tax Rate 
+        /// Add/Update a Tax Rate 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="taxRate">Tax Rate to Add/Update</param>
+        /// <param name="taxRate">Tax rate to add/update</param>
         /// <returns>Task of ApiResponse (MenuTaxRate)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<MenuTaxRate>> MenusUpsertTaxRateAsyncWithHttpInfo (int? menuId, MenuTaxRate taxRate)
         {
@@ -5106,7 +5353,7 @@ public async System.Threading.Tasks.Task<ApiResponse<MenuTaxRate>> MenusUpsertTa
             if (taxRate == null)
                 throw new ApiException(400, "Missing required parameter 'taxRate' when calling MenusApi->MenusUpsertTaxRate");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/taxrate";
+            var localVarPath = "./api/v1.0/menus/{menuId}/taxrate";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5166,12 +5413,12 @@ public async System.Threading.Tasks.Task<ApiResponse<MenuTaxRate>> MenusUpsertTa
             }
 
             return new ApiResponse<MenuTaxRate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (MenuTaxRate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(MenuTaxRate)));
         }
 
         /// <summary>
-        /// [PRIVATE API]Restore a Menu to a checkpoint 
+        /// Restore a Menu to a checkpoint 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5183,7 +5430,7 @@ public void RestoreAMenuCheckpoint (int? menuId, int? checkpointId)
         }
 
         /// <summary>
-        /// [PRIVATE API]Restore a Menu to a checkpoint 
+        /// Restore a Menu to a checkpoint 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5198,7 +5445,7 @@ public ApiResponse<Object> RestoreAMenuCheckpointWithHttpInfo (int? menuId, int?
             if (checkpointId == null)
                 throw new ApiException(400, "Missing required parameter 'checkpointId' when calling MenusApi->RestoreAMenuCheckpoint");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/checkpoints/{checkpointId}/restore";
+            var localVarPath = "./api/v1.0/menus/{menuId}/checkpoints/{checkpointId}/restore";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5246,12 +5493,12 @@ public ApiResponse<Object> RestoreAMenuCheckpointWithHttpInfo (int? menuId, int?
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Restore a Menu to a checkpoint 
+        /// Restore a Menu to a checkpoint 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5264,7 +5511,7 @@ public async System.Threading.Tasks.Task RestoreAMenuCheckpointAsync (int? menuI
         }
 
         /// <summary>
-        /// [PRIVATE API]Restore a Menu to a checkpoint 
+        /// Restore a Menu to a checkpoint 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5279,7 +5526,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RestoreAMenuCheckp
             if (checkpointId == null)
                 throw new ApiException(400, "Missing required parameter 'checkpointId' when calling MenusApi->RestoreAMenuCheckpoint");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/checkpoints/{checkpointId}/restore";
+            var localVarPath = "./api/v1.0/menus/{menuId}/checkpoints/{checkpointId}/restore";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5327,7 +5574,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RestoreAMenuCheckp
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -5369,7 +5616,7 @@ public ApiResponse<Object> SetMenuItemMetadataWithHttpInfo (int? menuId, int? st
             if (metadata == null)
                 throw new ApiException(400, "Missing required parameter 'metadata' when calling MenusApi->SetMenuItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5431,7 +5678,7 @@ public ApiResponse<Object> SetMenuItemMetadataWithHttpInfo (int? menuId, int? st
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -5474,7 +5721,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuItemMetadat
             if (metadata == null)
                 throw new ApiException(400, "Missing required parameter 'metadata' when calling MenusApi->SetMenuItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuitem/{menuItemId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5536,7 +5783,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuItemMetadat
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -5578,7 +5825,7 @@ public ApiResponse<Object> SetMenuItemOptionSetItemMetadataWithHttpInfo (int? me
             if (metadata == null)
                 throw new ApiException(400, "Missing required parameter 'metadata' when calling MenusApi->SetMenuItemOptionSetItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5640,7 +5887,7 @@ public ApiResponse<Object> SetMenuItemOptionSetItemMetadataWithHttpInfo (int? me
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -5683,7 +5930,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuItemOptionS
             if (metadata == null)
                 throw new ApiException(400, "Missing required parameter 'metadata' when calling MenusApi->SetMenuItemOptionSetItemMetadata");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}/optionsetitem/{optionSetItemId}/metadata/store/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5745,12 +5992,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuItemOptionS
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Lock/Unlock a Menu for Editing 
+        /// Lock/Unlock a Menu for Editing 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5762,7 +6009,7 @@ public void SetMenuLock (int? menuId, bool? locked)
         }
 
         /// <summary>
-        /// [PRIVATE API]Lock/Unlock a Menu for Editing 
+        /// Lock/Unlock a Menu for Editing 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5777,7 +6024,7 @@ public ApiResponse<Object> SetMenuLockWithHttpInfo (int? menuId, bool? locked)
             if (locked == null)
                 throw new ApiException(400, "Missing required parameter 'locked' when calling MenusApi->SetMenuLock");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/lock";
+            var localVarPath = "./api/v1.0/menus/{menuId}/lock";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5837,12 +6084,12 @@ public ApiResponse<Object> SetMenuLockWithHttpInfo (int? menuId, bool? locked)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Lock/Unlock a Menu for Editing 
+        /// Lock/Unlock a Menu for Editing 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5855,7 +6102,7 @@ public async System.Threading.Tasks.Task SetMenuLockAsync (int? menuId, bool? lo
         }
 
         /// <summary>
-        /// [PRIVATE API]Lock/Unlock a Menu for Editing 
+        /// Lock/Unlock a Menu for Editing 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5870,7 +6117,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuLockAsyncWi
             if (locked == null)
                 throw new ApiException(400, "Missing required parameter 'locked' when calling MenusApi->SetMenuLock");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/lock";
+            var localVarPath = "./api/v1.0/menus/{menuId}/lock";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5930,12 +6177,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuLockAsyncWi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Set Menus Name 
+        /// Set Menus Name 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5947,7 +6194,7 @@ public void SetMenuName (int? menuId, string name)
         }
 
         /// <summary>
-        /// [PRIVATE API]Set Menus Name 
+        /// Set Menus Name 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -5962,7 +6209,7 @@ public ApiResponse<Object> SetMenuNameWithHttpInfo (int? menuId, string name)
             if (name == null)
                 throw new ApiException(400, "Missing required parameter 'name' when calling MenusApi->SetMenuName");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/name";
+            var localVarPath = "./api/v1.0/menus/{menuId}/name";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6022,12 +6269,12 @@ public ApiResponse<Object> SetMenuNameWithHttpInfo (int? menuId, string name)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE API]Set Menus Name 
+        /// Set Menus Name 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -6040,7 +6287,7 @@ public async System.Threading.Tasks.Task SetMenuNameAsync (int? menuId, string n
         }
 
         /// <summary>
-        /// [PRIVATE API]Set Menus Name 
+        /// Set Menus Name 
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
@@ -6055,7 +6302,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuNameAsyncWi
             if (name == null)
                 throw new ApiException(400, "Missing required parameter 'name' when calling MenusApi->SetMenuName");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/name";
+            var localVarPath = "./api/v1.0/menus/{menuId}/name";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6115,7 +6362,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuNameAsyncWi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -6124,7 +6371,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SetMenuNameAsyncWi
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="menu">Menu (delta)</param>
+        /// <param name="menu">Full menu data</param>
         /// <returns></returns>
         public void UpdateMenu (int? menuId, MenuBase menu)
         {
@@ -6136,7 +6383,7 @@ public void UpdateMenu (int? menuId, MenuBase menu)
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="menu">Menu (delta)</param>
+        /// <param name="menu">Full menu data</param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateMenuWithHttpInfo (int? menuId, MenuBase menu)
         {
@@ -6147,7 +6394,7 @@ public ApiResponse<Object> UpdateMenuWithHttpInfo (int? menuId, MenuBase menu)
             if (menu == null)
                 throw new ApiException(400, "Missing required parameter 'menu' when calling MenusApi->UpdateMenu");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6207,7 +6454,7 @@ public ApiResponse<Object> UpdateMenuWithHttpInfo (int? menuId, MenuBase menu)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -6216,7 +6463,7 @@ public ApiResponse<Object> UpdateMenuWithHttpInfo (int? menuId, MenuBase menu)
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="menu">Menu (delta)</param>
+        /// <param name="menu">Full menu data</param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateMenuAsync (int? menuId, MenuBase menu)
         {
@@ -6229,7 +6476,7 @@ public async System.Threading.Tasks.Task UpdateMenuAsync (int? menuId, MenuBase
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="menuId">Menu identifier</param>
-        /// <param name="menu">Menu (delta)</param>
+        /// <param name="menu">Full menu data</param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuAsyncWithHttpInfo (int? menuId, MenuBase menu)
         {
@@ -6240,7 +6487,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuAsyncWit
             if (menu == null)
                 throw new ApiException(400, "Missing required parameter 'menu' when calling MenusApi->UpdateMenu");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}";
+            var localVarPath = "./api/v1.0/menus/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6300,7 +6547,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateMenuAsyncWit
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
@@ -6333,7 +6580,7 @@ public ApiResponse< RestApiStringResult > UploadMenuImageWithHttpInfo (int? menu
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenusApi->UploadMenuImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6382,7 +6629,7 @@ public ApiResponse< RestApiStringResult > UploadMenuImageWithHttpInfo (int? menu
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -6416,7 +6663,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MenusApi->UploadMenuImage");
 
-            var localVarPath = "/api/v1.0/menus/{menuId}/image";
+            var localVarPath = "./api/v1.0/menus/{menuId}/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6465,7 +6712,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
@@ -6498,7 +6745,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             if (menu == null)
                 throw new ApiException(400, "Missing required parameter 'menu' when calling MenusApi->UploadNewMenuForApp");
 
-            var localVarPath = "/api/v1.0/{appId}/menus/xlsx";
+            var localVarPath = "./api/v1.0/{appId}/menus/xlsx";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6547,7 +6794,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             }
 
             return new ApiResponse<int?>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (int?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(int?)));
         }
 
@@ -6581,7 +6828,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             if (menu == null)
                 throw new ApiException(400, "Missing required parameter 'menu' when calling MenusApi->UploadNewMenuForApp");
 
-            var localVarPath = "/api/v1.0/{appId}/menus/xlsx";
+            var localVarPath = "./api/v1.0/{appId}/menus/xlsx";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6630,7 +6877,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> Uploa
             }
 
             return new ApiResponse<int?>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (int?) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(int?)));
         }
 
diff --git a/src/Flipdish/Api/MenusNutritionInfoApi.cs b/src/Flipdish/Api/MenusNutritionInfoApi.cs
new file mode 100644
index 00000000..8ca23af7
--- /dev/null
+++ b/src/Flipdish/Api/MenusNutritionInfoApi.cs
@@ -0,0 +1,1410 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IMenusNutritionInfoApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>RestApiResultMenuNutritionInfoHeader</returns>
+        RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuItemNutritionInfo (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel);
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>ApiResponse of RestApiResultMenuNutritionInfoHeader</returns>
+        ApiResponse<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuItemNutritionInfoWithHttpInfo (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel);
+        /// <summary>
+        /// Add or update menuitem optionsetitem nutrition info its publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>RestApiResultMenuNutritionInfoHeader</returns>
+        RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuItemOptionSetItemNutritionInfo (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel);
+
+        /// <summary>
+        /// Add or update menuitem optionsetitem nutrition info its publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>ApiResponse of RestApiResultMenuNutritionInfoHeader</returns>
+        ApiResponse<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuItemOptionSetItemNutritionInfoWithHttpInfo (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel);
+        /// <summary>
+        /// Add or update menu nutrition by identifier
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>RestApiResultMenuNutritionInfoHeader</returns>
+        RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuNutritionInfoByMenuId (int? menuId);
+
+        /// <summary>
+        /// Add or update menu nutrition by identifier
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>ApiResponse of RestApiResultMenuNutritionInfoHeader</returns>
+        ApiResponse<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuNutritionInfoByMenuIdWithHttpInfo (int? menuId);
+        /// <summary>
+        /// Delete menu nutrition information by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Object</returns>
+        Object DeleteMenuNutritionInfoByMenuId (int? menuId);
+
+        /// <summary>
+        /// Delete menu nutrition information by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DeleteMenuNutritionInfoByMenuIdWithHttpInfo (int? menuId);
+        /// <summary>
+        /// Get allergens
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>RestApiArrayResultAllergen</returns>
+        RestApiArrayResultAllergen GetAllergens (string appId, string languageId = null);
+
+        /// <summary>
+        /// Get allergens
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultAllergen</returns>
+        ApiResponse<RestApiArrayResultAllergen> GetAllergensWithHttpInfo (string appId, string languageId = null);
+        /// <summary>
+        /// Get menu nutrition by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>RestApiResultNutritionInfo</returns>
+        RestApiResultNutritionInfo GetMenuNutritionInfoByMenuId (int? menuId);
+
+        /// <summary>
+        /// Get menu nutrition by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>ApiResponse of RestApiResultNutritionInfo</returns>
+        ApiResponse<RestApiResultNutritionInfo> GetMenuNutritionInfoByMenuIdWithHttpInfo (int? menuId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>Task of RestApiResultMenuNutritionInfoHeader</returns>
+        System.Threading.Tasks.Task<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuItemNutritionInfoAsync (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel);
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuNutritionInfoHeader)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuNutritionInfoHeader>> AddOrUpdateMenuItemNutritionInfoAsyncWithHttpInfo (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel);
+        /// <summary>
+        /// Add or update menuitem optionsetitem nutrition info its publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>Task of RestApiResultMenuNutritionInfoHeader</returns>
+        System.Threading.Tasks.Task<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuItemOptionSetItemNutritionInfoAsync (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel);
+
+        /// <summary>
+        /// Add or update menuitem optionsetitem nutrition info its publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuNutritionInfoHeader)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuNutritionInfoHeader>> AddOrUpdateMenuItemOptionSetItemNutritionInfoAsyncWithHttpInfo (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel);
+        /// <summary>
+        /// Add or update menu nutrition by identifier
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of RestApiResultMenuNutritionInfoHeader</returns>
+        System.Threading.Tasks.Task<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuNutritionInfoByMenuIdAsync (int? menuId);
+
+        /// <summary>
+        /// Add or update menu nutrition by identifier
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuNutritionInfoHeader)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuNutritionInfoHeader>> AddOrUpdateMenuNutritionInfoByMenuIdAsyncWithHttpInfo (int? menuId);
+        /// <summary>
+        /// Delete menu nutrition information by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DeleteMenuNutritionInfoByMenuIdAsync (int? menuId);
+
+        /// <summary>
+        /// Delete menu nutrition information by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuNutritionInfoByMenuIdAsyncWithHttpInfo (int? menuId);
+        /// <summary>
+        /// Get allergens
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultAllergen</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultAllergen> GetAllergensAsync (string appId, string languageId = null);
+
+        /// <summary>
+        /// Get allergens
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultAllergen)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAllergen>> GetAllergensAsyncWithHttpInfo (string appId, string languageId = null);
+        /// <summary>
+        /// Get menu nutrition by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of RestApiResultNutritionInfo</returns>
+        System.Threading.Tasks.Task<RestApiResultNutritionInfo> GetMenuNutritionInfoByMenuIdAsync (int? menuId);
+
+        /// <summary>
+        /// Get menu nutrition by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of ApiResponse (RestApiResultNutritionInfo)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultNutritionInfo>> GetMenuNutritionInfoByMenuIdAsyncWithHttpInfo (int? menuId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class MenusNutritionInfoApi : IMenusNutritionInfoApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenusNutritionInfoApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public MenusNutritionInfoApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenusNutritionInfoApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public MenusNutritionInfoApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>RestApiResultMenuNutritionInfoHeader</returns>
+        public RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuItemNutritionInfo (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+        {
+             ApiResponse<RestApiResultMenuNutritionInfoHeader> localVarResponse = AddOrUpdateMenuItemNutritionInfoWithHttpInfo(menuId, publicId, addOrUpdateModel);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>ApiResponse of RestApiResultMenuNutritionInfoHeader</returns>
+        public ApiResponse< RestApiResultMenuNutritionInfoHeader > AddOrUpdateMenuItemNutritionInfoWithHttpInfo (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemNutritionInfo");
+            // verify the required parameter 'publicId' is set
+            if (publicId == null)
+                throw new ApiException(400, "Missing required parameter 'publicId' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemNutritionInfo");
+            // verify the required parameter 'addOrUpdateModel' is set
+            if (addOrUpdateModel == null)
+                throw new ApiException(400, "Missing required parameter 'addOrUpdateModel' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemNutritionInfo");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuItem/{publicId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (publicId != null) localVarPathParams.Add("publicId", this.Configuration.ApiClient.ParameterToString(publicId)); // path parameter
+            if (addOrUpdateModel != null && addOrUpdateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(addOrUpdateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = addOrUpdateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuItemNutritionInfo", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuNutritionInfoHeader>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuNutritionInfoHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuNutritionInfoHeader)));
+        }
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>Task of RestApiResultMenuNutritionInfoHeader</returns>
+        public async System.Threading.Tasks.Task<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuItemNutritionInfoAsync (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+        {
+             ApiResponse<RestApiResultMenuNutritionInfoHeader> localVarResponse = await AddOrUpdateMenuItemNutritionInfoAsyncWithHttpInfo(menuId, publicId, addOrUpdateModel);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuNutritionInfoHeader)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuNutritionInfoHeader>> AddOrUpdateMenuItemNutritionInfoAsyncWithHttpInfo (int? menuId, string publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemNutritionInfo");
+            // verify the required parameter 'publicId' is set
+            if (publicId == null)
+                throw new ApiException(400, "Missing required parameter 'publicId' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemNutritionInfo");
+            // verify the required parameter 'addOrUpdateModel' is set
+            if (addOrUpdateModel == null)
+                throw new ApiException(400, "Missing required parameter 'addOrUpdateModel' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemNutritionInfo");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuItem/{publicId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (publicId != null) localVarPathParams.Add("publicId", this.Configuration.ApiClient.ParameterToString(publicId)); // path parameter
+            if (addOrUpdateModel != null && addOrUpdateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(addOrUpdateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = addOrUpdateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuItemNutritionInfo", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuNutritionInfoHeader>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuNutritionInfoHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuNutritionInfoHeader)));
+        }
+
+        /// <summary>
+        /// Add or update menuitem optionsetitem nutrition info its publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>RestApiResultMenuNutritionInfoHeader</returns>
+        public RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuItemOptionSetItemNutritionInfo (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+        {
+             ApiResponse<RestApiResultMenuNutritionInfoHeader> localVarResponse = AddOrUpdateMenuItemOptionSetItemNutritionInfoWithHttpInfo(menuId, publicId, addOrUpdateModel);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Add or update menuitem optionsetitem nutrition info its publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>ApiResponse of RestApiResultMenuNutritionInfoHeader</returns>
+        public ApiResponse< RestApiResultMenuNutritionInfoHeader > AddOrUpdateMenuItemOptionSetItemNutritionInfoWithHttpInfo (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemOptionSetItemNutritionInfo");
+            // verify the required parameter 'publicId' is set
+            if (publicId == null)
+                throw new ApiException(400, "Missing required parameter 'publicId' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemOptionSetItemNutritionInfo");
+            // verify the required parameter 'addOrUpdateModel' is set
+            if (addOrUpdateModel == null)
+                throw new ApiException(400, "Missing required parameter 'addOrUpdateModel' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemOptionSetItemNutritionInfo");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuItemOption/{publicId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (publicId != null) localVarPathParams.Add("publicId", this.Configuration.ApiClient.ParameterToString(publicId)); // path parameter
+            if (addOrUpdateModel != null && addOrUpdateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(addOrUpdateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = addOrUpdateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuItemOptionSetItemNutritionInfo", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuNutritionInfoHeader>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuNutritionInfoHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuNutritionInfoHeader)));
+        }
+
+        /// <summary>
+        /// Add or update menuitem optionsetitem nutrition info its publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>Task of RestApiResultMenuNutritionInfoHeader</returns>
+        public async System.Threading.Tasks.Task<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuItemOptionSetItemNutritionInfoAsync (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+        {
+             ApiResponse<RestApiResultMenuNutritionInfoHeader> localVarResponse = await AddOrUpdateMenuItemOptionSetItemNutritionInfoAsyncWithHttpInfo(menuId, publicId, addOrUpdateModel);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Add or update menuitem optionsetitem nutrition info its publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel"></param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuNutritionInfoHeader)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuNutritionInfoHeader>> AddOrUpdateMenuItemOptionSetItemNutritionInfoAsyncWithHttpInfo (int? menuId, Guid? publicId, ItemNutritionInfoAddUpdateModel addOrUpdateModel)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemOptionSetItemNutritionInfo");
+            // verify the required parameter 'publicId' is set
+            if (publicId == null)
+                throw new ApiException(400, "Missing required parameter 'publicId' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemOptionSetItemNutritionInfo");
+            // verify the required parameter 'addOrUpdateModel' is set
+            if (addOrUpdateModel == null)
+                throw new ApiException(400, "Missing required parameter 'addOrUpdateModel' when calling MenusNutritionInfoApi->AddOrUpdateMenuItemOptionSetItemNutritionInfo");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/menuItemOption/{publicId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (publicId != null) localVarPathParams.Add("publicId", this.Configuration.ApiClient.ParameterToString(publicId)); // path parameter
+            if (addOrUpdateModel != null && addOrUpdateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(addOrUpdateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = addOrUpdateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuItemOptionSetItemNutritionInfo", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuNutritionInfoHeader>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuNutritionInfoHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuNutritionInfoHeader)));
+        }
+
+        /// <summary>
+        /// Add or update menu nutrition by identifier 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>RestApiResultMenuNutritionInfoHeader</returns>
+        public RestApiResultMenuNutritionInfoHeader AddOrUpdateMenuNutritionInfoByMenuId (int? menuId)
+        {
+             ApiResponse<RestApiResultMenuNutritionInfoHeader> localVarResponse = AddOrUpdateMenuNutritionInfoByMenuIdWithHttpInfo(menuId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Add or update menu nutrition by identifier 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>ApiResponse of RestApiResultMenuNutritionInfoHeader</returns>
+        public ApiResponse< RestApiResultMenuNutritionInfoHeader > AddOrUpdateMenuNutritionInfoByMenuIdWithHttpInfo (int? menuId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->AddOrUpdateMenuNutritionInfoByMenuId");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuNutritionInfoByMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuNutritionInfoHeader>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuNutritionInfoHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuNutritionInfoHeader)));
+        }
+
+        /// <summary>
+        /// Add or update menu nutrition by identifier 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of RestApiResultMenuNutritionInfoHeader</returns>
+        public async System.Threading.Tasks.Task<RestApiResultMenuNutritionInfoHeader> AddOrUpdateMenuNutritionInfoByMenuIdAsync (int? menuId)
+        {
+             ApiResponse<RestApiResultMenuNutritionInfoHeader> localVarResponse = await AddOrUpdateMenuNutritionInfoByMenuIdAsyncWithHttpInfo(menuId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Add or update menu nutrition by identifier 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of ApiResponse (RestApiResultMenuNutritionInfoHeader)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMenuNutritionInfoHeader>> AddOrUpdateMenuNutritionInfoByMenuIdAsyncWithHttpInfo (int? menuId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->AddOrUpdateMenuNutritionInfoByMenuId");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuNutritionInfoByMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMenuNutritionInfoHeader>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMenuNutritionInfoHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMenuNutritionInfoHeader)));
+        }
+
+        /// <summary>
+        /// Delete menu nutrition information by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Object</returns>
+        public Object DeleteMenuNutritionInfoByMenuId (int? menuId)
+        {
+             ApiResponse<Object> localVarResponse = DeleteMenuNutritionInfoByMenuIdWithHttpInfo(menuId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Delete menu nutrition information by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DeleteMenuNutritionInfoByMenuIdWithHttpInfo (int? menuId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->DeleteMenuNutritionInfoByMenuId");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteMenuNutritionInfoByMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        /// Delete menu nutrition information by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DeleteMenuNutritionInfoByMenuIdAsync (int? menuId)
+        {
+             ApiResponse<Object> localVarResponse = await DeleteMenuNutritionInfoByMenuIdAsyncWithHttpInfo(menuId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Delete menu nutrition information by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteMenuNutritionInfoByMenuIdAsyncWithHttpInfo (int? menuId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->DeleteMenuNutritionInfoByMenuId");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteMenuNutritionInfoByMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        /// Get allergens 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>RestApiArrayResultAllergen</returns>
+        public RestApiArrayResultAllergen GetAllergens (string appId, string languageId = null)
+        {
+             ApiResponse<RestApiArrayResultAllergen> localVarResponse = GetAllergensWithHttpInfo(appId, languageId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Get allergens 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultAllergen</returns>
+        public ApiResponse< RestApiArrayResultAllergen > GetAllergensWithHttpInfo (string appId, string languageId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoApi->GetAllergens");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/nutrition/allergens";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (languageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "languageId", languageId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAllergens", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultAllergen>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultAllergen) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAllergen)));
+        }
+
+        /// <summary>
+        /// Get allergens 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultAllergen</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultAllergen> GetAllergensAsync (string appId, string languageId = null)
+        {
+             ApiResponse<RestApiArrayResultAllergen> localVarResponse = await GetAllergensAsyncWithHttpInfo(appId, languageId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Get allergens 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultAllergen)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAllergen>> GetAllergensAsyncWithHttpInfo (string appId, string languageId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoApi->GetAllergens");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/nutrition/allergens";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (languageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "languageId", languageId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAllergens", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultAllergen>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultAllergen) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAllergen)));
+        }
+
+        /// <summary>
+        /// Get menu nutrition by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>RestApiResultNutritionInfo</returns>
+        public RestApiResultNutritionInfo GetMenuNutritionInfoByMenuId (int? menuId)
+        {
+             ApiResponse<RestApiResultNutritionInfo> localVarResponse = GetMenuNutritionInfoByMenuIdWithHttpInfo(menuId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Get menu nutrition by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>ApiResponse of RestApiResultNutritionInfo</returns>
+        public ApiResponse< RestApiResultNutritionInfo > GetMenuNutritionInfoByMenuIdWithHttpInfo (int? menuId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->GetMenuNutritionInfoByMenuId");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetMenuNutritionInfoByMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultNutritionInfo>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultNutritionInfo) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultNutritionInfo)));
+        }
+
+        /// <summary>
+        /// Get menu nutrition by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of RestApiResultNutritionInfo</returns>
+        public async System.Threading.Tasks.Task<RestApiResultNutritionInfo> GetMenuNutritionInfoByMenuIdAsync (int? menuId)
+        {
+             ApiResponse<RestApiResultNutritionInfo> localVarResponse = await GetMenuNutritionInfoByMenuIdAsyncWithHttpInfo(menuId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Get menu nutrition by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <returns>Task of ApiResponse (RestApiResultNutritionInfo)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultNutritionInfo>> GetMenuNutritionInfoByMenuIdAsyncWithHttpInfo (int? menuId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoApi->GetMenuNutritionInfoByMenuId");
+
+            var localVarPath = "./api/v1.0/menus/{menuId}/nutrition";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetMenuNutritionInfoByMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultNutritionInfo>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultNutritionInfo) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultNutritionInfo)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/MenusNutritionInfoV2Api.cs b/src/Flipdish/Api/MenusNutritionInfoV2Api.cs
new file mode 100644
index 00000000..a82430d5
--- /dev/null
+++ b/src/Flipdish/Api/MenusNutritionInfoV2Api.cs
@@ -0,0 +1,1082 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IMenusNutritionInfoV2Api : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Object</returns>
+        Object AddOrUpdateMenuItemNutritionInfoV2 (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId);
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> AddOrUpdateMenuItemNutritionInfoV2WithHttpInfo (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId);
+        /// <summary>
+        /// Add or update menuitem option set item&#39;s nutrition info by its publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item option set item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Object</returns>
+        Object AddOrUpdateMenuItemOptionSetItemNutritionInfoV2 (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId);
+
+        /// <summary>
+        /// Add or update menuitem option set item&#39;s nutrition info by its publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item option set item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> AddOrUpdateMenuItemOptionSetItemNutritionInfoV2WithHttpInfo (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId);
+        /// <summary>
+        /// Get allergens
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>RestApiArrayResultAllergen</returns>
+        RestApiArrayResultAllergen GetAllergensV2 (string appId, string languageId = null);
+
+        /// <summary>
+        /// Get allergens
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultAllergen</returns>
+        ApiResponse<RestApiArrayResultAllergen> GetAllergensV2WithHttpInfo (string appId, string languageId = null);
+        /// <summary>
+        /// Get menu nutrition by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>RestApiResultNutritionInfoV2</returns>
+        RestApiResultNutritionInfoV2 GetMenuNutritionInfoV2ByMenuId (string appId, int? menuId, string languageId = null);
+
+        /// <summary>
+        /// Get menu nutrition by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultNutritionInfoV2</returns>
+        ApiResponse<RestApiResultNutritionInfoV2> GetMenuNutritionInfoV2ByMenuIdWithHttpInfo (string appId, int? menuId, string languageId = null);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> AddOrUpdateMenuItemNutritionInfoV2Async (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId);
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> AddOrUpdateMenuItemNutritionInfoV2AsyncWithHttpInfo (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId);
+        /// <summary>
+        /// Add or update menuitem option set item&#39;s nutrition info by its publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item option set item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> AddOrUpdateMenuItemOptionSetItemNutritionInfoV2Async (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId);
+
+        /// <summary>
+        /// Add or update menuitem option set item&#39;s nutrition info by its publicId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item option set item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> AddOrUpdateMenuItemOptionSetItemNutritionInfoV2AsyncWithHttpInfo (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId);
+        /// <summary>
+        /// Get allergens
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultAllergen</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultAllergen> GetAllergensV2Async (string appId, string languageId = null);
+
+        /// <summary>
+        /// Get allergens
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultAllergen)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAllergen>> GetAllergensV2AsyncWithHttpInfo (string appId, string languageId = null);
+        /// <summary>
+        /// Get menu nutrition by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of RestApiResultNutritionInfoV2</returns>
+        System.Threading.Tasks.Task<RestApiResultNutritionInfoV2> GetMenuNutritionInfoV2ByMenuIdAsync (string appId, int? menuId, string languageId = null);
+
+        /// <summary>
+        /// Get menu nutrition by menuId
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultNutritionInfoV2)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultNutritionInfoV2>> GetMenuNutritionInfoV2ByMenuIdAsyncWithHttpInfo (string appId, int? menuId, string languageId = null);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class MenusNutritionInfoV2Api : IMenusNutritionInfoV2Api
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenusNutritionInfoV2Api"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public MenusNutritionInfoV2Api(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenusNutritionInfoV2Api"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public MenusNutritionInfoV2Api(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Object</returns>
+        public Object AddOrUpdateMenuItemNutritionInfoV2 (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+        {
+             ApiResponse<Object> localVarResponse = AddOrUpdateMenuItemNutritionInfoV2WithHttpInfo(menuId, publicId, addOrUpdateModel, appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > AddOrUpdateMenuItemNutritionInfoV2WithHttpInfo (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemNutritionInfoV2");
+            // verify the required parameter 'publicId' is set
+            if (publicId == null)
+                throw new ApiException(400, "Missing required parameter 'publicId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemNutritionInfoV2");
+            // verify the required parameter 'addOrUpdateModel' is set
+            if (addOrUpdateModel == null)
+                throw new ApiException(400, "Missing required parameter 'addOrUpdateModel' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemNutritionInfoV2");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemNutritionInfoV2");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/{menuId}/menuItem/{publicId}/nutritionv2";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (publicId != null) localVarPathParams.Add("publicId", this.Configuration.ApiClient.ParameterToString(publicId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (addOrUpdateModel != null && addOrUpdateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(addOrUpdateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = addOrUpdateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuItemNutritionInfoV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> AddOrUpdateMenuItemNutritionInfoV2Async (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+        {
+             ApiResponse<Object> localVarResponse = await AddOrUpdateMenuItemNutritionInfoV2AsyncWithHttpInfo(menuId, publicId, addOrUpdateModel, appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Add or update menuitem nutrition info by menu item&#39;s publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> AddOrUpdateMenuItemNutritionInfoV2AsyncWithHttpInfo (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemNutritionInfoV2");
+            // verify the required parameter 'publicId' is set
+            if (publicId == null)
+                throw new ApiException(400, "Missing required parameter 'publicId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemNutritionInfoV2");
+            // verify the required parameter 'addOrUpdateModel' is set
+            if (addOrUpdateModel == null)
+                throw new ApiException(400, "Missing required parameter 'addOrUpdateModel' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemNutritionInfoV2");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemNutritionInfoV2");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/{menuId}/menuItem/{publicId}/nutritionv2";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (publicId != null) localVarPathParams.Add("publicId", this.Configuration.ApiClient.ParameterToString(publicId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (addOrUpdateModel != null && addOrUpdateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(addOrUpdateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = addOrUpdateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuItemNutritionInfoV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        /// Add or update menuitem option set item&#39;s nutrition info by its publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item option set item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Object</returns>
+        public Object AddOrUpdateMenuItemOptionSetItemNutritionInfoV2 (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+        {
+             ApiResponse<Object> localVarResponse = AddOrUpdateMenuItemOptionSetItemNutritionInfoV2WithHttpInfo(menuId, publicId, addOrUpdateModel, appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Add or update menuitem option set item&#39;s nutrition info by its publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item option set item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > AddOrUpdateMenuItemOptionSetItemNutritionInfoV2WithHttpInfo (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemOptionSetItemNutritionInfoV2");
+            // verify the required parameter 'publicId' is set
+            if (publicId == null)
+                throw new ApiException(400, "Missing required parameter 'publicId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemOptionSetItemNutritionInfoV2");
+            // verify the required parameter 'addOrUpdateModel' is set
+            if (addOrUpdateModel == null)
+                throw new ApiException(400, "Missing required parameter 'addOrUpdateModel' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemOptionSetItemNutritionInfoV2");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemOptionSetItemNutritionInfoV2");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/{menuId}/menuItemOption/{publicId}/nutritionv2";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (publicId != null) localVarPathParams.Add("publicId", this.Configuration.ApiClient.ParameterToString(publicId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (addOrUpdateModel != null && addOrUpdateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(addOrUpdateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = addOrUpdateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuItemOptionSetItemNutritionInfoV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        /// Add or update menuitem option set item&#39;s nutrition info by its publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item option set item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> AddOrUpdateMenuItemOptionSetItemNutritionInfoV2Async (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+        {
+             ApiResponse<Object> localVarResponse = await AddOrUpdateMenuItemOptionSetItemNutritionInfoV2AsyncWithHttpInfo(menuId, publicId, addOrUpdateModel, appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Add or update menuitem option set item&#39;s nutrition info by its publicId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="publicId">Menu item option set item&#39;s publicId</param>
+        /// <param name="addOrUpdateModel">Allergen ids</param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> AddOrUpdateMenuItemOptionSetItemNutritionInfoV2AsyncWithHttpInfo (int? menuId, string publicId, ItemNutritionInfoV2AddUpdateModel addOrUpdateModel, string appId)
+        {
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemOptionSetItemNutritionInfoV2");
+            // verify the required parameter 'publicId' is set
+            if (publicId == null)
+                throw new ApiException(400, "Missing required parameter 'publicId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemOptionSetItemNutritionInfoV2");
+            // verify the required parameter 'addOrUpdateModel' is set
+            if (addOrUpdateModel == null)
+                throw new ApiException(400, "Missing required parameter 'addOrUpdateModel' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemOptionSetItemNutritionInfoV2");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoV2Api->AddOrUpdateMenuItemOptionSetItemNutritionInfoV2");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/{menuId}/menuItemOption/{publicId}/nutritionv2";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (publicId != null) localVarPathParams.Add("publicId", this.Configuration.ApiClient.ParameterToString(publicId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (addOrUpdateModel != null && addOrUpdateModel.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(addOrUpdateModel); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = addOrUpdateModel; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddOrUpdateMenuItemOptionSetItemNutritionInfoV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        /// Get allergens 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>RestApiArrayResultAllergen</returns>
+        public RestApiArrayResultAllergen GetAllergensV2 (string appId, string languageId = null)
+        {
+             ApiResponse<RestApiArrayResultAllergen> localVarResponse = GetAllergensV2WithHttpInfo(appId, languageId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Get allergens 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultAllergen</returns>
+        public ApiResponse< RestApiArrayResultAllergen > GetAllergensV2WithHttpInfo (string appId, string languageId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoV2Api->GetAllergensV2");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/nutritionv2/allergens";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (languageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "languageId", languageId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAllergensV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultAllergen>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultAllergen) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAllergen)));
+        }
+
+        /// <summary>
+        /// Get allergens 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultAllergen</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultAllergen> GetAllergensV2Async (string appId, string languageId = null)
+        {
+             ApiResponse<RestApiArrayResultAllergen> localVarResponse = await GetAllergensV2AsyncWithHttpInfo(appId, languageId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Get allergens 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultAllergen)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultAllergen>> GetAllergensV2AsyncWithHttpInfo (string appId, string languageId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoV2Api->GetAllergensV2");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/nutritionv2/allergens";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (languageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "languageId", languageId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAllergensV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultAllergen>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultAllergen) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultAllergen)));
+        }
+
+        /// <summary>
+        /// Get menu nutrition by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>RestApiResultNutritionInfoV2</returns>
+        public RestApiResultNutritionInfoV2 GetMenuNutritionInfoV2ByMenuId (string appId, int? menuId, string languageId = null)
+        {
+             ApiResponse<RestApiResultNutritionInfoV2> localVarResponse = GetMenuNutritionInfoV2ByMenuIdWithHttpInfo(appId, menuId, languageId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        /// Get menu nutrition by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultNutritionInfoV2</returns>
+        public ApiResponse< RestApiResultNutritionInfoV2 > GetMenuNutritionInfoV2ByMenuIdWithHttpInfo (string appId, int? menuId, string languageId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoV2Api->GetMenuNutritionInfoV2ByMenuId");
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoV2Api->GetMenuNutritionInfoV2ByMenuId");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/{menuId}/nutritionv2";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (languageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "languageId", languageId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetMenuNutritionInfoV2ByMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultNutritionInfoV2>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultNutritionInfoV2) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultNutritionInfoV2)));
+        }
+
+        /// <summary>
+        /// Get menu nutrition by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of RestApiResultNutritionInfoV2</returns>
+        public async System.Threading.Tasks.Task<RestApiResultNutritionInfoV2> GetMenuNutritionInfoV2ByMenuIdAsync (string appId, int? menuId, string languageId = null)
+        {
+             ApiResponse<RestApiResultNutritionInfoV2> localVarResponse = await GetMenuNutritionInfoV2ByMenuIdAsyncWithHttpInfo(appId, menuId, languageId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        /// Get menu nutrition by menuId 
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="menuId">Menu identifier</param>
+        /// <param name="languageId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultNutritionInfoV2)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultNutritionInfoV2>> GetMenuNutritionInfoV2ByMenuIdAsyncWithHttpInfo (string appId, int? menuId, string languageId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MenusNutritionInfoV2Api->GetMenuNutritionInfoV2ByMenuId");
+            // verify the required parameter 'menuId' is set
+            if (menuId == null)
+                throw new ApiException(400, "Missing required parameter 'menuId' when calling MenusNutritionInfoV2Api->GetMenuNutritionInfoV2ByMenuId");
+
+            var localVarPath = "./api/v1.0/{appId}/menus/{menuId}/nutritionv2";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (menuId != null) localVarPathParams.Add("menuId", this.Configuration.ApiClient.ParameterToString(menuId)); // path parameter
+            if (languageId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "languageId", languageId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetMenuNutritionInfoV2ByMenuId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultNutritionInfoV2>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultNutritionInfoV2) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultNutritionInfoV2)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/MetafieldDefinitionsApi.cs b/src/Flipdish/Api/MetafieldDefinitionsApi.cs
index 1008439d..31ea5bb9 100644
--- a/src/Flipdish/Api/MetafieldDefinitionsApi.cs
+++ b/src/Flipdish/Api/MetafieldDefinitionsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,10 +25,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create a Metafield Definition
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -38,10 +38,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         RestApiResultMetafieldDefinition CreateMetafieldDefinition (string appId, string ownerEntity, CreateMetafieldDefinition createMetafieldDefinition);
 
         /// <summary>
-        /// Create a Metafield Definition
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -50,10 +50,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultMetafieldDefinition</returns>
         ApiResponse<RestApiResultMetafieldDefinition> CreateMetafieldDefinitionWithHttpInfo (string appId, string ownerEntity, CreateMetafieldDefinition createMetafieldDefinition);
         /// <summary>
-        /// Get a Metafield Definition for the specified owner entity and key.
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -63,10 +63,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         RestApiResultMetafieldDefinition GetMetafieldDefinitionByKey (string appId, string ownerEntity, string key);
 
         /// <summary>
-        /// Get a Metafield Definition for the specified owner entity and key.
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -75,10 +75,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultMetafieldDefinition</returns>
         ApiResponse<RestApiResultMetafieldDefinition> GetMetafieldDefinitionByKeyWithHttpInfo (string appId, string ownerEntity, string key);
         /// <summary>
-        /// Get Metafield Definitions for the specified owner entity.
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -90,10 +90,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         RestApiPaginationResultMetafieldDefinition GetMetafieldDefinitions (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get Metafield Definitions for the specified owner entity.
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -104,10 +104,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultMetafieldDefinition</returns>
         ApiResponse<RestApiPaginationResultMetafieldDefinition> GetMetafieldDefinitionsWithHttpInfo (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Get OwnerEntity Configurations which contain information to manage Metafield Definitions
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -115,20 +115,20 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         OwnerEntityConfigurations GetOwnerEntityConfigurations (string appId);
 
         /// <summary>
-        /// Get OwnerEntity Configurations which contain information to manage Metafield Definitions
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of OwnerEntityConfigurations</returns>
         ApiResponse<OwnerEntityConfigurations> GetOwnerEntityConfigurationsWithHttpInfo (string appId);
         /// <summary>
-        /// Get OwnerEntity Definition Recommendations
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -140,10 +140,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         RestApiPaginationResultMetafieldDefinitionRecommendation GetOwnerEntityRecommendations (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get OwnerEntity Definition Recommendations
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -154,10 +154,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultMetafieldDefinitionRecommendation</returns>
         ApiResponse<RestApiPaginationResultMetafieldDefinitionRecommendation> GetOwnerEntityRecommendationsWithHttpInfo (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Update a Metafield Definition
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -168,10 +168,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         RestApiResultMetafieldDefinition UpdateMetafieldDefinition (string appId, string ownerEntity, string key, UpdateMetafieldDefinition updateMetafieldDefinition);
 
         /// <summary>
-        /// Update a Metafield Definition
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -183,10 +183,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create a Metafield Definition
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -196,10 +196,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultMetafieldDefinition> CreateMetafieldDefinitionAsync (string appId, string ownerEntity, CreateMetafieldDefinition createMetafieldDefinition);
 
         /// <summary>
-        /// Create a Metafield Definition
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -208,10 +208,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultMetafieldDefinition)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultMetafieldDefinition>> CreateMetafieldDefinitionAsyncWithHttpInfo (string appId, string ownerEntity, CreateMetafieldDefinition createMetafieldDefinition);
         /// <summary>
-        /// Get a Metafield Definition for the specified owner entity and key.
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -221,10 +221,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultMetafieldDefinition> GetMetafieldDefinitionByKeyAsync (string appId, string ownerEntity, string key);
 
         /// <summary>
-        /// Get a Metafield Definition for the specified owner entity and key.
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -233,10 +233,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultMetafieldDefinition)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultMetafieldDefinition>> GetMetafieldDefinitionByKeyAsyncWithHttpInfo (string appId, string ownerEntity, string key);
         /// <summary>
-        /// Get Metafield Definitions for the specified owner entity.
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -248,10 +248,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultMetafieldDefinition> GetMetafieldDefinitionsAsync (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get Metafield Definitions for the specified owner entity.
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -262,10 +262,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiPaginationResultMetafieldDefinition)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultMetafieldDefinition>> GetMetafieldDefinitionsAsyncWithHttpInfo (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Get OwnerEntity Configurations which contain information to manage Metafield Definitions
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -273,20 +273,20 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         System.Threading.Tasks.Task<OwnerEntityConfigurations> GetOwnerEntityConfigurationsAsync (string appId);
 
         /// <summary>
-        /// Get OwnerEntity Configurations which contain information to manage Metafield Definitions
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (OwnerEntityConfigurations)</returns>
         System.Threading.Tasks.Task<ApiResponse<OwnerEntityConfigurations>> GetOwnerEntityConfigurationsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Get OwnerEntity Definition Recommendations
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -298,10 +298,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultMetafieldDefinitionRecommendation> GetOwnerEntityRecommendationsAsync (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get OwnerEntity Definition Recommendations
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -312,10 +312,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiPaginationResultMetafieldDefinitionRecommendation)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultMetafieldDefinitionRecommendation>> GetOwnerEntityRecommendationsAsyncWithHttpInfo (string appId, string ownerEntity, string searchTerm = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Update a Metafield Definition
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -326,10 +326,10 @@ public interface IMetafieldDefinitionsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultMetafieldDefinition> UpdateMetafieldDefinitionAsync (string appId, string ownerEntity, string key, UpdateMetafieldDefinition updateMetafieldDefinition);
 
         /// <summary>
-        /// Update a Metafield Definition
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -439,7 +439,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create a Metafield Definition [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -453,7 +453,7 @@ public RestApiResultMetafieldDefinition CreateMetafieldDefinition (string appId,
         }
 
         /// <summary>
-        /// Create a Metafield Definition [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -472,7 +472,7 @@ public ApiResponse< RestApiResultMetafieldDefinition > CreateMetafieldDefinition
             if (createMetafieldDefinition == null)
                 throw new ApiException(400, "Missing required parameter 'createMetafieldDefinition' when calling MetafieldDefinitionsApi->CreateMetafieldDefinition");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/{ownerEntity}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/{ownerEntity}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -533,12 +533,12 @@ public ApiResponse< RestApiResultMetafieldDefinition > CreateMetafieldDefinition
             }
 
             return new ApiResponse<RestApiResultMetafieldDefinition>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMetafieldDefinition) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetafieldDefinition)));
         }
 
         /// <summary>
-        /// Create a Metafield Definition [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -553,7 +553,7 @@ public async System.Threading.Tasks.Task<RestApiResultMetafieldDefinition> Creat
         }
 
         /// <summary>
-        /// Create a Metafield Definition [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -572,7 +572,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetafieldDefin
             if (createMetafieldDefinition == null)
                 throw new ApiException(400, "Missing required parameter 'createMetafieldDefinition' when calling MetafieldDefinitionsApi->CreateMetafieldDefinition");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/{ownerEntity}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/{ownerEntity}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -633,12 +633,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetafieldDefin
             }
 
             return new ApiResponse<RestApiResultMetafieldDefinition>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMetafieldDefinition) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetafieldDefinition)));
         }
 
         /// <summary>
-        /// Get a Metafield Definition for the specified owner entity and key. [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -652,7 +652,7 @@ public RestApiResultMetafieldDefinition GetMetafieldDefinitionByKey (string appI
         }
 
         /// <summary>
-        /// Get a Metafield Definition for the specified owner entity and key. [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -671,7 +671,7 @@ public ApiResponse< RestApiResultMetafieldDefinition > GetMetafieldDefinitionByK
             if (key == null)
                 throw new ApiException(400, "Missing required parameter 'key' when calling MetafieldDefinitionsApi->GetMetafieldDefinitionByKey");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -720,12 +720,12 @@ public ApiResponse< RestApiResultMetafieldDefinition > GetMetafieldDefinitionByK
             }
 
             return new ApiResponse<RestApiResultMetafieldDefinition>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMetafieldDefinition) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetafieldDefinition)));
         }
 
         /// <summary>
-        /// Get a Metafield Definition for the specified owner entity and key. [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -740,7 +740,7 @@ public async System.Threading.Tasks.Task<RestApiResultMetafieldDefinition> GetMe
         }
 
         /// <summary>
-        /// Get a Metafield Definition for the specified owner entity and key. [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -759,7 +759,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetafieldDefin
             if (key == null)
                 throw new ApiException(400, "Missing required parameter 'key' when calling MetafieldDefinitionsApi->GetMetafieldDefinitionByKey");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -808,12 +808,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetafieldDefin
             }
 
             return new ApiResponse<RestApiResultMetafieldDefinition>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMetafieldDefinition) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetafieldDefinition)));
         }
 
         /// <summary>
-        /// Get Metafield Definitions for the specified owner entity. [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -829,7 +829,7 @@ public RestApiPaginationResultMetafieldDefinition GetMetafieldDefinitions (strin
         }
 
         /// <summary>
-        /// Get Metafield Definitions for the specified owner entity. [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -847,7 +847,7 @@ public ApiResponse< RestApiPaginationResultMetafieldDefinition > GetMetafieldDef
             if (ownerEntity == null)
                 throw new ApiException(400, "Missing required parameter 'ownerEntity' when calling MetafieldDefinitionsApi->GetMetafieldDefinitions");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/{ownerEntity}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/{ownerEntity}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -898,12 +898,12 @@ public ApiResponse< RestApiPaginationResultMetafieldDefinition > GetMetafieldDef
             }
 
             return new ApiResponse<RestApiPaginationResultMetafieldDefinition>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultMetafieldDefinition) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultMetafieldDefinition)));
         }
 
         /// <summary>
-        /// Get Metafield Definitions for the specified owner entity. [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -920,7 +920,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultMetafieldDefinit
         }
 
         /// <summary>
-        /// Get Metafield Definitions for the specified owner entity. [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -938,7 +938,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultMeta
             if (ownerEntity == null)
                 throw new ApiException(400, "Missing required parameter 'ownerEntity' when calling MetafieldDefinitionsApi->GetMetafieldDefinitions");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/{ownerEntity}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/{ownerEntity}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -989,12 +989,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultMeta
             }
 
             return new ApiResponse<RestApiPaginationResultMetafieldDefinition>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultMetafieldDefinition) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultMetafieldDefinition)));
         }
 
         /// <summary>
-        /// Get OwnerEntity Configurations which contain information to manage Metafield Definitions [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1006,7 +1006,7 @@ public OwnerEntityConfigurations GetOwnerEntityConfigurations (string appId)
         }
 
         /// <summary>
-        /// Get OwnerEntity Configurations which contain information to manage Metafield Definitions [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1017,7 +1017,7 @@ public ApiResponse< OwnerEntityConfigurations > GetOwnerEntityConfigurationsWith
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MetafieldDefinitionsApi->GetOwnerEntityConfigurations");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1064,12 +1064,12 @@ public ApiResponse< OwnerEntityConfigurations > GetOwnerEntityConfigurationsWith
             }
 
             return new ApiResponse<OwnerEntityConfigurations>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (OwnerEntityConfigurations) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OwnerEntityConfigurations)));
         }
 
         /// <summary>
-        /// Get OwnerEntity Configurations which contain information to manage Metafield Definitions [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1082,7 +1082,7 @@ public async System.Threading.Tasks.Task<OwnerEntityConfigurations> GetOwnerEnti
         }
 
         /// <summary>
-        /// Get OwnerEntity Configurations which contain information to manage Metafield Definitions [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1093,7 +1093,7 @@ public async System.Threading.Tasks.Task<ApiResponse<OwnerEntityConfigurations>>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MetafieldDefinitionsApi->GetOwnerEntityConfigurations");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1140,12 +1140,12 @@ public async System.Threading.Tasks.Task<ApiResponse<OwnerEntityConfigurations>>
             }
 
             return new ApiResponse<OwnerEntityConfigurations>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (OwnerEntityConfigurations) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OwnerEntityConfigurations)));
         }
 
         /// <summary>
-        /// Get OwnerEntity Definition Recommendations [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1161,7 +1161,7 @@ public RestApiPaginationResultMetafieldDefinitionRecommendation GetOwnerEntityRe
         }
 
         /// <summary>
-        /// Get OwnerEntity Definition Recommendations [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1179,7 +1179,7 @@ public ApiResponse< RestApiPaginationResultMetafieldDefinitionRecommendation > G
             if (ownerEntity == null)
                 throw new ApiException(400, "Missing required parameter 'ownerEntity' when calling MetafieldDefinitionsApi->GetOwnerEntityRecommendations");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/recommendations/{ownerEntity}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/recommendations/{ownerEntity}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1230,12 +1230,12 @@ public ApiResponse< RestApiPaginationResultMetafieldDefinitionRecommendation > G
             }
 
             return new ApiResponse<RestApiPaginationResultMetafieldDefinitionRecommendation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultMetafieldDefinitionRecommendation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultMetafieldDefinitionRecommendation)));
         }
 
         /// <summary>
-        /// Get OwnerEntity Definition Recommendations [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1252,7 +1252,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultMetafieldDefinit
         }
 
         /// <summary>
-        /// Get OwnerEntity Definition Recommendations [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1270,7 +1270,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultMeta
             if (ownerEntity == null)
                 throw new ApiException(400, "Missing required parameter 'ownerEntity' when calling MetafieldDefinitionsApi->GetOwnerEntityRecommendations");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/recommendations/{ownerEntity}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/recommendations/{ownerEntity}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1321,12 +1321,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultMeta
             }
 
             return new ApiResponse<RestApiPaginationResultMetafieldDefinitionRecommendation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultMetafieldDefinitionRecommendation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultMetafieldDefinitionRecommendation)));
         }
 
         /// <summary>
-        /// Update a Metafield Definition [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1341,7 +1341,7 @@ public RestApiResultMetafieldDefinition UpdateMetafieldDefinition (string appId,
         }
 
         /// <summary>
-        /// Update a Metafield Definition [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1364,7 +1364,7 @@ public ApiResponse< RestApiResultMetafieldDefinition > UpdateMetafieldDefinition
             if (updateMetafieldDefinition == null)
                 throw new ApiException(400, "Missing required parameter 'updateMetafieldDefinition' when calling MetafieldDefinitionsApi->UpdateMetafieldDefinition");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1426,12 +1426,12 @@ public ApiResponse< RestApiResultMetafieldDefinition > UpdateMetafieldDefinition
             }
 
             return new ApiResponse<RestApiResultMetafieldDefinition>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMetafieldDefinition) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetafieldDefinition)));
         }
 
         /// <summary>
-        /// Update a Metafield Definition [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1447,7 +1447,7 @@ public async System.Threading.Tasks.Task<RestApiResultMetafieldDefinition> Updat
         }
 
         /// <summary>
-        /// Update a Metafield Definition [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1470,7 +1470,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetafieldDefin
             if (updateMetafieldDefinition == null)
                 throw new ApiException(400, "Missing required parameter 'updateMetafieldDefinition' when calling MetafieldDefinitionsApi->UpdateMetafieldDefinition");
 
-            var localVarPath = "/api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key}";
+            var localVarPath = "./api/v1.0/{appId}/metafields/definitions/{ownerEntity}/{key}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1532,7 +1532,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMetafieldDefin
             }
 
             return new ApiResponse<RestApiResultMetafieldDefinition>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMetafieldDefinition) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMetafieldDefinition)));
         }
 
diff --git a/src/Flipdish/Api/MobileAppsApi.cs b/src/Flipdish/Api/MobileAppsApi.cs
index 97dcf9c2..aecf6d97 100644
--- a/src/Flipdish/Api/MobileAppsApi.cs
+++ b/src/Flipdish/Api/MobileAppsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,7 +25,7 @@ public interface IMobileAppsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get sales channel configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -36,7 +36,7 @@ public interface IMobileAppsApi : IApiAccessor
         RestApiResultAppConfigSalesChannel GetAppConfigSalesChannel (string appId);
 
         /// <summary>
-        /// Get sales channel configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -46,7 +46,7 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultAppConfigSalesChannel</returns>
         ApiResponse<RestApiResultAppConfigSalesChannel> GetAppConfigSalesChannelWithHttpInfo (string appId);
         /// <summary>
-        /// Get statistics mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -58,7 +58,7 @@ public interface IMobileAppsApi : IApiAccessor
         RestApiArrayResultMobileAppsStatistics GetStatistics (string appId, List<string> platformTypes);
 
         /// <summary>
-        /// Get statistics mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -69,7 +69,7 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultMobileAppsStatistics</returns>
         ApiResponse<RestApiArrayResultMobileAppsStatistics> GetStatisticsWithHttpInfo (string appId, List<string> platformTypes);
         /// <summary>
-        /// Get submission details mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -80,7 +80,7 @@ public interface IMobileAppsApi : IApiAccessor
         RestApiResultMobileAppsSubmissionDetails GetSubmissionDetails (string appId);
 
         /// <summary>
-        /// Get submission details mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -90,30 +90,78 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultMobileAppsSubmissionDetails</returns>
         ApiResponse<RestApiResultMobileAppsSubmissionDetails> GetSubmissionDetailsWithHttpInfo (string appId);
         /// <summary>
-        /// Get submission status mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
+        /// <param name="submissionId"></param>
         /// <returns>RestApiResultMobileAppsSubmissionStatus</returns>
-        RestApiResultMobileAppsSubmissionStatus GetSubmissionStatus (string appId, int? mobileAppsSubmissionId);
+        RestApiResultMobileAppsSubmissionStatus GetSubmissionStatus (string appId, int? submissionId);
 
         /// <summary>
-        /// Get submission status mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
+        /// <param name="submissionId"></param>
         /// <returns>ApiResponse of RestApiResultMobileAppsSubmissionStatus</returns>
-        ApiResponse<RestApiResultMobileAppsSubmissionStatus> GetSubmissionStatusWithHttpInfo (string appId, int? mobileAppsSubmissionId);
+        ApiResponse<RestApiResultMobileAppsSubmissionStatus> GetSubmissionStatusWithHttpInfo (string appId, int? submissionId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>RestApiResultRestApiIntegerResult</returns>
+        RestApiResultRestApiIntegerResult Publish (string appId, int? submissionId, string platformType = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultRestApiIntegerResult</returns>
+        ApiResponse<RestApiResultRestApiIntegerResult> PublishWithHttpInfo (string appId, int? submissionId, string platformType = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>RestApiResultMobileAppsSubmission</returns>
+        RestApiResultMobileAppsSubmission Resubmission (string appId, MobileAppsSubmission mobileAppsSubmission);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>ApiResponse of RestApiResultMobileAppsSubmission</returns>
+        ApiResponse<RestApiResultMobileAppsSubmission> ResubmissionWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission);
         /// <summary>
-        /// Submission form mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -125,7 +173,7 @@ public interface IMobileAppsApi : IApiAccessor
         RestApiResultMobileAppsSubmission Submission (string appId, MobileAppsSubmission mobileAppsSubmission);
 
         /// <summary>
-        /// Submission form mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -136,7 +184,32 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultMobileAppsSubmission</returns>
         ApiResponse<RestApiResultMobileAppsSubmission> SubmissionWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission);
         /// <summary>
-        /// Update the application sales channel configuration
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>RestApiIntegerResult</returns>
+        RestApiIntegerResult Unpublish (string appId, int? submissionId, string platformType = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>ApiResponse of RestApiIntegerResult</returns>
+        ApiResponse<RestApiIntegerResult> UnpublishWithHttpInfo (string appId, int? submissionId, string platformType = null);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -148,7 +221,7 @@ public interface IMobileAppsApi : IApiAccessor
         RestApiResultAppConfigSalesChannel UpdateAppConfigSalesChannel (string appId, AppConfigSalesChannel appConfigSalesChannel);
 
         /// <summary>
-        /// Update the application sales channel configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -159,32 +232,32 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultAppConfigSalesChannel</returns>
         ApiResponse<RestApiResultAppConfigSalesChannel> UpdateAppConfigSalesChannelWithHttpInfo (string appId, AppConfigSalesChannel appConfigSalesChannel);
         /// <summary>
-        /// Update submission status
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
-        /// <param name="updateMobileAppsSubmissionStatus"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="updateSubmissionStatus"></param>
         /// <returns>RestApiResultUpdateMobileAppsSubmissionStatus</returns>
-        RestApiResultUpdateMobileAppsSubmissionStatus UpdateSubmissionStatus (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus);
+        RestApiResultUpdateMobileAppsSubmissionStatus UpdateSubmissionStatus (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus);
 
         /// <summary>
-        /// Update submission status
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
-        /// <param name="updateMobileAppsSubmissionStatus"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="updateSubmissionStatus"></param>
         /// <returns>ApiResponse of RestApiResultUpdateMobileAppsSubmissionStatus</returns>
-        ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus> UpdateSubmissionStatusWithHttpInfo (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus);
+        ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus> UpdateSubmissionStatusWithHttpInfo (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus);
         /// <summary>
-        /// Upload image mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -196,7 +269,7 @@ public interface IMobileAppsApi : IApiAccessor
         RestApiResultMobileAppsImage UploadImage (string appId, System.IO.Stream image);
 
         /// <summary>
-        /// Upload image mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -209,7 +282,7 @@ public interface IMobileAppsApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get sales channel configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -220,7 +293,7 @@ public interface IMobileAppsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultAppConfigSalesChannel> GetAppConfigSalesChannelAsync (string appId);
 
         /// <summary>
-        /// Get sales channel configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -230,7 +303,7 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultAppConfigSalesChannel)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAppConfigSalesChannel>> GetAppConfigSalesChannelAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Get statistics mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -242,7 +315,7 @@ public interface IMobileAppsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultMobileAppsStatistics> GetStatisticsAsync (string appId, List<string> platformTypes);
 
         /// <summary>
-        /// Get statistics mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -253,7 +326,7 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultMobileAppsStatistics)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMobileAppsStatistics>> GetStatisticsAsyncWithHttpInfo (string appId, List<string> platformTypes);
         /// <summary>
-        /// Get submission details mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -264,7 +337,7 @@ public interface IMobileAppsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultMobileAppsSubmissionDetails> GetSubmissionDetailsAsync (string appId);
 
         /// <summary>
-        /// Get submission details mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -274,30 +347,78 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultMobileAppsSubmissionDetails)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmissionDetails>> GetSubmissionDetailsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Get submission status mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
+        /// <param name="submissionId"></param>
         /// <returns>Task of RestApiResultMobileAppsSubmissionStatus</returns>
-        System.Threading.Tasks.Task<RestApiResultMobileAppsSubmissionStatus> GetSubmissionStatusAsync (string appId, int? mobileAppsSubmissionId);
+        System.Threading.Tasks.Task<RestApiResultMobileAppsSubmissionStatus> GetSubmissionStatusAsync (string appId, int? submissionId);
 
         /// <summary>
-        /// Get submission status mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
+        /// <param name="submissionId"></param>
         /// <returns>Task of ApiResponse (RestApiResultMobileAppsSubmissionStatus)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmissionStatus>> GetSubmissionStatusAsyncWithHttpInfo (string appId, int? mobileAppsSubmissionId);
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmissionStatus>> GetSubmissionStatusAsyncWithHttpInfo (string appId, int? submissionId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>Task of RestApiResultRestApiIntegerResult</returns>
+        System.Threading.Tasks.Task<RestApiResultRestApiIntegerResult> PublishAsync (string appId, int? submissionId, string platformType = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultRestApiIntegerResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultRestApiIntegerResult>> PublishAsyncWithHttpInfo (string appId, int? submissionId, string platformType = null);
         /// <summary>
-        /// Submission form mobile apps
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>Task of RestApiResultMobileAppsSubmission</returns>
+        System.Threading.Tasks.Task<RestApiResultMobileAppsSubmission> ResubmissionAsync (string appId, MobileAppsSubmission mobileAppsSubmission);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>Task of ApiResponse (RestApiResultMobileAppsSubmission)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmission>> ResubmissionAsyncWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -309,7 +430,7 @@ public interface IMobileAppsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultMobileAppsSubmission> SubmissionAsync (string appId, MobileAppsSubmission mobileAppsSubmission);
 
         /// <summary>
-        /// Submission form mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -320,7 +441,32 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultMobileAppsSubmission)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmission>> SubmissionAsyncWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission);
         /// <summary>
-        /// Update the application sales channel configuration
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>Task of RestApiIntegerResult</returns>
+        System.Threading.Tasks.Task<RestApiIntegerResult> UnpublishAsync (string appId, int? submissionId, string platformType = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiIntegerResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiIntegerResult>> UnpublishAsyncWithHttpInfo (string appId, int? submissionId, string platformType = null);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -332,7 +478,7 @@ public interface IMobileAppsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultAppConfigSalesChannel> UpdateAppConfigSalesChannelAsync (string appId, AppConfigSalesChannel appConfigSalesChannel);
 
         /// <summary>
-        /// Update the application sales channel configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -343,32 +489,32 @@ public interface IMobileAppsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultAppConfigSalesChannel)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAppConfigSalesChannel>> UpdateAppConfigSalesChannelAsyncWithHttpInfo (string appId, AppConfigSalesChannel appConfigSalesChannel);
         /// <summary>
-        /// Update submission status
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
-        /// <param name="updateMobileAppsSubmissionStatus"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="updateSubmissionStatus"></param>
         /// <returns>Task of RestApiResultUpdateMobileAppsSubmissionStatus</returns>
-        System.Threading.Tasks.Task<RestApiResultUpdateMobileAppsSubmissionStatus> UpdateSubmissionStatusAsync (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus);
+        System.Threading.Tasks.Task<RestApiResultUpdateMobileAppsSubmissionStatus> UpdateSubmissionStatusAsync (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus);
 
         /// <summary>
-        /// Update submission status
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
-        /// <param name="updateMobileAppsSubmissionStatus"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="updateSubmissionStatus"></param>
         /// <returns>Task of ApiResponse (RestApiResultUpdateMobileAppsSubmissionStatus)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus>> UpdateSubmissionStatusAsyncWithHttpInfo (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus);
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus>> UpdateSubmissionStatusAsyncWithHttpInfo (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus);
         /// <summary>
-        /// Upload image mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -380,7 +526,7 @@ public interface IMobileAppsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultMobileAppsImage> UploadImageAsync (string appId, System.IO.Stream image);
 
         /// <summary>
-        /// Upload image mobile apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -491,7 +637,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get sales channel configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -503,7 +649,7 @@ public RestApiResultAppConfigSalesChannel GetAppConfigSalesChannel (string appId
         }
 
         /// <summary>
-        /// Get sales channel configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -514,7 +660,7 @@ public ApiResponse< RestApiResultAppConfigSalesChannel > GetAppConfigSalesChanne
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->GetAppConfigSalesChannel");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/saleschannel/details";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/saleschannel/details";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -561,12 +707,12 @@ public ApiResponse< RestApiResultAppConfigSalesChannel > GetAppConfigSalesChanne
             }
 
             return new ApiResponse<RestApiResultAppConfigSalesChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAppConfigSalesChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppConfigSalesChannel)));
         }
 
         /// <summary>
-        /// Get sales channel configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -579,7 +725,7 @@ public async System.Threading.Tasks.Task<RestApiResultAppConfigSalesChannel> Get
         }
 
         /// <summary>
-        /// Get sales channel configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -590,7 +736,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppConfigSales
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->GetAppConfigSalesChannel");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/saleschannel/details";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/saleschannel/details";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -637,12 +783,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppConfigSales
             }
 
             return new ApiResponse<RestApiResultAppConfigSalesChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAppConfigSalesChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppConfigSalesChannel)));
         }
 
         /// <summary>
-        /// Get statistics mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -655,7 +801,7 @@ public RestApiArrayResultMobileAppsStatistics GetStatistics (string appId, List<
         }
 
         /// <summary>
-        /// Get statistics mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -670,7 +816,7 @@ public ApiResponse< RestApiArrayResultMobileAppsStatistics > GetStatisticsWithHt
             if (platformTypes == null)
                 throw new ApiException(400, "Missing required parameter 'platformTypes' when calling MobileAppsApi->GetStatistics");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/statistics";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/statistics";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -718,12 +864,12 @@ public ApiResponse< RestApiArrayResultMobileAppsStatistics > GetStatisticsWithHt
             }
 
             return new ApiResponse<RestApiArrayResultMobileAppsStatistics>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMobileAppsStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMobileAppsStatistics)));
         }
 
         /// <summary>
-        /// Get statistics mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -737,7 +883,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultMobileAppsStatistics>
         }
 
         /// <summary>
-        /// Get statistics mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -752,7 +898,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMobileApp
             if (platformTypes == null)
                 throw new ApiException(400, "Missing required parameter 'platformTypes' when calling MobileAppsApi->GetStatistics");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/statistics";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/statistics";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -800,12 +946,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultMobileApp
             }
 
             return new ApiResponse<RestApiArrayResultMobileAppsStatistics>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultMobileAppsStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultMobileAppsStatistics)));
         }
 
         /// <summary>
-        /// Get submission details mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -817,7 +963,7 @@ public RestApiResultMobileAppsSubmissionDetails GetSubmissionDetails (string app
         }
 
         /// <summary>
-        /// Get submission details mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -828,7 +974,7 @@ public ApiResponse< RestApiResultMobileAppsSubmissionDetails > GetSubmissionDeta
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->GetSubmissionDetails");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission/details";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/details";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -875,12 +1021,12 @@ public ApiResponse< RestApiResultMobileAppsSubmissionDetails > GetSubmissionDeta
             }
 
             return new ApiResponse<RestApiResultMobileAppsSubmissionDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMobileAppsSubmissionDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmissionDetails)));
         }
 
         /// <summary>
-        /// Get submission details mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -893,7 +1039,7 @@ public async System.Threading.Tasks.Task<RestApiResultMobileAppsSubmissionDetail
         }
 
         /// <summary>
-        /// Get submission details mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -904,7 +1050,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubm
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->GetSubmissionDetails");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission/details";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/details";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -951,40 +1097,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubm
             }
 
             return new ApiResponse<RestApiResultMobileAppsSubmissionDetails>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMobileAppsSubmissionDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmissionDetails)));
         }
 
         /// <summary>
-        /// Get submission status mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
+        /// <param name="submissionId"></param>
         /// <returns>RestApiResultMobileAppsSubmissionStatus</returns>
-        public RestApiResultMobileAppsSubmissionStatus GetSubmissionStatus (string appId, int? mobileAppsSubmissionId)
+        public RestApiResultMobileAppsSubmissionStatus GetSubmissionStatus (string appId, int? submissionId)
         {
-             ApiResponse<RestApiResultMobileAppsSubmissionStatus> localVarResponse = GetSubmissionStatusWithHttpInfo(appId, mobileAppsSubmissionId);
+             ApiResponse<RestApiResultMobileAppsSubmissionStatus> localVarResponse = GetSubmissionStatusWithHttpInfo(appId, submissionId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get submission status mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
+        /// <param name="submissionId"></param>
         /// <returns>ApiResponse of RestApiResultMobileAppsSubmissionStatus</returns>
-        public ApiResponse< RestApiResultMobileAppsSubmissionStatus > GetSubmissionStatusWithHttpInfo (string appId, int? mobileAppsSubmissionId)
+        public ApiResponse< RestApiResultMobileAppsSubmissionStatus > GetSubmissionStatusWithHttpInfo (string appId, int? submissionId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->GetSubmissionStatus");
-            // verify the required parameter 'mobileAppsSubmissionId' is set
-            if (mobileAppsSubmissionId == null)
-                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmissionId' when calling MobileAppsApi->GetSubmissionStatus");
+            // verify the required parameter 'submissionId' is set
+            if (submissionId == null)
+                throw new ApiException(400, "Missing required parameter 'submissionId' when calling MobileAppsApi->GetSubmissionStatus");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission/status";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/{submissionId}/status";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1009,7 +1155,7 @@ public ApiResponse< RestApiResultMobileAppsSubmissionStatus > GetSubmissionStatu
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (mobileAppsSubmissionId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "mobileAppsSubmissionId", mobileAppsSubmissionId)); // query parameter
+            if (submissionId != null) localVarPathParams.Add("submissionId", this.Configuration.ApiClient.ParameterToString(submissionId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1032,41 +1178,41 @@ public ApiResponse< RestApiResultMobileAppsSubmissionStatus > GetSubmissionStatu
             }
 
             return new ApiResponse<RestApiResultMobileAppsSubmissionStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMobileAppsSubmissionStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmissionStatus)));
         }
 
         /// <summary>
-        /// Get submission status mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
+        /// <param name="submissionId"></param>
         /// <returns>Task of RestApiResultMobileAppsSubmissionStatus</returns>
-        public async System.Threading.Tasks.Task<RestApiResultMobileAppsSubmissionStatus> GetSubmissionStatusAsync (string appId, int? mobileAppsSubmissionId)
+        public async System.Threading.Tasks.Task<RestApiResultMobileAppsSubmissionStatus> GetSubmissionStatusAsync (string appId, int? submissionId)
         {
-             ApiResponse<RestApiResultMobileAppsSubmissionStatus> localVarResponse = await GetSubmissionStatusAsyncWithHttpInfo(appId, mobileAppsSubmissionId);
+             ApiResponse<RestApiResultMobileAppsSubmissionStatus> localVarResponse = await GetSubmissionStatusAsyncWithHttpInfo(appId, submissionId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get submission status mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
+        /// <param name="submissionId"></param>
         /// <returns>Task of ApiResponse (RestApiResultMobileAppsSubmissionStatus)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmissionStatus>> GetSubmissionStatusAsyncWithHttpInfo (string appId, int? mobileAppsSubmissionId)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmissionStatus>> GetSubmissionStatusAsyncWithHttpInfo (string appId, int? submissionId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->GetSubmissionStatus");
-            // verify the required parameter 'mobileAppsSubmissionId' is set
-            if (mobileAppsSubmissionId == null)
-                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmissionId' when calling MobileAppsApi->GetSubmissionStatus");
+            // verify the required parameter 'submissionId' is set
+            if (submissionId == null)
+                throw new ApiException(400, "Missing required parameter 'submissionId' when calling MobileAppsApi->GetSubmissionStatus");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission/status";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/{submissionId}/status";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1091,7 +1237,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubm
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (mobileAppsSubmissionId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "mobileAppsSubmissionId", mobileAppsSubmissionId)); // query parameter
+            if (submissionId != null) localVarPathParams.Add("submissionId", this.Configuration.ApiClient.ParameterToString(submissionId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1114,40 +1260,42 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubm
             }
 
             return new ApiResponse<RestApiResultMobileAppsSubmissionStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMobileAppsSubmissionStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmissionStatus)));
         }
 
         /// <summary>
-        /// Submission form mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmission"></param>
-        /// <returns>RestApiResultMobileAppsSubmission</returns>
-        public RestApiResultMobileAppsSubmission Submission (string appId, MobileAppsSubmission mobileAppsSubmission)
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>RestApiResultRestApiIntegerResult</returns>
+        public RestApiResultRestApiIntegerResult Publish (string appId, int? submissionId, string platformType = null)
         {
-             ApiResponse<RestApiResultMobileAppsSubmission> localVarResponse = SubmissionWithHttpInfo(appId, mobileAppsSubmission);
+             ApiResponse<RestApiResultRestApiIntegerResult> localVarResponse = PublishWithHttpInfo(appId, submissionId, platformType);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Submission form mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmission"></param>
-        /// <returns>ApiResponse of RestApiResultMobileAppsSubmission</returns>
-        public ApiResponse< RestApiResultMobileAppsSubmission > SubmissionWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission)
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultRestApiIntegerResult</returns>
+        public ApiResponse< RestApiResultRestApiIntegerResult > PublishWithHttpInfo (string appId, int? submissionId, string platformType = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Submission");
-            // verify the required parameter 'mobileAppsSubmission' is set
-            if (mobileAppsSubmission == null)
-                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmission' when calling MobileAppsApi->Submission");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Publish");
+            // verify the required parameter 'submissionId' is set
+            if (submissionId == null)
+                throw new ApiException(400, "Missing required parameter 'submissionId' when calling MobileAppsApi->Publish");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/{submissionId}/publish";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1157,11 +1305,6 @@ public ApiResponse< RestApiResultMobileAppsSubmission > SubmissionWithHttpInfo (
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1177,15 +1320,94 @@ public ApiResponse< RestApiResultMobileAppsSubmission > SubmissionWithHttpInfo (
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (mobileAppsSubmission != null && mobileAppsSubmission.GetType() != typeof(byte[]))
+            if (submissionId != null) localVarPathParams.Add("submissionId", this.Configuration.ApiClient.ParameterToString(submissionId)); // path parameter
+            if (platformType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "platformType", platformType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(mobileAppsSubmission); // http body (model) parameter
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
             }
-            else
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
             {
-                localVarPostBody = mobileAppsSubmission; // byte array
+                Exception exception = ExceptionFactory("Publish", localVarResponse);
+                if (exception != null) throw exception;
             }
 
+            return new ApiResponse<RestApiResultRestApiIntegerResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestApiIntegerResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestApiIntegerResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>Task of RestApiResultRestApiIntegerResult</returns>
+        public async System.Threading.Tasks.Task<RestApiResultRestApiIntegerResult> PublishAsync (string appId, int? submissionId, string platformType = null)
+        {
+             ApiResponse<RestApiResultRestApiIntegerResult> localVarResponse = await PublishAsyncWithHttpInfo(appId, submissionId, platformType);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultRestApiIntegerResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRestApiIntegerResult>> PublishAsyncWithHttpInfo (string appId, int? submissionId, string platformType = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Publish");
+            // verify the required parameter 'submissionId' is set
+            if (submissionId == null)
+                throw new ApiException(400, "Missing required parameter 'submissionId' when calling MobileAppsApi->Publish");
+
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/{submissionId}/publish";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (submissionId != null) localVarPathParams.Add("submissionId", this.Configuration.ApiClient.ParameterToString(submissionId)); // path parameter
+            if (platformType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "platformType", platformType)); // query parameter
+
             // authentication (oauth2) required
             // oauth required
             if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
@@ -1194,7 +1416,7 @@ public ApiResponse< RestApiResultMobileAppsSubmission > SubmissionWithHttpInfo (
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
                 Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
@@ -1202,46 +1424,45 @@ public ApiResponse< RestApiResultMobileAppsSubmission > SubmissionWithHttpInfo (
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("Submission", localVarResponse);
+                Exception exception = ExceptionFactory("Publish", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultMobileAppsSubmission>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultMobileAppsSubmission) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmission)));
+            return new ApiResponse<RestApiResultRestApiIntegerResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestApiIntegerResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestApiIntegerResult)));
         }
 
         /// <summary>
-        /// Submission form mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <param name="mobileAppsSubmission"></param>
-        /// <returns>Task of RestApiResultMobileAppsSubmission</returns>
-        public async System.Threading.Tasks.Task<RestApiResultMobileAppsSubmission> SubmissionAsync (string appId, MobileAppsSubmission mobileAppsSubmission)
+        /// <returns>RestApiResultMobileAppsSubmission</returns>
+        public RestApiResultMobileAppsSubmission Resubmission (string appId, MobileAppsSubmission mobileAppsSubmission)
         {
-             ApiResponse<RestApiResultMobileAppsSubmission> localVarResponse = await SubmissionAsyncWithHttpInfo(appId, mobileAppsSubmission);
+             ApiResponse<RestApiResultMobileAppsSubmission> localVarResponse = ResubmissionWithHttpInfo(appId, mobileAppsSubmission);
              return localVarResponse.Data;
-
         }
 
         /// <summary>
-        /// Submission form mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <param name="mobileAppsSubmission"></param>
-        /// <returns>Task of ApiResponse (RestApiResultMobileAppsSubmission)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmission>> SubmissionAsyncWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission)
+        /// <returns>ApiResponse of RestApiResultMobileAppsSubmission</returns>
+        public ApiResponse< RestApiResultMobileAppsSubmission > ResubmissionWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Submission");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Resubmission");
             // verify the required parameter 'mobileAppsSubmission' is set
             if (mobileAppsSubmission == null)
-                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmission' when calling MobileAppsApi->Submission");
+                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmission' when calling MobileAppsApi->Resubmission");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/resubmission";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1288,7 +1509,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubm
             }
 
             // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
                 Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
@@ -1296,17 +1517,467 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubm
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("Submission", localVarResponse);
+                Exception exception = ExceptionFactory("Resubmission", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<RestApiResultMobileAppsSubmission>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMobileAppsSubmission) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmission)));
         }
 
         /// <summary>
-        /// Update the application sales channel configuration 
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>Task of RestApiResultMobileAppsSubmission</returns>
+        public async System.Threading.Tasks.Task<RestApiResultMobileAppsSubmission> ResubmissionAsync (string appId, MobileAppsSubmission mobileAppsSubmission)
+        {
+             ApiResponse<RestApiResultMobileAppsSubmission> localVarResponse = await ResubmissionAsyncWithHttpInfo(appId, mobileAppsSubmission);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>Task of ApiResponse (RestApiResultMobileAppsSubmission)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmission>> ResubmissionAsyncWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Resubmission");
+            // verify the required parameter 'mobileAppsSubmission' is set
+            if (mobileAppsSubmission == null)
+                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmission' when calling MobileAppsApi->Resubmission");
+
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/resubmission";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (mobileAppsSubmission != null && mobileAppsSubmission.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(mobileAppsSubmission); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = mobileAppsSubmission; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("Resubmission", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMobileAppsSubmission>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMobileAppsSubmission) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmission)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>RestApiResultMobileAppsSubmission</returns>
+        public RestApiResultMobileAppsSubmission Submission (string appId, MobileAppsSubmission mobileAppsSubmission)
+        {
+             ApiResponse<RestApiResultMobileAppsSubmission> localVarResponse = SubmissionWithHttpInfo(appId, mobileAppsSubmission);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>ApiResponse of RestApiResultMobileAppsSubmission</returns>
+        public ApiResponse< RestApiResultMobileAppsSubmission > SubmissionWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Submission");
+            // verify the required parameter 'mobileAppsSubmission' is set
+            if (mobileAppsSubmission == null)
+                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmission' when calling MobileAppsApi->Submission");
+
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (mobileAppsSubmission != null && mobileAppsSubmission.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(mobileAppsSubmission); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = mobileAppsSubmission; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("Submission", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMobileAppsSubmission>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMobileAppsSubmission) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmission)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>Task of RestApiResultMobileAppsSubmission</returns>
+        public async System.Threading.Tasks.Task<RestApiResultMobileAppsSubmission> SubmissionAsync (string appId, MobileAppsSubmission mobileAppsSubmission)
+        {
+             ApiResponse<RestApiResultMobileAppsSubmission> localVarResponse = await SubmissionAsyncWithHttpInfo(appId, mobileAppsSubmission);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="mobileAppsSubmission"></param>
+        /// <returns>Task of ApiResponse (RestApiResultMobileAppsSubmission)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsSubmission>> SubmissionAsyncWithHttpInfo (string appId, MobileAppsSubmission mobileAppsSubmission)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Submission");
+            // verify the required parameter 'mobileAppsSubmission' is set
+            if (mobileAppsSubmission == null)
+                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmission' when calling MobileAppsApi->Submission");
+
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (mobileAppsSubmission != null && mobileAppsSubmission.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(mobileAppsSubmission); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = mobileAppsSubmission; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("Submission", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultMobileAppsSubmission>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultMobileAppsSubmission) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsSubmission)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>RestApiIntegerResult</returns>
+        public RestApiIntegerResult Unpublish (string appId, int? submissionId, string platformType = null)
+        {
+             ApiResponse<RestApiIntegerResult> localVarResponse = UnpublishWithHttpInfo(appId, submissionId, platformType);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>ApiResponse of RestApiIntegerResult</returns>
+        public ApiResponse< RestApiIntegerResult > UnpublishWithHttpInfo (string appId, int? submissionId, string platformType = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Unpublish");
+            // verify the required parameter 'submissionId' is set
+            if (submissionId == null)
+                throw new ApiException(400, "Missing required parameter 'submissionId' when calling MobileAppsApi->Unpublish");
+
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/{submissionId}/unpublish";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (submissionId != null) localVarPathParams.Add("submissionId", this.Configuration.ApiClient.ParameterToString(submissionId)); // path parameter
+            if (platformType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "platformType", platformType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("Unpublish", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiIntegerResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiIntegerResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiIntegerResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>Task of RestApiIntegerResult</returns>
+        public async System.Threading.Tasks.Task<RestApiIntegerResult> UnpublishAsync (string appId, int? submissionId, string platformType = null)
+        {
+             ApiResponse<RestApiIntegerResult> localVarResponse = await UnpublishAsyncWithHttpInfo(appId, submissionId, platformType);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="platformType"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiIntegerResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiIntegerResult>> UnpublishAsyncWithHttpInfo (string appId, int? submissionId, string platformType = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->Unpublish");
+            // verify the required parameter 'submissionId' is set
+            if (submissionId == null)
+                throw new ApiException(400, "Missing required parameter 'submissionId' when calling MobileAppsApi->Unpublish");
+
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/{submissionId}/unpublish";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (submissionId != null) localVarPathParams.Add("submissionId", this.Configuration.ApiClient.ParameterToString(submissionId)); // path parameter
+            if (platformType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "platformType", platformType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("Unpublish", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiIntegerResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiIntegerResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiIntegerResult)));
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1319,7 +1990,7 @@ public RestApiResultAppConfigSalesChannel UpdateAppConfigSalesChannel (string ap
         }
 
         /// <summary>
-        /// Update the application sales channel configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1334,7 +2005,7 @@ public ApiResponse< RestApiResultAppConfigSalesChannel > UpdateAppConfigSalesCha
             if (appConfigSalesChannel == null)
                 throw new ApiException(400, "Missing required parameter 'appConfigSalesChannel' when calling MobileAppsApi->UpdateAppConfigSalesChannel");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/saleschannel";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/saleschannel";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1394,12 +2065,12 @@ public ApiResponse< RestApiResultAppConfigSalesChannel > UpdateAppConfigSalesCha
             }
 
             return new ApiResponse<RestApiResultAppConfigSalesChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAppConfigSalesChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppConfigSalesChannel)));
         }
 
         /// <summary>
-        /// Update the application sales channel configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1413,7 +2084,7 @@ public async System.Threading.Tasks.Task<RestApiResultAppConfigSalesChannel> Upd
         }
 
         /// <summary>
-        /// Update the application sales channel configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1428,7 +2099,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppConfigSales
             if (appConfigSalesChannel == null)
                 throw new ApiException(400, "Missing required parameter 'appConfigSalesChannel' when calling MobileAppsApi->UpdateAppConfigSalesChannel");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/saleschannel";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/saleschannel";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1488,45 +2159,45 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppConfigSales
             }
 
             return new ApiResponse<RestApiResultAppConfigSalesChannel>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAppConfigSalesChannel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppConfigSalesChannel)));
         }
 
         /// <summary>
-        /// Update submission status 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
-        /// <param name="updateMobileAppsSubmissionStatus"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="updateSubmissionStatus"></param>
         /// <returns>RestApiResultUpdateMobileAppsSubmissionStatus</returns>
-        public RestApiResultUpdateMobileAppsSubmissionStatus UpdateSubmissionStatus (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus)
+        public RestApiResultUpdateMobileAppsSubmissionStatus UpdateSubmissionStatus (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus)
         {
-             ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus> localVarResponse = UpdateSubmissionStatusWithHttpInfo(appId, mobileAppsSubmissionId, updateMobileAppsSubmissionStatus);
+             ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus> localVarResponse = UpdateSubmissionStatusWithHttpInfo(appId, submissionId, updateSubmissionStatus);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Update submission status 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
-        /// <param name="updateMobileAppsSubmissionStatus"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="updateSubmissionStatus"></param>
         /// <returns>ApiResponse of RestApiResultUpdateMobileAppsSubmissionStatus</returns>
-        public ApiResponse< RestApiResultUpdateMobileAppsSubmissionStatus > UpdateSubmissionStatusWithHttpInfo (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus)
+        public ApiResponse< RestApiResultUpdateMobileAppsSubmissionStatus > UpdateSubmissionStatusWithHttpInfo (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->UpdateSubmissionStatus");
-            // verify the required parameter 'mobileAppsSubmissionId' is set
-            if (mobileAppsSubmissionId == null)
-                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmissionId' when calling MobileAppsApi->UpdateSubmissionStatus");
-            // verify the required parameter 'updateMobileAppsSubmissionStatus' is set
-            if (updateMobileAppsSubmissionStatus == null)
-                throw new ApiException(400, "Missing required parameter 'updateMobileAppsSubmissionStatus' when calling MobileAppsApi->UpdateSubmissionStatus");
-
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission/{mobileAppsSubmissionId}/status";
+            // verify the required parameter 'submissionId' is set
+            if (submissionId == null)
+                throw new ApiException(400, "Missing required parameter 'submissionId' when calling MobileAppsApi->UpdateSubmissionStatus");
+            // verify the required parameter 'updateSubmissionStatus' is set
+            if (updateSubmissionStatus == null)
+                throw new ApiException(400, "Missing required parameter 'updateSubmissionStatus' when calling MobileAppsApi->UpdateSubmissionStatus");
+
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/{submissionId}/status";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1556,14 +2227,14 @@ public ApiResponse< RestApiResultUpdateMobileAppsSubmissionStatus > UpdateSubmis
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (mobileAppsSubmissionId != null) localVarPathParams.Add("mobileAppsSubmissionId", this.Configuration.ApiClient.ParameterToString(mobileAppsSubmissionId)); // path parameter
-            if (updateMobileAppsSubmissionStatus != null && updateMobileAppsSubmissionStatus.GetType() != typeof(byte[]))
+            if (submissionId != null) localVarPathParams.Add("submissionId", this.Configuration.ApiClient.ParameterToString(submissionId)); // path parameter
+            if (updateSubmissionStatus != null && updateSubmissionStatus.GetType() != typeof(byte[]))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(updateMobileAppsSubmissionStatus); // http body (model) parameter
+                localVarPostBody = this.Configuration.ApiClient.Serialize(updateSubmissionStatus); // http body (model) parameter
             }
             else
             {
-                localVarPostBody = updateMobileAppsSubmissionStatus; // byte array
+                localVarPostBody = updateSubmissionStatus; // byte array
             }
 
             // authentication (oauth2) required
@@ -1587,46 +2258,46 @@ public ApiResponse< RestApiResultUpdateMobileAppsSubmissionStatus > UpdateSubmis
             }
 
             return new ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultUpdateMobileAppsSubmissionStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUpdateMobileAppsSubmissionStatus)));
         }
 
         /// <summary>
-        /// Update submission status 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
-        /// <param name="updateMobileAppsSubmissionStatus"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="updateSubmissionStatus"></param>
         /// <returns>Task of RestApiResultUpdateMobileAppsSubmissionStatus</returns>
-        public async System.Threading.Tasks.Task<RestApiResultUpdateMobileAppsSubmissionStatus> UpdateSubmissionStatusAsync (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus)
+        public async System.Threading.Tasks.Task<RestApiResultUpdateMobileAppsSubmissionStatus> UpdateSubmissionStatusAsync (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus)
         {
-             ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus> localVarResponse = await UpdateSubmissionStatusAsyncWithHttpInfo(appId, mobileAppsSubmissionId, updateMobileAppsSubmissionStatus);
+             ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus> localVarResponse = await UpdateSubmissionStatusAsyncWithHttpInfo(appId, submissionId, updateSubmissionStatus);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Update submission status 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="mobileAppsSubmissionId"></param>
-        /// <param name="updateMobileAppsSubmissionStatus"></param>
+        /// <param name="submissionId"></param>
+        /// <param name="updateSubmissionStatus"></param>
         /// <returns>Task of ApiResponse (RestApiResultUpdateMobileAppsSubmissionStatus)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus>> UpdateSubmissionStatusAsyncWithHttpInfo (string appId, int? mobileAppsSubmissionId, UpdateMobileAppsSubmissionStatus updateMobileAppsSubmissionStatus)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus>> UpdateSubmissionStatusAsyncWithHttpInfo (string appId, int? submissionId, UpdateMobileAppsSubmissionStatus updateSubmissionStatus)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling MobileAppsApi->UpdateSubmissionStatus");
-            // verify the required parameter 'mobileAppsSubmissionId' is set
-            if (mobileAppsSubmissionId == null)
-                throw new ApiException(400, "Missing required parameter 'mobileAppsSubmissionId' when calling MobileAppsApi->UpdateSubmissionStatus");
-            // verify the required parameter 'updateMobileAppsSubmissionStatus' is set
-            if (updateMobileAppsSubmissionStatus == null)
-                throw new ApiException(400, "Missing required parameter 'updateMobileAppsSubmissionStatus' when calling MobileAppsApi->UpdateSubmissionStatus");
-
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission/{mobileAppsSubmissionId}/status";
+            // verify the required parameter 'submissionId' is set
+            if (submissionId == null)
+                throw new ApiException(400, "Missing required parameter 'submissionId' when calling MobileAppsApi->UpdateSubmissionStatus");
+            // verify the required parameter 'updateSubmissionStatus' is set
+            if (updateSubmissionStatus == null)
+                throw new ApiException(400, "Missing required parameter 'updateSubmissionStatus' when calling MobileAppsApi->UpdateSubmissionStatus");
+
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/{submissionId}/status";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1656,14 +2327,14 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUpdateMobileAp
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (mobileAppsSubmissionId != null) localVarPathParams.Add("mobileAppsSubmissionId", this.Configuration.ApiClient.ParameterToString(mobileAppsSubmissionId)); // path parameter
-            if (updateMobileAppsSubmissionStatus != null && updateMobileAppsSubmissionStatus.GetType() != typeof(byte[]))
+            if (submissionId != null) localVarPathParams.Add("submissionId", this.Configuration.ApiClient.ParameterToString(submissionId)); // path parameter
+            if (updateSubmissionStatus != null && updateSubmissionStatus.GetType() != typeof(byte[]))
             {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(updateMobileAppsSubmissionStatus); // http body (model) parameter
+                localVarPostBody = this.Configuration.ApiClient.Serialize(updateSubmissionStatus); // http body (model) parameter
             }
             else
             {
-                localVarPostBody = updateMobileAppsSubmissionStatus; // byte array
+                localVarPostBody = updateSubmissionStatus; // byte array
             }
 
             // authentication (oauth2) required
@@ -1687,12 +2358,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUpdateMobileAp
             }
 
             return new ApiResponse<RestApiResultUpdateMobileAppsSubmissionStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultUpdateMobileAppsSubmissionStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUpdateMobileAppsSubmissionStatus)));
         }
 
         /// <summary>
-        /// Upload image mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1705,7 +2376,7 @@ public RestApiResultMobileAppsImage UploadImage (string appId, System.IO.Stream
         }
 
         /// <summary>
-        /// Upload image mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1720,7 +2391,7 @@ public ApiResponse< RestApiResultMobileAppsImage > UploadImageWithHttpInfo (stri
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MobileAppsApi->UploadImage");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission/image";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1769,12 +2440,12 @@ public ApiResponse< RestApiResultMobileAppsImage > UploadImageWithHttpInfo (stri
             }
 
             return new ApiResponse<RestApiResultMobileAppsImage>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMobileAppsImage) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsImage)));
         }
 
         /// <summary>
-        /// Upload image mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1788,7 +2459,7 @@ public async System.Threading.Tasks.Task<RestApiResultMobileAppsImage> UploadIma
         }
 
         /// <summary>
-        /// Upload image mobile apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1803,7 +2474,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsImag
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling MobileAppsApi->UploadImage");
 
-            var localVarPath = "/api/v1.0/mobileapps/{appId}/submission/image";
+            var localVarPath = "./api/v1.0/mobileapps/{appId}/submission/image";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1852,7 +2523,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultMobileAppsImag
             }
 
             return new ApiResponse<RestApiResultMobileAppsImage>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultMobileAppsImage) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultMobileAppsImage)));
         }
 
diff --git a/src/Flipdish/Api/OAuthClientsApi.cs b/src/Flipdish/Api/OAuthClientsApi.cs
index 5a26fc89..34b6651d 100644
--- a/src/Flipdish/Api/OAuthClientsApi.cs
+++ b/src/Flipdish/Api/OAuthClientsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,78 +25,78 @@ public interface IOAuthClientsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create OAuth App redirect uri
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uri">Redirect uri</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uri"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiResultOauthClientRedirectUri</returns>
         RestApiResultOauthClientRedirectUri AddRedirectUri (string oauthAppId, string uri, string appId);
 
         /// <summary>
-        /// Create OAuth App redirect uri
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uri">Redirect uri</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uri"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultOauthClientRedirectUri</returns>
         ApiResponse<RestApiResultOauthClientRedirectUri> AddRedirectUriWithHttpInfo (string oauthAppId, string uri, string appId);
         /// <summary>
-        /// Create OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void CreateOAuthApp (OAuthApp oAuthApp, string appId);
 
         /// <summary>
-        /// Create OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> CreateOAuthAppWithHttpInfo (OAuthApp oAuthApp, string appId);
         /// <summary>
-        /// Delete OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void DeleteOAuthApp (string oauthAppId, string appId);
 
         /// <summary>
-        /// Delete OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteOAuthAppWithHttpInfo (string oauthAppId, string appId);
         /// <summary>
-        /// Get all OAuth Apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -108,7 +108,7 @@ public interface IOAuthClientsApi : IApiAccessor
         RestApiArrayResultOAuthApp GetOAuthApps (string appId, string oauthAppName = null);
 
         /// <summary>
-        /// Get all OAuth Apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -119,94 +119,94 @@ public interface IOAuthClientsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultOAuthApp</returns>
         ApiResponse<RestApiArrayResultOAuthApp> GetOAuthAppsWithHttpInfo (string appId, string oauthAppName = null);
         /// <summary>
-        /// Get OAuth App by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiResultOAuthApp</returns>
         RestApiResultOAuthApp GetOAuthClientByClientId (string oauthAppId, string appId);
 
         /// <summary>
-        /// Get OAuth App by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultOAuthApp</returns>
         ApiResponse<RestApiResultOAuthApp> GetOAuthClientByClientIdWithHttpInfo (string oauthAppId, string appId);
         /// <summary>
-        /// Get OAuth App secret key
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiStringResult</returns>
         RestApiStringResult GetOAuthClientSecret (string oauthAppId, string appId);
 
         /// <summary>
-        /// Get OAuth App secret key
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         ApiResponse<RestApiStringResult> GetOAuthClientSecretWithHttpInfo (string oauthAppId, string appId);
         /// <summary>
-        /// Get OAuth access token for App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiStringResult</returns>
         RestApiStringResult GetOauthAccessToken (string oauthAppId, string appId);
 
         /// <summary>
-        /// Get OAuth access token for App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         ApiResponse<RestApiStringResult> GetOauthAccessTokenWithHttpInfo (string oauthAppId, string appId);
         /// <summary>
-        /// Get OAuth App redirect uris
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiArrayResultOauthClientRedirectUri</returns>
         RestApiArrayResultOauthClientRedirectUri GetRedirectUris (string oauthAppId, string appId);
 
         /// <summary>
-        /// Get OAuth App redirect uris
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultOauthClientRedirectUri</returns>
         ApiResponse<RestApiArrayResultOauthClientRedirectUri> GetRedirectUrisWithHttpInfo (string oauthAppId, string appId);
@@ -232,130 +232,130 @@ public interface IOAuthClientsApi : IApiAccessor
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> OAuthClientsGetApplicationsWithHttpInfo (string appId);
         /// <summary>
-        /// Delete OAuth App redirect uri
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uriId">Redirect uri identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uriId"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void RemoveRedirectUri (string oauthAppId, int? uriId, string appId);
 
         /// <summary>
-        /// Delete OAuth App redirect uri
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uriId">Redirect uri identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uriId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RemoveRedirectUriWithHttpInfo (string oauthAppId, int? uriId, string appId);
         /// <summary>
-        /// Update OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void UpdateOAuthApp (string oauthAppId, OAuthApp oAuthApp, string appId);
 
         /// <summary>
-        /// Update OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateOAuthAppWithHttpInfo (string oauthAppId, OAuthApp oAuthApp, string appId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create OAuth App redirect uri
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uri">Redirect uri</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uri"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiResultOauthClientRedirectUri</returns>
         System.Threading.Tasks.Task<RestApiResultOauthClientRedirectUri> AddRedirectUriAsync (string oauthAppId, string uri, string appId);
 
         /// <summary>
-        /// Create OAuth App redirect uri
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uri">Redirect uri</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uri"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOauthClientRedirectUri)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultOauthClientRedirectUri>> AddRedirectUriAsyncWithHttpInfo (string oauthAppId, string uri, string appId);
         /// <summary>
-        /// Create OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task CreateOAuthAppAsync (OAuthApp oAuthApp, string appId);
 
         /// <summary>
-        /// Create OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> CreateOAuthAppAsyncWithHttpInfo (OAuthApp oAuthApp, string appId);
         /// <summary>
-        /// Delete OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeleteOAuthAppAsync (string oauthAppId, string appId);
 
         /// <summary>
-        /// Delete OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOAuthAppAsyncWithHttpInfo (string oauthAppId, string appId);
         /// <summary>
-        /// Get all OAuth Apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -367,7 +367,7 @@ public interface IOAuthClientsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultOAuthApp> GetOAuthAppsAsync (string appId, string oauthAppName = null);
 
         /// <summary>
-        /// Get all OAuth Apps
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -378,94 +378,94 @@ public interface IOAuthClientsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultOAuthApp)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOAuthApp>> GetOAuthAppsAsyncWithHttpInfo (string appId, string oauthAppName = null);
         /// <summary>
-        /// Get OAuth App by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiResultOAuthApp</returns>
         System.Threading.Tasks.Task<RestApiResultOAuthApp> GetOAuthClientByClientIdAsync (string oauthAppId, string appId);
 
         /// <summary>
-        /// Get OAuth App by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOAuthApp)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultOAuthApp>> GetOAuthClientByClientIdAsyncWithHttpInfo (string oauthAppId, string appId);
         /// <summary>
-        /// Get OAuth App secret key
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         System.Threading.Tasks.Task<RestApiStringResult> GetOAuthClientSecretAsync (string oauthAppId, string appId);
 
         /// <summary>
-        /// Get OAuth App secret key
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetOAuthClientSecretAsyncWithHttpInfo (string oauthAppId, string appId);
         /// <summary>
-        /// Get OAuth access token for App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         System.Threading.Tasks.Task<RestApiStringResult> GetOauthAccessTokenAsync (string oauthAppId, string appId);
 
         /// <summary>
-        /// Get OAuth access token for App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetOauthAccessTokenAsyncWithHttpInfo (string oauthAppId, string appId);
         /// <summary>
-        /// Get OAuth App redirect uris
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultOauthClientRedirectUri</returns>
         System.Threading.Tasks.Task<RestApiArrayResultOauthClientRedirectUri> GetRedirectUrisAsync (string oauthAppId, string appId);
 
         /// <summary>
-        /// Get OAuth App redirect uris
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultOauthClientRedirectUri)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOauthClientRedirectUri>> GetRedirectUrisAsyncWithHttpInfo (string oauthAppId, string appId);
@@ -491,52 +491,52 @@ public interface IOAuthClientsApi : IApiAccessor
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> OAuthClientsGetApplicationsAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Delete OAuth App redirect uri
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uriId">Redirect uri identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uriId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task RemoveRedirectUriAsync (string oauthAppId, int? uriId, string appId);
 
         /// <summary>
-        /// Delete OAuth App redirect uri
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uriId">Redirect uri identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uriId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RemoveRedirectUriAsyncWithHttpInfo (string oauthAppId, int? uriId, string appId);
         /// <summary>
-        /// Update OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateOAuthAppAsync (string oauthAppId, OAuthApp oAuthApp, string appId);
 
         /// <summary>
-        /// Update OAuth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateOAuthAppAsyncWithHttpInfo (string oauthAppId, OAuthApp oAuthApp, string appId);
@@ -641,11 +641,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create OAuth App redirect uri 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uri">Redirect uri</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uri"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiResultOauthClientRedirectUri</returns>
         public RestApiResultOauthClientRedirectUri AddRedirectUri (string oauthAppId, string uri, string appId)
@@ -655,11 +655,11 @@ public RestApiResultOauthClientRedirectUri AddRedirectUri (string oauthAppId, st
         }
 
         /// <summary>
-        /// Create OAuth App redirect uri 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uri">Redirect uri</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uri"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultOauthClientRedirectUri</returns>
         public ApiResponse< RestApiResultOauthClientRedirectUri > AddRedirectUriWithHttpInfo (string oauthAppId, string uri, string appId)
@@ -674,7 +674,7 @@ public ApiResponse< RestApiResultOauthClientRedirectUri > AddRedirectUriWithHttp
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->AddRedirectUri");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -735,16 +735,16 @@ public ApiResponse< RestApiResultOauthClientRedirectUri > AddRedirectUriWithHttp
             }
 
             return new ApiResponse<RestApiResultOauthClientRedirectUri>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOauthClientRedirectUri) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOauthClientRedirectUri)));
         }
 
         /// <summary>
-        /// Create OAuth App redirect uri 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uri">Redirect uri</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uri"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiResultOauthClientRedirectUri</returns>
         public async System.Threading.Tasks.Task<RestApiResultOauthClientRedirectUri> AddRedirectUriAsync (string oauthAppId, string uri, string appId)
@@ -755,11 +755,11 @@ public async System.Threading.Tasks.Task<RestApiResultOauthClientRedirectUri> Ad
         }
 
         /// <summary>
-        /// Create OAuth App redirect uri 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uri">Redirect uri</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uri"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOauthClientRedirectUri)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOauthClientRedirectUri>> AddRedirectUriAsyncWithHttpInfo (string oauthAppId, string uri, string appId)
@@ -774,7 +774,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOauthClientRed
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->AddRedirectUri");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -835,15 +835,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOauthClientRed
             }
 
             return new ApiResponse<RestApiResultOauthClientRedirectUri>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOauthClientRedirectUri) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOauthClientRedirectUri)));
         }
 
         /// <summary>
-        /// Create OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void CreateOAuthApp (OAuthApp oAuthApp, string appId)
@@ -852,10 +852,10 @@ public void CreateOAuthApp (OAuthApp oAuthApp, string appId)
         }
 
         /// <summary>
-        /// Create OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> CreateOAuthAppWithHttpInfo (OAuthApp oAuthApp, string appId)
@@ -867,7 +867,7 @@ public ApiResponse<Object> CreateOAuthAppWithHttpInfo (OAuthApp oAuthApp, string
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->CreateOAuthApp");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -927,15 +927,15 @@ public ApiResponse<Object> CreateOAuthAppWithHttpInfo (OAuthApp oAuthApp, string
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Create OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task CreateOAuthAppAsync (OAuthApp oAuthApp, string appId)
@@ -945,10 +945,10 @@ public async System.Threading.Tasks.Task CreateOAuthAppAsync (OAuthApp oAuthApp,
         }
 
         /// <summary>
-        /// Create OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateOAuthAppAsyncWithHttpInfo (OAuthApp oAuthApp, string appId)
@@ -960,7 +960,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateOAuthAppAsyn
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->CreateOAuthApp");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1020,15 +1020,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateOAuthAppAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void DeleteOAuthApp (string oauthAppId, string appId)
@@ -1037,10 +1037,10 @@ public void DeleteOAuthApp (string oauthAppId, string appId)
         }
 
         /// <summary>
-        /// Delete OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteOAuthAppWithHttpInfo (string oauthAppId, string appId)
@@ -1052,7 +1052,7 @@ public ApiResponse<Object> DeleteOAuthAppWithHttpInfo (string oauthAppId, string
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->DeleteOAuthApp");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1100,15 +1100,15 @@ public ApiResponse<Object> DeleteOAuthAppWithHttpInfo (string oauthAppId, string
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeleteOAuthAppAsync (string oauthAppId, string appId)
@@ -1118,10 +1118,10 @@ public async System.Threading.Tasks.Task DeleteOAuthAppAsync (string oauthAppId,
         }
 
         /// <summary>
-        /// Delete OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOAuthAppAsyncWithHttpInfo (string oauthAppId, string appId)
@@ -1133,7 +1133,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOAuthAppAsyn
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->DeleteOAuthApp");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1181,12 +1181,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteOAuthAppAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Get all OAuth Apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1199,7 +1199,7 @@ public RestApiArrayResultOAuthApp GetOAuthApps (string appId, string oauthAppNam
         }
 
         /// <summary>
-        /// Get all OAuth Apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1211,7 +1211,7 @@ public ApiResponse< RestApiArrayResultOAuthApp > GetOAuthAppsWithHttpInfo (strin
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetOAuthApps");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1259,12 +1259,12 @@ public ApiResponse< RestApiArrayResultOAuthApp > GetOAuthAppsWithHttpInfo (strin
             }
 
             return new ApiResponse<RestApiArrayResultOAuthApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultOAuthApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOAuthApp)));
         }
 
         /// <summary>
-        /// Get all OAuth Apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1278,7 +1278,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultOAuthApp> GetOAuthApp
         }
 
         /// <summary>
-        /// Get all OAuth Apps 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1290,7 +1290,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOAuthApp>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetOAuthApps");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1338,15 +1338,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOAuthApp>
             }
 
             return new ApiResponse<RestApiArrayResultOAuthApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultOAuthApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOAuthApp)));
         }
 
         /// <summary>
-        /// Get OAuth App by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiResultOAuthApp</returns>
         public RestApiResultOAuthApp GetOAuthClientByClientId (string oauthAppId, string appId)
@@ -1356,10 +1356,10 @@ public RestApiResultOAuthApp GetOAuthClientByClientId (string oauthAppId, string
         }
 
         /// <summary>
-        /// Get OAuth App by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultOAuthApp</returns>
         public ApiResponse< RestApiResultOAuthApp > GetOAuthClientByClientIdWithHttpInfo (string oauthAppId, string appId)
@@ -1371,7 +1371,7 @@ public ApiResponse< RestApiResultOAuthApp > GetOAuthClientByClientIdWithHttpInfo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetOAuthClientByClientId");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1419,15 +1419,15 @@ public ApiResponse< RestApiResultOAuthApp > GetOAuthClientByClientIdWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultOAuthApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOAuthApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOAuthApp)));
         }
 
         /// <summary>
-        /// Get OAuth App by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiResultOAuthApp</returns>
         public async System.Threading.Tasks.Task<RestApiResultOAuthApp> GetOAuthClientByClientIdAsync (string oauthAppId, string appId)
@@ -1438,10 +1438,10 @@ public async System.Threading.Tasks.Task<RestApiResultOAuthApp> GetOAuthClientBy
         }
 
         /// <summary>
-        /// Get OAuth App by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOAuthApp)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOAuthApp>> GetOAuthClientByClientIdAsyncWithHttpInfo (string oauthAppId, string appId)
@@ -1453,7 +1453,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOAuthApp>> Get
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetOAuthClientByClientId");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1501,15 +1501,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOAuthApp>> Get
             }
 
             return new ApiResponse<RestApiResultOAuthApp>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOAuthApp) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOAuthApp)));
         }
 
         /// <summary>
-        /// Get OAuth App secret key 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiStringResult</returns>
         public RestApiStringResult GetOAuthClientSecret (string oauthAppId, string appId)
@@ -1519,10 +1519,10 @@ public RestApiStringResult GetOAuthClientSecret (string oauthAppId, string appId
         }
 
         /// <summary>
-        /// Get OAuth App secret key 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         public ApiResponse< RestApiStringResult > GetOAuthClientSecretWithHttpInfo (string oauthAppId, string appId)
@@ -1534,7 +1534,7 @@ public ApiResponse< RestApiStringResult > GetOAuthClientSecretWithHttpInfo (stri
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetOAuthClientSecret");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/secret";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/secret";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1582,15 +1582,15 @@ public ApiResponse< RestApiStringResult > GetOAuthClientSecretWithHttpInfo (stri
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get OAuth App secret key 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         public async System.Threading.Tasks.Task<RestApiStringResult> GetOAuthClientSecretAsync (string oauthAppId, string appId)
@@ -1601,10 +1601,10 @@ public async System.Threading.Tasks.Task<RestApiStringResult> GetOAuthClientSecr
         }
 
         /// <summary>
-        /// Get OAuth App secret key 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetOAuthClientSecretAsyncWithHttpInfo (string oauthAppId, string appId)
@@ -1616,7 +1616,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetOA
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetOAuthClientSecret");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/secret";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/secret";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1664,15 +1664,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetOA
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get OAuth access token for App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiStringResult</returns>
         public RestApiStringResult GetOauthAccessToken (string oauthAppId, string appId)
@@ -1682,10 +1682,10 @@ public RestApiStringResult GetOauthAccessToken (string oauthAppId, string appId)
         }
 
         /// <summary>
-        /// Get OAuth access token for App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiStringResult</returns>
         public ApiResponse< RestApiStringResult > GetOauthAccessTokenWithHttpInfo (string oauthAppId, string appId)
@@ -1697,7 +1697,7 @@ public ApiResponse< RestApiStringResult > GetOauthAccessTokenWithHttpInfo (strin
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetOauthAccessToken");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/accesstoken";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/accesstoken";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1745,15 +1745,15 @@ public ApiResponse< RestApiStringResult > GetOauthAccessTokenWithHttpInfo (strin
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get OAuth access token for App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiStringResult</returns>
         public async System.Threading.Tasks.Task<RestApiStringResult> GetOauthAccessTokenAsync (string oauthAppId, string appId)
@@ -1764,10 +1764,10 @@ public async System.Threading.Tasks.Task<RestApiStringResult> GetOauthAccessToke
         }
 
         /// <summary>
-        /// Get OAuth access token for App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetOauthAccessTokenAsyncWithHttpInfo (string oauthAppId, string appId)
@@ -1779,7 +1779,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetOa
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetOauthAccessToken");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/accesstoken";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/accesstoken";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1827,15 +1827,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetOa
             }
 
             return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
         }
 
         /// <summary>
-        /// Get OAuth App redirect uris 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiArrayResultOauthClientRedirectUri</returns>
         public RestApiArrayResultOauthClientRedirectUri GetRedirectUris (string oauthAppId, string appId)
@@ -1845,10 +1845,10 @@ public RestApiArrayResultOauthClientRedirectUri GetRedirectUris (string oauthApp
         }
 
         /// <summary>
-        /// Get OAuth App redirect uris 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiArrayResultOauthClientRedirectUri</returns>
         public ApiResponse< RestApiArrayResultOauthClientRedirectUri > GetRedirectUrisWithHttpInfo (string oauthAppId, string appId)
@@ -1860,7 +1860,7 @@ public ApiResponse< RestApiArrayResultOauthClientRedirectUri > GetRedirectUrisWi
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetRedirectUris");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1908,15 +1908,15 @@ public ApiResponse< RestApiArrayResultOauthClientRedirectUri > GetRedirectUrisWi
             }
 
             return new ApiResponse<RestApiArrayResultOauthClientRedirectUri>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultOauthClientRedirectUri) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOauthClientRedirectUri)));
         }
 
         /// <summary>
-        /// Get OAuth App redirect uris 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiArrayResultOauthClientRedirectUri</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultOauthClientRedirectUri> GetRedirectUrisAsync (string oauthAppId, string appId)
@@ -1927,10 +1927,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultOauthClientRedirectUr
         }
 
         /// <summary>
-        /// Get OAuth App redirect uris 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultOauthClientRedirectUri)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOauthClientRedirectUri>> GetRedirectUrisAsyncWithHttpInfo (string oauthAppId, string appId)
@@ -1942,7 +1942,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOauthClie
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->GetRedirectUris");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1990,7 +1990,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOauthClie
             }
 
             return new ApiResponse<RestApiArrayResultOauthClientRedirectUri>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultOauthClientRedirectUri) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOauthClientRedirectUri)));
         }
 
@@ -2018,7 +2018,7 @@ public ApiResponse< Object > OAuthClientsGetApplicationsWithHttpInfo (string app
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->OAuthClientsGetApplications");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/appnames";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/appnames";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2065,7 +2065,7 @@ public ApiResponse< Object > OAuthClientsGetApplicationsWithHttpInfo (string app
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -2094,7 +2094,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OAuthClientsGetApp
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->OAuthClientsGetApplications");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/appnames";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/appnames";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2141,16 +2141,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OAuthClientsGetApp
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Delete OAuth App redirect uri 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uriId">Redirect uri identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uriId"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void RemoveRedirectUri (string oauthAppId, int? uriId, string appId)
@@ -2159,11 +2159,11 @@ public void RemoveRedirectUri (string oauthAppId, int? uriId, string appId)
         }
 
         /// <summary>
-        /// Delete OAuth App redirect uri 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uriId">Redirect uri identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uriId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> RemoveRedirectUriWithHttpInfo (string oauthAppId, int? uriId, string appId)
@@ -2178,7 +2178,7 @@ public ApiResponse<Object> RemoveRedirectUriWithHttpInfo (string oauthAppId, int
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->RemoveRedirectUri");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis/{uriId}";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis/{uriId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2227,16 +2227,16 @@ public ApiResponse<Object> RemoveRedirectUriWithHttpInfo (string oauthAppId, int
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete OAuth App redirect uri 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uriId">Redirect uri identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uriId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task RemoveRedirectUriAsync (string oauthAppId, int? uriId, string appId)
@@ -2246,11 +2246,11 @@ public async System.Threading.Tasks.Task RemoveRedirectUriAsync (string oauthApp
         }
 
         /// <summary>
-        /// Delete OAuth App redirect uri 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="uriId">Redirect uri identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="uriId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveRedirectUriAsyncWithHttpInfo (string oauthAppId, int? uriId, string appId)
@@ -2265,7 +2265,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveRedirectUriA
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->RemoveRedirectUri");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis/{uriId}";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}/redirecturis/{uriId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2314,16 +2314,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveRedirectUriA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void UpdateOAuthApp (string oauthAppId, OAuthApp oAuthApp, string appId)
@@ -2332,11 +2332,11 @@ public void UpdateOAuthApp (string oauthAppId, OAuthApp oAuthApp, string appId)
         }
 
         /// <summary>
-        /// Update OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateOAuthAppWithHttpInfo (string oauthAppId, OAuthApp oAuthApp, string appId)
@@ -2351,7 +2351,7 @@ public ApiResponse<Object> UpdateOAuthAppWithHttpInfo (string oauthAppId, OAuthA
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->UpdateOAuthApp");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2412,16 +2412,16 @@ public ApiResponse<Object> UpdateOAuthAppWithHttpInfo (string oauthAppId, OAuthA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateOAuthAppAsync (string oauthAppId, OAuthApp oAuthApp, string appId)
@@ -2431,11 +2431,11 @@ public async System.Threading.Tasks.Task UpdateOAuthAppAsync (string oauthAppId,
         }
 
         /// <summary>
-        /// Update OAuth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">OAuth App identifier</param>
-        /// <param name="oAuthApp">OAuth App</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="oAuthApp"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateOAuthAppAsyncWithHttpInfo (string oauthAppId, OAuthApp oAuthApp, string appId)
@@ -2450,7 +2450,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateOAuthAppAsyn
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OAuthClientsApi->UpdateOAuthApp");
 
-            var localVarPath = "/api/v1.0/{appId}/oauthclients/{oauthAppId}";
+            var localVarPath = "./api/v1.0/{appId}/oauthclients/{oauthAppId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2511,7 +2511,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateOAuthAppAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/OnboardingApi.cs b/src/Flipdish/Api/OnboardingApi.cs
index 99ad2c1f..bd971d65 100644
--- a/src/Flipdish/Api/OnboardingApi.cs
+++ b/src/Flipdish/Api/OnboardingApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -53,9 +53,31 @@ public interface IOnboardingApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
+        /// <returns>Object</returns>
+        Object OnboardingGetOnboardingConfigs (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> OnboardingGetOnboardingConfigsWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
         /// <param name="storeId"></param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>Object</returns>
-        Object OnboardingGetOnboardingItems (string appId, int? storeId);
+        Object OnboardingGetOnboardingItems (string appId, int? storeId, int? milestoneId = null);
 
         /// <summary>
         /// 
@@ -66,8 +88,34 @@ public interface IOnboardingApi : IApiAccessor
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <param name="storeId"></param>
+        /// <param name="milestoneId"> (optional)</param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> OnboardingGetOnboardingItemsWithHttpInfo (string appId, int? storeId, int? milestoneId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="milestoneId"> (optional)</param>
+        /// <returns>Object</returns>
+        Object OnboardingGetOnboardingItemsV2 (string appId, int? storeId = null, int? milestoneId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> OnboardingGetOnboardingItemsWithHttpInfo (string appId, int? storeId);
+        ApiResponse<Object> OnboardingGetOnboardingItemsV2WithHttpInfo (string appId, int? storeId = null, int? milestoneId = null);
         /// <summary>
         /// 
         /// </summary>
@@ -99,6 +147,31 @@ public interface IOnboardingApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Object</returns>
+        Object OnboardingUpdateOnboardingConfigById (string appId, int? configId, OnboardingConfigUpdate configUpdate);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> OnboardingUpdateOnboardingConfigByIdWithHttpInfo (string appId, int? configId, OnboardingConfigUpdate configUpdate);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
         /// <param name="storeId"></param>
         /// <param name="onboardingItemId"></param>
         /// <param name="itemUpdate"></param>
@@ -118,6 +191,33 @@ public interface IOnboardingApi : IApiAccessor
         /// <param name="itemUpdate"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> OnboardingUpdateOnboardingItemWithHttpInfo (string appId, int? storeId, int? onboardingItemId, OnboardingItemUpdate itemUpdate);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Object</returns>
+        Object OnboardingUpdateOnboardingItemV2 (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> OnboardingUpdateOnboardingItemV2WithHttpInfo (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
@@ -149,9 +249,31 @@ public interface IOnboardingApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> OnboardingGetOnboardingConfigsAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboardingConfigsAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
         /// <param name="storeId"></param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> OnboardingGetOnboardingItemsAsync (string appId, int? storeId);
+        System.Threading.Tasks.Task<Object> OnboardingGetOnboardingItemsAsync (string appId, int? storeId, int? milestoneId = null);
 
         /// <summary>
         /// 
@@ -162,8 +284,34 @@ public interface IOnboardingApi : IApiAccessor
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
         /// <param name="storeId"></param>
+        /// <param name="milestoneId"> (optional)</param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboardingItemsAsyncWithHttpInfo (string appId, int? storeId, int? milestoneId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="milestoneId"> (optional)</param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> OnboardingGetOnboardingItemsV2Async (string appId, int? storeId = null, int? milestoneId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboardingItemsAsyncWithHttpInfo (string appId, int? storeId);
+        System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboardingItemsV2AsyncWithHttpInfo (string appId, int? storeId = null, int? milestoneId = null);
         /// <summary>
         /// 
         /// </summary>
@@ -195,6 +343,31 @@ public interface IOnboardingApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> OnboardingUpdateOnboardingConfigByIdAsync (string appId, int? configId, OnboardingConfigUpdate configUpdate);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOnboardingConfigByIdAsyncWithHttpInfo (string appId, int? configId, OnboardingConfigUpdate configUpdate);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
         /// <param name="storeId"></param>
         /// <param name="onboardingItemId"></param>
         /// <param name="itemUpdate"></param>
@@ -214,6 +387,33 @@ public interface IOnboardingApi : IApiAccessor
         /// <param name="itemUpdate"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOnboardingItemAsyncWithHttpInfo (string appId, int? storeId, int? onboardingItemId, OnboardingItemUpdate itemUpdate);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> OnboardingUpdateOnboardingItemV2Async (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOnboardingItemV2AsyncWithHttpInfo (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null);
         #endregion Asynchronous Operations
     }
 
@@ -338,7 +538,7 @@ public ApiResponse< Object > OnboardingGetOnboardingConfigWithHttpInfo (string a
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingConfig");
 
-            var localVarPath = "/api/v1.0/clients/{appId}/onboarding/config";
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/config";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -385,7 +585,7 @@ public ApiResponse< Object > OnboardingGetOnboardingConfigWithHttpInfo (string a
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -414,7 +614,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboa
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingConfig");
 
-            var localVarPath = "/api/v1.0/clients/{appId}/onboarding/config";
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/config";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -461,7 +661,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboa
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -470,11 +670,10 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboa
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="storeId"></param>
         /// <returns>Object</returns>
-        public Object OnboardingGetOnboardingItems (string appId, int? storeId)
+        public Object OnboardingGetOnboardingConfigs (string appId)
         {
-             ApiResponse<Object> localVarResponse = OnboardingGetOnboardingItemsWithHttpInfo(appId, storeId);
+             ApiResponse<Object> localVarResponse = OnboardingGetOnboardingConfigsWithHttpInfo(appId);
              return localVarResponse.Data;
         }
 
@@ -483,18 +682,14 @@ public Object OnboardingGetOnboardingItems (string appId, int? storeId)
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > OnboardingGetOnboardingItemsWithHttpInfo (string appId, int? storeId)
+        public ApiResponse< Object > OnboardingGetOnboardingConfigsWithHttpInfo (string appId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingItems");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling OnboardingApi->OnboardingGetOnboardingItems");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingConfigs");
 
-            var localVarPath = "/api/v1.0/clients/{appId}/onboarding/stores/{storeId}";
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/configs";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -519,7 +714,6 @@ public ApiResponse< Object > OnboardingGetOnboardingItemsWithHttpInfo (string ap
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -537,12 +731,12 @@ public ApiResponse< Object > OnboardingGetOnboardingItemsWithHttpInfo (string ap
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("OnboardingGetOnboardingItems", localVarResponse);
+                Exception exception = ExceptionFactory("OnboardingGetOnboardingConfigs", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -551,11 +745,10 @@ public ApiResponse< Object > OnboardingGetOnboardingItemsWithHttpInfo (string ap
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> OnboardingGetOnboardingItemsAsync (string appId, int? storeId)
+        public async System.Threading.Tasks.Task<Object> OnboardingGetOnboardingConfigsAsync (string appId)
         {
-             ApiResponse<Object> localVarResponse = await OnboardingGetOnboardingItemsAsyncWithHttpInfo(appId, storeId);
+             ApiResponse<Object> localVarResponse = await OnboardingGetOnboardingConfigsAsyncWithHttpInfo(appId);
              return localVarResponse.Data;
 
         }
@@ -565,18 +758,14 @@ public async System.Threading.Tasks.Task<Object> OnboardingGetOnboardingItemsAsy
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboardingItemsAsyncWithHttpInfo (string appId, int? storeId)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboardingConfigsAsyncWithHttpInfo (string appId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingItems");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling OnboardingApi->OnboardingGetOnboardingItems");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingConfigs");
 
-            var localVarPath = "/api/v1.0/clients/{appId}/onboarding/stores/{storeId}";
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/configs";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -601,7 +790,6 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboa
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -619,12 +807,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboa
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("OnboardingGetOnboardingItems", localVarResponse);
+                Exception exception = ExceptionFactory("OnboardingGetOnboardingConfigs", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -633,11 +821,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboa
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="configUpdate"></param>
+        /// <param name="storeId"></param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>Object</returns>
-        public Object OnboardingUpdateOnboardingConfig (string appId, OnboardingConfigUpdate configUpdate)
+        public Object OnboardingGetOnboardingItems (string appId, int? storeId, int? milestoneId = null)
         {
-             ApiResponse<Object> localVarResponse = OnboardingUpdateOnboardingConfigWithHttpInfo(appId, configUpdate);
+             ApiResponse<Object> localVarResponse = OnboardingGetOnboardingItemsWithHttpInfo(appId, storeId, milestoneId);
              return localVarResponse.Data;
         }
 
@@ -646,18 +835,19 @@ public Object OnboardingUpdateOnboardingConfig (string appId, OnboardingConfigUp
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="configUpdate"></param>
+        /// <param name="storeId"></param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > OnboardingUpdateOnboardingConfigWithHttpInfo (string appId, OnboardingConfigUpdate configUpdate)
+        public ApiResponse< Object > OnboardingGetOnboardingItemsWithHttpInfo (string appId, int? storeId, int? milestoneId = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingConfig");
-            // verify the required parameter 'configUpdate' is set
-            if (configUpdate == null)
-                throw new ApiException(400, "Missing required parameter 'configUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingConfig");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingItems");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling OnboardingApi->OnboardingGetOnboardingItems");
 
-            var localVarPath = "/api/v1.0/clients/{appId}/onboarding/config";
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -667,11 +857,6 @@ public ApiResponse< Object > OnboardingUpdateOnboardingConfigWithHttpInfo (strin
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -687,14 +872,8 @@ public ApiResponse< Object > OnboardingUpdateOnboardingConfigWithHttpInfo (strin
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (configUpdate != null && configUpdate.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(configUpdate); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = configUpdate; // byte array
-            }
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (milestoneId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "milestoneId", milestoneId)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -705,19 +884,19 @@ public ApiResponse< Object > OnboardingUpdateOnboardingConfigWithHttpInfo (strin
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("OnboardingUpdateOnboardingConfig", localVarResponse);
+                Exception exception = ExceptionFactory("OnboardingGetOnboardingItems", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -726,11 +905,12 @@ public ApiResponse< Object > OnboardingUpdateOnboardingConfigWithHttpInfo (strin
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="configUpdate"></param>
+        /// <param name="storeId"></param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> OnboardingUpdateOnboardingConfigAsync (string appId, OnboardingConfigUpdate configUpdate)
+        public async System.Threading.Tasks.Task<Object> OnboardingGetOnboardingItemsAsync (string appId, int? storeId, int? milestoneId = null)
         {
-             ApiResponse<Object> localVarResponse = await OnboardingUpdateOnboardingConfigAsyncWithHttpInfo(appId, configUpdate);
+             ApiResponse<Object> localVarResponse = await OnboardingGetOnboardingItemsAsyncWithHttpInfo(appId, storeId, milestoneId);
              return localVarResponse.Data;
 
         }
@@ -740,18 +920,19 @@ public async System.Threading.Tasks.Task<Object> OnboardingUpdateOnboardingConfi
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="configUpdate"></param>
+        /// <param name="storeId"></param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOnboardingConfigAsyncWithHttpInfo (string appId, OnboardingConfigUpdate configUpdate)
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboardingItemsAsyncWithHttpInfo (string appId, int? storeId, int? milestoneId = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingConfig");
-            // verify the required parameter 'configUpdate' is set
-            if (configUpdate == null)
-                throw new ApiException(400, "Missing required parameter 'configUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingConfig");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingItems");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling OnboardingApi->OnboardingGetOnboardingItems");
 
-            var localVarPath = "/api/v1.0/clients/{appId}/onboarding/config";
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -761,11 +942,6 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOn
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -781,14 +957,8 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOn
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (configUpdate != null && configUpdate.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(configUpdate); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = configUpdate; // byte array
-            }
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (milestoneId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "milestoneId", milestoneId)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -799,19 +969,19 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOn
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("OnboardingUpdateOnboardingConfig", localVarResponse);
+                Exception exception = ExceptionFactory("OnboardingGetOnboardingItems", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -820,13 +990,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOn
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="storeId"></param>
-        /// <param name="onboardingItemId"></param>
-        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>Object</returns>
-        public Object OnboardingUpdateOnboardingItem (string appId, int? storeId, int? onboardingItemId, OnboardingItemUpdate itemUpdate)
+        public Object OnboardingGetOnboardingItemsV2 (string appId, int? storeId = null, int? milestoneId = null)
         {
-             ApiResponse<Object> localVarResponse = OnboardingUpdateOnboardingItemWithHttpInfo(appId, storeId, onboardingItemId, itemUpdate);
+             ApiResponse<Object> localVarResponse = OnboardingGetOnboardingItemsV2WithHttpInfo(appId, storeId, milestoneId);
              return localVarResponse.Data;
         }
 
@@ -835,15 +1004,565 @@ public Object OnboardingUpdateOnboardingItem (string appId, int? storeId, int? o
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="storeId"></param>
-        /// <param name="onboardingItemId"></param>
-        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="milestoneId"> (optional)</param>
         /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > OnboardingUpdateOnboardingItemWithHttpInfo (string appId, int? storeId, int? onboardingItemId, OnboardingItemUpdate itemUpdate)
+        public ApiResponse< Object > OnboardingGetOnboardingItemsV2WithHttpInfo (string appId, int? storeId = null, int? milestoneId = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingItem");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingItemsV2");
+
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (milestoneId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "milestoneId", milestoneId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("OnboardingGetOnboardingItemsV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="milestoneId"> (optional)</param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> OnboardingGetOnboardingItemsV2Async (string appId, int? storeId = null, int? milestoneId = null)
+        {
+             ApiResponse<Object> localVarResponse = await OnboardingGetOnboardingItemsV2AsyncWithHttpInfo(appId, storeId, milestoneId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="milestoneId"> (optional)</param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingGetOnboardingItemsV2AsyncWithHttpInfo (string appId, int? storeId = null, int? milestoneId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingGetOnboardingItemsV2");
+
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (milestoneId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "milestoneId", milestoneId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("OnboardingGetOnboardingItemsV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Object</returns>
+        public Object OnboardingUpdateOnboardingConfig (string appId, OnboardingConfigUpdate configUpdate)
+        {
+             ApiResponse<Object> localVarResponse = OnboardingUpdateOnboardingConfigWithHttpInfo(appId, configUpdate);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > OnboardingUpdateOnboardingConfigWithHttpInfo (string appId, OnboardingConfigUpdate configUpdate)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingConfig");
+            // verify the required parameter 'configUpdate' is set
+            if (configUpdate == null)
+                throw new ApiException(400, "Missing required parameter 'configUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingConfig");
+
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/config";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (configUpdate != null && configUpdate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(configUpdate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = configUpdate; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("OnboardingUpdateOnboardingConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> OnboardingUpdateOnboardingConfigAsync (string appId, OnboardingConfigUpdate configUpdate)
+        {
+             ApiResponse<Object> localVarResponse = await OnboardingUpdateOnboardingConfigAsyncWithHttpInfo(appId, configUpdate);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOnboardingConfigAsyncWithHttpInfo (string appId, OnboardingConfigUpdate configUpdate)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingConfig");
+            // verify the required parameter 'configUpdate' is set
+            if (configUpdate == null)
+                throw new ApiException(400, "Missing required parameter 'configUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingConfig");
+
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/config";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (configUpdate != null && configUpdate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(configUpdate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = configUpdate; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("OnboardingUpdateOnboardingConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Object</returns>
+        public Object OnboardingUpdateOnboardingConfigById (string appId, int? configId, OnboardingConfigUpdate configUpdate)
+        {
+             ApiResponse<Object> localVarResponse = OnboardingUpdateOnboardingConfigByIdWithHttpInfo(appId, configId, configUpdate);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > OnboardingUpdateOnboardingConfigByIdWithHttpInfo (string appId, int? configId, OnboardingConfigUpdate configUpdate)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingConfigById");
+            // verify the required parameter 'configId' is set
+            if (configId == null)
+                throw new ApiException(400, "Missing required parameter 'configId' when calling OnboardingApi->OnboardingUpdateOnboardingConfigById");
+            // verify the required parameter 'configUpdate' is set
+            if (configUpdate == null)
+                throw new ApiException(400, "Missing required parameter 'configUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingConfigById");
+
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/config/{configId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (configId != null) localVarPathParams.Add("configId", this.Configuration.ApiClient.ParameterToString(configId)); // path parameter
+            if (configUpdate != null && configUpdate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(configUpdate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = configUpdate; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("OnboardingUpdateOnboardingConfigById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> OnboardingUpdateOnboardingConfigByIdAsync (string appId, int? configId, OnboardingConfigUpdate configUpdate)
+        {
+             ApiResponse<Object> localVarResponse = await OnboardingUpdateOnboardingConfigByIdAsyncWithHttpInfo(appId, configId, configUpdate);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="configId"></param>
+        /// <param name="configUpdate"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOnboardingConfigByIdAsyncWithHttpInfo (string appId, int? configId, OnboardingConfigUpdate configUpdate)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingConfigById");
+            // verify the required parameter 'configId' is set
+            if (configId == null)
+                throw new ApiException(400, "Missing required parameter 'configId' when calling OnboardingApi->OnboardingUpdateOnboardingConfigById");
+            // verify the required parameter 'configUpdate' is set
+            if (configUpdate == null)
+                throw new ApiException(400, "Missing required parameter 'configUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingConfigById");
+
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/config/{configId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (configId != null) localVarPathParams.Add("configId", this.Configuration.ApiClient.ParameterToString(configId)); // path parameter
+            if (configUpdate != null && configUpdate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(configUpdate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = configUpdate; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("OnboardingUpdateOnboardingConfigById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <returns>Object</returns>
+        public Object OnboardingUpdateOnboardingItem (string appId, int? storeId, int? onboardingItemId, OnboardingItemUpdate itemUpdate)
+        {
+             ApiResponse<Object> localVarResponse = OnboardingUpdateOnboardingItemWithHttpInfo(appId, storeId, onboardingItemId, itemUpdate);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > OnboardingUpdateOnboardingItemWithHttpInfo (string appId, int? storeId, int? onboardingItemId, OnboardingItemUpdate itemUpdate)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingItem");
             // verify the required parameter 'storeId' is set
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling OnboardingApi->OnboardingUpdateOnboardingItem");
@@ -854,7 +1573,7 @@ public ApiResponse< Object > OnboardingUpdateOnboardingItemWithHttpInfo (string
             if (itemUpdate == null)
                 throw new ApiException(400, "Missing required parameter 'itemUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingItem");
 
-            var localVarPath = "/api/v1.0/clients/{appId}/onboarding/stores/{storeId}/items/{onboardingItemId}";
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/stores/{storeId}/items/{onboardingItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -916,7 +1635,7 @@ public ApiResponse< Object > OnboardingUpdateOnboardingItemWithHttpInfo (string
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -960,7 +1679,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOn
             if (itemUpdate == null)
                 throw new ApiException(400, "Missing required parameter 'itemUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingItem");
 
-            var localVarPath = "/api/v1.0/clients/{appId}/onboarding/stores/{storeId}/items/{onboardingItemId}";
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/stores/{storeId}/items/{onboardingItemId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1022,7 +1741,212 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Object</returns>
+        public Object OnboardingUpdateOnboardingItemV2 (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null)
+        {
+             ApiResponse<Object> localVarResponse = OnboardingUpdateOnboardingItemV2WithHttpInfo(appId, onboardingItemId, itemUpdate, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > OnboardingUpdateOnboardingItemV2WithHttpInfo (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingItemV2");
+            // verify the required parameter 'onboardingItemId' is set
+            if (onboardingItemId == null)
+                throw new ApiException(400, "Missing required parameter 'onboardingItemId' when calling OnboardingApi->OnboardingUpdateOnboardingItemV2");
+            // verify the required parameter 'itemUpdate' is set
+            if (itemUpdate == null)
+                throw new ApiException(400, "Missing required parameter 'itemUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingItemV2");
+
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/stores/items/{onboardingItemId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (onboardingItemId != null) localVarPathParams.Add("onboardingItemId", this.Configuration.ApiClient.ParameterToString(onboardingItemId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (itemUpdate != null && itemUpdate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(itemUpdate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = itemUpdate; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("OnboardingUpdateOnboardingItemV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> OnboardingUpdateOnboardingItemV2Async (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null)
+        {
+             ApiResponse<Object> localVarResponse = await OnboardingUpdateOnboardingItemV2AsyncWithHttpInfo(appId, onboardingItemId, itemUpdate, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="onboardingItemId"></param>
+        /// <param name="itemUpdate"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> OnboardingUpdateOnboardingItemV2AsyncWithHttpInfo (string appId, int? onboardingItemId, OnboardingItemUpdate itemUpdate, int? storeId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OnboardingApi->OnboardingUpdateOnboardingItemV2");
+            // verify the required parameter 'onboardingItemId' is set
+            if (onboardingItemId == null)
+                throw new ApiException(400, "Missing required parameter 'onboardingItemId' when calling OnboardingApi->OnboardingUpdateOnboardingItemV2");
+            // verify the required parameter 'itemUpdate' is set
+            if (itemUpdate == null)
+                throw new ApiException(400, "Missing required parameter 'itemUpdate' when calling OnboardingApi->OnboardingUpdateOnboardingItemV2");
+
+            var localVarPath = "./api/v1.0/clients/{appId}/onboarding/stores/items/{onboardingItemId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (onboardingItemId != null) localVarPathParams.Add("onboardingItemId", this.Configuration.ApiClient.ParameterToString(onboardingItemId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeId", storeId)); // query parameter
+            if (itemUpdate != null && itemUpdate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(itemUpdate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = itemUpdate; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("OnboardingUpdateOnboardingItemV2", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
diff --git a/src/Flipdish/Api/OrderBatchApi.cs b/src/Flipdish/Api/OrderBatchApi.cs
deleted file mode 100644
index 1db85fd3..00000000
--- a/src/Flipdish/Api/OrderBatchApi.cs
+++ /dev/null
@@ -1,371 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IOrderBatchApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Returns order batches created in a given time range
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="startDate">Start Date</param>
-        /// <param name="endDate">End Date</param>
-        /// <returns>RestApiArrayResultOrderBatchItem</returns>
-        RestApiArrayResultOrderBatchItem GetAllOrderBatches (string appId, int? storeId, DateTime? startDate, DateTime? endDate);
-
-        /// <summary>
-        /// Returns order batches created in a given time range
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="startDate">Start Date</param>
-        /// <param name="endDate">End Date</param>
-        /// <returns>ApiResponse of RestApiArrayResultOrderBatchItem</returns>
-        ApiResponse<RestApiArrayResultOrderBatchItem> GetAllOrderBatchesWithHttpInfo (string appId, int? storeId, DateTime? startDate, DateTime? endDate);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Returns order batches created in a given time range
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="startDate">Start Date</param>
-        /// <param name="endDate">End Date</param>
-        /// <returns>Task of RestApiArrayResultOrderBatchItem</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultOrderBatchItem> GetAllOrderBatchesAsync (string appId, int? storeId, DateTime? startDate, DateTime? endDate);
-
-        /// <summary>
-        /// Returns order batches created in a given time range
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="startDate">Start Date</param>
-        /// <param name="endDate">End Date</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultOrderBatchItem)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderBatchItem>> GetAllOrderBatchesAsyncWithHttpInfo (string appId, int? storeId, DateTime? startDate, DateTime? endDate);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class OrderBatchApi : IOrderBatchApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderBatchApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public OrderBatchApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderBatchApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public OrderBatchApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Returns order batches created in a given time range 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="startDate">Start Date</param>
-        /// <param name="endDate">End Date</param>
-        /// <returns>RestApiArrayResultOrderBatchItem</returns>
-        public RestApiArrayResultOrderBatchItem GetAllOrderBatches (string appId, int? storeId, DateTime? startDate, DateTime? endDate)
-        {
-             ApiResponse<RestApiArrayResultOrderBatchItem> localVarResponse = GetAllOrderBatchesWithHttpInfo(appId, storeId, startDate, endDate);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Returns order batches created in a given time range 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="startDate">Start Date</param>
-        /// <param name="endDate">End Date</param>
-        /// <returns>ApiResponse of RestApiArrayResultOrderBatchItem</returns>
-        public ApiResponse< RestApiArrayResultOrderBatchItem > GetAllOrderBatchesWithHttpInfo (string appId, int? storeId, DateTime? startDate, DateTime? endDate)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling OrderBatchApi->GetAllOrderBatches");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling OrderBatchApi->GetAllOrderBatches");
-            // verify the required parameter 'startDate' is set
-            if (startDate == null)
-                throw new ApiException(400, "Missing required parameter 'startDate' when calling OrderBatchApi->GetAllOrderBatches");
-            // verify the required parameter 'endDate' is set
-            if (endDate == null)
-                throw new ApiException(400, "Missing required parameter 'endDate' when calling OrderBatchApi->GetAllOrderBatches");
-
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/order-batches";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (startDate != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "startDate", startDate)); // query parameter
-            if (endDate != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "endDate", endDate)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetAllOrderBatches", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiArrayResultOrderBatchItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultOrderBatchItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOrderBatchItem)));
-        }
-
-        /// <summary>
-        /// Returns order batches created in a given time range 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="startDate">Start Date</param>
-        /// <param name="endDate">End Date</param>
-        /// <returns>Task of RestApiArrayResultOrderBatchItem</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultOrderBatchItem> GetAllOrderBatchesAsync (string appId, int? storeId, DateTime? startDate, DateTime? endDate)
-        {
-             ApiResponse<RestApiArrayResultOrderBatchItem> localVarResponse = await GetAllOrderBatchesAsyncWithHttpInfo(appId, storeId, startDate, endDate);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Returns order batches created in a given time range 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="startDate">Start Date</param>
-        /// <param name="endDate">End Date</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultOrderBatchItem)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderBatchItem>> GetAllOrderBatchesAsyncWithHttpInfo (string appId, int? storeId, DateTime? startDate, DateTime? endDate)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling OrderBatchApi->GetAllOrderBatches");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling OrderBatchApi->GetAllOrderBatches");
-            // verify the required parameter 'startDate' is set
-            if (startDate == null)
-                throw new ApiException(400, "Missing required parameter 'startDate' when calling OrderBatchApi->GetAllOrderBatches");
-            // verify the required parameter 'endDate' is set
-            if (endDate == null)
-                throw new ApiException(400, "Missing required parameter 'endDate' when calling OrderBatchApi->GetAllOrderBatches");
-
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/order-batches";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (startDate != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "startDate", startDate)); // query parameter
-            if (endDate != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "endDate", endDate)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetAllOrderBatches", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiArrayResultOrderBatchItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultOrderBatchItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOrderBatchItem)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/OrderBatchesApi.cs b/src/Flipdish/Api/OrderBatchesApi.cs
index 4019621d..339790ba 100644
--- a/src/Flipdish/Api/OrderBatchesApi.cs
+++ b/src/Flipdish/Api/OrderBatchesApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,111 +25,107 @@ public interface IOrderBatchesApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Returns order batches
+        /// 
         /// </summary>
         /// <remarks>
-        /// Entries are sorted by date, from the most recent. At most 100 entries are returned.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="createdFrom">Start date for retrieving the entries (optional)</param>
-        /// <param name="createdTo">End date for retrieving the entries (optional)</param>
-        /// <returns>RestApiArrayResultOrderBatchItem</returns>
-        RestApiArrayResultOrderBatchItem GetAllOrderBatches (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null);
+        /// <param name="appId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="createdFrom"> (optional)</param>
+        /// <param name="createdTo"> (optional)</param>
+        /// <returns>RestApiArrayResultOrderBatch</returns>
+        RestApiArrayResultOrderBatch GetAllOrderBatches (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null);
 
         /// <summary>
-        /// Returns order batches
+        /// 
         /// </summary>
         /// <remarks>
-        /// Entries are sorted by date, from the most recent. At most 100 entries are returned.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="createdFrom">Start date for retrieving the entries (optional)</param>
-        /// <param name="createdTo">End date for retrieving the entries (optional)</param>
-        /// <returns>ApiResponse of RestApiArrayResultOrderBatchItem</returns>
-        ApiResponse<RestApiArrayResultOrderBatchItem> GetAllOrderBatchesWithHttpInfo (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null);
+        /// <param name="appId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="createdFrom"> (optional)</param>
+        /// <param name="createdTo"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultOrderBatch</returns>
+        ApiResponse<RestApiArrayResultOrderBatch> GetAllOrderBatchesWithHttpInfo (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null);
         /// <summary>
-        /// Returns the order batch details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="batchId">Order Batch Id</param>
+        /// <param name="appId"></param>
+        /// <param name="orderBatchId"></param>
         /// <returns>RestApiResultOrderBatch</returns>
-        RestApiResultOrderBatch GetOrderBatch (string appId, int? storeId, int? batchId);
+        RestApiResultOrderBatch GetOrderBatch (string appId, int? orderBatchId);
 
         /// <summary>
-        /// Returns the order batch details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="batchId">Order Batch Id</param>
+        /// <param name="appId"></param>
+        /// <param name="orderBatchId"></param>
         /// <returns>ApiResponse of RestApiResultOrderBatch</returns>
-        ApiResponse<RestApiResultOrderBatch> GetOrderBatchWithHttpInfo (string appId, int? storeId, int? batchId);
+        ApiResponse<RestApiResultOrderBatch> GetOrderBatchWithHttpInfo (string appId, int? orderBatchId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Returns order batches
+        /// 
         /// </summary>
         /// <remarks>
-        /// Entries are sorted by date, from the most recent. At most 100 entries are returned.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="createdFrom">Start date for retrieving the entries (optional)</param>
-        /// <param name="createdTo">End date for retrieving the entries (optional)</param>
-        /// <returns>Task of RestApiArrayResultOrderBatchItem</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultOrderBatchItem> GetAllOrderBatchesAsync (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null);
+        /// <param name="appId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="createdFrom"> (optional)</param>
+        /// <param name="createdTo"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultOrderBatch</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultOrderBatch> GetAllOrderBatchesAsync (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null);
 
         /// <summary>
-        /// Returns order batches
+        /// 
         /// </summary>
         /// <remarks>
-        /// Entries are sorted by date, from the most recent. At most 100 entries are returned.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="createdFrom">Start date for retrieving the entries (optional)</param>
-        /// <param name="createdTo">End date for retrieving the entries (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultOrderBatchItem)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderBatchItem>> GetAllOrderBatchesAsyncWithHttpInfo (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null);
+        /// <param name="appId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="createdFrom"> (optional)</param>
+        /// <param name="createdTo"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultOrderBatch)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderBatch>> GetAllOrderBatchesAsyncWithHttpInfo (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null);
         /// <summary>
-        /// Returns the order batch details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="batchId">Order Batch Id</param>
+        /// <param name="appId"></param>
+        /// <param name="orderBatchId"></param>
         /// <returns>Task of RestApiResultOrderBatch</returns>
-        System.Threading.Tasks.Task<RestApiResultOrderBatch> GetOrderBatchAsync (string appId, int? storeId, int? batchId);
+        System.Threading.Tasks.Task<RestApiResultOrderBatch> GetOrderBatchAsync (string appId, int? orderBatchId);
 
         /// <summary>
-        /// Returns the order batch details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="batchId">Order Batch Id</param>
+        /// <param name="appId"></param>
+        /// <param name="orderBatchId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderBatch)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatch>> GetOrderBatchAsyncWithHttpInfo (string appId, int? storeId, int? batchId);
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatch>> GetOrderBatchAsyncWithHttpInfo (string appId, int? orderBatchId);
         #endregion Asynchronous Operations
     }
 
@@ -231,39 +227,36 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Returns order batches Entries are sorted by date, from the most recent. At most 100 entries are returned.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="createdFrom">Start date for retrieving the entries (optional)</param>
-        /// <param name="createdTo">End date for retrieving the entries (optional)</param>
-        /// <returns>RestApiArrayResultOrderBatchItem</returns>
-        public RestApiArrayResultOrderBatchItem GetAllOrderBatches (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null)
+        /// <param name="appId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="createdFrom"> (optional)</param>
+        /// <param name="createdTo"> (optional)</param>
+        /// <returns>RestApiArrayResultOrderBatch</returns>
+        public RestApiArrayResultOrderBatch GetAllOrderBatches (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null)
         {
-             ApiResponse<RestApiArrayResultOrderBatchItem> localVarResponse = GetAllOrderBatchesWithHttpInfo(appId, storeId, createdFrom, createdTo);
+             ApiResponse<RestApiArrayResultOrderBatch> localVarResponse = GetAllOrderBatchesWithHttpInfo(appId, storeIds, createdFrom, createdTo);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Returns order batches Entries are sorted by date, from the most recent. At most 100 entries are returned.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="createdFrom">Start date for retrieving the entries (optional)</param>
-        /// <param name="createdTo">End date for retrieving the entries (optional)</param>
-        /// <returns>ApiResponse of RestApiArrayResultOrderBatchItem</returns>
-        public ApiResponse< RestApiArrayResultOrderBatchItem > GetAllOrderBatchesWithHttpInfo (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null)
+        /// <param name="appId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="createdFrom"> (optional)</param>
+        /// <param name="createdTo"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultOrderBatch</returns>
+        public ApiResponse< RestApiArrayResultOrderBatch > GetAllOrderBatchesWithHttpInfo (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OrderBatchesApi->GetAllOrderBatches");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling OrderBatchesApi->GetAllOrderBatches");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/order-batches";
+            var localVarPath = "./api/v1.0/{appId}/order-batches";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -288,7 +281,7 @@ public ApiResponse< RestApiArrayResultOrderBatchItem > GetAllOrderBatchesWithHtt
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
             if (createdFrom != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "createdFrom", createdFrom)); // query parameter
             if (createdTo != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "createdTo", createdTo)); // query parameter
 
@@ -312,46 +305,43 @@ public ApiResponse< RestApiArrayResultOrderBatchItem > GetAllOrderBatchesWithHtt
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultOrderBatchItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultOrderBatchItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOrderBatchItem)));
+            return new ApiResponse<RestApiArrayResultOrderBatch>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultOrderBatch) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOrderBatch)));
         }
 
         /// <summary>
-        /// Returns order batches Entries are sorted by date, from the most recent. At most 100 entries are returned.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="createdFrom">Start date for retrieving the entries (optional)</param>
-        /// <param name="createdTo">End date for retrieving the entries (optional)</param>
-        /// <returns>Task of RestApiArrayResultOrderBatchItem</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultOrderBatchItem> GetAllOrderBatchesAsync (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null)
+        /// <param name="appId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="createdFrom"> (optional)</param>
+        /// <param name="createdTo"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultOrderBatch</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultOrderBatch> GetAllOrderBatchesAsync (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null)
         {
-             ApiResponse<RestApiArrayResultOrderBatchItem> localVarResponse = await GetAllOrderBatchesAsyncWithHttpInfo(appId, storeId, createdFrom, createdTo);
+             ApiResponse<RestApiArrayResultOrderBatch> localVarResponse = await GetAllOrderBatchesAsyncWithHttpInfo(appId, storeIds, createdFrom, createdTo);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Returns order batches Entries are sorted by date, from the most recent. At most 100 entries are returned.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="createdFrom">Start date for retrieving the entries (optional)</param>
-        /// <param name="createdTo">End date for retrieving the entries (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultOrderBatchItem)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderBatchItem>> GetAllOrderBatchesAsyncWithHttpInfo (string appId, int? storeId, DateTime? createdFrom = null, DateTime? createdTo = null)
+        /// <param name="appId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="createdFrom"> (optional)</param>
+        /// <param name="createdTo"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultOrderBatch)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderBatch>> GetAllOrderBatchesAsyncWithHttpInfo (string appId, List<int?> storeIds = null, DateTime? createdFrom = null, DateTime? createdTo = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OrderBatchesApi->GetAllOrderBatches");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling OrderBatchesApi->GetAllOrderBatches");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/order-batches";
+            var localVarPath = "./api/v1.0/{appId}/order-batches";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -376,7 +366,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderBatc
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
             if (createdFrom != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "createdFrom", createdFrom)); // query parameter
             if (createdTo != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "createdTo", createdTo)); // query parameter
 
@@ -400,46 +390,41 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderBatc
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultOrderBatchItem>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultOrderBatchItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOrderBatchItem)));
+            return new ApiResponse<RestApiArrayResultOrderBatch>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultOrderBatch) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOrderBatch)));
         }
 
         /// <summary>
-        /// Returns the order batch details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="batchId">Order Batch Id</param>
+        /// <param name="appId"></param>
+        /// <param name="orderBatchId"></param>
         /// <returns>RestApiResultOrderBatch</returns>
-        public RestApiResultOrderBatch GetOrderBatch (string appId, int? storeId, int? batchId)
+        public RestApiResultOrderBatch GetOrderBatch (string appId, int? orderBatchId)
         {
-             ApiResponse<RestApiResultOrderBatch> localVarResponse = GetOrderBatchWithHttpInfo(appId, storeId, batchId);
+             ApiResponse<RestApiResultOrderBatch> localVarResponse = GetOrderBatchWithHttpInfo(appId, orderBatchId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Returns the order batch details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="batchId">Order Batch Id</param>
+        /// <param name="appId"></param>
+        /// <param name="orderBatchId"></param>
         /// <returns>ApiResponse of RestApiResultOrderBatch</returns>
-        public ApiResponse< RestApiResultOrderBatch > GetOrderBatchWithHttpInfo (string appId, int? storeId, int? batchId)
+        public ApiResponse< RestApiResultOrderBatch > GetOrderBatchWithHttpInfo (string appId, int? orderBatchId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OrderBatchesApi->GetOrderBatch");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling OrderBatchesApi->GetOrderBatch");
-            // verify the required parameter 'batchId' is set
-            if (batchId == null)
-                throw new ApiException(400, "Missing required parameter 'batchId' when calling OrderBatchesApi->GetOrderBatch");
-
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/order-batches/{batchId}";
+            // verify the required parameter 'orderBatchId' is set
+            if (orderBatchId == null)
+                throw new ApiException(400, "Missing required parameter 'orderBatchId' when calling OrderBatchesApi->GetOrderBatch");
+
+            var localVarPath = "./api/v1.0/{appId}/order-batches/{orderBatchId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -464,8 +449,7 @@ public ApiResponse< RestApiResultOrderBatch > GetOrderBatchWithHttpInfo (string
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (batchId != null) localVarPathParams.Add("batchId", this.Configuration.ApiClient.ParameterToString(batchId)); // path parameter
+            if (orderBatchId != null) localVarPathParams.Add("orderBatchId", this.Configuration.ApiClient.ParameterToString(orderBatchId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -488,46 +472,41 @@ public ApiResponse< RestApiResultOrderBatch > GetOrderBatchWithHttpInfo (string
             }
 
             return new ApiResponse<RestApiResultOrderBatch>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderBatch) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderBatch)));
         }
 
         /// <summary>
-        /// Returns the order batch details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="batchId">Order Batch Id</param>
+        /// <param name="appId"></param>
+        /// <param name="orderBatchId"></param>
         /// <returns>Task of RestApiResultOrderBatch</returns>
-        public async System.Threading.Tasks.Task<RestApiResultOrderBatch> GetOrderBatchAsync (string appId, int? storeId, int? batchId)
+        public async System.Threading.Tasks.Task<RestApiResultOrderBatch> GetOrderBatchAsync (string appId, int? orderBatchId)
         {
-             ApiResponse<RestApiResultOrderBatch> localVarResponse = await GetOrderBatchAsyncWithHttpInfo(appId, storeId, batchId);
+             ApiResponse<RestApiResultOrderBatch> localVarResponse = await GetOrderBatchAsyncWithHttpInfo(appId, orderBatchId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Returns the order batch details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="batchId">Order Batch Id</param>
+        /// <param name="appId"></param>
+        /// <param name="orderBatchId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderBatch)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatch>> GetOrderBatchAsyncWithHttpInfo (string appId, int? storeId, int? batchId)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatch>> GetOrderBatchAsyncWithHttpInfo (string appId, int? orderBatchId)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OrderBatchesApi->GetOrderBatch");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling OrderBatchesApi->GetOrderBatch");
-            // verify the required parameter 'batchId' is set
-            if (batchId == null)
-                throw new ApiException(400, "Missing required parameter 'batchId' when calling OrderBatchesApi->GetOrderBatch");
-
-            var localVarPath = "/api/v1.0/{appId}/stores/{storeId}/order-batches/{batchId}";
+            // verify the required parameter 'orderBatchId' is set
+            if (orderBatchId == null)
+                throw new ApiException(400, "Missing required parameter 'orderBatchId' when calling OrderBatchesApi->GetOrderBatch");
+
+            var localVarPath = "./api/v1.0/{appId}/order-batches/{orderBatchId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -552,8 +531,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatch>> G
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (batchId != null) localVarPathParams.Add("batchId", this.Configuration.ApiClient.ParameterToString(batchId)); // path parameter
+            if (orderBatchId != null) localVarPathParams.Add("orderBatchId", this.Configuration.ApiClient.ParameterToString(orderBatchId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -576,7 +554,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatch>> G
             }
 
             return new ApiResponse<RestApiResultOrderBatch>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderBatch) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderBatch)));
         }
 
diff --git a/src/Flipdish/Api/OrderBatchingConfigurationApi.cs b/src/Flipdish/Api/OrderBatchingConfigurationApi.cs
index 4bdcc1ba..063dbd54 100644
--- a/src/Flipdish/Api/OrderBatchingConfigurationApi.cs
+++ b/src/Flipdish/Api/OrderBatchingConfigurationApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,93 +25,93 @@ public interface IOrderBatchingConfigurationApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Returns order batching configuration for a specific store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultOrderBatchingConfiguration</returns>
         RestApiResultOrderBatchingConfiguration Get (int? storeId);
 
         /// <summary>
-        /// Returns order batching configuration for a specific store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultOrderBatchingConfiguration</returns>
         ApiResponse<RestApiResultOrderBatchingConfiguration> GetWithHttpInfo (int? storeId);
         /// <summary>
-        /// Sets order batching configuration for a specific store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="setOrderBatchingConfiguration">SetOrderBatchingConfiguration</param>
+        /// <param name="storeId"></param>
+        /// <param name="setOrderBatchingConfiguration"></param>
         /// <returns></returns>
         void Post (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration);
 
         /// <summary>
-        /// Sets order batching configuration for a specific store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="setOrderBatchingConfiguration">SetOrderBatchingConfiguration</param>
+        /// <param name="storeId"></param>
+        /// <param name="setOrderBatchingConfiguration"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> PostWithHttpInfo (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Returns order batching configuration for a specific store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultOrderBatchingConfiguration</returns>
         System.Threading.Tasks.Task<RestApiResultOrderBatchingConfiguration> GetAsync (int? storeId);
 
         /// <summary>
-        /// Returns order batching configuration for a specific store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderBatchingConfiguration)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatchingConfiguration>> GetAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Sets order batching configuration for a specific store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="setOrderBatchingConfiguration">SetOrderBatchingConfiguration</param>
+        /// <param name="storeId"></param>
+        /// <param name="setOrderBatchingConfiguration"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task PostAsync (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration);
 
         /// <summary>
-        /// Sets order batching configuration for a specific store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="setOrderBatchingConfiguration">SetOrderBatchingConfiguration</param>
+        /// <param name="storeId"></param>
+        /// <param name="setOrderBatchingConfiguration"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> PostAsyncWithHttpInfo (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration);
         #endregion Asynchronous Operations
@@ -215,10 +215,10 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Returns order batching configuration for a specific store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultOrderBatchingConfiguration</returns>
         public RestApiResultOrderBatchingConfiguration Get (int? storeId)
         {
@@ -227,10 +227,10 @@ public RestApiResultOrderBatchingConfiguration Get (int? storeId)
         }
 
         /// <summary>
-        /// Returns order batching configuration for a specific store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultOrderBatchingConfiguration</returns>
         public ApiResponse< RestApiResultOrderBatchingConfiguration > GetWithHttpInfo (int? storeId)
         {
@@ -238,7 +238,7 @@ public ApiResponse< RestApiResultOrderBatchingConfiguration > GetWithHttpInfo (i
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling OrderBatchingConfigurationApi->Get");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/order-batching-configuration";
+            var localVarPath = "./api/v1.0/stores/{storeId}/order-batching-configuration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -285,15 +285,15 @@ public ApiResponse< RestApiResultOrderBatchingConfiguration > GetWithHttpInfo (i
             }
 
             return new ApiResponse<RestApiResultOrderBatchingConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderBatchingConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderBatchingConfiguration)));
         }
 
         /// <summary>
-        /// Returns order batching configuration for a specific store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultOrderBatchingConfiguration</returns>
         public async System.Threading.Tasks.Task<RestApiResultOrderBatchingConfiguration> GetAsync (int? storeId)
         {
@@ -303,10 +303,10 @@ public async System.Threading.Tasks.Task<RestApiResultOrderBatchingConfiguration
         }
 
         /// <summary>
-        /// Returns order batching configuration for a specific store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderBatchingConfiguration)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatchingConfiguration>> GetAsyncWithHttpInfo (int? storeId)
         {
@@ -314,7 +314,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatchingC
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling OrderBatchingConfigurationApi->Get");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/order-batching-configuration";
+            var localVarPath = "./api/v1.0/stores/{storeId}/order-batching-configuration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -361,16 +361,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderBatchingC
             }
 
             return new ApiResponse<RestApiResultOrderBatchingConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderBatchingConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderBatchingConfiguration)));
         }
 
         /// <summary>
-        /// Sets order batching configuration for a specific store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="setOrderBatchingConfiguration">SetOrderBatchingConfiguration</param>
+        /// <param name="storeId"></param>
+        /// <param name="setOrderBatchingConfiguration"></param>
         /// <returns></returns>
         public void Post (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration)
         {
@@ -378,11 +378,11 @@ public void Post (int? storeId, SetOrderBatchingConfiguration setOrderBatchingCo
         }
 
         /// <summary>
-        /// Sets order batching configuration for a specific store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="setOrderBatchingConfiguration">SetOrderBatchingConfiguration</param>
+        /// <param name="storeId"></param>
+        /// <param name="setOrderBatchingConfiguration"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> PostWithHttpInfo (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration)
         {
@@ -393,7 +393,7 @@ public ApiResponse<Object> PostWithHttpInfo (int? storeId, SetOrderBatchingConfi
             if (setOrderBatchingConfiguration == null)
                 throw new ApiException(400, "Missing required parameter 'setOrderBatchingConfiguration' when calling OrderBatchingConfigurationApi->Post");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/order-batching-configuration";
+            var localVarPath = "./api/v1.0/stores/{storeId}/order-batching-configuration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -453,16 +453,16 @@ public ApiResponse<Object> PostWithHttpInfo (int? storeId, SetOrderBatchingConfi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Sets order batching configuration for a specific store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="setOrderBatchingConfiguration">SetOrderBatchingConfiguration</param>
+        /// <param name="storeId"></param>
+        /// <param name="setOrderBatchingConfiguration"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task PostAsync (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration)
         {
@@ -471,11 +471,11 @@ public async System.Threading.Tasks.Task PostAsync (int? storeId, SetOrderBatchi
         }
 
         /// <summary>
-        /// Sets order batching configuration for a specific store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="setOrderBatchingConfiguration">SetOrderBatchingConfiguration</param>
+        /// <param name="storeId"></param>
+        /// <param name="setOrderBatchingConfiguration"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> PostAsyncWithHttpInfo (int? storeId, SetOrderBatchingConfiguration setOrderBatchingConfiguration)
         {
@@ -486,7 +486,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PostAsyncWithHttpI
             if (setOrderBatchingConfiguration == null)
                 throw new ApiException(400, "Missing required parameter 'setOrderBatchingConfiguration' when calling OrderBatchingConfigurationApi->Post");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/order-batching-configuration";
+            var localVarPath = "./api/v1.0/stores/{storeId}/order-batching-configuration";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -546,7 +546,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PostAsyncWithHttpI
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/OrderIngestApi.cs b/src/Flipdish/Api/OrderIngestApi.cs
deleted file mode 100644
index 81e443b2..00000000
--- a/src/Flipdish/Api/OrderIngestApi.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IOrderIngestApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Provides an ability to ingest a 3rd party order into Flipdish ecosystem
-        /// </summary>
-        /// <remarks>
-        /// [ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="order"></param>
-        /// <param name="appNameId"></param>
-        /// <returns>RestApiResultOrderIngestSubmitOrderResponse</returns>
-        RestApiResultOrderIngestSubmitOrderResponse OrderIngestSubmitNewOrder (OrderIngestSubmitOrderRequest order, string appNameId);
-
-        /// <summary>
-        /// Provides an ability to ingest a 3rd party order into Flipdish ecosystem
-        /// </summary>
-        /// <remarks>
-        /// [ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="order"></param>
-        /// <param name="appNameId"></param>
-        /// <returns>ApiResponse of RestApiResultOrderIngestSubmitOrderResponse</returns>
-        ApiResponse<RestApiResultOrderIngestSubmitOrderResponse> OrderIngestSubmitNewOrderWithHttpInfo (OrderIngestSubmitOrderRequest order, string appNameId);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Provides an ability to ingest a 3rd party order into Flipdish ecosystem
-        /// </summary>
-        /// <remarks>
-        /// [ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="order"></param>
-        /// <param name="appNameId"></param>
-        /// <returns>Task of RestApiResultOrderIngestSubmitOrderResponse</returns>
-        System.Threading.Tasks.Task<RestApiResultOrderIngestSubmitOrderResponse> OrderIngestSubmitNewOrderAsync (OrderIngestSubmitOrderRequest order, string appNameId);
-
-        /// <summary>
-        /// Provides an ability to ingest a 3rd party order into Flipdish ecosystem
-        /// </summary>
-        /// <remarks>
-        /// [ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="order"></param>
-        /// <param name="appNameId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultOrderIngestSubmitOrderResponse)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderIngestSubmitOrderResponse>> OrderIngestSubmitNewOrderAsyncWithHttpInfo (OrderIngestSubmitOrderRequest order, string appNameId);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class OrderIngestApi : IOrderIngestApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderIngestApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public OrderIngestApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderIngestApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public OrderIngestApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Provides an ability to ingest a 3rd party order into Flipdish ecosystem [ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="order"></param>
-        /// <param name="appNameId"></param>
-        /// <returns>RestApiResultOrderIngestSubmitOrderResponse</returns>
-        public RestApiResultOrderIngestSubmitOrderResponse OrderIngestSubmitNewOrder (OrderIngestSubmitOrderRequest order, string appNameId)
-        {
-             ApiResponse<RestApiResultOrderIngestSubmitOrderResponse> localVarResponse = OrderIngestSubmitNewOrderWithHttpInfo(order, appNameId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Provides an ability to ingest a 3rd party order into Flipdish ecosystem [ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="order"></param>
-        /// <param name="appNameId"></param>
-        /// <returns>ApiResponse of RestApiResultOrderIngestSubmitOrderResponse</returns>
-        public ApiResponse< RestApiResultOrderIngestSubmitOrderResponse > OrderIngestSubmitNewOrderWithHttpInfo (OrderIngestSubmitOrderRequest order, string appNameId)
-        {
-            // verify the required parameter 'order' is set
-            if (order == null)
-                throw new ApiException(400, "Missing required parameter 'order' when calling OrderIngestApi->OrderIngestSubmitNewOrder");
-            // verify the required parameter 'appNameId' is set
-            if (appNameId == null)
-                throw new ApiException(400, "Missing required parameter 'appNameId' when calling OrderIngestApi->OrderIngestSubmitNewOrder");
-
-            var localVarPath = "/api/v1.0/{appNameId}/order-ingest/submit";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appNameId != null) localVarPathParams.Add("appNameId", this.Configuration.ApiClient.ParameterToString(appNameId)); // path parameter
-            if (order != null && order.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(order); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = order; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("OrderIngestSubmitNewOrder", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultOrderIngestSubmitOrderResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultOrderIngestSubmitOrderResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderIngestSubmitOrderResponse)));
-        }
-
-        /// <summary>
-        /// Provides an ability to ingest a 3rd party order into Flipdish ecosystem [ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="order"></param>
-        /// <param name="appNameId"></param>
-        /// <returns>Task of RestApiResultOrderIngestSubmitOrderResponse</returns>
-        public async System.Threading.Tasks.Task<RestApiResultOrderIngestSubmitOrderResponse> OrderIngestSubmitNewOrderAsync (OrderIngestSubmitOrderRequest order, string appNameId)
-        {
-             ApiResponse<RestApiResultOrderIngestSubmitOrderResponse> localVarResponse = await OrderIngestSubmitNewOrderAsyncWithHttpInfo(order, appNameId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Provides an ability to ingest a 3rd party order into Flipdish ecosystem [ALPHA - this endpoint is under internal development, it is not available just yet to use in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="order"></param>
-        /// <param name="appNameId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultOrderIngestSubmitOrderResponse)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderIngestSubmitOrderResponse>> OrderIngestSubmitNewOrderAsyncWithHttpInfo (OrderIngestSubmitOrderRequest order, string appNameId)
-        {
-            // verify the required parameter 'order' is set
-            if (order == null)
-                throw new ApiException(400, "Missing required parameter 'order' when calling OrderIngestApi->OrderIngestSubmitNewOrder");
-            // verify the required parameter 'appNameId' is set
-            if (appNameId == null)
-                throw new ApiException(400, "Missing required parameter 'appNameId' when calling OrderIngestApi->OrderIngestSubmitNewOrder");
-
-            var localVarPath = "/api/v1.0/{appNameId}/order-ingest/submit";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appNameId != null) localVarPathParams.Add("appNameId", this.Configuration.ApiClient.ParameterToString(appNameId)); // path parameter
-            if (order != null && order.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(order); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = order; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("OrderIngestSubmitNewOrder", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultOrderIngestSubmitOrderResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultOrderIngestSubmitOrderResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderIngestSubmitOrderResponse)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/OrdersApi.cs b/src/Flipdish/Api/OrdersApi.cs
index 4505040f..48a525af 100644
--- a/src/Flipdish/Api/OrdersApi.cs
+++ b/src/Flipdish/Api/OrdersApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,623 +25,771 @@ public interface IOrdersApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Accept order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To accept an order, you create an &#x60;accept&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
-        /// <param name="acceptObject">Order accept parameters (eg: EstimatedMinutesForDelivery)</param>
+        /// <param name="id"></param>
+        /// <param name="acceptObject"></param>
         /// <returns></returns>
         void AcceptOrder (int? id, Accept acceptObject);
 
         /// <summary>
-        /// Accept order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To accept an order, you create an &#x60;accept&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
-        /// <param name="acceptObject">Order accept parameters (eg: EstimatedMinutesForDelivery)</param>
+        /// <param name="id"></param>
+        /// <param name="acceptObject"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> AcceptOrderWithHttpInfo (int? id, Accept acceptObject);
         /// <summary>
-        /// Dispatch order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To dispatch an order send a POST request with &#x60;Id&#x60; path parameter which identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns></returns>
         void DispatchOrder (int? id);
 
         /// <summary>
-        /// Dispatch order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To dispatch an order send a POST request with &#x60;Id&#x60; path parameter which identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DispatchOrderWithHttpInfo (int? id);
         /// <summary>
-        /// Get order delivery information
+        /// 
         /// </summary>
         /// <remarks>
-        /// Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>RestApiResultOrderDeliveryInformation</returns>
         RestApiResultOrderDeliveryInformation GetDeliveryInformation (int? orderId);
 
         /// <summary>
-        /// Get order delivery information
+        /// 
         /// </summary>
         /// <remarks>
-        /// Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>ApiResponse of RestApiResultOrderDeliveryInformation</returns>
         ApiResponse<RestApiResultOrderDeliveryInformation> GetDeliveryInformationWithHttpInfo (int? orderId);
         /// <summary>
-        /// Get order fulfillment state
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment state.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>RestApiResultOrderFulfillmentStatus</returns>
         RestApiResultOrderFulfillmentStatus GetFulfillmentState (int? orderId);
 
         /// <summary>
-        /// Get order fulfillment state
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment state.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>ApiResponse of RestApiResultOrderFulfillmentStatus</returns>
         ApiResponse<RestApiResultOrderFulfillmentStatus> GetFulfillmentStateWithHttpInfo (int? orderId);
         /// <summary>
-        /// Get order fulfillment state with actionable details like default next state
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment status and details about possible states.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>RestApiResultOrderFulfillmentStatusWithConfigurationActions</returns>
         RestApiResultOrderFulfillmentStatusWithConfigurationActions GetFulfillmentStatusWithDetailsAndActions (int? orderId);
 
         /// <summary>
-        /// Get order fulfillment state with actionable details like default next state
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment status and details about possible states.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>ApiResponse of RestApiResultOrderFulfillmentStatusWithConfigurationActions</returns>
         ApiResponse<RestApiResultOrderFulfillmentStatusWithConfigurationActions> GetFulfillmentStatusWithDetailsAndActionsWithHttpInfo (int? orderId);
         /// <summary>
-        /// Get order by ID
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>RestApiResultOrder</returns>
         RestApiResultOrder GetOrderById (int? id);
 
         /// <summary>
-        /// Get order by ID
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>ApiResponse of RestApiResultOrder</returns>
         ApiResponse<RestApiResultOrder> GetOrderByIdWithHttpInfo (int? id);
         /// <summary>
-        /// Get orders by filter
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="from">Order has been placed after this parameter value (optional)</param>
-        /// <param name="to">Order has been placed before this parameter value (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultOrder</returns>
         RestApiPaginationResultOrder GetOrders (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get orders by filter
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="from">Order has been placed after this parameter value (optional)</param>
-        /// <param name="to">Order has been placed before this parameter value (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultOrder</returns>
         ApiResponse<RestApiPaginationResultOrder> GetOrdersWithHttpInfo (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null);
         /// <summary>
-        /// [PRIVATE API] Get summary of orders by filter
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="orderByRequestedForTime"> (optional)</param>
+        /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
+        /// <returns>RestApiPaginationResultOrderSummary</returns>
+        RestApiPaginationResultOrderSummary GetOrdersSummary (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="orderByRequestedForTime"> (optional)</param>
+        /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultOrderSummary</returns>
+        ApiResponse<RestApiPaginationResultOrderSummary> GetOrdersSummaryWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Query string (optional)</param>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="orderByRequestedForTime"> (optional)</param>
         /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
         /// <returns>RestApiPaginationResultOrderSummary</returns>
-        RestApiPaginationResultOrderSummary GetOrdersSummary (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null);
+        RestApiPaginationResultOrderSummary GetOrdersSummaryNew (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null);
 
         /// <summary>
-        /// [PRIVATE API] Get summary of orders by filter
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Query string (optional)</param>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="orderByRequestedForTime"> (optional)</param>
         /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultOrderSummary</returns>
-        ApiResponse<RestApiPaginationResultOrderSummary> GetOrdersSummaryWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null);
+        ApiResponse<RestApiPaginationResultOrderSummary> GetOrdersSummaryNewWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null);
         /// <summary>
-        /// Refund order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To refund an order, you create a &#x60;refund&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>OrderList</returns>
+        OrderList GetReadyToProcess (string appId, List<int?> storeId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>ApiResponse of OrderList</returns>
+        ApiResponse<OrderList> GetReadyToProcessWithHttpInfo (string appId, List<int?> storeId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="id"></param>
         /// <param name="refundObject"></param>
         /// <returns></returns>
         void RefundOrder (int? id, Refund refundObject);
 
         /// <summary>
-        /// Refund order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To refund an order, you create a &#x60;refund&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="refundObject"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RefundOrderWithHttpInfo (int? id, Refund refundObject);
         /// <summary>
-        /// Reject order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To reject an order, you create a &#x60;reject&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="rejectObject"></param>
         /// <returns></returns>
         void RejectOrder (int? id, Reject rejectObject);
 
         /// <summary>
-        /// Reject order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To reject an order, you create a &#x60;reject&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="rejectObject"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RejectOrderWithHttpInfo (int? id, Reject rejectObject);
         /// <summary>
-        /// Get fulfillment status for a list of orders
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="orderIds">Flipdish Order Id list, comma separated</param>
+        /// <param name="appId"></param>
+        /// <param name="orderIds"></param>
         /// <returns>RestApiArrayResultOrderFulfillmentStatus</returns>
         RestApiArrayResultOrderFulfillmentStatus SearchFulfillmentStatuses (string appId, string orderIds);
 
         /// <summary>
-        /// Get fulfillment status for a list of orders
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="orderIds">Flipdish Order Id list, comma separated</param>
+        /// <param name="appId"></param>
+        /// <param name="orderIds"></param>
         /// <returns>ApiResponse of RestApiArrayResultOrderFulfillmentStatus</returns>
         ApiResponse<RestApiArrayResultOrderFulfillmentStatus> SearchFulfillmentStatusesWithHttpInfo (string appId, string orderIds);
         /// <summary>
-        /// Add/update delivery-related information to an order
+        /// 
         /// </summary>
         /// <remarks>
-        /// Returns an order&#39;s delivery information. This would be used to display the latest known delivery information on a screen.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="deliveryInformation">Delivery Information</param>
+        /// <param name="orderId"></param>
+        /// <param name="deliveryInformation"></param>
         /// <returns></returns>
         void UpdateDeliveryInformation (int? orderId, OrderDeliveryInformationBase deliveryInformation);
 
         /// <summary>
-        /// Add/update delivery-related information to an order
+        /// 
         /// </summary>
         /// <remarks>
-        /// Returns an order&#39;s delivery information. This would be used to display the latest known delivery information on a screen.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="deliveryInformation">Delivery Information</param>
+        /// <param name="orderId"></param>
+        /// <param name="deliveryInformation"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateDeliveryInformationWithHttpInfo (int? orderId, OrderDeliveryInformationBase deliveryInformation);
         /// <summary>
-        /// Update fulfillment status information to an order
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Updates an order&#39;s fulfillment states.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="fulfillmentStatusRequest">Fulfillment Status</param>
+        /// <param name="orderId"></param>
+        /// <param name="fulfillmentStatusRequest"></param>
         /// <returns></returns>
         void UpdateFulfillmentState (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest);
 
         /// <summary>
-        /// Update fulfillment status information to an order
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Updates an order&#39;s fulfillment states.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="fulfillmentStatusRequest">Fulfillment Status</param>
+        /// <param name="orderId"></param>
+        /// <param name="fulfillmentStatusRequest"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateFulfillmentStateWithHttpInfo (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Accept order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To accept an order, you create an &#x60;accept&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
-        /// <param name="acceptObject">Order accept parameters (eg: EstimatedMinutesForDelivery)</param>
+        /// <param name="id"></param>
+        /// <param name="acceptObject"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task AcceptOrderAsync (int? id, Accept acceptObject);
 
         /// <summary>
-        /// Accept order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To accept an order, you create an &#x60;accept&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
-        /// <param name="acceptObject">Order accept parameters (eg: EstimatedMinutesForDelivery)</param>
+        /// <param name="id"></param>
+        /// <param name="acceptObject"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> AcceptOrderAsyncWithHttpInfo (int? id, Accept acceptObject);
         /// <summary>
-        /// Dispatch order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To dispatch an order send a POST request with &#x60;Id&#x60; path parameter which identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DispatchOrderAsync (int? id);
 
         /// <summary>
-        /// Dispatch order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To dispatch an order send a POST request with &#x60;Id&#x60; path parameter which identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DispatchOrderAsyncWithHttpInfo (int? id);
         /// <summary>
-        /// Get order delivery information
+        /// 
         /// </summary>
         /// <remarks>
-        /// Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of RestApiResultOrderDeliveryInformation</returns>
         System.Threading.Tasks.Task<RestApiResultOrderDeliveryInformation> GetDeliveryInformationAsync (int? orderId);
 
         /// <summary>
-        /// Get order delivery information
+        /// 
         /// </summary>
         /// <remarks>
-        /// Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderDeliveryInformation)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderDeliveryInformation>> GetDeliveryInformationAsyncWithHttpInfo (int? orderId);
         /// <summary>
-        /// Get order fulfillment state
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment state.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of RestApiResultOrderFulfillmentStatus</returns>
         System.Threading.Tasks.Task<RestApiResultOrderFulfillmentStatus> GetFulfillmentStateAsync (int? orderId);
 
         /// <summary>
-        /// Get order fulfillment state
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment state.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderFulfillmentStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderFulfillmentStatus>> GetFulfillmentStateAsyncWithHttpInfo (int? orderId);
         /// <summary>
-        /// Get order fulfillment state with actionable details like default next state
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment status and details about possible states.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of RestApiResultOrderFulfillmentStatusWithConfigurationActions</returns>
         System.Threading.Tasks.Task<RestApiResultOrderFulfillmentStatusWithConfigurationActions> GetFulfillmentStatusWithDetailsAndActionsAsync (int? orderId);
 
         /// <summary>
-        /// Get order fulfillment state with actionable details like default next state
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment status and details about possible states.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderFulfillmentStatusWithConfigurationActions)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderFulfillmentStatusWithConfigurationActions>> GetFulfillmentStatusWithDetailsAndActionsAsyncWithHttpInfo (int? orderId);
         /// <summary>
-        /// Get order by ID
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>Task of RestApiResultOrder</returns>
         System.Threading.Tasks.Task<RestApiResultOrder> GetOrderByIdAsync (int? id);
 
         /// <summary>
-        /// Get order by ID
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrder)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultOrder>> GetOrderByIdAsyncWithHttpInfo (int? id);
         /// <summary>
-        /// Get orders by filter
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="from">Order has been placed after this parameter value (optional)</param>
-        /// <param name="to">Order has been placed before this parameter value (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultOrder</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultOrder> GetOrdersAsync (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get orders by filter
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="from">Order has been placed after this parameter value (optional)</param>
-        /// <param name="to">Order has been placed before this parameter value (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultOrder)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrder>> GetOrdersAsyncWithHttpInfo (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null);
         /// <summary>
-        /// [PRIVATE API] Get summary of orders by filter
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="orderByRequestedForTime"> (optional)</param>
+        /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultOrderSummary</returns>
+        System.Threading.Tasks.Task<RestApiPaginationResultOrderSummary> GetOrdersSummaryAsync (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="orderByRequestedForTime"> (optional)</param>
+        /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultOrderSummary)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrderSummary>> GetOrdersSummaryAsyncWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Query string (optional)</param>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="orderByRequestedForTime"> (optional)</param>
         /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultOrderSummary</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultOrderSummary> GetOrdersSummaryAsync (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null);
+        System.Threading.Tasks.Task<RestApiPaginationResultOrderSummary> GetOrdersSummaryNewAsync (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null);
 
         /// <summary>
-        /// [PRIVATE API] Get summary of orders by filter
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Query string (optional)</param>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="orderByRequestedForTime"> (optional)</param>
         /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultOrderSummary)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrderSummary>> GetOrdersSummaryAsyncWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrderSummary>> GetOrdersSummaryNewAsyncWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of OrderList</returns>
+        System.Threading.Tasks.Task<OrderList> GetReadyToProcessAsync (string appId, List<int?> storeId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of ApiResponse (OrderList)</returns>
+        System.Threading.Tasks.Task<ApiResponse<OrderList>> GetReadyToProcessAsyncWithHttpInfo (string appId, List<int?> storeId = null);
         /// <summary>
-        /// Refund order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To refund an order, you create a &#x60;refund&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="refundObject"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task RefundOrderAsync (int? id, Refund refundObject);
 
         /// <summary>
-        /// Refund order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To refund an order, you create a &#x60;refund&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="refundObject"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RefundOrderAsyncWithHttpInfo (int? id, Refund refundObject);
         /// <summary>
-        /// Reject order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To reject an order, you create a &#x60;reject&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="rejectObject"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task RejectOrderAsync (int? id, Reject rejectObject);
 
         /// <summary>
-        /// Reject order
+        /// 
         /// </summary>
         /// <remarks>
-        /// To reject an order, you create a &#x60;reject&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="rejectObject"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RejectOrderAsyncWithHttpInfo (int? id, Reject rejectObject);
         /// <summary>
-        /// Get fulfillment status for a list of orders
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="orderIds">Flipdish Order Id list, comma separated</param>
+        /// <param name="appId"></param>
+        /// <param name="orderIds"></param>
         /// <returns>Task of RestApiArrayResultOrderFulfillmentStatus</returns>
         System.Threading.Tasks.Task<RestApiArrayResultOrderFulfillmentStatus> SearchFulfillmentStatusesAsync (string appId, string orderIds);
 
         /// <summary>
-        /// Get fulfillment status for a list of orders
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="orderIds">Flipdish Order Id list, comma separated</param>
+        /// <param name="appId"></param>
+        /// <param name="orderIds"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultOrderFulfillmentStatus)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderFulfillmentStatus>> SearchFulfillmentStatusesAsyncWithHttpInfo (string appId, string orderIds);
         /// <summary>
-        /// Add/update delivery-related information to an order
+        /// 
         /// </summary>
         /// <remarks>
-        /// Returns an order&#39;s delivery information. This would be used to display the latest known delivery information on a screen.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="deliveryInformation">Delivery Information</param>
+        /// <param name="orderId"></param>
+        /// <param name="deliveryInformation"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateDeliveryInformationAsync (int? orderId, OrderDeliveryInformationBase deliveryInformation);
 
         /// <summary>
-        /// Add/update delivery-related information to an order
+        /// 
         /// </summary>
         /// <remarks>
-        /// Returns an order&#39;s delivery information. This would be used to display the latest known delivery information on a screen.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="deliveryInformation">Delivery Information</param>
+        /// <param name="orderId"></param>
+        /// <param name="deliveryInformation"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateDeliveryInformationAsyncWithHttpInfo (int? orderId, OrderDeliveryInformationBase deliveryInformation);
         /// <summary>
-        /// Update fulfillment status information to an order
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Updates an order&#39;s fulfillment states.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="fulfillmentStatusRequest">Fulfillment Status</param>
+        /// <param name="orderId"></param>
+        /// <param name="fulfillmentStatusRequest"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateFulfillmentStateAsync (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest);
 
         /// <summary>
-        /// Update fulfillment status information to an order
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system] Updates an order&#39;s fulfillment states.
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="fulfillmentStatusRequest">Fulfillment Status</param>
+        /// <param name="orderId"></param>
+        /// <param name="fulfillmentStatusRequest"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateFulfillmentStateAsyncWithHttpInfo (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest);
         #endregion Asynchronous Operations
@@ -745,11 +893,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Accept order To accept an order, you create an &#x60;accept&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
-        /// <param name="acceptObject">Order accept parameters (eg: EstimatedMinutesForDelivery)</param>
+        /// <param name="id"></param>
+        /// <param name="acceptObject"></param>
         /// <returns></returns>
         public void AcceptOrder (int? id, Accept acceptObject)
         {
@@ -757,11 +905,11 @@ public void AcceptOrder (int? id, Accept acceptObject)
         }
 
         /// <summary>
-        /// Accept order To accept an order, you create an &#x60;accept&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
-        /// <param name="acceptObject">Order accept parameters (eg: EstimatedMinutesForDelivery)</param>
+        /// <param name="id"></param>
+        /// <param name="acceptObject"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> AcceptOrderWithHttpInfo (int? id, Accept acceptObject)
         {
@@ -772,7 +920,7 @@ public ApiResponse<Object> AcceptOrderWithHttpInfo (int? id, Accept acceptObject
             if (acceptObject == null)
                 throw new ApiException(400, "Missing required parameter 'acceptObject' when calling OrdersApi->AcceptOrder");
 
-            var localVarPath = "/api/v1.0/orders/{id}/accept";
+            var localVarPath = "./api/v1.0/orders/{id}/accept";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -832,16 +980,16 @@ public ApiResponse<Object> AcceptOrderWithHttpInfo (int? id, Accept acceptObject
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Accept order To accept an order, you create an &#x60;accept&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
-        /// <param name="acceptObject">Order accept parameters (eg: EstimatedMinutesForDelivery)</param>
+        /// <param name="id"></param>
+        /// <param name="acceptObject"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task AcceptOrderAsync (int? id, Accept acceptObject)
         {
@@ -850,11 +998,11 @@ public async System.Threading.Tasks.Task AcceptOrderAsync (int? id, Accept accep
         }
 
         /// <summary>
-        /// Accept order To accept an order, you create an &#x60;accept&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
-        /// <param name="acceptObject">Order accept parameters (eg: EstimatedMinutesForDelivery)</param>
+        /// <param name="id"></param>
+        /// <param name="acceptObject"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> AcceptOrderAsyncWithHttpInfo (int? id, Accept acceptObject)
         {
@@ -865,7 +1013,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AcceptOrderAsyncWi
             if (acceptObject == null)
                 throw new ApiException(400, "Missing required parameter 'acceptObject' when calling OrdersApi->AcceptOrder");
 
-            var localVarPath = "/api/v1.0/orders/{id}/accept";
+            var localVarPath = "./api/v1.0/orders/{id}/accept";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -925,15 +1073,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> AcceptOrderAsyncWi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Dispatch order To dispatch an order send a POST request with &#x60;Id&#x60; path parameter which identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns></returns>
         public void DispatchOrder (int? id)
         {
@@ -941,10 +1089,10 @@ public void DispatchOrder (int? id)
         }
 
         /// <summary>
-        /// Dispatch order To dispatch an order send a POST request with &#x60;Id&#x60; path parameter which identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DispatchOrderWithHttpInfo (int? id)
         {
@@ -952,7 +1100,7 @@ public ApiResponse<Object> DispatchOrderWithHttpInfo (int? id)
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling OrdersApi->DispatchOrder");
 
-            var localVarPath = "/api/v1.0/orders/{id}/dispatch";
+            var localVarPath = "./api/v1.0/orders/{id}/dispatch";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -999,15 +1147,15 @@ public ApiResponse<Object> DispatchOrderWithHttpInfo (int? id)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Dispatch order To dispatch an order send a POST request with &#x60;Id&#x60; path parameter which identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DispatchOrderAsync (int? id)
         {
@@ -1016,10 +1164,10 @@ public async System.Threading.Tasks.Task DispatchOrderAsync (int? id)
         }
 
         /// <summary>
-        /// Dispatch order To dispatch an order send a POST request with &#x60;Id&#x60; path parameter which identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DispatchOrderAsyncWithHttpInfo (int? id)
         {
@@ -1027,7 +1175,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DispatchOrderAsync
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling OrdersApi->DispatchOrder");
 
-            var localVarPath = "/api/v1.0/orders/{id}/dispatch";
+            var localVarPath = "./api/v1.0/orders/{id}/dispatch";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1074,15 +1222,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DispatchOrderAsync
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Get order delivery information Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>RestApiResultOrderDeliveryInformation</returns>
         public RestApiResultOrderDeliveryInformation GetDeliveryInformation (int? orderId)
         {
@@ -1091,10 +1239,10 @@ public RestApiResultOrderDeliveryInformation GetDeliveryInformation (int? orderI
         }
 
         /// <summary>
-        /// Get order delivery information Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>ApiResponse of RestApiResultOrderDeliveryInformation</returns>
         public ApiResponse< RestApiResultOrderDeliveryInformation > GetDeliveryInformationWithHttpInfo (int? orderId)
         {
@@ -1102,7 +1250,7 @@ public ApiResponse< RestApiResultOrderDeliveryInformation > GetDeliveryInformati
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling OrdersApi->GetDeliveryInformation");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/deliveryinfo";
+            var localVarPath = "./api/v1.0/orders/{orderId}/deliveryinfo";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1149,15 +1297,15 @@ public ApiResponse< RestApiResultOrderDeliveryInformation > GetDeliveryInformati
             }
 
             return new ApiResponse<RestApiResultOrderDeliveryInformation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderDeliveryInformation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderDeliveryInformation)));
         }
 
         /// <summary>
-        /// Get order delivery information Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of RestApiResultOrderDeliveryInformation</returns>
         public async System.Threading.Tasks.Task<RestApiResultOrderDeliveryInformation> GetDeliveryInformationAsync (int? orderId)
         {
@@ -1167,10 +1315,10 @@ public async System.Threading.Tasks.Task<RestApiResultOrderDeliveryInformation>
         }
 
         /// <summary>
-        /// Get order delivery information Returns an orders delivery information. This would be used to display the latest known delivery information on a screen.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderDeliveryInformation)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderDeliveryInformation>> GetDeliveryInformationAsyncWithHttpInfo (int? orderId)
         {
@@ -1178,7 +1326,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderDeliveryI
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling OrdersApi->GetDeliveryInformation");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/deliveryinfo";
+            var localVarPath = "./api/v1.0/orders/{orderId}/deliveryinfo";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1225,15 +1373,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderDeliveryI
             }
 
             return new ApiResponse<RestApiResultOrderDeliveryInformation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderDeliveryInformation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderDeliveryInformation)));
         }
 
         /// <summary>
-        /// Get order fulfillment state [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment state.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>RestApiResultOrderFulfillmentStatus</returns>
         public RestApiResultOrderFulfillmentStatus GetFulfillmentState (int? orderId)
         {
@@ -1242,10 +1390,10 @@ public RestApiResultOrderFulfillmentStatus GetFulfillmentState (int? orderId)
         }
 
         /// <summary>
-        /// Get order fulfillment state [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment state.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>ApiResponse of RestApiResultOrderFulfillmentStatus</returns>
         public ApiResponse< RestApiResultOrderFulfillmentStatus > GetFulfillmentStateWithHttpInfo (int? orderId)
         {
@@ -1253,7 +1401,7 @@ public ApiResponse< RestApiResultOrderFulfillmentStatus > GetFulfillmentStateWit
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling OrdersApi->GetFulfillmentState");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/fulfillment/state";
+            var localVarPath = "./api/v1.0/orders/{orderId}/fulfillment/state";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1300,15 +1448,15 @@ public ApiResponse< RestApiResultOrderFulfillmentStatus > GetFulfillmentStateWit
             }
 
             return new ApiResponse<RestApiResultOrderFulfillmentStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderFulfillmentStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderFulfillmentStatus)));
         }
 
         /// <summary>
-        /// Get order fulfillment state [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment state.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of RestApiResultOrderFulfillmentStatus</returns>
         public async System.Threading.Tasks.Task<RestApiResultOrderFulfillmentStatus> GetFulfillmentStateAsync (int? orderId)
         {
@@ -1318,10 +1466,10 @@ public async System.Threading.Tasks.Task<RestApiResultOrderFulfillmentStatus> Ge
         }
 
         /// <summary>
-        /// Get order fulfillment state [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment state.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderFulfillmentStatus)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderFulfillmentStatus>> GetFulfillmentStateAsyncWithHttpInfo (int? orderId)
         {
@@ -1329,7 +1477,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderFulfillme
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling OrdersApi->GetFulfillmentState");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/fulfillment/state";
+            var localVarPath = "./api/v1.0/orders/{orderId}/fulfillment/state";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1376,15 +1524,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderFulfillme
             }
 
             return new ApiResponse<RestApiResultOrderFulfillmentStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderFulfillmentStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderFulfillmentStatus)));
         }
 
         /// <summary>
-        /// Get order fulfillment state with actionable details like default next state [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment status and details about possible states.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>RestApiResultOrderFulfillmentStatusWithConfigurationActions</returns>
         public RestApiResultOrderFulfillmentStatusWithConfigurationActions GetFulfillmentStatusWithDetailsAndActions (int? orderId)
         {
@@ -1393,10 +1541,10 @@ public RestApiResultOrderFulfillmentStatusWithConfigurationActions GetFulfillmen
         }
 
         /// <summary>
-        /// Get order fulfillment state with actionable details like default next state [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment status and details about possible states.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>ApiResponse of RestApiResultOrderFulfillmentStatusWithConfigurationActions</returns>
         public ApiResponse< RestApiResultOrderFulfillmentStatusWithConfigurationActions > GetFulfillmentStatusWithDetailsAndActionsWithHttpInfo (int? orderId)
         {
@@ -1404,7 +1552,7 @@ public ApiResponse< RestApiResultOrderFulfillmentStatusWithConfigurationActions
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling OrdersApi->GetFulfillmentStatusWithDetailsAndActions");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/fulfillment/state/details";
+            var localVarPath = "./api/v1.0/orders/{orderId}/fulfillment/state/details";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1451,15 +1599,15 @@ public ApiResponse< RestApiResultOrderFulfillmentStatusWithConfigurationActions
             }
 
             return new ApiResponse<RestApiResultOrderFulfillmentStatusWithConfigurationActions>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderFulfillmentStatusWithConfigurationActions) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderFulfillmentStatusWithConfigurationActions)));
         }
 
         /// <summary>
-        /// Get order fulfillment state with actionable details like default next state [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment status and details about possible states.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of RestApiResultOrderFulfillmentStatusWithConfigurationActions</returns>
         public async System.Threading.Tasks.Task<RestApiResultOrderFulfillmentStatusWithConfigurationActions> GetFulfillmentStatusWithDetailsAndActionsAsync (int? orderId)
         {
@@ -1469,10 +1617,10 @@ public async System.Threading.Tasks.Task<RestApiResultOrderFulfillmentStatusWith
         }
 
         /// <summary>
-        /// Get order fulfillment state with actionable details like default next state [BETA - this endpoint is under development, do not use it in your production system] Returns an order&#39;s fulfillment status and details about possible states.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderFulfillmentStatusWithConfigurationActions)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderFulfillmentStatusWithConfigurationActions>> GetFulfillmentStatusWithDetailsAndActionsAsyncWithHttpInfo (int? orderId)
         {
@@ -1480,7 +1628,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderFulfillme
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling OrdersApi->GetFulfillmentStatusWithDetailsAndActions");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/fulfillment/state/details";
+            var localVarPath = "./api/v1.0/orders/{orderId}/fulfillment/state/details";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1527,15 +1675,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderFulfillme
             }
 
             return new ApiResponse<RestApiResultOrderFulfillmentStatusWithConfigurationActions>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderFulfillmentStatusWithConfigurationActions) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderFulfillmentStatusWithConfigurationActions)));
         }
 
         /// <summary>
-        /// Get order by ID 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>RestApiResultOrder</returns>
         public RestApiResultOrder GetOrderById (int? id)
         {
@@ -1544,10 +1692,10 @@ public RestApiResultOrder GetOrderById (int? id)
         }
 
         /// <summary>
-        /// Get order by ID 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>ApiResponse of RestApiResultOrder</returns>
         public ApiResponse< RestApiResultOrder > GetOrderByIdWithHttpInfo (int? id)
         {
@@ -1555,7 +1703,7 @@ public ApiResponse< RestApiResultOrder > GetOrderByIdWithHttpInfo (int? id)
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling OrdersApi->GetOrderById");
 
-            var localVarPath = "/api/v1.0/orders/{id}";
+            var localVarPath = "./api/v1.0/orders/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1602,15 +1750,15 @@ public ApiResponse< RestApiResultOrder > GetOrderByIdWithHttpInfo (int? id)
             }
 
             return new ApiResponse<RestApiResultOrder>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrder)));
         }
 
         /// <summary>
-        /// Get order by ID 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>Task of RestApiResultOrder</returns>
         public async System.Threading.Tasks.Task<RestApiResultOrder> GetOrderByIdAsync (int? id)
         {
@@ -1620,10 +1768,10 @@ public async System.Threading.Tasks.Task<RestApiResultOrder> GetOrderByIdAsync (
         }
 
         /// <summary>
-        /// Get order by ID 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrder)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrder>> GetOrderByIdAsyncWithHttpInfo (int? id)
         {
@@ -1631,7 +1779,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrder>> GetOrd
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling OrdersApi->GetOrderById");
 
-            var localVarPath = "/api/v1.0/orders/{id}";
+            var localVarPath = "./api/v1.0/orders/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1678,20 +1826,20 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrder>> GetOrd
             }
 
             return new ApiResponse<RestApiResultOrder>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrder)));
         }
 
         /// <summary>
-        /// Get orders by filter 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="from">Order has been placed after this parameter value (optional)</param>
-        /// <param name="to">Order has been placed before this parameter value (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultOrder</returns>
         public RestApiPaginationResultOrder GetOrders (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null)
         {
@@ -1700,20 +1848,20 @@ public RestApiPaginationResultOrder GetOrders (List<int?> physicalRestaurantId =
         }
 
         /// <summary>
-        /// Get orders by filter 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="from">Order has been placed after this parameter value (optional)</param>
-        /// <param name="to">Order has been placed before this parameter value (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultOrder</returns>
         public ApiResponse< RestApiPaginationResultOrder > GetOrdersWithHttpInfo (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null)
         {
 
-            var localVarPath = "/api/v1.0/orders";
+            var localVarPath = "./api/v1.0/orders";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1765,20 +1913,20 @@ public ApiResponse< RestApiPaginationResultOrder > GetOrdersWithHttpInfo (List<i
             }
 
             return new ApiResponse<RestApiPaginationResultOrder>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultOrder)));
         }
 
         /// <summary>
-        /// Get orders by filter 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="from">Order has been placed after this parameter value (optional)</param>
-        /// <param name="to">Order has been placed before this parameter value (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultOrder</returns>
         public async System.Threading.Tasks.Task<RestApiPaginationResultOrder> GetOrdersAsync (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null)
         {
@@ -1788,20 +1936,20 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultOrder> GetOrders
         }
 
         /// <summary>
-        /// Get orders by filter 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="from">Order has been placed after this parameter value (optional)</param>
-        /// <param name="to">Order has been placed before this parameter value (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultOrder)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrder>> GetOrdersAsyncWithHttpInfo (List<int?> physicalRestaurantId = null, List<string> state = null, DateTime? from = null, DateTime? to = null, int? page = null, int? limit = null)
         {
 
-            var localVarPath = "/api/v1.0/orders";
+            var localVarPath = "./api/v1.0/orders";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1853,49 +2001,57 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrde
             }
 
             return new ApiResponse<RestApiPaginationResultOrder>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultOrder)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get summary of orders by filter 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Query string (optional)</param>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="orderByRequestedForTime"> (optional)</param>
         /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
         /// <returns>RestApiPaginationResultOrderSummary</returns>
-        public RestApiPaginationResultOrderSummary GetOrdersSummary (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null)
+        public RestApiPaginationResultOrderSummary GetOrdersSummary (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
         {
-             ApiResponse<RestApiPaginationResultOrderSummary> localVarResponse = GetOrdersSummaryWithHttpInfo(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels);
+             ApiResponse<RestApiPaginationResultOrderSummary> localVarResponse = GetOrdersSummaryWithHttpInfo(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels, orderIds, from, to, logSql);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API] Get summary of orders by filter 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Query string (optional)</param>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="orderByRequestedForTime"> (optional)</param>
         /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultOrderSummary</returns>
-        public ApiResponse< RestApiPaginationResultOrderSummary > GetOrdersSummaryWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null)
+        public ApiResponse< RestApiPaginationResultOrderSummary > GetOrdersSummaryWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OrdersApi->GetOrdersSummary");
 
-            var localVarPath = "/api/v1.0/{appId}/orders/summaries";
+            var localVarPath = "./api/v1.0/{appId}/orders/summaries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1927,6 +2083,10 @@ public ApiResponse< RestApiPaginationResultOrderSummary > GetOrdersSummaryWithHt
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (orderByRequestedForTime != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderByRequestedForTime", orderByRequestedForTime)); // query parameter
             if (channels != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "channels", channels)); // query parameter
+            if (orderIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "orderIds", orderIds)); // query parameter
+            if (from != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "from", from)); // query parameter
+            if (to != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "to", to)); // query parameter
+            if (logSql != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "logSql", logSql)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1949,50 +2109,58 @@ public ApiResponse< RestApiPaginationResultOrderSummary > GetOrdersSummaryWithHt
             }
 
             return new ApiResponse<RestApiPaginationResultOrderSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultOrderSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultOrderSummary)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get summary of orders by filter 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Query string (optional)</param>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="orderByRequestedForTime"> (optional)</param>
         /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultOrderSummary</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultOrderSummary> GetOrdersSummaryAsync (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null)
+        public async System.Threading.Tasks.Task<RestApiPaginationResultOrderSummary> GetOrdersSummaryAsync (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
         {
-             ApiResponse<RestApiPaginationResultOrderSummary> localVarResponse = await GetOrdersSummaryAsyncWithHttpInfo(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels);
+             ApiResponse<RestApiPaginationResultOrderSummary> localVarResponse = await GetOrdersSummaryAsyncWithHttpInfo(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels, orderIds, from, to, logSql);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Get summary of orders by filter 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Query string (optional)</param>
-        /// <param name="physicalRestaurantId">Physical restaurant identifiers (optional)</param>
-        /// <param name="state">Order states (optional)</param>
-        /// <param name="page">Requested page number (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="orderByRequestedForTime"> (optional)</param>
         /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultOrderSummary)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrderSummary>> GetOrdersSummaryAsyncWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrderSummary>> GetOrdersSummaryAsyncWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling OrdersApi->GetOrdersSummary");
 
-            var localVarPath = "/api/v1.0/{appId}/orders/summaries";
+            var localVarPath = "./api/v1.0/{appId}/orders/summaries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2024,6 +2192,10 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrde
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
             if (orderByRequestedForTime != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderByRequestedForTime", orderByRequestedForTime)); // query parameter
             if (channels != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "channels", channels)); // query parameter
+            if (orderIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "orderIds", orderIds)); // query parameter
+            if (from != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "from", from)); // query parameter
+            if (to != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "to", to)); // query parameter
+            if (logSql != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "logSql", logSql)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2046,15 +2218,389 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrde
             }
 
             return new ApiResponse<RestApiPaginationResultOrderSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultOrderSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultOrderSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="orderByRequestedForTime"> (optional)</param>
+        /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
+        /// <returns>RestApiPaginationResultOrderSummary</returns>
+        public RestApiPaginationResultOrderSummary GetOrdersSummaryNew (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
+        {
+             ApiResponse<RestApiPaginationResultOrderSummary> localVarResponse = GetOrdersSummaryNewWithHttpInfo(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels, orderIds, from, to, logSql);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="orderByRequestedForTime"> (optional)</param>
+        /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultOrderSummary</returns>
+        public ApiResponse< RestApiPaginationResultOrderSummary > GetOrdersSummaryNewWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OrdersApi->GetOrdersSummaryNew");
+
+            var localVarPath = "./api/v1.0/{appId}/orders/summariesNew";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
+            if (physicalRestaurantId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "physicalRestaurantId", physicalRestaurantId)); // query parameter
+            if (state != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "state", state)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (orderByRequestedForTime != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderByRequestedForTime", orderByRequestedForTime)); // query parameter
+            if (channels != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "channels", channels)); // query parameter
+            if (orderIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "orderIds", orderIds)); // query parameter
+            if (from != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "from", from)); // query parameter
+            if (to != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "to", to)); // query parameter
+            if (logSql != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "logSql", logSql)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetOrdersSummaryNew", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultOrderSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultOrderSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultOrderSummary)));
         }
 
         /// <summary>
-        /// Refund order To refund an order, you create a &#x60;refund&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="orderByRequestedForTime"> (optional)</param>
+        /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultOrderSummary</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultOrderSummary> GetOrdersSummaryNewAsync (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
+        {
+             ApiResponse<RestApiPaginationResultOrderSummary> localVarResponse = await GetOrdersSummaryNewAsyncWithHttpInfo(appId, searchQuery, physicalRestaurantId, state, page, limit, orderByRequestedForTime, channels, orderIds, from, to, logSql);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="physicalRestaurantId"> (optional)</param>
+        /// <param name="state"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="orderByRequestedForTime"> (optional)</param>
+        /// <param name="channels"> (optional)</param>
+        /// <param name="orderIds"> (optional)</param>
+        /// <param name="from"> (optional)</param>
+        /// <param name="to"> (optional)</param>
+        /// <param name="logSql"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultOrderSummary)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultOrderSummary>> GetOrdersSummaryNewAsyncWithHttpInfo (string appId, string searchQuery = null, List<int?> physicalRestaurantId = null, List<string> state = null, int? page = null, int? limit = null, bool? orderByRequestedForTime = null, List<string> channels = null, List<int?> orderIds = null, DateTime? from = null, DateTime? to = null, bool? logSql = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OrdersApi->GetOrdersSummaryNew");
+
+            var localVarPath = "./api/v1.0/{appId}/orders/summariesNew";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
+            if (physicalRestaurantId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "physicalRestaurantId", physicalRestaurantId)); // query parameter
+            if (state != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "state", state)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (orderByRequestedForTime != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "orderByRequestedForTime", orderByRequestedForTime)); // query parameter
+            if (channels != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "channels", channels)); // query parameter
+            if (orderIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "orderIds", orderIds)); // query parameter
+            if (from != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "from", from)); // query parameter
+            if (to != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "to", to)); // query parameter
+            if (logSql != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "logSql", logSql)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetOrdersSummaryNew", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultOrderSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultOrderSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultOrderSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>OrderList</returns>
+        public OrderList GetReadyToProcess (string appId, List<int?> storeId = null)
+        {
+             ApiResponse<OrderList> localVarResponse = GetReadyToProcessWithHttpInfo(appId, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>ApiResponse of OrderList</returns>
+        public ApiResponse< OrderList > GetReadyToProcessWithHttpInfo (string appId, List<int?> storeId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OrdersApi->GetReadyToProcess");
+
+            var localVarPath = "./api/v1.0/{appId}/orders/ready_to_process";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetReadyToProcess", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<OrderList>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (OrderList) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OrderList)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of OrderList</returns>
+        public async System.Threading.Tasks.Task<OrderList> GetReadyToProcessAsync (string appId, List<int?> storeId = null)
+        {
+             ApiResponse<OrderList> localVarResponse = await GetReadyToProcessAsyncWithHttpInfo(appId, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"> (optional)</param>
+        /// <returns>Task of ApiResponse (OrderList)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<OrderList>> GetReadyToProcessAsyncWithHttpInfo (string appId, List<int?> storeId = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling OrdersApi->GetReadyToProcess");
+
+            var localVarPath = "./api/v1.0/{appId}/orders/ready_to_process";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetReadyToProcess", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<OrderList>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (OrderList) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OrderList)));
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="refundObject"></param>
         /// <returns></returns>
         public void RefundOrder (int? id, Refund refundObject)
@@ -2063,10 +2609,10 @@ public void RefundOrder (int? id, Refund refundObject)
         }
 
         /// <summary>
-        /// Refund order To refund an order, you create a &#x60;refund&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="refundObject"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> RefundOrderWithHttpInfo (int? id, Refund refundObject)
@@ -2078,7 +2624,7 @@ public ApiResponse<Object> RefundOrderWithHttpInfo (int? id, Refund refundObject
             if (refundObject == null)
                 throw new ApiException(400, "Missing required parameter 'refundObject' when calling OrdersApi->RefundOrder");
 
-            var localVarPath = "/api/v1.0/orders/{id}/refund";
+            var localVarPath = "./api/v1.0/orders/{id}/refund";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2138,15 +2684,15 @@ public ApiResponse<Object> RefundOrderWithHttpInfo (int? id, Refund refundObject
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Refund order To refund an order, you create a &#x60;refund&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="refundObject"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task RefundOrderAsync (int? id, Refund refundObject)
@@ -2156,10 +2702,10 @@ public async System.Threading.Tasks.Task RefundOrderAsync (int? id, Refund refun
         }
 
         /// <summary>
-        /// Refund order To refund an order, you create a &#x60;refund&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="refundObject"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> RefundOrderAsyncWithHttpInfo (int? id, Refund refundObject)
@@ -2171,7 +2717,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RefundOrderAsyncWi
             if (refundObject == null)
                 throw new ApiException(400, "Missing required parameter 'refundObject' when calling OrdersApi->RefundOrder");
 
-            var localVarPath = "/api/v1.0/orders/{id}/refund";
+            var localVarPath = "./api/v1.0/orders/{id}/refund";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2231,15 +2777,15 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RefundOrderAsyncWi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Reject order To reject an order, you create a &#x60;reject&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="rejectObject"></param>
         /// <returns></returns>
         public void RejectOrder (int? id, Reject rejectObject)
@@ -2248,10 +2794,10 @@ public void RejectOrder (int? id, Reject rejectObject)
         }
 
         /// <summary>
-        /// Reject order To reject an order, you create a &#x60;reject&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="rejectObject"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> RejectOrderWithHttpInfo (int? id, Reject rejectObject)
@@ -2263,7 +2809,7 @@ public ApiResponse<Object> RejectOrderWithHttpInfo (int? id, Reject rejectObject
             if (rejectObject == null)
                 throw new ApiException(400, "Missing required parameter 'rejectObject' when calling OrdersApi->RejectOrder");
 
-            var localVarPath = "/api/v1.0/orders/{id}/reject";
+            var localVarPath = "./api/v1.0/orders/{id}/reject";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2323,15 +2869,15 @@ public ApiResponse<Object> RejectOrderWithHttpInfo (int? id, Reject rejectObject
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Reject order To reject an order, you create a &#x60;reject&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="rejectObject"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task RejectOrderAsync (int? id, Reject rejectObject)
@@ -2341,10 +2887,10 @@ public async System.Threading.Tasks.Task RejectOrderAsync (int? id, Reject rejec
         }
 
         /// <summary>
-        /// Reject order To reject an order, you create a &#x60;reject&#x60; object and send it to Flipdish API using HTTP POST method. &#x60;Id&#x60; path parameter identifies the order.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="id">Order identifier</param>
+        /// <param name="id"></param>
         /// <param name="rejectObject"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> RejectOrderAsyncWithHttpInfo (int? id, Reject rejectObject)
@@ -2356,7 +2902,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RejectOrderAsyncWi
             if (rejectObject == null)
                 throw new ApiException(400, "Missing required parameter 'rejectObject' when calling OrdersApi->RejectOrder");
 
-            var localVarPath = "/api/v1.0/orders/{id}/reject";
+            var localVarPath = "./api/v1.0/orders/{id}/reject";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2416,16 +2962,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RejectOrderAsyncWi
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Get fulfillment status for a list of orders [BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="orderIds">Flipdish Order Id list, comma separated</param>
+        /// <param name="appId"></param>
+        /// <param name="orderIds"></param>
         /// <returns>RestApiArrayResultOrderFulfillmentStatus</returns>
         public RestApiArrayResultOrderFulfillmentStatus SearchFulfillmentStatuses (string appId, string orderIds)
         {
@@ -2434,11 +2980,11 @@ public RestApiArrayResultOrderFulfillmentStatus SearchFulfillmentStatuses (strin
         }
 
         /// <summary>
-        /// Get fulfillment status for a list of orders [BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="orderIds">Flipdish Order Id list, comma separated</param>
+        /// <param name="appId"></param>
+        /// <param name="orderIds"></param>
         /// <returns>ApiResponse of RestApiArrayResultOrderFulfillmentStatus</returns>
         public ApiResponse< RestApiArrayResultOrderFulfillmentStatus > SearchFulfillmentStatusesWithHttpInfo (string appId, string orderIds)
         {
@@ -2449,7 +2995,7 @@ public ApiResponse< RestApiArrayResultOrderFulfillmentStatus > SearchFulfillment
             if (orderIds == null)
                 throw new ApiException(400, "Missing required parameter 'orderIds' when calling OrdersApi->SearchFulfillmentStatuses");
 
-            var localVarPath = "/api/v1.0/{appId}/orders/fulfillmentstatuses";
+            var localVarPath = "./api/v1.0/{appId}/orders/fulfillmentstatuses";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2497,16 +3043,16 @@ public ApiResponse< RestApiArrayResultOrderFulfillmentStatus > SearchFulfillment
             }
 
             return new ApiResponse<RestApiArrayResultOrderFulfillmentStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultOrderFulfillmentStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOrderFulfillmentStatus)));
         }
 
         /// <summary>
-        /// Get fulfillment status for a list of orders [BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="orderIds">Flipdish Order Id list, comma separated</param>
+        /// <param name="appId"></param>
+        /// <param name="orderIds"></param>
         /// <returns>Task of RestApiArrayResultOrderFulfillmentStatus</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultOrderFulfillmentStatus> SearchFulfillmentStatusesAsync (string appId, string orderIds)
         {
@@ -2516,11 +3062,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultOrderFulfillmentStatu
         }
 
         /// <summary>
-        /// Get fulfillment status for a list of orders [BETA - this endpoint is under development, do not use it in your production system] Returns fulfillment status for list of orders.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Id</param>
-        /// <param name="orderIds">Flipdish Order Id list, comma separated</param>
+        /// <param name="appId"></param>
+        /// <param name="orderIds"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultOrderFulfillmentStatus)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderFulfillmentStatus>> SearchFulfillmentStatusesAsyncWithHttpInfo (string appId, string orderIds)
         {
@@ -2531,7 +3077,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderFulf
             if (orderIds == null)
                 throw new ApiException(400, "Missing required parameter 'orderIds' when calling OrdersApi->SearchFulfillmentStatuses");
 
-            var localVarPath = "/api/v1.0/{appId}/orders/fulfillmentstatuses";
+            var localVarPath = "./api/v1.0/{appId}/orders/fulfillmentstatuses";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2579,16 +3125,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultOrderFulf
             }
 
             return new ApiResponse<RestApiArrayResultOrderFulfillmentStatus>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultOrderFulfillmentStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultOrderFulfillmentStatus)));
         }
 
         /// <summary>
-        /// Add/update delivery-related information to an order Returns an order&#39;s delivery information. This would be used to display the latest known delivery information on a screen.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="deliveryInformation">Delivery Information</param>
+        /// <param name="orderId"></param>
+        /// <param name="deliveryInformation"></param>
         /// <returns></returns>
         public void UpdateDeliveryInformation (int? orderId, OrderDeliveryInformationBase deliveryInformation)
         {
@@ -2596,11 +3142,11 @@ public void UpdateDeliveryInformation (int? orderId, OrderDeliveryInformationBas
         }
 
         /// <summary>
-        /// Add/update delivery-related information to an order Returns an order&#39;s delivery information. This would be used to display the latest known delivery information on a screen.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="deliveryInformation">Delivery Information</param>
+        /// <param name="orderId"></param>
+        /// <param name="deliveryInformation"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateDeliveryInformationWithHttpInfo (int? orderId, OrderDeliveryInformationBase deliveryInformation)
         {
@@ -2611,7 +3157,7 @@ public ApiResponse<Object> UpdateDeliveryInformationWithHttpInfo (int? orderId,
             if (deliveryInformation == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryInformation' when calling OrdersApi->UpdateDeliveryInformation");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/deliveryinfo";
+            var localVarPath = "./api/v1.0/orders/{orderId}/deliveryinfo";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2671,16 +3217,16 @@ public ApiResponse<Object> UpdateDeliveryInformationWithHttpInfo (int? orderId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Add/update delivery-related information to an order Returns an order&#39;s delivery information. This would be used to display the latest known delivery information on a screen.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="deliveryInformation">Delivery Information</param>
+        /// <param name="orderId"></param>
+        /// <param name="deliveryInformation"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateDeliveryInformationAsync (int? orderId, OrderDeliveryInformationBase deliveryInformation)
         {
@@ -2689,11 +3235,11 @@ public async System.Threading.Tasks.Task UpdateDeliveryInformationAsync (int? or
         }
 
         /// <summary>
-        /// Add/update delivery-related information to an order Returns an order&#39;s delivery information. This would be used to display the latest known delivery information on a screen.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="deliveryInformation">Delivery Information</param>
+        /// <param name="orderId"></param>
+        /// <param name="deliveryInformation"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateDeliveryInformationAsyncWithHttpInfo (int? orderId, OrderDeliveryInformationBase deliveryInformation)
         {
@@ -2704,7 +3250,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateDeliveryInfo
             if (deliveryInformation == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryInformation' when calling OrdersApi->UpdateDeliveryInformation");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/deliveryinfo";
+            var localVarPath = "./api/v1.0/orders/{orderId}/deliveryinfo";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2764,16 +3310,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateDeliveryInfo
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update fulfillment status information to an order [BETA - this endpoint is under development, do not use it in your production system] Updates an order&#39;s fulfillment states.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="fulfillmentStatusRequest">Fulfillment Status</param>
+        /// <param name="orderId"></param>
+        /// <param name="fulfillmentStatusRequest"></param>
         /// <returns></returns>
         public void UpdateFulfillmentState (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest)
         {
@@ -2781,11 +3327,11 @@ public void UpdateFulfillmentState (int? orderId, OrderFulfillmentStatusUpdate f
         }
 
         /// <summary>
-        /// Update fulfillment status information to an order [BETA - this endpoint is under development, do not use it in your production system] Updates an order&#39;s fulfillment states.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="fulfillmentStatusRequest">Fulfillment Status</param>
+        /// <param name="orderId"></param>
+        /// <param name="fulfillmentStatusRequest"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateFulfillmentStateWithHttpInfo (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest)
         {
@@ -2796,7 +3342,7 @@ public ApiResponse<Object> UpdateFulfillmentStateWithHttpInfo (int? orderId, Ord
             if (fulfillmentStatusRequest == null)
                 throw new ApiException(400, "Missing required parameter 'fulfillmentStatusRequest' when calling OrdersApi->UpdateFulfillmentState");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/fulfillment/state";
+            var localVarPath = "./api/v1.0/orders/{orderId}/fulfillment/state";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2856,16 +3402,16 @@ public ApiResponse<Object> UpdateFulfillmentStateWithHttpInfo (int? orderId, Ord
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update fulfillment status information to an order [BETA - this endpoint is under development, do not use it in your production system] Updates an order&#39;s fulfillment states.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="fulfillmentStatusRequest">Fulfillment Status</param>
+        /// <param name="orderId"></param>
+        /// <param name="fulfillmentStatusRequest"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateFulfillmentStateAsync (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest)
         {
@@ -2874,11 +3420,11 @@ public async System.Threading.Tasks.Task UpdateFulfillmentStateAsync (int? order
         }
 
         /// <summary>
-        /// Update fulfillment status information to an order [BETA - this endpoint is under development, do not use it in your production system] Updates an order&#39;s fulfillment states.
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Flipdish Order Id</param>
-        /// <param name="fulfillmentStatusRequest">Fulfillment Status</param>
+        /// <param name="orderId"></param>
+        /// <param name="fulfillmentStatusRequest"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateFulfillmentStateAsyncWithHttpInfo (int? orderId, OrderFulfillmentStatusUpdate fulfillmentStatusRequest)
         {
@@ -2889,7 +3435,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateFulfillmentS
             if (fulfillmentStatusRequest == null)
                 throw new ApiException(400, "Missing required parameter 'fulfillmentStatusRequest' when calling OrdersApi->UpdateFulfillmentState");
 
-            var localVarPath = "/api/v1.0/orders/{orderId}/fulfillment/state";
+            var localVarPath = "./api/v1.0/orders/{orderId}/fulfillment/state";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2949,7 +3495,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateFulfillmentS
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/PaymentIntentsApi.cs b/src/Flipdish/Api/PaymentIntentsApi.cs
index beae431e..e20cd553 100644
--- a/src/Flipdish/Api/PaymentIntentsApi.cs
+++ b/src/Flipdish/Api/PaymentIntentsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,47 +25,47 @@ public interface IPaymentIntentsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Returns stripe payment intent for a given id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="paymentIntentId">Stripe payment intent identifier</param>
+        /// <param name="paymentIntentId"></param>
         /// <returns>RestApiResultPaymentIntent</returns>
         RestApiResultPaymentIntent GetPaymentIntent (string paymentIntentId);
 
         /// <summary>
-        /// Returns stripe payment intent for a given id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="paymentIntentId">Stripe payment intent identifier</param>
+        /// <param name="paymentIntentId"></param>
         /// <returns>ApiResponse of RestApiResultPaymentIntent</returns>
         ApiResponse<RestApiResultPaymentIntent> GetPaymentIntentWithHttpInfo (string paymentIntentId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Returns stripe payment intent for a given id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="paymentIntentId">Stripe payment intent identifier</param>
+        /// <param name="paymentIntentId"></param>
         /// <returns>Task of RestApiResultPaymentIntent</returns>
         System.Threading.Tasks.Task<RestApiResultPaymentIntent> GetPaymentIntentAsync (string paymentIntentId);
 
         /// <summary>
-        /// Returns stripe payment intent for a given id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="paymentIntentId">Stripe payment intent identifier</param>
+        /// <param name="paymentIntentId"></param>
         /// <returns>Task of ApiResponse (RestApiResultPaymentIntent)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentIntent>> GetPaymentIntentAsyncWithHttpInfo (string paymentIntentId);
         #endregion Asynchronous Operations
@@ -169,10 +169,10 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Returns stripe payment intent for a given id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="paymentIntentId">Stripe payment intent identifier</param>
+        /// <param name="paymentIntentId"></param>
         /// <returns>RestApiResultPaymentIntent</returns>
         public RestApiResultPaymentIntent GetPaymentIntent (string paymentIntentId)
         {
@@ -181,10 +181,10 @@ public RestApiResultPaymentIntent GetPaymentIntent (string paymentIntentId)
         }
 
         /// <summary>
-        /// Returns stripe payment intent for a given id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="paymentIntentId">Stripe payment intent identifier</param>
+        /// <param name="paymentIntentId"></param>
         /// <returns>ApiResponse of RestApiResultPaymentIntent</returns>
         public ApiResponse< RestApiResultPaymentIntent > GetPaymentIntentWithHttpInfo (string paymentIntentId)
         {
@@ -192,7 +192,7 @@ public ApiResponse< RestApiResultPaymentIntent > GetPaymentIntentWithHttpInfo (s
             if (paymentIntentId == null)
                 throw new ApiException(400, "Missing required parameter 'paymentIntentId' when calling PaymentIntentsApi->GetPaymentIntent");
 
-            var localVarPath = "/api/v1.0/payment_intents/{paymentIntentId}";
+            var localVarPath = "./api/v1.0/payment_intents/{paymentIntentId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -239,15 +239,15 @@ public ApiResponse< RestApiResultPaymentIntent > GetPaymentIntentWithHttpInfo (s
             }
 
             return new ApiResponse<RestApiResultPaymentIntent>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPaymentIntent) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPaymentIntent)));
         }
 
         /// <summary>
-        /// Returns stripe payment intent for a given id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="paymentIntentId">Stripe payment intent identifier</param>
+        /// <param name="paymentIntentId"></param>
         /// <returns>Task of RestApiResultPaymentIntent</returns>
         public async System.Threading.Tasks.Task<RestApiResultPaymentIntent> GetPaymentIntentAsync (string paymentIntentId)
         {
@@ -257,10 +257,10 @@ public async System.Threading.Tasks.Task<RestApiResultPaymentIntent> GetPaymentI
         }
 
         /// <summary>
-        /// Returns stripe payment intent for a given id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="paymentIntentId">Stripe payment intent identifier</param>
+        /// <param name="paymentIntentId"></param>
         /// <returns>Task of ApiResponse (RestApiResultPaymentIntent)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentIntent>> GetPaymentIntentAsyncWithHttpInfo (string paymentIntentId)
         {
@@ -268,7 +268,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentIntent>
             if (paymentIntentId == null)
                 throw new ApiException(400, "Missing required parameter 'paymentIntentId' when calling PaymentIntentsApi->GetPaymentIntent");
 
-            var localVarPath = "/api/v1.0/payment_intents/{paymentIntentId}";
+            var localVarPath = "./api/v1.0/payment_intents/{paymentIntentId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -315,7 +315,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPaymentIntent>
             }
 
             return new ApiResponse<RestApiResultPaymentIntent>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPaymentIntent) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPaymentIntent)));
         }
 
diff --git a/src/Flipdish/Api/PaymentsApi.cs b/src/Flipdish/Api/PaymentsApi.cs
index 085dca08..8db117bb 100644
--- a/src/Flipdish/Api/PaymentsApi.cs
+++ b/src/Flipdish/Api/PaymentsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,47 +25,47 @@ public interface IPaymentsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Returns payment refund information related to the order with the order id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <returns>RestApiResultOrderPaymentInformation</returns>
         RestApiResultOrderPaymentInformation GetOrderPaymentInformation (int? orderId);
 
         /// <summary>
-        /// Returns payment refund information related to the order with the order id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <returns>ApiResponse of RestApiResultOrderPaymentInformation</returns>
         ApiResponse<RestApiResultOrderPaymentInformation> GetOrderPaymentInformationWithHttpInfo (int? orderId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Returns payment refund information related to the order with the order id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of RestApiResultOrderPaymentInformation</returns>
         System.Threading.Tasks.Task<RestApiResultOrderPaymentInformation> GetOrderPaymentInformationAsync (int? orderId);
 
         /// <summary>
-        /// Returns payment refund information related to the order with the order id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderPaymentInformation)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderPaymentInformation>> GetOrderPaymentInformationAsyncWithHttpInfo (int? orderId);
         #endregion Asynchronous Operations
@@ -169,10 +169,10 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Returns payment refund information related to the order with the order id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <returns>RestApiResultOrderPaymentInformation</returns>
         public RestApiResultOrderPaymentInformation GetOrderPaymentInformation (int? orderId)
         {
@@ -181,10 +181,10 @@ public RestApiResultOrderPaymentInformation GetOrderPaymentInformation (int? ord
         }
 
         /// <summary>
-        /// Returns payment refund information related to the order with the order id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <returns>ApiResponse of RestApiResultOrderPaymentInformation</returns>
         public ApiResponse< RestApiResultOrderPaymentInformation > GetOrderPaymentInformationWithHttpInfo (int? orderId)
         {
@@ -192,7 +192,7 @@ public ApiResponse< RestApiResultOrderPaymentInformation > GetOrderPaymentInform
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling PaymentsApi->GetOrderPaymentInformation");
 
-            var localVarPath = "/api/v1.0/payments/payment/{orderId}/refundable";
+            var localVarPath = "./api/v1.0/payments/payment/{orderId}/refundable";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -239,15 +239,15 @@ public ApiResponse< RestApiResultOrderPaymentInformation > GetOrderPaymentInform
             }
 
             return new ApiResponse<RestApiResultOrderPaymentInformation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderPaymentInformation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderPaymentInformation)));
         }
 
         /// <summary>
-        /// Returns payment refund information related to the order with the order id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of RestApiResultOrderPaymentInformation</returns>
         public async System.Threading.Tasks.Task<RestApiResultOrderPaymentInformation> GetOrderPaymentInformationAsync (int? orderId)
         {
@@ -257,10 +257,10 @@ public async System.Threading.Tasks.Task<RestApiResultOrderPaymentInformation> G
         }
 
         /// <summary>
-        /// Returns payment refund information related to the order with the order id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="orderId">Order identifier</param>
+        /// <param name="orderId"></param>
         /// <returns>Task of ApiResponse (RestApiResultOrderPaymentInformation)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderPaymentInformation>> GetOrderPaymentInformationAsyncWithHttpInfo (int? orderId)
         {
@@ -268,7 +268,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderPaymentIn
             if (orderId == null)
                 throw new ApiException(400, "Missing required parameter 'orderId' when calling PaymentsApi->GetOrderPaymentInformation");
 
-            var localVarPath = "/api/v1.0/payments/payment/{orderId}/refundable";
+            var localVarPath = "./api/v1.0/payments/payment/{orderId}/refundable";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -315,7 +315,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderPaymentIn
             }
 
             return new ApiResponse<RestApiResultOrderPaymentInformation>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultOrderPaymentInformation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderPaymentInformation)));
         }
 
diff --git a/src/Flipdish/Api/PayoutReportsApi.cs b/src/Flipdish/Api/PayoutReportsApi.cs
new file mode 100644
index 00000000..430695d6
--- /dev/null
+++ b/src/Flipdish/Api/PayoutReportsApi.cs
@@ -0,0 +1,1325 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IPayoutReportsApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>RestApiResultPayoutReport3Details</returns>
+        RestApiResultPayoutReport3Details GetPayoutReport3Details (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultPayoutReport3Details</returns>
+        ApiResponse<RestApiResultPayoutReport3Details> GetPayoutReport3DetailsWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <returns>RestApiResultPayoutReport3Overview</returns>
+        RestApiResultPayoutReport3Overview GetPayoutReport3Overview (string appId, int? bankAccountId, int? payoutId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <returns>ApiResponse of RestApiResultPayoutReport3Overview</returns>
+        ApiResponse<RestApiResultPayoutReport3Overview> GetPayoutReport3OverviewWithHttpInfo (string appId, int? bankAccountId, int? payoutId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="propertyIds"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>RestApiResultPayoutReport3PropertyDetails</returns>
+        RestApiResultPayoutReport3PropertyDetails GetPayoutReport3PropertyDetails (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="propertyIds"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultPayoutReport3PropertyDetails</returns>
+        ApiResponse<RestApiResultPayoutReport3PropertyDetails> GetPayoutReport3PropertyDetailsWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>RestApiPaginationResultPayoutReport3RefundedOrder</returns>
+        RestApiPaginationResultPayoutReport3RefundedOrder GetPayoutReport3RefundedOrders (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultPayoutReport3RefundedOrder</returns>
+        ApiResponse<RestApiPaginationResultPayoutReport3RefundedOrder> GetPayoutReport3RefundedOrdersWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="stores"> (optional)</param>
+        /// <returns>RestApiResultPayoutReport3StorePayouts</returns>
+        RestApiResultPayoutReport3StorePayouts GetPayoutReport3Stores (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="stores"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultPayoutReport3StorePayouts</returns>
+        ApiResponse<RestApiResultPayoutReport3StorePayouts> GetPayoutReport3StoresWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>Task of RestApiResultPayoutReport3Details</returns>
+        System.Threading.Tasks.Task<RestApiResultPayoutReport3Details> GetPayoutReport3DetailsAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultPayoutReport3Details)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultPayoutReport3Details>> GetPayoutReport3DetailsAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <returns>Task of RestApiResultPayoutReport3Overview</returns>
+        System.Threading.Tasks.Task<RestApiResultPayoutReport3Overview> GetPayoutReport3OverviewAsync (string appId, int? bankAccountId, int? payoutId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultPayoutReport3Overview)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultPayoutReport3Overview>> GetPayoutReport3OverviewAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="propertyIds"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>Task of RestApiResultPayoutReport3PropertyDetails</returns>
+        System.Threading.Tasks.Task<RestApiResultPayoutReport3PropertyDetails> GetPayoutReport3PropertyDetailsAsync (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="propertyIds"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultPayoutReport3PropertyDetails)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultPayoutReport3PropertyDetails>> GetPayoutReport3PropertyDetailsAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultPayoutReport3RefundedOrder</returns>
+        System.Threading.Tasks.Task<RestApiPaginationResultPayoutReport3RefundedOrder> GetPayoutReport3RefundedOrdersAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultPayoutReport3RefundedOrder)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayoutReport3RefundedOrder>> GetPayoutReport3RefundedOrdersAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="stores"> (optional)</param>
+        /// <returns>Task of RestApiResultPayoutReport3StorePayouts</returns>
+        System.Threading.Tasks.Task<RestApiResultPayoutReport3StorePayouts> GetPayoutReport3StoresAsync (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="stores"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultPayoutReport3StorePayouts)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultPayoutReport3StorePayouts>> GetPayoutReport3StoresAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class PayoutReportsApi : IPayoutReportsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReportsApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public PayoutReportsApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReportsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public PayoutReportsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>RestApiResultPayoutReport3Details</returns>
+        public RestApiResultPayoutReport3Details GetPayoutReport3Details (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
+        {
+             ApiResponse<RestApiResultPayoutReport3Details> localVarResponse = GetPayoutReport3DetailsWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultPayoutReport3Details</returns>
+        public ApiResponse< RestApiResultPayoutReport3Details > GetPayoutReport3DetailsWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3Details");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3Details");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3Details");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/details";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3Details", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPayoutReport3Details>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPayoutReport3Details) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPayoutReport3Details)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>Task of RestApiResultPayoutReport3Details</returns>
+        public async System.Threading.Tasks.Task<RestApiResultPayoutReport3Details> GetPayoutReport3DetailsAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
+        {
+             ApiResponse<RestApiResultPayoutReport3Details> localVarResponse = await GetPayoutReport3DetailsAsyncWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultPayoutReport3Details)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPayoutReport3Details>> GetPayoutReport3DetailsAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3Details");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3Details");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3Details");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/details";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3Details", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPayoutReport3Details>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPayoutReport3Details) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPayoutReport3Details)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <returns>RestApiResultPayoutReport3Overview</returns>
+        public RestApiResultPayoutReport3Overview GetPayoutReport3Overview (string appId, int? bankAccountId, int? payoutId)
+        {
+             ApiResponse<RestApiResultPayoutReport3Overview> localVarResponse = GetPayoutReport3OverviewWithHttpInfo(appId, bankAccountId, payoutId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <returns>ApiResponse of RestApiResultPayoutReport3Overview</returns>
+        public ApiResponse< RestApiResultPayoutReport3Overview > GetPayoutReport3OverviewWithHttpInfo (string appId, int? bankAccountId, int? payoutId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3Overview");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3Overview");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3Overview");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/overview";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3Overview", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPayoutReport3Overview>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPayoutReport3Overview) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPayoutReport3Overview)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <returns>Task of RestApiResultPayoutReport3Overview</returns>
+        public async System.Threading.Tasks.Task<RestApiResultPayoutReport3Overview> GetPayoutReport3OverviewAsync (string appId, int? bankAccountId, int? payoutId)
+        {
+             ApiResponse<RestApiResultPayoutReport3Overview> localVarResponse = await GetPayoutReport3OverviewAsyncWithHttpInfo(appId, bankAccountId, payoutId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultPayoutReport3Overview)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPayoutReport3Overview>> GetPayoutReport3OverviewAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3Overview");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3Overview");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3Overview");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/overview";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3Overview", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPayoutReport3Overview>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPayoutReport3Overview) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPayoutReport3Overview)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="propertyIds"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>RestApiResultPayoutReport3PropertyDetails</returns>
+        public RestApiResultPayoutReport3PropertyDetails GetPayoutReport3PropertyDetails (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null)
+        {
+             ApiResponse<RestApiResultPayoutReport3PropertyDetails> localVarResponse = GetPayoutReport3PropertyDetailsWithHttpInfo(appId, bankAccountId, payoutId, propertyIds, storeIds);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="propertyIds"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultPayoutReport3PropertyDetails</returns>
+        public ApiResponse< RestApiResultPayoutReport3PropertyDetails > GetPayoutReport3PropertyDetailsWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3PropertyDetails");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3PropertyDetails");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3PropertyDetails");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/properties";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+            if (propertyIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "propertyIds", propertyIds)); // query parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3PropertyDetails", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPayoutReport3PropertyDetails>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPayoutReport3PropertyDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPayoutReport3PropertyDetails)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="propertyIds"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>Task of RestApiResultPayoutReport3PropertyDetails</returns>
+        public async System.Threading.Tasks.Task<RestApiResultPayoutReport3PropertyDetails> GetPayoutReport3PropertyDetailsAsync (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null)
+        {
+             ApiResponse<RestApiResultPayoutReport3PropertyDetails> localVarResponse = await GetPayoutReport3PropertyDetailsAsyncWithHttpInfo(appId, bankAccountId, payoutId, propertyIds, storeIds);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="propertyIds"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultPayoutReport3PropertyDetails)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPayoutReport3PropertyDetails>> GetPayoutReport3PropertyDetailsAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<string> propertyIds = null, List<int?> storeIds = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3PropertyDetails");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3PropertyDetails");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3PropertyDetails");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/properties";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+            if (propertyIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "propertyIds", propertyIds)); // query parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3PropertyDetails", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPayoutReport3PropertyDetails>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPayoutReport3PropertyDetails) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPayoutReport3PropertyDetails)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>RestApiPaginationResultPayoutReport3RefundedOrder</returns>
+        public RestApiPaginationResultPayoutReport3RefundedOrder GetPayoutReport3RefundedOrders (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultPayoutReport3RefundedOrder> localVarResponse = GetPayoutReport3RefundedOrdersWithHttpInfo(appId, bankAccountId, payoutId, storeIds, page, limit);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultPayoutReport3RefundedOrder</returns>
+        public ApiResponse< RestApiPaginationResultPayoutReport3RefundedOrder > GetPayoutReport3RefundedOrdersWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3RefundedOrders");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3RefundedOrders");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3RefundedOrders");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/refundedOrders";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3RefundedOrders", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultPayoutReport3RefundedOrder>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultPayoutReport3RefundedOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutReport3RefundedOrder)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultPayoutReport3RefundedOrder</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultPayoutReport3RefundedOrder> GetPayoutReport3RefundedOrdersAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultPayoutReport3RefundedOrder> localVarResponse = await GetPayoutReport3RefundedOrdersAsyncWithHttpInfo(appId, bankAccountId, payoutId, storeIds, page, limit);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultPayoutReport3RefundedOrder)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayoutReport3RefundedOrder>> GetPayoutReport3RefundedOrdersAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null, int? page = null, int? limit = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3RefundedOrders");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3RefundedOrders");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3RefundedOrders");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/refundedOrders";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3RefundedOrders", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultPayoutReport3RefundedOrder>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultPayoutReport3RefundedOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutReport3RefundedOrder)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="stores"> (optional)</param>
+        /// <returns>RestApiResultPayoutReport3StorePayouts</returns>
+        public RestApiResultPayoutReport3StorePayouts GetPayoutReport3Stores (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null)
+        {
+             ApiResponse<RestApiResultPayoutReport3StorePayouts> localVarResponse = GetPayoutReport3StoresWithHttpInfo(appId, bankAccountId, payoutId, stores);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="stores"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultPayoutReport3StorePayouts</returns>
+        public ApiResponse< RestApiResultPayoutReport3StorePayouts > GetPayoutReport3StoresWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3Stores");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3Stores");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3Stores");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+            if (stores != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "stores", stores)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3Stores", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPayoutReport3StorePayouts>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPayoutReport3StorePayouts) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPayoutReport3StorePayouts)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="stores"> (optional)</param>
+        /// <returns>Task of RestApiResultPayoutReport3StorePayouts</returns>
+        public async System.Threading.Tasks.Task<RestApiResultPayoutReport3StorePayouts> GetPayoutReport3StoresAsync (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null)
+        {
+             ApiResponse<RestApiResultPayoutReport3StorePayouts> localVarResponse = await GetPayoutReport3StoresAsyncWithHttpInfo(appId, bankAccountId, payoutId, stores);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="payoutId"></param>
+        /// <param name="stores"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultPayoutReport3StorePayouts)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPayoutReport3StorePayouts>> GetPayoutReport3StoresAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> stores = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutReportsApi->GetPayoutReport3Stores");
+            // verify the required parameter 'bankAccountId' is set
+            if (bankAccountId == null)
+                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutReportsApi->GetPayoutReport3Stores");
+            // verify the required parameter 'payoutId' is set
+            if (payoutId == null)
+                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutReportsApi->GetPayoutReport3Stores");
+
+            var localVarPath = "./api/v1.0/{appId}/reporting/reports/payouts3/{bankAccountId}/{payoutId}/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
+            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
+            if (stores != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "stores", stores)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayoutReport3Stores", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPayoutReport3StorePayouts>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPayoutReport3StorePayouts) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPayoutReport3StorePayouts)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/PayoutsApi.cs b/src/Flipdish/Api/PayoutsApi.cs
index 0021b941..b0a69afd 100644
--- a/src/Flipdish/Api/PayoutsApi.cs
+++ b/src/Flipdish/Api/PayoutsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,7 +25,7 @@ public interface IPayoutsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get Payout details broken down by Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -38,7 +38,7 @@ public interface IPayoutsApi : IApiAccessor
         PayoutDetail GetPayout (string appId, int? bankAccountId, int? payoutId);
 
         /// <summary>
-        /// Get Payout details broken down by Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -50,7 +50,7 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>ApiResponse of PayoutDetail</returns>
         ApiResponse<PayoutDetail> GetPayoutWithHttpInfo (string appId, int? bankAccountId, int? payoutId);
         /// <summary>
-        /// Get list of payout&#39;s chargebacks
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -66,7 +66,7 @@ public interface IPayoutsApi : IApiAccessor
         RestApiPaginationResultPayoutChargeback GetPayoutChargebacks (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
 
         /// <summary>
-        /// Get list of payout&#39;s chargebacks
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -81,7 +81,7 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultPayoutChargeback</returns>
         ApiResponse<RestApiPaginationResultPayoutChargeback> GetPayoutChargebacksWithHttpInfo (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
         /// <summary>
-        /// Get list of payout&#39;s orders
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -97,7 +97,7 @@ public interface IPayoutsApi : IApiAccessor
         RestApiPaginationResultPayoutOrder GetPayoutOrders (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
 
         /// <summary>
-        /// Get list of payout&#39;s orders
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -112,7 +112,7 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultPayoutOrder</returns>
         ApiResponse<RestApiPaginationResultPayoutOrder> GetPayoutOrdersWithHttpInfo (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
         /// <summary>
-        /// Get list of payout&#39;s other charges
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -128,7 +128,7 @@ public interface IPayoutsApi : IApiAccessor
         RestApiPaginationResultPayoutOtherCharge GetPayoutOtherCharges (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
 
         /// <summary>
-        /// Get list of payout&#39;s other charges
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -143,7 +143,7 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultPayoutOtherCharge</returns>
         ApiResponse<RestApiPaginationResultPayoutOtherCharge> GetPayoutOtherChargesWithHttpInfo (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
         /// <summary>
-        /// Get list of payout&#39;s refunds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -159,7 +159,7 @@ public interface IPayoutsApi : IApiAccessor
         RestApiPaginationResultPayoutRefund GetPayoutRefunds (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
 
         /// <summary>
-        /// Get list of payout&#39;s refunds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -174,10 +174,10 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultPayoutRefund</returns>
         ApiResponse<RestApiPaginationResultPayoutRefund> GetPayoutRefundsWithHttpInfo (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
         /// <summary>
-        /// Get list of payout summaries
+        /// 
         /// </summary>
         /// <remarks>
-        /// BETA - this endpoint is under development, do not use it in your production system
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -189,10 +189,10 @@ public interface IPayoutsApi : IApiAccessor
         RestApiArrayResultPayoutSummary GetPayoutSummaries (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
 
         /// <summary>
-        /// Get list of payout summaries
+        /// 
         /// </summary>
         /// <remarks>
-        /// BETA - this endpoint is under development, do not use it in your production system
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -203,10 +203,10 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultPayoutSummary</returns>
         ApiResponse<RestApiArrayResultPayoutSummary> GetPayoutSummariesWithHttpInfo (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
         /// <summary>
-        /// Get list of payouts
+        /// 
         /// </summary>
         /// <remarks>
-        /// BETA - this endpoint is under development, do not use it in your production system
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -220,10 +220,10 @@ public interface IPayoutsApi : IApiAccessor
         RestApiPaginationResultPayout GetPayouts (string appId, DateTime? startDate = null, DateTime? endDate = null, int? page = null, int? limit = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
 
         /// <summary>
-        /// Get list of payouts
+        /// 
         /// </summary>
         /// <remarks>
-        /// BETA - this endpoint is under development, do not use it in your production system
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -238,7 +238,7 @@ public interface IPayoutsApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get Payout details broken down by Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -251,7 +251,7 @@ public interface IPayoutsApi : IApiAccessor
         System.Threading.Tasks.Task<PayoutDetail> GetPayoutAsync (string appId, int? bankAccountId, int? payoutId);
 
         /// <summary>
-        /// Get Payout details broken down by Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -263,7 +263,7 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>Task of ApiResponse (PayoutDetail)</returns>
         System.Threading.Tasks.Task<ApiResponse<PayoutDetail>> GetPayoutAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId);
         /// <summary>
-        /// Get list of payout&#39;s chargebacks
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -279,7 +279,7 @@ public interface IPayoutsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultPayoutChargeback> GetPayoutChargebacksAsync (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
 
         /// <summary>
-        /// Get list of payout&#39;s chargebacks
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -294,7 +294,7 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiPaginationResultPayoutChargeback)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayoutChargeback>> GetPayoutChargebacksAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
         /// <summary>
-        /// Get list of payout&#39;s orders
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -310,7 +310,7 @@ public interface IPayoutsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultPayoutOrder> GetPayoutOrdersAsync (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
 
         /// <summary>
-        /// Get list of payout&#39;s orders
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -325,7 +325,7 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiPaginationResultPayoutOrder)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayoutOrder>> GetPayoutOrdersAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
         /// <summary>
-        /// Get list of payout&#39;s other charges
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -341,7 +341,7 @@ public interface IPayoutsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultPayoutOtherCharge> GetPayoutOtherChargesAsync (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
 
         /// <summary>
-        /// Get list of payout&#39;s other charges
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -356,7 +356,7 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiPaginationResultPayoutOtherCharge)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayoutOtherCharge>> GetPayoutOtherChargesAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
         /// <summary>
-        /// Get list of payout&#39;s refunds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -372,7 +372,7 @@ public interface IPayoutsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultPayoutRefund> GetPayoutRefundsAsync (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
 
         /// <summary>
-        /// Get list of payout&#39;s refunds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -387,10 +387,10 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiPaginationResultPayoutRefund)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayoutRefund>> GetPayoutRefundsAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, int? page = null, int? limit = null, List<int?> storeIds = null);
         /// <summary>
-        /// Get list of payout summaries
+        /// 
         /// </summary>
         /// <remarks>
-        /// BETA - this endpoint is under development, do not use it in your production system
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -402,10 +402,10 @@ public interface IPayoutsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultPayoutSummary> GetPayoutSummariesAsync (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
 
         /// <summary>
-        /// Get list of payout summaries
+        /// 
         /// </summary>
         /// <remarks>
-        /// BETA - this endpoint is under development, do not use it in your production system
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -416,10 +416,10 @@ public interface IPayoutsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultPayoutSummary)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPayoutSummary>> GetPayoutSummariesAsyncWithHttpInfo (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
         /// <summary>
-        /// Get list of payouts
+        /// 
         /// </summary>
         /// <remarks>
-        /// BETA - this endpoint is under development, do not use it in your production system
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -433,10 +433,10 @@ public interface IPayoutsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultPayout> GetPayoutsAsync (string appId, DateTime? startDate = null, DateTime? endDate = null, int? page = null, int? limit = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
 
         /// <summary>
-        /// Get list of payouts
+        /// 
         /// </summary>
         /// <remarks>
-        /// BETA - this endpoint is under development, do not use it in your production system
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -549,7 +549,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get Payout details broken down by Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -563,7 +563,7 @@ public PayoutDetail GetPayout (string appId, int? bankAccountId, int? payoutId)
         }
 
         /// <summary>
-        /// Get Payout details broken down by Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -582,7 +582,7 @@ public ApiResponse< PayoutDetail > GetPayoutWithHttpInfo (string appId, int? ban
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayout");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -631,12 +631,12 @@ public ApiResponse< PayoutDetail > GetPayoutWithHttpInfo (string appId, int? ban
             }
 
             return new ApiResponse<PayoutDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (PayoutDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(PayoutDetail)));
         }
 
         /// <summary>
-        /// Get Payout details broken down by Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -651,7 +651,7 @@ public async System.Threading.Tasks.Task<PayoutDetail> GetPayoutAsync (string ap
         }
 
         /// <summary>
-        /// Get Payout details broken down by Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -670,7 +670,7 @@ public async System.Threading.Tasks.Task<ApiResponse<PayoutDetail>> GetPayoutAsy
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayout");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -719,12 +719,12 @@ public async System.Threading.Tasks.Task<ApiResponse<PayoutDetail>> GetPayoutAsy
             }
 
             return new ApiResponse<PayoutDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (PayoutDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(PayoutDetail)));
         }
 
         /// <summary>
-        /// Get list of payout&#39;s chargebacks 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -741,7 +741,7 @@ public RestApiPaginationResultPayoutChargeback GetPayoutChargebacks (string appI
         }
 
         /// <summary>
-        /// Get list of payout&#39;s chargebacks 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -763,7 +763,7 @@ public ApiResponse< RestApiPaginationResultPayoutChargeback > GetPayoutChargebac
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayoutChargebacks");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -815,12 +815,12 @@ public ApiResponse< RestApiPaginationResultPayoutChargeback > GetPayoutChargebac
             }
 
             return new ApiResponse<RestApiPaginationResultPayoutChargeback>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayoutChargeback) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutChargeback)));
         }
 
         /// <summary>
-        /// Get list of payout&#39;s chargebacks 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -838,7 +838,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultPayoutChargeback
         }
 
         /// <summary>
-        /// Get list of payout&#39;s chargebacks 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -860,7 +860,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayoutChargebacks");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -912,12 +912,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             }
 
             return new ApiResponse<RestApiPaginationResultPayoutChargeback>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayoutChargeback) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutChargeback)));
         }
 
         /// <summary>
-        /// Get list of payout&#39;s orders 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -934,7 +934,7 @@ public RestApiPaginationResultPayoutOrder GetPayoutOrders (string appId, int? ba
         }
 
         /// <summary>
-        /// Get list of payout&#39;s orders 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -956,7 +956,7 @@ public ApiResponse< RestApiPaginationResultPayoutOrder > GetPayoutOrdersWithHttp
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayoutOrders");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1008,12 +1008,12 @@ public ApiResponse< RestApiPaginationResultPayoutOrder > GetPayoutOrdersWithHttp
             }
 
             return new ApiResponse<RestApiPaginationResultPayoutOrder>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayoutOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutOrder)));
         }
 
         /// <summary>
-        /// Get list of payout&#39;s orders 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1031,7 +1031,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultPayoutOrder> Get
         }
 
         /// <summary>
-        /// Get list of payout&#39;s orders 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1053,7 +1053,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayoutOrders");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1105,12 +1105,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             }
 
             return new ApiResponse<RestApiPaginationResultPayoutOrder>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayoutOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutOrder)));
         }
 
         /// <summary>
-        /// Get list of payout&#39;s other charges 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1127,7 +1127,7 @@ public RestApiPaginationResultPayoutOtherCharge GetPayoutOtherCharges (string ap
         }
 
         /// <summary>
-        /// Get list of payout&#39;s other charges 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1149,7 +1149,7 @@ public ApiResponse< RestApiPaginationResultPayoutOtherCharge > GetPayoutOtherCha
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayoutOtherCharges");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1201,12 +1201,12 @@ public ApiResponse< RestApiPaginationResultPayoutOtherCharge > GetPayoutOtherCha
             }
 
             return new ApiResponse<RestApiPaginationResultPayoutOtherCharge>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayoutOtherCharge) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutOtherCharge)));
         }
 
         /// <summary>
-        /// Get list of payout&#39;s other charges 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1224,7 +1224,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultPayoutOtherCharg
         }
 
         /// <summary>
-        /// Get list of payout&#39;s other charges 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1246,7 +1246,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayoutOtherCharges");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1298,12 +1298,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             }
 
             return new ApiResponse<RestApiPaginationResultPayoutOtherCharge>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayoutOtherCharge) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutOtherCharge)));
         }
 
         /// <summary>
-        /// Get list of payout&#39;s refunds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1320,7 +1320,7 @@ public RestApiPaginationResultPayoutRefund GetPayoutRefunds (string appId, int?
         }
 
         /// <summary>
-        /// Get list of payout&#39;s refunds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1342,7 +1342,7 @@ public ApiResponse< RestApiPaginationResultPayoutRefund > GetPayoutRefundsWithHt
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayoutRefunds");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1394,12 +1394,12 @@ public ApiResponse< RestApiPaginationResultPayoutRefund > GetPayoutRefundsWithHt
             }
 
             return new ApiResponse<RestApiPaginationResultPayoutRefund>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayoutRefund) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutRefund)));
         }
 
         /// <summary>
-        /// Get list of payout&#39;s refunds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1417,7 +1417,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultPayoutRefund> Ge
         }
 
         /// <summary>
-        /// Get list of payout&#39;s refunds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1439,7 +1439,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             if (payoutId == null)
                 throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsApi->GetPayoutRefunds");
 
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds";
+            var localVarPath = "./api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1491,12 +1491,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             }
 
             return new ApiResponse<RestApiPaginationResultPayoutRefund>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayoutRefund) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayoutRefund)));
         }
 
         /// <summary>
-        /// Get list of payout summaries BETA - this endpoint is under development, do not use it in your production system
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1512,7 +1512,7 @@ public RestApiArrayResultPayoutSummary GetPayoutSummaries (string appId, DateTim
         }
 
         /// <summary>
-        /// Get list of payout summaries BETA - this endpoint is under development, do not use it in your production system
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1527,7 +1527,7 @@ public ApiResponse< RestApiArrayResultPayoutSummary > GetPayoutSummariesWithHttp
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsApi->GetPayoutSummaries");
 
-            var localVarPath = "/api/v1.0/{appId}/payouts/summaries";
+            var localVarPath = "./api/v1.0/{appId}/payouts/summaries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1578,12 +1578,12 @@ public ApiResponse< RestApiArrayResultPayoutSummary > GetPayoutSummariesWithHttp
             }
 
             return new ApiResponse<RestApiArrayResultPayoutSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultPayoutSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultPayoutSummary)));
         }
 
         /// <summary>
-        /// Get list of payout summaries BETA - this endpoint is under development, do not use it in your production system
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1600,7 +1600,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultPayoutSummary> GetPay
         }
 
         /// <summary>
-        /// Get list of payout summaries BETA - this endpoint is under development, do not use it in your production system
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1615,7 +1615,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPayoutSum
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsApi->GetPayoutSummaries");
 
-            var localVarPath = "/api/v1.0/{appId}/payouts/summaries";
+            var localVarPath = "./api/v1.0/{appId}/payouts/summaries";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1666,12 +1666,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPayoutSum
             }
 
             return new ApiResponse<RestApiArrayResultPayoutSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultPayoutSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultPayoutSummary)));
         }
 
         /// <summary>
-        /// Get list of payouts BETA - this endpoint is under development, do not use it in your production system
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1689,7 +1689,7 @@ public RestApiPaginationResultPayout GetPayouts (string appId, DateTime? startDa
         }
 
         /// <summary>
-        /// Get list of payouts BETA - this endpoint is under development, do not use it in your production system
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1706,7 +1706,7 @@ public ApiResponse< RestApiPaginationResultPayout > GetPayoutsWithHttpInfo (stri
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsApi->GetPayouts");
 
-            var localVarPath = "/api/v1.0/{appId}/payouts";
+            var localVarPath = "./api/v1.0/{appId}/payouts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1759,12 +1759,12 @@ public ApiResponse< RestApiPaginationResultPayout > GetPayoutsWithHttpInfo (stri
             }
 
             return new ApiResponse<RestApiPaginationResultPayout>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayout) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayout)));
         }
 
         /// <summary>
-        /// Get list of payouts BETA - this endpoint is under development, do not use it in your production system
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1783,7 +1783,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultPayout> GetPayou
         }
 
         /// <summary>
-        /// Get list of payouts BETA - this endpoint is under development, do not use it in your production system
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1800,7 +1800,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsApi->GetPayouts");
 
-            var localVarPath = "/api/v1.0/{appId}/payouts";
+            var localVarPath = "./api/v1.0/{appId}/payouts";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1853,7 +1853,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPayo
             }
 
             return new ApiResponse<RestApiPaginationResultPayout>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPayout) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPayout)));
         }
 
diff --git a/src/Flipdish/Api/PayoutsExportApi.cs b/src/Flipdish/Api/PayoutsExportApi.cs
deleted file mode 100644
index 2a88fed1..00000000
--- a/src/Flipdish/Api/PayoutsExportApi.cs
+++ /dev/null
@@ -1,1538 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IPayoutsExportApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Export a list of payout&#39;s chargebacks as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        string ExportPayoutChargebacks (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export a list of payout&#39;s chargebacks as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> ExportPayoutChargebacksWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export a list of payout&#39;s orders as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        string ExportPayoutOrders (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export a list of payout&#39;s orders as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> ExportPayoutOrdersWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export a list of payout&#39;s other charges as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        string ExportPayoutOtherCharges (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export a list of payout&#39;s other charges as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> ExportPayoutOtherChargesWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export a list of payout&#39;s refunds as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        string ExportPayoutRefunds (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export a list of payout&#39;s refunds as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> ExportPayoutRefundsWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export payout&#39;s details as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        string ExportPayoutStores (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export payout&#39;s details as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> ExportPayoutStoresWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export payouts as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="startDate"> (optional)</param>
-        /// <param name="endDate"> (optional)</param>
-        /// <param name="payoutRequestIdsBankAccountIds">List of bank account ids to search for (optional)</param>
-        /// <param name="payoutRequestIdsStates">List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional)</param>
-        /// <returns>string</returns>
-        string ExportPayouts (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
-
-        /// <summary>
-        /// Export payouts as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="startDate"> (optional)</param>
-        /// <param name="endDate"> (optional)</param>
-        /// <param name="payoutRequestIdsBankAccountIds">List of bank account ids to search for (optional)</param>
-        /// <param name="payoutRequestIdsStates">List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        ApiResponse<string> ExportPayoutsWithHttpInfo (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Export a list of payout&#39;s chargebacks as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> ExportPayoutChargebacksAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export a list of payout&#39;s chargebacks as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutChargebacksAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export a list of payout&#39;s orders as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> ExportPayoutOrdersAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export a list of payout&#39;s orders as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutOrdersAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export a list of payout&#39;s other charges as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> ExportPayoutOtherChargesAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export a list of payout&#39;s other charges as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutOtherChargesAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export a list of payout&#39;s refunds as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> ExportPayoutRefundsAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export a list of payout&#39;s refunds as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutRefundsAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export payout&#39;s details as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> ExportPayoutStoresAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-
-        /// <summary>
-        /// Export payout&#39;s details as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutStoresAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null);
-        /// <summary>
-        /// Export payouts as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="startDate"> (optional)</param>
-        /// <param name="endDate"> (optional)</param>
-        /// <param name="payoutRequestIdsBankAccountIds">List of bank account ids to search for (optional)</param>
-        /// <param name="payoutRequestIdsStates">List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional)</param>
-        /// <returns>Task of string</returns>
-        System.Threading.Tasks.Task<string> ExportPayoutsAsync (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
-
-        /// <summary>
-        /// Export payouts as CSV
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="startDate"> (optional)</param>
-        /// <param name="endDate"> (optional)</param>
-        /// <param name="payoutRequestIdsBankAccountIds">List of bank account ids to search for (optional)</param>
-        /// <param name="payoutRequestIdsStates">List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutsAsyncWithHttpInfo (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class PayoutsExportApi : IPayoutsExportApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PayoutsExportApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public PayoutsExportApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PayoutsExportApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public PayoutsExportApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s chargebacks as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        public string ExportPayoutChargebacks (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = ExportPayoutChargebacksWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s chargebacks as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > ExportPayoutChargebacksWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutChargebacks");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutChargebacks");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutChargebacks");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutChargebacks", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s chargebacks as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> ExportPayoutChargebacksAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = await ExportPayoutChargebacksAsyncWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s chargebacks as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutChargebacksAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutChargebacks");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutChargebacks");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutChargebacks");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/chargebacks/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutChargebacks", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s orders as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        public string ExportPayoutOrders (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = ExportPayoutOrdersWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s orders as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > ExportPayoutOrdersWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutOrders");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutOrders");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutOrders");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutOrders", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s orders as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> ExportPayoutOrdersAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = await ExportPayoutOrdersAsyncWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s orders as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutOrdersAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutOrders");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutOrders");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutOrders");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/orders/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutOrders", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s other charges as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        public string ExportPayoutOtherCharges (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = ExportPayoutOtherChargesWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s other charges as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > ExportPayoutOtherChargesWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutOtherCharges");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutOtherCharges");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutOtherCharges");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutOtherCharges", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s other charges as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> ExportPayoutOtherChargesAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = await ExportPayoutOtherChargesAsyncWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s other charges as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutOtherChargesAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutOtherCharges");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutOtherCharges");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutOtherCharges");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/othercharges/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutOtherCharges", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s refunds as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        public string ExportPayoutRefunds (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = ExportPayoutRefundsWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s refunds as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > ExportPayoutRefundsWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutRefunds");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutRefunds");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutRefunds");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutRefunds", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s refunds as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> ExportPayoutRefundsAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = await ExportPayoutRefundsAsyncWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Export a list of payout&#39;s refunds as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutRefundsAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutRefunds");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutRefunds");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutRefunds");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/refunds/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutRefunds", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export payout&#39;s details as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>string</returns>
-        public string ExportPayoutStores (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = ExportPayoutStoresWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Export payout&#39;s details as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > ExportPayoutStoresWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutStores");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutStores");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutStores");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutStores", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export payout&#39;s details as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> ExportPayoutStoresAsync (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-             ApiResponse<string> localVarResponse = await ExportPayoutStoresAsyncWithHttpInfo(appId, bankAccountId, payoutId, storeIds);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Export payout&#39;s details as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="bankAccountId"></param>
-        /// <param name="payoutId"></param>
-        /// <param name="storeIds"> (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutStoresAsyncWithHttpInfo (string appId, int? bankAccountId, int? payoutId, List<int?> storeIds = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayoutStores");
-            // verify the required parameter 'bankAccountId' is set
-            if (bankAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling PayoutsExportApi->ExportPayoutStores");
-            // verify the required parameter 'payoutId' is set
-            if (payoutId == null)
-                throw new ApiException(400, "Missing required parameter 'payoutId' when calling PayoutsExportApi->ExportPayoutStores");
-
-            var localVarPath = "/api/v1.0/{appId}/bankaccounts/{bankAccountId}/payouts/{payoutId}/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (bankAccountId != null) localVarPathParams.Add("bankAccountId", this.Configuration.ApiClient.ParameterToString(bankAccountId)); // path parameter
-            if (payoutId != null) localVarPathParams.Add("payoutId", this.Configuration.ApiClient.ParameterToString(payoutId)); // path parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayoutStores", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export payouts as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="startDate"> (optional)</param>
-        /// <param name="endDate"> (optional)</param>
-        /// <param name="payoutRequestIdsBankAccountIds">List of bank account ids to search for (optional)</param>
-        /// <param name="payoutRequestIdsStates">List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional)</param>
-        /// <returns>string</returns>
-        public string ExportPayouts (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null)
-        {
-             ApiResponse<string> localVarResponse = ExportPayoutsWithHttpInfo(appId, startDate, endDate, payoutRequestIdsBankAccountIds, payoutRequestIdsStates);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Export payouts as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="startDate"> (optional)</param>
-        /// <param name="endDate"> (optional)</param>
-        /// <param name="payoutRequestIdsBankAccountIds">List of bank account ids to search for (optional)</param>
-        /// <param name="payoutRequestIdsStates">List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional)</param>
-        /// <returns>ApiResponse of string</returns>
-        public ApiResponse< string > ExportPayoutsWithHttpInfo (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayouts");
-
-            var localVarPath = "/api/v1.0/{appId}/payouts/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (startDate != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "startDate", startDate)); // query parameter
-            if (endDate != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "endDate", endDate)); // query parameter
-            if (payoutRequestIdsBankAccountIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "payoutRequestIds.bankAccountIds", payoutRequestIdsBankAccountIds)); // query parameter
-            if (payoutRequestIdsStates != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "payoutRequestIds.states", payoutRequestIdsStates)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayouts", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-        /// <summary>
-        /// Export payouts as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="startDate"> (optional)</param>
-        /// <param name="endDate"> (optional)</param>
-        /// <param name="payoutRequestIdsBankAccountIds">List of bank account ids to search for (optional)</param>
-        /// <param name="payoutRequestIdsStates">List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional)</param>
-        /// <returns>Task of string</returns>
-        public async System.Threading.Tasks.Task<string> ExportPayoutsAsync (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null)
-        {
-             ApiResponse<string> localVarResponse = await ExportPayoutsAsyncWithHttpInfo(appId, startDate, endDate, payoutRequestIdsBankAccountIds, payoutRequestIdsStates);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Export payouts as CSV 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="startDate"> (optional)</param>
-        /// <param name="endDate"> (optional)</param>
-        /// <param name="payoutRequestIdsBankAccountIds">List of bank account ids to search for (optional)</param>
-        /// <param name="payoutRequestIdsStates">List of {Flipdish.PublicModels.V1.Payouts.PayoutStatus} so search for (optional)</param>
-        /// <returns>Task of ApiResponse (string)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<string>> ExportPayoutsAsyncWithHttpInfo (string appId, DateTime? startDate = null, DateTime? endDate = null, List<int?> payoutRequestIdsBankAccountIds = null, List<string> payoutRequestIdsStates = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PayoutsExportApi->ExportPayouts");
-
-            var localVarPath = "/api/v1.0/{appId}/payouts/export";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (startDate != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "startDate", startDate)); // query parameter
-            if (endDate != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "endDate", endDate)); // query parameter
-            if (payoutRequestIdsBankAccountIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "payoutRequestIds.bankAccountIds", payoutRequestIdsBankAccountIds)); // query parameter
-            if (payoutRequestIdsStates != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "payoutRequestIds.states", payoutRequestIdsStates)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ExportPayouts", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<string>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/PendingMenuChangesApi.cs b/src/Flipdish/Api/PendingMenuChangesApi.cs
deleted file mode 100644
index d68310ec..00000000
--- a/src/Flipdish/Api/PendingMenuChangesApi.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IPendingMenuChangesApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Get menu pending changes from Catalog groups and items
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="menuId"> (optional)</param>
-        /// <param name="catalogElementId"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>RestApiPaginationResultPendingMenuChanges</returns>
-        RestApiPaginationResultPendingMenuChanges GetPendingMenuChanges (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null);
-
-        /// <summary>
-        /// Get menu pending changes from Catalog groups and items
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="menuId"> (optional)</param>
-        /// <param name="catalogElementId"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultPendingMenuChanges</returns>
-        ApiResponse<RestApiPaginationResultPendingMenuChanges> GetPendingMenuChangesWithHttpInfo (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Get menu pending changes from Catalog groups and items
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="menuId"> (optional)</param>
-        /// <param name="catalogElementId"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of RestApiPaginationResultPendingMenuChanges</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultPendingMenuChanges> GetPendingMenuChangesAsync (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null);
-
-        /// <summary>
-        /// Get menu pending changes from Catalog groups and items
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="menuId"> (optional)</param>
-        /// <param name="catalogElementId"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultPendingMenuChanges)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPendingMenuChanges>> GetPendingMenuChangesAsyncWithHttpInfo (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class PendingMenuChangesApi : IPendingMenuChangesApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PendingMenuChangesApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public PendingMenuChangesApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PendingMenuChangesApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public PendingMenuChangesApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Get menu pending changes from Catalog groups and items [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="menuId"> (optional)</param>
-        /// <param name="catalogElementId"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>RestApiPaginationResultPendingMenuChanges</returns>
-        public RestApiPaginationResultPendingMenuChanges GetPendingMenuChanges (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null)
-        {
-             ApiResponse<RestApiPaginationResultPendingMenuChanges> localVarResponse = GetPendingMenuChangesWithHttpInfo(appId, menuId, catalogElementId, page, limit);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Get menu pending changes from Catalog groups and items [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="menuId"> (optional)</param>
-        /// <param name="catalogElementId"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultPendingMenuChanges</returns>
-        public ApiResponse< RestApiPaginationResultPendingMenuChanges > GetPendingMenuChangesWithHttpInfo (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PendingMenuChangesApi->GetPendingMenuChanges");
-
-            var localVarPath = "/api/v1.0/{appId}/menus/pendingmenuchanges";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
-            if (catalogElementId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "catalogElementId", catalogElementId)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetPendingMenuChanges", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiPaginationResultPendingMenuChanges>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultPendingMenuChanges) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPendingMenuChanges)));
-        }
-
-        /// <summary>
-        /// Get menu pending changes from Catalog groups and items [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="menuId"> (optional)</param>
-        /// <param name="catalogElementId"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of RestApiPaginationResultPendingMenuChanges</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultPendingMenuChanges> GetPendingMenuChangesAsync (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null)
-        {
-             ApiResponse<RestApiPaginationResultPendingMenuChanges> localVarResponse = await GetPendingMenuChangesAsyncWithHttpInfo(appId, menuId, catalogElementId, page, limit);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Get menu pending changes from Catalog groups and items [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="menuId"> (optional)</param>
-        /// <param name="catalogElementId"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultPendingMenuChanges)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPendingMenuChanges>> GetPendingMenuChangesAsyncWithHttpInfo (string appId, int? menuId = null, string catalogElementId = null, int? page = null, int? limit = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling PendingMenuChangesApi->GetPendingMenuChanges");
-
-            var localVarPath = "/api/v1.0/{appId}/menus/pendingmenuchanges";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (menuId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "menuId", menuId)); // query parameter
-            if (catalogElementId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "catalogElementId", catalogElementId)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetPendingMenuChanges", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiPaginationResultPendingMenuChanges>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultPendingMenuChanges) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPendingMenuChanges)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/ProcessingFeeConfigsApi.cs b/src/Flipdish/Api/ProcessingFeeConfigsApi.cs
index 89066769..6d027817 100644
--- a/src/Flipdish/Api/ProcessingFeeConfigsApi.cs
+++ b/src/Flipdish/Api/ProcessingFeeConfigsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,47 +25,47 @@ public interface IProcessingFeeConfigsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get processing fee configs by store identifiers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeIds">Store identifiers</param>
+        /// <param name="storeIds"></param>
         /// <returns>RestApiArrayResultProcessingFeeConfig</returns>
         RestApiArrayResultProcessingFeeConfig GetProcessingFeeConfigsByStoreIds (List<int?> storeIds);
 
         /// <summary>
-        /// Get processing fee configs by store identifiers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeIds">Store identifiers</param>
+        /// <param name="storeIds"></param>
         /// <returns>ApiResponse of RestApiArrayResultProcessingFeeConfig</returns>
         ApiResponse<RestApiArrayResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdsWithHttpInfo (List<int?> storeIds);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get processing fee configs by store identifiers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeIds">Store identifiers</param>
+        /// <param name="storeIds"></param>
         /// <returns>Task of RestApiArrayResultProcessingFeeConfig</returns>
         System.Threading.Tasks.Task<RestApiArrayResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdsAsync (List<int?> storeIds);
 
         /// <summary>
-        /// Get processing fee configs by store identifiers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeIds">Store identifiers</param>
+        /// <param name="storeIds"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultProcessingFeeConfig)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultProcessingFeeConfig>> GetProcessingFeeConfigsByStoreIdsAsyncWithHttpInfo (List<int?> storeIds);
         #endregion Asynchronous Operations
@@ -169,10 +169,10 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifiers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeIds">Store identifiers</param>
+        /// <param name="storeIds"></param>
         /// <returns>RestApiArrayResultProcessingFeeConfig</returns>
         public RestApiArrayResultProcessingFeeConfig GetProcessingFeeConfigsByStoreIds (List<int?> storeIds)
         {
@@ -181,10 +181,10 @@ public RestApiArrayResultProcessingFeeConfig GetProcessingFeeConfigsByStoreIds (
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifiers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeIds">Store identifiers</param>
+        /// <param name="storeIds"></param>
         /// <returns>ApiResponse of RestApiArrayResultProcessingFeeConfig</returns>
         public ApiResponse< RestApiArrayResultProcessingFeeConfig > GetProcessingFeeConfigsByStoreIdsWithHttpInfo (List<int?> storeIds)
         {
@@ -192,7 +192,7 @@ public ApiResponse< RestApiArrayResultProcessingFeeConfig > GetProcessingFeeConf
             if (storeIds == null)
                 throw new ApiException(400, "Missing required parameter 'storeIds' when calling ProcessingFeeConfigsApi->GetProcessingFeeConfigsByStoreIds");
 
-            var localVarPath = "/api/v1.0/processingfeeconfigs";
+            var localVarPath = "./api/v1.0/processingfeeconfigs";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -239,15 +239,15 @@ public ApiResponse< RestApiArrayResultProcessingFeeConfig > GetProcessingFeeConf
             }
 
             return new ApiResponse<RestApiArrayResultProcessingFeeConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultProcessingFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultProcessingFeeConfig)));
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifiers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeIds">Store identifiers</param>
+        /// <param name="storeIds"></param>
         /// <returns>Task of RestApiArrayResultProcessingFeeConfig</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdsAsync (List<int?> storeIds)
         {
@@ -257,10 +257,10 @@ public async System.Threading.Tasks.Task<RestApiArrayResultProcessingFeeConfig>
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifiers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeIds">Store identifiers</param>
+        /// <param name="storeIds"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultProcessingFeeConfig)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultProcessingFeeConfig>> GetProcessingFeeConfigsByStoreIdsAsyncWithHttpInfo (List<int?> storeIds)
         {
@@ -268,7 +268,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultProcessin
             if (storeIds == null)
                 throw new ApiException(400, "Missing required parameter 'storeIds' when calling ProcessingFeeConfigsApi->GetProcessingFeeConfigsByStoreIds");
 
-            var localVarPath = "/api/v1.0/processingfeeconfigs";
+            var localVarPath = "./api/v1.0/processingfeeconfigs";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -315,7 +315,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultProcessin
             }
 
             return new ApiResponse<RestApiArrayResultProcessingFeeConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultProcessingFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultProcessingFeeConfig)));
         }
 
diff --git a/src/Flipdish/Api/ProductsApi.cs b/src/Flipdish/Api/ProductsApi.cs
deleted file mode 100644
index a6b596a6..00000000
--- a/src/Flipdish/Api/ProductsApi.cs
+++ /dev/null
@@ -1,785 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IProductsApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns></returns>
-        void ArchiveProduct (string appId, string productId);
-
-        /// <summary>
-        /// Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> ArchiveProductWithHttpInfo (string appId, string productId);
-        /// <summary>
-        /// Duplicate a product
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>RestApiResultProduct</returns>
-        RestApiResultProduct DuplicateProduct (string appId, string productId);
-
-        /// <summary>
-        /// Duplicate a product
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>ApiResponse of RestApiResultProduct</returns>
-        ApiResponse<RestApiResultProduct> DuplicateProductWithHttpInfo (string appId, string productId);
-        /// <summary>
-        /// Get paginated products by app name id filtered by product types
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productTypes"></param>
-        /// <param name="searchTerm"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>RestApiPaginationResultProduct</returns>
-        RestApiPaginationResultProduct GetProducts (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null);
-
-        /// <summary>
-        /// Get paginated products by app name id filtered by product types
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productTypes"></param>
-        /// <param name="searchTerm"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultProduct</returns>
-        ApiResponse<RestApiPaginationResultProduct> GetProductsWithHttpInfo (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task ArchiveProductAsync (string appId, string productId);
-
-        /// <summary>
-        /// Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveProductAsyncWithHttpInfo (string appId, string productId);
-        /// <summary>
-        /// Duplicate a product
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>Task of RestApiResultProduct</returns>
-        System.Threading.Tasks.Task<RestApiResultProduct> DuplicateProductAsync (string appId, string productId);
-
-        /// <summary>
-        /// Duplicate a product
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultProduct)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultProduct>> DuplicateProductAsyncWithHttpInfo (string appId, string productId);
-        /// <summary>
-        /// Get paginated products by app name id filtered by product types
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productTypes"></param>
-        /// <param name="searchTerm"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of RestApiPaginationResultProduct</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultProduct> GetProductsAsync (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null);
-
-        /// <summary>
-        /// Get paginated products by app name id filtered by product types
-        /// </summary>
-        /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productTypes"></param>
-        /// <param name="searchTerm"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultProduct)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultProduct>> GetProductsAsyncWithHttpInfo (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class ProductsApi : IProductsApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProductsApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public ProductsApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProductsApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public ProductsApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns></returns>
-        public void ArchiveProduct (string appId, string productId)
-        {
-             ArchiveProductWithHttpInfo(appId, productId);
-        }
-
-        /// <summary>
-        /// Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> ArchiveProductWithHttpInfo (string appId, string productId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ProductsApi->ArchiveProduct");
-            // verify the required parameter 'productId' is set
-            if (productId == null)
-                throw new ApiException(400, "Missing required parameter 'productId' when calling ProductsApi->ArchiveProduct");
-
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{productId}/archive";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (productId != null) localVarPathParams.Add("productId", this.Configuration.ApiClient.ParameterToString(productId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ArchiveProduct", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task ArchiveProductAsync (string appId, string productId)
-        {
-             await ArchiveProductAsyncWithHttpInfo(appId, productId);
-
-        }
-
-        /// <summary>
-        /// Archive a product. If the product is used in Menus, the related MenuItems will be marked as deleted [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveProductAsyncWithHttpInfo (string appId, string productId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ProductsApi->ArchiveProduct");
-            // verify the required parameter 'productId' is set
-            if (productId == null)
-                throw new ApiException(400, "Missing required parameter 'productId' when calling ProductsApi->ArchiveProduct");
-
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{productId}/archive";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (productId != null) localVarPathParams.Add("productId", this.Configuration.ApiClient.ParameterToString(productId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("ArchiveProduct", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
-        }
-
-        /// <summary>
-        /// Duplicate a product [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>RestApiResultProduct</returns>
-        public RestApiResultProduct DuplicateProduct (string appId, string productId)
-        {
-             ApiResponse<RestApiResultProduct> localVarResponse = DuplicateProductWithHttpInfo(appId, productId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Duplicate a product [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>ApiResponse of RestApiResultProduct</returns>
-        public ApiResponse< RestApiResultProduct > DuplicateProductWithHttpInfo (string appId, string productId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ProductsApi->DuplicateProduct");
-            // verify the required parameter 'productId' is set
-            if (productId == null)
-                throw new ApiException(400, "Missing required parameter 'productId' when calling ProductsApi->DuplicateProduct");
-
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{productId}/duplicate";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (productId != null) localVarPathParams.Add("productId", this.Configuration.ApiClient.ParameterToString(productId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("DuplicateProduct", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultProduct>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultProduct) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultProduct)));
-        }
-
-        /// <summary>
-        /// Duplicate a product [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>Task of RestApiResultProduct</returns>
-        public async System.Threading.Tasks.Task<RestApiResultProduct> DuplicateProductAsync (string appId, string productId)
-        {
-             ApiResponse<RestApiResultProduct> localVarResponse = await DuplicateProductAsyncWithHttpInfo(appId, productId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Duplicate a product [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultProduct)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultProduct>> DuplicateProductAsyncWithHttpInfo (string appId, string productId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ProductsApi->DuplicateProduct");
-            // verify the required parameter 'productId' is set
-            if (productId == null)
-                throw new ApiException(400, "Missing required parameter 'productId' when calling ProductsApi->DuplicateProduct");
-
-            var localVarPath = "/api/v1.0/{appId}/catalog/products/{productId}/duplicate";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (productId != null) localVarPathParams.Add("productId", this.Configuration.ApiClient.ParameterToString(productId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("DuplicateProduct", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultProduct>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultProduct) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultProduct)));
-        }
-
-        /// <summary>
-        /// Get paginated products by app name id filtered by product types [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productTypes"></param>
-        /// <param name="searchTerm"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>RestApiPaginationResultProduct</returns>
-        public RestApiPaginationResultProduct GetProducts (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null)
-        {
-             ApiResponse<RestApiPaginationResultProduct> localVarResponse = GetProductsWithHttpInfo(appId, productTypes, searchTerm, page, limit);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Get paginated products by app name id filtered by product types [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productTypes"></param>
-        /// <param name="searchTerm"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultProduct</returns>
-        public ApiResponse< RestApiPaginationResultProduct > GetProductsWithHttpInfo (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ProductsApi->GetProducts");
-            // verify the required parameter 'productTypes' is set
-            if (productTypes == null)
-                throw new ApiException(400, "Missing required parameter 'productTypes' when calling ProductsApi->GetProducts");
-
-            var localVarPath = "/api/v1.0/{appId}/catalog/products";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (productTypes != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "productTypes", productTypes)); // query parameter
-            if (searchTerm != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchTerm", searchTerm)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetProducts", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiPaginationResultProduct>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultProduct) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultProduct)));
-        }
-
-        /// <summary>
-        /// Get paginated products by app name id filtered by product types [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productTypes"></param>
-        /// <param name="searchTerm"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of RestApiPaginationResultProduct</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultProduct> GetProductsAsync (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null)
-        {
-             ApiResponse<RestApiPaginationResultProduct> localVarResponse = await GetProductsAsyncWithHttpInfo(appId, productTypes, searchTerm, page, limit);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Get paginated products by app name id filtered by product types [BETA - this endpoint is under development, do not use it in your production system]
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId"></param>
-        /// <param name="productTypes"></param>
-        /// <param name="searchTerm"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultProduct)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultProduct>> GetProductsAsyncWithHttpInfo (string appId, List<string> productTypes, string searchTerm = null, int? page = null, int? limit = null)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling ProductsApi->GetProducts");
-            // verify the required parameter 'productTypes' is set
-            if (productTypes == null)
-                throw new ApiException(400, "Missing required parameter 'productTypes' when calling ProductsApi->GetProducts");
-
-            var localVarPath = "/api/v1.0/{appId}/catalog/products";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (productTypes != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "productTypes", productTypes)); // query parameter
-            if (searchTerm != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchTerm", searchTerm)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("GetProducts", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiPaginationResultProduct>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultProduct) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultProduct)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/PushNotificationsApi.cs b/src/Flipdish/Api/PushNotificationsApi.cs
index c715187d..9019195e 100644
--- a/src/Flipdish/Api/PushNotificationsApi.cs
+++ b/src/Flipdish/Api/PushNotificationsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,30 +25,30 @@ public interface IPushNotificationsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="scheduledPushNotificationId">ID of Scheduled push notifiaction to delete</param>
+        /// <param name="scheduledPushNotificationId"></param>
         /// <returns></returns>
         void DeletePushNotification (string appId, int? scheduledPushNotificationId);
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="scheduledPushNotificationId">ID of Scheduled push notifiaction to delete</param>
+        /// <param name="scheduledPushNotificationId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeletePushNotificationWithHttpInfo (string appId, int? scheduledPushNotificationId);
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -61,7 +61,7 @@ public interface IPushNotificationsApi : IApiAccessor
         RestApiPaginationResultPushNotificationResponse GetPushNotifications (string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -73,80 +73,80 @@ public interface IPushNotificationsApi : IApiAccessor
         /// <returns>ApiResponse of RestApiPaginationResultPushNotificationResponse</returns>
         ApiResponse<RestApiPaginationResultPushNotificationResponse> GetPushNotificationsWithHttpInfo (string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="notification"></param>
         /// <returns>RestApiResultPushNotificationResponse</returns>
         RestApiResultPushNotificationResponse SchedulePushNotification (string appId, PushNotificationRequest notification);
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="notification"></param>
         /// <returns>ApiResponse of RestApiResultPushNotificationResponse</returns>
         ApiResponse<RestApiResultPushNotificationResponse> SchedulePushNotificationWithHttpInfo (string appId, PushNotificationRequest notification);
         /// <summary>
-        /// [PRIVATE] Update the push notification
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="scheduledPushNotificationId">Notification Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="scheduledPushNotificationId"></param>
+        /// <param name="notification"></param>
         /// <returns>RestApiResultPushNotificationResponse</returns>
         RestApiResultPushNotificationResponse UpdatePushNotification (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification);
 
         /// <summary>
-        /// [PRIVATE] Update the push notification
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="scheduledPushNotificationId">Notification Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="scheduledPushNotificationId"></param>
+        /// <param name="notification"></param>
         /// <returns>ApiResponse of RestApiResultPushNotificationResponse</returns>
         ApiResponse<RestApiResultPushNotificationResponse> UpdatePushNotificationWithHttpInfo (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="scheduledPushNotificationId">ID of Scheduled push notifiaction to delete</param>
+        /// <param name="scheduledPushNotificationId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeletePushNotificationAsync (string appId, int? scheduledPushNotificationId);
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="scheduledPushNotificationId">ID of Scheduled push notifiaction to delete</param>
+        /// <param name="scheduledPushNotificationId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeletePushNotificationAsyncWithHttpInfo (string appId, int? scheduledPushNotificationId);
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -159,7 +159,7 @@ public interface IPushNotificationsApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultPushNotificationResponse> GetPushNotificationsAsync (string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -171,51 +171,51 @@ public interface IPushNotificationsApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiPaginationResultPushNotificationResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPushNotificationResponse>> GetPushNotificationsAsyncWithHttpInfo (string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="notification"></param>
         /// <returns>Task of RestApiResultPushNotificationResponse</returns>
         System.Threading.Tasks.Task<RestApiResultPushNotificationResponse> SchedulePushNotificationAsync (string appId, PushNotificationRequest notification);
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="notification"></param>
         /// <returns>Task of ApiResponse (RestApiResultPushNotificationResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultPushNotificationResponse>> SchedulePushNotificationAsyncWithHttpInfo (string appId, PushNotificationRequest notification);
         /// <summary>
-        /// [PRIVATE] Update the push notification
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="scheduledPushNotificationId">Notification Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="scheduledPushNotificationId"></param>
+        /// <param name="notification"></param>
         /// <returns>Task of RestApiResultPushNotificationResponse</returns>
         System.Threading.Tasks.Task<RestApiResultPushNotificationResponse> UpdatePushNotificationAsync (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification);
 
         /// <summary>
-        /// [PRIVATE] Update the push notification
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="scheduledPushNotificationId">Notification Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="scheduledPushNotificationId"></param>
+        /// <param name="notification"></param>
         /// <returns>Task of ApiResponse (RestApiResultPushNotificationResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultPushNotificationResponse>> UpdatePushNotificationAsyncWithHttpInfo (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification);
         #endregion Asynchronous Operations
@@ -319,11 +319,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="scheduledPushNotificationId">ID of Scheduled push notifiaction to delete</param>
+        /// <param name="scheduledPushNotificationId"></param>
         /// <returns></returns>
         public void DeletePushNotification (string appId, int? scheduledPushNotificationId)
         {
@@ -331,11 +331,11 @@ public void DeletePushNotification (string appId, int? scheduledPushNotification
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="scheduledPushNotificationId">ID of Scheduled push notifiaction to delete</param>
+        /// <param name="scheduledPushNotificationId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeletePushNotificationWithHttpInfo (string appId, int? scheduledPushNotificationId)
         {
@@ -346,7 +346,7 @@ public ApiResponse<Object> DeletePushNotificationWithHttpInfo (string appId, int
             if (scheduledPushNotificationId == null)
                 throw new ApiException(400, "Missing required parameter 'scheduledPushNotificationId' when calling PushNotificationsApi->DeletePushNotification");
 
-            var localVarPath = "/api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId}";
+            var localVarPath = "./api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -394,16 +394,16 @@ public ApiResponse<Object> DeletePushNotificationWithHttpInfo (string appId, int
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="scheduledPushNotificationId">ID of Scheduled push notifiaction to delete</param>
+        /// <param name="scheduledPushNotificationId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeletePushNotificationAsync (string appId, int? scheduledPushNotificationId)
         {
@@ -412,11 +412,11 @@ public async System.Threading.Tasks.Task DeletePushNotificationAsync (string app
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
-        /// <param name="scheduledPushNotificationId">ID of Scheduled push notifiaction to delete</param>
+        /// <param name="scheduledPushNotificationId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeletePushNotificationAsyncWithHttpInfo (string appId, int? scheduledPushNotificationId)
         {
@@ -427,7 +427,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeletePushNotifica
             if (scheduledPushNotificationId == null)
                 throw new ApiException(400, "Missing required parameter 'scheduledPushNotificationId' when calling PushNotificationsApi->DeletePushNotification");
 
-            var localVarPath = "/api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId}";
+            var localVarPath = "./api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -475,12 +475,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeletePushNotifica
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -494,7 +494,7 @@ public RestApiPaginationResultPushNotificationResponse GetPushNotifications (str
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -507,7 +507,7 @@ public ApiResponse< RestApiPaginationResultPushNotificationResponse > GetPushNot
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling PushNotificationsApi->GetPushNotifications");
 
-            var localVarPath = "/api/v1.0/{appId}/pushnotifications";
+            var localVarPath = "./api/v1.0/{appId}/pushnotifications";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -556,12 +556,12 @@ public ApiResponse< RestApiPaginationResultPushNotificationResponse > GetPushNot
             }
 
             return new ApiResponse<RestApiPaginationResultPushNotificationResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPushNotificationResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPushNotificationResponse)));
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -576,7 +576,7 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultPushNotification
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -589,7 +589,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPush
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling PushNotificationsApi->GetPushNotifications");
 
-            var localVarPath = "/api/v1.0/{appId}/pushnotifications";
+            var localVarPath = "./api/v1.0/{appId}/pushnotifications";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -638,16 +638,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultPush
             }
 
             return new ApiResponse<RestApiPaginationResultPushNotificationResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultPushNotificationResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultPushNotificationResponse)));
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="notification"></param>
         /// <returns>RestApiResultPushNotificationResponse</returns>
         public RestApiResultPushNotificationResponse SchedulePushNotification (string appId, PushNotificationRequest notification)
         {
@@ -656,11 +656,11 @@ public RestApiResultPushNotificationResponse SchedulePushNotification (string ap
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="notification"></param>
         /// <returns>ApiResponse of RestApiResultPushNotificationResponse</returns>
         public ApiResponse< RestApiResultPushNotificationResponse > SchedulePushNotificationWithHttpInfo (string appId, PushNotificationRequest notification)
         {
@@ -671,7 +671,7 @@ public ApiResponse< RestApiResultPushNotificationResponse > SchedulePushNotifica
             if (notification == null)
                 throw new ApiException(400, "Missing required parameter 'notification' when calling PushNotificationsApi->SchedulePushNotification");
 
-            var localVarPath = "/api/v1.0/{appId}/pushnotifications";
+            var localVarPath = "./api/v1.0/{appId}/pushnotifications";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -731,16 +731,16 @@ public ApiResponse< RestApiResultPushNotificationResponse > SchedulePushNotifica
             }
 
             return new ApiResponse<RestApiResultPushNotificationResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPushNotificationResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPushNotificationResponse)));
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="notification"></param>
         /// <returns>Task of RestApiResultPushNotificationResponse</returns>
         public async System.Threading.Tasks.Task<RestApiResultPushNotificationResponse> SchedulePushNotificationAsync (string appId, PushNotificationRequest notification)
         {
@@ -750,11 +750,11 @@ public async System.Threading.Tasks.Task<RestApiResultPushNotificationResponse>
         }
 
         /// <summary>
-        /// [PRIVATE] Push notification to cutomers 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="notification"></param>
         /// <returns>Task of ApiResponse (RestApiResultPushNotificationResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPushNotificationResponse>> SchedulePushNotificationAsyncWithHttpInfo (string appId, PushNotificationRequest notification)
         {
@@ -765,7 +765,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPushNotificati
             if (notification == null)
                 throw new ApiException(400, "Missing required parameter 'notification' when calling PushNotificationsApi->SchedulePushNotification");
 
-            var localVarPath = "/api/v1.0/{appId}/pushnotifications";
+            var localVarPath = "./api/v1.0/{appId}/pushnotifications";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -825,17 +825,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPushNotificati
             }
 
             return new ApiResponse<RestApiResultPushNotificationResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPushNotificationResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPushNotificationResponse)));
         }
 
         /// <summary>
-        /// [PRIVATE] Update the push notification 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="scheduledPushNotificationId">Notification Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="scheduledPushNotificationId"></param>
+        /// <param name="notification"></param>
         /// <returns>RestApiResultPushNotificationResponse</returns>
         public RestApiResultPushNotificationResponse UpdatePushNotification (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification)
         {
@@ -844,12 +844,12 @@ public RestApiResultPushNotificationResponse UpdatePushNotification (string appI
         }
 
         /// <summary>
-        /// [PRIVATE] Update the push notification 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="scheduledPushNotificationId">Notification Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="scheduledPushNotificationId"></param>
+        /// <param name="notification"></param>
         /// <returns>ApiResponse of RestApiResultPushNotificationResponse</returns>
         public ApiResponse< RestApiResultPushNotificationResponse > UpdatePushNotificationWithHttpInfo (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification)
         {
@@ -863,7 +863,7 @@ public ApiResponse< RestApiResultPushNotificationResponse > UpdatePushNotificati
             if (notification == null)
                 throw new ApiException(400, "Missing required parameter 'notification' when calling PushNotificationsApi->UpdatePushNotification");
 
-            var localVarPath = "/api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId}";
+            var localVarPath = "./api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -924,17 +924,17 @@ public ApiResponse< RestApiResultPushNotificationResponse > UpdatePushNotificati
             }
 
             return new ApiResponse<RestApiResultPushNotificationResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPushNotificationResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPushNotificationResponse)));
         }
 
         /// <summary>
-        /// [PRIVATE] Update the push notification 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="scheduledPushNotificationId">Notification Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="scheduledPushNotificationId"></param>
+        /// <param name="notification"></param>
         /// <returns>Task of RestApiResultPushNotificationResponse</returns>
         public async System.Threading.Tasks.Task<RestApiResultPushNotificationResponse> UpdatePushNotificationAsync (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification)
         {
@@ -944,12 +944,12 @@ public async System.Threading.Tasks.Task<RestApiResultPushNotificationResponse>
         }
 
         /// <summary>
-        /// [PRIVATE] Update the push notification 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="scheduledPushNotificationId">Notification Id</param>
-        /// <param name="notification">Notification to send</param>
+        /// <param name="appId"></param>
+        /// <param name="scheduledPushNotificationId"></param>
+        /// <param name="notification"></param>
         /// <returns>Task of ApiResponse (RestApiResultPushNotificationResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPushNotificationResponse>> UpdatePushNotificationAsyncWithHttpInfo (string appId, int? scheduledPushNotificationId, PushNotificationRequest notification)
         {
@@ -963,7 +963,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPushNotificati
             if (notification == null)
                 throw new ApiException(400, "Missing required parameter 'notification' when calling PushNotificationsApi->UpdatePushNotification");
 
-            var localVarPath = "/api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId}";
+            var localVarPath = "./api/v1.0/{appId}/pushnotifications/{scheduledPushNotificationId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1024,7 +1024,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPushNotificati
             }
 
             return new ApiResponse<RestApiResultPushNotificationResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPushNotificationResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPushNotificationResponse)));
         }
 
diff --git a/src/Flipdish/Api/ReceiptsApi.cs b/src/Flipdish/Api/ReceiptsApi.cs
new file mode 100644
index 00000000..ce8f27aa
--- /dev/null
+++ b/src/Flipdish/Api/ReceiptsApi.cs
@@ -0,0 +1,323 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IReceiptsApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <returns>GetReceiptByOrderIdQueryResponse</returns>
+        GetReceiptByOrderIdQueryResponse GetReceipt (int? orderId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <returns>ApiResponse of GetReceiptByOrderIdQueryResponse</returns>
+        ApiResponse<GetReceiptByOrderIdQueryResponse> GetReceiptWithHttpInfo (int? orderId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <returns>Task of GetReceiptByOrderIdQueryResponse</returns>
+        System.Threading.Tasks.Task<GetReceiptByOrderIdQueryResponse> GetReceiptAsync (int? orderId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <returns>Task of ApiResponse (GetReceiptByOrderIdQueryResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<GetReceiptByOrderIdQueryResponse>> GetReceiptAsyncWithHttpInfo (int? orderId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class ReceiptsApi : IReceiptsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReceiptsApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public ReceiptsApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReceiptsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public ReceiptsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <returns>GetReceiptByOrderIdQueryResponse</returns>
+        public GetReceiptByOrderIdQueryResponse GetReceipt (int? orderId)
+        {
+             ApiResponse<GetReceiptByOrderIdQueryResponse> localVarResponse = GetReceiptWithHttpInfo(orderId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <returns>ApiResponse of GetReceiptByOrderIdQueryResponse</returns>
+        public ApiResponse< GetReceiptByOrderIdQueryResponse > GetReceiptWithHttpInfo (int? orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling ReceiptsApi->GetReceipt");
+
+            var localVarPath = "./api/v1.0/receipts/{orderId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetReceipt", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<GetReceiptByOrderIdQueryResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (GetReceiptByOrderIdQueryResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(GetReceiptByOrderIdQueryResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <returns>Task of GetReceiptByOrderIdQueryResponse</returns>
+        public async System.Threading.Tasks.Task<GetReceiptByOrderIdQueryResponse> GetReceiptAsync (int? orderId)
+        {
+             ApiResponse<GetReceiptByOrderIdQueryResponse> localVarResponse = await GetReceiptAsyncWithHttpInfo(orderId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orderId"></param>
+        /// <returns>Task of ApiResponse (GetReceiptByOrderIdQueryResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<GetReceiptByOrderIdQueryResponse>> GetReceiptAsyncWithHttpInfo (int? orderId)
+        {
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling ReceiptsApi->GetReceipt");
+
+            var localVarPath = "./api/v1.0/receipts/{orderId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetReceipt", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<GetReceiptByOrderIdQueryResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (GetReceiptByOrderIdQueryResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(GetReceiptByOrderIdQueryResponse)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/RestaurantVouchersPayGreenApi.cs b/src/Flipdish/Api/RestaurantVouchersPayGreenApi.cs
new file mode 100644
index 00000000..c1c1a67b
--- /dev/null
+++ b/src/Flipdish/Api/RestaurantVouchersPayGreenApi.cs
@@ -0,0 +1,2083 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IRestaurantVouchersPayGreenApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        RestApiResultRestaurantVoucherPayGreenConfiguration CreatePayGreenConfiguration (string appId, CreatePayGreenConfigurationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> CreatePayGreenConfigurationWithHttpInfo (string appId, CreatePayGreenConfigurationRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Object</returns>
+        Object DeletePayGreenConfiguration (string appId, int? paygreenConfigurationId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> DeletePayGreenConfigurationWithHttpInfo (string appId, int? paygreenConfigurationId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiArrayResultRestaurantVoucherEligibleStore</returns>
+        RestApiArrayResultRestaurantVoucherEligibleStore GetElegibleStores (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestaurantVoucherEligibleStore</returns>
+        ApiResponse<RestApiArrayResultRestaurantVoucherEligibleStore> GetElegibleStoresWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiArrayResultRestaurantVoucherPayGreenConfiguration</returns>
+        RestApiArrayResultRestaurantVoucherPayGreenConfiguration GetPayGreenConfigurations (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestaurantVoucherPayGreenConfiguration</returns>
+        ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfiguration> GetPayGreenConfigurationsWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary</returns>
+        RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary GetStoreAvailablePayGreenConfigurations (string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary</returns>
+        ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary> GetStoreAvailablePayGreenConfigurationsWithHttpInfo (string appId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        RestApiResultRestaurantVoucherPayGreenStoreConfiguration GetStorePayGreenConfiguration_ (string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> GetStorePayGreenConfiguration_WithHttpInfo (string appId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        RestApiResultRestaurantVoucherPayGreenConfiguration ListPayGreenConfigurations (string appId, int? paygreenConfigurationId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> ListPayGreenConfigurationsWithHttpInfo (string appId, int? paygreenConfigurationId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        RestApiResultRestaurantVoucherPayGreenConfiguration UpdatePayGreenConfiguration (string appId, int? paygreenConfigurationId, UpdatePayGreenConfigurationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> UpdatePayGreenConfigurationWithHttpInfo (string appId, int? paygreenConfigurationId, UpdatePayGreenConfigurationRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        RestApiResultRestaurantVoucherPayGreenStoreConfiguration UpdateStorePayGreenConfiguration_ (string appId, int? storeId, UpdateStorePayGreenConfigurationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> UpdateStorePayGreenConfiguration_WithHttpInfo (string appId, int? storeId, UpdateStorePayGreenConfigurationRequest request);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenConfiguration> CreatePayGreenConfigurationAsync (string appId, CreatePayGreenConfigurationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenConfiguration)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>> CreatePayGreenConfigurationAsyncWithHttpInfo (string appId, CreatePayGreenConfigurationRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> DeletePayGreenConfigurationAsync (string appId, int? paygreenConfigurationId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> DeletePayGreenConfigurationAsyncWithHttpInfo (string appId, int? paygreenConfigurationId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiArrayResultRestaurantVoucherEligibleStore</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultRestaurantVoucherEligibleStore> GetElegibleStoresAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRestaurantVoucherEligibleStore)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestaurantVoucherEligibleStore>> GetElegibleStoresAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiArrayResultRestaurantVoucherPayGreenConfiguration</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultRestaurantVoucherPayGreenConfiguration> GetPayGreenConfigurationsAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRestaurantVoucherPayGreenConfiguration)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfiguration>> GetPayGreenConfigurationsAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary> GetStoreAvailablePayGreenConfigurationsAsync (string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary>> GetStoreAvailablePayGreenConfigurationsAsyncWithHttpInfo (string appId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> GetStorePayGreenConfiguration_Async (string appId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenStoreConfiguration)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>> GetStorePayGreenConfiguration_AsyncWithHttpInfo (string appId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenConfiguration> ListPayGreenConfigurationsAsync (string appId, int? paygreenConfigurationId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenConfiguration)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>> ListPayGreenConfigurationsAsyncWithHttpInfo (string appId, int? paygreenConfigurationId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenConfiguration> UpdatePayGreenConfigurationAsync (string appId, int? paygreenConfigurationId, UpdatePayGreenConfigurationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenConfiguration)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>> UpdatePayGreenConfigurationAsyncWithHttpInfo (string appId, int? paygreenConfigurationId, UpdatePayGreenConfigurationRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> UpdateStorePayGreenConfiguration_Async (string appId, int? storeId, UpdateStorePayGreenConfigurationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenStoreConfiguration)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>> UpdateStorePayGreenConfiguration_AsyncWithHttpInfo (string appId, int? storeId, UpdateStorePayGreenConfigurationRequest request);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class RestaurantVouchersPayGreenApi : IRestaurantVouchersPayGreenApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestaurantVouchersPayGreenApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public RestaurantVouchersPayGreenApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestaurantVouchersPayGreenApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public RestaurantVouchersPayGreenApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public RestApiResultRestaurantVoucherPayGreenConfiguration CreatePayGreenConfiguration (string appId, CreatePayGreenConfigurationRequest request)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> localVarResponse = CreatePayGreenConfigurationWithHttpInfo(appId, request);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public ApiResponse< RestApiResultRestaurantVoucherPayGreenConfiguration > CreatePayGreenConfigurationWithHttpInfo (string appId, CreatePayGreenConfigurationRequest request)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->CreatePayGreenConfiguration");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling RestaurantVouchersPayGreenApi->CreatePayGreenConfiguration");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreatePayGreenConfiguration", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public async System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenConfiguration> CreatePayGreenConfigurationAsync (string appId, CreatePayGreenConfigurationRequest request)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> localVarResponse = await CreatePayGreenConfigurationAsyncWithHttpInfo(appId, request);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>> CreatePayGreenConfigurationAsyncWithHttpInfo (string appId, CreatePayGreenConfigurationRequest request)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->CreatePayGreenConfiguration");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling RestaurantVouchersPayGreenApi->CreatePayGreenConfiguration");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreatePayGreenConfiguration", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Object</returns>
+        public Object DeletePayGreenConfiguration (string appId, int? paygreenConfigurationId)
+        {
+             ApiResponse<Object> localVarResponse = DeletePayGreenConfigurationWithHttpInfo(appId, paygreenConfigurationId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > DeletePayGreenConfigurationWithHttpInfo (string appId, int? paygreenConfigurationId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->DeletePayGreenConfiguration");
+            // verify the required parameter 'paygreenConfigurationId' is set
+            if (paygreenConfigurationId == null)
+                throw new ApiException(400, "Missing required parameter 'paygreenConfigurationId' when calling RestaurantVouchersPayGreenApi->DeletePayGreenConfiguration");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (paygreenConfigurationId != null) localVarPathParams.Add("paygreenConfigurationId", this.Configuration.ApiClient.ParameterToString(paygreenConfigurationId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeletePayGreenConfiguration", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> DeletePayGreenConfigurationAsync (string appId, int? paygreenConfigurationId)
+        {
+             ApiResponse<Object> localVarResponse = await DeletePayGreenConfigurationAsyncWithHttpInfo(appId, paygreenConfigurationId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> DeletePayGreenConfigurationAsyncWithHttpInfo (string appId, int? paygreenConfigurationId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->DeletePayGreenConfiguration");
+            // verify the required parameter 'paygreenConfigurationId' is set
+            if (paygreenConfigurationId == null)
+                throw new ApiException(400, "Missing required parameter 'paygreenConfigurationId' when calling RestaurantVouchersPayGreenApi->DeletePayGreenConfiguration");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (paygreenConfigurationId != null) localVarPathParams.Add("paygreenConfigurationId", this.Configuration.ApiClient.ParameterToString(paygreenConfigurationId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeletePayGreenConfiguration", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiArrayResultRestaurantVoucherEligibleStore</returns>
+        public RestApiArrayResultRestaurantVoucherEligibleStore GetElegibleStores (string appId)
+        {
+             ApiResponse<RestApiArrayResultRestaurantVoucherEligibleStore> localVarResponse = GetElegibleStoresWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestaurantVoucherEligibleStore</returns>
+        public ApiResponse< RestApiArrayResultRestaurantVoucherEligibleStore > GetElegibleStoresWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->GetElegibleStores");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetElegibleStores", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestaurantVoucherEligibleStore>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestaurantVoucherEligibleStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestaurantVoucherEligibleStore)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiArrayResultRestaurantVoucherEligibleStore</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultRestaurantVoucherEligibleStore> GetElegibleStoresAsync (string appId)
+        {
+             ApiResponse<RestApiArrayResultRestaurantVoucherEligibleStore> localVarResponse = await GetElegibleStoresAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRestaurantVoucherEligibleStore)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestaurantVoucherEligibleStore>> GetElegibleStoresAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->GetElegibleStores");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetElegibleStores", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestaurantVoucherEligibleStore>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestaurantVoucherEligibleStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestaurantVoucherEligibleStore)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiArrayResultRestaurantVoucherPayGreenConfiguration</returns>
+        public RestApiArrayResultRestaurantVoucherPayGreenConfiguration GetPayGreenConfigurations (string appId)
+        {
+             ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfiguration> localVarResponse = GetPayGreenConfigurationsWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestaurantVoucherPayGreenConfiguration</returns>
+        public ApiResponse< RestApiArrayResultRestaurantVoucherPayGreenConfiguration > GetPayGreenConfigurationsWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->GetPayGreenConfigurations");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayGreenConfigurations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestaurantVoucherPayGreenConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestaurantVoucherPayGreenConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiArrayResultRestaurantVoucherPayGreenConfiguration</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultRestaurantVoucherPayGreenConfiguration> GetPayGreenConfigurationsAsync (string appId)
+        {
+             ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfiguration> localVarResponse = await GetPayGreenConfigurationsAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRestaurantVoucherPayGreenConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfiguration>> GetPayGreenConfigurationsAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->GetPayGreenConfigurations");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPayGreenConfigurations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestaurantVoucherPayGreenConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestaurantVoucherPayGreenConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary</returns>
+        public RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary GetStoreAvailablePayGreenConfigurations (string appId, int? storeId)
+        {
+             ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary> localVarResponse = GetStoreAvailablePayGreenConfigurationsWithHttpInfo(appId, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary</returns>
+        public ApiResponse< RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary > GetStoreAvailablePayGreenConfigurationsWithHttpInfo (string appId, int? storeId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->GetStoreAvailablePayGreenConfigurations");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling RestaurantVouchersPayGreenApi->GetStoreAvailablePayGreenConfigurations");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/stores/{storeId}/available-configurations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStoreAvailablePayGreenConfigurations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary> GetStoreAvailablePayGreenConfigurationsAsync (string appId, int? storeId)
+        {
+             ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary> localVarResponse = await GetStoreAvailablePayGreenConfigurationsAsyncWithHttpInfo(appId, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary>> GetStoreAvailablePayGreenConfigurationsAsyncWithHttpInfo (string appId, int? storeId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->GetStoreAvailablePayGreenConfigurations");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling RestaurantVouchersPayGreenApi->GetStoreAvailablePayGreenConfigurations");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/stores/{storeId}/available-configurations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStoreAvailablePayGreenConfigurations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        public RestApiResultRestaurantVoucherPayGreenStoreConfiguration GetStorePayGreenConfiguration_ (string appId, int? storeId)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> localVarResponse = GetStorePayGreenConfiguration_WithHttpInfo(appId, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        public ApiResponse< RestApiResultRestaurantVoucherPayGreenStoreConfiguration > GetStorePayGreenConfiguration_WithHttpInfo (string appId, int? storeId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->GetStorePayGreenConfiguration_");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling RestaurantVouchersPayGreenApi->GetStorePayGreenConfiguration_");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/stores/{storeId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStorePayGreenConfiguration_", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenStoreConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenStoreConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        public async System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> GetStorePayGreenConfiguration_Async (string appId, int? storeId)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> localVarResponse = await GetStorePayGreenConfiguration_AsyncWithHttpInfo(appId, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenStoreConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>> GetStorePayGreenConfiguration_AsyncWithHttpInfo (string appId, int? storeId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->GetStorePayGreenConfiguration_");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling RestaurantVouchersPayGreenApi->GetStorePayGreenConfiguration_");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/stores/{storeId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStorePayGreenConfiguration_", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenStoreConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenStoreConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public RestApiResultRestaurantVoucherPayGreenConfiguration ListPayGreenConfigurations (string appId, int? paygreenConfigurationId)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> localVarResponse = ListPayGreenConfigurationsWithHttpInfo(appId, paygreenConfigurationId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public ApiResponse< RestApiResultRestaurantVoucherPayGreenConfiguration > ListPayGreenConfigurationsWithHttpInfo (string appId, int? paygreenConfigurationId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->ListPayGreenConfigurations");
+            // verify the required parameter 'paygreenConfigurationId' is set
+            if (paygreenConfigurationId == null)
+                throw new ApiException(400, "Missing required parameter 'paygreenConfigurationId' when calling RestaurantVouchersPayGreenApi->ListPayGreenConfigurations");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (paygreenConfigurationId != null) localVarPathParams.Add("paygreenConfigurationId", this.Configuration.ApiClient.ParameterToString(paygreenConfigurationId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("ListPayGreenConfigurations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public async System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenConfiguration> ListPayGreenConfigurationsAsync (string appId, int? paygreenConfigurationId)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> localVarResponse = await ListPayGreenConfigurationsAsyncWithHttpInfo(appId, paygreenConfigurationId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>> ListPayGreenConfigurationsAsyncWithHttpInfo (string appId, int? paygreenConfigurationId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->ListPayGreenConfigurations");
+            // verify the required parameter 'paygreenConfigurationId' is set
+            if (paygreenConfigurationId == null)
+                throw new ApiException(400, "Missing required parameter 'paygreenConfigurationId' when calling RestaurantVouchersPayGreenApi->ListPayGreenConfigurations");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (paygreenConfigurationId != null) localVarPathParams.Add("paygreenConfigurationId", this.Configuration.ApiClient.ParameterToString(paygreenConfigurationId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("ListPayGreenConfigurations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public RestApiResultRestaurantVoucherPayGreenConfiguration UpdatePayGreenConfiguration (string appId, int? paygreenConfigurationId, UpdatePayGreenConfigurationRequest request)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> localVarResponse = UpdatePayGreenConfigurationWithHttpInfo(appId, paygreenConfigurationId, request);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public ApiResponse< RestApiResultRestaurantVoucherPayGreenConfiguration > UpdatePayGreenConfigurationWithHttpInfo (string appId, int? paygreenConfigurationId, UpdatePayGreenConfigurationRequest request)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->UpdatePayGreenConfiguration");
+            // verify the required parameter 'paygreenConfigurationId' is set
+            if (paygreenConfigurationId == null)
+                throw new ApiException(400, "Missing required parameter 'paygreenConfigurationId' when calling RestaurantVouchersPayGreenApi->UpdatePayGreenConfiguration");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling RestaurantVouchersPayGreenApi->UpdatePayGreenConfiguration");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (paygreenConfigurationId != null) localVarPathParams.Add("paygreenConfigurationId", this.Configuration.ApiClient.ParameterToString(paygreenConfigurationId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePayGreenConfiguration", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenConfiguration</returns>
+        public async System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenConfiguration> UpdatePayGreenConfigurationAsync (string appId, int? paygreenConfigurationId, UpdatePayGreenConfigurationRequest request)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration> localVarResponse = await UpdatePayGreenConfigurationAsyncWithHttpInfo(appId, paygreenConfigurationId, request);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="paygreenConfigurationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>> UpdatePayGreenConfigurationAsyncWithHttpInfo (string appId, int? paygreenConfigurationId, UpdatePayGreenConfigurationRequest request)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->UpdatePayGreenConfiguration");
+            // verify the required parameter 'paygreenConfigurationId' is set
+            if (paygreenConfigurationId == null)
+                throw new ApiException(400, "Missing required parameter 'paygreenConfigurationId' when calling RestaurantVouchersPayGreenApi->UpdatePayGreenConfiguration");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling RestaurantVouchersPayGreenApi->UpdatePayGreenConfiguration");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/{paygreenConfigurationId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (paygreenConfigurationId != null) localVarPathParams.Add("paygreenConfigurationId", this.Configuration.ApiClient.ParameterToString(paygreenConfigurationId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePayGreenConfiguration", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        public RestApiResultRestaurantVoucherPayGreenStoreConfiguration UpdateStorePayGreenConfiguration_ (string appId, int? storeId, UpdateStorePayGreenConfigurationRequest request)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> localVarResponse = UpdateStorePayGreenConfiguration_WithHttpInfo(appId, storeId, request);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        public ApiResponse< RestApiResultRestaurantVoucherPayGreenStoreConfiguration > UpdateStorePayGreenConfiguration_WithHttpInfo (string appId, int? storeId, UpdateStorePayGreenConfigurationRequest request)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->UpdateStorePayGreenConfiguration_");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling RestaurantVouchersPayGreenApi->UpdateStorePayGreenConfiguration_");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling RestaurantVouchersPayGreenApi->UpdateStorePayGreenConfiguration_");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/stores/{storeId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateStorePayGreenConfiguration_", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenStoreConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenStoreConfiguration)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiResultRestaurantVoucherPayGreenStoreConfiguration</returns>
+        public async System.Threading.Tasks.Task<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> UpdateStorePayGreenConfiguration_Async (string appId, int? storeId, UpdateStorePayGreenConfigurationRequest request)
+        {
+             ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration> localVarResponse = await UpdateStorePayGreenConfiguration_AsyncWithHttpInfo(appId, storeId, request);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRestaurantVoucherPayGreenStoreConfiguration)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>> UpdateStorePayGreenConfiguration_AsyncWithHttpInfo (string appId, int? storeId, UpdateStorePayGreenConfigurationRequest request)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling RestaurantVouchersPayGreenApi->UpdateStorePayGreenConfiguration_");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling RestaurantVouchersPayGreenApi->UpdateStorePayGreenConfiguration_");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling RestaurantVouchersPayGreenApi->UpdateStorePayGreenConfiguration_");
+
+            var localVarPath = "./api/v1.0/{appId}/restaurant-vouchers/paygreen/stores/{storeId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateStorePayGreenConfiguration_", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestaurantVoucherPayGreenStoreConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestaurantVoucherPayGreenStoreConfiguration)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/SearchApi.cs b/src/Flipdish/Api/SearchApi.cs
new file mode 100644
index 00000000..990bb62f
--- /dev/null
+++ b/src/Flipdish/Api/SearchApi.cs
@@ -0,0 +1,389 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface ISearchApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="query"></param>
+        /// <param name="countryId"></param>
+        /// <param name="includeArchivedStores"> (optional)</param>
+        /// <param name="searchType"> (optional)</param>
+        /// <param name="publishedStatus"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>RestApiPaginationResultRestaurant</returns>
+        RestApiPaginationResultRestaurant SearchRestaurants (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="query"></param>
+        /// <param name="countryId"></param>
+        /// <param name="includeArchivedStores"> (optional)</param>
+        /// <param name="searchType"> (optional)</param>
+        /// <param name="publishedStatus"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultRestaurant</returns>
+        ApiResponse<RestApiPaginationResultRestaurant> SearchRestaurantsWithHttpInfo (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="query"></param>
+        /// <param name="countryId"></param>
+        /// <param name="includeArchivedStores"> (optional)</param>
+        /// <param name="searchType"> (optional)</param>
+        /// <param name="publishedStatus"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultRestaurant</returns>
+        System.Threading.Tasks.Task<RestApiPaginationResultRestaurant> SearchRestaurantsAsync (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="query"></param>
+        /// <param name="countryId"></param>
+        /// <param name="includeArchivedStores"> (optional)</param>
+        /// <param name="searchType"> (optional)</param>
+        /// <param name="publishedStatus"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultRestaurant)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultRestaurant>> SearchRestaurantsAsyncWithHttpInfo (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class SearchApi : ISearchApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SearchApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public SearchApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SearchApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public SearchApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="query"></param>
+        /// <param name="countryId"></param>
+        /// <param name="includeArchivedStores"> (optional)</param>
+        /// <param name="searchType"> (optional)</param>
+        /// <param name="publishedStatus"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>RestApiPaginationResultRestaurant</returns>
+        public RestApiPaginationResultRestaurant SearchRestaurants (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultRestaurant> localVarResponse = SearchRestaurantsWithHttpInfo(query, countryId, includeArchivedStores, searchType, publishedStatus, page, limit);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="query"></param>
+        /// <param name="countryId"></param>
+        /// <param name="includeArchivedStores"> (optional)</param>
+        /// <param name="searchType"> (optional)</param>
+        /// <param name="publishedStatus"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultRestaurant</returns>
+        public ApiResponse< RestApiPaginationResultRestaurant > SearchRestaurantsWithHttpInfo (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null)
+        {
+            // verify the required parameter 'query' is set
+            if (query == null)
+                throw new ApiException(400, "Missing required parameter 'query' when calling SearchApi->SearchRestaurants");
+            // verify the required parameter 'countryId' is set
+            if (countryId == null)
+                throw new ApiException(400, "Missing required parameter 'countryId' when calling SearchApi->SearchRestaurants");
+
+            var localVarPath = "./api/v1.0/search/restaurants";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (query != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "query", query)); // query parameter
+            if (countryId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "countryId", countryId)); // query parameter
+            if (includeArchivedStores != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "includeArchivedStores", includeArchivedStores)); // query parameter
+            if (searchType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchType", searchType)); // query parameter
+            if (publishedStatus != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "publishedStatus", publishedStatus)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SearchRestaurants", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultRestaurant>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultRestaurant) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultRestaurant)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="query"></param>
+        /// <param name="countryId"></param>
+        /// <param name="includeArchivedStores"> (optional)</param>
+        /// <param name="searchType"> (optional)</param>
+        /// <param name="publishedStatus"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultRestaurant</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultRestaurant> SearchRestaurantsAsync (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultRestaurant> localVarResponse = await SearchRestaurantsAsyncWithHttpInfo(query, countryId, includeArchivedStores, searchType, publishedStatus, page, limit);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="query"></param>
+        /// <param name="countryId"></param>
+        /// <param name="includeArchivedStores"> (optional)</param>
+        /// <param name="searchType"> (optional)</param>
+        /// <param name="publishedStatus"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultRestaurant)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultRestaurant>> SearchRestaurantsAsyncWithHttpInfo (string query, string countryId, string includeArchivedStores = null, string searchType = null, string publishedStatus = null, int? page = null, int? limit = null)
+        {
+            // verify the required parameter 'query' is set
+            if (query == null)
+                throw new ApiException(400, "Missing required parameter 'query' when calling SearchApi->SearchRestaurants");
+            // verify the required parameter 'countryId' is set
+            if (countryId == null)
+                throw new ApiException(400, "Missing required parameter 'countryId' when calling SearchApi->SearchRestaurants");
+
+            var localVarPath = "./api/v1.0/search/restaurants";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (query != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "query", query)); // query parameter
+            if (countryId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "countryId", countryId)); // query parameter
+            if (includeArchivedStores != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "includeArchivedStores", includeArchivedStores)); // query parameter
+            if (searchType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchType", searchType)); // query parameter
+            if (publishedStatus != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "publishedStatus", publishedStatus)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SearchRestaurants", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultRestaurant>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultRestaurant) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultRestaurant)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/SmsProviderCredentialsApi.cs b/src/Flipdish/Api/SmsProviderCredentialsApi.cs
new file mode 100644
index 00000000..df5ecb20
--- /dev/null
+++ b/src/Flipdish/Api/SmsProviderCredentialsApi.cs
@@ -0,0 +1,1281 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface ISmsProviderCredentialsApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="withFallback"> (optional)</param>
+        /// <returns>RestApiResultSmsProviderCredential</returns>
+        RestApiResultSmsProviderCredential GetBrandSmsProviderCredentialByServiceType (string orgId, string brandId, string serviceType, bool? withFallback = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="withFallback"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultSmsProviderCredential</returns>
+        ApiResponse<RestApiResultSmsProviderCredential> GetBrandSmsProviderCredentialByServiceTypeWithHttpInfo (string orgId, string brandId, string serviceType, bool? withFallback = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <returns>RestApiArrayResultSmsProviderCredential</returns>
+        RestApiArrayResultSmsProviderCredential GetBrandSmsProviderCredentials (string orgId, string brandId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultSmsProviderCredential</returns>
+        ApiResponse<RestApiArrayResultSmsProviderCredential> GetBrandSmsProviderCredentialsWithHttpInfo (string orgId, string brandId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <returns>RestApiResultSmsProviderCredential</returns>
+        RestApiResultSmsProviderCredential SmsProviderCredentialDelete (string orgId, string brandId, string serviceType);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <returns>ApiResponse of RestApiResultSmsProviderCredential</returns>
+        ApiResponse<RestApiResultSmsProviderCredential> SmsProviderCredentialDeleteWithHttpInfo (string orgId, string brandId, string serviceType);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="credential"></param>
+        /// <returns>RestApiResultSmsProviderCredential</returns>
+        RestApiResultSmsProviderCredential SmsProviderCredentialUpdate (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="credential"></param>
+        /// <returns>ApiResponse of RestApiResultSmsProviderCredential</returns>
+        ApiResponse<RestApiResultSmsProviderCredential> SmsProviderCredentialUpdateWithHttpInfo (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="credentials"></param>
+        /// <returns>RestApiArrayResultSmsProviderCredential</returns>
+        RestApiArrayResultSmsProviderCredential SmsProviderCredentialsBulkUpsert (List<SmsProviderCredential> credentials);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="credentials"></param>
+        /// <returns>ApiResponse of RestApiArrayResultSmsProviderCredential</returns>
+        ApiResponse<RestApiArrayResultSmsProviderCredential> SmsProviderCredentialsBulkUpsertWithHttpInfo (List<SmsProviderCredential> credentials);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="withFallback"> (optional)</param>
+        /// <returns>Task of RestApiResultSmsProviderCredential</returns>
+        System.Threading.Tasks.Task<RestApiResultSmsProviderCredential> GetBrandSmsProviderCredentialByServiceTypeAsync (string orgId, string brandId, string serviceType, bool? withFallback = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="withFallback"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultSmsProviderCredential)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultSmsProviderCredential>> GetBrandSmsProviderCredentialByServiceTypeAsyncWithHttpInfo (string orgId, string brandId, string serviceType, bool? withFallback = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <returns>Task of RestApiArrayResultSmsProviderCredential</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultSmsProviderCredential> GetBrandSmsProviderCredentialsAsync (string orgId, string brandId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultSmsProviderCredential)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSmsProviderCredential>> GetBrandSmsProviderCredentialsAsyncWithHttpInfo (string orgId, string brandId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <returns>Task of RestApiResultSmsProviderCredential</returns>
+        System.Threading.Tasks.Task<RestApiResultSmsProviderCredential> SmsProviderCredentialDeleteAsync (string orgId, string brandId, string serviceType);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <returns>Task of ApiResponse (RestApiResultSmsProviderCredential)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultSmsProviderCredential>> SmsProviderCredentialDeleteAsyncWithHttpInfo (string orgId, string brandId, string serviceType);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="credential"></param>
+        /// <returns>Task of RestApiResultSmsProviderCredential</returns>
+        System.Threading.Tasks.Task<RestApiResultSmsProviderCredential> SmsProviderCredentialUpdateAsync (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="credential"></param>
+        /// <returns>Task of ApiResponse (RestApiResultSmsProviderCredential)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultSmsProviderCredential>> SmsProviderCredentialUpdateAsyncWithHttpInfo (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="credentials"></param>
+        /// <returns>Task of RestApiArrayResultSmsProviderCredential</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultSmsProviderCredential> SmsProviderCredentialsBulkUpsertAsync (List<SmsProviderCredential> credentials);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="credentials"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultSmsProviderCredential)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSmsProviderCredential>> SmsProviderCredentialsBulkUpsertAsyncWithHttpInfo (List<SmsProviderCredential> credentials);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class SmsProviderCredentialsApi : ISmsProviderCredentialsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SmsProviderCredentialsApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public SmsProviderCredentialsApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SmsProviderCredentialsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public SmsProviderCredentialsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="withFallback"> (optional)</param>
+        /// <returns>RestApiResultSmsProviderCredential</returns>
+        public RestApiResultSmsProviderCredential GetBrandSmsProviderCredentialByServiceType (string orgId, string brandId, string serviceType, bool? withFallback = null)
+        {
+             ApiResponse<RestApiResultSmsProviderCredential> localVarResponse = GetBrandSmsProviderCredentialByServiceTypeWithHttpInfo(orgId, brandId, serviceType, withFallback);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="withFallback"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultSmsProviderCredential</returns>
+        public ApiResponse< RestApiResultSmsProviderCredential > GetBrandSmsProviderCredentialByServiceTypeWithHttpInfo (string orgId, string brandId, string serviceType, bool? withFallback = null)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentialByServiceType");
+            // verify the required parameter 'brandId' is set
+            if (brandId == null)
+                throw new ApiException(400, "Missing required parameter 'brandId' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentialByServiceType");
+            // verify the required parameter 'serviceType' is set
+            if (serviceType == null)
+                throw new ApiException(400, "Missing required parameter 'serviceType' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentialByServiceType");
+
+            var localVarPath = "./api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+            if (brandId != null) localVarPathParams.Add("brandId", this.Configuration.ApiClient.ParameterToString(brandId)); // path parameter
+            if (serviceType != null) localVarPathParams.Add("serviceType", this.Configuration.ApiClient.ParameterToString(serviceType)); // path parameter
+            if (withFallback != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "withFallback", withFallback)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetBrandSmsProviderCredentialByServiceType", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="withFallback"> (optional)</param>
+        /// <returns>Task of RestApiResultSmsProviderCredential</returns>
+        public async System.Threading.Tasks.Task<RestApiResultSmsProviderCredential> GetBrandSmsProviderCredentialByServiceTypeAsync (string orgId, string brandId, string serviceType, bool? withFallback = null)
+        {
+             ApiResponse<RestApiResultSmsProviderCredential> localVarResponse = await GetBrandSmsProviderCredentialByServiceTypeAsyncWithHttpInfo(orgId, brandId, serviceType, withFallback);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="withFallback"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultSmsProviderCredential)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSmsProviderCredential>> GetBrandSmsProviderCredentialByServiceTypeAsyncWithHttpInfo (string orgId, string brandId, string serviceType, bool? withFallback = null)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentialByServiceType");
+            // verify the required parameter 'brandId' is set
+            if (brandId == null)
+                throw new ApiException(400, "Missing required parameter 'brandId' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentialByServiceType");
+            // verify the required parameter 'serviceType' is set
+            if (serviceType == null)
+                throw new ApiException(400, "Missing required parameter 'serviceType' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentialByServiceType");
+
+            var localVarPath = "./api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+            if (brandId != null) localVarPathParams.Add("brandId", this.Configuration.ApiClient.ParameterToString(brandId)); // path parameter
+            if (serviceType != null) localVarPathParams.Add("serviceType", this.Configuration.ApiClient.ParameterToString(serviceType)); // path parameter
+            if (withFallback != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "withFallback", withFallback)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetBrandSmsProviderCredentialByServiceType", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <returns>RestApiArrayResultSmsProviderCredential</returns>
+        public RestApiArrayResultSmsProviderCredential GetBrandSmsProviderCredentials (string orgId, string brandId)
+        {
+             ApiResponse<RestApiArrayResultSmsProviderCredential> localVarResponse = GetBrandSmsProviderCredentialsWithHttpInfo(orgId, brandId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultSmsProviderCredential</returns>
+        public ApiResponse< RestApiArrayResultSmsProviderCredential > GetBrandSmsProviderCredentialsWithHttpInfo (string orgId, string brandId)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentials");
+            // verify the required parameter 'brandId' is set
+            if (brandId == null)
+                throw new ApiException(400, "Missing required parameter 'brandId' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentials");
+
+            var localVarPath = "./api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+            if (brandId != null) localVarPathParams.Add("brandId", this.Configuration.ApiClient.ParameterToString(brandId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetBrandSmsProviderCredentials", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <returns>Task of RestApiArrayResultSmsProviderCredential</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultSmsProviderCredential> GetBrandSmsProviderCredentialsAsync (string orgId, string brandId)
+        {
+             ApiResponse<RestApiArrayResultSmsProviderCredential> localVarResponse = await GetBrandSmsProviderCredentialsAsyncWithHttpInfo(orgId, brandId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultSmsProviderCredential)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSmsProviderCredential>> GetBrandSmsProviderCredentialsAsyncWithHttpInfo (string orgId, string brandId)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentials");
+            // verify the required parameter 'brandId' is set
+            if (brandId == null)
+                throw new ApiException(400, "Missing required parameter 'brandId' when calling SmsProviderCredentialsApi->GetBrandSmsProviderCredentials");
+
+            var localVarPath = "./api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+            if (brandId != null) localVarPathParams.Add("brandId", this.Configuration.ApiClient.ParameterToString(brandId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetBrandSmsProviderCredentials", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <returns>RestApiResultSmsProviderCredential</returns>
+        public RestApiResultSmsProviderCredential SmsProviderCredentialDelete (string orgId, string brandId, string serviceType)
+        {
+             ApiResponse<RestApiResultSmsProviderCredential> localVarResponse = SmsProviderCredentialDeleteWithHttpInfo(orgId, brandId, serviceType);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <returns>ApiResponse of RestApiResultSmsProviderCredential</returns>
+        public ApiResponse< RestApiResultSmsProviderCredential > SmsProviderCredentialDeleteWithHttpInfo (string orgId, string brandId, string serviceType)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling SmsProviderCredentialsApi->SmsProviderCredentialDelete");
+            // verify the required parameter 'brandId' is set
+            if (brandId == null)
+                throw new ApiException(400, "Missing required parameter 'brandId' when calling SmsProviderCredentialsApi->SmsProviderCredentialDelete");
+            // verify the required parameter 'serviceType' is set
+            if (serviceType == null)
+                throw new ApiException(400, "Missing required parameter 'serviceType' when calling SmsProviderCredentialsApi->SmsProviderCredentialDelete");
+
+            var localVarPath = "./api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+            if (brandId != null) localVarPathParams.Add("brandId", this.Configuration.ApiClient.ParameterToString(brandId)); // path parameter
+            if (serviceType != null) localVarPathParams.Add("serviceType", this.Configuration.ApiClient.ParameterToString(serviceType)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SmsProviderCredentialDelete", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <returns>Task of RestApiResultSmsProviderCredential</returns>
+        public async System.Threading.Tasks.Task<RestApiResultSmsProviderCredential> SmsProviderCredentialDeleteAsync (string orgId, string brandId, string serviceType)
+        {
+             ApiResponse<RestApiResultSmsProviderCredential> localVarResponse = await SmsProviderCredentialDeleteAsyncWithHttpInfo(orgId, brandId, serviceType);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <returns>Task of ApiResponse (RestApiResultSmsProviderCredential)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSmsProviderCredential>> SmsProviderCredentialDeleteAsyncWithHttpInfo (string orgId, string brandId, string serviceType)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling SmsProviderCredentialsApi->SmsProviderCredentialDelete");
+            // verify the required parameter 'brandId' is set
+            if (brandId == null)
+                throw new ApiException(400, "Missing required parameter 'brandId' when calling SmsProviderCredentialsApi->SmsProviderCredentialDelete");
+            // verify the required parameter 'serviceType' is set
+            if (serviceType == null)
+                throw new ApiException(400, "Missing required parameter 'serviceType' when calling SmsProviderCredentialsApi->SmsProviderCredentialDelete");
+
+            var localVarPath = "./api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+            if (brandId != null) localVarPathParams.Add("brandId", this.Configuration.ApiClient.ParameterToString(brandId)); // path parameter
+            if (serviceType != null) localVarPathParams.Add("serviceType", this.Configuration.ApiClient.ParameterToString(serviceType)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SmsProviderCredentialDelete", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="credential"></param>
+        /// <returns>RestApiResultSmsProviderCredential</returns>
+        public RestApiResultSmsProviderCredential SmsProviderCredentialUpdate (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential)
+        {
+             ApiResponse<RestApiResultSmsProviderCredential> localVarResponse = SmsProviderCredentialUpdateWithHttpInfo(orgId, brandId, serviceType, credential);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="credential"></param>
+        /// <returns>ApiResponse of RestApiResultSmsProviderCredential</returns>
+        public ApiResponse< RestApiResultSmsProviderCredential > SmsProviderCredentialUpdateWithHttpInfo (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling SmsProviderCredentialsApi->SmsProviderCredentialUpdate");
+            // verify the required parameter 'brandId' is set
+            if (brandId == null)
+                throw new ApiException(400, "Missing required parameter 'brandId' when calling SmsProviderCredentialsApi->SmsProviderCredentialUpdate");
+            // verify the required parameter 'serviceType' is set
+            if (serviceType == null)
+                throw new ApiException(400, "Missing required parameter 'serviceType' when calling SmsProviderCredentialsApi->SmsProviderCredentialUpdate");
+            // verify the required parameter 'credential' is set
+            if (credential == null)
+                throw new ApiException(400, "Missing required parameter 'credential' when calling SmsProviderCredentialsApi->SmsProviderCredentialUpdate");
+
+            var localVarPath = "./api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+            if (brandId != null) localVarPathParams.Add("brandId", this.Configuration.ApiClient.ParameterToString(brandId)); // path parameter
+            if (serviceType != null) localVarPathParams.Add("serviceType", this.Configuration.ApiClient.ParameterToString(serviceType)); // path parameter
+            if (credential != null && credential.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(credential); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = credential; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SmsProviderCredentialUpdate", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="credential"></param>
+        /// <returns>Task of RestApiResultSmsProviderCredential</returns>
+        public async System.Threading.Tasks.Task<RestApiResultSmsProviderCredential> SmsProviderCredentialUpdateAsync (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential)
+        {
+             ApiResponse<RestApiResultSmsProviderCredential> localVarResponse = await SmsProviderCredentialUpdateAsyncWithHttpInfo(orgId, brandId, serviceType, credential);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="orgId"></param>
+        /// <param name="brandId"></param>
+        /// <param name="serviceType"></param>
+        /// <param name="credential"></param>
+        /// <returns>Task of ApiResponse (RestApiResultSmsProviderCredential)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSmsProviderCredential>> SmsProviderCredentialUpdateAsyncWithHttpInfo (string orgId, string brandId, string serviceType, SmsProviderCredentialUpdateRequest credential)
+        {
+            // verify the required parameter 'orgId' is set
+            if (orgId == null)
+                throw new ApiException(400, "Missing required parameter 'orgId' when calling SmsProviderCredentialsApi->SmsProviderCredentialUpdate");
+            // verify the required parameter 'brandId' is set
+            if (brandId == null)
+                throw new ApiException(400, "Missing required parameter 'brandId' when calling SmsProviderCredentialsApi->SmsProviderCredentialUpdate");
+            // verify the required parameter 'serviceType' is set
+            if (serviceType == null)
+                throw new ApiException(400, "Missing required parameter 'serviceType' when calling SmsProviderCredentialsApi->SmsProviderCredentialUpdate");
+            // verify the required parameter 'credential' is set
+            if (credential == null)
+                throw new ApiException(400, "Missing required parameter 'credential' when calling SmsProviderCredentialsApi->SmsProviderCredentialUpdate");
+
+            var localVarPath = "./api/v1.0/sms-providers/orgs/{orgId}/brands/{brandId}/provider-credentials/{serviceType}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (orgId != null) localVarPathParams.Add("orgId", this.Configuration.ApiClient.ParameterToString(orgId)); // path parameter
+            if (brandId != null) localVarPathParams.Add("brandId", this.Configuration.ApiClient.ParameterToString(brandId)); // path parameter
+            if (serviceType != null) localVarPathParams.Add("serviceType", this.Configuration.ApiClient.ParameterToString(serviceType)); // path parameter
+            if (credential != null && credential.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(credential); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = credential; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SmsProviderCredentialUpdate", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="credentials"></param>
+        /// <returns>RestApiArrayResultSmsProviderCredential</returns>
+        public RestApiArrayResultSmsProviderCredential SmsProviderCredentialsBulkUpsert (List<SmsProviderCredential> credentials)
+        {
+             ApiResponse<RestApiArrayResultSmsProviderCredential> localVarResponse = SmsProviderCredentialsBulkUpsertWithHttpInfo(credentials);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="credentials"></param>
+        /// <returns>ApiResponse of RestApiArrayResultSmsProviderCredential</returns>
+        public ApiResponse< RestApiArrayResultSmsProviderCredential > SmsProviderCredentialsBulkUpsertWithHttpInfo (List<SmsProviderCredential> credentials)
+        {
+            // verify the required parameter 'credentials' is set
+            if (credentials == null)
+                throw new ApiException(400, "Missing required parameter 'credentials' when calling SmsProviderCredentialsApi->SmsProviderCredentialsBulkUpsert");
+
+            var localVarPath = "./api/v1.0/sms-providers/bulk-upsert";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (credentials != null && credentials.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(credentials); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = credentials; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SmsProviderCredentialsBulkUpsert", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSmsProviderCredential)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="credentials"></param>
+        /// <returns>Task of RestApiArrayResultSmsProviderCredential</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultSmsProviderCredential> SmsProviderCredentialsBulkUpsertAsync (List<SmsProviderCredential> credentials)
+        {
+             ApiResponse<RestApiArrayResultSmsProviderCredential> localVarResponse = await SmsProviderCredentialsBulkUpsertAsyncWithHttpInfo(credentials);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="credentials"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultSmsProviderCredential)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSmsProviderCredential>> SmsProviderCredentialsBulkUpsertAsyncWithHttpInfo (List<SmsProviderCredential> credentials)
+        {
+            // verify the required parameter 'credentials' is set
+            if (credentials == null)
+                throw new ApiException(400, "Missing required parameter 'credentials' when calling SmsProviderCredentialsApi->SmsProviderCredentialsBulkUpsert");
+
+            var localVarPath = "./api/v1.0/sms-providers/bulk-upsert";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (credentials != null && credentials.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(credentials); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = credentials; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SmsProviderCredentialsBulkUpsert", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultSmsProviderCredential>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultSmsProviderCredential) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSmsProviderCredential)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/StoreGroupsApi.cs b/src/Flipdish/Api/StoreGroupsApi.cs
index 5ca3b376..f0c1df97 100644
--- a/src/Flipdish/Api/StoreGroupsApi.cs
+++ b/src/Flipdish/Api/StoreGroupsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,293 +25,389 @@ public interface IStoreGroupsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Creates a Store Group  It will be attached to an existing App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="storeGroup">Store group definition</param>
+        /// <param name="appId"></param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeIds"></param>
+        /// <returns></returns>
+        void AssignStoresToStoreGroup (string appId, int? storeGroupId, List<int?> storeIds);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeIds"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> AssignStoresToStoreGroupWithHttpInfo (string appId, int? storeGroupId, List<int?> storeIds);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appNameId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>RestApiResultStoreGroup</returns>
         RestApiResultStoreGroup CreateStoreGroup (string appNameId, StoreGroupBase storeGroup);
 
         /// <summary>
-        /// Creates a Store Group  It will be attached to an existing App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="storeGroup">Store group definition</param>
+        /// <param name="appNameId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>ApiResponse of RestApiResultStoreGroup</returns>
         ApiResponse<RestApiResultStoreGroup> CreateStoreGroupWithHttpInfo (string appNameId, StoreGroupBase storeGroup);
         /// <summary>
-        /// Returns a Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>RestApiResultStoreGroup</returns>
         RestApiResultStoreGroup GetStoreGroup (int? storeGroupId);
 
         /// <summary>
-        /// Returns a Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>ApiResponse of RestApiResultStoreGroup</returns>
         ApiResponse<RestApiResultStoreGroup> GetStoreGroupWithHttpInfo (int? storeGroupId);
         /// <summary>
-        /// Returns a paginated list of Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultStoreGroup</returns>
         RestApiPaginationResultStoreGroup GetStoreGroups (string appNameId, string searchQuery = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Returns a paginated list of Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultStoreGroup</returns>
         ApiResponse<RestApiPaginationResultStoreGroup> GetStoreGroupsWithHttpInfo (string appNameId, string searchQuery = null, int? page = null, int? limit = null);
         /// <summary>
-        /// [PRIVATE API] Returns a paginated list of Extended Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="groupingRadius"> (optional)</param>
         /// <returns>RestApiPaginationResultStoreGroupExtended</returns>
         RestApiPaginationResultStoreGroupExtended GetStoreGroupsExtended (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null);
 
         /// <summary>
-        /// [PRIVATE API] Returns a paginated list of Extended Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="groupingRadius"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultStoreGroupExtended</returns>
         ApiResponse<RestApiPaginationResultStoreGroupExtended> GetStoreGroupsExtendedWithHttpInfo (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null);
         /// <summary>
-        /// Deletes a Store Group  Can only remove a store group if there is no stores attached to the group
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns></returns>
         void RemoveStoreGroup (int? storeGroupId);
 
         /// <summary>
-        /// Deletes a Store Group  Can only remove a store group if there is no stores attached to the group
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> RemoveStoreGroupWithHttpInfo (int? storeGroupId);
         /// <summary>
-        /// Updates Store Group
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="customerMessages"></param>
+        /// <returns></returns>
+        void SetCustomerMessages (int? storeGroupId, CustomerMessages customerMessages);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="customerMessages"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SetCustomerMessagesWithHttpInfo (int? storeGroupId, CustomerMessages customerMessages);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
-        /// <param name="storeGroup">Store Group Delta</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>RestApiResultStoreGroupBase</returns>
         RestApiResultStoreGroupBase UpdateStoreGroup (int? storeGroupId, StoreGroupBase storeGroup);
 
         /// <summary>
-        /// Updates Store Group
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
-        /// <param name="storeGroup">Store Group Delta</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>ApiResponse of RestApiResultStoreGroupBase</returns>
         ApiResponse<RestApiResultStoreGroupBase> UpdateStoreGroupWithHttpInfo (int? storeGroupId, StoreGroupBase storeGroup);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Creates a Store Group  It will be attached to an existing App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="storeGroup">Store group definition</param>
+        /// <param name="appId"></param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeIds"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task AssignStoresToStoreGroupAsync (string appId, int? storeGroupId, List<int?> storeIds);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeIds"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> AssignStoresToStoreGroupAsyncWithHttpInfo (string appId, int? storeGroupId, List<int?> storeIds);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appNameId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>Task of RestApiResultStoreGroup</returns>
         System.Threading.Tasks.Task<RestApiResultStoreGroup> CreateStoreGroupAsync (string appNameId, StoreGroupBase storeGroup);
 
         /// <summary>
-        /// Creates a Store Group  It will be attached to an existing App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="storeGroup">Store group definition</param>
+        /// <param name="appNameId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreGroup)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroup>> CreateStoreGroupAsyncWithHttpInfo (string appNameId, StoreGroupBase storeGroup);
         /// <summary>
-        /// Returns a Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>Task of RestApiResultStoreGroup</returns>
         System.Threading.Tasks.Task<RestApiResultStoreGroup> GetStoreGroupAsync (int? storeGroupId);
 
         /// <summary>
-        /// Returns a Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreGroup)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroup>> GetStoreGroupAsyncWithHttpInfo (int? storeGroupId);
         /// <summary>
-        /// Returns a paginated list of Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultStoreGroup</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultStoreGroup> GetStoreGroupsAsync (string appNameId, string searchQuery = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Returns a paginated list of Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultStoreGroup)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreGroup>> GetStoreGroupsAsyncWithHttpInfo (string appNameId, string searchQuery = null, int? page = null, int? limit = null);
         /// <summary>
-        /// [PRIVATE API] Returns a paginated list of Extended Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="groupingRadius"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultStoreGroupExtended</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultStoreGroupExtended> GetStoreGroupsExtendedAsync (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null);
 
         /// <summary>
-        /// [PRIVATE API] Returns a paginated list of Extended Store Groups
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="groupingRadius"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultStoreGroupExtended)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreGroupExtended>> GetStoreGroupsExtendedAsyncWithHttpInfo (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null);
         /// <summary>
-        /// Deletes a Store Group  Can only remove a store group if there is no stores attached to the group
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task RemoveStoreGroupAsync (int? storeGroupId);
 
         /// <summary>
-        /// Deletes a Store Group  Can only remove a store group if there is no stores attached to the group
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> RemoveStoreGroupAsyncWithHttpInfo (int? storeGroupId);
         /// <summary>
-        /// Updates Store Group
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="customerMessages"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SetCustomerMessagesAsync (int? storeGroupId, CustomerMessages customerMessages);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="customerMessages"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetCustomerMessagesAsyncWithHttpInfo (int? storeGroupId, CustomerMessages customerMessages);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
-        /// <param name="storeGroup">Store Group Delta</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>Task of RestApiResultStoreGroupBase</returns>
         System.Threading.Tasks.Task<RestApiResultStoreGroupBase> UpdateStoreGroupAsync (int? storeGroupId, StoreGroupBase storeGroup);
 
         /// <summary>
-        /// Updates Store Group
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
-        /// <param name="storeGroup">Store Group Delta</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreGroupBase)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroupBase>> UpdateStoreGroupAsyncWithHttpInfo (int? storeGroupId, StoreGroupBase storeGroup);
         #endregion Asynchronous Operations
@@ -415,11 +511,208 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Creates a Store Group  It will be attached to an existing App 
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeIds"></param>
+        /// <returns></returns>
+        public void AssignStoresToStoreGroup (string appId, int? storeGroupId, List<int?> storeIds)
+        {
+             AssignStoresToStoreGroupWithHttpInfo(appId, storeGroupId, storeIds);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeIds"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> AssignStoresToStoreGroupWithHttpInfo (string appId, int? storeGroupId, List<int?> storeIds)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoreGroupsApi->AssignStoresToStoreGroup");
+            // verify the required parameter 'storeGroupId' is set
+            if (storeGroupId == null)
+                throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoreGroupsApi->AssignStoresToStoreGroup");
+            // verify the required parameter 'storeIds' is set
+            if (storeIds == null)
+                throw new ApiException(400, "Missing required parameter 'storeIds' when calling StoreGroupsApi->AssignStoresToStoreGroup");
+
+            var localVarPath = "./api/v1.0/{appId}/storegroups/{storeGroupId}/assignStores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeGroupId != null) localVarPathParams.Add("storeGroupId", this.Configuration.ApiClient.ParameterToString(storeGroupId)); // path parameter
+            if (storeIds != null && storeIds.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(storeIds); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = storeIds; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AssignStoresToStoreGroup", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeIds"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task AssignStoresToStoreGroupAsync (string appId, int? storeGroupId, List<int?> storeIds)
+        {
+             await AssignStoresToStoreGroupAsyncWithHttpInfo(appId, storeGroupId, storeIds);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeIds"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> AssignStoresToStoreGroupAsyncWithHttpInfo (string appId, int? storeGroupId, List<int?> storeIds)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoreGroupsApi->AssignStoresToStoreGroup");
+            // verify the required parameter 'storeGroupId' is set
+            if (storeGroupId == null)
+                throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoreGroupsApi->AssignStoresToStoreGroup");
+            // verify the required parameter 'storeIds' is set
+            if (storeIds == null)
+                throw new ApiException(400, "Missing required parameter 'storeIds' when calling StoreGroupsApi->AssignStoresToStoreGroup");
+
+            var localVarPath = "./api/v1.0/{appId}/storegroups/{storeGroupId}/assignStores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeGroupId != null) localVarPathParams.Add("storeGroupId", this.Configuration.ApiClient.ParameterToString(storeGroupId)); // path parameter
+            if (storeIds != null && storeIds.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(storeIds); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = storeIds; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AssignStoresToStoreGroup", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="storeGroup">Store group definition</param>
+        /// <param name="appNameId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>RestApiResultStoreGroup</returns>
         public RestApiResultStoreGroup CreateStoreGroup (string appNameId, StoreGroupBase storeGroup)
         {
@@ -428,11 +721,11 @@ public RestApiResultStoreGroup CreateStoreGroup (string appNameId, StoreGroupBas
         }
 
         /// <summary>
-        /// Creates a Store Group  It will be attached to an existing App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="storeGroup">Store group definition</param>
+        /// <param name="appNameId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>ApiResponse of RestApiResultStoreGroup</returns>
         public ApiResponse< RestApiResultStoreGroup > CreateStoreGroupWithHttpInfo (string appNameId, StoreGroupBase storeGroup)
         {
@@ -443,7 +736,7 @@ public ApiResponse< RestApiResultStoreGroup > CreateStoreGroupWithHttpInfo (stri
             if (storeGroup == null)
                 throw new ApiException(400, "Missing required parameter 'storeGroup' when calling StoreGroupsApi->CreateStoreGroup");
 
-            var localVarPath = "/api/v1.0/{appNameId}/storegroups";
+            var localVarPath = "./api/v1.0/{appNameId}/storegroups";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -503,16 +796,16 @@ public ApiResponse< RestApiResultStoreGroup > CreateStoreGroupWithHttpInfo (stri
             }
 
             return new ApiResponse<RestApiResultStoreGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreGroup)));
         }
 
         /// <summary>
-        /// Creates a Store Group  It will be attached to an existing App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="storeGroup">Store group definition</param>
+        /// <param name="appNameId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>Task of RestApiResultStoreGroup</returns>
         public async System.Threading.Tasks.Task<RestApiResultStoreGroup> CreateStoreGroupAsync (string appNameId, StoreGroupBase storeGroup)
         {
@@ -522,11 +815,11 @@ public async System.Threading.Tasks.Task<RestApiResultStoreGroup> CreateStoreGro
         }
 
         /// <summary>
-        /// Creates a Store Group  It will be attached to an existing App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="storeGroup">Store group definition</param>
+        /// <param name="appNameId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreGroup)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroup>> CreateStoreGroupAsyncWithHttpInfo (string appNameId, StoreGroupBase storeGroup)
         {
@@ -537,7 +830,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroup>> C
             if (storeGroup == null)
                 throw new ApiException(400, "Missing required parameter 'storeGroup' when calling StoreGroupsApi->CreateStoreGroup");
 
-            var localVarPath = "/api/v1.0/{appNameId}/storegroups";
+            var localVarPath = "./api/v1.0/{appNameId}/storegroups";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -597,15 +890,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroup>> C
             }
 
             return new ApiResponse<RestApiResultStoreGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreGroup)));
         }
 
         /// <summary>
-        /// Returns a Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>RestApiResultStoreGroup</returns>
         public RestApiResultStoreGroup GetStoreGroup (int? storeGroupId)
         {
@@ -614,10 +907,10 @@ public RestApiResultStoreGroup GetStoreGroup (int? storeGroupId)
         }
 
         /// <summary>
-        /// Returns a Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>ApiResponse of RestApiResultStoreGroup</returns>
         public ApiResponse< RestApiResultStoreGroup > GetStoreGroupWithHttpInfo (int? storeGroupId)
         {
@@ -625,7 +918,7 @@ public ApiResponse< RestApiResultStoreGroup > GetStoreGroupWithHttpInfo (int? st
             if (storeGroupId == null)
                 throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoreGroupsApi->GetStoreGroup");
 
-            var localVarPath = "/api/v1.0/storegroups/{storeGroupId}";
+            var localVarPath = "./api/v1.0/storegroups/{storeGroupId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -672,15 +965,15 @@ public ApiResponse< RestApiResultStoreGroup > GetStoreGroupWithHttpInfo (int? st
             }
 
             return new ApiResponse<RestApiResultStoreGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreGroup)));
         }
 
         /// <summary>
-        /// Returns a Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>Task of RestApiResultStoreGroup</returns>
         public async System.Threading.Tasks.Task<RestApiResultStoreGroup> GetStoreGroupAsync (int? storeGroupId)
         {
@@ -690,10 +983,10 @@ public async System.Threading.Tasks.Task<RestApiResultStoreGroup> GetStoreGroupA
         }
 
         /// <summary>
-        /// Returns a Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreGroup)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroup>> GetStoreGroupAsyncWithHttpInfo (int? storeGroupId)
         {
@@ -701,7 +994,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroup>> G
             if (storeGroupId == null)
                 throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoreGroupsApi->GetStoreGroup");
 
-            var localVarPath = "/api/v1.0/storegroups/{storeGroupId}";
+            var localVarPath = "./api/v1.0/storegroups/{storeGroupId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -748,18 +1041,18 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroup>> G
             }
 
             return new ApiResponse<RestApiResultStoreGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreGroup)));
         }
 
         /// <summary>
-        /// Returns a paginated list of Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultStoreGroup</returns>
         public RestApiPaginationResultStoreGroup GetStoreGroups (string appNameId, string searchQuery = null, int? page = null, int? limit = null)
         {
@@ -768,13 +1061,13 @@ public RestApiPaginationResultStoreGroup GetStoreGroups (string appNameId, strin
         }
 
         /// <summary>
-        /// Returns a paginated list of Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultStoreGroup</returns>
         public ApiResponse< RestApiPaginationResultStoreGroup > GetStoreGroupsWithHttpInfo (string appNameId, string searchQuery = null, int? page = null, int? limit = null)
         {
@@ -782,7 +1075,7 @@ public ApiResponse< RestApiPaginationResultStoreGroup > GetStoreGroupsWithHttpIn
             if (appNameId == null)
                 throw new ApiException(400, "Missing required parameter 'appNameId' when calling StoreGroupsApi->GetStoreGroups");
 
-            var localVarPath = "/api/v1.0/{appNameId}/storegroups";
+            var localVarPath = "./api/v1.0/{appNameId}/storegroups";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -832,18 +1125,18 @@ public ApiResponse< RestApiPaginationResultStoreGroup > GetStoreGroupsWithHttpIn
             }
 
             return new ApiResponse<RestApiPaginationResultStoreGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultStoreGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreGroup)));
         }
 
         /// <summary>
-        /// Returns a paginated list of Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultStoreGroup</returns>
         public async System.Threading.Tasks.Task<RestApiPaginationResultStoreGroup> GetStoreGroupsAsync (string appNameId, string searchQuery = null, int? page = null, int? limit = null)
         {
@@ -853,13 +1146,13 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultStoreGroup> GetS
         }
 
         /// <summary>
-        /// Returns a paginated list of Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultStoreGroup)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreGroup>> GetStoreGroupsAsyncWithHttpInfo (string appNameId, string searchQuery = null, int? page = null, int? limit = null)
         {
@@ -867,7 +1160,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
             if (appNameId == null)
                 throw new ApiException(400, "Missing required parameter 'appNameId' when calling StoreGroupsApi->GetStoreGroups");
 
-            var localVarPath = "/api/v1.0/{appNameId}/storegroups";
+            var localVarPath = "./api/v1.0/{appNameId}/storegroups";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -917,18 +1210,18 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
             }
 
             return new ApiResponse<RestApiPaginationResultStoreGroup>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultStoreGroup) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreGroup)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Returns a paginated list of Extended Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="groupingRadius"> (optional)</param>
         /// <returns>RestApiPaginationResultStoreGroupExtended</returns>
         public RestApiPaginationResultStoreGroupExtended GetStoreGroupsExtended (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null)
@@ -938,13 +1231,13 @@ public RestApiPaginationResultStoreGroupExtended GetStoreGroupsExtended (string
         }
 
         /// <summary>
-        /// [PRIVATE API] Returns a paginated list of Extended Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="groupingRadius"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultStoreGroupExtended</returns>
         public ApiResponse< RestApiPaginationResultStoreGroupExtended > GetStoreGroupsExtendedWithHttpInfo (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null)
@@ -953,7 +1246,7 @@ public ApiResponse< RestApiPaginationResultStoreGroupExtended > GetStoreGroupsEx
             if (appNameId == null)
                 throw new ApiException(400, "Missing required parameter 'appNameId' when calling StoreGroupsApi->GetStoreGroupsExtended");
 
-            var localVarPath = "/api/v1.0/{appNameId}/storegroups/extended";
+            var localVarPath = "./api/v1.0/{appNameId}/storegroups/extended";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1004,18 +1297,18 @@ public ApiResponse< RestApiPaginationResultStoreGroupExtended > GetStoreGroupsEx
             }
 
             return new ApiResponse<RestApiPaginationResultStoreGroupExtended>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultStoreGroupExtended) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreGroupExtended)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Returns a paginated list of Extended Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="groupingRadius"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultStoreGroupExtended</returns>
         public async System.Threading.Tasks.Task<RestApiPaginationResultStoreGroupExtended> GetStoreGroupsExtendedAsync (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null)
@@ -1026,13 +1319,13 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultStoreGroupExtend
         }
 
         /// <summary>
-        /// [PRIVATE API] Returns a paginated list of Extended Store Groups 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appNameId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appNameId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <param name="groupingRadius"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultStoreGroupExtended)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreGroupExtended>> GetStoreGroupsExtendedAsyncWithHttpInfo (string appNameId, string searchQuery = null, int? page = null, int? limit = null, int? groupingRadius = null)
@@ -1041,7 +1334,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
             if (appNameId == null)
                 throw new ApiException(400, "Missing required parameter 'appNameId' when calling StoreGroupsApi->GetStoreGroupsExtended");
 
-            var localVarPath = "/api/v1.0/{appNameId}/storegroups/extended";
+            var localVarPath = "./api/v1.0/{appNameId}/storegroups/extended";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1092,15 +1385,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
             }
 
             return new ApiResponse<RestApiPaginationResultStoreGroupExtended>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultStoreGroupExtended) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreGroupExtended)));
         }
 
         /// <summary>
-        /// Deletes a Store Group  Can only remove a store group if there is no stores attached to the group 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns></returns>
         public void RemoveStoreGroup (int? storeGroupId)
         {
@@ -1108,10 +1401,10 @@ public void RemoveStoreGroup (int? storeGroupId)
         }
 
         /// <summary>
-        /// Deletes a Store Group  Can only remove a store group if there is no stores attached to the group 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> RemoveStoreGroupWithHttpInfo (int? storeGroupId)
         {
@@ -1119,7 +1412,7 @@ public ApiResponse<Object> RemoveStoreGroupWithHttpInfo (int? storeGroupId)
             if (storeGroupId == null)
                 throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoreGroupsApi->RemoveStoreGroup");
 
-            var localVarPath = "/api/v1.0/storegroups/{storeGroupId}";
+            var localVarPath = "./api/v1.0/storegroups/{storeGroupId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1166,15 +1459,15 @@ public ApiResponse<Object> RemoveStoreGroupWithHttpInfo (int? storeGroupId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Deletes a Store Group  Can only remove a store group if there is no stores attached to the group 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task RemoveStoreGroupAsync (int? storeGroupId)
         {
@@ -1183,10 +1476,10 @@ public async System.Threading.Tasks.Task RemoveStoreGroupAsync (int? storeGroupI
         }
 
         /// <summary>
-        /// Deletes a Store Group  Can only remove a store group if there is no stores attached to the group 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
+        /// <param name="storeGroupId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveStoreGroupAsyncWithHttpInfo (int? storeGroupId)
         {
@@ -1194,7 +1487,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveStoreGroupAs
             if (storeGroupId == null)
                 throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoreGroupsApi->RemoveStoreGroup");
 
-            var localVarPath = "/api/v1.0/storegroups/{storeGroupId}";
+            var localVarPath = "./api/v1.0/storegroups/{storeGroupId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1241,16 +1534,201 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> RemoveStoreGroupAs
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="customerMessages"></param>
+        /// <returns></returns>
+        public void SetCustomerMessages (int? storeGroupId, CustomerMessages customerMessages)
+        {
+             SetCustomerMessagesWithHttpInfo(storeGroupId, customerMessages);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="customerMessages"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetCustomerMessagesWithHttpInfo (int? storeGroupId, CustomerMessages customerMessages)
+        {
+            // verify the required parameter 'storeGroupId' is set
+            if (storeGroupId == null)
+                throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoreGroupsApi->SetCustomerMessages");
+            // verify the required parameter 'customerMessages' is set
+            if (customerMessages == null)
+                throw new ApiException(400, "Missing required parameter 'customerMessages' when calling StoreGroupsApi->SetCustomerMessages");
+
+            var localVarPath = "./api/v1.0/storegroups/{storeGroupId}/CustomerMessages";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeGroupId != null) localVarPathParams.Add("storeGroupId", this.Configuration.ApiClient.ParameterToString(storeGroupId)); // path parameter
+            if (customerMessages != null && customerMessages.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(customerMessages); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = customerMessages; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetCustomerMessages", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="customerMessages"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetCustomerMessagesAsync (int? storeGroupId, CustomerMessages customerMessages)
+        {
+             await SetCustomerMessagesAsyncWithHttpInfo(storeGroupId, customerMessages);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="customerMessages"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetCustomerMessagesAsyncWithHttpInfo (int? storeGroupId, CustomerMessages customerMessages)
+        {
+            // verify the required parameter 'storeGroupId' is set
+            if (storeGroupId == null)
+                throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoreGroupsApi->SetCustomerMessages");
+            // verify the required parameter 'customerMessages' is set
+            if (customerMessages == null)
+                throw new ApiException(400, "Missing required parameter 'customerMessages' when calling StoreGroupsApi->SetCustomerMessages");
+
+            var localVarPath = "./api/v1.0/storegroups/{storeGroupId}/CustomerMessages";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeGroupId != null) localVarPathParams.Add("storeGroupId", this.Configuration.ApiClient.ParameterToString(storeGroupId)); // path parameter
+            if (customerMessages != null && customerMessages.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(customerMessages); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = customerMessages; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetCustomerMessages", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Updates Store Group 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
-        /// <param name="storeGroup">Store Group Delta</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>RestApiResultStoreGroupBase</returns>
         public RestApiResultStoreGroupBase UpdateStoreGroup (int? storeGroupId, StoreGroupBase storeGroup)
         {
@@ -1259,11 +1737,11 @@ public RestApiResultStoreGroupBase UpdateStoreGroup (int? storeGroupId, StoreGro
         }
 
         /// <summary>
-        /// Updates Store Group 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
-        /// <param name="storeGroup">Store Group Delta</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>ApiResponse of RestApiResultStoreGroupBase</returns>
         public ApiResponse< RestApiResultStoreGroupBase > UpdateStoreGroupWithHttpInfo (int? storeGroupId, StoreGroupBase storeGroup)
         {
@@ -1274,7 +1752,7 @@ public ApiResponse< RestApiResultStoreGroupBase > UpdateStoreGroupWithHttpInfo (
             if (storeGroup == null)
                 throw new ApiException(400, "Missing required parameter 'storeGroup' when calling StoreGroupsApi->UpdateStoreGroup");
 
-            var localVarPath = "/api/v1.0/storegroups/{storeGroupId}";
+            var localVarPath = "./api/v1.0/storegroups/{storeGroupId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1334,16 +1812,16 @@ public ApiResponse< RestApiResultStoreGroupBase > UpdateStoreGroupWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultStoreGroupBase>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreGroupBase) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreGroupBase)));
         }
 
         /// <summary>
-        /// Updates Store Group 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
-        /// <param name="storeGroup">Store Group Delta</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>Task of RestApiResultStoreGroupBase</returns>
         public async System.Threading.Tasks.Task<RestApiResultStoreGroupBase> UpdateStoreGroupAsync (int? storeGroupId, StoreGroupBase storeGroup)
         {
@@ -1353,11 +1831,11 @@ public async System.Threading.Tasks.Task<RestApiResultStoreGroupBase> UpdateStor
         }
 
         /// <summary>
-        /// Updates Store Group 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group Id</param>
-        /// <param name="storeGroup">Store Group Delta</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="storeGroup"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreGroupBase)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroupBase>> UpdateStoreGroupAsyncWithHttpInfo (int? storeGroupId, StoreGroupBase storeGroup)
         {
@@ -1368,7 +1846,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroupBase
             if (storeGroup == null)
                 throw new ApiException(400, "Missing required parameter 'storeGroup' when calling StoreGroupsApi->UpdateStoreGroup");
 
-            var localVarPath = "/api/v1.0/storegroups/{storeGroupId}";
+            var localVarPath = "./api/v1.0/storegroups/{storeGroupId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1428,7 +1906,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreGroupBase
             }
 
             return new ApiResponse<RestApiResultStoreGroupBase>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreGroupBase) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreGroupBase)));
         }
 
diff --git a/src/Flipdish/Api/StoreOrderCapacityApi.cs b/src/Flipdish/Api/StoreOrderCapacityApi.cs
index 2e18ef52..27dfcc41 100644
--- a/src/Flipdish/Api/StoreOrderCapacityApi.cs
+++ b/src/Flipdish/Api/StoreOrderCapacityApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,108 +25,108 @@ public interface IStoreOrderCapacityApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get store&#39;s order capacity configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>RestApiResultStoreOrderCapacityConfig</returns>
         RestApiResultStoreOrderCapacityConfig GetStoreOrderCapacity (string appId, int? storeId, string deliveryType);
 
         /// <summary>
-        /// Get store&#39;s order capacity configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>ApiResponse of RestApiResultStoreOrderCapacityConfig</returns>
         ApiResponse<RestApiResultStoreOrderCapacityConfig> GetStoreOrderCapacityWithHttpInfo (string appId, int? storeId, string deliveryType);
         /// <summary>
-        /// Create or update a store&#39;s order capacity configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
-        /// <param name="newOrderCapacityConfig">new order capacity configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="newOrderCapacityConfig"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void UpdateStoreOrderCapacityConfig (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId);
 
         /// <summary>
-        /// Create or update a store&#39;s order capacity configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
-        /// <param name="newOrderCapacityConfig">new order capacity configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="newOrderCapacityConfig"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateStoreOrderCapacityConfigWithHttpInfo (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get store&#39;s order capacity configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of RestApiResultStoreOrderCapacityConfig</returns>
         System.Threading.Tasks.Task<RestApiResultStoreOrderCapacityConfig> GetStoreOrderCapacityAsync (string appId, int? storeId, string deliveryType);
 
         /// <summary>
-        /// Get store&#39;s order capacity configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreOrderCapacityConfig)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreOrderCapacityConfig>> GetStoreOrderCapacityAsyncWithHttpInfo (string appId, int? storeId, string deliveryType);
         /// <summary>
-        /// Create or update a store&#39;s order capacity configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
-        /// <param name="newOrderCapacityConfig">new order capacity configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="newOrderCapacityConfig"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateStoreOrderCapacityConfigAsync (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId);
 
         /// <summary>
-        /// Create or update a store&#39;s order capacity configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
-        /// <param name="newOrderCapacityConfig">new order capacity configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="newOrderCapacityConfig"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateStoreOrderCapacityConfigAsyncWithHttpInfo (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId);
@@ -231,12 +231,12 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get store&#39;s order capacity configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>RestApiResultStoreOrderCapacityConfig</returns>
         public RestApiResultStoreOrderCapacityConfig GetStoreOrderCapacity (string appId, int? storeId, string deliveryType)
         {
@@ -245,12 +245,12 @@ public RestApiResultStoreOrderCapacityConfig GetStoreOrderCapacity (string appId
         }
 
         /// <summary>
-        /// Get store&#39;s order capacity configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>ApiResponse of RestApiResultStoreOrderCapacityConfig</returns>
         public ApiResponse< RestApiResultStoreOrderCapacityConfig > GetStoreOrderCapacityWithHttpInfo (string appId, int? storeId, string deliveryType)
         {
@@ -264,7 +264,7 @@ public ApiResponse< RestApiResultStoreOrderCapacityConfig > GetStoreOrderCapacit
             if (deliveryType == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoreOrderCapacityApi->GetStoreOrderCapacity");
 
-            var localVarPath = "/api/v1.0/{appId}/storeordercapacity/{storeId}/{deliveryType}";
+            var localVarPath = "./api/v1.0/{appId}/storeordercapacity/{storeId}/{deliveryType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -313,17 +313,17 @@ public ApiResponse< RestApiResultStoreOrderCapacityConfig > GetStoreOrderCapacit
             }
 
             return new ApiResponse<RestApiResultStoreOrderCapacityConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreOrderCapacityConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreOrderCapacityConfig)));
         }
 
         /// <summary>
-        /// Get store&#39;s order capacity configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of RestApiResultStoreOrderCapacityConfig</returns>
         public async System.Threading.Tasks.Task<RestApiResultStoreOrderCapacityConfig> GetStoreOrderCapacityAsync (string appId, int? storeId, string deliveryType)
         {
@@ -333,12 +333,12 @@ public async System.Threading.Tasks.Task<RestApiResultStoreOrderCapacityConfig>
         }
 
         /// <summary>
-        /// Get store&#39;s order capacity configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreOrderCapacityConfig)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreOrderCapacityConfig>> GetStoreOrderCapacityAsyncWithHttpInfo (string appId, int? storeId, string deliveryType)
         {
@@ -352,7 +352,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreOrderCapa
             if (deliveryType == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoreOrderCapacityApi->GetStoreOrderCapacity");
 
-            var localVarPath = "/api/v1.0/{appId}/storeordercapacity/{storeId}/{deliveryType}";
+            var localVarPath = "./api/v1.0/{appId}/storeordercapacity/{storeId}/{deliveryType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -401,17 +401,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreOrderCapa
             }
 
             return new ApiResponse<RestApiResultStoreOrderCapacityConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreOrderCapacityConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreOrderCapacityConfig)));
         }
 
         /// <summary>
-        /// Create or update a store&#39;s order capacity configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
-        /// <param name="newOrderCapacityConfig">new order capacity configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="newOrderCapacityConfig"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void UpdateStoreOrderCapacityConfig (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId)
@@ -420,12 +420,12 @@ public void UpdateStoreOrderCapacityConfig (int? storeId, string deliveryType, S
         }
 
         /// <summary>
-        /// Create or update a store&#39;s order capacity configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
-        /// <param name="newOrderCapacityConfig">new order capacity configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="newOrderCapacityConfig"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateStoreOrderCapacityConfigWithHttpInfo (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId)
@@ -443,7 +443,7 @@ public ApiResponse<Object> UpdateStoreOrderCapacityConfigWithHttpInfo (int? stor
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling StoreOrderCapacityApi->UpdateStoreOrderCapacityConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/storeordercapacity/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/storeordercapacity/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -505,17 +505,17 @@ public ApiResponse<Object> UpdateStoreOrderCapacityConfigWithHttpInfo (int? stor
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Create or update a store&#39;s order capacity configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
-        /// <param name="newOrderCapacityConfig">new order capacity configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="newOrderCapacityConfig"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateStoreOrderCapacityConfigAsync (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId)
@@ -525,12 +525,12 @@ public async System.Threading.Tasks.Task UpdateStoreOrderCapacityConfigAsync (in
         }
 
         /// <summary>
-        /// Create or update a store&#39;s order capacity configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery / Pickup</param>
-        /// <param name="newOrderCapacityConfig">new order capacity configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="newOrderCapacityConfig"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateStoreOrderCapacityConfigAsyncWithHttpInfo (int? storeId, string deliveryType, StoreOrderCapacityConfigEditModel newOrderCapacityConfig, string appId)
@@ -548,7 +548,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateStoreOrderCa
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling StoreOrderCapacityApi->UpdateStoreOrderCapacityConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/storeordercapacity/{storeId}";
+            var localVarPath = "./api/v1.0/{appId}/storeordercapacity/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -610,7 +610,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateStoreOrderCa
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/StoresApi.cs b/src/Flipdish/Api/StoresApi.cs
index b613a389..a092671a 100644
--- a/src/Flipdish/Api/StoresApi.cs
+++ b/src/Flipdish/Api/StoresApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,143 +25,170 @@ public interface IStoresApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Archive store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns></returns>
         void ArchiveStore (int? storeId);
 
         /// <summary>
-        /// Archive store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> ArchiveStoreWithHttpInfo (int? storeId);
         /// <summary>
-        /// Assign Menu to Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="menuId">Id of Menu to assign to store</param>
+        /// <param name="storeId"></param>
+        /// <param name="menuId"></param>
         /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
         RestApiArrayResultRestApiDefaultResponse AssignMenu (int? storeId, int? menuId);
 
         /// <summary>
-        /// Assign Menu to Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="menuId">Id of Menu to assign to store</param>
+        /// <param name="storeId"></param>
+        /// <param name="menuId"></param>
         /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
         ApiResponse<RestApiArrayResultRestApiDefaultResponse> AssignMenuWithHttpInfo (int? storeId, int? menuId);
         /// <summary>
-        /// Clone store with store clone settings
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="settings">Settings for cloning the store</param>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
         /// <returns>RestApiResultStore</returns>
         RestApiResultStore CloneStore (int? storeId, StoreCloneSettings settings);
 
         /// <summary>
-        /// Clone store with store clone settings
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="settings">Settings for cloning the store</param>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
         /// <returns>ApiResponse of RestApiResultStore</returns>
         ApiResponse<RestApiResultStore> CloneStoreWithHttpInfo (int? storeId, StoreCloneSettings settings);
         /// <summary>
-        /// Configure Store Service Charge; Idempotent Operation
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="serviceCharge">Service charge</param>
+        /// <param name="storeId"></param>
+        /// <param name="serviceCharge"></param>
         /// <returns>RestApiResultServiceCharge</returns>
         RestApiResultServiceCharge ConfigureStoreServiceCharge (int? storeId, ServiceCharge serviceCharge);
 
         /// <summary>
-        /// Configure Store Service Charge; Idempotent Operation
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="serviceCharge">Service charge</param>
+        /// <param name="storeId"></param>
+        /// <param name="serviceCharge"></param>
         /// <returns>ApiResponse of RestApiResultServiceCharge</returns>
         ApiResponse<RestApiResultServiceCharge> ConfigureStoreServiceChargeWithHttpInfo (int? storeId, ServiceCharge serviceCharge);
         /// <summary>
-        /// Create Business Hours Override for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="businessHoursOverride">Business Hours Override</param>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverride"></param>
         /// <returns>RestApiResultBusinessHoursOverride</returns>
         RestApiResultBusinessHoursOverride CreateBusinessHoursOverrideByStoreId (int? storeId, BusinessHoursOverrideBase businessHoursOverride);
 
         /// <summary>
-        /// Create Business Hours Override for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="businessHoursOverride">Business Hours Override</param>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverride"></param>
         /// <returns>ApiResponse of RestApiResultBusinessHoursOverride</returns>
         ApiResponse<RestApiResultBusinessHoursOverride> CreateBusinessHoursOverrideByStoreIdWithHttpInfo (int? storeId, BusinessHoursOverrideBase businessHoursOverride);
         /// <summary>
-        /// Create store with Store Group identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="store"></param>
         /// <returns>RestApiResultStore</returns>
         RestApiResultStore CreateStore (int? storeGroupId, StoreCreateBase store);
 
         /// <summary>
-        /// Create store with Store Group identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="store"></param>
         /// <returns>ApiResponse of RestApiResultStore</returns>
         ApiResponse<RestApiResultStore> CreateStoreWithHttpInfo (int? storeGroupId, StoreCreateBase store);
         /// <summary>
-        /// Delete Business Hours Override for a store
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="propertyId"></param>
+        /// <param name="store"></param>
+        /// <param name="autoAssignMenu"> (optional)</param>
+        /// <returns>RestApiResultStore</returns>
+        RestApiResultStore CreateStoreInProperty (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="propertyId"></param>
+        /// <param name="store"></param>
+        /// <param name="autoAssignMenu"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultStore</returns>
+        ApiResponse<RestApiResultStore> CreateStoreInPropertyWithHttpInfo (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -173,7 +200,7 @@ public interface IStoresApi : IApiAccessor
         RestApiArrayResultRestApiDefaultResponse DeleteBusinessHoursOverride (int? storeId, int? businessHoursOverrideId);
 
         /// <summary>
-        /// Delete Business Hours Override for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -184,131 +211,131 @@ public interface IStoresApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
         ApiResponse<RestApiArrayResultRestApiDefaultResponse> DeleteBusinessHoursOverrideWithHttpInfo (int? storeId, int? businessHoursOverrideId);
         /// <summary>
-        /// Get Stores Bank Account Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultAssignedBankAccount</returns>
         RestApiResultAssignedBankAccount GetBankAccountForStore (int? storeId);
 
         /// <summary>
-        /// Get Stores Bank Account Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultAssignedBankAccount</returns>
         ApiResponse<RestApiResultAssignedBankAccount> GetBankAccountForStoreWithHttpInfo (int? storeId);
         /// <summary>
-        /// Get Business hours
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>RestApiArrayResultBusinessHoursPeriod</returns>
         RestApiArrayResultBusinessHoursPeriod GetBusinessHours (int? storeId, string deliveryType);
 
         /// <summary>
-        /// Get Business hours
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>ApiResponse of RestApiArrayResultBusinessHoursPeriod</returns>
         ApiResponse<RestApiArrayResultBusinessHoursPeriod> GetBusinessHoursWithHttpInfo (int? storeId, string deliveryType);
         /// <summary>
-        /// Get business hours overrides by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="after">Return results that ended after this datetime. Default value is the current datetime. (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="after"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultBusinessHoursOverride</returns>
         RestApiPaginationResultBusinessHoursOverride GetBusinessHoursOverrideByStoreId (int? storeId, DateTime? after = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get business hours overrides by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="after">Return results that ended after this datetime. Default value is the current datetime. (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="after"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultBusinessHoursOverride</returns>
         ApiResponse<RestApiPaginationResultBusinessHoursOverride> GetBusinessHoursOverrideByStoreIdWithHttpInfo (int? storeId, DateTime? after = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Get store end of day report
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="date">Store identifier (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="date"> (optional)</param>
         /// <returns>RestApiResultStoreEndOfDayReport</returns>
         RestApiResultStoreEndOfDayReport GetEndOfDayReport (int? storeId, DateTime? date = null);
 
         /// <summary>
-        /// Get store end of day report
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="date">Store identifier (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="date"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultStoreEndOfDayReport</returns>
         ApiResponse<RestApiResultStoreEndOfDayReport> GetEndOfDayReportWithHttpInfo (int? storeId, DateTime? date = null);
         /// <summary>
-        /// Get the pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>RestApiResultPreOrderConfig</returns>
         RestApiResultPreOrderConfig GetPreOrderConfig (int? storeId, string deliveryType);
 
         /// <summary>
-        /// Get the pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>ApiResponse of RestApiResultPreOrderConfig</returns>
         ApiResponse<RestApiResultPreOrderConfig> GetPreOrderConfigWithHttpInfo (int? storeId, string deliveryType);
         /// <summary>
-        /// Get the Preview times of the pre-order configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <param name="preOrderConfigLeadTimeMinutes">Lead Time in Minutes (optional)</param>
         /// <param name="preOrderConfigIntervalMinutes">Interval in minutes (optional)</param>
         /// <param name="preOrderConfigMaxOrderAheadDays">Max Days to order ahead (optional)</param>
@@ -323,14 +350,14 @@ public interface IStoresApi : IApiAccessor
         RestApiArrayResultPreOrderTime GetPreOrderPreview (int? storeId, string deliveryType, int? preOrderConfigLeadTimeMinutes = null, int? preOrderConfigIntervalMinutes = null, int? preOrderConfigMaxOrderAheadDays = null, bool? preOrderConfigIncludeAsap = null, bool? preOrderConfigIncludeMoreGranularInitialTime = null, string preOrderConfigCutOffTimePreviousDayBasic = null, string preOrderConfigCutOffTimeCurrentDayBasic = null, string preOrderConfigPreOrderTimeDisplayType = null, bool? preOrderConfigAlwaysAppearOpen = null, bool? preOrderConfigRequireExplicitSelectAlways = null);
 
         /// <summary>
-        /// Get the Preview times of the pre-order configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <param name="preOrderConfigLeadTimeMinutes">Lead Time in Minutes (optional)</param>
         /// <param name="preOrderConfigIntervalMinutes">Interval in minutes (optional)</param>
         /// <param name="preOrderConfigMaxOrderAheadDays">Max Days to order ahead (optional)</param>
@@ -344,598 +371,792 @@ public interface IStoresApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultPreOrderTime</returns>
         ApiResponse<RestApiArrayResultPreOrderTime> GetPreOrderPreviewWithHttpInfo (int? storeId, string deliveryType, int? preOrderConfigLeadTimeMinutes = null, int? preOrderConfigIntervalMinutes = null, int? preOrderConfigMaxOrderAheadDays = null, bool? preOrderConfigIncludeAsap = null, bool? preOrderConfigIncludeMoreGranularInitialTime = null, string preOrderConfigCutOffTimePreviousDayBasic = null, string preOrderConfigCutOffTimeCurrentDayBasic = null, string preOrderConfigPreOrderTimeDisplayType = null, bool? preOrderConfigAlwaysAppearOpen = null, bool? preOrderConfigRequireExplicitSelectAlways = null);
         /// <summary>
-        /// Get processing fee configs by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>RestApiArrayResultProcessingFeeConfig</returns>
         RestApiArrayResultProcessingFeeConfig GetProcessingFeeConfigsByStoreId (int? storeId, string appNameId = null);
 
         /// <summary>
-        /// Get processing fee configs by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultProcessingFeeConfig</returns>
         ApiResponse<RestApiArrayResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdWithHttpInfo (int? storeId, string appNameId = null);
         /// <summary>
-        /// Get processing fee configs by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="paymentAccountType"></param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>RestApiResultProcessingFeeConfig</returns>
         RestApiResultProcessingFeeConfig GetProcessingFeeConfigsByStoreIdAndPaymentAccountType (int? storeId, string paymentAccountType, string appNameId = null);
 
         /// <summary>
-        /// Get processing fee configs by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="paymentAccountType"></param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultProcessingFeeConfig</returns>
         ApiResponse<RestApiResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdAndPaymentAccountTypeWithHttpInfo (int? storeId, string paymentAccountType, string appNameId = null);
         /// <summary>
-        /// Get store by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultStore</returns>
         RestApiResultStore GetStoreById (int? storeId);
 
         /// <summary>
-        /// Get store by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultStore</returns>
         ApiResponse<RestApiResultStore> GetStoreByIdWithHttpInfo (int? storeId);
         /// <summary>
-        /// Retrieve Store feeConfig
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiArrayResultStoreDeliveryZoneFeeConfig</returns>
+        RestApiArrayResultStoreDeliveryZoneFeeConfig GetStoreDeliveryFeeConfig (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultStoreDeliveryZoneFeeConfig</returns>
+        ApiResponse<RestApiArrayResultStoreDeliveryZoneFeeConfig> GetStoreDeliveryFeeConfigWithHttpInfo (int? storeId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>StoreFeeConfig</returns>
         StoreFeeConfig GetStoreFeeConfig (int? storeId);
 
         /// <summary>
-        /// Retrieve Store feeConfig
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of StoreFeeConfig</returns>
         ApiResponse<StoreFeeConfig> GetStoreFeeConfigWithHttpInfo (int? storeId);
         /// <summary>
-        /// Get all stores by app name id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="storeNameQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultStoreHeader</returns>
-        RestApiPaginationResultStoreHeader GetStoreHeadersByAppId (string appId, string storeNameQuery = null, int? page = null, int? limit = null);
+        RestApiPaginationResultStoreHeader GetStoreHeadersByAppId (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get all stores by app name id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="storeNameQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultStoreHeader</returns>
-        ApiResponse<RestApiPaginationResultStoreHeader> GetStoreHeadersByAppIdWithHttpInfo (string appId, string storeNameQuery = null, int? page = null, int? limit = null);
+        ApiResponse<RestApiPaginationResultStoreHeader> GetStoreHeadersByAppIdWithHttpInfo (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultOrderLeadTimes</returns>
+        RestApiResultOrderLeadTimes GetStoreLeadTimes (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultOrderLeadTimes</returns>
+        ApiResponse<RestApiResultOrderLeadTimes> GetStoreLeadTimesWithHttpInfo (int? storeId);
         /// <summary>
-        /// Get stores statistics by app name id and storeIds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Ids</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiArrayResultStoreStatistics</returns>
         RestApiArrayResultStoreStatistics GetStoreNetSales (string appId, List<int?> storeId);
 
         /// <summary>
-        /// Get stores statistics by app name id and storeIds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Ids</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiArrayResultStoreStatistics</returns>
         ApiResponse<RestApiArrayResultStoreStatistics> GetStoreNetSalesWithHttpInfo (string appId, List<int?> storeId);
         /// <summary>
-        /// Retrieve Store Service Charge
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ServiceCharge</returns>
         ServiceCharge GetStoreServiceCharge (int? storeId);
 
         /// <summary>
-        /// Retrieve Store Service Charge
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of ServiceCharge</returns>
         ApiResponse<ServiceCharge> GetStoreServiceChargeWithHttpInfo (int? storeId);
         /// <summary>
-        /// Get all stores, excluding archived ones
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeGroupId">Store Group Id (optional)</param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeGroupId"> (optional)</param>
         /// <returns>RestApiPaginationResultStore</returns>
         RestApiPaginationResultStore GetStores (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null);
 
         /// <summary>
-        /// Get all stores, excluding archived ones
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeGroupId">Store Group Id (optional)</param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeGroupId"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultStore</returns>
         ApiResponse<RestApiPaginationResultStore> GetStoresWithHttpInfo (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null);
         /// <summary>
-        /// Get all stores by app name id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="excludeUnpublished"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultStore</returns>
-        RestApiPaginationResultStore GetStoresByAppId (string appId, string searchQuery = null, int? page = null, int? limit = null);
+        RestApiPaginationResultStore GetStoresByAppId (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get all stores by app name id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="excludeUnpublished"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultStore</returns>
-        ApiResponse<RestApiPaginationResultStore> GetStoresByAppIdWithHttpInfo (string appId, string searchQuery = null, int? page = null, int? limit = null);
+        ApiResponse<RestApiPaginationResultStore> GetStoresByAppIdWithHttpInfo (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Get store validation by storeIds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultStoreValidationConfig</returns>
         RestApiPaginationResultStoreValidationConfig GetStoresByStoreIdWithValidations (List<int?> storeId, string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get store validation by storeIds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultStoreValidationConfig</returns>
         ApiResponse<RestApiPaginationResultStoreValidationConfig> GetStoresByStoreIdWithValidationsWithHttpInfo (List<int?> storeId, string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// Publish store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns></returns>
         void PublishStore (int? storeId);
 
         /// <summary>
-        /// Publish store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> PublishStoreWithHttpInfo (int? storeId);
         /// <summary>
-        /// Set Business hours
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="feeConfigUpdateRequest"></param>
+        /// <returns></returns>
+        void PutStoreDeliveryFeeConfig (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="feeConfigUpdateRequest"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> PutStoreDeliveryFeeConfigWithHttpInfo (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
-        /// <param name="businessHoursPeriod">Business Hours Period</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="businessHoursPeriod"></param>
         /// <returns>RestApiResultBusinessHoursPeriod</returns>
         RestApiResultBusinessHoursPeriod SetBusinessHours (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod);
 
         /// <summary>
-        /// Set Business hours
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
-        /// <param name="businessHoursPeriod">Business Hours Period</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="businessHoursPeriod"></param>
         /// <returns>ApiResponse of RestApiResultBusinessHoursPeriod</returns>
         ApiResponse<RestApiResultBusinessHoursPeriod> SetBusinessHoursWithHttpInfo (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod);
         /// <summary>
-        /// UPDATE pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="enabled">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="enabled"></param>
         /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
         RestApiArrayResultRestApiDefaultResponse SetPreOrdeEnabled (int? storeId, string deliveryType, bool? enabled);
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="enabled">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="enabled"></param>
         /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
         ApiResponse<RestApiArrayResultRestApiDefaultResponse> SetPreOrdeEnabledWithHttpInfo (int? storeId, string deliveryType, bool? enabled);
         /// <summary>
-        /// Unpublish store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns></returns>
-        void UnpublishStore (int? storeId);
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
+        /// <param name="inheritFromProperty"> (optional)</param>
+        /// <returns>RestApiResultRestApiDefaultResponse</returns>
+        RestApiResultRestApiDefaultResponse SetStoreCollectionSettings (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null);
 
         /// <summary>
-        /// Unpublish store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> UnpublishStoreWithHttpInfo (int? storeId);
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
+        /// <param name="inheritFromProperty"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultRestApiDefaultResponse</returns>
+        ApiResponse<RestApiResultRestApiDefaultResponse> SetStoreCollectionSettingsWithHttpInfo (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null);
         /// <summary>
-        /// UPDATE pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="preOrderConfig">Update pre order config values</param>
-        /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
-        RestApiArrayResultRestApiDefaultResponse UpdatePreOrderConfig (int? storeId, string deliveryType, PreOrderConfig preOrderConfig);
+        /// <param name="storeId"></param>
+        /// <param name="leadTime"></param>
+        /// <returns>RestApiResultOrderLeadTimes</returns>
+        RestApiResultOrderLeadTimes SetStoreLeadTimes (int? storeId, LeadTime leadTime);
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="preOrderConfig">Update pre order config values</param>
-        /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
-        ApiResponse<RestApiArrayResultRestApiDefaultResponse> UpdatePreOrderConfigWithHttpInfo (int? storeId, string deliveryType, PreOrderConfig preOrderConfig);
+        /// <param name="storeId"></param>
+        /// <param name="leadTime"></param>
+        /// <returns>ApiResponse of RestApiResultOrderLeadTimes</returns>
+        ApiResponse<RestApiResultOrderLeadTimes> SetStoreLeadTimesWithHttpInfo (int? storeId, LeadTime leadTime);
         /// <summary>
-        /// Update store by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Group identifier</param>
-        /// <param name="store">Store</param>
-        /// <returns>RestApiResultStore</returns>
-        RestApiResultStore UpdateStore (int? storeId, StoreBase store);
+        /// <param name="storeId"></param>
+        /// <param name="propertyId"></param>
+        /// <returns>Object</returns>
+        Object StoresSetPropertyId (int? storeId, string propertyId);
 
         /// <summary>
-        /// Update store by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Group identifier</param>
-        /// <param name="store">Store</param>
-        /// <returns>ApiResponse of RestApiResultStore</returns>
-        ApiResponse<RestApiResultStore> UpdateStoreWithHttpInfo (int? storeId, StoreBase store);
+        /// <param name="storeId"></param>
+        /// <param name="propertyId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> StoresSetPropertyIdWithHttpInfo (int? storeId, string propertyId);
         /// <summary>
-        /// Update store address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="storeAddress">Store address</param>
-        /// <returns>RestApiResultStoreAddress</returns>
-        RestApiResultStoreAddress UpdateStoreAddress (int? storeId, StoreAddressBase storeAddress);
+        /// <param name="propertyId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="salesChannelTypes"></param>
+        /// <returns></returns>
+        void SupportedSalesChannelsTypes (string propertyId, int? storeId, List<string> salesChannelTypes);
 
         /// <summary>
-        /// Update store address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="storeAddress">Store address</param>
-        /// <returns>ApiResponse of RestApiResultStoreAddress</returns>
-        ApiResponse<RestApiResultStoreAddress> UpdateStoreAddressWithHttpInfo (int? storeId, StoreAddressBase storeAddress);
+        /// <param name="propertyId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="salesChannelTypes"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SupportedSalesChannelsTypesWithHttpInfo (string propertyId, int? storeId, List<string> salesChannelTypes);
         /// <summary>
-        /// Update store address coordinates
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="coordinates">Store address coordinates</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
-        /// <returns>RestApiResultCoordinates</returns>
-        RestApiResultCoordinates UpdateStoreAddressCoordinates (int? storeId, Coordinates coordinates, string appNameId = null);
+        /// <param name="storeId"></param>
+        /// <returns></returns>
+        void UnpublishStore (int? storeId);
 
         /// <summary>
-        /// Update store address coordinates
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="coordinates">Store address coordinates</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
-        /// <returns>ApiResponse of RestApiResultCoordinates</returns>
-        ApiResponse<RestApiResultCoordinates> UpdateStoreAddressCoordinatesWithHttpInfo (int? storeId, Coordinates coordinates, string appNameId = null);
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UnpublishStoreWithHttpInfo (int? storeId);
         /// <summary>
-        /// Update store address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="address">Store address</param>
-        /// <returns>Object</returns>
-        Object UpdateStoreAddressForm (int? storeId, StoreAddressForm address);
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="preOrderConfig"></param>
+        /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
+        RestApiArrayResultRestApiDefaultResponse UpdatePreOrderConfig (int? storeId, string deliveryType, PreOrderConfig preOrderConfig);
 
         /// <summary>
-        /// Update store address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="address">Store address</param>
-        /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> UpdateStoreAddressFormWithHttpInfo (int? storeId, StoreAddressForm address);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="preOrderConfig"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
+        ApiResponse<RestApiArrayResultRestApiDefaultResponse> UpdatePreOrderConfigWithHttpInfo (int? storeId, string deliveryType, PreOrderConfig preOrderConfig);
         /// <summary>
-        /// Archive store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task ArchiveStoreAsync (int? storeId);
+        /// <param name="storeId"></param>
+        /// <param name="store"></param>
+        /// <returns>RestApiResultStore</returns>
+        RestApiResultStore UpdateStore (int? storeId, StoreBase store);
 
         /// <summary>
-        /// Archive store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>Task of ApiResponse</returns>
+        /// <param name="storeId"></param>
+        /// <param name="store"></param>
+        /// <returns>ApiResponse of RestApiResultStore</returns>
+        ApiResponse<RestApiResultStore> UpdateStoreWithHttpInfo (int? storeId, StoreBase store);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="storeAddress"></param>
+        /// <returns>RestApiResultStoreAddress</returns>
+        RestApiResultStoreAddress UpdateStoreAddress (int? storeId, StoreAddressBase storeAddress);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="storeAddress"></param>
+        /// <returns>ApiResponse of RestApiResultStoreAddress</returns>
+        ApiResponse<RestApiResultStoreAddress> UpdateStoreAddressWithHttpInfo (int? storeId, StoreAddressBase storeAddress);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="coordinates"></param>
+        /// <param name="appNameId"> (optional)</param>
+        /// <returns>RestApiResultCoordinates</returns>
+        RestApiResultCoordinates UpdateStoreAddressCoordinates (int? storeId, Coordinates coordinates, string appNameId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="coordinates"></param>
+        /// <param name="appNameId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultCoordinates</returns>
+        ApiResponse<RestApiResultCoordinates> UpdateStoreAddressCoordinatesWithHttpInfo (int? storeId, Coordinates coordinates, string appNameId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="address"></param>
+        /// <returns>Object</returns>
+        Object UpdateStoreAddressForm (int? storeId, StoreAddressForm address);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="address"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> UpdateStoreAddressFormWithHttpInfo (int? storeId, StoreAddressForm address);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task ArchiveStoreAsync (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveStoreAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Assign Menu to Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="menuId">Id of Menu to assign to store</param>
+        /// <param name="storeId"></param>
+        /// <param name="menuId"></param>
         /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
         System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> AssignMenuAsync (int? storeId, int? menuId);
 
         /// <summary>
-        /// Assign Menu to Store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="menuId">Id of Menu to assign to store</param>
+        /// <param name="storeId"></param>
+        /// <param name="menuId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> AssignMenuAsyncWithHttpInfo (int? storeId, int? menuId);
         /// <summary>
-        /// Clone store with store clone settings
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="settings">Settings for cloning the store</param>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
         /// <returns>Task of RestApiResultStore</returns>
         System.Threading.Tasks.Task<RestApiResultStore> CloneStoreAsync (int? storeId, StoreCloneSettings settings);
 
         /// <summary>
-        /// Clone store with store clone settings
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="settings">Settings for cloning the store</param>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
         /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> CloneStoreAsyncWithHttpInfo (int? storeId, StoreCloneSettings settings);
         /// <summary>
-        /// Configure Store Service Charge; Idempotent Operation
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="serviceCharge">Service charge</param>
+        /// <param name="storeId"></param>
+        /// <param name="serviceCharge"></param>
         /// <returns>Task of RestApiResultServiceCharge</returns>
         System.Threading.Tasks.Task<RestApiResultServiceCharge> ConfigureStoreServiceChargeAsync (int? storeId, ServiceCharge serviceCharge);
 
         /// <summary>
-        /// Configure Store Service Charge; Idempotent Operation
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="serviceCharge">Service charge</param>
+        /// <param name="storeId"></param>
+        /// <param name="serviceCharge"></param>
         /// <returns>Task of ApiResponse (RestApiResultServiceCharge)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultServiceCharge>> ConfigureStoreServiceChargeAsyncWithHttpInfo (int? storeId, ServiceCharge serviceCharge);
         /// <summary>
-        /// Create Business Hours Override for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="businessHoursOverride">Business Hours Override</param>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverride"></param>
         /// <returns>Task of RestApiResultBusinessHoursOverride</returns>
         System.Threading.Tasks.Task<RestApiResultBusinessHoursOverride> CreateBusinessHoursOverrideByStoreIdAsync (int? storeId, BusinessHoursOverrideBase businessHoursOverride);
 
         /// <summary>
-        /// Create Business Hours Override for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="businessHoursOverride">Business Hours Override</param>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverride"></param>
         /// <returns>Task of ApiResponse (RestApiResultBusinessHoursOverride)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursOverride>> CreateBusinessHoursOverrideByStoreIdAsyncWithHttpInfo (int? storeId, BusinessHoursOverrideBase businessHoursOverride);
         /// <summary>
-        /// Create store with Store Group identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="store"></param>
         /// <returns>Task of RestApiResultStore</returns>
         System.Threading.Tasks.Task<RestApiResultStore> CreateStoreAsync (int? storeGroupId, StoreCreateBase store);
 
         /// <summary>
-        /// Create store with Store Group identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="store"></param>
         /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> CreateStoreAsyncWithHttpInfo (int? storeGroupId, StoreCreateBase store);
         /// <summary>
-        /// Delete Business Hours Override for a store
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="propertyId"></param>
+        /// <param name="store"></param>
+        /// <param name="autoAssignMenu"> (optional)</param>
+        /// <returns>Task of RestApiResultStore</returns>
+        System.Threading.Tasks.Task<RestApiResultStore> CreateStoreInPropertyAsync (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeGroupId"></param>
+        /// <param name="propertyId"></param>
+        /// <param name="store"></param>
+        /// <param name="autoAssignMenu"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> CreateStoreInPropertyAsyncWithHttpInfo (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -947,7 +1168,7 @@ public interface IStoresApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> DeleteBusinessHoursOverrideAsync (int? storeId, int? businessHoursOverrideId);
 
         /// <summary>
-        /// Delete Business Hours Override for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -958,131 +1179,131 @@ public interface IStoresApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> DeleteBusinessHoursOverrideAsyncWithHttpInfo (int? storeId, int? businessHoursOverrideId);
         /// <summary>
-        /// Get Stores Bank Account Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultAssignedBankAccount</returns>
         System.Threading.Tasks.Task<RestApiResultAssignedBankAccount> GetBankAccountForStoreAsync (int? storeId);
 
         /// <summary>
-        /// Get Stores Bank Account Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultAssignedBankAccount)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultAssignedBankAccount>> GetBankAccountForStoreAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Get Business hours
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of RestApiArrayResultBusinessHoursPeriod</returns>
         System.Threading.Tasks.Task<RestApiArrayResultBusinessHoursPeriod> GetBusinessHoursAsync (int? storeId, string deliveryType);
 
         /// <summary>
-        /// Get Business hours
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultBusinessHoursPeriod)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultBusinessHoursPeriod>> GetBusinessHoursAsyncWithHttpInfo (int? storeId, string deliveryType);
         /// <summary>
-        /// Get business hours overrides by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="after">Return results that ended after this datetime. Default value is the current datetime. (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="after"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultBusinessHoursOverride</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultBusinessHoursOverride> GetBusinessHoursOverrideByStoreIdAsync (int? storeId, DateTime? after = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get business hours overrides by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="after">Return results that ended after this datetime. Default value is the current datetime. (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="after"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultBusinessHoursOverride)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultBusinessHoursOverride>> GetBusinessHoursOverrideByStoreIdAsyncWithHttpInfo (int? storeId, DateTime? after = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Get store end of day report
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="date">Store identifier (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="date"> (optional)</param>
         /// <returns>Task of RestApiResultStoreEndOfDayReport</returns>
         System.Threading.Tasks.Task<RestApiResultStoreEndOfDayReport> GetEndOfDayReportAsync (int? storeId, DateTime? date = null);
 
         /// <summary>
-        /// Get store end of day report
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="date">Store identifier (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="date"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultStoreEndOfDayReport)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreEndOfDayReport>> GetEndOfDayReportAsyncWithHttpInfo (int? storeId, DateTime? date = null);
         /// <summary>
-        /// Get the pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of RestApiResultPreOrderConfig</returns>
         System.Threading.Tasks.Task<RestApiResultPreOrderConfig> GetPreOrderConfigAsync (int? storeId, string deliveryType);
 
         /// <summary>
-        /// Get the pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of ApiResponse (RestApiResultPreOrderConfig)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultPreOrderConfig>> GetPreOrderConfigAsyncWithHttpInfo (int? storeId, string deliveryType);
         /// <summary>
-        /// Get the Preview times of the pre-order configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <param name="preOrderConfigLeadTimeMinutes">Lead Time in Minutes (optional)</param>
         /// <param name="preOrderConfigIntervalMinutes">Interval in minutes (optional)</param>
         /// <param name="preOrderConfigMaxOrderAheadDays">Max Days to order ahead (optional)</param>
@@ -1097,14 +1318,14 @@ public interface IStoresApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultPreOrderTime> GetPreOrderPreviewAsync (int? storeId, string deliveryType, int? preOrderConfigLeadTimeMinutes = null, int? preOrderConfigIntervalMinutes = null, int? preOrderConfigMaxOrderAheadDays = null, bool? preOrderConfigIncludeAsap = null, bool? preOrderConfigIncludeMoreGranularInitialTime = null, string preOrderConfigCutOffTimePreviousDayBasic = null, string preOrderConfigCutOffTimeCurrentDayBasic = null, string preOrderConfigPreOrderTimeDisplayType = null, bool? preOrderConfigAlwaysAppearOpen = null, bool? preOrderConfigRequireExplicitSelectAlways = null);
 
         /// <summary>
-        /// Get the Preview times of the pre-order configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <param name="preOrderConfigLeadTimeMinutes">Lead Time in Minutes (optional)</param>
         /// <param name="preOrderConfigIntervalMinutes">Interval in minutes (optional)</param>
         /// <param name="preOrderConfigMaxOrderAheadDays">Max Days to order ahead (optional)</param>
@@ -1118,456 +1339,623 @@ public interface IStoresApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultPreOrderTime)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPreOrderTime>> GetPreOrderPreviewAsyncWithHttpInfo (int? storeId, string deliveryType, int? preOrderConfigLeadTimeMinutes = null, int? preOrderConfigIntervalMinutes = null, int? preOrderConfigMaxOrderAheadDays = null, bool? preOrderConfigIncludeAsap = null, bool? preOrderConfigIncludeMoreGranularInitialTime = null, string preOrderConfigCutOffTimePreviousDayBasic = null, string preOrderConfigCutOffTimeCurrentDayBasic = null, string preOrderConfigPreOrderTimeDisplayType = null, bool? preOrderConfigAlwaysAppearOpen = null, bool? preOrderConfigRequireExplicitSelectAlways = null);
         /// <summary>
-        /// Get processing fee configs by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of RestApiArrayResultProcessingFeeConfig</returns>
         System.Threading.Tasks.Task<RestApiArrayResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdAsync (int? storeId, string appNameId = null);
 
         /// <summary>
-        /// Get processing fee configs by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultProcessingFeeConfig)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultProcessingFeeConfig>> GetProcessingFeeConfigsByStoreIdAsyncWithHttpInfo (int? storeId, string appNameId = null);
         /// <summary>
-        /// Get processing fee configs by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="paymentAccountType"></param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of RestApiResultProcessingFeeConfig</returns>
         System.Threading.Tasks.Task<RestApiResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdAndPaymentAccountTypeAsync (int? storeId, string paymentAccountType, string appNameId = null);
 
         /// <summary>
-        /// Get processing fee configs by store identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="paymentAccountType"></param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultProcessingFeeConfig)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultProcessingFeeConfig>> GetProcessingFeeConfigsByStoreIdAndPaymentAccountTypeAsyncWithHttpInfo (int? storeId, string paymentAccountType, string appNameId = null);
         /// <summary>
-        /// Get store by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultStore</returns>
         System.Threading.Tasks.Task<RestApiResultStore> GetStoreByIdAsync (int? storeId);
 
         /// <summary>
-        /// Get store by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> GetStoreByIdAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Retrieve Store feeConfig
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiArrayResultStoreDeliveryZoneFeeConfig</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultStoreDeliveryZoneFeeConfig> GetStoreDeliveryFeeConfigAsync (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultStoreDeliveryZoneFeeConfig)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreDeliveryZoneFeeConfig>> GetStoreDeliveryFeeConfigAsyncWithHttpInfo (int? storeId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of StoreFeeConfig</returns>
         System.Threading.Tasks.Task<StoreFeeConfig> GetStoreFeeConfigAsync (int? storeId);
 
         /// <summary>
-        /// Retrieve Store feeConfig
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (StoreFeeConfig)</returns>
         System.Threading.Tasks.Task<ApiResponse<StoreFeeConfig>> GetStoreFeeConfigAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Get all stores by app name id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="storeNameQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultStoreHeader</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultStoreHeader> GetStoreHeadersByAppIdAsync (string appId, string storeNameQuery = null, int? page = null, int? limit = null);
+        System.Threading.Tasks.Task<RestApiPaginationResultStoreHeader> GetStoreHeadersByAppIdAsync (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get all stores by app name id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
+        /// <param name="appId"></param>
         /// <param name="storeNameQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultStoreHeader)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreHeader>> GetStoreHeadersByAppIdAsyncWithHttpInfo (string appId, string storeNameQuery = null, int? page = null, int? limit = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreHeader>> GetStoreHeadersByAppIdAsyncWithHttpInfo (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiResultOrderLeadTimes</returns>
+        System.Threading.Tasks.Task<RestApiResultOrderLeadTimes> GetStoreLeadTimesAsync (int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultOrderLeadTimes)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderLeadTimes>> GetStoreLeadTimesAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Get stores statistics by app name id and storeIds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Ids</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiArrayResultStoreStatistics</returns>
         System.Threading.Tasks.Task<RestApiArrayResultStoreStatistics> GetStoreNetSalesAsync (string appId, List<int?> storeId);
 
         /// <summary>
-        /// Get stores statistics by app name id and storeIds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Ids</param>
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultStoreStatistics)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreStatistics>> GetStoreNetSalesAsyncWithHttpInfo (string appId, List<int?> storeId);
         /// <summary>
-        /// Retrieve Store Service Charge
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ServiceCharge</returns>
         System.Threading.Tasks.Task<ServiceCharge> GetStoreServiceChargeAsync (int? storeId);
 
         /// <summary>
-        /// Retrieve Store Service Charge
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (ServiceCharge)</returns>
         System.Threading.Tasks.Task<ApiResponse<ServiceCharge>> GetStoreServiceChargeAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Get all stores, excluding archived ones
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeGroupId">Store Group Id (optional)</param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeGroupId"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultStore</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultStore> GetStoresAsync (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null);
 
         /// <summary>
-        /// Get all stores, excluding archived ones
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeGroupId">Store Group Id (optional)</param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeGroupId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultStore)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStore>> GetStoresAsyncWithHttpInfo (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null);
         /// <summary>
-        /// Get all stores by app name id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="excludeUnpublished"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultStore</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultStore> GetStoresByAppIdAsync (string appId, string searchQuery = null, int? page = null, int? limit = null);
+        System.Threading.Tasks.Task<RestApiPaginationResultStore> GetStoresByAppIdAsync (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get all stores by app name id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="excludeUnpublished"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultStore)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStore>> GetStoresByAppIdAsyncWithHttpInfo (string appId, string searchQuery = null, int? page = null, int? limit = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStore>> GetStoresByAppIdAsyncWithHttpInfo (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null);
         /// <summary>
-        /// Get store validation by storeIds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultStoreValidationConfig</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultStoreValidationConfig> GetStoresByStoreIdWithValidationsAsync (List<int?> storeId, string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get store validation by storeIds
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultStoreValidationConfig)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreValidationConfig>> GetStoresByStoreIdWithValidationsAsyncWithHttpInfo (List<int?> storeId, string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// Publish store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task PublishStoreAsync (int? storeId);
 
         /// <summary>
-        /// Publish store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> PublishStoreAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Set Business hours
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
-        /// <param name="businessHoursPeriod">Business Hours Period</param>
-        /// <returns>Task of RestApiResultBusinessHoursPeriod</returns>
-        System.Threading.Tasks.Task<RestApiResultBusinessHoursPeriod> SetBusinessHoursAsync (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod);
+        /// <param name="storeId"></param>
+        /// <param name="feeConfigUpdateRequest"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task PutStoreDeliveryFeeConfigAsync (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest);
 
         /// <summary>
-        /// Set Business hours
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
-        /// <param name="businessHoursPeriod">Business Hours Period</param>
-        /// <returns>Task of ApiResponse (RestApiResultBusinessHoursPeriod)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursPeriod>> SetBusinessHoursAsyncWithHttpInfo (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod);
+        /// <param name="storeId"></param>
+        /// <param name="feeConfigUpdateRequest"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> PutStoreDeliveryFeeConfigAsyncWithHttpInfo (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest);
         /// <summary>
-        /// UPDATE pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="enabled">Update pre order config values</param>
-        /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
-        System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> SetPreOrdeEnabledAsync (int? storeId, string deliveryType, bool? enabled);
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="businessHoursPeriod"></param>
+        /// <returns>Task of RestApiResultBusinessHoursPeriod</returns>
+        System.Threading.Tasks.Task<RestApiResultBusinessHoursPeriod> SetBusinessHoursAsync (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="businessHoursPeriod"></param>
+        /// <returns>Task of ApiResponse (RestApiResultBusinessHoursPeriod)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursPeriod>> SetBusinessHoursAsyncWithHttpInfo (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="enabled"></param>
+        /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> SetPreOrdeEnabledAsync (int? storeId, string deliveryType, bool? enabled);
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="enabled">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="enabled"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> SetPreOrdeEnabledAsyncWithHttpInfo (int? storeId, string deliveryType, bool? enabled);
         /// <summary>
-        /// Unpublish store
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
+        /// <param name="inheritFromProperty"> (optional)</param>
+        /// <returns>Task of RestApiResultRestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiResultRestApiDefaultResponse> SetStoreCollectionSettingsAsync (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
+        /// <param name="inheritFromProperty"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultRestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultRestApiDefaultResponse>> SetStoreCollectionSettingsAsyncWithHttpInfo (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="leadTime"></param>
+        /// <returns>Task of RestApiResultOrderLeadTimes</returns>
+        System.Threading.Tasks.Task<RestApiResultOrderLeadTimes> SetStoreLeadTimesAsync (int? storeId, LeadTime leadTime);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="leadTime"></param>
+        /// <returns>Task of ApiResponse (RestApiResultOrderLeadTimes)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderLeadTimes>> SetStoreLeadTimesAsyncWithHttpInfo (int? storeId, LeadTime leadTime);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="propertyId"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> StoresSetPropertyIdAsync (int? storeId, string propertyId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="propertyId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> StoresSetPropertyIdAsyncWithHttpInfo (int? storeId, string propertyId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="propertyId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="salesChannelTypes"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SupportedSalesChannelsTypesAsync (string propertyId, int? storeId, List<string> salesChannelTypes);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="propertyId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="salesChannelTypes"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SupportedSalesChannelsTypesAsyncWithHttpInfo (string propertyId, int? storeId, List<string> salesChannelTypes);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UnpublishStoreAsync (int? storeId);
 
         /// <summary>
-        /// Unpublish store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UnpublishStoreAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// UPDATE pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="preOrderConfig">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="preOrderConfig"></param>
         /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
         System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> UpdatePreOrderConfigAsync (int? storeId, string deliveryType, PreOrderConfig preOrderConfig);
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="preOrderConfig">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="preOrderConfig"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> UpdatePreOrderConfigAsyncWithHttpInfo (int? storeId, string deliveryType, PreOrderConfig preOrderConfig);
         /// <summary>
-        /// Update store by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeId"></param>
+        /// <param name="store"></param>
         /// <returns>Task of RestApiResultStore</returns>
         System.Threading.Tasks.Task<RestApiResultStore> UpdateStoreAsync (int? storeId, StoreBase store);
 
         /// <summary>
-        /// Update store by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeId"></param>
+        /// <param name="store"></param>
         /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> UpdateStoreAsyncWithHttpInfo (int? storeId, StoreBase store);
         /// <summary>
-        /// Update store address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="storeAddress">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="storeAddress"></param>
         /// <returns>Task of RestApiResultStoreAddress</returns>
         System.Threading.Tasks.Task<RestApiResultStoreAddress> UpdateStoreAddressAsync (int? storeId, StoreAddressBase storeAddress);
 
         /// <summary>
-        /// Update store address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="storeAddress">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="storeAddress"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreAddress)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreAddress>> UpdateStoreAddressAsyncWithHttpInfo (int? storeId, StoreAddressBase storeAddress);
         /// <summary>
-        /// Update store address coordinates
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="coordinates">Store address coordinates</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="coordinates"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of RestApiResultCoordinates</returns>
         System.Threading.Tasks.Task<RestApiResultCoordinates> UpdateStoreAddressCoordinatesAsync (int? storeId, Coordinates coordinates, string appNameId = null);
 
         /// <summary>
-        /// Update store address coordinates
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="coordinates">Store address coordinates</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="coordinates"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultCoordinates)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultCoordinates>> UpdateStoreAddressCoordinatesAsyncWithHttpInfo (int? storeId, Coordinates coordinates, string appNameId = null);
         /// <summary>
-        /// Update store address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="address">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="address"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> UpdateStoreAddressFormAsync (int? storeId, StoreAddressForm address);
 
         /// <summary>
-        /// Update store address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="address">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="address"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateStoreAddressFormAsyncWithHttpInfo (int? storeId, StoreAddressForm address);
         #endregion Asynchronous Operations
@@ -1671,10 +2059,10 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Archive store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns></returns>
         public void ArchiveStore (int? storeId)
         {
@@ -1682,10 +2070,10 @@ public void ArchiveStore (int? storeId)
         }
 
         /// <summary>
-        /// Archive store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> ArchiveStoreWithHttpInfo (int? storeId)
         {
@@ -1693,7 +2081,7 @@ public ApiResponse<Object> ArchiveStoreWithHttpInfo (int? storeId)
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->ArchiveStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/archive";
+            var localVarPath = "./api/v1.0/stores/{storeId}/archive";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1740,15 +2128,15 @@ public ApiResponse<Object> ArchiveStoreWithHttpInfo (int? storeId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Archive store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task ArchiveStoreAsync (int? storeId)
         {
@@ -1757,10 +2145,10 @@ public async System.Threading.Tasks.Task ArchiveStoreAsync (int? storeId)
         }
 
         /// <summary>
-        /// Archive store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveStoreAsyncWithHttpInfo (int? storeId)
         {
@@ -1768,7 +2156,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveStoreAsyncW
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->ArchiveStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/archive";
+            var localVarPath = "./api/v1.0/stores/{storeId}/archive";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1815,16 +2203,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> ArchiveStoreAsyncW
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Assign Menu to Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="menuId">Id of Menu to assign to store</param>
+        /// <param name="storeId"></param>
+        /// <param name="menuId"></param>
         /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
         public RestApiArrayResultRestApiDefaultResponse AssignMenu (int? storeId, int? menuId)
         {
@@ -1833,11 +2221,11 @@ public RestApiArrayResultRestApiDefaultResponse AssignMenu (int? storeId, int? m
         }
 
         /// <summary>
-        /// Assign Menu to Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="menuId">Id of Menu to assign to store</param>
+        /// <param name="storeId"></param>
+        /// <param name="menuId"></param>
         /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
         public ApiResponse< RestApiArrayResultRestApiDefaultResponse > AssignMenuWithHttpInfo (int? storeId, int? menuId)
         {
@@ -1848,7 +2236,7 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > AssignMenuWithHtt
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling StoresApi->AssignMenu");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/menu/{menuId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/menu/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1896,16 +2284,16 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > AssignMenuWithHtt
             }
 
             return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// Assign Menu to Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="menuId">Id of Menu to assign to store</param>
+        /// <param name="storeId"></param>
+        /// <param name="menuId"></param>
         /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> AssignMenuAsync (int? storeId, int? menuId)
         {
@@ -1915,11 +2303,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultRespons
         }
 
         /// <summary>
-        /// Assign Menu to Store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="menuId">Id of Menu to assign to store</param>
+        /// <param name="storeId"></param>
+        /// <param name="menuId"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> AssignMenuAsyncWithHttpInfo (int? storeId, int? menuId)
         {
@@ -1930,7 +2318,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
             if (menuId == null)
                 throw new ApiException(400, "Missing required parameter 'menuId' when calling StoresApi->AssignMenu");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/menu/{menuId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/menu/{menuId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1978,16 +2366,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
             }
 
             return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// Clone store with store clone settings 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="settings">Settings for cloning the store</param>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
         /// <returns>RestApiResultStore</returns>
         public RestApiResultStore CloneStore (int? storeId, StoreCloneSettings settings)
         {
@@ -1996,11 +2384,11 @@ public RestApiResultStore CloneStore (int? storeId, StoreCloneSettings settings)
         }
 
         /// <summary>
-        /// Clone store with store clone settings 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="settings">Settings for cloning the store</param>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
         /// <returns>ApiResponse of RestApiResultStore</returns>
         public ApiResponse< RestApiResultStore > CloneStoreWithHttpInfo (int? storeId, StoreCloneSettings settings)
         {
@@ -2011,7 +2399,7 @@ public ApiResponse< RestApiResultStore > CloneStoreWithHttpInfo (int? storeId, S
             if (settings == null)
                 throw new ApiException(400, "Missing required parameter 'settings' when calling StoresApi->CloneStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/clone";
+            var localVarPath = "./api/v1.0/stores/{storeId}/clone";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2071,16 +2459,16 @@ public ApiResponse< RestApiResultStore > CloneStoreWithHttpInfo (int? storeId, S
             }
 
             return new ApiResponse<RestApiResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Clone store with store clone settings 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="settings">Settings for cloning the store</param>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
         /// <returns>Task of RestApiResultStore</returns>
         public async System.Threading.Tasks.Task<RestApiResultStore> CloneStoreAsync (int? storeId, StoreCloneSettings settings)
         {
@@ -2090,11 +2478,11 @@ public async System.Threading.Tasks.Task<RestApiResultStore> CloneStoreAsync (in
         }
 
         /// <summary>
-        /// Clone store with store clone settings 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="settings">Settings for cloning the store</param>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
         /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> CloneStoreAsyncWithHttpInfo (int? storeId, StoreCloneSettings settings)
         {
@@ -2105,7 +2493,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> CloneS
             if (settings == null)
                 throw new ApiException(400, "Missing required parameter 'settings' when calling StoresApi->CloneStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/clone";
+            var localVarPath = "./api/v1.0/stores/{storeId}/clone";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2165,16 +2553,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> CloneS
             }
 
             return new ApiResponse<RestApiResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Configure Store Service Charge; Idempotent Operation 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="serviceCharge">Service charge</param>
+        /// <param name="storeId"></param>
+        /// <param name="serviceCharge"></param>
         /// <returns>RestApiResultServiceCharge</returns>
         public RestApiResultServiceCharge ConfigureStoreServiceCharge (int? storeId, ServiceCharge serviceCharge)
         {
@@ -2183,11 +2571,11 @@ public RestApiResultServiceCharge ConfigureStoreServiceCharge (int? storeId, Ser
         }
 
         /// <summary>
-        /// Configure Store Service Charge; Idempotent Operation 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="serviceCharge">Service charge</param>
+        /// <param name="storeId"></param>
+        /// <param name="serviceCharge"></param>
         /// <returns>ApiResponse of RestApiResultServiceCharge</returns>
         public ApiResponse< RestApiResultServiceCharge > ConfigureStoreServiceChargeWithHttpInfo (int? storeId, ServiceCharge serviceCharge)
         {
@@ -2198,7 +2586,7 @@ public ApiResponse< RestApiResultServiceCharge > ConfigureStoreServiceChargeWith
             if (serviceCharge == null)
                 throw new ApiException(400, "Missing required parameter 'serviceCharge' when calling StoresApi->ConfigureStoreServiceCharge");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/servicecharge";
+            var localVarPath = "./api/v1.0/stores/{storeId}/servicecharge";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2258,16 +2646,16 @@ public ApiResponse< RestApiResultServiceCharge > ConfigureStoreServiceChargeWith
             }
 
             return new ApiResponse<RestApiResultServiceCharge>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultServiceCharge) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultServiceCharge)));
         }
 
         /// <summary>
-        /// Configure Store Service Charge; Idempotent Operation 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="serviceCharge">Service charge</param>
+        /// <param name="storeId"></param>
+        /// <param name="serviceCharge"></param>
         /// <returns>Task of RestApiResultServiceCharge</returns>
         public async System.Threading.Tasks.Task<RestApiResultServiceCharge> ConfigureStoreServiceChargeAsync (int? storeId, ServiceCharge serviceCharge)
         {
@@ -2277,11 +2665,11 @@ public async System.Threading.Tasks.Task<RestApiResultServiceCharge> ConfigureSt
         }
 
         /// <summary>
-        /// Configure Store Service Charge; Idempotent Operation 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="serviceCharge">Service charge</param>
+        /// <param name="storeId"></param>
+        /// <param name="serviceCharge"></param>
         /// <returns>Task of ApiResponse (RestApiResultServiceCharge)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultServiceCharge>> ConfigureStoreServiceChargeAsyncWithHttpInfo (int? storeId, ServiceCharge serviceCharge)
         {
@@ -2292,7 +2680,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultServiceCharge>
             if (serviceCharge == null)
                 throw new ApiException(400, "Missing required parameter 'serviceCharge' when calling StoresApi->ConfigureStoreServiceCharge");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/servicecharge";
+            var localVarPath = "./api/v1.0/stores/{storeId}/servicecharge";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2352,16 +2740,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultServiceCharge>
             }
 
             return new ApiResponse<RestApiResultServiceCharge>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultServiceCharge) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultServiceCharge)));
         }
 
         /// <summary>
-        /// Create Business Hours Override for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="businessHoursOverride">Business Hours Override</param>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverride"></param>
         /// <returns>RestApiResultBusinessHoursOverride</returns>
         public RestApiResultBusinessHoursOverride CreateBusinessHoursOverrideByStoreId (int? storeId, BusinessHoursOverrideBase businessHoursOverride)
         {
@@ -2370,11 +2758,11 @@ public RestApiResultBusinessHoursOverride CreateBusinessHoursOverrideByStoreId (
         }
 
         /// <summary>
-        /// Create Business Hours Override for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="businessHoursOverride">Business Hours Override</param>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverride"></param>
         /// <returns>ApiResponse of RestApiResultBusinessHoursOverride</returns>
         public ApiResponse< RestApiResultBusinessHoursOverride > CreateBusinessHoursOverrideByStoreIdWithHttpInfo (int? storeId, BusinessHoursOverrideBase businessHoursOverride)
         {
@@ -2385,7 +2773,7 @@ public ApiResponse< RestApiResultBusinessHoursOverride > CreateBusinessHoursOver
             if (businessHoursOverride == null)
                 throw new ApiException(400, "Missing required parameter 'businessHoursOverride' when calling StoresApi->CreateBusinessHoursOverrideByStoreId");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/businesshoursoverrides";
+            var localVarPath = "./api/v1.0/stores/{storeId}/businesshoursoverrides";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2445,16 +2833,16 @@ public ApiResponse< RestApiResultBusinessHoursOverride > CreateBusinessHoursOver
             }
 
             return new ApiResponse<RestApiResultBusinessHoursOverride>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBusinessHoursOverride) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBusinessHoursOverride)));
         }
 
         /// <summary>
-        /// Create Business Hours Override for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="businessHoursOverride">Business Hours Override</param>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverride"></param>
         /// <returns>Task of RestApiResultBusinessHoursOverride</returns>
         public async System.Threading.Tasks.Task<RestApiResultBusinessHoursOverride> CreateBusinessHoursOverrideByStoreIdAsync (int? storeId, BusinessHoursOverrideBase businessHoursOverride)
         {
@@ -2464,11 +2852,11 @@ public async System.Threading.Tasks.Task<RestApiResultBusinessHoursOverride> Cre
         }
 
         /// <summary>
-        /// Create Business Hours Override for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="businessHoursOverride">Business Hours Override</param>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverride"></param>
         /// <returns>Task of ApiResponse (RestApiResultBusinessHoursOverride)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursOverride>> CreateBusinessHoursOverrideByStoreIdAsyncWithHttpInfo (int? storeId, BusinessHoursOverrideBase businessHoursOverride)
         {
@@ -2479,7 +2867,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursO
             if (businessHoursOverride == null)
                 throw new ApiException(400, "Missing required parameter 'businessHoursOverride' when calling StoresApi->CreateBusinessHoursOverrideByStoreId");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/businesshoursoverrides";
+            var localVarPath = "./api/v1.0/stores/{storeId}/businesshoursoverrides";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2539,16 +2927,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursO
             }
 
             return new ApiResponse<RestApiResultBusinessHoursOverride>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBusinessHoursOverride) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBusinessHoursOverride)));
         }
 
         /// <summary>
-        /// Create store with Store Group identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="store"></param>
         /// <returns>RestApiResultStore</returns>
         public RestApiResultStore CreateStore (int? storeGroupId, StoreCreateBase store)
         {
@@ -2557,11 +2945,11 @@ public RestApiResultStore CreateStore (int? storeGroupId, StoreCreateBase store)
         }
 
         /// <summary>
-        /// Create store with Store Group identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="store"></param>
         /// <returns>ApiResponse of RestApiResultStore</returns>
         public ApiResponse< RestApiResultStore > CreateStoreWithHttpInfo (int? storeGroupId, StoreCreateBase store)
         {
@@ -2572,7 +2960,7 @@ public ApiResponse< RestApiResultStore > CreateStoreWithHttpInfo (int? storeGrou
             if (store == null)
                 throw new ApiException(400, "Missing required parameter 'store' when calling StoresApi->CreateStore");
 
-            var localVarPath = "/api/v1.0/stores";
+            var localVarPath = "./api/v1.0/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2632,16 +3020,16 @@ public ApiResponse< RestApiResultStore > CreateStoreWithHttpInfo (int? storeGrou
             }
 
             return new ApiResponse<RestApiResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Create store with Store Group identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="store"></param>
         /// <returns>Task of RestApiResultStore</returns>
         public async System.Threading.Tasks.Task<RestApiResultStore> CreateStoreAsync (int? storeGroupId, StoreCreateBase store)
         {
@@ -2651,11 +3039,11 @@ public async System.Threading.Tasks.Task<RestApiResultStore> CreateStoreAsync (i
         }
 
         /// <summary>
-        /// Create store with Store Group identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeGroupId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeGroupId"></param>
+        /// <param name="store"></param>
         /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> CreateStoreAsyncWithHttpInfo (int? storeGroupId, StoreCreateBase store)
         {
@@ -2666,7 +3054,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> Create
             if (store == null)
                 throw new ApiException(400, "Missing required parameter 'store' when calling StoresApi->CreateStore");
 
-            var localVarPath = "/api/v1.0/stores";
+            var localVarPath = "./api/v1.0/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2726,40 +3114,47 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> Create
             }
 
             return new ApiResponse<RestApiResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Delete Business Hours Override for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId"></param>
-        /// <param name="businessHoursOverrideId"></param>
-        /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
-        public RestApiArrayResultRestApiDefaultResponse DeleteBusinessHoursOverride (int? storeId, int? businessHoursOverrideId)
+        /// <param name="storeGroupId"></param>
+        /// <param name="propertyId"></param>
+        /// <param name="store"></param>
+        /// <param name="autoAssignMenu"> (optional)</param>
+        /// <returns>RestApiResultStore</returns>
+        public RestApiResultStore CreateStoreInProperty (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null)
         {
-             ApiResponse<RestApiArrayResultRestApiDefaultResponse> localVarResponse = DeleteBusinessHoursOverrideWithHttpInfo(storeId, businessHoursOverrideId);
+             ApiResponse<RestApiResultStore> localVarResponse = CreateStoreInPropertyWithHttpInfo(storeGroupId, propertyId, store, autoAssignMenu);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Delete Business Hours Override for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId"></param>
-        /// <param name="businessHoursOverrideId"></param>
-        /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
-        public ApiResponse< RestApiArrayResultRestApiDefaultResponse > DeleteBusinessHoursOverrideWithHttpInfo (int? storeId, int? businessHoursOverrideId)
+        /// <param name="storeGroupId"></param>
+        /// <param name="propertyId"></param>
+        /// <param name="store"></param>
+        /// <param name="autoAssignMenu"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultStore</returns>
+        public ApiResponse< RestApiResultStore > CreateStoreInPropertyWithHttpInfo (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null)
         {
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->DeleteBusinessHoursOverride");
-            // verify the required parameter 'businessHoursOverrideId' is set
-            if (businessHoursOverrideId == null)
-                throw new ApiException(400, "Missing required parameter 'businessHoursOverrideId' when calling StoresApi->DeleteBusinessHoursOverride");
+            // verify the required parameter 'storeGroupId' is set
+            if (storeGroupId == null)
+                throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoresApi->CreateStoreInProperty");
+            // verify the required parameter 'propertyId' is set
+            if (propertyId == null)
+                throw new ApiException(400, "Missing required parameter 'propertyId' when calling StoresApi->CreateStoreInProperty");
+            // verify the required parameter 'store' is set
+            if (store == null)
+                throw new ApiException(400, "Missing required parameter 'store' when calling StoresApi->CreateStoreInProperty");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/businesshoursoverrides/{businessHoursOverrideId}";
+            var localVarPath = "./api/v1.0/properties/{propertyId}/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2769,6 +3164,11 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > DeleteBusinessHou
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -2783,8 +3183,17 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > DeleteBusinessHou
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (businessHoursOverrideId != null) localVarPathParams.Add("businessHoursOverrideId", this.Configuration.ApiClient.ParameterToString(businessHoursOverrideId)); // path parameter
+            if (propertyId != null) localVarPathParams.Add("propertyId", this.Configuration.ApiClient.ParameterToString(propertyId)); // path parameter
+            if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
+            if (autoAssignMenu != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "autoAssignMenu", autoAssignMenu)); // query parameter
+            if (store != null && store.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(store); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = store; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -2795,53 +3204,60 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > DeleteBusinessHou
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DeleteBusinessHoursOverride", localVarResponse);
+                Exception exception = ExceptionFactory("CreateStoreInProperty", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
+            return new ApiResponse<RestApiResultStore>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Delete Business Hours Override for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId"></param>
-        /// <param name="businessHoursOverrideId"></param>
-        /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> DeleteBusinessHoursOverrideAsync (int? storeId, int? businessHoursOverrideId)
+        /// <param name="storeGroupId"></param>
+        /// <param name="propertyId"></param>
+        /// <param name="store"></param>
+        /// <param name="autoAssignMenu"> (optional)</param>
+        /// <returns>Task of RestApiResultStore</returns>
+        public async System.Threading.Tasks.Task<RestApiResultStore> CreateStoreInPropertyAsync (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null)
         {
-             ApiResponse<RestApiArrayResultRestApiDefaultResponse> localVarResponse = await DeleteBusinessHoursOverrideAsyncWithHttpInfo(storeId, businessHoursOverrideId);
+             ApiResponse<RestApiResultStore> localVarResponse = await CreateStoreInPropertyAsyncWithHttpInfo(storeGroupId, propertyId, store, autoAssignMenu);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Delete Business Hours Override for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId"></param>
-        /// <param name="businessHoursOverrideId"></param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> DeleteBusinessHoursOverrideAsyncWithHttpInfo (int? storeId, int? businessHoursOverrideId)
+        /// <param name="storeGroupId"></param>
+        /// <param name="propertyId"></param>
+        /// <param name="store"></param>
+        /// <param name="autoAssignMenu"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> CreateStoreInPropertyAsyncWithHttpInfo (int? storeGroupId, string propertyId, StoreCreateBase store, bool? autoAssignMenu = null)
         {
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->DeleteBusinessHoursOverride");
-            // verify the required parameter 'businessHoursOverrideId' is set
-            if (businessHoursOverrideId == null)
-                throw new ApiException(400, "Missing required parameter 'businessHoursOverrideId' when calling StoresApi->DeleteBusinessHoursOverride");
+            // verify the required parameter 'storeGroupId' is set
+            if (storeGroupId == null)
+                throw new ApiException(400, "Missing required parameter 'storeGroupId' when calling StoresApi->CreateStoreInProperty");
+            // verify the required parameter 'propertyId' is set
+            if (propertyId == null)
+                throw new ApiException(400, "Missing required parameter 'propertyId' when calling StoresApi->CreateStoreInProperty");
+            // verify the required parameter 'store' is set
+            if (store == null)
+                throw new ApiException(400, "Missing required parameter 'store' when calling StoresApi->CreateStoreInProperty");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/businesshoursoverrides/{businessHoursOverrideId}";
+            var localVarPath = "./api/v1.0/properties/{propertyId}/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2851,6 +3267,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -2865,8 +3286,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (businessHoursOverrideId != null) localVarPathParams.Add("businessHoursOverrideId", this.Configuration.ApiClient.ParameterToString(businessHoursOverrideId)); // path parameter
+            if (propertyId != null) localVarPathParams.Add("propertyId", this.Configuration.ApiClient.ParameterToString(propertyId)); // path parameter
+            if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
+            if (autoAssignMenu != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "autoAssignMenu", autoAssignMenu)); // query parameter
+            if (store != null && store.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(store); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = store; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -2877,47 +3307,52 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("DeleteBusinessHoursOverride", localVarResponse);
+                Exception exception = ExceptionFactory("CreateStoreInProperty", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
+            return new ApiResponse<RestApiResultStore>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Get Stores Bank Account Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>RestApiResultAssignedBankAccount</returns>
-        public RestApiResultAssignedBankAccount GetBankAccountForStore (int? storeId)
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverrideId"></param>
+        /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
+        public RestApiArrayResultRestApiDefaultResponse DeleteBusinessHoursOverride (int? storeId, int? businessHoursOverrideId)
         {
-             ApiResponse<RestApiResultAssignedBankAccount> localVarResponse = GetBankAccountForStoreWithHttpInfo(storeId);
+             ApiResponse<RestApiArrayResultRestApiDefaultResponse> localVarResponse = DeleteBusinessHoursOverrideWithHttpInfo(storeId, businessHoursOverrideId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get Stores Bank Account Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>ApiResponse of RestApiResultAssignedBankAccount</returns>
-        public ApiResponse< RestApiResultAssignedBankAccount > GetBankAccountForStoreWithHttpInfo (int? storeId)
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverrideId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
+        public ApiResponse< RestApiArrayResultRestApiDefaultResponse > DeleteBusinessHoursOverrideWithHttpInfo (int? storeId, int? businessHoursOverrideId)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetBankAccountForStore");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->DeleteBusinessHoursOverride");
+            // verify the required parameter 'businessHoursOverrideId' is set
+            if (businessHoursOverrideId == null)
+                throw new ApiException(400, "Missing required parameter 'businessHoursOverrideId' when calling StoresApi->DeleteBusinessHoursOverride");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/bankaccount";
+            var localVarPath = "./api/v1.0/stores/{storeId}/businesshoursoverrides/{businessHoursOverrideId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2942,6 +3377,7 @@ public ApiResponse< RestApiResultAssignedBankAccount > GetBankAccountForStoreWit
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (businessHoursOverrideId != null) localVarPathParams.Add("businessHoursOverrideId", this.Configuration.ApiClient.ParameterToString(businessHoursOverrideId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -2952,27 +3388,184 @@ public ApiResponse< RestApiResultAssignedBankAccount > GetBankAccountForStoreWit
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetBankAccountForStore", localVarResponse);
+                Exception exception = ExceptionFactory("DeleteBusinessHoursOverride", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultAssignedBankAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultAssignedBankAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAssignedBankAccount)));
+            return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverrideId"></param>
+        /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> DeleteBusinessHoursOverrideAsync (int? storeId, int? businessHoursOverrideId)
+        {
+             ApiResponse<RestApiArrayResultRestApiDefaultResponse> localVarResponse = await DeleteBusinessHoursOverrideAsyncWithHttpInfo(storeId, businessHoursOverrideId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="businessHoursOverrideId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> DeleteBusinessHoursOverrideAsyncWithHttpInfo (int? storeId, int? businessHoursOverrideId)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->DeleteBusinessHoursOverride");
+            // verify the required parameter 'businessHoursOverrideId' is set
+            if (businessHoursOverrideId == null)
+                throw new ApiException(400, "Missing required parameter 'businessHoursOverrideId' when calling StoresApi->DeleteBusinessHoursOverride");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/businesshoursoverrides/{businessHoursOverrideId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (businessHoursOverrideId != null) localVarPathParams.Add("businessHoursOverrideId", this.Configuration.ApiClient.ParameterToString(businessHoursOverrideId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("DeleteBusinessHoursOverride", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultAssignedBankAccount</returns>
+        public RestApiResultAssignedBankAccount GetBankAccountForStore (int? storeId)
+        {
+             ApiResponse<RestApiResultAssignedBankAccount> localVarResponse = GetBankAccountForStoreWithHttpInfo(storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultAssignedBankAccount</returns>
+        public ApiResponse< RestApiResultAssignedBankAccount > GetBankAccountForStoreWithHttpInfo (int? storeId)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetBankAccountForStore");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/bankaccount";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetBankAccountForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAssignedBankAccount>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAssignedBankAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAssignedBankAccount)));
         }
 
         /// <summary>
-        /// Get Stores Bank Account Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultAssignedBankAccount</returns>
         public async System.Threading.Tasks.Task<RestApiResultAssignedBankAccount> GetBankAccountForStoreAsync (int? storeId)
         {
@@ -2982,10 +3575,10 @@ public async System.Threading.Tasks.Task<RestApiResultAssignedBankAccount> GetBa
         }
 
         /// <summary>
-        /// Get Stores Bank Account Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultAssignedBankAccount)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAssignedBankAccount>> GetBankAccountForStoreAsyncWithHttpInfo (int? storeId)
         {
@@ -2993,7 +3586,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAssignedBankAc
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetBankAccountForStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/bankaccount";
+            var localVarPath = "./api/v1.0/stores/{storeId}/bankaccount";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3040,16 +3633,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAssignedBankAc
             }
 
             return new ApiResponse<RestApiResultAssignedBankAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultAssignedBankAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAssignedBankAccount)));
         }
 
         /// <summary>
-        /// Get Business hours 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>RestApiArrayResultBusinessHoursPeriod</returns>
         public RestApiArrayResultBusinessHoursPeriod GetBusinessHours (int? storeId, string deliveryType)
         {
@@ -3058,11 +3651,11 @@ public RestApiArrayResultBusinessHoursPeriod GetBusinessHours (int? storeId, str
         }
 
         /// <summary>
-        /// Get Business hours 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>ApiResponse of RestApiArrayResultBusinessHoursPeriod</returns>
         public ApiResponse< RestApiArrayResultBusinessHoursPeriod > GetBusinessHoursWithHttpInfo (int? storeId, string deliveryType)
         {
@@ -3073,7 +3666,7 @@ public ApiResponse< RestApiArrayResultBusinessHoursPeriod > GetBusinessHoursWith
             if (deliveryType == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->GetBusinessHours");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/availability/{deliveryType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/availability/{deliveryType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3121,16 +3714,16 @@ public ApiResponse< RestApiArrayResultBusinessHoursPeriod > GetBusinessHoursWith
             }
 
             return new ApiResponse<RestApiArrayResultBusinessHoursPeriod>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultBusinessHoursPeriod) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultBusinessHoursPeriod)));
         }
 
         /// <summary>
-        /// Get Business hours 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of RestApiArrayResultBusinessHoursPeriod</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultBusinessHoursPeriod> GetBusinessHoursAsync (int? storeId, string deliveryType)
         {
@@ -3140,11 +3733,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultBusinessHoursPeriod>
         }
 
         /// <summary>
-        /// Get Business hours 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultBusinessHoursPeriod)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultBusinessHoursPeriod>> GetBusinessHoursAsyncWithHttpInfo (int? storeId, string deliveryType)
         {
@@ -3155,7 +3748,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultBusinessH
             if (deliveryType == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->GetBusinessHours");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/availability/{deliveryType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/availability/{deliveryType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3203,18 +3796,18 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultBusinessH
             }
 
             return new ApiResponse<RestApiArrayResultBusinessHoursPeriod>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultBusinessHoursPeriod) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultBusinessHoursPeriod)));
         }
 
         /// <summary>
-        /// Get business hours overrides by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="after">Return results that ended after this datetime. Default value is the current datetime. (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="after"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultBusinessHoursOverride</returns>
         public RestApiPaginationResultBusinessHoursOverride GetBusinessHoursOverrideByStoreId (int? storeId, DateTime? after = null, int? page = null, int? limit = null)
         {
@@ -3223,13 +3816,13 @@ public RestApiPaginationResultBusinessHoursOverride GetBusinessHoursOverrideBySt
         }
 
         /// <summary>
-        /// Get business hours overrides by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="after">Return results that ended after this datetime. Default value is the current datetime. (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="after"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultBusinessHoursOverride</returns>
         public ApiResponse< RestApiPaginationResultBusinessHoursOverride > GetBusinessHoursOverrideByStoreIdWithHttpInfo (int? storeId, DateTime? after = null, int? page = null, int? limit = null)
         {
@@ -3237,7 +3830,7 @@ public ApiResponse< RestApiPaginationResultBusinessHoursOverride > GetBusinessHo
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetBusinessHoursOverrideByStoreId");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/businesshoursoverrides";
+            var localVarPath = "./api/v1.0/stores/{storeId}/businesshoursoverrides";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3287,18 +3880,18 @@ public ApiResponse< RestApiPaginationResultBusinessHoursOverride > GetBusinessHo
             }
 
             return new ApiResponse<RestApiPaginationResultBusinessHoursOverride>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultBusinessHoursOverride) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultBusinessHoursOverride)));
         }
 
         /// <summary>
-        /// Get business hours overrides by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="after">Return results that ended after this datetime. Default value is the current datetime. (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="after"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultBusinessHoursOverride</returns>
         public async System.Threading.Tasks.Task<RestApiPaginationResultBusinessHoursOverride> GetBusinessHoursOverrideByStoreIdAsync (int? storeId, DateTime? after = null, int? page = null, int? limit = null)
         {
@@ -3308,13 +3901,13 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultBusinessHoursOve
         }
 
         /// <summary>
-        /// Get business hours overrides by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="after">Return results that ended after this datetime. Default value is the current datetime. (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="after"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultBusinessHoursOverride)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultBusinessHoursOverride>> GetBusinessHoursOverrideByStoreIdAsyncWithHttpInfo (int? storeId, DateTime? after = null, int? page = null, int? limit = null)
         {
@@ -3322,7 +3915,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultBusi
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetBusinessHoursOverrideByStoreId");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/businesshoursoverrides";
+            var localVarPath = "./api/v1.0/stores/{storeId}/businesshoursoverrides";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3372,16 +3965,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultBusi
             }
 
             return new ApiResponse<RestApiPaginationResultBusinessHoursOverride>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultBusinessHoursOverride) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultBusinessHoursOverride)));
         }
 
         /// <summary>
-        /// Get store end of day report 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="date">Store identifier (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="date"> (optional)</param>
         /// <returns>RestApiResultStoreEndOfDayReport</returns>
         public RestApiResultStoreEndOfDayReport GetEndOfDayReport (int? storeId, DateTime? date = null)
         {
@@ -3390,11 +3983,11 @@ public RestApiResultStoreEndOfDayReport GetEndOfDayReport (int? storeId, DateTim
         }
 
         /// <summary>
-        /// Get store end of day report 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="date">Store identifier (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="date"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultStoreEndOfDayReport</returns>
         public ApiResponse< RestApiResultStoreEndOfDayReport > GetEndOfDayReportWithHttpInfo (int? storeId, DateTime? date = null)
         {
@@ -3402,7 +3995,7 @@ public ApiResponse< RestApiResultStoreEndOfDayReport > GetEndOfDayReportWithHttp
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetEndOfDayReport");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/endofdayreport";
+            var localVarPath = "./api/v1.0/stores/{storeId}/endofdayreport";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3450,16 +4043,16 @@ public ApiResponse< RestApiResultStoreEndOfDayReport > GetEndOfDayReportWithHttp
             }
 
             return new ApiResponse<RestApiResultStoreEndOfDayReport>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreEndOfDayReport) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreEndOfDayReport)));
         }
 
         /// <summary>
-        /// Get store end of day report 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="date">Store identifier (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="date"> (optional)</param>
         /// <returns>Task of RestApiResultStoreEndOfDayReport</returns>
         public async System.Threading.Tasks.Task<RestApiResultStoreEndOfDayReport> GetEndOfDayReportAsync (int? storeId, DateTime? date = null)
         {
@@ -3469,11 +4062,11 @@ public async System.Threading.Tasks.Task<RestApiResultStoreEndOfDayReport> GetEn
         }
 
         /// <summary>
-        /// Get store end of day report 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="date">Store identifier (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="date"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultStoreEndOfDayReport)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreEndOfDayReport>> GetEndOfDayReportAsyncWithHttpInfo (int? storeId, DateTime? date = null)
         {
@@ -3481,7 +4074,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreEndOfDayR
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetEndOfDayReport");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/endofdayreport";
+            var localVarPath = "./api/v1.0/stores/{storeId}/endofdayreport";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3529,16 +4122,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreEndOfDayR
             }
 
             return new ApiResponse<RestApiResultStoreEndOfDayReport>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreEndOfDayReport) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreEndOfDayReport)));
         }
 
         /// <summary>
-        /// Get the pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>RestApiResultPreOrderConfig</returns>
         public RestApiResultPreOrderConfig GetPreOrderConfig (int? storeId, string deliveryType)
         {
@@ -3547,11 +4140,11 @@ public RestApiResultPreOrderConfig GetPreOrderConfig (int? storeId, string deliv
         }
 
         /// <summary>
-        /// Get the pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>ApiResponse of RestApiResultPreOrderConfig</returns>
         public ApiResponse< RestApiResultPreOrderConfig > GetPreOrderConfigWithHttpInfo (int? storeId, string deliveryType)
         {
@@ -3562,7 +4155,7 @@ public ApiResponse< RestApiResultPreOrderConfig > GetPreOrderConfigWithHttpInfo
             if (deliveryType == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->GetPreOrderConfig");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3610,16 +4203,16 @@ public ApiResponse< RestApiResultPreOrderConfig > GetPreOrderConfigWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultPreOrderConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPreOrderConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPreOrderConfig)));
         }
 
         /// <summary>
-        /// Get the pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of RestApiResultPreOrderConfig</returns>
         public async System.Threading.Tasks.Task<RestApiResultPreOrderConfig> GetPreOrderConfigAsync (int? storeId, string deliveryType)
         {
@@ -3629,11 +4222,11 @@ public async System.Threading.Tasks.Task<RestApiResultPreOrderConfig> GetPreOrde
         }
 
         /// <summary>
-        /// Get the pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <returns>Task of ApiResponse (RestApiResultPreOrderConfig)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPreOrderConfig>> GetPreOrderConfigAsyncWithHttpInfo (int? storeId, string deliveryType)
         {
@@ -3644,7 +4237,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPreOrderConfig
             if (deliveryType == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->GetPreOrderConfig");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3692,16 +4285,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPreOrderConfig
             }
 
             return new ApiResponse<RestApiResultPreOrderConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultPreOrderConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPreOrderConfig)));
         }
 
         /// <summary>
-        /// Get the Preview times of the pre-order configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <param name="preOrderConfigLeadTimeMinutes">Lead Time in Minutes (optional)</param>
         /// <param name="preOrderConfigIntervalMinutes">Interval in minutes (optional)</param>
         /// <param name="preOrderConfigMaxOrderAheadDays">Max Days to order ahead (optional)</param>
@@ -3720,11 +4313,11 @@ public RestApiArrayResultPreOrderTime GetPreOrderPreview (int? storeId, string d
         }
 
         /// <summary>
-        /// Get the Preview times of the pre-order configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <param name="preOrderConfigLeadTimeMinutes">Lead Time in Minutes (optional)</param>
         /// <param name="preOrderConfigIntervalMinutes">Interval in minutes (optional)</param>
         /// <param name="preOrderConfigMaxOrderAheadDays">Max Days to order ahead (optional)</param>
@@ -3745,7 +4338,7 @@ public ApiResponse< RestApiArrayResultPreOrderTime > GetPreOrderPreviewWithHttpI
             if (deliveryType == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->GetPreOrderPreview");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/preview";
+            var localVarPath = "./api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/preview";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3808,16 +4401,16 @@ public ApiResponse< RestApiArrayResultPreOrderTime > GetPreOrderPreviewWithHttpI
             }
 
             return new ApiResponse<RestApiArrayResultPreOrderTime>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultPreOrderTime) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultPreOrderTime)));
         }
 
         /// <summary>
-        /// Get the Preview times of the pre-order configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <param name="preOrderConfigLeadTimeMinutes">Lead Time in Minutes (optional)</param>
         /// <param name="preOrderConfigIntervalMinutes">Interval in minutes (optional)</param>
         /// <param name="preOrderConfigMaxOrderAheadDays">Max Days to order ahead (optional)</param>
@@ -3837,11 +4430,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultPreOrderTime> GetPreO
         }
 
         /// <summary>
-        /// Get the Preview times of the pre-order configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
         /// <param name="preOrderConfigLeadTimeMinutes">Lead Time in Minutes (optional)</param>
         /// <param name="preOrderConfigIntervalMinutes">Interval in minutes (optional)</param>
         /// <param name="preOrderConfigMaxOrderAheadDays">Max Days to order ahead (optional)</param>
@@ -3862,7 +4455,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPreOrderT
             if (deliveryType == null)
                 throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->GetPreOrderPreview");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/preview";
+            var localVarPath = "./api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/preview";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -3925,16 +4518,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPreOrderT
             }
 
             return new ApiResponse<RestApiArrayResultPreOrderTime>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultPreOrderTime) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultPreOrderTime)));
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>RestApiArrayResultProcessingFeeConfig</returns>
         public RestApiArrayResultProcessingFeeConfig GetProcessingFeeConfigsByStoreId (int? storeId, string appNameId = null)
         {
@@ -3943,11 +4536,11 @@ public RestApiArrayResultProcessingFeeConfig GetProcessingFeeConfigsByStoreId (i
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultProcessingFeeConfig</returns>
         public ApiResponse< RestApiArrayResultProcessingFeeConfig > GetProcessingFeeConfigsByStoreIdWithHttpInfo (int? storeId, string appNameId = null)
         {
@@ -3955,7 +4548,7 @@ public ApiResponse< RestApiArrayResultProcessingFeeConfig > GetProcessingFeeConf
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetProcessingFeeConfigsByStoreId");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/processingfeeconfigs";
+            var localVarPath = "./api/v1.0/stores/{storeId}/processingfeeconfigs";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4003,16 +4596,16 @@ public ApiResponse< RestApiArrayResultProcessingFeeConfig > GetProcessingFeeConf
             }
 
             return new ApiResponse<RestApiArrayResultProcessingFeeConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultProcessingFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultProcessingFeeConfig)));
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of RestApiArrayResultProcessingFeeConfig</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdAsync (int? storeId, string appNameId = null)
         {
@@ -4022,11 +4615,11 @@ public async System.Threading.Tasks.Task<RestApiArrayResultProcessingFeeConfig>
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultProcessingFeeConfig)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultProcessingFeeConfig>> GetProcessingFeeConfigsByStoreIdAsyncWithHttpInfo (int? storeId, string appNameId = null)
         {
@@ -4034,7 +4627,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultProcessin
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetProcessingFeeConfigsByStoreId");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/processingfeeconfigs";
+            var localVarPath = "./api/v1.0/stores/{storeId}/processingfeeconfigs";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4082,17 +4675,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultProcessin
             }
 
             return new ApiResponse<RestApiArrayResultProcessingFeeConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultProcessingFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultProcessingFeeConfig)));
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="paymentAccountType"></param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>RestApiResultProcessingFeeConfig</returns>
         public RestApiResultProcessingFeeConfig GetProcessingFeeConfigsByStoreIdAndPaymentAccountType (int? storeId, string paymentAccountType, string appNameId = null)
         {
@@ -4101,12 +4694,12 @@ public RestApiResultProcessingFeeConfig GetProcessingFeeConfigsByStoreIdAndPayme
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="paymentAccountType"></param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultProcessingFeeConfig</returns>
         public ApiResponse< RestApiResultProcessingFeeConfig > GetProcessingFeeConfigsByStoreIdAndPaymentAccountTypeWithHttpInfo (int? storeId, string paymentAccountType, string appNameId = null)
         {
@@ -4117,7 +4710,7 @@ public ApiResponse< RestApiResultProcessingFeeConfig > GetProcessingFeeConfigsBy
             if (paymentAccountType == null)
                 throw new ApiException(400, "Missing required parameter 'paymentAccountType' when calling StoresApi->GetProcessingFeeConfigsByStoreIdAndPaymentAccountType");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/processingfeeconfigs/{paymentAccountType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/processingfeeconfigs/{paymentAccountType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4166,17 +4759,17 @@ public ApiResponse< RestApiResultProcessingFeeConfig > GetProcessingFeeConfigsBy
             }
 
             return new ApiResponse<RestApiResultProcessingFeeConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultProcessingFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultProcessingFeeConfig)));
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="paymentAccountType"></param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of RestApiResultProcessingFeeConfig</returns>
         public async System.Threading.Tasks.Task<RestApiResultProcessingFeeConfig> GetProcessingFeeConfigsByStoreIdAndPaymentAccountTypeAsync (int? storeId, string paymentAccountType, string appNameId = null)
         {
@@ -4186,12 +4779,12 @@ public async System.Threading.Tasks.Task<RestApiResultProcessingFeeConfig> GetPr
         }
 
         /// <summary>
-        /// Get processing fee configs by store identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <param name="paymentAccountType"></param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultProcessingFeeConfig)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultProcessingFeeConfig>> GetProcessingFeeConfigsByStoreIdAndPaymentAccountTypeAsyncWithHttpInfo (int? storeId, string paymentAccountType, string appNameId = null)
         {
@@ -4202,7 +4795,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultProcessingFeeC
             if (paymentAccountType == null)
                 throw new ApiException(400, "Missing required parameter 'paymentAccountType' when calling StoresApi->GetProcessingFeeConfigsByStoreIdAndPaymentAccountType");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/processingfeeconfigs/{paymentAccountType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/processingfeeconfigs/{paymentAccountType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4251,15 +4844,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultProcessingFeeC
             }
 
             return new ApiResponse<RestApiResultProcessingFeeConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultProcessingFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultProcessingFeeConfig)));
         }
 
         /// <summary>
-        /// Get store by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultStore</returns>
         public RestApiResultStore GetStoreById (int? storeId)
         {
@@ -4268,10 +4861,10 @@ public RestApiResultStore GetStoreById (int? storeId)
         }
 
         /// <summary>
-        /// Get store by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultStore</returns>
         public ApiResponse< RestApiResultStore > GetStoreByIdWithHttpInfo (int? storeId)
         {
@@ -4279,7 +4872,7 @@ public ApiResponse< RestApiResultStore > GetStoreByIdWithHttpInfo (int? storeId)
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreById");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4326,15 +4919,15 @@ public ApiResponse< RestApiResultStore > GetStoreByIdWithHttpInfo (int? storeId)
             }
 
             return new ApiResponse<RestApiResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Get store by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultStore</returns>
         public async System.Threading.Tasks.Task<RestApiResultStore> GetStoreByIdAsync (int? storeId)
         {
@@ -4344,10 +4937,10 @@ public async System.Threading.Tasks.Task<RestApiResultStore> GetStoreByIdAsync (
         }
 
         /// <summary>
-        /// Get store by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> GetStoreByIdAsyncWithHttpInfo (int? storeId)
         {
@@ -4355,7 +4948,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> GetSto
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreById");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4402,35 +4995,35 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> GetSto
             }
 
             return new ApiResponse<RestApiResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Retrieve Store feeConfig 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>StoreFeeConfig</returns>
-        public StoreFeeConfig GetStoreFeeConfig (int? storeId)
+        /// <param name="storeId"></param>
+        /// <returns>RestApiArrayResultStoreDeliveryZoneFeeConfig</returns>
+        public RestApiArrayResultStoreDeliveryZoneFeeConfig GetStoreDeliveryFeeConfig (int? storeId)
         {
-             ApiResponse<StoreFeeConfig> localVarResponse = GetStoreFeeConfigWithHttpInfo(storeId);
+             ApiResponse<RestApiArrayResultStoreDeliveryZoneFeeConfig> localVarResponse = GetStoreDeliveryFeeConfigWithHttpInfo(storeId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Retrieve Store feeConfig 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>ApiResponse of StoreFeeConfig</returns>
-        public ApiResponse< StoreFeeConfig > GetStoreFeeConfigWithHttpInfo (int? storeId)
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultStoreDeliveryZoneFeeConfig</returns>
+        public ApiResponse< RestApiArrayResultStoreDeliveryZoneFeeConfig > GetStoreDeliveryFeeConfigWithHttpInfo (int? storeId)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreFeeConfig");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreDeliveryFeeConfig");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/feeConfig";
+            var localVarPath = "./api/v1.0/stores/{storeId}/feeConfig/deliveryZones";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4472,41 +5065,41 @@ public ApiResponse< StoreFeeConfig > GetStoreFeeConfigWithHttpInfo (int? storeId
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoreFeeConfig", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreDeliveryFeeConfig", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<StoreFeeConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (StoreFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(StoreFeeConfig)));
+            return new ApiResponse<RestApiArrayResultStoreDeliveryZoneFeeConfig>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultStoreDeliveryZoneFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreDeliveryZoneFeeConfig)));
         }
 
         /// <summary>
-        /// Retrieve Store feeConfig 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>Task of StoreFeeConfig</returns>
-        public async System.Threading.Tasks.Task<StoreFeeConfig> GetStoreFeeConfigAsync (int? storeId)
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiArrayResultStoreDeliveryZoneFeeConfig</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultStoreDeliveryZoneFeeConfig> GetStoreDeliveryFeeConfigAsync (int? storeId)
         {
-             ApiResponse<StoreFeeConfig> localVarResponse = await GetStoreFeeConfigAsyncWithHttpInfo(storeId);
+             ApiResponse<RestApiArrayResultStoreDeliveryZoneFeeConfig> localVarResponse = await GetStoreDeliveryFeeConfigAsyncWithHttpInfo(storeId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Retrieve Store feeConfig 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>Task of ApiResponse (StoreFeeConfig)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<StoreFeeConfig>> GetStoreFeeConfigAsyncWithHttpInfo (int? storeId)
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultStoreDeliveryZoneFeeConfig)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreDeliveryZoneFeeConfig>> GetStoreDeliveryFeeConfigAsyncWithHttpInfo (int? storeId)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreFeeConfig");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreDeliveryFeeConfig");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/feeConfig";
+            var localVarPath = "./api/v1.0/stores/{storeId}/feeConfig/deliveryZones";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4548,46 +5141,40 @@ public async System.Threading.Tasks.Task<ApiResponse<StoreFeeConfig>> GetStoreFe
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoreFeeConfig", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreDeliveryFeeConfig", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<StoreFeeConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (StoreFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(StoreFeeConfig)));
+            return new ApiResponse<RestApiArrayResultStoreDeliveryZoneFeeConfig>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultStoreDeliveryZoneFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreDeliveryZoneFeeConfig)));
         }
 
         /// <summary>
-        /// Get all stores by app name id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeNameQuery"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>RestApiPaginationResultStoreHeader</returns>
-        public RestApiPaginationResultStoreHeader GetStoreHeadersByAppId (string appId, string storeNameQuery = null, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <returns>StoreFeeConfig</returns>
+        public StoreFeeConfig GetStoreFeeConfig (int? storeId)
         {
-             ApiResponse<RestApiPaginationResultStoreHeader> localVarResponse = GetStoreHeadersByAppIdWithHttpInfo(appId, storeNameQuery, page, limit);
+             ApiResponse<StoreFeeConfig> localVarResponse = GetStoreFeeConfigWithHttpInfo(storeId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get all stores by app name id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeNameQuery"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultStoreHeader</returns>
-        public ApiResponse< RestApiPaginationResultStoreHeader > GetStoreHeadersByAppIdWithHttpInfo (string appId, string storeNameQuery = null, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of StoreFeeConfig</returns>
+        public ApiResponse< StoreFeeConfig > GetStoreFeeConfigWithHttpInfo (int? storeId)
         {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoreHeadersByAppId");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreFeeConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/header";
+            var localVarPath = "./api/v1.0/stores/{storeId}/feeConfig";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4611,10 +5198,7 @@ public ApiResponse< RestApiPaginationResultStoreHeader > GetStoreHeadersByAppIdW
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeNameQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeNameQuery", storeNameQuery)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -4632,47 +5216,41 @@ public ApiResponse< RestApiPaginationResultStoreHeader > GetStoreHeadersByAppIdW
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoreHeadersByAppId", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreFeeConfig", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultStoreHeader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultStoreHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreHeader)));
+            return new ApiResponse<StoreFeeConfig>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (StoreFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(StoreFeeConfig)));
         }
 
         /// <summary>
-        /// Get all stores by app name id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeNameQuery"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of RestApiPaginationResultStoreHeader</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultStoreHeader> GetStoreHeadersByAppIdAsync (string appId, string storeNameQuery = null, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <returns>Task of StoreFeeConfig</returns>
+        public async System.Threading.Tasks.Task<StoreFeeConfig> GetStoreFeeConfigAsync (int? storeId)
         {
-             ApiResponse<RestApiPaginationResultStoreHeader> localVarResponse = await GetStoreHeadersByAppIdAsyncWithHttpInfo(appId, storeNameQuery, page, limit);
+             ApiResponse<StoreFeeConfig> localVarResponse = await GetStoreFeeConfigAsyncWithHttpInfo(storeId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get all stores by app name id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeNameQuery"> (optional)</param>
-        /// <param name="page"> (optional)</param>
-        /// <param name="limit"> (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultStoreHeader)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreHeader>> GetStoreHeadersByAppIdAsyncWithHttpInfo (string appId, string storeNameQuery = null, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (StoreFeeConfig)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<StoreFeeConfig>> GetStoreFeeConfigAsyncWithHttpInfo (int? storeId)
         {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoreHeadersByAppId");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreFeeConfig");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/header";
+            var localVarPath = "./api/v1.0/stores/{storeId}/feeConfig";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4696,10 +5274,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeNameQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeNameQuery", storeNameQuery)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -4717,45 +5292,48 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoreHeadersByAppId", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreFeeConfig", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultStoreHeader>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultStoreHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreHeader)));
+            return new ApiResponse<StoreFeeConfig>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (StoreFeeConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(StoreFeeConfig)));
         }
 
         /// <summary>
-        /// Get stores statistics by app name id and storeIds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Ids</param>
-        /// <returns>RestApiArrayResultStoreStatistics</returns>
-        public RestApiArrayResultStoreStatistics GetStoreNetSales (string appId, List<int?> storeId)
+        /// <param name="appId"></param>
+        /// <param name="storeNameQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>RestApiPaginationResultStoreHeader</returns>
+        public RestApiPaginationResultStoreHeader GetStoreHeadersByAppId (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null)
         {
-             ApiResponse<RestApiArrayResultStoreStatistics> localVarResponse = GetStoreNetSalesWithHttpInfo(appId, storeId);
+             ApiResponse<RestApiPaginationResultStoreHeader> localVarResponse = GetStoreHeadersByAppIdWithHttpInfo(appId, storeNameQuery, salesChannelType, page, limit);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get stores statistics by app name id and storeIds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Ids</param>
-        /// <returns>ApiResponse of RestApiArrayResultStoreStatistics</returns>
-        public ApiResponse< RestApiArrayResultStoreStatistics > GetStoreNetSalesWithHttpInfo (string appId, List<int?> storeId)
+        /// <param name="appId"></param>
+        /// <param name="storeNameQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultStoreHeader</returns>
+        public ApiResponse< RestApiPaginationResultStoreHeader > GetStoreHeadersByAppIdWithHttpInfo (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoreNetSales");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreNetSales");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoreHeadersByAppId");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/stats";
+            var localVarPath = "./api/v1.0/{appId}/stores/header";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4780,7 +5358,10 @@ public ApiResponse< RestApiArrayResultStoreStatistics > GetStoreNetSalesWithHttp
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+            if (storeNameQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeNameQuery", storeNameQuery)); // query parameter
+            if (salesChannelType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "salesChannelType", salesChannelType)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -4798,46 +5379,49 @@ public ApiResponse< RestApiArrayResultStoreStatistics > GetStoreNetSalesWithHttp
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoreNetSales", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreHeadersByAppId", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultStoreStatistics>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultStoreStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreStatistics)));
+            return new ApiResponse<RestApiPaginationResultStoreHeader>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultStoreHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreHeader)));
         }
 
         /// <summary>
-        /// Get stores statistics by app name id and storeIds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Ids</param>
-        /// <returns>Task of RestApiArrayResultStoreStatistics</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultStoreStatistics> GetStoreNetSalesAsync (string appId, List<int?> storeId)
+        /// <param name="appId"></param>
+        /// <param name="storeNameQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultStoreHeader</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultStoreHeader> GetStoreHeadersByAppIdAsync (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null)
         {
-             ApiResponse<RestApiArrayResultStoreStatistics> localVarResponse = await GetStoreNetSalesAsyncWithHttpInfo(appId, storeId);
+             ApiResponse<RestApiPaginationResultStoreHeader> localVarResponse = await GetStoreHeadersByAppIdAsyncWithHttpInfo(appId, storeNameQuery, salesChannelType, page, limit);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get stores statistics by app name id and storeIds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="storeId">Store Ids</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultStoreStatistics)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreStatistics>> GetStoreNetSalesAsyncWithHttpInfo (string appId, List<int?> storeId)
+        /// <param name="appId"></param>
+        /// <param name="storeNameQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultStoreHeader)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreHeader>> GetStoreHeadersByAppIdAsyncWithHttpInfo (string appId, string storeNameQuery = null, string salesChannelType = null, int? page = null, int? limit = null)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoreNetSales");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreNetSales");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoreHeadersByAppId");
 
-            var localVarPath = "/api/v1.0/{appId}/stores/stats";
+            var localVarPath = "./api/v1.0/{appId}/stores/header";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4862,7 +5446,10 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreStat
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+            if (storeNameQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeNameQuery", storeNameQuery)); // query parameter
+            if (salesChannelType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "salesChannelType", salesChannelType)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -4880,40 +5467,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreStat
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoreNetSales", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreHeadersByAppId", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultStoreStatistics>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultStoreStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreStatistics)));
+            return new ApiResponse<RestApiPaginationResultStoreHeader>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultStoreHeader) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreHeader)));
         }
 
         /// <summary>
-        /// Retrieve Store Service Charge 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>ServiceCharge</returns>
-        public ServiceCharge GetStoreServiceCharge (int? storeId)
+        /// <param name="storeId"></param>
+        /// <returns>RestApiResultOrderLeadTimes</returns>
+        public RestApiResultOrderLeadTimes GetStoreLeadTimes (int? storeId)
         {
-             ApiResponse<ServiceCharge> localVarResponse = GetStoreServiceChargeWithHttpInfo(storeId);
+             ApiResponse<RestApiResultOrderLeadTimes> localVarResponse = GetStoreLeadTimesWithHttpInfo(storeId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Retrieve Store Service Charge 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>ApiResponse of ServiceCharge</returns>
-        public ApiResponse< ServiceCharge > GetStoreServiceChargeWithHttpInfo (int? storeId)
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiResultOrderLeadTimes</returns>
+        public ApiResponse< RestApiResultOrderLeadTimes > GetStoreLeadTimesWithHttpInfo (int? storeId)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreServiceCharge");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreLeadTimes");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/servicecharge";
+            var localVarPath = "./api/v1.0/stores/{storeId}/leadTimes";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -4955,41 +5542,41 @@ public ApiResponse< ServiceCharge > GetStoreServiceChargeWithHttpInfo (int? stor
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoreServiceCharge", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreLeadTimes", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<ServiceCharge>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (ServiceCharge) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ServiceCharge)));
+            return new ApiResponse<RestApiResultOrderLeadTimes>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultOrderLeadTimes) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderLeadTimes)));
         }
 
         /// <summary>
-        /// Retrieve Store Service Charge 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>Task of ServiceCharge</returns>
-        public async System.Threading.Tasks.Task<ServiceCharge> GetStoreServiceChargeAsync (int? storeId)
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiResultOrderLeadTimes</returns>
+        public async System.Threading.Tasks.Task<RestApiResultOrderLeadTimes> GetStoreLeadTimesAsync (int? storeId)
         {
-             ApiResponse<ServiceCharge> localVarResponse = await GetStoreServiceChargeAsyncWithHttpInfo(storeId);
+             ApiResponse<RestApiResultOrderLeadTimes> localVarResponse = await GetStoreLeadTimesAsyncWithHttpInfo(storeId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Retrieve Store Service Charge 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>Task of ApiResponse (ServiceCharge)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<ServiceCharge>> GetStoreServiceChargeAsyncWithHttpInfo (int? storeId)
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultOrderLeadTimes)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderLeadTimes>> GetStoreLeadTimesAsyncWithHttpInfo (int? storeId)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreServiceCharge");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreLeadTimes");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/servicecharge";
+            var localVarPath = "./api/v1.0/stores/{storeId}/leadTimes";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5031,43 +5618,45 @@ public async System.Threading.Tasks.Task<ApiResponse<ServiceCharge>> GetStoreSer
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoreServiceCharge", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreLeadTimes", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<ServiceCharge>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (ServiceCharge) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ServiceCharge)));
+            return new ApiResponse<RestApiResultOrderLeadTimes>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultOrderLeadTimes) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderLeadTimes)));
         }
 
         /// <summary>
-        /// Get all stores, excluding archived ones 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeGroupId">Store Group Id (optional)</param>
-        /// <returns>RestApiPaginationResultStore</returns>
-        public RestApiPaginationResultStore GetStores (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiArrayResultStoreStatistics</returns>
+        public RestApiArrayResultStoreStatistics GetStoreNetSales (string appId, List<int?> storeId)
         {
-             ApiResponse<RestApiPaginationResultStore> localVarResponse = GetStoresWithHttpInfo(searchQuery, page, limit, storeGroupId);
+             ApiResponse<RestApiArrayResultStoreStatistics> localVarResponse = GetStoreNetSalesWithHttpInfo(appId, storeId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get all stores, excluding archived ones 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeGroupId">Store Group Id (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultStore</returns>
-        public ApiResponse< RestApiPaginationResultStore > GetStoresWithHttpInfo (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultStoreStatistics</returns>
+        public ApiResponse< RestApiArrayResultStoreStatistics > GetStoreNetSalesWithHttpInfo (string appId, List<int?> storeId)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoreNetSales");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreNetSales");
 
-            var localVarPath = "/api/v1.0/stores";
+            var localVarPath = "./api/v1.0/{appId}/stores/stats";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5091,10 +5680,8 @@ public ApiResponse< RestApiPaginationResultStore > GetStoresWithHttpInfo (string
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
-            if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -5112,44 +5699,46 @@ public ApiResponse< RestApiPaginationResultStore > GetStoresWithHttpInfo (string
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStores", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreNetSales", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStore)));
+            return new ApiResponse<RestApiArrayResultStoreStatistics>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultStoreStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreStatistics)));
         }
 
         /// <summary>
-        /// Get all stores, excluding archived ones 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeGroupId">Store Group Id (optional)</param>
-        /// <returns>Task of RestApiPaginationResultStore</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultStore> GetStoresAsync (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiArrayResultStoreStatistics</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultStoreStatistics> GetStoreNetSalesAsync (string appId, List<int?> storeId)
         {
-             ApiResponse<RestApiPaginationResultStore> localVarResponse = await GetStoresAsyncWithHttpInfo(searchQuery, page, limit, storeGroupId);
+             ApiResponse<RestApiArrayResultStoreStatistics> localVarResponse = await GetStoreNetSalesAsyncWithHttpInfo(appId, storeId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get all stores, excluding archived ones 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <param name="storeGroupId">Store Group Id (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultStore)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStore>> GetStoresAsyncWithHttpInfo (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
+        /// <param name="appId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultStoreStatistics)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStoreStatistics>> GetStoreNetSalesAsyncWithHttpInfo (string appId, List<int?> storeId)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoreNetSales");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreNetSales");
 
-            var localVarPath = "/api/v1.0/stores";
+            var localVarPath = "./api/v1.0/{appId}/stores/stats";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5173,10 +5762,8 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
-            if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -5194,46 +5781,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStores", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreNetSales", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStore)));
+            return new ApiResponse<RestApiArrayResultStoreStatistics>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultStoreStatistics) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStoreStatistics)));
         }
 
         /// <summary>
-        /// Get all stores by app name id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <returns>RestApiPaginationResultStore</returns>
-        public RestApiPaginationResultStore GetStoresByAppId (string appId, string searchQuery = null, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <returns>ServiceCharge</returns>
+        public ServiceCharge GetStoreServiceCharge (int? storeId)
         {
-             ApiResponse<RestApiPaginationResultStore> localVarResponse = GetStoresByAppIdWithHttpInfo(appId, searchQuery, page, limit);
+             ApiResponse<ServiceCharge> localVarResponse = GetStoreServiceChargeWithHttpInfo(storeId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get all stores by app name id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultStore</returns>
-        public ApiResponse< RestApiPaginationResultStore > GetStoresByAppIdWithHttpInfo (string appId, string searchQuery = null, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of ServiceCharge</returns>
+        public ApiResponse< ServiceCharge > GetStoreServiceChargeWithHttpInfo (int? storeId)
         {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoresByAppId");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreServiceCharge");
 
-            var localVarPath = "/api/v1.0/{appId}/stores";
+            var localVarPath = "./api/v1.0/stores/{storeId}/servicecharge";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5257,10 +5838,7 @@ public ApiResponse< RestApiPaginationResultStore > GetStoresByAppIdWithHttpInfo
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -5278,47 +5856,41 @@ public ApiResponse< RestApiPaginationResultStore > GetStoresByAppIdWithHttpInfo
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoresByAppId", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreServiceCharge", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStore)));
+            return new ApiResponse<ServiceCharge>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (ServiceCharge) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ServiceCharge)));
         }
 
         /// <summary>
-        /// Get all stores by app name id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <returns>Task of RestApiPaginationResultStore</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultStore> GetStoresByAppIdAsync (string appId, string searchQuery = null, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <returns>Task of ServiceCharge</returns>
+        public async System.Threading.Tasks.Task<ServiceCharge> GetStoreServiceChargeAsync (int? storeId)
         {
-             ApiResponse<RestApiPaginationResultStore> localVarResponse = await GetStoresByAppIdAsyncWithHttpInfo(appId, searchQuery, page, limit);
+             ApiResponse<ServiceCharge> localVarResponse = await GetStoreServiceChargeAsyncWithHttpInfo(storeId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get all stores by app name id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="searchQuery">Search query (optional)</param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultStore)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStore>> GetStoresByAppIdAsyncWithHttpInfo (string appId, string searchQuery = null, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (ServiceCharge)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<ServiceCharge>> GetStoreServiceChargeAsyncWithHttpInfo (int? storeId)
         {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoresByAppId");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoreServiceCharge");
 
-            var localVarPath = "/api/v1.0/{appId}/stores";
+            var localVarPath = "./api/v1.0/stores/{storeId}/servicecharge";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5342,10 +5914,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -5363,49 +5932,43 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoresByAppId", localVarResponse);
+                Exception exception = ExceptionFactory("GetStoreServiceCharge", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStore)));
+            return new ApiResponse<ServiceCharge>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (ServiceCharge) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(ServiceCharge)));
         }
 
         /// <summary>
-        /// Get store validation by storeIds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId"></param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <returns>RestApiPaginationResultStoreValidationConfig</returns>
-        public RestApiPaginationResultStoreValidationConfig GetStoresByStoreIdWithValidations (List<int?> storeId, string appId, int? page = null, int? limit = null)
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeGroupId"> (optional)</param>
+        /// <returns>RestApiPaginationResultStore</returns>
+        public RestApiPaginationResultStore GetStores (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
         {
-             ApiResponse<RestApiPaginationResultStoreValidationConfig> localVarResponse = GetStoresByStoreIdWithValidationsWithHttpInfo(storeId, appId, page, limit);
+             ApiResponse<RestApiPaginationResultStore> localVarResponse = GetStoresWithHttpInfo(searchQuery, page, limit, storeGroupId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get store validation by storeIds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId"></param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultStoreValidationConfig</returns>
-        public ApiResponse< RestApiPaginationResultStoreValidationConfig > GetStoresByStoreIdWithValidationsWithHttpInfo (List<int?> storeId, string appId, int? page = null, int? limit = null)
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeGroupId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultStore</returns>
+        public ApiResponse< RestApiPaginationResultStore > GetStoresWithHttpInfo (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
         {
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoresByStoreIdWithValidations");
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoresByStoreIdWithValidations");
 
-            var localVarPath = "/api/v1.0/{appId}/storevalidation/kiosk";
+            var localVarPath = "./api/v1.0/stores";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5429,10 +5992,1252 @@ public ApiResponse< RestApiPaginationResultStoreValidationConfig > GetStoresBySt
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
             if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
             if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStores", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultStore>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStore)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeGroupId"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultStore</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultStore> GetStoresAsync (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
+        {
+             ApiResponse<RestApiPaginationResultStore> localVarResponse = await GetStoresAsyncWithHttpInfo(searchQuery, page, limit, storeGroupId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <param name="storeGroupId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultStore)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStore>> GetStoresAsyncWithHttpInfo (string searchQuery = null, int? page = null, int? limit = null, int? storeGroupId = null)
+        {
+
+            var localVarPath = "./api/v1.0/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (storeGroupId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "storeGroupId", storeGroupId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStores", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultStore>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStore)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="excludeUnpublished"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>RestApiPaginationResultStore</returns>
+        public RestApiPaginationResultStore GetStoresByAppId (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultStore> localVarResponse = GetStoresByAppIdWithHttpInfo(appId, searchQuery, salesChannelType, excludeUnpublished, page, limit);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="excludeUnpublished"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultStore</returns>
+        public ApiResponse< RestApiPaginationResultStore > GetStoresByAppIdWithHttpInfo (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoresByAppId");
+
+            var localVarPath = "./api/v1.0/{appId}/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
+            if (salesChannelType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "salesChannelType", salesChannelType)); // query parameter
+            if (excludeUnpublished != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeUnpublished", excludeUnpublished)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStoresByAppId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultStore>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStore)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="excludeUnpublished"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultStore</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultStore> GetStoresByAppIdAsync (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultStore> localVarResponse = await GetStoresByAppIdAsyncWithHttpInfo(appId, searchQuery, salesChannelType, excludeUnpublished, page, limit);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="searchQuery"> (optional)</param>
+        /// <param name="salesChannelType"> (optional)</param>
+        /// <param name="excludeUnpublished"> (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultStore)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStore>> GetStoresByAppIdAsyncWithHttpInfo (string appId, string searchQuery = null, string salesChannelType = null, bool? excludeUnpublished = null, int? page = null, int? limit = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoresByAppId");
+
+            var localVarPath = "./api/v1.0/{appId}/stores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
+            if (salesChannelType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "salesChannelType", salesChannelType)); // query parameter
+            if (excludeUnpublished != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeUnpublished", excludeUnpublished)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStoresByAppId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultStore>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStore)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>RestApiPaginationResultStoreValidationConfig</returns>
+        public RestApiPaginationResultStoreValidationConfig GetStoresByStoreIdWithValidations (List<int?> storeId, string appId, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultStoreValidationConfig> localVarResponse = GetStoresByStoreIdWithValidationsWithHttpInfo(storeId, appId, page, limit);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultStoreValidationConfig</returns>
+        public ApiResponse< RestApiPaginationResultStoreValidationConfig > GetStoresByStoreIdWithValidationsWithHttpInfo (List<int?> storeId, string appId, int? page = null, int? limit = null)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoresByStoreIdWithValidations");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoresByStoreIdWithValidations");
+
+            var localVarPath = "./api/v1.0/{appId}/storevalidation/kiosk";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStoresByStoreIdWithValidations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultStoreValidationConfig>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultStoreValidationConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreValidationConfig)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultStoreValidationConfig</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultStoreValidationConfig> GetStoresByStoreIdWithValidationsAsync (List<int?> storeId, string appId, int? page = null, int? limit = null)
+        {
+             ApiResponse<RestApiPaginationResultStoreValidationConfig> localVarResponse = await GetStoresByStoreIdWithValidationsAsyncWithHttpInfo(storeId, appId, page, limit);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="appId"></param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultStoreValidationConfig)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreValidationConfig>> GetStoresByStoreIdWithValidationsAsyncWithHttpInfo (List<int?> storeId, string appId, int? page = null, int? limit = null)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoresByStoreIdWithValidations");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoresByStoreIdWithValidations");
+
+            var localVarPath = "./api/v1.0/{appId}/storevalidation/kiosk";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
+            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetStoresByStoreIdWithValidations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultStoreValidationConfig>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultStoreValidationConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreValidationConfig)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns></returns>
+        public void PublishStore (int? storeId)
+        {
+             PublishStoreWithHttpInfo(storeId);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> PublishStoreWithHttpInfo (int? storeId)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->PublishStore");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/publish";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("PublishStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task PublishStoreAsync (int? storeId)
+        {
+             await PublishStoreAsyncWithHttpInfo(storeId);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> PublishStoreAsyncWithHttpInfo (int? storeId)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->PublishStore");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/publish";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("PublishStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="feeConfigUpdateRequest"></param>
+        /// <returns></returns>
+        public void PutStoreDeliveryFeeConfig (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest)
+        {
+             PutStoreDeliveryFeeConfigWithHttpInfo(storeId, feeConfigUpdateRequest);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="feeConfigUpdateRequest"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> PutStoreDeliveryFeeConfigWithHttpInfo (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->PutStoreDeliveryFeeConfig");
+            // verify the required parameter 'feeConfigUpdateRequest' is set
+            if (feeConfigUpdateRequest == null)
+                throw new ApiException(400, "Missing required parameter 'feeConfigUpdateRequest' when calling StoresApi->PutStoreDeliveryFeeConfig");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/feeConfig/deliveryZones";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (feeConfigUpdateRequest != null && feeConfigUpdateRequest.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(feeConfigUpdateRequest); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = feeConfigUpdateRequest; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("PutStoreDeliveryFeeConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="feeConfigUpdateRequest"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task PutStoreDeliveryFeeConfigAsync (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest)
+        {
+             await PutStoreDeliveryFeeConfigAsyncWithHttpInfo(storeId, feeConfigUpdateRequest);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="feeConfigUpdateRequest"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> PutStoreDeliveryFeeConfigAsyncWithHttpInfo (int? storeId, StoreDeliveryZoneFeeConfigUpdateRequest feeConfigUpdateRequest)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->PutStoreDeliveryFeeConfig");
+            // verify the required parameter 'feeConfigUpdateRequest' is set
+            if (feeConfigUpdateRequest == null)
+                throw new ApiException(400, "Missing required parameter 'feeConfigUpdateRequest' when calling StoresApi->PutStoreDeliveryFeeConfig");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/feeConfig/deliveryZones";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (feeConfigUpdateRequest != null && feeConfigUpdateRequest.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(feeConfigUpdateRequest); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = feeConfigUpdateRequest; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.PUT, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("PutStoreDeliveryFeeConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="businessHoursPeriod"></param>
+        /// <returns>RestApiResultBusinessHoursPeriod</returns>
+        public RestApiResultBusinessHoursPeriod SetBusinessHours (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
+        {
+             ApiResponse<RestApiResultBusinessHoursPeriod> localVarResponse = SetBusinessHoursWithHttpInfo(storeId, deliveryType, businessHoursPeriod);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="businessHoursPeriod"></param>
+        /// <returns>ApiResponse of RestApiResultBusinessHoursPeriod</returns>
+        public ApiResponse< RestApiResultBusinessHoursPeriod > SetBusinessHoursWithHttpInfo (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetBusinessHours");
+            // verify the required parameter 'deliveryType' is set
+            if (deliveryType == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->SetBusinessHours");
+            // verify the required parameter 'businessHoursPeriod' is set
+            if (businessHoursPeriod == null)
+                throw new ApiException(400, "Missing required parameter 'businessHoursPeriod' when calling StoresApi->SetBusinessHours");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/availability/{deliveryType}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (deliveryType != null) localVarPathParams.Add("deliveryType", this.Configuration.ApiClient.ParameterToString(deliveryType)); // path parameter
+            if (businessHoursPeriod != null && businessHoursPeriod.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(businessHoursPeriod); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = businessHoursPeriod; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetBusinessHours", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBusinessHoursPeriod>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBusinessHoursPeriod) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBusinessHoursPeriod)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="businessHoursPeriod"></param>
+        /// <returns>Task of RestApiResultBusinessHoursPeriod</returns>
+        public async System.Threading.Tasks.Task<RestApiResultBusinessHoursPeriod> SetBusinessHoursAsync (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
+        {
+             ApiResponse<RestApiResultBusinessHoursPeriod> localVarResponse = await SetBusinessHoursAsyncWithHttpInfo(storeId, deliveryType, businessHoursPeriod);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="businessHoursPeriod"></param>
+        /// <returns>Task of ApiResponse (RestApiResultBusinessHoursPeriod)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursPeriod>> SetBusinessHoursAsyncWithHttpInfo (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetBusinessHours");
+            // verify the required parameter 'deliveryType' is set
+            if (deliveryType == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->SetBusinessHours");
+            // verify the required parameter 'businessHoursPeriod' is set
+            if (businessHoursPeriod == null)
+                throw new ApiException(400, "Missing required parameter 'businessHoursPeriod' when calling StoresApi->SetBusinessHours");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/availability/{deliveryType}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (deliveryType != null) localVarPathParams.Add("deliveryType", this.Configuration.ApiClient.ParameterToString(deliveryType)); // path parameter
+            if (businessHoursPeriod != null && businessHoursPeriod.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(businessHoursPeriod); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = businessHoursPeriod; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetBusinessHours", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBusinessHoursPeriod>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBusinessHoursPeriod) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBusinessHoursPeriod)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="enabled"></param>
+        /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
+        public RestApiArrayResultRestApiDefaultResponse SetPreOrdeEnabled (int? storeId, string deliveryType, bool? enabled)
+        {
+             ApiResponse<RestApiArrayResultRestApiDefaultResponse> localVarResponse = SetPreOrdeEnabledWithHttpInfo(storeId, deliveryType, enabled);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="enabled"></param>
+        /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
+        public ApiResponse< RestApiArrayResultRestApiDefaultResponse > SetPreOrdeEnabledWithHttpInfo (int? storeId, string deliveryType, bool? enabled)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetPreOrdeEnabled");
+            // verify the required parameter 'deliveryType' is set
+            if (deliveryType == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->SetPreOrdeEnabled");
+            // verify the required parameter 'enabled' is set
+            if (enabled == null)
+                throw new ApiException(400, "Missing required parameter 'enabled' when calling StoresApi->SetPreOrdeEnabled");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/enabled";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (deliveryType != null) localVarPathParams.Add("deliveryType", this.Configuration.ApiClient.ParameterToString(deliveryType)); // path parameter
+            if (enabled != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enabled", enabled)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetPreOrdeEnabled", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="enabled"></param>
+        /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> SetPreOrdeEnabledAsync (int? storeId, string deliveryType, bool? enabled)
+        {
+             ApiResponse<RestApiArrayResultRestApiDefaultResponse> localVarResponse = await SetPreOrdeEnabledAsyncWithHttpInfo(storeId, deliveryType, enabled);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="enabled"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> SetPreOrdeEnabledAsyncWithHttpInfo (int? storeId, string deliveryType, bool? enabled)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetPreOrdeEnabled");
+            // verify the required parameter 'deliveryType' is set
+            if (deliveryType == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->SetPreOrdeEnabled");
+            // verify the required parameter 'enabled' is set
+            if (enabled == null)
+                throw new ApiException(400, "Missing required parameter 'enabled' when calling StoresApi->SetPreOrdeEnabled");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/enabled";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (deliveryType != null) localVarPathParams.Add("deliveryType", this.Configuration.ApiClient.ParameterToString(deliveryType)); // path parameter
+            if (enabled != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enabled", enabled)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetPreOrdeEnabled", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
+        /// <param name="inheritFromProperty"> (optional)</param>
+        /// <returns>RestApiResultRestApiDefaultResponse</returns>
+        public RestApiResultRestApiDefaultResponse SetStoreCollectionSettings (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null)
+        {
+             ApiResponse<RestApiResultRestApiDefaultResponse> localVarResponse = SetStoreCollectionSettingsWithHttpInfo(storeId, settings, inheritFromProperty);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
+        /// <param name="inheritFromProperty"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultRestApiDefaultResponse</returns>
+        public ApiResponse< RestApiResultRestApiDefaultResponse > SetStoreCollectionSettingsWithHttpInfo (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null)
+        {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetStoreCollectionSettings");
+            // verify the required parameter 'settings' is set
+            if (settings == null)
+                throw new ApiException(400, "Missing required parameter 'settings' when calling StoresApi->SetStoreCollectionSettings");
+
+            var localVarPath = "./api/v1.0/stores/{storeId}/collectionsettings";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (inheritFromProperty != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "inheritFromProperty", inheritFromProperty)); // query parameter
+            if (settings != null && settings.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(settings); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = settings; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -5443,57 +7248,55 @@ public ApiResponse< RestApiPaginationResultStoreValidationConfig > GetStoresBySt
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoresByStoreIdWithValidations", localVarResponse);
+                Exception exception = ExceptionFactory("SetStoreCollectionSettings", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultStoreValidationConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultStoreValidationConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreValidationConfig)));
+            return new ApiResponse<RestApiResultRestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// Get store validation by storeIds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId"></param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <returns>Task of RestApiPaginationResultStoreValidationConfig</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultStoreValidationConfig> GetStoresByStoreIdWithValidationsAsync (List<int?> storeId, string appId, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
+        /// <param name="inheritFromProperty"> (optional)</param>
+        /// <returns>Task of RestApiResultRestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiResultRestApiDefaultResponse> SetStoreCollectionSettingsAsync (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null)
         {
-             ApiResponse<RestApiPaginationResultStoreValidationConfig> localVarResponse = await GetStoresByStoreIdWithValidationsAsyncWithHttpInfo(storeId, appId, page, limit);
+             ApiResponse<RestApiResultRestApiDefaultResponse> localVarResponse = await SetStoreCollectionSettingsAsyncWithHttpInfo(storeId, settings, inheritFromProperty);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get store validation by storeIds 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="appId"></param>
-        /// <param name="page">Requested page index (optional)</param>
-        /// <param name="limit">Requested page limit (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultStoreValidationConfig)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStoreValidationConfig>> GetStoresByStoreIdWithValidationsAsyncWithHttpInfo (List<int?> storeId, string appId, int? page = null, int? limit = null)
+        /// <param name="storeId"></param>
+        /// <param name="settings"></param>
+        /// <param name="inheritFromProperty"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultRestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRestApiDefaultResponse>> SetStoreCollectionSettingsAsyncWithHttpInfo (int? storeId, StoreCollectionSettings settings, bool? inheritFromProperty = null)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->GetStoresByStoreIdWithValidations");
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StoresApi->GetStoresByStoreIdWithValidations");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetStoreCollectionSettings");
+            // verify the required parameter 'settings' is set
+            if (settings == null)
+                throw new ApiException(400, "Missing required parameter 'settings' when calling StoresApi->SetStoreCollectionSettings");
 
-            var localVarPath = "/api/v1.0/{appId}/storevalidation/kiosk";
+            var localVarPath = "./api/v1.0/stores/{storeId}/collectionsettings";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5503,6 +7306,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -5517,10 +7325,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
-            if (page != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "page", page)); // query parameter
-            if (limit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "limit", limit)); // query parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (inheritFromProperty != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "inheritFromProperty", inheritFromProperty)); // query parameter
+            if (settings != null && settings.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(settings); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = settings; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -5531,46 +7345,52 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultStor
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetStoresByStoreIdWithValidations", localVarResponse);
+                Exception exception = ExceptionFactory("SetStoreCollectionSettings", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultStoreValidationConfig>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultStoreValidationConfig) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultStoreValidationConfig)));
+            return new ApiResponse<RestApiResultRestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// Publish store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns></returns>
-        public void PublishStore (int? storeId)
+        /// <param name="storeId"></param>
+        /// <param name="leadTime"></param>
+        /// <returns>RestApiResultOrderLeadTimes</returns>
+        public RestApiResultOrderLeadTimes SetStoreLeadTimes (int? storeId, LeadTime leadTime)
         {
-             PublishStoreWithHttpInfo(storeId);
+             ApiResponse<RestApiResultOrderLeadTimes> localVarResponse = SetStoreLeadTimesWithHttpInfo(storeId, leadTime);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Publish store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>ApiResponse of Object(void)</returns>
-        public ApiResponse<Object> PublishStoreWithHttpInfo (int? storeId)
+        /// <param name="storeId"></param>
+        /// <param name="leadTime"></param>
+        /// <returns>ApiResponse of RestApiResultOrderLeadTimes</returns>
+        public ApiResponse< RestApiResultOrderLeadTimes > SetStoreLeadTimesWithHttpInfo (int? storeId, LeadTime leadTime)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->PublishStore");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetStoreLeadTimes");
+            // verify the required parameter 'leadTime' is set
+            if (leadTime == null)
+                throw new ApiException(400, "Missing required parameter 'leadTime' when calling StoresApi->SetStoreLeadTimes");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/publish";
+            var localVarPath = "./api/v1.0/stores/{storeId}/leadTimes";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5580,6 +7400,11 @@ public ApiResponse<Object> PublishStoreWithHttpInfo (int? storeId)
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -5595,6 +7420,14 @@ public ApiResponse<Object> PublishStoreWithHttpInfo (int? storeId)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (leadTime != null && leadTime.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(leadTime); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = leadTime; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -5612,40 +7445,46 @@ public ApiResponse<Object> PublishStoreWithHttpInfo (int? storeId)
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("PublishStore", localVarResponse);
+                Exception exception = ExceptionFactory("SetStoreLeadTimes", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+            return new ApiResponse<RestApiResultOrderLeadTimes>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultOrderLeadTimes) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderLeadTimes)));
         }
 
         /// <summary>
-        /// Publish store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task PublishStoreAsync (int? storeId)
+        /// <param name="storeId"></param>
+        /// <param name="leadTime"></param>
+        /// <returns>Task of RestApiResultOrderLeadTimes</returns>
+        public async System.Threading.Tasks.Task<RestApiResultOrderLeadTimes> SetStoreLeadTimesAsync (int? storeId, LeadTime leadTime)
         {
-             await PublishStoreAsyncWithHttpInfo(storeId);
+             ApiResponse<RestApiResultOrderLeadTimes> localVarResponse = await SetStoreLeadTimesAsyncWithHttpInfo(storeId, leadTime);
+             return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Publish store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> PublishStoreAsyncWithHttpInfo (int? storeId)
+        /// <param name="storeId"></param>
+        /// <param name="leadTime"></param>
+        /// <returns>Task of ApiResponse (RestApiResultOrderLeadTimes)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrderLeadTimes>> SetStoreLeadTimesAsyncWithHttpInfo (int? storeId, LeadTime leadTime)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->PublishStore");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetStoreLeadTimes");
+            // verify the required parameter 'leadTime' is set
+            if (leadTime == null)
+                throw new ApiException(400, "Missing required parameter 'leadTime' when calling StoresApi->SetStoreLeadTimes");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/publish";
+            var localVarPath = "./api/v1.0/stores/{storeId}/leadTimes";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5655,6 +7494,11 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PublishStoreAsyncW
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -5670,6 +7514,14 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PublishStoreAsyncW
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (leadTime != null && leadTime.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(leadTime); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = leadTime; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -5687,50 +7539,45 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> PublishStoreAsyncW
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("PublishStore", localVarResponse);
+                Exception exception = ExceptionFactory("SetStoreLeadTimes", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                null);
+            return new ApiResponse<RestApiResultOrderLeadTimes>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultOrderLeadTimes) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrderLeadTimes)));
         }
 
         /// <summary>
-        /// Set Business hours 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
-        /// <param name="businessHoursPeriod">Business Hours Period</param>
-        /// <returns>RestApiResultBusinessHoursPeriod</returns>
-        public RestApiResultBusinessHoursPeriod SetBusinessHours (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
+        /// <param name="storeId"></param>
+        /// <param name="propertyId"></param>
+        /// <returns>Object</returns>
+        public Object StoresSetPropertyId (int? storeId, string propertyId)
         {
-             ApiResponse<RestApiResultBusinessHoursPeriod> localVarResponse = SetBusinessHoursWithHttpInfo(storeId, deliveryType, businessHoursPeriod);
+             ApiResponse<Object> localVarResponse = StoresSetPropertyIdWithHttpInfo(storeId, propertyId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Set Business hours 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
-        /// <param name="businessHoursPeriod">Business Hours Period</param>
-        /// <returns>ApiResponse of RestApiResultBusinessHoursPeriod</returns>
-        public ApiResponse< RestApiResultBusinessHoursPeriod > SetBusinessHoursWithHttpInfo (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
+        /// <param name="storeId"></param>
+        /// <param name="propertyId"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > StoresSetPropertyIdWithHttpInfo (int? storeId, string propertyId)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetBusinessHours");
-            // verify the required parameter 'deliveryType' is set
-            if (deliveryType == null)
-                throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->SetBusinessHours");
-            // verify the required parameter 'businessHoursPeriod' is set
-            if (businessHoursPeriod == null)
-                throw new ApiException(400, "Missing required parameter 'businessHoursPeriod' when calling StoresApi->SetBusinessHours");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->StoresSetPropertyId");
+            // verify the required parameter 'propertyId' is set
+            if (propertyId == null)
+                throw new ApiException(400, "Missing required parameter 'propertyId' when calling StoresApi->StoresSetPropertyId");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/availability/{deliveryType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/propertyId/{propertyId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5740,11 +7587,6 @@ public ApiResponse< RestApiResultBusinessHoursPeriod > SetBusinessHoursWithHttpI
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -5760,15 +7602,7 @@ public ApiResponse< RestApiResultBusinessHoursPeriod > SetBusinessHoursWithHttpI
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (deliveryType != null) localVarPathParams.Add("deliveryType", this.Configuration.ApiClient.ParameterToString(deliveryType)); // path parameter
-            if (businessHoursPeriod != null && businessHoursPeriod.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(businessHoursPeriod); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = businessHoursPeriod; // byte array
-            }
+            if (propertyId != null) localVarPathParams.Add("propertyId", this.Configuration.ApiClient.ParameterToString(propertyId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -5786,51 +7620,46 @@ public ApiResponse< RestApiResultBusinessHoursPeriod > SetBusinessHoursWithHttpI
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetBusinessHours", localVarResponse);
+                Exception exception = ExceptionFactory("StoresSetPropertyId", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultBusinessHoursPeriod>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultBusinessHoursPeriod) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBusinessHoursPeriod)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Set Business hours 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
-        /// <param name="businessHoursPeriod">Business Hours Period</param>
-        /// <returns>Task of RestApiResultBusinessHoursPeriod</returns>
-        public async System.Threading.Tasks.Task<RestApiResultBusinessHoursPeriod> SetBusinessHoursAsync (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
+        /// <param name="storeId"></param>
+        /// <param name="propertyId"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> StoresSetPropertyIdAsync (int? storeId, string propertyId)
         {
-             ApiResponse<RestApiResultBusinessHoursPeriod> localVarResponse = await SetBusinessHoursAsyncWithHttpInfo(storeId, deliveryType, businessHoursPeriod);
+             ApiResponse<Object> localVarResponse = await StoresSetPropertyIdAsyncWithHttpInfo(storeId, propertyId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Set Business hours 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">Delivery type</param>
-        /// <param name="businessHoursPeriod">Business Hours Period</param>
-        /// <returns>Task of ApiResponse (RestApiResultBusinessHoursPeriod)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursPeriod>> SetBusinessHoursAsyncWithHttpInfo (int? storeId, string deliveryType, BusinessHoursPeriodBase businessHoursPeriod)
+        /// <param name="storeId"></param>
+        /// <param name="propertyId"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> StoresSetPropertyIdAsyncWithHttpInfo (int? storeId, string propertyId)
         {
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetBusinessHours");
-            // verify the required parameter 'deliveryType' is set
-            if (deliveryType == null)
-                throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->SetBusinessHours");
-            // verify the required parameter 'businessHoursPeriod' is set
-            if (businessHoursPeriod == null)
-                throw new ApiException(400, "Missing required parameter 'businessHoursPeriod' when calling StoresApi->SetBusinessHours");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->StoresSetPropertyId");
+            // verify the required parameter 'propertyId' is set
+            if (propertyId == null)
+                throw new ApiException(400, "Missing required parameter 'propertyId' when calling StoresApi->StoresSetPropertyId");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/availability/{deliveryType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/propertyId/{propertyId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5840,11 +7669,6 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursP
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -5860,15 +7684,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursP
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (deliveryType != null) localVarPathParams.Add("deliveryType", this.Configuration.ApiClient.ParameterToString(deliveryType)); // path parameter
-            if (businessHoursPeriod != null && businessHoursPeriod.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(businessHoursPeriod); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = businessHoursPeriod; // byte array
-            }
+            if (propertyId != null) localVarPathParams.Add("propertyId", this.Configuration.ApiClient.ParameterToString(propertyId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -5886,50 +7702,49 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBusinessHoursP
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetBusinessHours", localVarResponse);
+                Exception exception = ExceptionFactory("StoresSetPropertyId", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultBusinessHoursPeriod>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultBusinessHoursPeriod) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBusinessHoursPeriod)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="enabled">Update pre order config values</param>
-        /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
-        public RestApiArrayResultRestApiDefaultResponse SetPreOrdeEnabled (int? storeId, string deliveryType, bool? enabled)
+        /// <param name="propertyId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="salesChannelTypes"></param>
+        /// <returns></returns>
+        public void SupportedSalesChannelsTypes (string propertyId, int? storeId, List<string> salesChannelTypes)
         {
-             ApiResponse<RestApiArrayResultRestApiDefaultResponse> localVarResponse = SetPreOrdeEnabledWithHttpInfo(storeId, deliveryType, enabled);
-             return localVarResponse.Data;
+             SupportedSalesChannelsTypesWithHttpInfo(propertyId, storeId, salesChannelTypes);
         }
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="enabled">Update pre order config values</param>
-        /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
-        public ApiResponse< RestApiArrayResultRestApiDefaultResponse > SetPreOrdeEnabledWithHttpInfo (int? storeId, string deliveryType, bool? enabled)
+        /// <param name="propertyId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="salesChannelTypes"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SupportedSalesChannelsTypesWithHttpInfo (string propertyId, int? storeId, List<string> salesChannelTypes)
         {
+            // verify the required parameter 'propertyId' is set
+            if (propertyId == null)
+                throw new ApiException(400, "Missing required parameter 'propertyId' when calling StoresApi->SupportedSalesChannelsTypes");
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetPreOrdeEnabled");
-            // verify the required parameter 'deliveryType' is set
-            if (deliveryType == null)
-                throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->SetPreOrdeEnabled");
-            // verify the required parameter 'enabled' is set
-            if (enabled == null)
-                throw new ApiException(400, "Missing required parameter 'enabled' when calling StoresApi->SetPreOrdeEnabled");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SupportedSalesChannelsTypes");
+            // verify the required parameter 'salesChannelTypes' is set
+            if (salesChannelTypes == null)
+                throw new ApiException(400, "Missing required parameter 'salesChannelTypes' when calling StoresApi->SupportedSalesChannelsTypes");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/enabled";
+            var localVarPath = "./api/v1.0/properties/{propertyId}/stores/{storeId}/supportedSalesChannels";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -5939,6 +7754,11 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > SetPreOrdeEnabled
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -5953,9 +7773,16 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > SetPreOrdeEnabled
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (propertyId != null) localVarPathParams.Add("propertyId", this.Configuration.ApiClient.ParameterToString(propertyId)); // path parameter
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (deliveryType != null) localVarPathParams.Add("deliveryType", this.Configuration.ApiClient.ParameterToString(deliveryType)); // path parameter
-            if (enabled != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enabled", enabled)); // query parameter
+            if (salesChannelTypes != null && salesChannelTypes.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(salesChannelTypes); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = salesChannelTypes; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -5973,51 +7800,50 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > SetPreOrdeEnabled
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetPreOrdeEnabled", localVarResponse);
+                Exception exception = ExceptionFactory("SupportedSalesChannelsTypes", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="enabled">Update pre order config values</param>
-        /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> SetPreOrdeEnabledAsync (int? storeId, string deliveryType, bool? enabled)
+        /// <param name="propertyId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="salesChannelTypes"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SupportedSalesChannelsTypesAsync (string propertyId, int? storeId, List<string> salesChannelTypes)
         {
-             ApiResponse<RestApiArrayResultRestApiDefaultResponse> localVarResponse = await SetPreOrdeEnabledAsyncWithHttpInfo(storeId, deliveryType, enabled);
-             return localVarResponse.Data;
+             await SupportedSalesChannelsTypesAsyncWithHttpInfo(propertyId, storeId, salesChannelTypes);
 
         }
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="enabled">Update pre order config values</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> SetPreOrdeEnabledAsyncWithHttpInfo (int? storeId, string deliveryType, bool? enabled)
+        /// <param name="propertyId"></param>
+        /// <param name="storeId"></param>
+        /// <param name="salesChannelTypes"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SupportedSalesChannelsTypesAsyncWithHttpInfo (string propertyId, int? storeId, List<string> salesChannelTypes)
         {
+            // verify the required parameter 'propertyId' is set
+            if (propertyId == null)
+                throw new ApiException(400, "Missing required parameter 'propertyId' when calling StoresApi->SupportedSalesChannelsTypes");
             // verify the required parameter 'storeId' is set
             if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SetPreOrdeEnabled");
-            // verify the required parameter 'deliveryType' is set
-            if (deliveryType == null)
-                throw new ApiException(400, "Missing required parameter 'deliveryType' when calling StoresApi->SetPreOrdeEnabled");
-            // verify the required parameter 'enabled' is set
-            if (enabled == null)
-                throw new ApiException(400, "Missing required parameter 'enabled' when calling StoresApi->SetPreOrdeEnabled");
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->SupportedSalesChannelsTypes");
+            // verify the required parameter 'salesChannelTypes' is set
+            if (salesChannelTypes == null)
+                throw new ApiException(400, "Missing required parameter 'salesChannelTypes' when calling StoresApi->SupportedSalesChannelsTypes");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}/enabled";
+            var localVarPath = "./api/v1.0/properties/{propertyId}/stores/{storeId}/supportedSalesChannels";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6027,6 +7853,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -6041,9 +7872,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (propertyId != null) localVarPathParams.Add("propertyId", this.Configuration.ApiClient.ParameterToString(propertyId)); // path parameter
             if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
-            if (deliveryType != null) localVarPathParams.Add("deliveryType", this.Configuration.ApiClient.ParameterToString(deliveryType)); // path parameter
-            if (enabled != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "enabled", enabled)); // query parameter
+            if (salesChannelTypes != null && salesChannelTypes.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(salesChannelTypes); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = salesChannelTypes; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -6061,20 +7899,20 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SetPreOrdeEnabled", localVarResponse);
+                Exception exception = ExceptionFactory("SupportedSalesChannelsTypes", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// Unpublish store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns></returns>
         public void UnpublishStore (int? storeId)
         {
@@ -6082,10 +7920,10 @@ public void UnpublishStore (int? storeId)
         }
 
         /// <summary>
-        /// Unpublish store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UnpublishStoreWithHttpInfo (int? storeId)
         {
@@ -6093,7 +7931,7 @@ public ApiResponse<Object> UnpublishStoreWithHttpInfo (int? storeId)
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->UnpublishStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/unpublish";
+            var localVarPath = "./api/v1.0/stores/{storeId}/unpublish";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6140,15 +7978,15 @@ public ApiResponse<Object> UnpublishStoreWithHttpInfo (int? storeId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Unpublish store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UnpublishStoreAsync (int? storeId)
         {
@@ -6157,10 +7995,10 @@ public async System.Threading.Tasks.Task UnpublishStoreAsync (int? storeId)
         }
 
         /// <summary>
-        /// Unpublish store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UnpublishStoreAsyncWithHttpInfo (int? storeId)
         {
@@ -6168,7 +8006,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnpublishStoreAsyn
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StoresApi->UnpublishStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/unpublish";
+            var localVarPath = "./api/v1.0/stores/{storeId}/unpublish";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6215,17 +8053,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UnpublishStoreAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="preOrderConfig">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="preOrderConfig"></param>
         /// <returns>RestApiArrayResultRestApiDefaultResponse</returns>
         public RestApiArrayResultRestApiDefaultResponse UpdatePreOrderConfig (int? storeId, string deliveryType, PreOrderConfig preOrderConfig)
         {
@@ -6234,12 +8072,12 @@ public RestApiArrayResultRestApiDefaultResponse UpdatePreOrderConfig (int? store
         }
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="preOrderConfig">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="preOrderConfig"></param>
         /// <returns>ApiResponse of RestApiArrayResultRestApiDefaultResponse</returns>
         public ApiResponse< RestApiArrayResultRestApiDefaultResponse > UpdatePreOrderConfigWithHttpInfo (int? storeId, string deliveryType, PreOrderConfig preOrderConfig)
         {
@@ -6253,7 +8091,7 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > UpdatePreOrderCon
             if (preOrderConfig == null)
                 throw new ApiException(400, "Missing required parameter 'preOrderConfig' when calling StoresApi->UpdatePreOrderConfig");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6314,17 +8152,17 @@ public ApiResponse< RestApiArrayResultRestApiDefaultResponse > UpdatePreOrderCon
             }
 
             return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="preOrderConfig">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="preOrderConfig"></param>
         /// <returns>Task of RestApiArrayResultRestApiDefaultResponse</returns>
         public async System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultResponse> UpdatePreOrderConfigAsync (int? storeId, string deliveryType, PreOrderConfig preOrderConfig)
         {
@@ -6334,12 +8172,12 @@ public async System.Threading.Tasks.Task<RestApiArrayResultRestApiDefaultRespons
         }
 
         /// <summary>
-        /// UPDATE pre order config for a store, by type 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="deliveryType">\&quot;delivery\&quot; or \&quot;pickup\&quot;</param>
-        /// <param name="preOrderConfig">Update pre order config values</param>
+        /// <param name="storeId"></param>
+        /// <param name="deliveryType"></param>
+        /// <param name="preOrderConfig"></param>
         /// <returns>Task of ApiResponse (RestApiArrayResultRestApiDefaultResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDefaultResponse>> UpdatePreOrderConfigAsyncWithHttpInfo (int? storeId, string deliveryType, PreOrderConfig preOrderConfig)
         {
@@ -6353,7 +8191,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
             if (preOrderConfig == null)
                 throw new ApiException(400, "Missing required parameter 'preOrderConfig' when calling StoresApi->UpdatePreOrderConfig");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}";
+            var localVarPath = "./api/v1.0/stores/{storeId}/preorderconfig/{deliveryType}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6414,16 +8252,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRestApiDe
             }
 
             return new ApiResponse<RestApiArrayResultRestApiDefaultResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultRestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// Update store by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeId"></param>
+        /// <param name="store"></param>
         /// <returns>RestApiResultStore</returns>
         public RestApiResultStore UpdateStore (int? storeId, StoreBase store)
         {
@@ -6432,11 +8270,11 @@ public RestApiResultStore UpdateStore (int? storeId, StoreBase store)
         }
 
         /// <summary>
-        /// Update store by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeId"></param>
+        /// <param name="store"></param>
         /// <returns>ApiResponse of RestApiResultStore</returns>
         public ApiResponse< RestApiResultStore > UpdateStoreWithHttpInfo (int? storeId, StoreBase store)
         {
@@ -6447,7 +8285,7 @@ public ApiResponse< RestApiResultStore > UpdateStoreWithHttpInfo (int? storeId,
             if (store == null)
                 throw new ApiException(400, "Missing required parameter 'store' when calling StoresApi->UpdateStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6507,16 +8345,16 @@ public ApiResponse< RestApiResultStore > UpdateStoreWithHttpInfo (int? storeId,
             }
 
             return new ApiResponse<RestApiResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Update store by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeId"></param>
+        /// <param name="store"></param>
         /// <returns>Task of RestApiResultStore</returns>
         public async System.Threading.Tasks.Task<RestApiResultStore> UpdateStoreAsync (int? storeId, StoreBase store)
         {
@@ -6526,11 +8364,11 @@ public async System.Threading.Tasks.Task<RestApiResultStore> UpdateStoreAsync (i
         }
 
         /// <summary>
-        /// Update store by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Group identifier</param>
-        /// <param name="store">Store</param>
+        /// <param name="storeId"></param>
+        /// <param name="store"></param>
         /// <returns>Task of ApiResponse (RestApiResultStore)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> UpdateStoreAsyncWithHttpInfo (int? storeId, StoreBase store)
         {
@@ -6541,7 +8379,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> Update
             if (store == null)
                 throw new ApiException(400, "Missing required parameter 'store' when calling StoresApi->UpdateStore");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}";
+            var localVarPath = "./api/v1.0/stores/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6601,16 +8439,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStore>> Update
             }
 
             return new ApiResponse<RestApiResultStore>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStore) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStore)));
         }
 
         /// <summary>
-        /// Update store address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="storeAddress">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="storeAddress"></param>
         /// <returns>RestApiResultStoreAddress</returns>
         public RestApiResultStoreAddress UpdateStoreAddress (int? storeId, StoreAddressBase storeAddress)
         {
@@ -6619,11 +8457,11 @@ public RestApiResultStoreAddress UpdateStoreAddress (int? storeId, StoreAddressB
         }
 
         /// <summary>
-        /// Update store address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="storeAddress">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="storeAddress"></param>
         /// <returns>ApiResponse of RestApiResultStoreAddress</returns>
         public ApiResponse< RestApiResultStoreAddress > UpdateStoreAddressWithHttpInfo (int? storeId, StoreAddressBase storeAddress)
         {
@@ -6634,7 +8472,7 @@ public ApiResponse< RestApiResultStoreAddress > UpdateStoreAddressWithHttpInfo (
             if (storeAddress == null)
                 throw new ApiException(400, "Missing required parameter 'storeAddress' when calling StoresApi->UpdateStoreAddress");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/address";
+            var localVarPath = "./api/v1.0/stores/{storeId}/address";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6694,16 +8532,16 @@ public ApiResponse< RestApiResultStoreAddress > UpdateStoreAddressWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultStoreAddress>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreAddress) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreAddress)));
         }
 
         /// <summary>
-        /// Update store address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="storeAddress">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="storeAddress"></param>
         /// <returns>Task of RestApiResultStoreAddress</returns>
         public async System.Threading.Tasks.Task<RestApiResultStoreAddress> UpdateStoreAddressAsync (int? storeId, StoreAddressBase storeAddress)
         {
@@ -6713,11 +8551,11 @@ public async System.Threading.Tasks.Task<RestApiResultStoreAddress> UpdateStoreA
         }
 
         /// <summary>
-        /// Update store address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="storeAddress">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="storeAddress"></param>
         /// <returns>Task of ApiResponse (RestApiResultStoreAddress)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreAddress>> UpdateStoreAddressAsyncWithHttpInfo (int? storeId, StoreAddressBase storeAddress)
         {
@@ -6728,7 +8566,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreAddress>>
             if (storeAddress == null)
                 throw new ApiException(400, "Missing required parameter 'storeAddress' when calling StoresApi->UpdateStoreAddress");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/address";
+            var localVarPath = "./api/v1.0/stores/{storeId}/address";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6788,17 +8626,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStoreAddress>>
             }
 
             return new ApiResponse<RestApiResultStoreAddress>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStoreAddress) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStoreAddress)));
         }
 
         /// <summary>
-        /// Update store address coordinates 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="coordinates">Store address coordinates</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="coordinates"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>RestApiResultCoordinates</returns>
         public RestApiResultCoordinates UpdateStoreAddressCoordinates (int? storeId, Coordinates coordinates, string appNameId = null)
         {
@@ -6807,12 +8645,12 @@ public RestApiResultCoordinates UpdateStoreAddressCoordinates (int? storeId, Coo
         }
 
         /// <summary>
-        /// Update store address coordinates 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="coordinates">Store address coordinates</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="coordinates"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultCoordinates</returns>
         public ApiResponse< RestApiResultCoordinates > UpdateStoreAddressCoordinatesWithHttpInfo (int? storeId, Coordinates coordinates, string appNameId = null)
         {
@@ -6823,7 +8661,7 @@ public ApiResponse< RestApiResultCoordinates > UpdateStoreAddressCoordinatesWith
             if (coordinates == null)
                 throw new ApiException(400, "Missing required parameter 'coordinates' when calling StoresApi->UpdateStoreAddressCoordinates");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/address/coordinates";
+            var localVarPath = "./api/v1.0/stores/{storeId}/address/coordinates";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6884,17 +8722,17 @@ public ApiResponse< RestApiResultCoordinates > UpdateStoreAddressCoordinatesWith
             }
 
             return new ApiResponse<RestApiResultCoordinates>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCoordinates) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCoordinates)));
         }
 
         /// <summary>
-        /// Update store address coordinates 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="coordinates">Store address coordinates</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="coordinates"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of RestApiResultCoordinates</returns>
         public async System.Threading.Tasks.Task<RestApiResultCoordinates> UpdateStoreAddressCoordinatesAsync (int? storeId, Coordinates coordinates, string appNameId = null)
         {
@@ -6904,12 +8742,12 @@ public async System.Threading.Tasks.Task<RestApiResultCoordinates> UpdateStoreAd
         }
 
         /// <summary>
-        /// Update store address coordinates 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="coordinates">Store address coordinates</param>
-        /// <param name="appNameId">App Name Id(Not used, still here for compatability reasons) (optional)</param>
+        /// <param name="storeId"></param>
+        /// <param name="coordinates"></param>
+        /// <param name="appNameId"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultCoordinates)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCoordinates>> UpdateStoreAddressCoordinatesAsyncWithHttpInfo (int? storeId, Coordinates coordinates, string appNameId = null)
         {
@@ -6920,7 +8758,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCoordinates>>
             if (coordinates == null)
                 throw new ApiException(400, "Missing required parameter 'coordinates' when calling StoresApi->UpdateStoreAddressCoordinates");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/address/coordinates";
+            var localVarPath = "./api/v1.0/stores/{storeId}/address/coordinates";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -6981,16 +8819,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCoordinates>>
             }
 
             return new ApiResponse<RestApiResultCoordinates>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultCoordinates) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCoordinates)));
         }
 
         /// <summary>
-        /// Update store address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="address">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="address"></param>
         /// <returns>Object</returns>
         public Object UpdateStoreAddressForm (int? storeId, StoreAddressForm address)
         {
@@ -6999,11 +8837,11 @@ public Object UpdateStoreAddressForm (int? storeId, StoreAddressForm address)
         }
 
         /// <summary>
-        /// Update store address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="address">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="address"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > UpdateStoreAddressFormWithHttpInfo (int? storeId, StoreAddressForm address)
         {
@@ -7014,7 +8852,7 @@ public ApiResponse< Object > UpdateStoreAddressFormWithHttpInfo (int? storeId, S
             if (address == null)
                 throw new ApiException(400, "Missing required parameter 'address' when calling StoresApi->UpdateStoreAddressForm");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/addressform";
+            var localVarPath = "./api/v1.0/stores/{storeId}/addressform";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -7074,16 +8912,16 @@ public ApiResponse< Object > UpdateStoreAddressFormWithHttpInfo (int? storeId, S
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Update store address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="address">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="address"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> UpdateStoreAddressFormAsync (int? storeId, StoreAddressForm address)
         {
@@ -7093,11 +8931,11 @@ public async System.Threading.Tasks.Task<Object> UpdateStoreAddressFormAsync (in
         }
 
         /// <summary>
-        /// Update store address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store identifier</param>
-        /// <param name="address">Store address</param>
+        /// <param name="storeId"></param>
+        /// <param name="address"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateStoreAddressFormAsyncWithHttpInfo (int? storeId, StoreAddressForm address)
         {
@@ -7108,7 +8946,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateStoreAddress
             if (address == null)
                 throw new ApiException(400, "Missing required parameter 'address' when calling StoresApi->UpdateStoreAddressForm");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/addressform";
+            var localVarPath = "./api/v1.0/stores/{storeId}/addressform";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -7168,7 +9006,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateStoreAddress
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
diff --git a/src/Flipdish/Api/StripeCustomConnectAdminApi.cs b/src/Flipdish/Api/StripeCustomConnectAdminApi.cs
deleted file mode 100644
index ce46faec..00000000
--- a/src/Flipdish/Api/StripeCustomConnectAdminApi.cs
+++ /dev/null
@@ -1,347 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using RestSharp;
-using Flipdish.Client;
-using Flipdish.Model;
-
-namespace Flipdish.Api
-{
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public interface IStripeCustomConnectAdminApi : IApiAccessor
-    {
-        #region Synchronous Operations
-        /// <summary>
-        /// Create a new Bank Account and Stripe connected account
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="accounts">Accounts to be initialized in stripe</param>
-        /// <returns>RestApiResultBankAccountDetail</returns>
-        RestApiResultBankAccountDetail InitializeBankAccountConnectedAccount (List<int?> accounts);
-
-        /// <summary>
-        /// Create a new Bank Account and Stripe connected account
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="accounts">Accounts to be initialized in stripe</param>
-        /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
-        ApiResponse<RestApiResultBankAccountDetail> InitializeBankAccountConnectedAccountWithHttpInfo (List<int?> accounts);
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
-        /// <summary>
-        /// Create a new Bank Account and Stripe connected account
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="accounts">Accounts to be initialized in stripe</param>
-        /// <returns>Task of RestApiResultBankAccountDetail</returns>
-        System.Threading.Tasks.Task<RestApiResultBankAccountDetail> InitializeBankAccountConnectedAccountAsync (List<int?> accounts);
-
-        /// <summary>
-        /// Create a new Bank Account and Stripe connected account
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="accounts">Accounts to be initialized in stripe</param>
-        /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> InitializeBankAccountConnectedAccountAsyncWithHttpInfo (List<int?> accounts);
-        #endregion Asynchronous Operations
-    }
-
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class StripeCustomConnectAdminApi : IStripeCustomConnectAdminApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StripeCustomConnectAdminApi"/> class.
-        /// </summary>
-        /// <returns></returns>
-        public StripeCustomConnectAdminApi(String basePath)
-        {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StripeCustomConnectAdminApi"/> class
-        /// using Configuration object
-        /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public StripeCustomConnectAdminApi(Flipdish.Client.Configuration configuration = null)
-        {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
-            else
-                this.Configuration = configuration;
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
-        }
-
-        /// <summary>
-        /// Gets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
-        {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
-        }
-
-        /// <summary>
-        /// Sets the base path of the API client.
-        /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
-        {
-            // do nothing
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
-
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
-            {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
-            }
-            set { _exceptionFactory = value; }
-        }
-
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
-
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
-        }
-
-        /// <summary>
-        /// Create a new Bank Account and Stripe connected account 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="accounts">Accounts to be initialized in stripe</param>
-        /// <returns>RestApiResultBankAccountDetail</returns>
-        public RestApiResultBankAccountDetail InitializeBankAccountConnectedAccount (List<int?> accounts)
-        {
-             ApiResponse<RestApiResultBankAccountDetail> localVarResponse = InitializeBankAccountConnectedAccountWithHttpInfo(accounts);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Create a new Bank Account and Stripe connected account 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="accounts">Accounts to be initialized in stripe</param>
-        /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
-        public ApiResponse< RestApiResultBankAccountDetail > InitializeBankAccountConnectedAccountWithHttpInfo (List<int?> accounts)
-        {
-            // verify the required parameter 'accounts' is set
-            if (accounts == null)
-                throw new ApiException(400, "Missing required parameter 'accounts' when calling StripeCustomConnectAdminApi->InitializeBankAccountConnectedAccount");
-
-            var localVarPath = "/api/v1.0/customconnect/initialize-bank-account";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (accounts != null && accounts.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(accounts); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = accounts; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("InitializeBankAccountConnectedAccount", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
-        }
-
-        /// <summary>
-        /// Create a new Bank Account and Stripe connected account 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="accounts">Accounts to be initialized in stripe</param>
-        /// <returns>Task of RestApiResultBankAccountDetail</returns>
-        public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> InitializeBankAccountConnectedAccountAsync (List<int?> accounts)
-        {
-             ApiResponse<RestApiResultBankAccountDetail> localVarResponse = await InitializeBankAccountConnectedAccountAsyncWithHttpInfo(accounts);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Create a new Bank Account and Stripe connected account 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="accounts">Accounts to be initialized in stripe</param>
-        /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> InitializeBankAccountConnectedAccountAsyncWithHttpInfo (List<int?> accounts)
-        {
-            // verify the required parameter 'accounts' is set
-            if (accounts == null)
-                throw new ApiException(400, "Missing required parameter 'accounts' when calling StripeCustomConnectAdminApi->InitializeBankAccountConnectedAccount");
-
-            var localVarPath = "/api/v1.0/customconnect/initialize-bank-account";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (accounts != null && accounts.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(accounts); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = accounts; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("InitializeBankAccountConnectedAccount", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
-        }
-
-    }
-}
diff --git a/src/Flipdish/Api/StripeCustomConnectApi.cs b/src/Flipdish/Api/StripeCustomConnectApi.cs
index 5b15c04e..a01cc1a8 100644
--- a/src/Flipdish/Api/StripeCustomConnectApi.cs
+++ b/src/Flipdish/Api/StripeCustomConnectApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,122 +25,122 @@ public interface IStripeCustomConnectApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create a new Bank Account and Stripe connected account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>RestApiResultBankAccountDetail</returns>
         RestApiResultBankAccountDetail CreateBankAccountAndConnectedAccount (string appId, BankAccountCreate account);
 
         /// <summary>
-        /// Create a new Bank Account and Stripe connected account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
         ApiResponse<RestApiResultBankAccountDetail> CreateBankAccountAndConnectedAccountWithHttpInfo (string appId, BankAccountCreate account);
         /// <summary>
-        /// Create or update a Stripe connected account associated with the bank account of bankAccountId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>RestApiResultStripeConnectedAccount</returns>
         RestApiResultStripeConnectedAccount CreateStripeConnectedAccount (string appId, int? bankAccountId);
 
         /// <summary>
-        /// Create or update a Stripe connected account associated with the bank account of bankAccountId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>ApiResponse of RestApiResultStripeConnectedAccount</returns>
         ApiResponse<RestApiResultStripeConnectedAccount> CreateStripeConnectedAccountWithHttpInfo (string appId, int? bankAccountId);
         /// <summary>
-        /// Gets a single-use Stripe URL for the given account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="stripeConnectedAccountId">Stripe Connected Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="stripeConnectedAccountId"></param>
         /// <param name="stripeAccountLinkRequest"></param>
         /// <returns>RestApiResultStripeConnectedAccount</returns>
         RestApiResultStripeConnectedAccount CreateStripeConnectedAccountLink (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest);
 
         /// <summary>
-        /// Gets a single-use Stripe URL for the given account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="stripeConnectedAccountId">Stripe Connected Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="stripeConnectedAccountId"></param>
         /// <param name="stripeAccountLinkRequest"></param>
         /// <returns>ApiResponse of RestApiResultStripeConnectedAccount</returns>
         ApiResponse<RestApiResultStripeConnectedAccount> CreateStripeConnectedAccountLinkWithHttpInfo (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest);
         /// <summary>
-        /// Gets the current verification status of the given connected account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="stripeConnectedAccountId"></param>
-        /// <returns>RestApiResultStripeConnectedAccount</returns>
-        RestApiResultStripeConnectedAccount GetVerificationStatus (string appId, string stripeConnectedAccountId);
+        /// <returns>RestApiArrayResultStripeCustomConnectedAccount</returns>
+        RestApiArrayResultStripeCustomConnectedAccount GetCustomConnect (int? storeId, string appId);
 
         /// <summary>
-        /// Gets the current verification status of the given connected account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="stripeConnectedAccountId"></param>
-        /// <returns>ApiResponse of RestApiResultStripeConnectedAccount</returns>
-        ApiResponse<RestApiResultStripeConnectedAccount> GetVerificationStatusWithHttpInfo (string appId, string stripeConnectedAccountId);
+        /// <returns>ApiResponse of RestApiArrayResultStripeCustomConnectedAccount</returns>
+        ApiResponse<RestApiArrayResultStripeCustomConnectedAccount> GetCustomConnectWithHttpInfo (int? storeId, string appId);
         /// <summary>
-        /// Update bank account&#39;s BusinessType and create a Stripe Connected Account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="businessType">Bank Account business type</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="businessType"></param>
         /// <returns>RestApiResultBankAccountDetail</returns>
         RestApiResultBankAccountDetail SetBankAccountBusinessType (string appId, int? bankAccountId, string businessType);
 
         /// <summary>
-        /// Update bank account&#39;s BusinessType and create a Stripe Connected Account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="businessType">Bank Account business type</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="businessType"></param>
         /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
         ApiResponse<RestApiResultBankAccountDetail> SetBankAccountBusinessTypeWithHttpInfo (string appId, int? bankAccountId, string businessType);
         /// <summary>
@@ -167,32 +167,32 @@ public interface IStripeCustomConnectApi : IApiAccessor
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> StripeCustomConnectRefreshWithHttpInfo (int? linkRequestId, string appId);
         /// <summary>
-        /// Update bank account details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="updateRequest">fields to be updated</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="updateRequest"></param>
         /// <returns>RestApiResultStripeConnectedAccount</returns>
         RestApiResultStripeConnectedAccount UpdateBankAccountDetails (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest);
 
         /// <summary>
-        /// Update bank account details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="updateRequest">fields to be updated</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="updateRequest"></param>
         /// <returns>ApiResponse of RestApiResultStripeConnectedAccount</returns>
         ApiResponse<RestApiResultStripeConnectedAccount> UpdateBankAccountDetailsWithHttpInfo (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest);
         /// <summary>
-        /// Update Stripe Connection Account&#39;s payout schedule
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -205,7 +205,7 @@ public interface IStripeCustomConnectApi : IApiAccessor
         RestApiResultModelBase UpdatePayoutSchedule (string appId, string stripeConnectedAccountId, string interval);
 
         /// <summary>
-        /// Update Stripe Connection Account&#39;s payout schedule
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -219,122 +219,122 @@ public interface IStripeCustomConnectApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create a new Bank Account and Stripe connected account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of RestApiResultBankAccountDetail</returns>
         System.Threading.Tasks.Task<RestApiResultBankAccountDetail> CreateBankAccountAndConnectedAccountAsync (string appId, BankAccountCreate account);
 
         /// <summary>
-        /// Create a new Bank Account and Stripe connected account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> CreateBankAccountAndConnectedAccountAsyncWithHttpInfo (string appId, BankAccountCreate account);
         /// <summary>
-        /// Create or update a Stripe connected account associated with the bank account of bankAccountId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>Task of RestApiResultStripeConnectedAccount</returns>
         System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> CreateStripeConnectedAccountAsync (string appId, int? bankAccountId);
 
         /// <summary>
-        /// Create or update a Stripe connected account associated with the bank account of bankAccountId
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStripeConnectedAccount)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnectedAccount>> CreateStripeConnectedAccountAsyncWithHttpInfo (string appId, int? bankAccountId);
         /// <summary>
-        /// Gets a single-use Stripe URL for the given account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="stripeConnectedAccountId">Stripe Connected Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="stripeConnectedAccountId"></param>
         /// <param name="stripeAccountLinkRequest"></param>
         /// <returns>Task of RestApiResultStripeConnectedAccount</returns>
         System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> CreateStripeConnectedAccountLinkAsync (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest);
 
         /// <summary>
-        /// Gets a single-use Stripe URL for the given account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="stripeConnectedAccountId">Stripe Connected Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="stripeConnectedAccountId"></param>
         /// <param name="stripeAccountLinkRequest"></param>
         /// <returns>Task of ApiResponse (RestApiResultStripeConnectedAccount)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnectedAccount>> CreateStripeConnectedAccountLinkAsyncWithHttpInfo (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest);
         /// <summary>
-        /// Gets the current verification status of the given connected account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="stripeConnectedAccountId"></param>
-        /// <returns>Task of RestApiResultStripeConnectedAccount</returns>
-        System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> GetVerificationStatusAsync (string appId, string stripeConnectedAccountId);
+        /// <returns>Task of RestApiArrayResultStripeCustomConnectedAccount</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultStripeCustomConnectedAccount> GetCustomConnectAsync (int? storeId, string appId);
 
         /// <summary>
-        /// Gets the current verification status of the given connected account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="stripeConnectedAccountId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultStripeConnectedAccount)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnectedAccount>> GetVerificationStatusAsyncWithHttpInfo (string appId, string stripeConnectedAccountId);
+        /// <returns>Task of ApiResponse (RestApiArrayResultStripeCustomConnectedAccount)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStripeCustomConnectedAccount>> GetCustomConnectAsyncWithHttpInfo (int? storeId, string appId);
         /// <summary>
-        /// Update bank account&#39;s BusinessType and create a Stripe Connected Account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="businessType">Bank Account business type</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="businessType"></param>
         /// <returns>Task of RestApiResultBankAccountDetail</returns>
         System.Threading.Tasks.Task<RestApiResultBankAccountDetail> SetBankAccountBusinessTypeAsync (string appId, int? bankAccountId, string businessType);
 
         /// <summary>
-        /// Update bank account&#39;s BusinessType and create a Stripe Connected Account
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="businessType">Bank Account business type</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="businessType"></param>
         /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> SetBankAccountBusinessTypeAsyncWithHttpInfo (string appId, int? bankAccountId, string businessType);
         /// <summary>
@@ -361,32 +361,32 @@ public interface IStripeCustomConnectApi : IApiAccessor
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> StripeCustomConnectRefreshAsyncWithHttpInfo (int? linkRequestId, string appId);
         /// <summary>
-        /// Update bank account details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="updateRequest">fields to be updated</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="updateRequest"></param>
         /// <returns>Task of RestApiResultStripeConnectedAccount</returns>
         System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> UpdateBankAccountDetailsAsync (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest);
 
         /// <summary>
-        /// Update bank account details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="updateRequest">fields to be updated</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="updateRequest"></param>
         /// <returns>Task of ApiResponse (RestApiResultStripeConnectedAccount)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnectedAccount>> UpdateBankAccountDetailsAsyncWithHttpInfo (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest);
         /// <summary>
-        /// Update Stripe Connection Account&#39;s payout schedule
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -399,7 +399,7 @@ public interface IStripeCustomConnectApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultModelBase> UpdatePayoutScheduleAsync (string appId, string stripeConnectedAccountId, string interval);
 
         /// <summary>
-        /// Update Stripe Connection Account&#39;s payout schedule
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -511,11 +511,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create a new Bank Account and Stripe connected account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>RestApiResultBankAccountDetail</returns>
         public RestApiResultBankAccountDetail CreateBankAccountAndConnectedAccount (string appId, BankAccountCreate account)
         {
@@ -524,11 +524,11 @@ public RestApiResultBankAccountDetail CreateBankAccountAndConnectedAccount (stri
         }
 
         /// <summary>
-        /// Create a new Bank Account and Stripe connected account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
         public ApiResponse< RestApiResultBankAccountDetail > CreateBankAccountAndConnectedAccountWithHttpInfo (string appId, BankAccountCreate account)
         {
@@ -539,7 +539,7 @@ public ApiResponse< RestApiResultBankAccountDetail > CreateBankAccountAndConnect
             if (account == null)
                 throw new ApiException(400, "Missing required parameter 'account' when calling StripeCustomConnectApi->CreateBankAccountAndConnectedAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/bank-account";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/bank-account";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -599,16 +599,16 @@ public ApiResponse< RestApiResultBankAccountDetail > CreateBankAccountAndConnect
             }
 
             return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
         }
 
         /// <summary>
-        /// Create a new Bank Account and Stripe connected account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of RestApiResultBankAccountDetail</returns>
         public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> CreateBankAccountAndConnectedAccountAsync (string appId, BankAccountCreate account)
         {
@@ -618,11 +618,11 @@ public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> CreateB
         }
 
         /// <summary>
-        /// Create a new Bank Account and Stripe connected account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="account">Account to be created</param>
+        /// <param name="appId"></param>
+        /// <param name="account"></param>
         /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> CreateBankAccountAndConnectedAccountAsyncWithHttpInfo (string appId, BankAccountCreate account)
         {
@@ -633,7 +633,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDet
             if (account == null)
                 throw new ApiException(400, "Missing required parameter 'account' when calling StripeCustomConnectApi->CreateBankAccountAndConnectedAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/bank-account";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/bank-account";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -693,16 +693,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDet
             }
 
             return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
         }
 
         /// <summary>
-        /// Create or update a Stripe connected account associated with the bank account of bankAccountId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>RestApiResultStripeConnectedAccount</returns>
         public RestApiResultStripeConnectedAccount CreateStripeConnectedAccount (string appId, int? bankAccountId)
         {
@@ -711,11 +711,11 @@ public RestApiResultStripeConnectedAccount CreateStripeConnectedAccount (string
         }
 
         /// <summary>
-        /// Create or update a Stripe connected account associated with the bank account of bankAccountId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>ApiResponse of RestApiResultStripeConnectedAccount</returns>
         public ApiResponse< RestApiResultStripeConnectedAccount > CreateStripeConnectedAccountWithHttpInfo (string appId, int? bankAccountId)
         {
@@ -726,7 +726,7 @@ public ApiResponse< RestApiResultStripeConnectedAccount > CreateStripeConnectedA
             if (bankAccountId == null)
                 throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling StripeCustomConnectApi->CreateStripeConnectedAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/{bankAccountId}/create-update-account";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/{bankAccountId}/create-update-account";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -774,16 +774,16 @@ public ApiResponse< RestApiResultStripeConnectedAccount > CreateStripeConnectedA
             }
 
             return new ApiResponse<RestApiResultStripeConnectedAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeConnectedAccount)));
         }
 
         /// <summary>
-        /// Create or update a Stripe connected account associated with the bank account of bankAccountId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>Task of RestApiResultStripeConnectedAccount</returns>
         public async System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> CreateStripeConnectedAccountAsync (string appId, int? bankAccountId)
         {
@@ -793,11 +793,11 @@ public async System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> Cr
         }
 
         /// <summary>
-        /// Create or update a Stripe connected account associated with the bank account of bankAccountId 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStripeConnectedAccount)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnectedAccount>> CreateStripeConnectedAccountAsyncWithHttpInfo (string appId, int? bankAccountId)
         {
@@ -808,7 +808,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnecte
             if (bankAccountId == null)
                 throw new ApiException(400, "Missing required parameter 'bankAccountId' when calling StripeCustomConnectApi->CreateStripeConnectedAccount");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/{bankAccountId}/create-update-account";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/{bankAccountId}/create-update-account";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -856,16 +856,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnecte
             }
 
             return new ApiResponse<RestApiResultStripeConnectedAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeConnectedAccount)));
         }
 
         /// <summary>
-        /// Gets a single-use Stripe URL for the given account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="stripeConnectedAccountId">Stripe Connected Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="stripeConnectedAccountId"></param>
         /// <param name="stripeAccountLinkRequest"></param>
         /// <returns>RestApiResultStripeConnectedAccount</returns>
         public RestApiResultStripeConnectedAccount CreateStripeConnectedAccountLink (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest)
@@ -875,11 +875,11 @@ public RestApiResultStripeConnectedAccount CreateStripeConnectedAccountLink (str
         }
 
         /// <summary>
-        /// Gets a single-use Stripe URL for the given account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="stripeConnectedAccountId">Stripe Connected Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="stripeConnectedAccountId"></param>
         /// <param name="stripeAccountLinkRequest"></param>
         /// <returns>ApiResponse of RestApiResultStripeConnectedAccount</returns>
         public ApiResponse< RestApiResultStripeConnectedAccount > CreateStripeConnectedAccountLinkWithHttpInfo (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest)
@@ -894,7 +894,7 @@ public ApiResponse< RestApiResultStripeConnectedAccount > CreateStripeConnectedA
             if (stripeAccountLinkRequest == null)
                 throw new ApiException(400, "Missing required parameter 'stripeAccountLinkRequest' when calling StripeCustomConnectApi->CreateStripeConnectedAccountLink");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/{stripeConnectedAccountId}/create-account-link";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/{stripeConnectedAccountId}/create-account-link";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -955,16 +955,16 @@ public ApiResponse< RestApiResultStripeConnectedAccount > CreateStripeConnectedA
             }
 
             return new ApiResponse<RestApiResultStripeConnectedAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeConnectedAccount)));
         }
 
         /// <summary>
-        /// Gets a single-use Stripe URL for the given account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="stripeConnectedAccountId">Stripe Connected Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="stripeConnectedAccountId"></param>
         /// <param name="stripeAccountLinkRequest"></param>
         /// <returns>Task of RestApiResultStripeConnectedAccount</returns>
         public async System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> CreateStripeConnectedAccountLinkAsync (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest)
@@ -975,11 +975,11 @@ public async System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> Cr
         }
 
         /// <summary>
-        /// Gets a single-use Stripe URL for the given account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="stripeConnectedAccountId">Stripe Connected Account Id</param>
+        /// <param name="appId"></param>
+        /// <param name="stripeConnectedAccountId"></param>
         /// <param name="stripeAccountLinkRequest"></param>
         /// <returns>Task of ApiResponse (RestApiResultStripeConnectedAccount)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnectedAccount>> CreateStripeConnectedAccountLinkAsyncWithHttpInfo (string appId, string stripeConnectedAccountId, StripeAccountLinkRequest stripeAccountLinkRequest)
@@ -994,7 +994,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnecte
             if (stripeAccountLinkRequest == null)
                 throw new ApiException(400, "Missing required parameter 'stripeAccountLinkRequest' when calling StripeCustomConnectApi->CreateStripeConnectedAccountLink");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/{stripeConnectedAccountId}/create-account-link";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/{stripeConnectedAccountId}/create-account-link";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1055,40 +1055,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnecte
             }
 
             return new ApiResponse<RestApiResultStripeConnectedAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeConnectedAccount)));
         }
 
         /// <summary>
-        /// Gets the current verification status of the given connected account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="stripeConnectedAccountId"></param>
-        /// <returns>RestApiResultStripeConnectedAccount</returns>
-        public RestApiResultStripeConnectedAccount GetVerificationStatus (string appId, string stripeConnectedAccountId)
+        /// <returns>RestApiArrayResultStripeCustomConnectedAccount</returns>
+        public RestApiArrayResultStripeCustomConnectedAccount GetCustomConnect (int? storeId, string appId)
         {
-             ApiResponse<RestApiResultStripeConnectedAccount> localVarResponse = GetVerificationStatusWithHttpInfo(appId, stripeConnectedAccountId);
+             ApiResponse<RestApiArrayResultStripeCustomConnectedAccount> localVarResponse = GetCustomConnectWithHttpInfo(storeId, appId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Gets the current verification status of the given connected account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="stripeConnectedAccountId"></param>
-        /// <returns>ApiResponse of RestApiResultStripeConnectedAccount</returns>
-        public ApiResponse< RestApiResultStripeConnectedAccount > GetVerificationStatusWithHttpInfo (string appId, string stripeConnectedAccountId)
+        /// <returns>ApiResponse of RestApiArrayResultStripeCustomConnectedAccount</returns>
+        public ApiResponse< RestApiArrayResultStripeCustomConnectedAccount > GetCustomConnectWithHttpInfo (int? storeId, string appId)
         {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StripeCustomConnectApi->GetCustomConnect");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StripeCustomConnectApi->GetVerificationStatus");
-            // verify the required parameter 'stripeConnectedAccountId' is set
-            if (stripeConnectedAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'stripeConnectedAccountId' when calling StripeCustomConnectApi->GetVerificationStatus");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StripeCustomConnectApi->GetCustomConnect");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/verification-status";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1112,8 +1112,8 @@ public ApiResponse< RestApiResultStripeConnectedAccount > GetVerificationStatusW
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (stripeConnectedAccountId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "stripeConnectedAccountId", stripeConnectedAccountId)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1131,46 +1131,46 @@ public ApiResponse< RestApiResultStripeConnectedAccount > GetVerificationStatusW
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetVerificationStatus", localVarResponse);
+                Exception exception = ExceptionFactory("GetCustomConnect", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultStripeConnectedAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultStripeConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeConnectedAccount)));
+            return new ApiResponse<RestApiArrayResultStripeCustomConnectedAccount>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultStripeCustomConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStripeCustomConnectedAccount)));
         }
 
         /// <summary>
-        /// Gets the current verification status of the given connected account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="stripeConnectedAccountId"></param>
-        /// <returns>Task of RestApiResultStripeConnectedAccount</returns>
-        public async System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> GetVerificationStatusAsync (string appId, string stripeConnectedAccountId)
+        /// <returns>Task of RestApiArrayResultStripeCustomConnectedAccount</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultStripeCustomConnectedAccount> GetCustomConnectAsync (int? storeId, string appId)
         {
-             ApiResponse<RestApiResultStripeConnectedAccount> localVarResponse = await GetVerificationStatusAsyncWithHttpInfo(appId, stripeConnectedAccountId);
+             ApiResponse<RestApiArrayResultStripeCustomConnectedAccount> localVarResponse = await GetCustomConnectAsyncWithHttpInfo(storeId, appId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Gets the current verification status of the given connected account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="storeId"></param>
         /// <param name="appId"></param>
-        /// <param name="stripeConnectedAccountId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultStripeConnectedAccount)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnectedAccount>> GetVerificationStatusAsyncWithHttpInfo (string appId, string stripeConnectedAccountId)
+        /// <returns>Task of ApiResponse (RestApiArrayResultStripeCustomConnectedAccount)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultStripeCustomConnectedAccount>> GetCustomConnectAsyncWithHttpInfo (int? storeId, string appId)
         {
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling StripeCustomConnectApi->GetCustomConnect");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling StripeCustomConnectApi->GetVerificationStatus");
-            // verify the required parameter 'stripeConnectedAccountId' is set
-            if (stripeConnectedAccountId == null)
-                throw new ApiException(400, "Missing required parameter 'stripeConnectedAccountId' when calling StripeCustomConnectApi->GetVerificationStatus");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling StripeCustomConnectApi->GetCustomConnect");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/verification-status";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1194,8 +1194,8 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnecte
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (stripeConnectedAccountId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "stripeConnectedAccountId", stripeConnectedAccountId)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -1213,22 +1213,22 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnecte
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetVerificationStatus", localVarResponse);
+                Exception exception = ExceptionFactory("GetCustomConnect", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultStripeConnectedAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultStripeConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeConnectedAccount)));
+            return new ApiResponse<RestApiArrayResultStripeCustomConnectedAccount>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultStripeCustomConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultStripeCustomConnectedAccount)));
         }
 
         /// <summary>
-        /// Update bank account&#39;s BusinessType and create a Stripe Connected Account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="businessType">Bank Account business type</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="businessType"></param>
         /// <returns>RestApiResultBankAccountDetail</returns>
         public RestApiResultBankAccountDetail SetBankAccountBusinessType (string appId, int? bankAccountId, string businessType)
         {
@@ -1237,12 +1237,12 @@ public RestApiResultBankAccountDetail SetBankAccountBusinessType (string appId,
         }
 
         /// <summary>
-        /// Update bank account&#39;s BusinessType and create a Stripe Connected Account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="businessType">Bank Account business type</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="businessType"></param>
         /// <returns>ApiResponse of RestApiResultBankAccountDetail</returns>
         public ApiResponse< RestApiResultBankAccountDetail > SetBankAccountBusinessTypeWithHttpInfo (string appId, int? bankAccountId, string businessType)
         {
@@ -1256,7 +1256,7 @@ public ApiResponse< RestApiResultBankAccountDetail > SetBankAccountBusinessTypeW
             if (businessType == null)
                 throw new ApiException(400, "Missing required parameter 'businessType' when calling StripeCustomConnectApi->SetBankAccountBusinessType");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/bank-account/{bankAccountId}/businesstype";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/bank-account/{bankAccountId}/businesstype";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1317,17 +1317,17 @@ public ApiResponse< RestApiResultBankAccountDetail > SetBankAccountBusinessTypeW
             }
 
             return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
         }
 
         /// <summary>
-        /// Update bank account&#39;s BusinessType and create a Stripe Connected Account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="businessType">Bank Account business type</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="businessType"></param>
         /// <returns>Task of RestApiResultBankAccountDetail</returns>
         public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> SetBankAccountBusinessTypeAsync (string appId, int? bankAccountId, string businessType)
         {
@@ -1337,12 +1337,12 @@ public async System.Threading.Tasks.Task<RestApiResultBankAccountDetail> SetBank
         }
 
         /// <summary>
-        /// Update bank account&#39;s BusinessType and create a Stripe Connected Account 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="businessType">Bank Account business type</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="businessType"></param>
         /// <returns>Task of ApiResponse (RestApiResultBankAccountDetail)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDetail>> SetBankAccountBusinessTypeAsyncWithHttpInfo (string appId, int? bankAccountId, string businessType)
         {
@@ -1356,7 +1356,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDet
             if (businessType == null)
                 throw new ApiException(400, "Missing required parameter 'businessType' when calling StripeCustomConnectApi->SetBankAccountBusinessType");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/bank-account/{bankAccountId}/businesstype";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/bank-account/{bankAccountId}/businesstype";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1417,7 +1417,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBankAccountDet
             }
 
             return new ApiResponse<RestApiResultBankAccountDetail>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultBankAccountDetail) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBankAccountDetail)));
         }
 
@@ -1450,7 +1450,7 @@ public ApiResponse< Object > StripeCustomConnectRefreshWithHttpInfo (int? linkRe
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling StripeCustomConnectApi->StripeCustomConnectRefresh");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/refresh-link";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/refresh-link";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1498,7 +1498,7 @@ public ApiResponse< Object > StripeCustomConnectRefreshWithHttpInfo (int? linkRe
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
@@ -1532,7 +1532,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> StripeCustomConnec
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling StripeCustomConnectApi->StripeCustomConnectRefresh");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/refresh-link";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/refresh-link";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1580,17 +1580,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> StripeCustomConnec
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Update bank account details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="updateRequest">fields to be updated</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="updateRequest"></param>
         /// <returns>RestApiResultStripeConnectedAccount</returns>
         public RestApiResultStripeConnectedAccount UpdateBankAccountDetails (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest)
         {
@@ -1599,12 +1599,12 @@ public RestApiResultStripeConnectedAccount UpdateBankAccountDetails (string appI
         }
 
         /// <summary>
-        /// Update bank account details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="updateRequest">fields to be updated</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="updateRequest"></param>
         /// <returns>ApiResponse of RestApiResultStripeConnectedAccount</returns>
         public ApiResponse< RestApiResultStripeConnectedAccount > UpdateBankAccountDetailsWithHttpInfo (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest)
         {
@@ -1618,7 +1618,7 @@ public ApiResponse< RestApiResultStripeConnectedAccount > UpdateBankAccountDetai
             if (updateRequest == null)
                 throw new ApiException(400, "Missing required parameter 'updateRequest' when calling StripeCustomConnectApi->UpdateBankAccountDetails");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/{bankAccountId}/update-bank-account-details";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/{bankAccountId}/update-bank-account-details";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1679,17 +1679,17 @@ public ApiResponse< RestApiResultStripeConnectedAccount > UpdateBankAccountDetai
             }
 
             return new ApiResponse<RestApiResultStripeConnectedAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeConnectedAccount)));
         }
 
         /// <summary>
-        /// Update bank account details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="updateRequest">fields to be updated</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="updateRequest"></param>
         /// <returns>Task of RestApiResultStripeConnectedAccount</returns>
         public async System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> UpdateBankAccountDetailsAsync (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest)
         {
@@ -1699,12 +1699,12 @@ public async System.Threading.Tasks.Task<RestApiResultStripeConnectedAccount> Up
         }
 
         /// <summary>
-        /// Update bank account details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="bankAccountId">Bank Account Id</param>
-        /// <param name="updateRequest">fields to be updated</param>
+        /// <param name="appId"></param>
+        /// <param name="bankAccountId"></param>
+        /// <param name="updateRequest"></param>
         /// <returns>Task of ApiResponse (RestApiResultStripeConnectedAccount)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnectedAccount>> UpdateBankAccountDetailsAsyncWithHttpInfo (string appId, int? bankAccountId, BankAccountDetailsUpdateRequest updateRequest)
         {
@@ -1718,7 +1718,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnecte
             if (updateRequest == null)
                 throw new ApiException(400, "Missing required parameter 'updateRequest' when calling StripeCustomConnectApi->UpdateBankAccountDetails");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/{bankAccountId}/update-bank-account-details";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/{bankAccountId}/update-bank-account-details";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1779,12 +1779,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStripeConnecte
             }
 
             return new ApiResponse<RestApiResultStripeConnectedAccount>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStripeConnectedAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStripeConnectedAccount)));
         }
 
         /// <summary>
-        /// Update Stripe Connection Account&#39;s payout schedule 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1798,7 +1798,7 @@ public RestApiResultModelBase UpdatePayoutSchedule (string appId, string stripeC
         }
 
         /// <summary>
-        /// Update Stripe Connection Account&#39;s payout schedule 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1817,7 +1817,7 @@ public ApiResponse< RestApiResultModelBase > UpdatePayoutScheduleWithHttpInfo (s
             if (interval == null)
                 throw new ApiException(400, "Missing required parameter 'interval' when calling StripeCustomConnectApi->UpdatePayoutSchedule");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/update-payout-schedule/{stripeConnectedAccountId}/{interval}";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/update-payout-schedule/{stripeConnectedAccountId}/{interval}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1866,12 +1866,12 @@ public ApiResponse< RestApiResultModelBase > UpdatePayoutScheduleWithHttpInfo (s
             }
 
             return new ApiResponse<RestApiResultModelBase>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultModelBase) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultModelBase)));
         }
 
         /// <summary>
-        /// Update Stripe Connection Account&#39;s payout schedule 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1886,7 +1886,7 @@ public async System.Threading.Tasks.Task<RestApiResultModelBase> UpdatePayoutSch
         }
 
         /// <summary>
-        /// Update Stripe Connection Account&#39;s payout schedule 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1905,7 +1905,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultModelBase>> Up
             if (interval == null)
                 throw new ApiException(400, "Missing required parameter 'interval' when calling StripeCustomConnectApi->UpdatePayoutSchedule");
 
-            var localVarPath = "/api/v1.0/{appId}/customconnect/update-payout-schedule/{stripeConnectedAccountId}/{interval}";
+            var localVarPath = "./api/v1.0/{appId}/customconnect/update-payout-schedule/{stripeConnectedAccountId}/{interval}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1954,7 +1954,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultModelBase>> Up
             }
 
             return new ApiResponse<RestApiResultModelBase>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultModelBase) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultModelBase)));
         }
 
diff --git a/src/Flipdish/Api/StuartApi.cs b/src/Flipdish/Api/StuartApi.cs
index 8213f989..81e3d89d 100644
--- a/src/Flipdish/Api/StuartApi.cs
+++ b/src/Flipdish/Api/StuartApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,185 +25,185 @@ public interface IStuartApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Cancel a stuart job
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         Object StuartCancelJob (int? jobId, int? storeId);
 
         /// <summary>
-        /// Cancel a stuart job
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> StuartCancelJobWithHttpInfo (int? jobId, int? storeId);
         /// <summary>
-        /// Get start job details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultJobResponse</returns>
         RestApiResultJobResponse StuartGetJob (int? jobId, int? storeId);
 
         /// <summary>
-        /// Get start job details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultJobResponse</returns>
         ApiResponse<RestApiResultJobResponse> StuartGetJobWithHttpInfo (int? jobId, int? storeId);
         /// <summary>
-        /// Get stuart settings for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultStuartSettings</returns>
         RestApiResultStuartSettings StuartGetStuartSettings (int? storeId);
 
         /// <summary>
-        /// Get stuart settings for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultStuartSettings</returns>
         ApiResponse<RestApiResultStuartSettings> StuartGetStuartSettingsWithHttpInfo (int? storeId);
         /// <summary>
-        /// Set stuart settings for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
-        /// <param name="stuartSettings">Stuart settings model</param>
+        /// <param name="storeId"></param>
+        /// <param name="stuartSettings"></param>
         /// <returns>Object</returns>
         Object StuartPostStuartSettings (int? storeId, StuartSettings stuartSettings);
 
         /// <summary>
-        /// Set stuart settings for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
-        /// <param name="stuartSettings">Stuart settings model</param>
+        /// <param name="storeId"></param>
+        /// <param name="stuartSettings"></param>
         /// <returns>ApiResponse of Object</returns>
         ApiResponse<Object> StuartPostStuartSettingsWithHttpInfo (int? storeId, StuartSettings stuartSettings);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Cancel a stuart job
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> StuartCancelJobAsync (int? jobId, int? storeId);
 
         /// <summary>
-        /// Cancel a stuart job
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> StuartCancelJobAsyncWithHttpInfo (int? jobId, int? storeId);
         /// <summary>
-        /// Get start job details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultJobResponse</returns>
         System.Threading.Tasks.Task<RestApiResultJobResponse> StuartGetJobAsync (int? jobId, int? storeId);
 
         /// <summary>
-        /// Get start job details
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultJobResponse)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultJobResponse>> StuartGetJobAsyncWithHttpInfo (int? jobId, int? storeId);
         /// <summary>
-        /// Get stuart settings for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultStuartSettings</returns>
         System.Threading.Tasks.Task<RestApiResultStuartSettings> StuartGetStuartSettingsAsync (int? storeId);
 
         /// <summary>
-        /// Get stuart settings for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStuartSettings)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultStuartSettings>> StuartGetStuartSettingsAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Set stuart settings for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
-        /// <param name="stuartSettings">Stuart settings model</param>
+        /// <param name="storeId"></param>
+        /// <param name="stuartSettings"></param>
         /// <returns>Task of Object</returns>
         System.Threading.Tasks.Task<Object> StuartPostStuartSettingsAsync (int? storeId, StuartSettings stuartSettings);
 
         /// <summary>
-        /// Set stuart settings for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
-        /// <param name="stuartSettings">Stuart settings model</param>
+        /// <param name="storeId"></param>
+        /// <param name="stuartSettings"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> StuartPostStuartSettingsAsyncWithHttpInfo (int? storeId, StuartSettings stuartSettings);
         #endregion Asynchronous Operations
@@ -307,11 +307,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Cancel a stuart job 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Object</returns>
         public Object StuartCancelJob (int? jobId, int? storeId)
         {
@@ -320,11 +320,11 @@ public Object StuartCancelJob (int? jobId, int? storeId)
         }
 
         /// <summary>
-        /// Cancel a stuart job 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > StuartCancelJobWithHttpInfo (int? jobId, int? storeId)
         {
@@ -335,7 +335,7 @@ public ApiResponse< Object > StuartCancelJobWithHttpInfo (int? jobId, int? store
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StuartApi->StuartCancelJob");
 
-            var localVarPath = "/api/v1.0/stuart/jobs/{jobId}";
+            var localVarPath = "./api/v1.0/stuart/jobs/{jobId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -383,16 +383,16 @@ public ApiResponse< Object > StuartCancelJobWithHttpInfo (int? jobId, int? store
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Cancel a stuart job 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> StuartCancelJobAsync (int? jobId, int? storeId)
         {
@@ -402,11 +402,11 @@ public async System.Threading.Tasks.Task<Object> StuartCancelJobAsync (int? jobI
         }
 
         /// <summary>
-        /// Cancel a stuart job 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> StuartCancelJobAsyncWithHttpInfo (int? jobId, int? storeId)
         {
@@ -417,7 +417,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> StuartCancelJobAsy
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StuartApi->StuartCancelJob");
 
-            var localVarPath = "/api/v1.0/stuart/jobs/{jobId}";
+            var localVarPath = "./api/v1.0/stuart/jobs/{jobId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -465,16 +465,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> StuartCancelJobAsy
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Get start job details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultJobResponse</returns>
         public RestApiResultJobResponse StuartGetJob (int? jobId, int? storeId)
         {
@@ -483,11 +483,11 @@ public RestApiResultJobResponse StuartGetJob (int? jobId, int? storeId)
         }
 
         /// <summary>
-        /// Get start job details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultJobResponse</returns>
         public ApiResponse< RestApiResultJobResponse > StuartGetJobWithHttpInfo (int? jobId, int? storeId)
         {
@@ -498,7 +498,7 @@ public ApiResponse< RestApiResultJobResponse > StuartGetJobWithHttpInfo (int? jo
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StuartApi->StuartGetJob");
 
-            var localVarPath = "/api/v1.0/stuart/jobs/{jobId}";
+            var localVarPath = "./api/v1.0/stuart/jobs/{jobId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -546,16 +546,16 @@ public ApiResponse< RestApiResultJobResponse > StuartGetJobWithHttpInfo (int? jo
             }
 
             return new ApiResponse<RestApiResultJobResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultJobResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultJobResponse)));
         }
 
         /// <summary>
-        /// Get start job details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultJobResponse</returns>
         public async System.Threading.Tasks.Task<RestApiResultJobResponse> StuartGetJobAsync (int? jobId, int? storeId)
         {
@@ -565,11 +565,11 @@ public async System.Threading.Tasks.Task<RestApiResultJobResponse> StuartGetJobA
         }
 
         /// <summary>
-        /// Get start job details 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="jobId">Stuart job identifier</param>
-        /// <param name="storeId">Store identifier</param>
+        /// <param name="jobId"></param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultJobResponse)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultJobResponse>> StuartGetJobAsyncWithHttpInfo (int? jobId, int? storeId)
         {
@@ -580,7 +580,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultJobResponse>>
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StuartApi->StuartGetJob");
 
-            var localVarPath = "/api/v1.0/stuart/jobs/{jobId}";
+            var localVarPath = "./api/v1.0/stuart/jobs/{jobId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -628,15 +628,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultJobResponse>>
             }
 
             return new ApiResponse<RestApiResultJobResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultJobResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultJobResponse)));
         }
 
         /// <summary>
-        /// Get stuart settings for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultStuartSettings</returns>
         public RestApiResultStuartSettings StuartGetStuartSettings (int? storeId)
         {
@@ -645,10 +645,10 @@ public RestApiResultStuartSettings StuartGetStuartSettings (int? storeId)
         }
 
         /// <summary>
-        /// Get stuart settings for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultStuartSettings</returns>
         public ApiResponse< RestApiResultStuartSettings > StuartGetStuartSettingsWithHttpInfo (int? storeId)
         {
@@ -656,7 +656,7 @@ public ApiResponse< RestApiResultStuartSettings > StuartGetStuartSettingsWithHtt
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StuartApi->StuartGetStuartSettings");
 
-            var localVarPath = "/api/v1.0/stuart/settings/{storeId}";
+            var localVarPath = "./api/v1.0/stuart/settings/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -703,15 +703,15 @@ public ApiResponse< RestApiResultStuartSettings > StuartGetStuartSettingsWithHtt
             }
 
             return new ApiResponse<RestApiResultStuartSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStuartSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStuartSettings)));
         }
 
         /// <summary>
-        /// Get stuart settings for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultStuartSettings</returns>
         public async System.Threading.Tasks.Task<RestApiResultStuartSettings> StuartGetStuartSettingsAsync (int? storeId)
         {
@@ -721,10 +721,10 @@ public async System.Threading.Tasks.Task<RestApiResultStuartSettings> StuartGetS
         }
 
         /// <summary>
-        /// Get stuart settings for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultStuartSettings)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStuartSettings>> StuartGetStuartSettingsAsyncWithHttpInfo (int? storeId)
         {
@@ -732,7 +732,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStuartSettings
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling StuartApi->StuartGetStuartSettings");
 
-            var localVarPath = "/api/v1.0/stuart/settings/{storeId}";
+            var localVarPath = "./api/v1.0/stuart/settings/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -779,16 +779,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultStuartSettings
             }
 
             return new ApiResponse<RestApiResultStuartSettings>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultStuartSettings) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultStuartSettings)));
         }
 
         /// <summary>
-        /// Set stuart settings for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
-        /// <param name="stuartSettings">Stuart settings model</param>
+        /// <param name="storeId"></param>
+        /// <param name="stuartSettings"></param>
         /// <returns>Object</returns>
         public Object StuartPostStuartSettings (int? storeId, StuartSettings stuartSettings)
         {
@@ -797,11 +797,11 @@ public Object StuartPostStuartSettings (int? storeId, StuartSettings stuartSetti
         }
 
         /// <summary>
-        /// Set stuart settings for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
-        /// <param name="stuartSettings">Stuart settings model</param>
+        /// <param name="storeId"></param>
+        /// <param name="stuartSettings"></param>
         /// <returns>ApiResponse of Object</returns>
         public ApiResponse< Object > StuartPostStuartSettingsWithHttpInfo (int? storeId, StuartSettings stuartSettings)
         {
@@ -812,7 +812,7 @@ public ApiResponse< Object > StuartPostStuartSettingsWithHttpInfo (int? storeId,
             if (stuartSettings == null)
                 throw new ApiException(400, "Missing required parameter 'stuartSettings' when calling StuartApi->StuartPostStuartSettings");
 
-            var localVarPath = "/api/v1.0/stuart/settings/{storeId}";
+            var localVarPath = "./api/v1.0/stuart/settings/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -872,16 +872,16 @@ public ApiResponse< Object > StuartPostStuartSettingsWithHttpInfo (int? storeId,
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Set stuart settings for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
-        /// <param name="stuartSettings">Stuart settings model</param>
+        /// <param name="storeId"></param>
+        /// <param name="stuartSettings"></param>
         /// <returns>Task of Object</returns>
         public async System.Threading.Tasks.Task<Object> StuartPostStuartSettingsAsync (int? storeId, StuartSettings stuartSettings)
         {
@@ -891,11 +891,11 @@ public async System.Threading.Tasks.Task<Object> StuartPostStuartSettingsAsync (
         }
 
         /// <summary>
-        /// Set stuart settings for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Identifier</param>
-        /// <param name="stuartSettings">Stuart settings model</param>
+        /// <param name="storeId"></param>
+        /// <param name="stuartSettings"></param>
         /// <returns>Task of ApiResponse (Object)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> StuartPostStuartSettingsAsyncWithHttpInfo (int? storeId, StuartSettings stuartSettings)
         {
@@ -906,7 +906,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> StuartPostStuartSe
             if (stuartSettings == null)
                 throw new ApiException(400, "Missing required parameter 'stuartSettings' when calling StuartApi->StuartPostStuartSettings");
 
-            var localVarPath = "/api/v1.0/stuart/settings/{storeId}";
+            var localVarPath = "./api/v1.0/stuart/settings/{storeId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -966,7 +966,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> StuartPostStuartSe
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
diff --git a/src/Flipdish/Api/SubscriptionsApi.cs b/src/Flipdish/Api/SubscriptionsApi.cs
index 36ae70b4..6d444459 100644
--- a/src/Flipdish/Api/SubscriptionsApi.cs
+++ b/src/Flipdish/Api/SubscriptionsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,393 +25,153 @@ public interface ISubscriptionsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Cancel the subscription
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Object</returns>
-        Object SubscriptionsCancelSubscription (int? subscriptionId);
-
-        /// <summary>
-        /// Cancel the subscription
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> SubscriptionsCancelSubscriptionWithHttpInfo (int? subscriptionId);
-        /// <summary>
-        /// Get the card linked to the subscription
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>RestApiResultCard</returns>
-        RestApiResultCard SubscriptionsGetCard (int? subscriptionId);
-
-        /// <summary>
-        /// Get the card linked to the subscription
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>ApiResponse of RestApiResultCard</returns>
-        ApiResponse<RestApiResultCard> SubscriptionsGetCardWithHttpInfo (int? subscriptionId);
-        /// <summary>
-        /// Get avaialble plans for currency&#39;s user
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiResultSubscriptionPlansResponse</returns>
-        RestApiResultSubscriptionPlansResponse SubscriptionsGetPlansByCurrency ();
-
-        /// <summary>
-        /// Get avaialble plans for currency&#39;s user
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiResultSubscriptionPlansResponse</returns>
-        ApiResponse<RestApiResultSubscriptionPlansResponse> SubscriptionsGetPlansByCurrencyWithHttpInfo ();
-        /// <summary>
-        /// Get the subscription including the payment history
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"></param>
         /// <returns>RestApiResultSubscription</returns>
-        RestApiResultSubscription SubscriptionsGetSubscription (int? subscriptionId);
+        RestApiResultSubscription GetSubscriptionById (string appId, string subscriptionId);
 
         /// <summary>
-        /// Get the subscription including the payment history
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription Identifier</param>
-        /// <returns>ApiResponse of RestApiResultSubscription</returns>
-        ApiResponse<RestApiResultSubscription> SubscriptionsGetSubscriptionWithHttpInfo (int? subscriptionId);
-        /// <summary>
-        /// Get subscription by appId
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">The string app identifier</param>
-        /// <returns>RestApiResultSubscription</returns>
-        RestApiResultSubscription SubscriptionsGetUserSubscriptionByAppId (string appId);
-
-        /// <summary>
-        /// Get subscription by appId
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">The string app identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"></param>
         /// <returns>ApiResponse of RestApiResultSubscription</returns>
-        ApiResponse<RestApiResultSubscription> SubscriptionsGetUserSubscriptionByAppIdWithHttpInfo (string appId);
-        /// <summary>
-        /// Add a new card and replace the old one
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Token Id</param>
-        /// <returns>Object</returns>
-        Object SubscriptionsReplaceOldCardWithNewCard (int? subscriptionId, CardWithToken card);
-
+        ApiResponse<RestApiResultSubscription> GetSubscriptionByIdWithHttpInfo (string appId, string subscriptionId);
         /// <summary>
-        /// Add a new card and replace the old one
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Token Id</param>
-        /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> SubscriptionsReplaceOldCardWithNewCardWithHttpInfo (int? subscriptionId, CardWithToken card);
-        /// <summary>
-        /// Create a new subscription
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscription">Data necessary to create a new subscription</param>
-        /// <returns>Object</returns>
-        Object SubscriptionsSubscribe (SubscriptionWithToken subscription);
+        /// <param name="appId"></param>
+        /// <param name="excludeNotOwnedSubscriptions"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="excludeCancelledSubscriptions"> (optional)</param>
+        /// <returns>RestApiArrayResultSubscriptionSummary</returns>
+        RestApiArrayResultSubscriptionSummary GetSubscriptionsForApp (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null);
 
         /// <summary>
-        /// Create a new subscription
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscription">Data necessary to create a new subscription</param>
-        /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> SubscriptionsSubscribeWithHttpInfo (SubscriptionWithToken subscription);
-        /// <summary>
-        /// Update card expiring date
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Data to update card expiring date</param>
-        /// <returns>RestApiResultCard</returns>
-        RestApiResultCard SubscriptionsUpdateCardExpiringDate (int? subscriptionId, CardBase card);
-
+        /// <param name="appId"></param>
+        /// <param name="excludeNotOwnedSubscriptions"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="excludeCancelledSubscriptions"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultSubscriptionSummary</returns>
+        ApiResponse<RestApiArrayResultSubscriptionSummary> GetSubscriptionsForAppWithHttpInfo (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null);
         /// <summary>
-        /// Update card expiring date
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Data to update card expiring date</param>
-        /// <returns>ApiResponse of RestApiResultCard</returns>
-        ApiResponse<RestApiResultCard> SubscriptionsUpdateCardExpiringDateWithHttpInfo (int? subscriptionId, CardBase card);
-        /// <summary>
-        /// Update the subscription
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="subscription">Data to update the subscription</param>
-        /// <returns>Object</returns>
-        Object SubscriptionsUpdateSubscription (int? subscriptionId, SubscriptionBase subscription);
+        /// <param name="appId"></param>
+        /// <param name="email"> (optional)</param>
+        /// <returns>RestApiResultHasPaymentMethodResponse</returns>
+        RestApiResultHasPaymentMethodResponse HasCustomerGotPaymentMethodOnFile (string appId, string email = null);
 
         /// <summary>
-        /// Update the subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="subscription">Data to update the subscription</param>
-        /// <returns>ApiResponse of Object</returns>
-        ApiResponse<Object> SubscriptionsUpdateSubscriptionWithHttpInfo (int? subscriptionId, SubscriptionBase subscription);
+        /// <param name="appId"></param>
+        /// <param name="email"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultHasPaymentMethodResponse</returns>
+        ApiResponse<RestApiResultHasPaymentMethodResponse> HasCustomerGotPaymentMethodOnFileWithHttpInfo (string appId, string email = null);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Cancel the subscription
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> SubscriptionsCancelSubscriptionAsync (int? subscriptionId);
-
-        /// <summary>
-        /// Cancel the subscription
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsCancelSubscriptionAsyncWithHttpInfo (int? subscriptionId);
-        /// <summary>
-        /// Get the card linked to the subscription
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Task of RestApiResultCard</returns>
-        System.Threading.Tasks.Task<RestApiResultCard> SubscriptionsGetCardAsync (int? subscriptionId);
-
-        /// <summary>
-        /// Get the card linked to the subscription
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultCard)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultCard>> SubscriptionsGetCardAsyncWithHttpInfo (int? subscriptionId);
-        /// <summary>
-        /// Get avaialble plans for currency&#39;s user
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiResultSubscriptionPlansResponse</returns>
-        System.Threading.Tasks.Task<RestApiResultSubscriptionPlansResponse> SubscriptionsGetPlansByCurrencyAsync ();
-
-        /// <summary>
-        /// Get avaialble plans for currency&#39;s user
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiResultSubscriptionPlansResponse)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscriptionPlansResponse>> SubscriptionsGetPlansByCurrencyAsyncWithHttpInfo ();
-        /// <summary>
-        /// Get the subscription including the payment history
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription Identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"></param>
         /// <returns>Task of RestApiResultSubscription</returns>
-        System.Threading.Tasks.Task<RestApiResultSubscription> SubscriptionsGetSubscriptionAsync (int? subscriptionId);
+        System.Threading.Tasks.Task<RestApiResultSubscription> GetSubscriptionByIdAsync (string appId, string subscriptionId);
 
         /// <summary>
-        /// Get the subscription including the payment history
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription Identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultSubscription)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscription>> SubscriptionsGetSubscriptionAsyncWithHttpInfo (int? subscriptionId);
-        /// <summary>
-        /// Get subscription by appId
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">The string app identifier</param>
-        /// <returns>Task of RestApiResultSubscription</returns>
-        System.Threading.Tasks.Task<RestApiResultSubscription> SubscriptionsGetUserSubscriptionByAppIdAsync (string appId);
-
-        /// <summary>
-        /// Get subscription by appId
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">The string app identifier</param>
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"></param>
         /// <returns>Task of ApiResponse (RestApiResultSubscription)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscription>> SubscriptionsGetUserSubscriptionByAppIdAsyncWithHttpInfo (string appId);
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscription>> GetSubscriptionByIdAsyncWithHttpInfo (string appId, string subscriptionId);
         /// <summary>
-        /// Add a new card and replace the old one
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Token Id</param>
-        /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> SubscriptionsReplaceOldCardWithNewCardAsync (int? subscriptionId, CardWithToken card);
-
-        /// <summary>
-        /// Add a new card and replace the old one
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Token Id</param>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsReplaceOldCardWithNewCardAsyncWithHttpInfo (int? subscriptionId, CardWithToken card);
-        /// <summary>
-        /// Create a new subscription
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscription">Data necessary to create a new subscription</param>
-        /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> SubscriptionsSubscribeAsync (SubscriptionWithToken subscription);
+        /// <param name="appId"></param>
+        /// <param name="excludeNotOwnedSubscriptions"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="excludeCancelledSubscriptions"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultSubscriptionSummary</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultSubscriptionSummary> GetSubscriptionsForAppAsync (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null);
 
         /// <summary>
-        /// Create a new subscription
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscription">Data necessary to create a new subscription</param>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsSubscribeAsyncWithHttpInfo (SubscriptionWithToken subscription);
-        /// <summary>
-        /// Update card expiring date
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Data to update card expiring date</param>
-        /// <returns>Task of RestApiResultCard</returns>
-        System.Threading.Tasks.Task<RestApiResultCard> SubscriptionsUpdateCardExpiringDateAsync (int? subscriptionId, CardBase card);
-
+        /// <param name="appId"></param>
+        /// <param name="excludeNotOwnedSubscriptions"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="excludeCancelledSubscriptions"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultSubscriptionSummary)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSubscriptionSummary>> GetSubscriptionsForAppAsyncWithHttpInfo (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null);
         /// <summary>
-        /// Update card expiring date
-        /// </summary>
-        /// <remarks>
         /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Data to update card expiring date</param>
-        /// <returns>Task of ApiResponse (RestApiResultCard)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultCard>> SubscriptionsUpdateCardExpiringDateAsyncWithHttpInfo (int? subscriptionId, CardBase card);
-        /// <summary>
-        /// Update the subscription
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="subscription">Data to update the subscription</param>
-        /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> SubscriptionsUpdateSubscriptionAsync (int? subscriptionId, SubscriptionBase subscription);
+        /// <param name="appId"></param>
+        /// <param name="email"> (optional)</param>
+        /// <returns>Task of RestApiResultHasPaymentMethodResponse</returns>
+        System.Threading.Tasks.Task<RestApiResultHasPaymentMethodResponse> HasCustomerGotPaymentMethodOnFileAsync (string appId, string email = null);
 
         /// <summary>
-        /// Update the subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="subscription">Data to update the subscription</param>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsUpdateSubscriptionAsyncWithHttpInfo (int? subscriptionId, SubscriptionBase subscription);
+        /// <param name="appId"></param>
+        /// <param name="email"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultHasPaymentMethodResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultHasPaymentMethodResponse>> HasCustomerGotPaymentMethodOnFileAsyncWithHttpInfo (string appId, string email = null);
         #endregion Asynchronous Operations
     }
 
@@ -513,30 +273,35 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Cancel the subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Object</returns>
-        public Object SubscriptionsCancelSubscription (int? subscriptionId)
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"></param>
+        /// <returns>RestApiResultSubscription</returns>
+        public RestApiResultSubscription GetSubscriptionById (string appId, string subscriptionId)
         {
-             ApiResponse<Object> localVarResponse = SubscriptionsCancelSubscriptionWithHttpInfo(subscriptionId);
+             ApiResponse<RestApiResultSubscription> localVarResponse = GetSubscriptionByIdWithHttpInfo(appId, subscriptionId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Cancel the subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > SubscriptionsCancelSubscriptionWithHttpInfo (int? subscriptionId)
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"></param>
+        /// <returns>ApiResponse of RestApiResultSubscription</returns>
+        public ApiResponse< RestApiResultSubscription > GetSubscriptionByIdWithHttpInfo (string appId, string subscriptionId)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling SubscriptionsApi->GetSubscriptionById");
             // verify the required parameter 'subscriptionId' is set
             if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsCancelSubscription");
+                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->GetSubscriptionById");
 
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}";
+            var localVarPath = "./api/v1.0/{appId}/subscriptions/{subscriptionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -560,6 +325,7 @@ public ApiResponse< Object > SubscriptionsCancelSubscriptionWithHttpInfo (int? s
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
 
             // authentication (oauth2) required
@@ -571,48 +337,53 @@ public ApiResponse< Object > SubscriptionsCancelSubscriptionWithHttpInfo (int? s
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SubscriptionsCancelSubscription", localVarResponse);
+                Exception exception = ExceptionFactory("GetSubscriptionById", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+            return new ApiResponse<RestApiResultSubscription>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSubscription) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSubscription)));
         }
 
         /// <summary>
-        /// Cancel the subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> SubscriptionsCancelSubscriptionAsync (int? subscriptionId)
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"></param>
+        /// <returns>Task of RestApiResultSubscription</returns>
+        public async System.Threading.Tasks.Task<RestApiResultSubscription> GetSubscriptionByIdAsync (string appId, string subscriptionId)
         {
-             ApiResponse<Object> localVarResponse = await SubscriptionsCancelSubscriptionAsyncWithHttpInfo(subscriptionId);
+             ApiResponse<RestApiResultSubscription> localVarResponse = await GetSubscriptionByIdAsyncWithHttpInfo(appId, subscriptionId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Cancel the subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsCancelSubscriptionAsyncWithHttpInfo (int? subscriptionId)
+        /// <param name="appId"></param>
+        /// <param name="subscriptionId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultSubscription)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscription>> GetSubscriptionByIdAsyncWithHttpInfo (string appId, string subscriptionId)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling SubscriptionsApi->GetSubscriptionById");
             // verify the required parameter 'subscriptionId' is set
             if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsCancelSubscription");
+                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->GetSubscriptionById");
 
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}";
+            var localVarPath = "./api/v1.0/{appId}/subscriptions/{subscriptionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -636,6 +407,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsCance
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
             if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
 
             // authentication (oauth2) required
@@ -647,47 +419,53 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsCance
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.DELETE, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SubscriptionsCancelSubscription", localVarResponse);
+                Exception exception = ExceptionFactory("GetSubscriptionById", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+            return new ApiResponse<RestApiResultSubscription>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultSubscription) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSubscription)));
         }
 
         /// <summary>
-        /// Get the card linked to the subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>RestApiResultCard</returns>
-        public RestApiResultCard SubscriptionsGetCard (int? subscriptionId)
+        /// <param name="appId"></param>
+        /// <param name="excludeNotOwnedSubscriptions"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="excludeCancelledSubscriptions"> (optional)</param>
+        /// <returns>RestApiArrayResultSubscriptionSummary</returns>
+        public RestApiArrayResultSubscriptionSummary GetSubscriptionsForApp (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null)
         {
-             ApiResponse<RestApiResultCard> localVarResponse = SubscriptionsGetCardWithHttpInfo(subscriptionId);
+             ApiResponse<RestApiArrayResultSubscriptionSummary> localVarResponse = GetSubscriptionsForAppWithHttpInfo(appId, excludeNotOwnedSubscriptions, storeId, excludeCancelledSubscriptions);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get the card linked to the subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>ApiResponse of RestApiResultCard</returns>
-        public ApiResponse< RestApiResultCard > SubscriptionsGetCardWithHttpInfo (int? subscriptionId)
+        /// <param name="appId"></param>
+        /// <param name="excludeNotOwnedSubscriptions"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="excludeCancelledSubscriptions"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultSubscriptionSummary</returns>
+        public ApiResponse< RestApiArrayResultSubscriptionSummary > GetSubscriptionsForAppWithHttpInfo (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null)
         {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsGetCard");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling SubscriptionsApi->GetSubscriptionsForApp");
 
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}/card";
+            var localVarPath = "./api/v1.0/{appId}/subscriptions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -711,7 +489,10 @@ public ApiResponse< RestApiResultCard > SubscriptionsGetCardWithHttpInfo (int? s
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (excludeNotOwnedSubscriptions != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeNotOwnedSubscriptions", excludeNotOwnedSubscriptions)); // query parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+            if (excludeCancelledSubscriptions != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeCancelledSubscriptions", excludeCancelledSubscriptions)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -729,41 +510,47 @@ public ApiResponse< RestApiResultCard > SubscriptionsGetCardWithHttpInfo (int? s
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SubscriptionsGetCard", localVarResponse);
+                Exception exception = ExceptionFactory("GetSubscriptionsForApp", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultCard>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultCard) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCard)));
+            return new ApiResponse<RestApiArrayResultSubscriptionSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultSubscriptionSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSubscriptionSummary)));
         }
 
         /// <summary>
-        /// Get the card linked to the subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Task of RestApiResultCard</returns>
-        public async System.Threading.Tasks.Task<RestApiResultCard> SubscriptionsGetCardAsync (int? subscriptionId)
+        /// <param name="appId"></param>
+        /// <param name="excludeNotOwnedSubscriptions"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="excludeCancelledSubscriptions"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultSubscriptionSummary</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultSubscriptionSummary> GetSubscriptionsForAppAsync (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null)
         {
-             ApiResponse<RestApiResultCard> localVarResponse = await SubscriptionsGetCardAsyncWithHttpInfo(subscriptionId);
+             ApiResponse<RestApiArrayResultSubscriptionSummary> localVarResponse = await GetSubscriptionsForAppAsyncWithHttpInfo(appId, excludeNotOwnedSubscriptions, storeId, excludeCancelledSubscriptions);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get the card linked to the subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultCard)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCard>> SubscriptionsGetCardAsyncWithHttpInfo (int? subscriptionId)
+        /// <param name="appId"></param>
+        /// <param name="excludeNotOwnedSubscriptions"> (optional)</param>
+        /// <param name="storeId"> (optional)</param>
+        /// <param name="excludeCancelledSubscriptions"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultSubscriptionSummary)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultSubscriptionSummary>> GetSubscriptionsForAppAsyncWithHttpInfo (string appId, bool? excludeNotOwnedSubscriptions = null, List<int?> storeId = null, bool? excludeCancelledSubscriptions = null)
         {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsGetCard");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling SubscriptionsApi->GetSubscriptionsForApp");
 
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}/card";
+            var localVarPath = "./api/v1.0/{appId}/subscriptions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -787,7 +574,10 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCard>> Subscri
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (excludeNotOwnedSubscriptions != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeNotOwnedSubscriptions", excludeNotOwnedSubscriptions)); // query parameter
+            if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
+            if (excludeCancelledSubscriptions != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "excludeCancelledSubscriptions", excludeCancelledSubscriptions)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -805,35 +595,42 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCard>> Subscri
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SubscriptionsGetCard", localVarResponse);
+                Exception exception = ExceptionFactory("GetSubscriptionsForApp", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultCard>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultCard) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCard)));
+            return new ApiResponse<RestApiArrayResultSubscriptionSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultSubscriptionSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultSubscriptionSummary)));
         }
 
         /// <summary>
-        /// Get avaialble plans for currency&#39;s user 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiResultSubscriptionPlansResponse</returns>
-        public RestApiResultSubscriptionPlansResponse SubscriptionsGetPlansByCurrency ()
+        /// <param name="appId"></param>
+        /// <param name="email"> (optional)</param>
+        /// <returns>RestApiResultHasPaymentMethodResponse</returns>
+        public RestApiResultHasPaymentMethodResponse HasCustomerGotPaymentMethodOnFile (string appId, string email = null)
         {
-             ApiResponse<RestApiResultSubscriptionPlansResponse> localVarResponse = SubscriptionsGetPlansByCurrencyWithHttpInfo();
+             ApiResponse<RestApiResultHasPaymentMethodResponse> localVarResponse = HasCustomerGotPaymentMethodOnFileWithHttpInfo(appId, email);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get avaialble plans for currency&#39;s user 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiResultSubscriptionPlansResponse</returns>
-        public ApiResponse< RestApiResultSubscriptionPlansResponse > SubscriptionsGetPlansByCurrencyWithHttpInfo ()
+        /// <param name="appId"></param>
+        /// <param name="email"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultHasPaymentMethodResponse</returns>
+        public ApiResponse< RestApiResultHasPaymentMethodResponse > HasCustomerGotPaymentMethodOnFileWithHttpInfo (string appId, string email = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling SubscriptionsApi->HasCustomerGotPaymentMethodOnFile");
 
-            var localVarPath = "/api/v1.0/subscriptions/plans";
+            var localVarPath = "./api/v1.0/{appId}/subscriptions/hasPaymentMethod";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -857,6 +654,8 @@ public ApiResponse< RestApiResultSubscriptionPlansResponse > SubscriptionsGetPla
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (email != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "email", email)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -874,36 +673,43 @@ public ApiResponse< RestApiResultSubscriptionPlansResponse > SubscriptionsGetPla
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SubscriptionsGetPlansByCurrency", localVarResponse);
+                Exception exception = ExceptionFactory("HasCustomerGotPaymentMethodOnFile", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultSubscriptionPlansResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultSubscriptionPlansResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSubscriptionPlansResponse)));
+            return new ApiResponse<RestApiResultHasPaymentMethodResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultHasPaymentMethodResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHasPaymentMethodResponse)));
         }
 
         /// <summary>
-        /// Get avaialble plans for currency&#39;s user 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiResultSubscriptionPlansResponse</returns>
-        public async System.Threading.Tasks.Task<RestApiResultSubscriptionPlansResponse> SubscriptionsGetPlansByCurrencyAsync ()
+        /// <param name="appId"></param>
+        /// <param name="email"> (optional)</param>
+        /// <returns>Task of RestApiResultHasPaymentMethodResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiResultHasPaymentMethodResponse> HasCustomerGotPaymentMethodOnFileAsync (string appId, string email = null)
         {
-             ApiResponse<RestApiResultSubscriptionPlansResponse> localVarResponse = await SubscriptionsGetPlansByCurrencyAsyncWithHttpInfo();
+             ApiResponse<RestApiResultHasPaymentMethodResponse> localVarResponse = await HasCustomerGotPaymentMethodOnFileAsyncWithHttpInfo(appId, email);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get avaialble plans for currency&#39;s user 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiResultSubscriptionPlansResponse)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscriptionPlansResponse>> SubscriptionsGetPlansByCurrencyAsyncWithHttpInfo ()
+        /// <param name="appId"></param>
+        /// <param name="email"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultHasPaymentMethodResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultHasPaymentMethodResponse>> HasCustomerGotPaymentMethodOnFileAsyncWithHttpInfo (string appId, string email = null)
         {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling SubscriptionsApi->HasCustomerGotPaymentMethodOnFile");
 
-            var localVarPath = "/api/v1.0/subscriptions/plans";
+            var localVarPath = "./api/v1.0/{appId}/subscriptions/hasPaymentMethod";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -927,6 +733,8 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscriptionPl
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (email != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "email", email)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -944,1051 +752,13 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscriptionPl
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("SubscriptionsGetPlansByCurrency", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultSubscriptionPlansResponse>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultSubscriptionPlansResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSubscriptionPlansResponse)));
-        }
-
-        /// <summary>
-        /// Get the subscription including the payment history 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription Identifier</param>
-        /// <returns>RestApiResultSubscription</returns>
-        public RestApiResultSubscription SubscriptionsGetSubscription (int? subscriptionId)
-        {
-             ApiResponse<RestApiResultSubscription> localVarResponse = SubscriptionsGetSubscriptionWithHttpInfo(subscriptionId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Get the subscription including the payment history 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription Identifier</param>
-        /// <returns>ApiResponse of RestApiResultSubscription</returns>
-        public ApiResponse< RestApiResultSubscription > SubscriptionsGetSubscriptionWithHttpInfo (int? subscriptionId)
-        {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsGetSubscription");
-
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsGetSubscription", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultSubscription>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultSubscription) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSubscription)));
-        }
-
-        /// <summary>
-        /// Get the subscription including the payment history 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription Identifier</param>
-        /// <returns>Task of RestApiResultSubscription</returns>
-        public async System.Threading.Tasks.Task<RestApiResultSubscription> SubscriptionsGetSubscriptionAsync (int? subscriptionId)
-        {
-             ApiResponse<RestApiResultSubscription> localVarResponse = await SubscriptionsGetSubscriptionAsyncWithHttpInfo(subscriptionId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Get the subscription including the payment history 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription Identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultSubscription)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscription>> SubscriptionsGetSubscriptionAsyncWithHttpInfo (int? subscriptionId)
-        {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsGetSubscription");
-
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsGetSubscription", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultSubscription>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultSubscription) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSubscription)));
-        }
-
-        /// <summary>
-        /// Get subscription by appId 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">The string app identifier</param>
-        /// <returns>RestApiResultSubscription</returns>
-        public RestApiResultSubscription SubscriptionsGetUserSubscriptionByAppId (string appId)
-        {
-             ApiResponse<RestApiResultSubscription> localVarResponse = SubscriptionsGetUserSubscriptionByAppIdWithHttpInfo(appId);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Get subscription by appId 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">The string app identifier</param>
-        /// <returns>ApiResponse of RestApiResultSubscription</returns>
-        public ApiResponse< RestApiResultSubscription > SubscriptionsGetUserSubscriptionByAppIdWithHttpInfo (string appId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling SubscriptionsApi->SubscriptionsGetUserSubscriptionByAppId");
-
-            var localVarPath = "/api/v1.0/subscriptions";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "appId", appId)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsGetUserSubscriptionByAppId", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultSubscription>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultSubscription) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSubscription)));
-        }
-
-        /// <summary>
-        /// Get subscription by appId 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">The string app identifier</param>
-        /// <returns>Task of RestApiResultSubscription</returns>
-        public async System.Threading.Tasks.Task<RestApiResultSubscription> SubscriptionsGetUserSubscriptionByAppIdAsync (string appId)
-        {
-             ApiResponse<RestApiResultSubscription> localVarResponse = await SubscriptionsGetUserSubscriptionByAppIdAsyncWithHttpInfo(appId);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Get subscription by appId 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">The string app identifier</param>
-        /// <returns>Task of ApiResponse (RestApiResultSubscription)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultSubscription>> SubscriptionsGetUserSubscriptionByAppIdAsyncWithHttpInfo (string appId)
-        {
-            // verify the required parameter 'appId' is set
-            if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling SubscriptionsApi->SubscriptionsGetUserSubscriptionByAppId");
-
-            var localVarPath = "/api/v1.0/subscriptions";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (appId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "appId", appId)); // query parameter
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsGetUserSubscriptionByAppId", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultSubscription>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultSubscription) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultSubscription)));
-        }
-
-        /// <summary>
-        /// Add a new card and replace the old one 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Token Id</param>
-        /// <returns>Object</returns>
-        public Object SubscriptionsReplaceOldCardWithNewCard (int? subscriptionId, CardWithToken card)
-        {
-             ApiResponse<Object> localVarResponse = SubscriptionsReplaceOldCardWithNewCardWithHttpInfo(subscriptionId, card);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Add a new card and replace the old one 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Token Id</param>
-        /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > SubscriptionsReplaceOldCardWithNewCardWithHttpInfo (int? subscriptionId, CardWithToken card)
-        {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsReplaceOldCardWithNewCard");
-            // verify the required parameter 'card' is set
-            if (card == null)
-                throw new ApiException(400, "Missing required parameter 'card' when calling SubscriptionsApi->SubscriptionsReplaceOldCardWithNewCard");
-
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}/card/new";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
-            if (card != null && card.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(card); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = card; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsReplaceOldCardWithNewCard", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-        }
-
-        /// <summary>
-        /// Add a new card and replace the old one 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Token Id</param>
-        /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> SubscriptionsReplaceOldCardWithNewCardAsync (int? subscriptionId, CardWithToken card)
-        {
-             ApiResponse<Object> localVarResponse = await SubscriptionsReplaceOldCardWithNewCardAsyncWithHttpInfo(subscriptionId, card);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Add a new card and replace the old one 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Token Id</param>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsReplaceOldCardWithNewCardAsyncWithHttpInfo (int? subscriptionId, CardWithToken card)
-        {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsReplaceOldCardWithNewCard");
-            // verify the required parameter 'card' is set
-            if (card == null)
-                throw new ApiException(400, "Missing required parameter 'card' when calling SubscriptionsApi->SubscriptionsReplaceOldCardWithNewCard");
-
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}/card/new";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
-            if (card != null && card.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(card); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = card; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsReplaceOldCardWithNewCard", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-        }
-
-        /// <summary>
-        /// Create a new subscription 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscription">Data necessary to create a new subscription</param>
-        /// <returns>Object</returns>
-        public Object SubscriptionsSubscribe (SubscriptionWithToken subscription)
-        {
-             ApiResponse<Object> localVarResponse = SubscriptionsSubscribeWithHttpInfo(subscription);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Create a new subscription 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscription">Data necessary to create a new subscription</param>
-        /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > SubscriptionsSubscribeWithHttpInfo (SubscriptionWithToken subscription)
-        {
-            // verify the required parameter 'subscription' is set
-            if (subscription == null)
-                throw new ApiException(400, "Missing required parameter 'subscription' when calling SubscriptionsApi->SubscriptionsSubscribe");
-
-            var localVarPath = "/api/v1.0/subscriptions";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscription != null && subscription.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(subscription); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = subscription; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsSubscribe", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-        }
-
-        /// <summary>
-        /// Create a new subscription 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscription">Data necessary to create a new subscription</param>
-        /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> SubscriptionsSubscribeAsync (SubscriptionWithToken subscription)
-        {
-             ApiResponse<Object> localVarResponse = await SubscriptionsSubscribeAsyncWithHttpInfo(subscription);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Create a new subscription 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscription">Data necessary to create a new subscription</param>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsSubscribeAsyncWithHttpInfo (SubscriptionWithToken subscription)
-        {
-            // verify the required parameter 'subscription' is set
-            if (subscription == null)
-                throw new ApiException(400, "Missing required parameter 'subscription' when calling SubscriptionsApi->SubscriptionsSubscribe");
-
-            var localVarPath = "/api/v1.0/subscriptions";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscription != null && subscription.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(subscription); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = subscription; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsSubscribe", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-        }
-
-        /// <summary>
-        /// Update card expiring date 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Data to update card expiring date</param>
-        /// <returns>RestApiResultCard</returns>
-        public RestApiResultCard SubscriptionsUpdateCardExpiringDate (int? subscriptionId, CardBase card)
-        {
-             ApiResponse<RestApiResultCard> localVarResponse = SubscriptionsUpdateCardExpiringDateWithHttpInfo(subscriptionId, card);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Update card expiring date 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Data to update card expiring date</param>
-        /// <returns>ApiResponse of RestApiResultCard</returns>
-        public ApiResponse< RestApiResultCard > SubscriptionsUpdateCardExpiringDateWithHttpInfo (int? subscriptionId, CardBase card)
-        {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsUpdateCardExpiringDate");
-            // verify the required parameter 'card' is set
-            if (card == null)
-                throw new ApiException(400, "Missing required parameter 'card' when calling SubscriptionsApi->SubscriptionsUpdateCardExpiringDate");
-
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}/card";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
-            if (card != null && card.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(card); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = card; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsUpdateCardExpiringDate", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultCard>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultCard) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCard)));
-        }
-
-        /// <summary>
-        /// Update card expiring date 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Data to update card expiring date</param>
-        /// <returns>Task of RestApiResultCard</returns>
-        public async System.Threading.Tasks.Task<RestApiResultCard> SubscriptionsUpdateCardExpiringDateAsync (int? subscriptionId, CardBase card)
-        {
-             ApiResponse<RestApiResultCard> localVarResponse = await SubscriptionsUpdateCardExpiringDateAsyncWithHttpInfo(subscriptionId, card);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Update card expiring date 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="card">Data to update card expiring date</param>
-        /// <returns>Task of ApiResponse (RestApiResultCard)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultCard>> SubscriptionsUpdateCardExpiringDateAsyncWithHttpInfo (int? subscriptionId, CardBase card)
-        {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsUpdateCardExpiringDate");
-            // verify the required parameter 'card' is set
-            if (card == null)
-                throw new ApiException(400, "Missing required parameter 'card' when calling SubscriptionsApi->SubscriptionsUpdateCardExpiringDate");
-
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}/card";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
-            if (card != null && card.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(card); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = card; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsUpdateCardExpiringDate", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<RestApiResultCard>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultCard) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultCard)));
-        }
-
-        /// <summary>
-        /// Update the subscription 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="subscription">Data to update the subscription</param>
-        /// <returns>Object</returns>
-        public Object SubscriptionsUpdateSubscription (int? subscriptionId, SubscriptionBase subscription)
-        {
-             ApiResponse<Object> localVarResponse = SubscriptionsUpdateSubscriptionWithHttpInfo(subscriptionId, subscription);
-             return localVarResponse.Data;
-        }
-
-        /// <summary>
-        /// Update the subscription 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="subscription">Data to update the subscription</param>
-        /// <returns>ApiResponse of Object</returns>
-        public ApiResponse< Object > SubscriptionsUpdateSubscriptionWithHttpInfo (int? subscriptionId, SubscriptionBase subscription)
-        {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsUpdateSubscription");
-            // verify the required parameter 'subscription' is set
-            if (subscription == null)
-                throw new ApiException(400, "Missing required parameter 'subscription' when calling SubscriptionsApi->SubscriptionsUpdateSubscription");
-
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
-            if (subscription != null && subscription.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(subscription); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = subscription; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsUpdateSubscription", localVarResponse);
-                if (exception != null) throw exception;
-            }
-
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
-        }
-
-        /// <summary>
-        /// Update the subscription 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="subscription">Data to update the subscription</param>
-        /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> SubscriptionsUpdateSubscriptionAsync (int? subscriptionId, SubscriptionBase subscription)
-        {
-             ApiResponse<Object> localVarResponse = await SubscriptionsUpdateSubscriptionAsyncWithHttpInfo(subscriptionId, subscription);
-             return localVarResponse.Data;
-
-        }
-
-        /// <summary>
-        /// Update the subscription 
-        /// </summary>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="subscriptionId">Subscription identifier</param>
-        /// <param name="subscription">Data to update the subscription</param>
-        /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<Object>> SubscriptionsUpdateSubscriptionAsyncWithHttpInfo (int? subscriptionId, SubscriptionBase subscription)
-        {
-            // verify the required parameter 'subscriptionId' is set
-            if (subscriptionId == null)
-                throw new ApiException(400, "Missing required parameter 'subscriptionId' when calling SubscriptionsApi->SubscriptionsUpdateSubscription");
-            // verify the required parameter 'subscription' is set
-            if (subscription == null)
-                throw new ApiException(400, "Missing required parameter 'subscription' when calling SubscriptionsApi->SubscriptionsUpdateSubscription");
-
-            var localVarPath = "/api/v1.0/subscriptions/{subscriptionId}";
-            var localVarPathParams = new Dictionary<String, String>();
-            var localVarQueryParams = new List<KeyValuePair<String, String>>();
-            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
-            var localVarFormParams = new Dictionary<String, String>();
-            var localVarFileParams = new Dictionary<String, FileParameter>();
-            Object localVarPostBody = null;
-
-            // to determine the Content-Type header
-            String[] localVarHttpContentTypes = new String[] {
-                "application/json", 
-                "text/json", 
-                "application/xml", 
-                "text/xml", 
-                "application/x-www-form-urlencoded"
-            };
-            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
-
-            // to determine the Accept header
-            String[] localVarHttpHeaderAccepts = new String[] {
-                "application/json",
-                "text/json",
-                "application/xml",
-                "text/xml"
-            };
-            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
-            if (localVarHttpHeaderAccept != null)
-                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
-
-            if (subscriptionId != null) localVarPathParams.Add("subscriptionId", this.Configuration.ApiClient.ParameterToString(subscriptionId)); // path parameter
-            if (subscription != null && subscription.GetType() != typeof(byte[]))
-            {
-                localVarPostBody = this.Configuration.ApiClient.Serialize(subscription); // http body (model) parameter
-            }
-            else
-            {
-                localVarPostBody = subscription; // byte array
-            }
-
-            // authentication (oauth2) required
-            // oauth required
-            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
-            {
-                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
-            }
-
-            // make the HTTP request
-            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
-                localVarPathParams, localVarHttpContentType);
-
-            int localVarStatusCode = (int) localVarResponse.StatusCode;
-
-            if (ExceptionFactory != null)
-            {
-                Exception exception = ExceptionFactory("SubscriptionsUpdateSubscription", localVarResponse);
+                Exception exception = ExceptionFactory("HasCustomerGotPaymentMethodOnFile", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+            return new ApiResponse<RestApiResultHasPaymentMethodResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultHasPaymentMethodResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultHasPaymentMethodResponse)));
         }
 
     }
diff --git a/src/Flipdish/Api/TeammatesApi.cs b/src/Flipdish/Api/TeammatesApi.cs
index 41a30e57..332776fb 100644
--- a/src/Flipdish/Api/TeammatesApi.cs
+++ b/src/Flipdish/Api/TeammatesApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,30 +25,30 @@ public interface ITeammatesApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create teammate and send an invite.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
         /// <returns>RestApiResultTeammate</returns>
         RestApiResultTeammate CreateTeammate (string appId, CreateTeammate teammate);
 
         /// <summary>
-        /// Create teammate and send an invite.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
         /// <returns>ApiResponse of RestApiResultTeammate</returns>
         ApiResponse<RestApiResultTeammate> CreateTeammateWithHttpInfo (string appId, CreateTeammate teammate);
         /// <summary>
-        /// Delete teammate
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -60,7 +60,7 @@ public interface ITeammatesApi : IApiAccessor
         void DeleteTeammate (string appId, string id);
 
         /// <summary>
-        /// Delete teammate
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -71,7 +71,7 @@ public interface ITeammatesApi : IApiAccessor
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteTeammateWithHttpInfo (string appId, string id);
         /// <summary>
-        /// Get a teammates by email address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -83,7 +83,7 @@ public interface ITeammatesApi : IApiAccessor
         RestApiResultTeammate GetTeammateByAppIdAndTeammateId (string appId, string id);
 
         /// <summary>
-        /// Get a teammates by email address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -94,7 +94,7 @@ public interface ITeammatesApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultTeammate</returns>
         ApiResponse<RestApiResultTeammate> GetTeammateByAppIdAndTeammateIdWithHttpInfo (string appId, string id);
         /// <summary>
-        /// Get all teammates
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -105,7 +105,7 @@ public interface ITeammatesApi : IApiAccessor
         RestApiArrayResultTeammate GetTeammatesByAppId (string appId);
 
         /// <summary>
-        /// Get all teammates
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -115,7 +115,30 @@ public interface ITeammatesApi : IApiAccessor
         /// <returns>ApiResponse of RestApiArrayResultTeammate</returns>
         ApiResponse<RestApiArrayResultTeammate> GetTeammatesByAppIdWithHttpInfo (string appId);
         /// <summary>
-        /// Redeem one-time code from invitation
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
+        /// <returns>Object</returns>
+        Object Grantaccess (string appId, CreateTeammate teammate);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> GrantaccessWithHttpInfo (string appId, CreateTeammate teammate);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -127,7 +150,7 @@ public interface ITeammatesApi : IApiAccessor
         RestApiResultRedeemInvitationResult RedeemInvitation (string otc, string appId);
 
         /// <summary>
-        /// Redeem one-time code from invitation
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -138,57 +161,139 @@ public interface ITeammatesApi : IApiAccessor
         /// <returns>ApiResponse of RestApiResultRedeemInvitationResult</returns>
         ApiResponse<RestApiResultRedeemInvitationResult> RedeemInvitationWithHttpInfo (string otc, string appId);
         /// <summary>
-        /// Update teammates (this method does not support Deltas!)
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="portalUrl"></param>
+        /// <returns>Object</returns>
+        Object TeammateMobileRedirect (string portalUrl);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="portalUrl"></param>
+        /// <returns>ApiResponse of Object</returns>
+        ApiResponse<Object> TeammateMobileRedirectWithHttpInfo (string portalUrl);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultAcceptInvitationResult</returns>
+        RestApiResultAcceptInvitationResult TeammatesAcceptInvitation (string otc, string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultAcceptInvitationResult</returns>
+        ApiResponse<RestApiResultAcceptInvitationResult> TeammatesAcceptInvitationWithHttpInfo (string otc, string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>RestApiArrayResultRedeemInvitationResult</returns>
+        RestApiArrayResultRedeemInvitationResult TeammatesAcceptInvitations ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of RestApiArrayResultRedeemInvitationResult</returns>
+        ApiResponse<RestApiArrayResultRedeemInvitationResult> TeammatesAcceptInvitationsWithHttpInfo ();
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>RestApiArrayResultPendingInvitation</returns>
+        RestApiArrayResultPendingInvitation TeammatesPendingInvitations ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of RestApiArrayResultPendingInvitation</returns>
+        ApiResponse<RestApiArrayResultPendingInvitation> TeammatesPendingInvitationsWithHttpInfo ();
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="id">teammate identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="id"></param>
+        /// <param name="teammate"></param>
         /// <returns>RestApiResultTeammate</returns>
         RestApiResultTeammate UpdateTeammate (string appId, string id, TeammateBase teammate);
 
         /// <summary>
-        /// Update teammates (this method does not support Deltas!)
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="id">teammate identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="id"></param>
+        /// <param name="teammate"></param>
         /// <returns>ApiResponse of RestApiResultTeammate</returns>
         ApiResponse<RestApiResultTeammate> UpdateTeammateWithHttpInfo (string appId, string id, TeammateBase teammate);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create teammate and send an invite.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
         /// <returns>Task of RestApiResultTeammate</returns>
         System.Threading.Tasks.Task<RestApiResultTeammate> CreateTeammateAsync (string appId, CreateTeammate teammate);
 
         /// <summary>
-        /// Create teammate and send an invite.
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
         /// <returns>Task of ApiResponse (RestApiResultTeammate)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> CreateTeammateAsyncWithHttpInfo (string appId, CreateTeammate teammate);
         /// <summary>
-        /// Delete teammate
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -200,7 +305,7 @@ public interface ITeammatesApi : IApiAccessor
         System.Threading.Tasks.Task DeleteTeammateAsync (string appId, string id);
 
         /// <summary>
-        /// Delete teammate
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -211,7 +316,7 @@ public interface ITeammatesApi : IApiAccessor
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteTeammateAsyncWithHttpInfo (string appId, string id);
         /// <summary>
-        /// Get a teammates by email address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -223,7 +328,7 @@ public interface ITeammatesApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultTeammate> GetTeammateByAppIdAndTeammateIdAsync (string appId, string id);
 
         /// <summary>
-        /// Get a teammates by email address
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -234,7 +339,7 @@ public interface ITeammatesApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultTeammate)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> GetTeammateByAppIdAndTeammateIdAsyncWithHttpInfo (string appId, string id);
         /// <summary>
-        /// Get all teammates
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -245,7 +350,7 @@ public interface ITeammatesApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiArrayResultTeammate> GetTeammatesByAppIdAsync (string appId);
 
         /// <summary>
-        /// Get all teammates
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -255,7 +360,30 @@ public interface ITeammatesApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiArrayResultTeammate)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultTeammate>> GetTeammatesByAppIdAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Redeem one-time code from invitation
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> GrantaccessAsync (string appId, CreateTeammate teammate);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> GrantaccessAsyncWithHttpInfo (string appId, CreateTeammate teammate);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -267,7 +395,7 @@ public interface ITeammatesApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiResultRedeemInvitationResult> RedeemInvitationAsync (string otc, string appId);
 
         /// <summary>
-        /// Redeem one-time code from invitation
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -278,28 +406,110 @@ public interface ITeammatesApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiResultRedeemInvitationResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultRedeemInvitationResult>> RedeemInvitationAsyncWithHttpInfo (string otc, string appId);
         /// <summary>
-        /// Update teammates (this method does not support Deltas!)
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="portalUrl"></param>
+        /// <returns>Task of Object</returns>
+        System.Threading.Tasks.Task<Object> TeammateMobileRedirectAsync (string portalUrl);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="portalUrl"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> TeammateMobileRedirectAsyncWithHttpInfo (string portalUrl);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultAcceptInvitationResult</returns>
+        System.Threading.Tasks.Task<RestApiResultAcceptInvitationResult> TeammatesAcceptInvitationAsync (string otc, string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAcceptInvitationResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAcceptInvitationResult>> TeammatesAcceptInvitationAsyncWithHttpInfo (string otc, string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiArrayResultRedeemInvitationResult</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultRedeemInvitationResult> TeammatesAcceptInvitationsAsync ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRedeemInvitationResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRedeemInvitationResult>> TeammatesAcceptInvitationsAsyncWithHttpInfo ();
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiArrayResultPendingInvitation</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultPendingInvitation> TeammatesPendingInvitationsAsync ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiArrayResultPendingInvitation)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPendingInvitation>> TeammatesPendingInvitationsAsyncWithHttpInfo ();
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="id">teammate identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="id"></param>
+        /// <param name="teammate"></param>
         /// <returns>Task of RestApiResultTeammate</returns>
         System.Threading.Tasks.Task<RestApiResultTeammate> UpdateTeammateAsync (string appId, string id, TeammateBase teammate);
 
         /// <summary>
-        /// Update teammates (this method does not support Deltas!)
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="id">teammate identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="id"></param>
+        /// <param name="teammate"></param>
         /// <returns>Task of ApiResponse (RestApiResultTeammate)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> UpdateTeammateAsyncWithHttpInfo (string appId, string id, TeammateBase teammate);
         #endregion Asynchronous Operations
@@ -403,11 +613,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create teammate and send an invite. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
         /// <returns>RestApiResultTeammate</returns>
         public RestApiResultTeammate CreateTeammate (string appId, CreateTeammate teammate)
         {
@@ -416,11 +626,11 @@ public RestApiResultTeammate CreateTeammate (string appId, CreateTeammate teamma
         }
 
         /// <summary>
-        /// Create teammate and send an invite. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
         /// <returns>ApiResponse of RestApiResultTeammate</returns>
         public ApiResponse< RestApiResultTeammate > CreateTeammateWithHttpInfo (string appId, CreateTeammate teammate)
         {
@@ -431,7 +641,7 @@ public ApiResponse< RestApiResultTeammate > CreateTeammateWithHttpInfo (string a
             if (teammate == null)
                 throw new ApiException(400, "Missing required parameter 'teammate' when calling TeammatesApi->CreateTeammate");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates";
+            var localVarPath = "./api/v1.0/{appId}/teammates";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -491,16 +701,16 @@ public ApiResponse< RestApiResultTeammate > CreateTeammateWithHttpInfo (string a
             }
 
             return new ApiResponse<RestApiResultTeammate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTeammate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTeammate)));
         }
 
         /// <summary>
-        /// Create teammate and send an invite. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
         /// <returns>Task of RestApiResultTeammate</returns>
         public async System.Threading.Tasks.Task<RestApiResultTeammate> CreateTeammateAsync (string appId, CreateTeammate teammate)
         {
@@ -510,11 +720,11 @@ public async System.Threading.Tasks.Task<RestApiResultTeammate> CreateTeammateAs
         }
 
         /// <summary>
-        /// Create teammate and send an invite. 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="teammate"></param>
         /// <returns>Task of ApiResponse (RestApiResultTeammate)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> CreateTeammateAsyncWithHttpInfo (string appId, CreateTeammate teammate)
         {
@@ -525,7 +735,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> Cre
             if (teammate == null)
                 throw new ApiException(400, "Missing required parameter 'teammate' when calling TeammatesApi->CreateTeammate");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates";
+            var localVarPath = "./api/v1.0/{appId}/teammates";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -585,12 +795,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> Cre
             }
 
             return new ApiResponse<RestApiResultTeammate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTeammate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTeammate)));
         }
 
         /// <summary>
-        /// Delete teammate 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -602,7 +812,7 @@ public void DeleteTeammate (string appId, string id)
         }
 
         /// <summary>
-        /// Delete teammate 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -617,7 +827,7 @@ public ApiResponse<Object> DeleteTeammateWithHttpInfo (string appId, string id)
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling TeammatesApi->DeleteTeammate");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates/{id}";
+            var localVarPath = "./api/v1.0/{appId}/teammates/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -665,12 +875,12 @@ public ApiResponse<Object> DeleteTeammateWithHttpInfo (string appId, string id)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete teammate 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -683,7 +893,7 @@ public async System.Threading.Tasks.Task DeleteTeammateAsync (string appId, stri
         }
 
         /// <summary>
-        /// Delete teammate 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -698,7 +908,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteTeammateAsyn
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling TeammatesApi->DeleteTeammate");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates/{id}";
+            var localVarPath = "./api/v1.0/{appId}/teammates/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -746,12 +956,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteTeammateAsyn
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Get a teammates by email address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -764,7 +974,7 @@ public RestApiResultTeammate GetTeammateByAppIdAndTeammateId (string appId, stri
         }
 
         /// <summary>
-        /// Get a teammates by email address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -779,7 +989,7 @@ public ApiResponse< RestApiResultTeammate > GetTeammateByAppIdAndTeammateIdWithH
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling TeammatesApi->GetTeammateByAppIdAndTeammateId");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates/{id}";
+            var localVarPath = "./api/v1.0/{appId}/teammates/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -827,12 +1037,12 @@ public ApiResponse< RestApiResultTeammate > GetTeammateByAppIdAndTeammateIdWithH
             }
 
             return new ApiResponse<RestApiResultTeammate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTeammate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTeammate)));
         }
 
         /// <summary>
-        /// Get a teammates by email address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -846,7 +1056,7 @@ public async System.Threading.Tasks.Task<RestApiResultTeammate> GetTeammateByApp
         }
 
         /// <summary>
-        /// Get a teammates by email address 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -861,7 +1071,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> Get
             if (id == null)
                 throw new ApiException(400, "Missing required parameter 'id' when calling TeammatesApi->GetTeammateByAppIdAndTeammateId");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates/{id}";
+            var localVarPath = "./api/v1.0/{appId}/teammates/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -909,12 +1119,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> Get
             }
 
             return new ApiResponse<RestApiResultTeammate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTeammate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTeammate)));
         }
 
         /// <summary>
-        /// Get all teammates 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -926,7 +1136,7 @@ public RestApiArrayResultTeammate GetTeammatesByAppId (string appId)
         }
 
         /// <summary>
-        /// Get all teammates 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -937,7 +1147,7 @@ public ApiResponse< RestApiArrayResultTeammate > GetTeammatesByAppIdWithHttpInfo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->GetTeammatesByAppId");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates";
+            var localVarPath = "./api/v1.0/{appId}/teammates";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -984,12 +1194,12 @@ public ApiResponse< RestApiArrayResultTeammate > GetTeammatesByAppIdWithHttpInfo
             }
 
             return new ApiResponse<RestApiArrayResultTeammate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultTeammate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultTeammate)));
         }
 
         /// <summary>
-        /// Get all teammates 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1002,7 +1212,7 @@ public async System.Threading.Tasks.Task<RestApiArrayResultTeammate> GetTeammate
         }
 
         /// <summary>
-        /// Get all teammates 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1013,7 +1223,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultTeammate>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->GetTeammatesByAppId");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates";
+            var localVarPath = "./api/v1.0/{appId}/teammates";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1060,40 +1270,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultTeammate>
             }
 
             return new ApiResponse<RestApiArrayResultTeammate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiArrayResultTeammate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultTeammate)));
         }
 
         /// <summary>
-        /// Redeem one-time code from invitation 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="otc"></param>
         /// <param name="appId"></param>
-        /// <returns>RestApiResultRedeemInvitationResult</returns>
-        public RestApiResultRedeemInvitationResult RedeemInvitation (string otc, string appId)
+        /// <param name="teammate"></param>
+        /// <returns>Object</returns>
+        public Object Grantaccess (string appId, CreateTeammate teammate)
         {
-             ApiResponse<RestApiResultRedeemInvitationResult> localVarResponse = RedeemInvitationWithHttpInfo(otc, appId);
+             ApiResponse<Object> localVarResponse = GrantaccessWithHttpInfo(appId, teammate);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Redeem one-time code from invitation 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="otc"></param>
         /// <param name="appId"></param>
-        /// <returns>ApiResponse of RestApiResultRedeemInvitationResult</returns>
-        public ApiResponse< RestApiResultRedeemInvitationResult > RedeemInvitationWithHttpInfo (string otc, string appId)
+        /// <param name="teammate"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > GrantaccessWithHttpInfo (string appId, CreateTeammate teammate)
         {
-            // verify the required parameter 'otc' is set
-            if (otc == null)
-                throw new ApiException(400, "Missing required parameter 'otc' when calling TeammatesApi->RedeemInvitation");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->RedeemInvitation");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->Grantaccess");
+            // verify the required parameter 'teammate' is set
+            if (teammate == null)
+                throw new ApiException(400, "Missing required parameter 'teammate' when calling TeammatesApi->Grantaccess");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates/redeem/{otc}";
+            var localVarPath = "./api/v1.0/{appId}/teammates/grantaccess";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1103,6 +1313,11 @@ public ApiResponse< RestApiResultRedeemInvitationResult > RedeemInvitationWithHt
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1117,8 +1332,15 @@ public ApiResponse< RestApiResultRedeemInvitationResult > RedeemInvitationWithHt
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (otc != null) localVarPathParams.Add("otc", this.Configuration.ApiClient.ParameterToString(otc)); // path parameter
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (teammate != null && teammate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(teammate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = teammate; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1129,53 +1351,53 @@ public ApiResponse< RestApiResultRedeemInvitationResult > RedeemInvitationWithHt
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("RedeemInvitation", localVarResponse);
+                Exception exception = ExceptionFactory("Grantaccess", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultRedeemInvitationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultRedeemInvitationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRedeemInvitationResult)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
         }
 
         /// <summary>
-        /// Redeem one-time code from invitation 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="otc"></param>
         /// <param name="appId"></param>
-        /// <returns>Task of RestApiResultRedeemInvitationResult</returns>
-        public async System.Threading.Tasks.Task<RestApiResultRedeemInvitationResult> RedeemInvitationAsync (string otc, string appId)
+        /// <param name="teammate"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> GrantaccessAsync (string appId, CreateTeammate teammate)
         {
-             ApiResponse<RestApiResultRedeemInvitationResult> localVarResponse = await RedeemInvitationAsyncWithHttpInfo(otc, appId);
+             ApiResponse<Object> localVarResponse = await GrantaccessAsyncWithHttpInfo(appId, teammate);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Redeem one-time code from invitation 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="otc"></param>
         /// <param name="appId"></param>
-        /// <returns>Task of ApiResponse (RestApiResultRedeemInvitationResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRedeemInvitationResult>> RedeemInvitationAsyncWithHttpInfo (string otc, string appId)
+        /// <param name="teammate"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> GrantaccessAsyncWithHttpInfo (string appId, CreateTeammate teammate)
         {
-            // verify the required parameter 'otc' is set
-            if (otc == null)
-                throw new ApiException(400, "Missing required parameter 'otc' when calling TeammatesApi->RedeemInvitation");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->RedeemInvitation");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->Grantaccess");
+            // verify the required parameter 'teammate' is set
+            if (teammate == null)
+                throw new ApiException(400, "Missing required parameter 'teammate' when calling TeammatesApi->Grantaccess");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates/redeem/{otc}";
+            var localVarPath = "./api/v1.0/{appId}/teammates/grantaccess";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1185,6 +1407,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRedeemInvitati
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1199,10 +1426,494 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRedeemInvitati
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (otc != null) localVarPathParams.Add("otc", this.Configuration.ApiClient.ParameterToString(otc)); // path parameter
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-
-            // authentication (oauth2) required
+            if (teammate != null && teammate.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(teammate); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = teammate; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("Grantaccess", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultRedeemInvitationResult</returns>
+        public RestApiResultRedeemInvitationResult RedeemInvitation (string otc, string appId)
+        {
+             ApiResponse<RestApiResultRedeemInvitationResult> localVarResponse = RedeemInvitationWithHttpInfo(otc, appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultRedeemInvitationResult</returns>
+        public ApiResponse< RestApiResultRedeemInvitationResult > RedeemInvitationWithHttpInfo (string otc, string appId)
+        {
+            // verify the required parameter 'otc' is set
+            if (otc == null)
+                throw new ApiException(400, "Missing required parameter 'otc' when calling TeammatesApi->RedeemInvitation");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->RedeemInvitation");
+
+            var localVarPath = "./api/v1.0/{appId}/teammates/redeem/{otc}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (otc != null) localVarPathParams.Add("otc", this.Configuration.ApiClient.ParameterToString(otc)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("RedeemInvitation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRedeemInvitationResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRedeemInvitationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRedeemInvitationResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultRedeemInvitationResult</returns>
+        public async System.Threading.Tasks.Task<RestApiResultRedeemInvitationResult> RedeemInvitationAsync (string otc, string appId)
+        {
+             ApiResponse<RestApiResultRedeemInvitationResult> localVarResponse = await RedeemInvitationAsyncWithHttpInfo(otc, appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultRedeemInvitationResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRedeemInvitationResult>> RedeemInvitationAsyncWithHttpInfo (string otc, string appId)
+        {
+            // verify the required parameter 'otc' is set
+            if (otc == null)
+                throw new ApiException(400, "Missing required parameter 'otc' when calling TeammatesApi->RedeemInvitation");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->RedeemInvitation");
+
+            var localVarPath = "./api/v1.0/{appId}/teammates/redeem/{otc}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (otc != null) localVarPathParams.Add("otc", this.Configuration.ApiClient.ParameterToString(otc)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("RedeemInvitation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultRedeemInvitationResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultRedeemInvitationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRedeemInvitationResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="portalUrl"></param>
+        /// <returns>Object</returns>
+        public Object TeammateMobileRedirect (string portalUrl)
+        {
+             ApiResponse<Object> localVarResponse = TeammateMobileRedirectWithHttpInfo(portalUrl);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="portalUrl"></param>
+        /// <returns>ApiResponse of Object</returns>
+        public ApiResponse< Object > TeammateMobileRedirectWithHttpInfo (string portalUrl)
+        {
+            // verify the required parameter 'portalUrl' is set
+            if (portalUrl == null)
+                throw new ApiException(400, "Missing required parameter 'portalUrl' when calling TeammatesApi->TeammateMobileRedirect");
+
+            var localVarPath = "./api/v1.0/teammates/mobile-redirect";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (portalUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "portalUrl", portalUrl)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TeammateMobileRedirect", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="portalUrl"></param>
+        /// <returns>Task of Object</returns>
+        public async System.Threading.Tasks.Task<Object> TeammateMobileRedirectAsync (string portalUrl)
+        {
+             ApiResponse<Object> localVarResponse = await TeammateMobileRedirectAsyncWithHttpInfo(portalUrl);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="portalUrl"></param>
+        /// <returns>Task of ApiResponse (Object)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> TeammateMobileRedirectAsyncWithHttpInfo (string portalUrl)
+        {
+            // verify the required parameter 'portalUrl' is set
+            if (portalUrl == null)
+                throw new ApiException(400, "Missing required parameter 'portalUrl' when calling TeammatesApi->TeammateMobileRedirect");
+
+            var localVarPath = "./api/v1.0/teammates/mobile-redirect";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (portalUrl != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "portalUrl", portalUrl)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TeammateMobileRedirect", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (Object) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(Object)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultAcceptInvitationResult</returns>
+        public RestApiResultAcceptInvitationResult TeammatesAcceptInvitation (string otc, string appId)
+        {
+             ApiResponse<RestApiResultAcceptInvitationResult> localVarResponse = TeammatesAcceptInvitationWithHttpInfo(otc, appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultAcceptInvitationResult</returns>
+        public ApiResponse< RestApiResultAcceptInvitationResult > TeammatesAcceptInvitationWithHttpInfo (string otc, string appId)
+        {
+            // verify the required parameter 'otc' is set
+            if (otc == null)
+                throw new ApiException(400, "Missing required parameter 'otc' when calling TeammatesApi->TeammatesAcceptInvitation");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->TeammatesAcceptInvitation");
+
+            var localVarPath = "./api/v1.0/{appId}/teammates/accept/{otc}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (otc != null) localVarPathParams.Add("otc", this.Configuration.ApiClient.ParameterToString(otc)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TeammatesAcceptInvitation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAcceptInvitationResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAcceptInvitationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAcceptInvitationResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultAcceptInvitationResult</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAcceptInvitationResult> TeammatesAcceptInvitationAsync (string otc, string appId)
+        {
+             ApiResponse<RestApiResultAcceptInvitationResult> localVarResponse = await TeammatesAcceptInvitationAsyncWithHttpInfo(otc, appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="otc"></param>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAcceptInvitationResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAcceptInvitationResult>> TeammatesAcceptInvitationAsyncWithHttpInfo (string otc, string appId)
+        {
+            // verify the required parameter 'otc' is set
+            if (otc == null)
+                throw new ApiException(400, "Missing required parameter 'otc' when calling TeammatesApi->TeammatesAcceptInvitation");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling TeammatesApi->TeammatesAcceptInvitation");
+
+            var localVarPath = "./api/v1.0/{appId}/teammates/accept/{otc}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (otc != null) localVarPathParams.Add("otc", this.Configuration.ApiClient.ParameterToString(otc)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
             // oauth required
             if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
             {
@@ -1218,22 +1929,300 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultRedeemInvitati
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("RedeemInvitation", localVarResponse);
+                Exception exception = ExceptionFactory("TeammatesAcceptInvitation", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultRedeemInvitationResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultRedeemInvitationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultRedeemInvitationResult)));
+            return new ApiResponse<RestApiResultAcceptInvitationResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAcceptInvitationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAcceptInvitationResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>RestApiArrayResultRedeemInvitationResult</returns>
+        public RestApiArrayResultRedeemInvitationResult TeammatesAcceptInvitations ()
+        {
+             ApiResponse<RestApiArrayResultRedeemInvitationResult> localVarResponse = TeammatesAcceptInvitationsWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of RestApiArrayResultRedeemInvitationResult</returns>
+        public ApiResponse< RestApiArrayResultRedeemInvitationResult > TeammatesAcceptInvitationsWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/teammates/acceptInvitations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TeammatesAcceptInvitations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRedeemInvitationResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRedeemInvitationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRedeemInvitationResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiArrayResultRedeemInvitationResult</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultRedeemInvitationResult> TeammatesAcceptInvitationsAsync ()
+        {
+             ApiResponse<RestApiArrayResultRedeemInvitationResult> localVarResponse = await TeammatesAcceptInvitationsAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiArrayResultRedeemInvitationResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultRedeemInvitationResult>> TeammatesAcceptInvitationsAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/teammates/acceptInvitations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TeammatesAcceptInvitations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultRedeemInvitationResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultRedeemInvitationResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultRedeemInvitationResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>RestApiArrayResultPendingInvitation</returns>
+        public RestApiArrayResultPendingInvitation TeammatesPendingInvitations ()
+        {
+             ApiResponse<RestApiArrayResultPendingInvitation> localVarResponse = TeammatesPendingInvitationsWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of RestApiArrayResultPendingInvitation</returns>
+        public ApiResponse< RestApiArrayResultPendingInvitation > TeammatesPendingInvitationsWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/teammates/pending-invitations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TeammatesPendingInvitations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultPendingInvitation>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultPendingInvitation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultPendingInvitation)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiArrayResultPendingInvitation</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultPendingInvitation> TeammatesPendingInvitationsAsync ()
+        {
+             ApiResponse<RestApiArrayResultPendingInvitation> localVarResponse = await TeammatesPendingInvitationsAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiArrayResultPendingInvitation)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultPendingInvitation>> TeammatesPendingInvitationsAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/teammates/pending-invitations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("TeammatesPendingInvitations", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultPendingInvitation>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultPendingInvitation) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultPendingInvitation)));
         }
 
         /// <summary>
-        /// Update teammates (this method does not support Deltas!) 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="id">teammate identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="id"></param>
+        /// <param name="teammate"></param>
         /// <returns>RestApiResultTeammate</returns>
         public RestApiResultTeammate UpdateTeammate (string appId, string id, TeammateBase teammate)
         {
@@ -1242,12 +2231,12 @@ public RestApiResultTeammate UpdateTeammate (string appId, string id, TeammateBa
         }
 
         /// <summary>
-        /// Update teammates (this method does not support Deltas!) 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="id">teammate identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="id"></param>
+        /// <param name="teammate"></param>
         /// <returns>ApiResponse of RestApiResultTeammate</returns>
         public ApiResponse< RestApiResultTeammate > UpdateTeammateWithHttpInfo (string appId, string id, TeammateBase teammate)
         {
@@ -1261,7 +2250,7 @@ public ApiResponse< RestApiResultTeammate > UpdateTeammateWithHttpInfo (string a
             if (teammate == null)
                 throw new ApiException(400, "Missing required parameter 'teammate' when calling TeammatesApi->UpdateTeammate");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates/{id}";
+            var localVarPath = "./api/v1.0/{appId}/teammates/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1322,17 +2311,17 @@ public ApiResponse< RestApiResultTeammate > UpdateTeammateWithHttpInfo (string a
             }
 
             return new ApiResponse<RestApiResultTeammate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTeammate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTeammate)));
         }
 
         /// <summary>
-        /// Update teammates (this method does not support Deltas!) 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="id">teammate identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="id"></param>
+        /// <param name="teammate"></param>
         /// <returns>Task of RestApiResultTeammate</returns>
         public async System.Threading.Tasks.Task<RestApiResultTeammate> UpdateTeammateAsync (string appId, string id, TeammateBase teammate)
         {
@@ -1342,12 +2331,12 @@ public async System.Threading.Tasks.Task<RestApiResultTeammate> UpdateTeammateAs
         }
 
         /// <summary>
-        /// Update teammates (this method does not support Deltas!) 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="id">teammate identifier</param>
-        /// <param name="teammate">teammate model</param>
+        /// <param name="appId"></param>
+        /// <param name="id"></param>
+        /// <param name="teammate"></param>
         /// <returns>Task of ApiResponse (RestApiResultTeammate)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> UpdateTeammateAsyncWithHttpInfo (string appId, string id, TeammateBase teammate)
         {
@@ -1361,7 +2350,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> Upd
             if (teammate == null)
                 throw new ApiException(400, "Missing required parameter 'teammate' when calling TeammatesApi->UpdateTeammate");
 
-            var localVarPath = "/api/v1.0/{appId}/teammates/{id}";
+            var localVarPath = "./api/v1.0/{appId}/teammates/{id}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1422,7 +2411,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTeammate>> Upd
             }
 
             return new ApiResponse<RestApiResultTeammate>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTeammate) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTeammate)));
         }
 
diff --git a/src/Flipdish/Api/TerminalIotApi.cs b/src/Flipdish/Api/TerminalIotApi.cs
index 83508398..0d1e3423 100644
--- a/src/Flipdish/Api/TerminalIotApi.cs
+++ b/src/Flipdish/Api/TerminalIotApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,20 +25,20 @@ public interface ITerminalIotApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>RestApiResultKioskIotConnectionParameters</returns>
         RestApiResultKioskIotConnectionParameters GetTerminalIotConnection ();
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of RestApiResultKioskIotConnectionParameters</returns>
@@ -46,20 +46,20 @@ public interface ITerminalIotApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of RestApiResultKioskIotConnectionParameters</returns>
         System.Threading.Tasks.Task<RestApiResultKioskIotConnectionParameters> GetTerminalIotConnectionAsync ();
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context
+        /// 
         /// </summary>
         /// <remarks>
-        /// [BETA - this endpoint is under development, do not use it in your production system]
+        /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of ApiResponse (RestApiResultKioskIotConnectionParameters)</returns>
@@ -165,7 +165,7 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>RestApiResultKioskIotConnectionParameters</returns>
@@ -176,14 +176,14 @@ public RestApiResultKioskIotConnectionParameters GetTerminalIotConnection ()
         }
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of RestApiResultKioskIotConnectionParameters</returns>
         public ApiResponse< RestApiResultKioskIotConnectionParameters > GetTerminalIotConnectionWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/terminaliot/connect";
+            var localVarPath = "./api/v1.0/terminaliot/connect";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -229,12 +229,12 @@ public ApiResponse< RestApiResultKioskIotConnectionParameters > GetTerminalIotCo
             }
 
             return new ApiResponse<RestApiResultKioskIotConnectionParameters>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultKioskIotConnectionParameters) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskIotConnectionParameters)));
         }
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of RestApiResultKioskIotConnectionParameters</returns>
@@ -246,14 +246,14 @@ public async System.Threading.Tasks.Task<RestApiResultKioskIotConnectionParamete
         }
 
         /// <summary>
-        /// Get the IoT connection parameters for telemetry and commands  No input parameters since authenticated hydra user defines context [BETA - this endpoint is under development, do not use it in your production system]
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>Task of ApiResponse (RestApiResultKioskIotConnectionParameters)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskIotConnectionParameters>> GetTerminalIotConnectionAsyncWithHttpInfo ()
         {
 
-            var localVarPath = "/api/v1.0/terminaliot/connect";
+            var localVarPath = "./api/v1.0/terminaliot/connect";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -299,7 +299,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultKioskIotConnec
             }
 
             return new ApiResponse<RestApiResultKioskIotConnectionParameters>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultKioskIotConnectionParameters) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultKioskIotConnectionParameters)));
         }
 
diff --git a/src/Flipdish/Api/TipsApi.cs b/src/Flipdish/Api/TipsApi.cs
index d0e09397..069e3cf6 100644
--- a/src/Flipdish/Api/TipsApi.cs
+++ b/src/Flipdish/Api/TipsApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,93 +25,93 @@ public interface ITipsApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Returns current tip configuration for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultTipConfiguration</returns>
         RestApiResultTipConfiguration TipConfigGet (int? storeId);
 
         /// <summary>
-        /// Returns current tip configuration for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultTipConfiguration</returns>
         ApiResponse<RestApiResultTipConfiguration> TipConfigGetWithHttpInfo (int? storeId);
         /// <summary>
-        /// Update or insert current tip configuration for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="updateConfig">Update Configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="updateConfig"></param>
         /// <returns>RestApiResultTipConfiguration</returns>
         RestApiResultTipConfiguration TipConfigUpsert (int? storeId, UpdateTipConfiguration updateConfig);
 
         /// <summary>
-        /// Update or insert current tip configuration for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="updateConfig">Update Configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="updateConfig"></param>
         /// <returns>ApiResponse of RestApiResultTipConfiguration</returns>
         ApiResponse<RestApiResultTipConfiguration> TipConfigUpsertWithHttpInfo (int? storeId, UpdateTipConfiguration updateConfig);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Returns current tip configuration for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultTipConfiguration</returns>
         System.Threading.Tasks.Task<RestApiResultTipConfiguration> TipConfigGetAsync (int? storeId);
 
         /// <summary>
-        /// Returns current tip configuration for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultTipConfiguration)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultTipConfiguration>> TipConfigGetAsyncWithHttpInfo (int? storeId);
         /// <summary>
-        /// Update or insert current tip configuration for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="updateConfig">Update Configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="updateConfig"></param>
         /// <returns>Task of RestApiResultTipConfiguration</returns>
         System.Threading.Tasks.Task<RestApiResultTipConfiguration> TipConfigUpsertAsync (int? storeId, UpdateTipConfiguration updateConfig);
 
         /// <summary>
-        /// Update or insert current tip configuration for a store
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="updateConfig">Update Configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="updateConfig"></param>
         /// <returns>Task of ApiResponse (RestApiResultTipConfiguration)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultTipConfiguration>> TipConfigUpsertAsyncWithHttpInfo (int? storeId, UpdateTipConfiguration updateConfig);
         #endregion Asynchronous Operations
@@ -215,10 +215,10 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Returns current tip configuration for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>RestApiResultTipConfiguration</returns>
         public RestApiResultTipConfiguration TipConfigGet (int? storeId)
         {
@@ -227,10 +227,10 @@ public RestApiResultTipConfiguration TipConfigGet (int? storeId)
         }
 
         /// <summary>
-        /// Returns current tip configuration for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>ApiResponse of RestApiResultTipConfiguration</returns>
         public ApiResponse< RestApiResultTipConfiguration > TipConfigGetWithHttpInfo (int? storeId)
         {
@@ -238,7 +238,7 @@ public ApiResponse< RestApiResultTipConfiguration > TipConfigGetWithHttpInfo (in
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling TipsApi->TipConfigGet");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/tipconfig";
+            var localVarPath = "./api/v1.0/stores/{storeId}/tipconfig";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -285,15 +285,15 @@ public ApiResponse< RestApiResultTipConfiguration > TipConfigGetWithHttpInfo (in
             }
 
             return new ApiResponse<RestApiResultTipConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTipConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTipConfiguration)));
         }
 
         /// <summary>
-        /// Returns current tip configuration for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of RestApiResultTipConfiguration</returns>
         public async System.Threading.Tasks.Task<RestApiResultTipConfiguration> TipConfigGetAsync (int? storeId)
         {
@@ -303,10 +303,10 @@ public async System.Threading.Tasks.Task<RestApiResultTipConfiguration> TipConfi
         }
 
         /// <summary>
-        /// Returns current tip configuration for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
+        /// <param name="storeId"></param>
         /// <returns>Task of ApiResponse (RestApiResultTipConfiguration)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTipConfiguration>> TipConfigGetAsyncWithHttpInfo (int? storeId)
         {
@@ -314,7 +314,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTipConfigurati
             if (storeId == null)
                 throw new ApiException(400, "Missing required parameter 'storeId' when calling TipsApi->TipConfigGet");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/tipconfig";
+            var localVarPath = "./api/v1.0/stores/{storeId}/tipconfig";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -361,16 +361,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTipConfigurati
             }
 
             return new ApiResponse<RestApiResultTipConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTipConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTipConfiguration)));
         }
 
         /// <summary>
-        /// Update or insert current tip configuration for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="updateConfig">Update Configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="updateConfig"></param>
         /// <returns>RestApiResultTipConfiguration</returns>
         public RestApiResultTipConfiguration TipConfigUpsert (int? storeId, UpdateTipConfiguration updateConfig)
         {
@@ -379,11 +379,11 @@ public RestApiResultTipConfiguration TipConfigUpsert (int? storeId, UpdateTipCon
         }
 
         /// <summary>
-        /// Update or insert current tip configuration for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="updateConfig">Update Configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="updateConfig"></param>
         /// <returns>ApiResponse of RestApiResultTipConfiguration</returns>
         public ApiResponse< RestApiResultTipConfiguration > TipConfigUpsertWithHttpInfo (int? storeId, UpdateTipConfiguration updateConfig)
         {
@@ -394,7 +394,7 @@ public ApiResponse< RestApiResultTipConfiguration > TipConfigUpsertWithHttpInfo
             if (updateConfig == null)
                 throw new ApiException(400, "Missing required parameter 'updateConfig' when calling TipsApi->TipConfigUpsert");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/tipconfig";
+            var localVarPath = "./api/v1.0/stores/{storeId}/tipconfig";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -454,16 +454,16 @@ public ApiResponse< RestApiResultTipConfiguration > TipConfigUpsertWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultTipConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTipConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTipConfiguration)));
         }
 
         /// <summary>
-        /// Update or insert current tip configuration for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="updateConfig">Update Configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="updateConfig"></param>
         /// <returns>Task of RestApiResultTipConfiguration</returns>
         public async System.Threading.Tasks.Task<RestApiResultTipConfiguration> TipConfigUpsertAsync (int? storeId, UpdateTipConfiguration updateConfig)
         {
@@ -473,11 +473,11 @@ public async System.Threading.Tasks.Task<RestApiResultTipConfiguration> TipConfi
         }
 
         /// <summary>
-        /// Update or insert current tip configuration for a store 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="storeId">Store Id</param>
-        /// <param name="updateConfig">Update Configuration</param>
+        /// <param name="storeId"></param>
+        /// <param name="updateConfig"></param>
         /// <returns>Task of ApiResponse (RestApiResultTipConfiguration)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTipConfiguration>> TipConfigUpsertAsyncWithHttpInfo (int? storeId, UpdateTipConfiguration updateConfig)
         {
@@ -488,7 +488,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTipConfigurati
             if (updateConfig == null)
                 throw new ApiException(400, "Missing required parameter 'updateConfig' when calling TipsApi->TipConfigUpsert");
 
-            var localVarPath = "/api/v1.0/stores/{storeId}/tipconfig";
+            var localVarPath = "./api/v1.0/stores/{storeId}/tipconfig";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -548,7 +548,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultTipConfigurati
             }
 
             return new ApiResponse<RestApiResultTipConfiguration>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultTipConfiguration) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultTipConfiguration)));
         }
 
diff --git a/src/Flipdish/Api/UsersApi.cs b/src/Flipdish/Api/UsersApi.cs
index eae887c6..50216477 100644
--- a/src/Flipdish/Api/UsersApi.cs
+++ b/src/Flipdish/Api/UsersApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -32,6 +32,117 @@ public interface IUsersApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId"></param>
+        /// <param name="note"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse AddUserNote (int? userId, string note);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="note"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> AddUserNoteWithHttpInfo (int? userId, string note);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>RestApiResultUserRole</returns>
+        RestApiResultUserRole AddUserToRole (int? userId, string roleName);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>ApiResponse of RestApiResultUserRole</returns>
+        ApiResponse<RestApiResultUserRole> AddUserToRoleWithHttpInfo (int? userId, string roleName);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse AnonymizeUser (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> AnonymizeUserWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse BlockUserPhoneNumber (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> BlockUserPhoneNumberWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse CreateUserDeliveryLocation (int? userId, CreateUserDeliveryLocationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> CreateUserDeliveryLocationWithHttpInfo (int? userId, CreateUserDeliveryLocationRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
         /// <param name="storeId"></param>
         /// <returns>RestApiStringResult</returns>
         RestApiStringResult GetPreviousOrderCountForStore (int? userId, int? storeId);
@@ -48,7 +159,49 @@ public interface IUsersApi : IApiAccessor
         /// <returns>ApiResponse of RestApiStringResult</returns>
         ApiResponse<RestApiStringResult> GetPreviousOrderCountForStoreWithHttpInfo (int? userId, int? storeId);
         /// <summary>
-        /// Get role names
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiArrayResultUserFlipdishAccount</returns>
+        RestApiArrayResultUserFlipdishAccount GetRestaurantUserAccounts (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultUserFlipdishAccount</returns>
+        ApiResponse<RestApiArrayResultUserFlipdishAccount> GetRestaurantUserAccountsWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiArrayResultUserStoreInfo</returns>
+        RestApiArrayResultUserStoreInfo GetRestaurantUserStores (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultUserStoreInfo</returns>
+        ApiResponse<RestApiArrayResultUserStoreInfo> GetRestaurantUserStoresWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -58,7 +211,7 @@ public interface IUsersApi : IApiAccessor
         RestApiStringArrayResult GetRoles ();
 
         /// <summary>
-        /// Get role names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -66,8 +219,6 @@ public interface IUsersApi : IApiAccessor
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <returns>ApiResponse of RestApiStringArrayResult</returns>
         ApiResponse<RestApiStringArrayResult> GetRolesWithHttpInfo ();
-        #endregion Synchronous Operations
-        #region Asynchronous Operations
         /// <summary>
         /// 
         /// </summary>
@@ -76,9 +227,8 @@ public interface IUsersApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId"></param>
-        /// <param name="storeId"></param>
-        /// <returns>Task of RestApiStringResult</returns>
-        System.Threading.Tasks.Task<RestApiStringResult> GetPreviousOrderCountForStoreAsync (int? userId, int? storeId);
+        /// <returns>RestApiResultUserRole</returns>
+        RestApiResultUserRole GetRolesAndUnassignedRoles (int? userId);
 
         /// <summary>
         /// 
@@ -88,126 +238,6278 @@ public interface IUsersApi : IApiAccessor
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId"></param>
-        /// <param name="storeId"></param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPreviousOrderCountForStoreAsyncWithHttpInfo (int? userId, int? storeId);
+        /// <returns>ApiResponse of RestApiResultUserRole</returns>
+        ApiResponse<RestApiResultUserRole> GetRolesAndUnassignedRolesWithHttpInfo (int? userId);
         /// <summary>
-        /// Get role names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiStringArrayResult</returns>
-        System.Threading.Tasks.Task<RestApiStringArrayResult> GetRolesAsync ();
+        /// <param name="userId"></param>
+        /// <returns>RestApiResultUserInfo</returns>
+        RestApiResultUserInfo GetUserById (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiResultUserInfo</returns>
+        ApiResponse<RestApiResultUserInfo> GetUserByIdWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <returns>RestApiArrayResultUserDeliveryLocationAdmin</returns>
+        RestApiArrayResultUserDeliveryLocationAdmin GetUserDeliveryLocationsForAdmin (int? userId, int? whiteLabelId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultUserDeliveryLocationAdmin</returns>
+        ApiResponse<RestApiArrayResultUserDeliveryLocationAdmin> GetUserDeliveryLocationsForAdminWithHttpInfo (int? userId, int? whiteLabelId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiArrayResultUserNote</returns>
+        RestApiArrayResultUserNote GetUserNotes (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultUserNote</returns>
+        ApiResponse<RestApiArrayResultUserNote> GetUserNotesWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="orderId"></param>
+        /// <returns>RestApiResultOrder</returns>
+        RestApiResultOrder GetUserOrderByIdForAdmin (int? userId, int? orderId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="orderId"></param>
+        /// <returns>ApiResponse of RestApiResultOrder</returns>
+        ApiResponse<RestApiResultOrder> GetUserOrderByIdForAdminWithHttpInfo (int? userId, int? orderId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="skip"> (optional)</param>
+        /// <param name="take"> (optional)</param>
+        /// <param name="brandId"> (optional)</param>
+        /// <returns>RestApiArrayResultUserOrderSummary</returns>
+        RestApiArrayResultUserOrderSummary GetUserOrdersForAdmin (int? userId, int? skip = null, int? take = null, string brandId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="skip"> (optional)</param>
+        /// <param name="take"> (optional)</param>
+        /// <param name="brandId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultUserOrderSummary</returns>
+        ApiResponse<RestApiArrayResultUserOrderSummary> GetUserOrdersForAdminWithHttpInfo (int? userId, int? skip = null, int? take = null, string brandId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="mostRecentCount"> (optional)</param>
+        /// <returns>RestApiArrayResultUserSmsChatItem</returns>
+        RestApiArrayResultUserSmsChatItem GetUserSmsConversationItems (int? userId, int? mostRecentCount = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="mostRecentCount"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultUserSmsChatItem</returns>
+        ApiResponse<RestApiArrayResultUserSmsChatItem> GetUserSmsConversationItemsWithHttpInfo (int? userId, int? mostRecentCount = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse HideUserDeliveryLocation (int? userId, int? deliveryLocationId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> HideUserDeliveryLocationWithHttpInfo (int? userId, int? deliveryLocationId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse MarkUserAsFraudulent (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> MarkUserAsFraudulentWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse MarkUserAsSuspicious (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> MarkUserAsSuspiciousWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse RemoveFlipdishAccountIdForUser (int? userId, int? accountId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> RemoveFlipdishAccountIdForUserWithHttpInfo (int? userId, int? accountId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>RestApiResultUserRole</returns>
+        RestApiResultUserRole RemoveUserFromRole (int? userId, string roleName);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>ApiResponse of RestApiResultUserRole</returns>
+        ApiResponse<RestApiResultUserRole> RemoveUserFromRoleWithHttpInfo (int? userId, string roleName);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse ResetMfa (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> ResetMfaWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchPattern"></param>
+        /// <returns>RestApiArrayResultFlipdishAccountName</returns>
+        RestApiArrayResultFlipdishAccountName SearchFlipdishAccounts (string searchPattern);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchPattern"></param>
+        /// <returns>ApiResponse of RestApiArrayResultFlipdishAccountName</returns>
+        ApiResponse<RestApiArrayResultFlipdishAccountName> SearchFlipdishAccountsWithHttpInfo (string searchPattern);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"></param>
+        /// <param name="hasUserLoggedIn"> (optional)</param>
+        /// <param name="userDiscriminator"> (optional)</param>
+        /// <param name="searchIn"> (optional)</param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>RestApiPaginationResultUserSearch</returns>
+        RestApiPaginationResultUserSearch SearchUsers (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"></param>
+        /// <param name="hasUserLoggedIn"> (optional)</param>
+        /// <param name="userDiscriminator"> (optional)</param>
+        /// <param name="searchIn"> (optional)</param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultUserSearch</returns>
+        ApiResponse<RestApiPaginationResultUserSearch> SearchUsersWithHttpInfo (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiResultUserPushNotificationSentResult</returns>
+        RestApiResultUserPushNotificationSentResult SendUserPushNotification (int? userId, SendUserPushNotificationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiResultUserPushNotificationSentResult</returns>
+        ApiResponse<RestApiResultUserPushNotificationSentResult> SendUserPushNotificationWithHttpInfo (int? userId, SendUserPushNotificationRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse SendUserSms (int? userId, SendUserSmsRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> SendUserSmsWithHttpInfo (int? userId, SendUserSmsRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="customerName"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse SetCustomerName (int? userId, string customerName);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="customerName"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> SetCustomerNameWithHttpInfo (int? userId, string customerName);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse SetFlipdishAccountIdForUser (int? userId, int? accountId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> SetFlipdishAccountIdForUserWithHttpInfo (int? userId, int? accountId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse SetUserDeliveryLocationCoordinates (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> SetUserDeliveryLocationCoordinatesWithHttpInfo (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse SetUserDeliveryLocationField (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> SetUserDeliveryLocationFieldWithHttpInfo (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="languageId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse SetUserLanguage (int? userId, string languageId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="languageId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> SetUserLanguageWithHttpInfo (int? userId, string languageId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        RestApiDefaultResponse UnblockUserPhoneNumber (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        ApiResponse<RestApiDefaultResponse> UnblockUserPhoneNumberWithHttpInfo (int? userId);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="note"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> AddUserNoteAsync (int? userId, string note);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="note"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> AddUserNoteAsyncWithHttpInfo (int? userId, string note);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>Task of RestApiResultUserRole</returns>
+        System.Threading.Tasks.Task<RestApiResultUserRole> AddUserToRoleAsync (int? userId, string roleName);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserRole)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultUserRole>> AddUserToRoleAsyncWithHttpInfo (int? userId, string roleName);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> AnonymizeUserAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> AnonymizeUserAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> BlockUserPhoneNumberAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> BlockUserPhoneNumberAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> CreateUserDeliveryLocationAsync (int? userId, CreateUserDeliveryLocationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> CreateUserDeliveryLocationAsyncWithHttpInfo (int? userId, CreateUserDeliveryLocationRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        System.Threading.Tasks.Task<RestApiStringResult> GetPreviousOrderCountForStoreAsync (int? userId, int? storeId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPreviousOrderCountForStoreAsyncWithHttpInfo (int? userId, int? storeId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiArrayResultUserFlipdishAccount</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultUserFlipdishAccount> GetRestaurantUserAccountsAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserFlipdishAccount)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserFlipdishAccount>> GetRestaurantUserAccountsAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiArrayResultUserStoreInfo</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultUserStoreInfo> GetRestaurantUserStoresAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserStoreInfo)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserStoreInfo>> GetRestaurantUserStoresAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiStringArrayResult</returns>
+        System.Threading.Tasks.Task<RestApiStringArrayResult> GetRolesAsync ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> GetRolesAsyncWithHttpInfo ();
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiResultUserRole</returns>
+        System.Threading.Tasks.Task<RestApiResultUserRole> GetRolesAndUnassignedRolesAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserRole)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultUserRole>> GetRolesAndUnassignedRolesAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiResultUserInfo</returns>
+        System.Threading.Tasks.Task<RestApiResultUserInfo> GetUserByIdAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserInfo)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultUserInfo>> GetUserByIdAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultUserDeliveryLocationAdmin</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultUserDeliveryLocationAdmin> GetUserDeliveryLocationsForAdminAsync (int? userId, int? whiteLabelId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserDeliveryLocationAdmin)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserDeliveryLocationAdmin>> GetUserDeliveryLocationsForAdminAsyncWithHttpInfo (int? userId, int? whiteLabelId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiArrayResultUserNote</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultUserNote> GetUserNotesAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserNote)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserNote>> GetUserNotesAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="orderId"></param>
+        /// <returns>Task of RestApiResultOrder</returns>
+        System.Threading.Tasks.Task<RestApiResultOrder> GetUserOrderByIdForAdminAsync (int? userId, int? orderId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="orderId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultOrder)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultOrder>> GetUserOrderByIdForAdminAsyncWithHttpInfo (int? userId, int? orderId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="skip"> (optional)</param>
+        /// <param name="take"> (optional)</param>
+        /// <param name="brandId"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultUserOrderSummary</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultUserOrderSummary> GetUserOrdersForAdminAsync (int? userId, int? skip = null, int? take = null, string brandId = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="skip"> (optional)</param>
+        /// <param name="take"> (optional)</param>
+        /// <param name="brandId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserOrderSummary)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserOrderSummary>> GetUserOrdersForAdminAsyncWithHttpInfo (int? userId, int? skip = null, int? take = null, string brandId = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="mostRecentCount"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultUserSmsChatItem</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultUserSmsChatItem> GetUserSmsConversationItemsAsync (int? userId, int? mostRecentCount = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="mostRecentCount"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserSmsChatItem)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserSmsChatItem>> GetUserSmsConversationItemsAsyncWithHttpInfo (int? userId, int? mostRecentCount = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> HideUserDeliveryLocationAsync (int? userId, int? deliveryLocationId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> HideUserDeliveryLocationAsyncWithHttpInfo (int? userId, int? deliveryLocationId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> MarkUserAsFraudulentAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> MarkUserAsFraudulentAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> MarkUserAsSuspiciousAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> MarkUserAsSuspiciousAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> RemoveFlipdishAccountIdForUserAsync (int? userId, int? accountId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> RemoveFlipdishAccountIdForUserAsyncWithHttpInfo (int? userId, int? accountId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>Task of RestApiResultUserRole</returns>
+        System.Threading.Tasks.Task<RestApiResultUserRole> RemoveUserFromRoleAsync (int? userId, string roleName);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserRole)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultUserRole>> RemoveUserFromRoleAsyncWithHttpInfo (int? userId, string roleName);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> ResetMfaAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> ResetMfaAsyncWithHttpInfo (int? userId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchPattern"></param>
+        /// <returns>Task of RestApiArrayResultFlipdishAccountName</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultFlipdishAccountName> SearchFlipdishAccountsAsync (string searchPattern);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchPattern"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultFlipdishAccountName)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultFlipdishAccountName>> SearchFlipdishAccountsAsyncWithHttpInfo (string searchPattern);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"></param>
+        /// <param name="hasUserLoggedIn"> (optional)</param>
+        /// <param name="userDiscriminator"> (optional)</param>
+        /// <param name="searchIn"> (optional)</param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultUserSearch</returns>
+        System.Threading.Tasks.Task<RestApiPaginationResultUserSearch> SearchUsersAsync (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"></param>
+        /// <param name="hasUserLoggedIn"> (optional)</param>
+        /// <param name="userDiscriminator"> (optional)</param>
+        /// <param name="searchIn"> (optional)</param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultUserSearch)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultUserSearch>> SearchUsersAsyncWithHttpInfo (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiResultUserPushNotificationSentResult</returns>
+        System.Threading.Tasks.Task<RestApiResultUserPushNotificationSentResult> SendUserPushNotificationAsync (int? userId, SendUserPushNotificationRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserPushNotificationSentResult)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultUserPushNotificationSentResult>> SendUserPushNotificationAsyncWithHttpInfo (int? userId, SendUserPushNotificationRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> SendUserSmsAsync (int? userId, SendUserSmsRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SendUserSmsAsyncWithHttpInfo (int? userId, SendUserSmsRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="customerName"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> SetCustomerNameAsync (int? userId, string customerName);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="customerName"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetCustomerNameAsyncWithHttpInfo (int? userId, string customerName);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> SetFlipdishAccountIdForUserAsync (int? userId, int? accountId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetFlipdishAccountIdForUserAsyncWithHttpInfo (int? userId, int? accountId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> SetUserDeliveryLocationCoordinatesAsync (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetUserDeliveryLocationCoordinatesAsyncWithHttpInfo (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> SetUserDeliveryLocationFieldAsync (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetUserDeliveryLocationFieldAsyncWithHttpInfo (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="languageId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> SetUserLanguageAsync (int? userId, string languageId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="languageId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetUserLanguageAsyncWithHttpInfo (int? userId, string languageId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        System.Threading.Tasks.Task<RestApiDefaultResponse> UnblockUserPhoneNumberAsync (int? userId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> UnblockUserPhoneNumberAsyncWithHttpInfo (int? userId);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class UsersApi : IUsersApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UsersApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public UsersApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UsersApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public UsersApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="note"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse AddUserNote (int? userId, string note)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = AddUserNoteWithHttpInfo(userId, note);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="note"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > AddUserNoteWithHttpInfo (int? userId, string note)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->AddUserNote");
+            // verify the required parameter 'note' is set
+            if (note == null)
+                throw new ApiException(400, "Missing required parameter 'note' when calling UsersApi->AddUserNote");
+
+            var localVarPath = "./api/v1.0/users/{userId}/AddUserNote";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (note != null && note.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(note); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = note; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddUserNote", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="note"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> AddUserNoteAsync (int? userId, string note)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await AddUserNoteAsyncWithHttpInfo(userId, note);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="note"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> AddUserNoteAsyncWithHttpInfo (int? userId, string note)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->AddUserNote");
+            // verify the required parameter 'note' is set
+            if (note == null)
+                throw new ApiException(400, "Missing required parameter 'note' when calling UsersApi->AddUserNote");
+
+            var localVarPath = "./api/v1.0/users/{userId}/AddUserNote";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (note != null && note.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(note); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = note; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddUserNote", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>RestApiResultUserRole</returns>
+        public RestApiResultUserRole AddUserToRole (int? userId, string roleName)
+        {
+             ApiResponse<RestApiResultUserRole> localVarResponse = AddUserToRoleWithHttpInfo(userId, roleName);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>ApiResponse of RestApiResultUserRole</returns>
+        public ApiResponse< RestApiResultUserRole > AddUserToRoleWithHttpInfo (int? userId, string roleName)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->AddUserToRole");
+            // verify the required parameter 'roleName' is set
+            if (roleName == null)
+                throw new ApiException(400, "Missing required parameter 'roleName' when calling UsersApi->AddUserToRole");
+
+            var localVarPath = "./api/v1.0/users/{userId}/AddUserToRole/{roleName}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (roleName != null) localVarPathParams.Add("roleName", this.Configuration.ApiClient.ParameterToString(roleName)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddUserToRole", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserRole>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserRole) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserRole)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>Task of RestApiResultUserRole</returns>
+        public async System.Threading.Tasks.Task<RestApiResultUserRole> AddUserToRoleAsync (int? userId, string roleName)
+        {
+             ApiResponse<RestApiResultUserRole> localVarResponse = await AddUserToRoleAsyncWithHttpInfo(userId, roleName);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserRole)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUserRole>> AddUserToRoleAsyncWithHttpInfo (int? userId, string roleName)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->AddUserToRole");
+            // verify the required parameter 'roleName' is set
+            if (roleName == null)
+                throw new ApiException(400, "Missing required parameter 'roleName' when calling UsersApi->AddUserToRole");
+
+            var localVarPath = "./api/v1.0/users/{userId}/AddUserToRole/{roleName}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (roleName != null) localVarPathParams.Add("roleName", this.Configuration.ApiClient.ParameterToString(roleName)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AddUserToRole", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserRole>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserRole) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserRole)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse AnonymizeUser (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = AnonymizeUserWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > AnonymizeUserWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->AnonymizeUser");
+
+            var localVarPath = "./api/v1.0/users/{userId}/AnonymizeUser";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AnonymizeUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> AnonymizeUserAsync (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await AnonymizeUserAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> AnonymizeUserAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->AnonymizeUser");
+
+            var localVarPath = "./api/v1.0/users/{userId}/AnonymizeUser";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("AnonymizeUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse BlockUserPhoneNumber (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = BlockUserPhoneNumberWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > BlockUserPhoneNumberWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->BlockUserPhoneNumber");
+
+            var localVarPath = "./api/v1.0/users/{userId}/BlockUserPhoneNumber";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("BlockUserPhoneNumber", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> BlockUserPhoneNumberAsync (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await BlockUserPhoneNumberAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> BlockUserPhoneNumberAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->BlockUserPhoneNumber");
+
+            var localVarPath = "./api/v1.0/users/{userId}/BlockUserPhoneNumber";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("BlockUserPhoneNumber", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse CreateUserDeliveryLocation (int? userId, CreateUserDeliveryLocationRequest request)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = CreateUserDeliveryLocationWithHttpInfo(userId, request);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > CreateUserDeliveryLocationWithHttpInfo (int? userId, CreateUserDeliveryLocationRequest request)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->CreateUserDeliveryLocation");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->CreateUserDeliveryLocation");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUserDeliveryLocation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> CreateUserDeliveryLocationAsync (int? userId, CreateUserDeliveryLocationRequest request)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await CreateUserDeliveryLocationAsyncWithHttpInfo(userId, request);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> CreateUserDeliveryLocationAsyncWithHttpInfo (int? userId, CreateUserDeliveryLocationRequest request)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->CreateUserDeliveryLocation");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->CreateUserDeliveryLocation");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("CreateUserDeliveryLocation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>RestApiStringResult</returns>
+        public RestApiStringResult GetPreviousOrderCountForStore (int? userId, int? storeId)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = GetPreviousOrderCountForStoreWithHttpInfo(userId, storeId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>ApiResponse of RestApiStringResult</returns>
+        public ApiResponse< RestApiStringResult > GetPreviousOrderCountForStoreWithHttpInfo (int? userId, int? storeId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetPreviousOrderCountForStore");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling UsersApi->GetPreviousOrderCountForStore");
+
+            var localVarPath = "./api/v1.0/users/{userId}/previousordercount/{storeId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPreviousOrderCountForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of RestApiStringResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringResult> GetPreviousOrderCountForStoreAsync (int? userId, int? storeId)
+        {
+             ApiResponse<RestApiStringResult> localVarResponse = await GetPreviousOrderCountForStoreAsyncWithHttpInfo(userId, storeId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="storeId"></param>
+        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPreviousOrderCountForStoreAsyncWithHttpInfo (int? userId, int? storeId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetPreviousOrderCountForStore");
+            // verify the required parameter 'storeId' is set
+            if (storeId == null)
+                throw new ApiException(400, "Missing required parameter 'storeId' when calling UsersApi->GetPreviousOrderCountForStore");
+
+            var localVarPath = "./api/v1.0/users/{userId}/previousordercount/{storeId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPreviousOrderCountForStore", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiArrayResultUserFlipdishAccount</returns>
+        public RestApiArrayResultUserFlipdishAccount GetRestaurantUserAccounts (int? userId)
+        {
+             ApiResponse<RestApiArrayResultUserFlipdishAccount> localVarResponse = GetRestaurantUserAccountsWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultUserFlipdishAccount</returns>
+        public ApiResponse< RestApiArrayResultUserFlipdishAccount > GetRestaurantUserAccountsWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetRestaurantUserAccounts");
+
+            var localVarPath = "./api/v1.0/users/{userId}/RestaurantUserAccounts";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetRestaurantUserAccounts", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserFlipdishAccount>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserFlipdishAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserFlipdishAccount)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiArrayResultUserFlipdishAccount</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultUserFlipdishAccount> GetRestaurantUserAccountsAsync (int? userId)
+        {
+             ApiResponse<RestApiArrayResultUserFlipdishAccount> localVarResponse = await GetRestaurantUserAccountsAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserFlipdishAccount)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserFlipdishAccount>> GetRestaurantUserAccountsAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetRestaurantUserAccounts");
+
+            var localVarPath = "./api/v1.0/users/{userId}/RestaurantUserAccounts";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetRestaurantUserAccounts", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserFlipdishAccount>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserFlipdishAccount) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserFlipdishAccount)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiArrayResultUserStoreInfo</returns>
+        public RestApiArrayResultUserStoreInfo GetRestaurantUserStores (int? userId)
+        {
+             ApiResponse<RestApiArrayResultUserStoreInfo> localVarResponse = GetRestaurantUserStoresWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultUserStoreInfo</returns>
+        public ApiResponse< RestApiArrayResultUserStoreInfo > GetRestaurantUserStoresWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetRestaurantUserStores");
+
+            var localVarPath = "./api/v1.0/users/{userId}/RestaurantUserStores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetRestaurantUserStores", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserStoreInfo>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserStoreInfo) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserStoreInfo)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiArrayResultUserStoreInfo</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultUserStoreInfo> GetRestaurantUserStoresAsync (int? userId)
+        {
+             ApiResponse<RestApiArrayResultUserStoreInfo> localVarResponse = await GetRestaurantUserStoresAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserStoreInfo)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserStoreInfo>> GetRestaurantUserStoresAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetRestaurantUserStores");
+
+            var localVarPath = "./api/v1.0/users/{userId}/RestaurantUserStores";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetRestaurantUserStores", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserStoreInfo>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserStoreInfo) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserStoreInfo)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>RestApiStringArrayResult</returns>
+        public RestApiStringArrayResult GetRoles ()
+        {
+             ApiResponse<RestApiStringArrayResult> localVarResponse = GetRolesWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of RestApiStringArrayResult</returns>
+        public ApiResponse< RestApiStringArrayResult > GetRolesWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/users/roles";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetRoles", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of RestApiStringArrayResult</returns>
+        public async System.Threading.Tasks.Task<RestApiStringArrayResult> GetRolesAsync ()
+        {
+             ApiResponse<RestApiStringArrayResult> localVarResponse = await GetRolesAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> GetRolesAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/users/roles";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetRoles", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiResultUserRole</returns>
+        public RestApiResultUserRole GetRolesAndUnassignedRoles (int? userId)
+        {
+             ApiResponse<RestApiResultUserRole> localVarResponse = GetRolesAndUnassignedRolesWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiResultUserRole</returns>
+        public ApiResponse< RestApiResultUserRole > GetRolesAndUnassignedRolesWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetRolesAndUnassignedRoles");
+
+            var localVarPath = "./api/v1.0/users/{userId}/roles";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetRolesAndUnassignedRoles", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserRole>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserRole) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserRole)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiResultUserRole</returns>
+        public async System.Threading.Tasks.Task<RestApiResultUserRole> GetRolesAndUnassignedRolesAsync (int? userId)
+        {
+             ApiResponse<RestApiResultUserRole> localVarResponse = await GetRolesAndUnassignedRolesAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserRole)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUserRole>> GetRolesAndUnassignedRolesAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetRolesAndUnassignedRoles");
+
+            var localVarPath = "./api/v1.0/users/{userId}/roles";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetRolesAndUnassignedRoles", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserRole>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserRole) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserRole)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiResultUserInfo</returns>
+        public RestApiResultUserInfo GetUserById (int? userId)
+        {
+             ApiResponse<RestApiResultUserInfo> localVarResponse = GetUserByIdWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiResultUserInfo</returns>
+        public ApiResponse< RestApiResultUserInfo > GetUserByIdWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserById");
+
+            var localVarPath = "./api/v1.0/users/{userId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserInfo>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserInfo) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserInfo)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiResultUserInfo</returns>
+        public async System.Threading.Tasks.Task<RestApiResultUserInfo> GetUserByIdAsync (int? userId)
+        {
+             ApiResponse<RestApiResultUserInfo> localVarResponse = await GetUserByIdAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserInfo)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUserInfo>> GetUserByIdAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserById");
+
+            var localVarPath = "./api/v1.0/users/{userId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserInfo>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserInfo) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserInfo)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <returns>RestApiArrayResultUserDeliveryLocationAdmin</returns>
+        public RestApiArrayResultUserDeliveryLocationAdmin GetUserDeliveryLocationsForAdmin (int? userId, int? whiteLabelId = null)
+        {
+             ApiResponse<RestApiArrayResultUserDeliveryLocationAdmin> localVarResponse = GetUserDeliveryLocationsForAdminWithHttpInfo(userId, whiteLabelId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultUserDeliveryLocationAdmin</returns>
+        public ApiResponse< RestApiArrayResultUserDeliveryLocationAdmin > GetUserDeliveryLocationsForAdminWithHttpInfo (int? userId, int? whiteLabelId = null)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserDeliveryLocationsForAdmin");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (whiteLabelId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "whiteLabelId", whiteLabelId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserDeliveryLocationsForAdmin", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserDeliveryLocationAdmin>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserDeliveryLocationAdmin) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserDeliveryLocationAdmin)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultUserDeliveryLocationAdmin</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultUserDeliveryLocationAdmin> GetUserDeliveryLocationsForAdminAsync (int? userId, int? whiteLabelId = null)
+        {
+             ApiResponse<RestApiArrayResultUserDeliveryLocationAdmin> localVarResponse = await GetUserDeliveryLocationsForAdminAsyncWithHttpInfo(userId, whiteLabelId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="whiteLabelId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserDeliveryLocationAdmin)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserDeliveryLocationAdmin>> GetUserDeliveryLocationsForAdminAsyncWithHttpInfo (int? userId, int? whiteLabelId = null)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserDeliveryLocationsForAdmin");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (whiteLabelId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "whiteLabelId", whiteLabelId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserDeliveryLocationsForAdmin", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserDeliveryLocationAdmin>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserDeliveryLocationAdmin) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserDeliveryLocationAdmin)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiArrayResultUserNote</returns>
+        public RestApiArrayResultUserNote GetUserNotes (int? userId)
+        {
+             ApiResponse<RestApiArrayResultUserNote> localVarResponse = GetUserNotesWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultUserNote</returns>
+        public ApiResponse< RestApiArrayResultUserNote > GetUserNotesWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserNotes");
+
+            var localVarPath = "./api/v1.0/users/{userId}/UserNotes";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserNotes", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserNote>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserNote) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserNote)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiArrayResultUserNote</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultUserNote> GetUserNotesAsync (int? userId)
+        {
+             ApiResponse<RestApiArrayResultUserNote> localVarResponse = await GetUserNotesAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserNote)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserNote>> GetUserNotesAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserNotes");
+
+            var localVarPath = "./api/v1.0/users/{userId}/UserNotes";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserNotes", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserNote>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserNote) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserNote)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="orderId"></param>
+        /// <returns>RestApiResultOrder</returns>
+        public RestApiResultOrder GetUserOrderByIdForAdmin (int? userId, int? orderId)
+        {
+             ApiResponse<RestApiResultOrder> localVarResponse = GetUserOrderByIdForAdminWithHttpInfo(userId, orderId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="orderId"></param>
+        /// <returns>ApiResponse of RestApiResultOrder</returns>
+        public ApiResponse< RestApiResultOrder > GetUserOrderByIdForAdminWithHttpInfo (int? userId, int? orderId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserOrderByIdForAdmin");
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling UsersApi->GetUserOrderByIdForAdmin");
+
+            var localVarPath = "./api/v1.0/users/{userId}/orders/{orderId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserOrderByIdForAdmin", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultOrder>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrder)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="orderId"></param>
+        /// <returns>Task of RestApiResultOrder</returns>
+        public async System.Threading.Tasks.Task<RestApiResultOrder> GetUserOrderByIdForAdminAsync (int? userId, int? orderId)
+        {
+             ApiResponse<RestApiResultOrder> localVarResponse = await GetUserOrderByIdForAdminAsyncWithHttpInfo(userId, orderId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="orderId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultOrder)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultOrder>> GetUserOrderByIdForAdminAsyncWithHttpInfo (int? userId, int? orderId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserOrderByIdForAdmin");
+            // verify the required parameter 'orderId' is set
+            if (orderId == null)
+                throw new ApiException(400, "Missing required parameter 'orderId' when calling UsersApi->GetUserOrderByIdForAdmin");
+
+            var localVarPath = "./api/v1.0/users/{userId}/orders/{orderId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (orderId != null) localVarPathParams.Add("orderId", this.Configuration.ApiClient.ParameterToString(orderId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserOrderByIdForAdmin", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultOrder>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultOrder) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultOrder)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="skip"> (optional)</param>
+        /// <param name="take"> (optional)</param>
+        /// <param name="brandId"> (optional)</param>
+        /// <returns>RestApiArrayResultUserOrderSummary</returns>
+        public RestApiArrayResultUserOrderSummary GetUserOrdersForAdmin (int? userId, int? skip = null, int? take = null, string brandId = null)
+        {
+             ApiResponse<RestApiArrayResultUserOrderSummary> localVarResponse = GetUserOrdersForAdminWithHttpInfo(userId, skip, take, brandId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="skip"> (optional)</param>
+        /// <param name="take"> (optional)</param>
+        /// <param name="brandId"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultUserOrderSummary</returns>
+        public ApiResponse< RestApiArrayResultUserOrderSummary > GetUserOrdersForAdminWithHttpInfo (int? userId, int? skip = null, int? take = null, string brandId = null)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserOrdersForAdmin");
+
+            var localVarPath = "./api/v1.0/users/{userId}/orders";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (skip != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "skip", skip)); // query parameter
+            if (take != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "take", take)); // query parameter
+            if (brandId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "brandId", brandId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserOrdersForAdmin", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserOrderSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserOrderSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserOrderSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="skip"> (optional)</param>
+        /// <param name="take"> (optional)</param>
+        /// <param name="brandId"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultUserOrderSummary</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultUserOrderSummary> GetUserOrdersForAdminAsync (int? userId, int? skip = null, int? take = null, string brandId = null)
+        {
+             ApiResponse<RestApiArrayResultUserOrderSummary> localVarResponse = await GetUserOrdersForAdminAsyncWithHttpInfo(userId, skip, take, brandId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="skip"> (optional)</param>
+        /// <param name="take"> (optional)</param>
+        /// <param name="brandId"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserOrderSummary)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserOrderSummary>> GetUserOrdersForAdminAsyncWithHttpInfo (int? userId, int? skip = null, int? take = null, string brandId = null)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserOrdersForAdmin");
+
+            var localVarPath = "./api/v1.0/users/{userId}/orders";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (skip != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "skip", skip)); // query parameter
+            if (take != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "take", take)); // query parameter
+            if (brandId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "brandId", brandId)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserOrdersForAdmin", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserOrderSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserOrderSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserOrderSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="mostRecentCount"> (optional)</param>
+        /// <returns>RestApiArrayResultUserSmsChatItem</returns>
+        public RestApiArrayResultUserSmsChatItem GetUserSmsConversationItems (int? userId, int? mostRecentCount = null)
+        {
+             ApiResponse<RestApiArrayResultUserSmsChatItem> localVarResponse = GetUserSmsConversationItemsWithHttpInfo(userId, mostRecentCount);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="mostRecentCount"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultUserSmsChatItem</returns>
+        public ApiResponse< RestApiArrayResultUserSmsChatItem > GetUserSmsConversationItemsWithHttpInfo (int? userId, int? mostRecentCount = null)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserSmsConversationItems");
+
+            var localVarPath = "./api/v1.0/users/{userId}/smsConversationItems";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (mostRecentCount != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "mostRecentCount", mostRecentCount)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserSmsConversationItems", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserSmsChatItem>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserSmsChatItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserSmsChatItem)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="mostRecentCount"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultUserSmsChatItem</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultUserSmsChatItem> GetUserSmsConversationItemsAsync (int? userId, int? mostRecentCount = null)
+        {
+             ApiResponse<RestApiArrayResultUserSmsChatItem> localVarResponse = await GetUserSmsConversationItemsAsyncWithHttpInfo(userId, mostRecentCount);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="mostRecentCount"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultUserSmsChatItem)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultUserSmsChatItem>> GetUserSmsConversationItemsAsyncWithHttpInfo (int? userId, int? mostRecentCount = null)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetUserSmsConversationItems");
+
+            var localVarPath = "./api/v1.0/users/{userId}/smsConversationItems";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (mostRecentCount != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "mostRecentCount", mostRecentCount)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetUserSmsConversationItems", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultUserSmsChatItem>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultUserSmsChatItem) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultUserSmsChatItem)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse HideUserDeliveryLocation (int? userId, int? deliveryLocationId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = HideUserDeliveryLocationWithHttpInfo(userId, deliveryLocationId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > HideUserDeliveryLocationWithHttpInfo (int? userId, int? deliveryLocationId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->HideUserDeliveryLocation");
+            // verify the required parameter 'deliveryLocationId' is set
+            if (deliveryLocationId == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryLocationId' when calling UsersApi->HideUserDeliveryLocation");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/hide";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (deliveryLocationId != null) localVarPathParams.Add("deliveryLocationId", this.Configuration.ApiClient.ParameterToString(deliveryLocationId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("HideUserDeliveryLocation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> HideUserDeliveryLocationAsync (int? userId, int? deliveryLocationId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await HideUserDeliveryLocationAsyncWithHttpInfo(userId, deliveryLocationId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> HideUserDeliveryLocationAsyncWithHttpInfo (int? userId, int? deliveryLocationId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->HideUserDeliveryLocation");
+            // verify the required parameter 'deliveryLocationId' is set
+            if (deliveryLocationId == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryLocationId' when calling UsersApi->HideUserDeliveryLocation");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/hide";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (deliveryLocationId != null) localVarPathParams.Add("deliveryLocationId", this.Configuration.ApiClient.ParameterToString(deliveryLocationId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("HideUserDeliveryLocation", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse MarkUserAsFraudulent (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = MarkUserAsFraudulentWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > MarkUserAsFraudulentWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->MarkUserAsFraudulent");
+
+            var localVarPath = "./api/v1.0/users/{userId}/MarkUserAsFraudulent";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("MarkUserAsFraudulent", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> MarkUserAsFraudulentAsync (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await MarkUserAsFraudulentAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> MarkUserAsFraudulentAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->MarkUserAsFraudulent");
+
+            var localVarPath = "./api/v1.0/users/{userId}/MarkUserAsFraudulent";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("MarkUserAsFraudulent", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse MarkUserAsSuspicious (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = MarkUserAsSuspiciousWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > MarkUserAsSuspiciousWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->MarkUserAsSuspicious");
+
+            var localVarPath = "./api/v1.0/users/{userId}/MarkUserAsSuspicious";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("MarkUserAsSuspicious", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> MarkUserAsSuspiciousAsync (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await MarkUserAsSuspiciousAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> MarkUserAsSuspiciousAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->MarkUserAsSuspicious");
+
+            var localVarPath = "./api/v1.0/users/{userId}/MarkUserAsSuspicious";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("MarkUserAsSuspicious", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse RemoveFlipdishAccountIdForUser (int? userId, int? accountId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = RemoveFlipdishAccountIdForUserWithHttpInfo(userId, accountId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > RemoveFlipdishAccountIdForUserWithHttpInfo (int? userId, int? accountId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->RemoveFlipdishAccountIdForUser");
+            // verify the required parameter 'accountId' is set
+            if (accountId == null)
+                throw new ApiException(400, "Missing required parameter 'accountId' when calling UsersApi->RemoveFlipdishAccountIdForUser");
+
+            var localVarPath = "./api/v1.0/users/{userId}/RemoveFlipdishAccountId/{accountId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (accountId != null) localVarPathParams.Add("accountId", this.Configuration.ApiClient.ParameterToString(accountId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("RemoveFlipdishAccountIdForUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> RemoveFlipdishAccountIdForUserAsync (int? userId, int? accountId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await RemoveFlipdishAccountIdForUserAsyncWithHttpInfo(userId, accountId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> RemoveFlipdishAccountIdForUserAsyncWithHttpInfo (int? userId, int? accountId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->RemoveFlipdishAccountIdForUser");
+            // verify the required parameter 'accountId' is set
+            if (accountId == null)
+                throw new ApiException(400, "Missing required parameter 'accountId' when calling UsersApi->RemoveFlipdishAccountIdForUser");
+
+            var localVarPath = "./api/v1.0/users/{userId}/RemoveFlipdishAccountId/{accountId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (accountId != null) localVarPathParams.Add("accountId", this.Configuration.ApiClient.ParameterToString(accountId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("RemoveFlipdishAccountIdForUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>RestApiResultUserRole</returns>
+        public RestApiResultUserRole RemoveUserFromRole (int? userId, string roleName)
+        {
+             ApiResponse<RestApiResultUserRole> localVarResponse = RemoveUserFromRoleWithHttpInfo(userId, roleName);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>ApiResponse of RestApiResultUserRole</returns>
+        public ApiResponse< RestApiResultUserRole > RemoveUserFromRoleWithHttpInfo (int? userId, string roleName)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->RemoveUserFromRole");
+            // verify the required parameter 'roleName' is set
+            if (roleName == null)
+                throw new ApiException(400, "Missing required parameter 'roleName' when calling UsersApi->RemoveUserFromRole");
+
+            var localVarPath = "./api/v1.0/users/{userId}/RemoveUserFromRole/{roleName}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (roleName != null) localVarPathParams.Add("roleName", this.Configuration.ApiClient.ParameterToString(roleName)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("RemoveUserFromRole", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserRole>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserRole) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserRole)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>Task of RestApiResultUserRole</returns>
+        public async System.Threading.Tasks.Task<RestApiResultUserRole> RemoveUserFromRoleAsync (int? userId, string roleName)
+        {
+             ApiResponse<RestApiResultUserRole> localVarResponse = await RemoveUserFromRoleAsyncWithHttpInfo(userId, roleName);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="roleName"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserRole)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUserRole>> RemoveUserFromRoleAsyncWithHttpInfo (int? userId, string roleName)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->RemoveUserFromRole");
+            // verify the required parameter 'roleName' is set
+            if (roleName == null)
+                throw new ApiException(400, "Missing required parameter 'roleName' when calling UsersApi->RemoveUserFromRole");
+
+            var localVarPath = "./api/v1.0/users/{userId}/RemoveUserFromRole/{roleName}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (roleName != null) localVarPathParams.Add("roleName", this.Configuration.ApiClient.ParameterToString(roleName)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("RemoveUserFromRole", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserRole>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserRole) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserRole)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse ResetMfa (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = ResetMfaWithHttpInfo(userId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > ResetMfaWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->ResetMfa");
+
+            var localVarPath = "./api/v1.0/users/{userId}/ResetMfa";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("ResetMfa", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> ResetMfaAsync (int? userId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await ResetMfaAsyncWithHttpInfo(userId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> ResetMfaAsyncWithHttpInfo (int? userId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->ResetMfa");
+
+            var localVarPath = "./api/v1.0/users/{userId}/ResetMfa";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("ResetMfa", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchPattern"></param>
+        /// <returns>RestApiArrayResultFlipdishAccountName</returns>
+        public RestApiArrayResultFlipdishAccountName SearchFlipdishAccounts (string searchPattern)
+        {
+             ApiResponse<RestApiArrayResultFlipdishAccountName> localVarResponse = SearchFlipdishAccountsWithHttpInfo(searchPattern);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchPattern"></param>
+        /// <returns>ApiResponse of RestApiArrayResultFlipdishAccountName</returns>
+        public ApiResponse< RestApiArrayResultFlipdishAccountName > SearchFlipdishAccountsWithHttpInfo (string searchPattern)
+        {
+            // verify the required parameter 'searchPattern' is set
+            if (searchPattern == null)
+                throw new ApiException(400, "Missing required parameter 'searchPattern' when calling UsersApi->SearchFlipdishAccounts");
+
+            var localVarPath = "./api/v1.0/users/searchFlipdishAccounts";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (searchPattern != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchPattern", searchPattern)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SearchFlipdishAccounts", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultFlipdishAccountName>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultFlipdishAccountName) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultFlipdishAccountName)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchPattern"></param>
+        /// <returns>Task of RestApiArrayResultFlipdishAccountName</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultFlipdishAccountName> SearchFlipdishAccountsAsync (string searchPattern)
+        {
+             ApiResponse<RestApiArrayResultFlipdishAccountName> localVarResponse = await SearchFlipdishAccountsAsyncWithHttpInfo(searchPattern);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchPattern"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultFlipdishAccountName)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultFlipdishAccountName>> SearchFlipdishAccountsAsyncWithHttpInfo (string searchPattern)
+        {
+            // verify the required parameter 'searchPattern' is set
+            if (searchPattern == null)
+                throw new ApiException(400, "Missing required parameter 'searchPattern' when calling UsersApi->SearchFlipdishAccounts");
+
+            var localVarPath = "./api/v1.0/users/searchFlipdishAccounts";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (searchPattern != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchPattern", searchPattern)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SearchFlipdishAccounts", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultFlipdishAccountName>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultFlipdishAccountName) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultFlipdishAccountName)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"></param>
+        /// <param name="hasUserLoggedIn"> (optional)</param>
+        /// <param name="userDiscriminator"> (optional)</param>
+        /// <param name="searchIn"> (optional)</param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>RestApiPaginationResultUserSearch</returns>
+        public RestApiPaginationResultUserSearch SearchUsers (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null)
+        {
+             ApiResponse<RestApiPaginationResultUserSearch> localVarResponse = SearchUsersWithHttpInfo(searchQuery, hasUserLoggedIn, userDiscriminator, searchIn, pageIndex, pageSize);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"></param>
+        /// <param name="hasUserLoggedIn"> (optional)</param>
+        /// <param name="userDiscriminator"> (optional)</param>
+        /// <param name="searchIn"> (optional)</param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultUserSearch</returns>
+        public ApiResponse< RestApiPaginationResultUserSearch > SearchUsersWithHttpInfo (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null)
+        {
+            // verify the required parameter 'searchQuery' is set
+            if (searchQuery == null)
+                throw new ApiException(400, "Missing required parameter 'searchQuery' when calling UsersApi->SearchUsers");
+
+            var localVarPath = "./api/v1.0/users/search";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
+            if (hasUserLoggedIn != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "hasUserLoggedIn", hasUserLoggedIn)); // query parameter
+            if (userDiscriminator != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userDiscriminator", userDiscriminator)); // query parameter
+            if (searchIn != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchIn", searchIn)); // query parameter
+            if (pageIndex != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageIndex", pageIndex)); // query parameter
+            if (pageSize != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageSize", pageSize)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SearchUsers", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultUserSearch>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultUserSearch) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultUserSearch)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"></param>
+        /// <param name="hasUserLoggedIn"> (optional)</param>
+        /// <param name="userDiscriminator"> (optional)</param>
+        /// <param name="searchIn"> (optional)</param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultUserSearch</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultUserSearch> SearchUsersAsync (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null)
+        {
+             ApiResponse<RestApiPaginationResultUserSearch> localVarResponse = await SearchUsersAsyncWithHttpInfo(searchQuery, hasUserLoggedIn, userDiscriminator, searchIn, pageIndex, pageSize);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="searchQuery"></param>
+        /// <param name="hasUserLoggedIn"> (optional)</param>
+        /// <param name="userDiscriminator"> (optional)</param>
+        /// <param name="searchIn"> (optional)</param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultUserSearch)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultUserSearch>> SearchUsersAsyncWithHttpInfo (string searchQuery, bool? hasUserLoggedIn = null, string userDiscriminator = null, string searchIn = null, int? pageIndex = null, int? pageSize = null)
+        {
+            // verify the required parameter 'searchQuery' is set
+            if (searchQuery == null)
+                throw new ApiException(400, "Missing required parameter 'searchQuery' when calling UsersApi->SearchUsers");
+
+            var localVarPath = "./api/v1.0/users/search";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (searchQuery != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchQuery", searchQuery)); // query parameter
+            if (hasUserLoggedIn != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "hasUserLoggedIn", hasUserLoggedIn)); // query parameter
+            if (userDiscriminator != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "userDiscriminator", userDiscriminator)); // query parameter
+            if (searchIn != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "searchIn", searchIn)); // query parameter
+            if (pageIndex != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageIndex", pageIndex)); // query parameter
+            if (pageSize != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageSize", pageSize)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SearchUsers", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultUserSearch>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultUserSearch) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultUserSearch)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiResultUserPushNotificationSentResult</returns>
+        public RestApiResultUserPushNotificationSentResult SendUserPushNotification (int? userId, SendUserPushNotificationRequest request)
+        {
+             ApiResponse<RestApiResultUserPushNotificationSentResult> localVarResponse = SendUserPushNotificationWithHttpInfo(userId, request);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiResultUserPushNotificationSentResult</returns>
+        public ApiResponse< RestApiResultUserPushNotificationSentResult > SendUserPushNotificationWithHttpInfo (int? userId, SendUserPushNotificationRequest request)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SendUserPushNotification");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->SendUserPushNotification");
+
+            var localVarPath = "./api/v1.0/users/{userId}/pushNotifications";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SendUserPushNotification", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserPushNotificationSentResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserPushNotificationSentResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserPushNotificationSentResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiResultUserPushNotificationSentResult</returns>
+        public async System.Threading.Tasks.Task<RestApiResultUserPushNotificationSentResult> SendUserPushNotificationAsync (int? userId, SendUserPushNotificationRequest request)
+        {
+             ApiResponse<RestApiResultUserPushNotificationSentResult> localVarResponse = await SendUserPushNotificationAsyncWithHttpInfo(userId, request);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiResultUserPushNotificationSentResult)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultUserPushNotificationSentResult>> SendUserPushNotificationAsyncWithHttpInfo (int? userId, SendUserPushNotificationRequest request)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SendUserPushNotification");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->SendUserPushNotification");
+
+            var localVarPath = "./api/v1.0/users/{userId}/pushNotifications";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SendUserPushNotification", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultUserPushNotificationSentResult>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultUserPushNotificationSentResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultUserPushNotificationSentResult)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse SendUserSms (int? userId, SendUserSmsRequest request)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = SendUserSmsWithHttpInfo(userId, request);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > SendUserSmsWithHttpInfo (int? userId, SendUserSmsRequest request)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SendUserSms");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->SendUserSms");
+
+            var localVarPath = "./api/v1.0/users/{userId}/sms";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SendUserSms", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> SendUserSmsAsync (int? userId, SendUserSmsRequest request)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await SendUserSmsAsyncWithHttpInfo(userId, request);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SendUserSmsAsyncWithHttpInfo (int? userId, SendUserSmsRequest request)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SendUserSms");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->SendUserSms");
+
+            var localVarPath = "./api/v1.0/users/{userId}/sms";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SendUserSms", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="customerName"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse SetCustomerName (int? userId, string customerName)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = SetCustomerNameWithHttpInfo(userId, customerName);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="customerName"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > SetCustomerNameWithHttpInfo (int? userId, string customerName)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetCustomerName");
+            // verify the required parameter 'customerName' is set
+            if (customerName == null)
+                throw new ApiException(400, "Missing required parameter 'customerName' when calling UsersApi->SetCustomerName");
+
+            var localVarPath = "./api/v1.0/users/{userId}/SetCustomerName";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (customerName != null && customerName.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(customerName); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = customerName; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetCustomerName", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="customerName"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> SetCustomerNameAsync (int? userId, string customerName)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await SetCustomerNameAsyncWithHttpInfo(userId, customerName);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="customerName"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetCustomerNameAsyncWithHttpInfo (int? userId, string customerName)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetCustomerName");
+            // verify the required parameter 'customerName' is set
+            if (customerName == null)
+                throw new ApiException(400, "Missing required parameter 'customerName' when calling UsersApi->SetCustomerName");
+
+            var localVarPath = "./api/v1.0/users/{userId}/SetCustomerName";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (customerName != null && customerName.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(customerName); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = customerName; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetCustomerName", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse SetFlipdishAccountIdForUser (int? userId, int? accountId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = SetFlipdishAccountIdForUserWithHttpInfo(userId, accountId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > SetFlipdishAccountIdForUserWithHttpInfo (int? userId, int? accountId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetFlipdishAccountIdForUser");
+            // verify the required parameter 'accountId' is set
+            if (accountId == null)
+                throw new ApiException(400, "Missing required parameter 'accountId' when calling UsersApi->SetFlipdishAccountIdForUser");
+
+            var localVarPath = "./api/v1.0/users/{userId}/SetFlipdishAccountId/{accountId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (accountId != null) localVarPathParams.Add("accountId", this.Configuration.ApiClient.ParameterToString(accountId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetFlipdishAccountIdForUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> SetFlipdishAccountIdForUserAsync (int? userId, int? accountId)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await SetFlipdishAccountIdForUserAsyncWithHttpInfo(userId, accountId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="accountId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetFlipdishAccountIdForUserAsyncWithHttpInfo (int? userId, int? accountId)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetFlipdishAccountIdForUser");
+            // verify the required parameter 'accountId' is set
+            if (accountId == null)
+                throw new ApiException(400, "Missing required parameter 'accountId' when calling UsersApi->SetFlipdishAccountIdForUser");
+
+            var localVarPath = "./api/v1.0/users/{userId}/SetFlipdishAccountId/{accountId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (accountId != null) localVarPathParams.Add("accountId", this.Configuration.ApiClient.ParameterToString(accountId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetFlipdishAccountIdForUser", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse SetUserDeliveryLocationCoordinates (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = SetUserDeliveryLocationCoordinatesWithHttpInfo(userId, deliveryLocationId, request);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > SetUserDeliveryLocationCoordinatesWithHttpInfo (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetUserDeliveryLocationCoordinates");
+            // verify the required parameter 'deliveryLocationId' is set
+            if (deliveryLocationId == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryLocationId' when calling UsersApi->SetUserDeliveryLocationCoordinates");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->SetUserDeliveryLocationCoordinates");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/coordinates";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (deliveryLocationId != null) localVarPathParams.Add("deliveryLocationId", this.Configuration.ApiClient.ParameterToString(deliveryLocationId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetUserDeliveryLocationCoordinates", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> SetUserDeliveryLocationCoordinatesAsync (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request)
+        {
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await SetUserDeliveryLocationCoordinatesAsyncWithHttpInfo(userId, deliveryLocationId, request);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetUserDeliveryLocationCoordinatesAsyncWithHttpInfo (int? userId, int? deliveryLocationId, SetUserDeliveryLocationCoordinatesRequest request)
+        {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetUserDeliveryLocationCoordinates");
+            // verify the required parameter 'deliveryLocationId' is set
+            if (deliveryLocationId == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryLocationId' when calling UsersApi->SetUserDeliveryLocationCoordinates");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->SetUserDeliveryLocationCoordinates");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/coordinates";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (deliveryLocationId != null) localVarPathParams.Add("deliveryLocationId", this.Configuration.ApiClient.ParameterToString(deliveryLocationId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
 
-        /// <summary>
-        /// Get role names
-        /// </summary>
-        /// <remarks>
-        /// 
-        /// </remarks>
-        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> GetRolesAsyncWithHttpInfo ();
-        #endregion Asynchronous Operations
-    }
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetUserDeliveryLocationCoordinates", localVarResponse);
+                if (exception != null) throw exception;
+            }
 
-    /// <summary>
-    /// Represents a collection of functions to interact with the API endpoints
-    /// </summary>
-    public partial class UsersApi : IUsersApi
-    {
-        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
+        }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="UsersApi"/> class.
+        ///  
         /// </summary>
-        /// <returns></returns>
-        public UsersApi(String basePath)
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse SetUserDeliveryLocationField (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request)
         {
-            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
-
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+             ApiResponse<RestApiDefaultResponse> localVarResponse = SetUserDeliveryLocationFieldWithHttpInfo(userId, deliveryLocationId, request);
+             return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="UsersApi"/> class
-        /// using Configuration object
+        ///  
         /// </summary>
-        /// <param name="configuration">An instance of Configuration</param>
-        /// <returns></returns>
-        public UsersApi(Flipdish.Client.Configuration configuration = null)
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > SetUserDeliveryLocationFieldWithHttpInfo (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request)
         {
-            if (configuration == null) // use the default one in Configuration
-                this.Configuration = Flipdish.Client.Configuration.Default;
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetUserDeliveryLocationField");
+            // verify the required parameter 'deliveryLocationId' is set
+            if (deliveryLocationId == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryLocationId' when calling UsersApi->SetUserDeliveryLocationField");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->SetUserDeliveryLocationField");
+
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/fields";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (deliveryLocationId != null) localVarPathParams.Add("deliveryLocationId", this.Configuration.ApiClient.ParameterToString(deliveryLocationId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
             else
-                this.Configuration = configuration;
+            {
+                localVarPostBody = request; // byte array
+            }
 
-            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetUserDeliveryLocationField", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// Gets the base path of the API client.
+        ///  
         /// </summary>
-        /// <value>The base path</value>
-        public String GetBasePath()
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> SetUserDeliveryLocationFieldAsync (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request)
         {
-            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await SetUserDeliveryLocationFieldAsyncWithHttpInfo(userId, deliveryLocationId, request);
+             return localVarResponse.Data;
+
         }
 
         /// <summary>
-        /// Sets the base path of the API client.
+        ///  
         /// </summary>
-        /// <value>The base path</value>
-        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
-        public void SetBasePath(String basePath)
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="userId"></param>
+        /// <param name="deliveryLocationId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetUserDeliveryLocationFieldAsyncWithHttpInfo (int? userId, int? deliveryLocationId, SetUserDeliveryLocationFieldRequest request)
         {
-            // do nothing
-        }
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetUserDeliveryLocationField");
+            // verify the required parameter 'deliveryLocationId' is set
+            if (deliveryLocationId == null)
+                throw new ApiException(400, "Missing required parameter 'deliveryLocationId' when calling UsersApi->SetUserDeliveryLocationField");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling UsersApi->SetUserDeliveryLocationField");
 
-        /// <summary>
-        /// Gets or sets the configuration object
-        /// </summary>
-        /// <value>An instance of the Configuration</value>
-        public Flipdish.Client.Configuration Configuration {get; set;}
+            var localVarPath = "./api/v1.0/users/{userId}/deliveryLocations/{deliveryLocationId}/fields";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
 
-        /// <summary>
-        /// Provides a factory method hook for the creation of exceptions.
-        /// </summary>
-        public Flipdish.Client.ExceptionFactory ExceptionFactory
-        {
-            get
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
+            if (deliveryLocationId != null) localVarPathParams.Add("deliveryLocationId", this.Configuration.ApiClient.ParameterToString(deliveryLocationId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
             {
-                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
-                {
-                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
-                }
-                return _exceptionFactory;
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
             }
-            set { _exceptionFactory = value; }
-        }
 
-        /// <summary>
-        /// Gets the default header.
-        /// </summary>
-        /// <returns>Dictionary of HTTP header</returns>
-        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
-        public IDictionary<String, String> DefaultHeader()
-        {
-            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
-        }
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
 
-        /// <summary>
-        /// Add default header.
-        /// </summary>
-        /// <param name="key">Header field name.</param>
-        /// <param name="value">Header field value.</param>
-        /// <returns></returns>
-        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
-        public void AddDefaultHeader(string key, string value)
-        {
-            this.Configuration.AddDefaultHeader(key, value);
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SetUserDeliveryLocationField", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
         }
 
         /// <summary>
@@ -215,11 +6517,11 @@ public void AddDefaultHeader(string key, string value)
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId"></param>
-        /// <param name="storeId"></param>
-        /// <returns>RestApiStringResult</returns>
-        public RestApiStringResult GetPreviousOrderCountForStore (int? userId, int? storeId)
+        /// <param name="languageId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse SetUserLanguage (int? userId, string languageId)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = GetPreviousOrderCountForStoreWithHttpInfo(userId, storeId);
+             ApiResponse<RestApiDefaultResponse> localVarResponse = SetUserLanguageWithHttpInfo(userId, languageId);
              return localVarResponse.Data;
         }
 
@@ -228,18 +6530,18 @@ public RestApiStringResult GetPreviousOrderCountForStore (int? userId, int? stor
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId"></param>
-        /// <param name="storeId"></param>
-        /// <returns>ApiResponse of RestApiStringResult</returns>
-        public ApiResponse< RestApiStringResult > GetPreviousOrderCountForStoreWithHttpInfo (int? userId, int? storeId)
+        /// <param name="languageId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > SetUserLanguageWithHttpInfo (int? userId, string languageId)
         {
             // verify the required parameter 'userId' is set
             if (userId == null)
-                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetPreviousOrderCountForStore");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling UsersApi->GetPreviousOrderCountForStore");
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetUserLanguage");
+            // verify the required parameter 'languageId' is set
+            if (languageId == null)
+                throw new ApiException(400, "Missing required parameter 'languageId' when calling UsersApi->SetUserLanguage");
 
-            var localVarPath = "/api/v1.0/users/{userId}/previousordercount/{storeId}";
+            var localVarPath = "./api/v1.0/users/{userId}/SetLanguage/{languageId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -264,7 +6566,7 @@ public ApiResponse< RestApiStringResult > GetPreviousOrderCountForStoreWithHttpI
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (languageId != null) localVarPathParams.Add("languageId", this.Configuration.ApiClient.ParameterToString(languageId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -275,20 +6577,20 @@ public ApiResponse< RestApiStringResult > GetPreviousOrderCountForStoreWithHttpI
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetPreviousOrderCountForStore", localVarResponse);
+                Exception exception = ExceptionFactory("SetUserLanguage", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
         }
 
         /// <summary>
@@ -296,11 +6598,11 @@ public ApiResponse< RestApiStringResult > GetPreviousOrderCountForStoreWithHttpI
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId"></param>
-        /// <param name="storeId"></param>
-        /// <returns>Task of RestApiStringResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringResult> GetPreviousOrderCountForStoreAsync (int? userId, int? storeId)
+        /// <param name="languageId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> SetUserLanguageAsync (int? userId, string languageId)
         {
-             ApiResponse<RestApiStringResult> localVarResponse = await GetPreviousOrderCountForStoreAsyncWithHttpInfo(userId, storeId);
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await SetUserLanguageAsyncWithHttpInfo(userId, languageId);
              return localVarResponse.Data;
 
         }
@@ -310,18 +6612,18 @@ public async System.Threading.Tasks.Task<RestApiStringResult> GetPreviousOrderCo
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId"></param>
-        /// <param name="storeId"></param>
-        /// <returns>Task of ApiResponse (RestApiStringResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPreviousOrderCountForStoreAsyncWithHttpInfo (int? userId, int? storeId)
+        /// <param name="languageId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> SetUserLanguageAsyncWithHttpInfo (int? userId, string languageId)
         {
             // verify the required parameter 'userId' is set
             if (userId == null)
-                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->GetPreviousOrderCountForStore");
-            // verify the required parameter 'storeId' is set
-            if (storeId == null)
-                throw new ApiException(400, "Missing required parameter 'storeId' when calling UsersApi->GetPreviousOrderCountForStore");
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->SetUserLanguage");
+            // verify the required parameter 'languageId' is set
+            if (languageId == null)
+                throw new ApiException(400, "Missing required parameter 'languageId' when calling UsersApi->SetUserLanguage");
 
-            var localVarPath = "/api/v1.0/users/{userId}/previousordercount/{storeId}";
+            var localVarPath = "./api/v1.0/users/{userId}/SetLanguage/{languageId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -346,7 +6648,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPr
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
-            if (storeId != null) localVarPathParams.Add("storeId", this.Configuration.ApiClient.ParameterToString(storeId)); // path parameter
+            if (languageId != null) localVarPathParams.Add("languageId", this.Configuration.ApiClient.ParameterToString(languageId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -357,42 +6659,47 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringResult>> GetPr
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetPreviousOrderCountForStore", localVarResponse);
+                Exception exception = ExceptionFactory("SetUserLanguage", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringResult)));
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// Get role names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>RestApiStringArrayResult</returns>
-        public RestApiStringArrayResult GetRoles ()
+        /// <param name="userId"></param>
+        /// <returns>RestApiDefaultResponse</returns>
+        public RestApiDefaultResponse UnblockUserPhoneNumber (int? userId)
         {
-             ApiResponse<RestApiStringArrayResult> localVarResponse = GetRolesWithHttpInfo();
+             ApiResponse<RestApiDefaultResponse> localVarResponse = UnblockUserPhoneNumberWithHttpInfo(userId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Get role names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>ApiResponse of RestApiStringArrayResult</returns>
-        public ApiResponse< RestApiStringArrayResult > GetRolesWithHttpInfo ()
+        /// <param name="userId"></param>
+        /// <returns>ApiResponse of RestApiDefaultResponse</returns>
+        public ApiResponse< RestApiDefaultResponse > UnblockUserPhoneNumberWithHttpInfo (int? userId)
         {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->UnblockUserPhoneNumber");
 
-            var localVarPath = "/api/v1.0/users/roles";
+            var localVarPath = "./api/v1.0/users/{userId}/UnblockUserPhoneNumber";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -416,6 +6723,7 @@ public ApiResponse< RestApiStringArrayResult > GetRolesWithHttpInfo ()
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -426,43 +6734,48 @@ public ApiResponse< RestApiStringArrayResult > GetRolesWithHttpInfo ()
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetRoles", localVarResponse);
+                Exception exception = ExceptionFactory("UnblockUserPhoneNumber", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
         }
 
         /// <summary>
-        /// Get role names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of RestApiStringArrayResult</returns>
-        public async System.Threading.Tasks.Task<RestApiStringArrayResult> GetRolesAsync ()
+        /// <param name="userId"></param>
+        /// <returns>Task of RestApiDefaultResponse</returns>
+        public async System.Threading.Tasks.Task<RestApiDefaultResponse> UnblockUserPhoneNumberAsync (int? userId)
         {
-             ApiResponse<RestApiStringArrayResult> localVarResponse = await GetRolesAsyncWithHttpInfo();
+             ApiResponse<RestApiDefaultResponse> localVarResponse = await UnblockUserPhoneNumberAsyncWithHttpInfo(userId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Get role names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> GetRolesAsyncWithHttpInfo ()
+        /// <param name="userId"></param>
+        /// <returns>Task of ApiResponse (RestApiDefaultResponse)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiDefaultResponse>> UnblockUserPhoneNumberAsyncWithHttpInfo (int? userId)
         {
+            // verify the required parameter 'userId' is set
+            if (userId == null)
+                throw new ApiException(400, "Missing required parameter 'userId' when calling UsersApi->UnblockUserPhoneNumber");
 
-            var localVarPath = "/api/v1.0/users/roles";
+            var localVarPath = "./api/v1.0/users/{userId}/UnblockUserPhoneNumber";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -486,6 +6799,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>>
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
+            if (userId != null) localVarPathParams.Add("userId", this.Configuration.ApiClient.ParameterToString(userId)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -496,20 +6810,20 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>>
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetRoles", localVarResponse);
+                Exception exception = ExceptionFactory("UnblockUserPhoneNumber", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
+            return new ApiResponse<RestApiDefaultResponse>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiDefaultResponse) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiDefaultResponse)));
         }
 
     }
diff --git a/src/Flipdish/Api/VouchersApi.cs b/src/Flipdish/Api/VouchersApi.cs
index 20b10996..1a26d7ad 100644
--- a/src/Flipdish/Api/VouchersApi.cs
+++ b/src/Flipdish/Api/VouchersApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,277 +25,519 @@ public interface IVouchersApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// [PRIVATE API] Create voucher
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="voucher">Voucher Details</param>
+        /// <param name="appId"></param>
+        /// <param name="voucher"></param>
         /// <returns>RestApiResultVoucherWithStats</returns>
         RestApiResultVoucherWithStats CreateVoucher (string appId, CreateVoucher voucher);
 
         /// <summary>
-        /// [PRIVATE API] Create voucher
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="voucher">Voucher Details</param>
+        /// <param name="appId"></param>
+        /// <param name="voucher"></param>
         /// <returns>ApiResponse of RestApiResultVoucherWithStats</returns>
         ApiResponse<RestApiResultVoucherWithStats> CreateVoucherWithHttpInfo (string appId, CreateVoucher voucher);
         /// <summary>
-        /// [PRIVATE API] Get voucher by identifier
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="code"></param>
+        /// <returns>RestApiResultVoucher</returns>
+        RestApiResultVoucher GetVoucherByCode (string appId, string code);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="code"></param>
+        /// <returns>ApiResponse of RestApiResultVoucher</returns>
+        ApiResponse<RestApiResultVoucher> GetVoucherByCodeWithHttpInfo (string appId, string code);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
+        /// <param name="voucherId"></param>
         /// <returns>RestApiResultVoucherWithStats</returns>
         RestApiResultVoucherWithStats GetVoucherById (int? voucherId);
 
         /// <summary>
-        /// [PRIVATE API] Get voucher by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
+        /// <param name="voucherId"></param>
         /// <returns>ApiResponse of RestApiResultVoucherWithStats</returns>
         ApiResponse<RestApiResultVoucherWithStats> GetVoucherByIdWithHttpInfo (int? voucherId);
         /// <summary>
-        /// [PRIVATE API] Get voucher stats by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week \\ month</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
+        /// <param name="voucherId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
         /// <returns>RestApiArrayResultVoucherDataPoint</returns>
         RestApiArrayResultVoucherDataPoint GetVoucherStatsById (int? voucherId, string aggregateDataBy, int? dataPointLimit = null);
 
         /// <summary>
-        /// [PRIVATE API] Get voucher stats by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week \\ month</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
+        /// <param name="voucherId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
         /// <returns>ApiResponse of RestApiArrayResultVoucherDataPoint</returns>
         ApiResponse<RestApiArrayResultVoucherDataPoint> GetVoucherStatsByIdWithHttpInfo (int? voucherId, string aggregateDataBy, int? dataPointLimit = null);
         /// <summary>
-        /// [PRIVATE API] Get vouchers summaries for App Id
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns></returns>
+        void GetVoucherValidityPeriods (string appId, int? voucherId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> GetVoucherValidityPeriodsWithHttpInfo (string appId, int? voucherId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="pageIndex">Page Number (optional)</param>
-        /// <param name="pageSize">Page Size (optional)</param>
-        /// <param name="searchCodes">Search by Voucher Code\\s (optional)</param>
-        /// <param name="statusSearch">Search by Status (optional)</param>
-        /// <param name="typeSearch">Search by Type (optional)</param>
-        /// <param name="subTypeSearch">Search by Sub Type (optional)</param>
-        /// <param name="storeIds">Search by Store Ids (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <param name="searchCodes"> (optional)</param>
+        /// <param name="statusSearch"> (optional)</param>
+        /// <param name="typeSearch"> (optional)</param>
+        /// <param name="subTypeSearch"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="channelRestrictions"> (optional)</param>
         /// <returns>RestApiPaginationResultVoucherSummary</returns>
-        RestApiPaginationResultVoucherSummary GetVouchers (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null);
+        RestApiPaginationResultVoucherSummary GetVouchers (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null);
 
         /// <summary>
-        /// [PRIVATE API] Get vouchers summaries for App Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="pageIndex">Page Number (optional)</param>
-        /// <param name="pageSize">Page Size (optional)</param>
-        /// <param name="searchCodes">Search by Voucher Code\\s (optional)</param>
-        /// <param name="statusSearch">Search by Status (optional)</param>
-        /// <param name="typeSearch">Search by Type (optional)</param>
-        /// <param name="subTypeSearch">Search by Sub Type (optional)</param>
-        /// <param name="storeIds">Search by Store Ids (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <param name="searchCodes"> (optional)</param>
+        /// <param name="statusSearch"> (optional)</param>
+        /// <param name="typeSearch"> (optional)</param>
+        /// <param name="subTypeSearch"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="channelRestrictions"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultVoucherSummary</returns>
-        ApiResponse<RestApiPaginationResultVoucherSummary> GetVouchersWithHttpInfo (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null);
+        ApiResponse<RestApiPaginationResultVoucherSummary> GetVouchersWithHttpInfo (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <returns>RestApiArrayResultVoucherSummary</returns>
+        RestApiArrayResultVoucherSummary GetVouchersByCustomerForApp (string appId, int? customerId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultVoucherSummary</returns>
+        ApiResponse<RestApiArrayResultVoucherSummary> GetVouchersByCustomerForAppWithHttpInfo (string appId, int? customerId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        void SetVoucherValidityPeriodsSimplified (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> SetVoucherValidityPeriodsSimplifiedWithHttpInfo (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request);
         /// <summary>
-        /// [PRIVATE API] Updates voucher
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="voucher">Updated details for the voucher</param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucher"></param>
         /// <param name="storeId"> (optional)</param>
-        /// <param name="percentValue">Percent voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="lumpValue">Lump voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="freeItemId">Free Item Id (can have 1 of 3) (optional)</param>
+        /// <param name="percentValue"> (optional)</param>
+        /// <param name="lumpValue"> (optional)</param>
+        /// <param name="maxDiscountAmount"> (optional)</param>
         /// <returns>RestApiResultVoucherWithStats</returns>
-        RestApiResultVoucherWithStats UpdateVoucher (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null);
+        RestApiResultVoucherWithStats UpdateVoucher (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null);
 
         /// <summary>
-        /// [PRIVATE API] Updates voucher
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="voucher">Updated details for the voucher</param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucher"></param>
         /// <param name="storeId"> (optional)</param>
-        /// <param name="percentValue">Percent voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="lumpValue">Lump voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="freeItemId">Free Item Id (can have 1 of 3) (optional)</param>
+        /// <param name="percentValue"> (optional)</param>
+        /// <param name="lumpValue"> (optional)</param>
+        /// <param name="maxDiscountAmount"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultVoucherWithStats</returns>
-        ApiResponse<RestApiResultVoucherWithStats> UpdateVoucherWithHttpInfo (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null);
+        ApiResponse<RestApiResultVoucherWithStats> UpdateVoucherWithHttpInfo (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucherUsage"></param>
+        /// <returns></returns>
+        void UpdateVoucherUsage (string appId, int? voucherId, UpdateVoucherUsage voucherUsage);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucherUsage"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        ApiResponse<Object> UpdateVoucherUsageWithHttpInfo (string appId, int? voucherId, UpdateVoucherUsage voucherUsage);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// [PRIVATE API] Create voucher
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="voucher">Voucher Details</param>
+        /// <param name="appId"></param>
+        /// <param name="voucher"></param>
         /// <returns>Task of RestApiResultVoucherWithStats</returns>
         System.Threading.Tasks.Task<RestApiResultVoucherWithStats> CreateVoucherAsync (string appId, CreateVoucher voucher);
 
         /// <summary>
-        /// [PRIVATE API] Create voucher
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="voucher">Voucher Details</param>
+        /// <param name="appId"></param>
+        /// <param name="voucher"></param>
         /// <returns>Task of ApiResponse (RestApiResultVoucherWithStats)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> CreateVoucherAsyncWithHttpInfo (string appId, CreateVoucher voucher);
         /// <summary>
-        /// [PRIVATE API] Get voucher by identifier
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="code"></param>
+        /// <returns>Task of RestApiResultVoucher</returns>
+        System.Threading.Tasks.Task<RestApiResultVoucher> GetVoucherByCodeAsync (string appId, string code);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="code"></param>
+        /// <returns>Task of ApiResponse (RestApiResultVoucher)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucher>> GetVoucherByCodeAsyncWithHttpInfo (string appId, string code);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
+        /// <param name="voucherId"></param>
         /// <returns>Task of RestApiResultVoucherWithStats</returns>
         System.Threading.Tasks.Task<RestApiResultVoucherWithStats> GetVoucherByIdAsync (int? voucherId);
 
         /// <summary>
-        /// [PRIVATE API] Get voucher by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
+        /// <param name="voucherId"></param>
         /// <returns>Task of ApiResponse (RestApiResultVoucherWithStats)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> GetVoucherByIdAsyncWithHttpInfo (int? voucherId);
         /// <summary>
-        /// [PRIVATE API] Get voucher stats by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week \\ month</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
+        /// <param name="voucherId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
         /// <returns>Task of RestApiArrayResultVoucherDataPoint</returns>
         System.Threading.Tasks.Task<RestApiArrayResultVoucherDataPoint> GetVoucherStatsByIdAsync (int? voucherId, string aggregateDataBy, int? dataPointLimit = null);
 
         /// <summary>
-        /// [PRIVATE API] Get voucher stats by identifier
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week \\ month</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
+        /// <param name="voucherId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiArrayResultVoucherDataPoint)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultVoucherDataPoint>> GetVoucherStatsByIdAsyncWithHttpInfo (int? voucherId, string aggregateDataBy, int? dataPointLimit = null);
         /// <summary>
-        /// [PRIVATE API] Get vouchers summaries for App Id
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task GetVoucherValidityPeriodsAsync (string appId, int? voucherId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> GetVoucherValidityPeriodsAsyncWithHttpInfo (string appId, int? voucherId);
+        /// <summary>
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="pageIndex">Page Number (optional)</param>
-        /// <param name="pageSize">Page Size (optional)</param>
-        /// <param name="searchCodes">Search by Voucher Code\\s (optional)</param>
-        /// <param name="statusSearch">Search by Status (optional)</param>
-        /// <param name="typeSearch">Search by Type (optional)</param>
-        /// <param name="subTypeSearch">Search by Sub Type (optional)</param>
-        /// <param name="storeIds">Search by Store Ids (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <param name="searchCodes"> (optional)</param>
+        /// <param name="statusSearch"> (optional)</param>
+        /// <param name="typeSearch"> (optional)</param>
+        /// <param name="subTypeSearch"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="channelRestrictions"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultVoucherSummary</returns>
-        System.Threading.Tasks.Task<RestApiPaginationResultVoucherSummary> GetVouchersAsync (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null);
+        System.Threading.Tasks.Task<RestApiPaginationResultVoucherSummary> GetVouchersAsync (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null);
 
         /// <summary>
-        /// [PRIVATE API] Get vouchers summaries for App Id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="pageIndex">Page Number (optional)</param>
-        /// <param name="pageSize">Page Size (optional)</param>
-        /// <param name="searchCodes">Search by Voucher Code\\s (optional)</param>
-        /// <param name="statusSearch">Search by Status (optional)</param>
-        /// <param name="typeSearch">Search by Type (optional)</param>
-        /// <param name="subTypeSearch">Search by Sub Type (optional)</param>
-        /// <param name="storeIds">Search by Store Ids (optional)</param>
+        /// <param name="appId"></param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <param name="searchCodes"> (optional)</param>
+        /// <param name="statusSearch"> (optional)</param>
+        /// <param name="typeSearch"> (optional)</param>
+        /// <param name="subTypeSearch"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="channelRestrictions"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultVoucherSummary)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultVoucherSummary>> GetVouchersAsyncWithHttpInfo (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultVoucherSummary>> GetVouchersAsyncWithHttpInfo (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <returns>Task of RestApiArrayResultVoucherSummary</returns>
+        System.Threading.Tasks.Task<RestApiArrayResultVoucherSummary> GetVouchersByCustomerForAppAsync (string appId, int? customerId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultVoucherSummary)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultVoucherSummary>> GetVouchersByCustomerForAppAsyncWithHttpInfo (string appId, int? customerId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task SetVoucherValidityPeriodsSimplifiedAsync (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> SetVoucherValidityPeriodsSimplifiedAsyncWithHttpInfo (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request);
         /// <summary>
-        /// [PRIVATE API] Updates voucher
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="voucher">Updated details for the voucher</param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucher"></param>
         /// <param name="storeId"> (optional)</param>
-        /// <param name="percentValue">Percent voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="lumpValue">Lump voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="freeItemId">Free Item Id (can have 1 of 3) (optional)</param>
+        /// <param name="percentValue"> (optional)</param>
+        /// <param name="lumpValue"> (optional)</param>
+        /// <param name="maxDiscountAmount"> (optional)</param>
         /// <returns>Task of RestApiResultVoucherWithStats</returns>
-        System.Threading.Tasks.Task<RestApiResultVoucherWithStats> UpdateVoucherAsync (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null);
+        System.Threading.Tasks.Task<RestApiResultVoucherWithStats> UpdateVoucherAsync (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null);
 
         /// <summary>
-        /// [PRIVATE API] Updates voucher
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="voucher">Updated details for the voucher</param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucher"></param>
         /// <param name="storeId"> (optional)</param>
-        /// <param name="percentValue">Percent voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="lumpValue">Lump voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="freeItemId">Free Item Id (can have 1 of 3) (optional)</param>
+        /// <param name="percentValue"> (optional)</param>
+        /// <param name="lumpValue"> (optional)</param>
+        /// <param name="maxDiscountAmount"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultVoucherWithStats)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> UpdateVoucherAsyncWithHttpInfo (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null);
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> UpdateVoucherAsyncWithHttpInfo (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucherUsage"></param>
+        /// <returns>Task of void</returns>
+        System.Threading.Tasks.Task UpdateVoucherUsageAsync (string appId, int? voucherId, UpdateVoucherUsage voucherUsage);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucherUsage"></param>
+        /// <returns>Task of ApiResponse</returns>
+        System.Threading.Tasks.Task<ApiResponse<Object>> UpdateVoucherUsageAsyncWithHttpInfo (string appId, int? voucherId, UpdateVoucherUsage voucherUsage);
         #endregion Asynchronous Operations
     }
 
@@ -397,11 +639,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// [PRIVATE API] Create voucher 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="voucher">Voucher Details</param>
+        /// <param name="appId"></param>
+        /// <param name="voucher"></param>
         /// <returns>RestApiResultVoucherWithStats</returns>
         public RestApiResultVoucherWithStats CreateVoucher (string appId, CreateVoucher voucher)
         {
@@ -410,11 +652,11 @@ public RestApiResultVoucherWithStats CreateVoucher (string appId, CreateVoucher
         }
 
         /// <summary>
-        /// [PRIVATE API] Create voucher 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="voucher">Voucher Details</param>
+        /// <param name="appId"></param>
+        /// <param name="voucher"></param>
         /// <returns>ApiResponse of RestApiResultVoucherWithStats</returns>
         public ApiResponse< RestApiResultVoucherWithStats > CreateVoucherWithHttpInfo (string appId, CreateVoucher voucher)
         {
@@ -425,7 +667,7 @@ public ApiResponse< RestApiResultVoucherWithStats > CreateVoucherWithHttpInfo (s
             if (voucher == null)
                 throw new ApiException(400, "Missing required parameter 'voucher' when calling VouchersApi->CreateVoucher");
 
-            var localVarPath = "/api/v1.0/vouchers/{appId}";
+            var localVarPath = "./api/v1.0/vouchers/{appId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -485,16 +727,16 @@ public ApiResponse< RestApiResultVoucherWithStats > CreateVoucherWithHttpInfo (s
             }
 
             return new ApiResponse<RestApiResultVoucherWithStats>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultVoucherWithStats) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucherWithStats)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Create voucher 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="voucher">Voucher Details</param>
+        /// <param name="appId"></param>
+        /// <param name="voucher"></param>
         /// <returns>Task of RestApiResultVoucherWithStats</returns>
         public async System.Threading.Tasks.Task<RestApiResultVoucherWithStats> CreateVoucherAsync (string appId, CreateVoucher voucher)
         {
@@ -504,11 +746,11 @@ public async System.Threading.Tasks.Task<RestApiResultVoucherWithStats> CreateVo
         }
 
         /// <summary>
-        /// [PRIVATE API] Create voucher 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">App Name Id</param>
-        /// <param name="voucher">Voucher Details</param>
+        /// <param name="appId"></param>
+        /// <param name="voucher"></param>
         /// <returns>Task of ApiResponse (RestApiResultVoucherWithStats)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> CreateVoucherAsyncWithHttpInfo (string appId, CreateVoucher voucher)
         {
@@ -519,7 +761,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithSta
             if (voucher == null)
                 throw new ApiException(400, "Missing required parameter 'voucher' when calling VouchersApi->CreateVoucher");
 
-            var localVarPath = "/api/v1.0/vouchers/{appId}";
+            var localVarPath = "./api/v1.0/vouchers/{appId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -579,35 +821,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithSta
             }
 
             return new ApiResponse<RestApiResultVoucherWithStats>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultVoucherWithStats) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucherWithStats)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get voucher by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <returns>RestApiResultVoucherWithStats</returns>
-        public RestApiResultVoucherWithStats GetVoucherById (int? voucherId)
+        /// <param name="appId"></param>
+        /// <param name="code"></param>
+        /// <returns>RestApiResultVoucher</returns>
+        public RestApiResultVoucher GetVoucherByCode (string appId, string code)
         {
-             ApiResponse<RestApiResultVoucherWithStats> localVarResponse = GetVoucherByIdWithHttpInfo(voucherId);
+             ApiResponse<RestApiResultVoucher> localVarResponse = GetVoucherByCodeWithHttpInfo(appId, code);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API] Get voucher by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <returns>ApiResponse of RestApiResultVoucherWithStats</returns>
-        public ApiResponse< RestApiResultVoucherWithStats > GetVoucherByIdWithHttpInfo (int? voucherId)
+        /// <param name="appId"></param>
+        /// <param name="code"></param>
+        /// <returns>ApiResponse of RestApiResultVoucher</returns>
+        public ApiResponse< RestApiResultVoucher > GetVoucherByCodeWithHttpInfo (string appId, string code)
         {
-            // verify the required parameter 'voucherId' is set
-            if (voucherId == null)
-                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherById");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVoucherByCode");
+            // verify the required parameter 'code' is set
+            if (code == null)
+                throw new ApiException(400, "Missing required parameter 'code' when calling VouchersApi->GetVoucherByCode");
 
-            var localVarPath = "/api/v1.0/vouchers/{voucherId}";
+            var localVarPath = "./api/v1.0/{appId}/vouchers/code/{code}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -631,7 +878,8 @@ public ApiResponse< RestApiResultVoucherWithStats > GetVoucherByIdWithHttpInfo (
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (code != null) localVarPathParams.Add("code", this.Configuration.ApiClient.ParameterToString(code)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -649,41 +897,46 @@ public ApiResponse< RestApiResultVoucherWithStats > GetVoucherByIdWithHttpInfo (
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetVoucherById", localVarResponse);
+                Exception exception = ExceptionFactory("GetVoucherByCode", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultVoucherWithStats>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultVoucherWithStats) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucherWithStats)));
+            return new ApiResponse<RestApiResultVoucher>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultVoucher) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucher)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get voucher by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <returns>Task of RestApiResultVoucherWithStats</returns>
-        public async System.Threading.Tasks.Task<RestApiResultVoucherWithStats> GetVoucherByIdAsync (int? voucherId)
+        /// <param name="appId"></param>
+        /// <param name="code"></param>
+        /// <returns>Task of RestApiResultVoucher</returns>
+        public async System.Threading.Tasks.Task<RestApiResultVoucher> GetVoucherByCodeAsync (string appId, string code)
         {
-             ApiResponse<RestApiResultVoucherWithStats> localVarResponse = await GetVoucherByIdAsyncWithHttpInfo(voucherId);
+             ApiResponse<RestApiResultVoucher> localVarResponse = await GetVoucherByCodeAsyncWithHttpInfo(appId, code);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Get voucher by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <returns>Task of ApiResponse (RestApiResultVoucherWithStats)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> GetVoucherByIdAsyncWithHttpInfo (int? voucherId)
+        /// <param name="appId"></param>
+        /// <param name="code"></param>
+        /// <returns>Task of ApiResponse (RestApiResultVoucher)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucher>> GetVoucherByCodeAsyncWithHttpInfo (string appId, string code)
         {
-            // verify the required parameter 'voucherId' is set
-            if (voucherId == null)
-                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherById");
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVoucherByCode");
+            // verify the required parameter 'code' is set
+            if (code == null)
+                throw new ApiException(400, "Missing required parameter 'code' when calling VouchersApi->GetVoucherByCode");
 
-            var localVarPath = "/api/v1.0/vouchers/{voucherId}";
+            var localVarPath = "./api/v1.0/{appId}/vouchers/code/{code}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -707,7 +960,8 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithSta
             if (localVarHttpHeaderAccept != null)
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
-            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (code != null) localVarPathParams.Add("code", this.Configuration.ApiClient.ParameterToString(code)); // path parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -725,47 +979,40 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithSta
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetVoucherById", localVarResponse);
+                Exception exception = ExceptionFactory("GetVoucherByCode", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiResultVoucherWithStats>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiResultVoucherWithStats) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucherWithStats)));
+            return new ApiResponse<RestApiResultVoucher>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultVoucher) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucher)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get voucher stats by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week \\ month</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <returns>RestApiArrayResultVoucherDataPoint</returns>
-        public RestApiArrayResultVoucherDataPoint GetVoucherStatsById (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
+        /// <param name="voucherId"></param>
+        /// <returns>RestApiResultVoucherWithStats</returns>
+        public RestApiResultVoucherWithStats GetVoucherById (int? voucherId)
         {
-             ApiResponse<RestApiArrayResultVoucherDataPoint> localVarResponse = GetVoucherStatsByIdWithHttpInfo(voucherId, aggregateDataBy, dataPointLimit);
+             ApiResponse<RestApiResultVoucherWithStats> localVarResponse = GetVoucherByIdWithHttpInfo(voucherId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API] Get voucher stats by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week \\ month</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <returns>ApiResponse of RestApiArrayResultVoucherDataPoint</returns>
-        public ApiResponse< RestApiArrayResultVoucherDataPoint > GetVoucherStatsByIdWithHttpInfo (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
+        /// <param name="voucherId"></param>
+        /// <returns>ApiResponse of RestApiResultVoucherWithStats</returns>
+        public ApiResponse< RestApiResultVoucherWithStats > GetVoucherByIdWithHttpInfo (int? voucherId)
         {
             // verify the required parameter 'voucherId' is set
             if (voucherId == null)
-                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherStatsById");
-            // verify the required parameter 'aggregateDataBy' is set
-            if (aggregateDataBy == null)
-                throw new ApiException(400, "Missing required parameter 'aggregateDataBy' when calling VouchersApi->GetVoucherStatsById");
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherById");
 
-            var localVarPath = "/api/v1.0/vouchers/stats/{voucherId}";
+            var localVarPath = "./api/v1.0/vouchers/{voucherId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -790,8 +1037,6 @@ public ApiResponse< RestApiArrayResultVoucherDataPoint > GetVoucherStatsByIdWith
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
-            if (aggregateDataBy != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "aggregateDataBy", aggregateDataBy)); // query parameter
-            if (dataPointLimit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dataPointLimit", dataPointLimit)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -809,48 +1054,41 @@ public ApiResponse< RestApiArrayResultVoucherDataPoint > GetVoucherStatsByIdWith
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetVoucherStatsById", localVarResponse);
+                Exception exception = ExceptionFactory("GetVoucherById", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultVoucherDataPoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultVoucherDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultVoucherDataPoint)));
+            return new ApiResponse<RestApiResultVoucherWithStats>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultVoucherWithStats) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucherWithStats)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get voucher stats by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week \\ month</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <returns>Task of RestApiArrayResultVoucherDataPoint</returns>
-        public async System.Threading.Tasks.Task<RestApiArrayResultVoucherDataPoint> GetVoucherStatsByIdAsync (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
+        /// <param name="voucherId"></param>
+        /// <returns>Task of RestApiResultVoucherWithStats</returns>
+        public async System.Threading.Tasks.Task<RestApiResultVoucherWithStats> GetVoucherByIdAsync (int? voucherId)
         {
-             ApiResponse<RestApiArrayResultVoucherDataPoint> localVarResponse = await GetVoucherStatsByIdAsyncWithHttpInfo(voucherId, aggregateDataBy, dataPointLimit);
+             ApiResponse<RestApiResultVoucherWithStats> localVarResponse = await GetVoucherByIdAsyncWithHttpInfo(voucherId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Get voucher stats by identifier 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="aggregateDataBy">Aggregate data by day \\ week \\ month</param>
-        /// <param name="dataPointLimit">Amount of data points per request (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiArrayResultVoucherDataPoint)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultVoucherDataPoint>> GetVoucherStatsByIdAsyncWithHttpInfo (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
+        /// <param name="voucherId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultVoucherWithStats)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> GetVoucherByIdAsyncWithHttpInfo (int? voucherId)
         {
             // verify the required parameter 'voucherId' is set
             if (voucherId == null)
-                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherStatsById");
-            // verify the required parameter 'aggregateDataBy' is set
-            if (aggregateDataBy == null)
-                throw new ApiException(400, "Missing required parameter 'aggregateDataBy' when calling VouchersApi->GetVoucherStatsById");
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherById");
 
-            var localVarPath = "/api/v1.0/vouchers/stats/{voucherId}";
+            var localVarPath = "./api/v1.0/vouchers/{voucherId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -875,8 +1113,6 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultVoucherDa
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
-            if (aggregateDataBy != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "aggregateDataBy", aggregateDataBy)); // query parameter
-            if (dataPointLimit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dataPointLimit", dataPointLimit)); // query parameter
 
             // authentication (oauth2) required
             // oauth required
@@ -894,54 +1130,741 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultVoucherDa
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetVoucherStatsById", localVarResponse);
+                Exception exception = ExceptionFactory("GetVoucherById", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiArrayResultVoucherDataPoint>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiArrayResultVoucherDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultVoucherDataPoint)));
+            return new ApiResponse<RestApiResultVoucherWithStats>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultVoucherWithStats) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucherWithStats)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Get vouchers summaries for App Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="pageIndex">Page Number (optional)</param>
-        /// <param name="pageSize">Page Size (optional)</param>
-        /// <param name="searchCodes">Search by Voucher Code\\s (optional)</param>
-        /// <param name="statusSearch">Search by Status (optional)</param>
-        /// <param name="typeSearch">Search by Type (optional)</param>
-        /// <param name="subTypeSearch">Search by Sub Type (optional)</param>
-        /// <param name="storeIds">Search by Store Ids (optional)</param>
-        /// <returns>RestApiPaginationResultVoucherSummary</returns>
-        public RestApiPaginationResultVoucherSummary GetVouchers (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null)
+        /// <param name="voucherId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <returns>RestApiArrayResultVoucherDataPoint</returns>
+        public RestApiArrayResultVoucherDataPoint GetVoucherStatsById (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
         {
-             ApiResponse<RestApiPaginationResultVoucherSummary> localVarResponse = GetVouchersWithHttpInfo(appId, pageIndex, pageSize, searchCodes, statusSearch, typeSearch, subTypeSearch, storeIds);
+             ApiResponse<RestApiArrayResultVoucherDataPoint> localVarResponse = GetVoucherStatsByIdWithHttpInfo(voucherId, aggregateDataBy, dataPointLimit);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API] Get vouchers summaries for App Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="pageIndex">Page Number (optional)</param>
-        /// <param name="pageSize">Page Size (optional)</param>
-        /// <param name="searchCodes">Search by Voucher Code\\s (optional)</param>
-        /// <param name="statusSearch">Search by Status (optional)</param>
-        /// <param name="typeSearch">Search by Type (optional)</param>
-        /// <param name="subTypeSearch">Search by Sub Type (optional)</param>
-        /// <param name="storeIds">Search by Store Ids (optional)</param>
-        /// <returns>ApiResponse of RestApiPaginationResultVoucherSummary</returns>
-        public ApiResponse< RestApiPaginationResultVoucherSummary > GetVouchersWithHttpInfo (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null)
+        /// <param name="voucherId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <returns>ApiResponse of RestApiArrayResultVoucherDataPoint</returns>
+        public ApiResponse< RestApiArrayResultVoucherDataPoint > GetVoucherStatsByIdWithHttpInfo (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
+        {
+            // verify the required parameter 'voucherId' is set
+            if (voucherId == null)
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherStatsById");
+            // verify the required parameter 'aggregateDataBy' is set
+            if (aggregateDataBy == null)
+                throw new ApiException(400, "Missing required parameter 'aggregateDataBy' when calling VouchersApi->GetVoucherStatsById");
+
+            var localVarPath = "./api/v1.0/vouchers/stats/{voucherId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+            if (aggregateDataBy != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "aggregateDataBy", aggregateDataBy)); // query parameter
+            if (dataPointLimit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dataPointLimit", dataPointLimit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetVoucherStatsById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultVoucherDataPoint>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultVoucherDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultVoucherDataPoint)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="voucherId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <returns>Task of RestApiArrayResultVoucherDataPoint</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultVoucherDataPoint> GetVoucherStatsByIdAsync (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
+        {
+             ApiResponse<RestApiArrayResultVoucherDataPoint> localVarResponse = await GetVoucherStatsByIdAsyncWithHttpInfo(voucherId, aggregateDataBy, dataPointLimit);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="voucherId"></param>
+        /// <param name="aggregateDataBy"></param>
+        /// <param name="dataPointLimit"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultVoucherDataPoint)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultVoucherDataPoint>> GetVoucherStatsByIdAsyncWithHttpInfo (int? voucherId, string aggregateDataBy, int? dataPointLimit = null)
+        {
+            // verify the required parameter 'voucherId' is set
+            if (voucherId == null)
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherStatsById");
+            // verify the required parameter 'aggregateDataBy' is set
+            if (aggregateDataBy == null)
+                throw new ApiException(400, "Missing required parameter 'aggregateDataBy' when calling VouchersApi->GetVoucherStatsById");
+
+            var localVarPath = "./api/v1.0/vouchers/stats/{voucherId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+            if (aggregateDataBy != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "aggregateDataBy", aggregateDataBy)); // query parameter
+            if (dataPointLimit != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "dataPointLimit", dataPointLimit)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetVoucherStatsById", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultVoucherDataPoint>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultVoucherDataPoint) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultVoucherDataPoint)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns></returns>
+        public void GetVoucherValidityPeriods (string appId, int? voucherId)
+        {
+             GetVoucherValidityPeriodsWithHttpInfo(appId, voucherId);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> GetVoucherValidityPeriodsWithHttpInfo (string appId, int? voucherId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVoucherValidityPeriods");
+            // verify the required parameter 'voucherId' is set
+            if (voucherId == null)
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherValidityPeriods");
+
+            var localVarPath = "./api/v1.0/{appId}/vouchers/{voucherId}/validity-periods";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetVoucherValidityPeriods", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task GetVoucherValidityPeriodsAsync (string appId, int? voucherId)
+        {
+             await GetVoucherValidityPeriodsAsyncWithHttpInfo(appId, voucherId);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> GetVoucherValidityPeriodsAsyncWithHttpInfo (string appId, int? voucherId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVoucherValidityPeriods");
+            // verify the required parameter 'voucherId' is set
+            if (voucherId == null)
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->GetVoucherValidityPeriods");
+
+            var localVarPath = "./api/v1.0/{appId}/vouchers/{voucherId}/validity-periods";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetVoucherValidityPeriods", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <param name="searchCodes"> (optional)</param>
+        /// <param name="statusSearch"> (optional)</param>
+        /// <param name="typeSearch"> (optional)</param>
+        /// <param name="subTypeSearch"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="channelRestrictions"> (optional)</param>
+        /// <returns>RestApiPaginationResultVoucherSummary</returns>
+        public RestApiPaginationResultVoucherSummary GetVouchers (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null)
+        {
+             ApiResponse<RestApiPaginationResultVoucherSummary> localVarResponse = GetVouchersWithHttpInfo(appId, pageIndex, pageSize, searchCodes, statusSearch, typeSearch, subTypeSearch, storeIds, channelRestrictions);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <param name="searchCodes"> (optional)</param>
+        /// <param name="statusSearch"> (optional)</param>
+        /// <param name="typeSearch"> (optional)</param>
+        /// <param name="subTypeSearch"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="channelRestrictions"> (optional)</param>
+        /// <returns>ApiResponse of RestApiPaginationResultVoucherSummary</returns>
+        public ApiResponse< RestApiPaginationResultVoucherSummary > GetVouchersWithHttpInfo (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVouchers");
+
+            var localVarPath = "./api/v1.0/{appId}/vouchers/summaries";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (pageIndex != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageIndex", pageIndex)); // query parameter
+            if (pageSize != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageSize", pageSize)); // query parameter
+            if (searchCodes != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "searchCodes", searchCodes)); // query parameter
+            if (statusSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "statusSearch", statusSearch)); // query parameter
+            if (typeSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "typeSearch", typeSearch)); // query parameter
+            if (subTypeSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "subTypeSearch", subTypeSearch)); // query parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+            if (channelRestrictions != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "channelRestrictions", channelRestrictions)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetVouchers", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultVoucherSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultVoucherSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultVoucherSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <param name="searchCodes"> (optional)</param>
+        /// <param name="statusSearch"> (optional)</param>
+        /// <param name="typeSearch"> (optional)</param>
+        /// <param name="subTypeSearch"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="channelRestrictions"> (optional)</param>
+        /// <returns>Task of RestApiPaginationResultVoucherSummary</returns>
+        public async System.Threading.Tasks.Task<RestApiPaginationResultVoucherSummary> GetVouchersAsync (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null)
+        {
+             ApiResponse<RestApiPaginationResultVoucherSummary> localVarResponse = await GetVouchersAsyncWithHttpInfo(appId, pageIndex, pageSize, searchCodes, statusSearch, typeSearch, subTypeSearch, storeIds, channelRestrictions);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="pageIndex"> (optional)</param>
+        /// <param name="pageSize"> (optional)</param>
+        /// <param name="searchCodes"> (optional)</param>
+        /// <param name="statusSearch"> (optional)</param>
+        /// <param name="typeSearch"> (optional)</param>
+        /// <param name="subTypeSearch"> (optional)</param>
+        /// <param name="storeIds"> (optional)</param>
+        /// <param name="channelRestrictions"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiPaginationResultVoucherSummary)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultVoucherSummary>> GetVouchersAsyncWithHttpInfo (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null, List<string> channelRestrictions = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVouchers");
+
+            var localVarPath = "./api/v1.0/{appId}/vouchers/summaries";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (pageIndex != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageIndex", pageIndex)); // query parameter
+            if (pageSize != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageSize", pageSize)); // query parameter
+            if (searchCodes != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "searchCodes", searchCodes)); // query parameter
+            if (statusSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "statusSearch", statusSearch)); // query parameter
+            if (typeSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "typeSearch", typeSearch)); // query parameter
+            if (subTypeSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "subTypeSearch", subTypeSearch)); // query parameter
+            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+            if (channelRestrictions != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "channelRestrictions", channelRestrictions)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetVouchers", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiPaginationResultVoucherSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiPaginationResultVoucherSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultVoucherSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <returns>RestApiArrayResultVoucherSummary</returns>
+        public RestApiArrayResultVoucherSummary GetVouchersByCustomerForApp (string appId, int? customerId)
+        {
+             ApiResponse<RestApiArrayResultVoucherSummary> localVarResponse = GetVouchersByCustomerForAppWithHttpInfo(appId, customerId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <returns>ApiResponse of RestApiArrayResultVoucherSummary</returns>
+        public ApiResponse< RestApiArrayResultVoucherSummary > GetVouchersByCustomerForAppWithHttpInfo (string appId, int? customerId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVouchersByCustomerForApp");
+            // verify the required parameter 'customerId' is set
+            if (customerId == null)
+                throw new ApiException(400, "Missing required parameter 'customerId' when calling VouchersApi->GetVouchersByCustomerForApp");
+
+            var localVarPath = "./api/v1.0/vouchers/{appId}/customer/{customerId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (customerId != null) localVarPathParams.Add("customerId", this.Configuration.ApiClient.ParameterToString(customerId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetVouchersByCustomerForApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultVoucherSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultVoucherSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultVoucherSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <returns>Task of RestApiArrayResultVoucherSummary</returns>
+        public async System.Threading.Tasks.Task<RestApiArrayResultVoucherSummary> GetVouchersByCustomerForAppAsync (string appId, int? customerId)
+        {
+             ApiResponse<RestApiArrayResultVoucherSummary> localVarResponse = await GetVouchersByCustomerForAppAsyncWithHttpInfo(appId, customerId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="customerId"></param>
+        /// <returns>Task of ApiResponse (RestApiArrayResultVoucherSummary)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiArrayResultVoucherSummary>> GetVouchersByCustomerForAppAsyncWithHttpInfo (string appId, int? customerId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVouchersByCustomerForApp");
+            // verify the required parameter 'customerId' is set
+            if (customerId == null)
+                throw new ApiException(400, "Missing required parameter 'customerId' when calling VouchersApi->GetVouchersByCustomerForApp");
+
+            var localVarPath = "./api/v1.0/vouchers/{appId}/customer/{customerId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (customerId != null) localVarPathParams.Add("customerId", this.Configuration.ApiClient.ParameterToString(customerId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetVouchersByCustomerForApp", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiArrayResultVoucherSummary>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiArrayResultVoucherSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiArrayResultVoucherSummary)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public void SetVoucherValidityPeriodsSimplified (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request)
+        {
+             SetVoucherValidityPeriodsSimplifiedWithHttpInfo(appId, voucherId, request);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="request"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> SetVoucherValidityPeriodsSimplifiedWithHttpInfo (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVouchers");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->SetVoucherValidityPeriodsSimplified");
+            // verify the required parameter 'voucherId' is set
+            if (voucherId == null)
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->SetVoucherValidityPeriodsSimplified");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling VouchersApi->SetVoucherValidityPeriodsSimplified");
 
-            var localVarPath = "/api/v1.0/{appId}/vouchers/summaries";
+            var localVarPath = "./api/v1.0/{appId}/vouchers/{voucherId}/validity-periods-simplified";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -951,6 +1874,11 @@ public ApiResponse< RestApiPaginationResultVoucherSummary > GetVouchersWithHttpI
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -966,13 +1894,15 @@ public ApiResponse< RestApiPaginationResultVoucherSummary > GetVouchersWithHttpI
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (pageIndex != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageIndex", pageIndex)); // query parameter
-            if (pageSize != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageSize", pageSize)); // query parameter
-            if (searchCodes != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "searchCodes", searchCodes)); // query parameter
-            if (statusSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "statusSearch", statusSearch)); // query parameter
-            if (typeSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "typeSearch", typeSearch)); // query parameter
-            if (subTypeSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "subTypeSearch", subTypeSearch)); // query parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -983,62 +1913,57 @@ public ApiResponse< RestApiPaginationResultVoucherSummary > GetVouchersWithHttpI
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetVouchers", localVarResponse);
+                Exception exception = ExceptionFactory("SetVoucherValidityPeriodsSimplified", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultVoucherSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultVoucherSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultVoucherSummary)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// [PRIVATE API] Get vouchers summaries for App Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="pageIndex">Page Number (optional)</param>
-        /// <param name="pageSize">Page Size (optional)</param>
-        /// <param name="searchCodes">Search by Voucher Code\\s (optional)</param>
-        /// <param name="statusSearch">Search by Status (optional)</param>
-        /// <param name="typeSearch">Search by Type (optional)</param>
-        /// <param name="subTypeSearch">Search by Sub Type (optional)</param>
-        /// <param name="storeIds">Search by Store Ids (optional)</param>
-        /// <returns>Task of RestApiPaginationResultVoucherSummary</returns>
-        public async System.Threading.Tasks.Task<RestApiPaginationResultVoucherSummary> GetVouchersAsync (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null)
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task SetVoucherValidityPeriodsSimplifiedAsync (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request)
         {
-             ApiResponse<RestApiPaginationResultVoucherSummary> localVarResponse = await GetVouchersAsyncWithHttpInfo(appId, pageIndex, pageSize, searchCodes, statusSearch, typeSearch, subTypeSearch, storeIds);
-             return localVarResponse.Data;
+             await SetVoucherValidityPeriodsSimplifiedAsyncWithHttpInfo(appId, voucherId, request);
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Get vouchers summaries for App Id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application Id</param>
-        /// <param name="pageIndex">Page Number (optional)</param>
-        /// <param name="pageSize">Page Size (optional)</param>
-        /// <param name="searchCodes">Search by Voucher Code\\s (optional)</param>
-        /// <param name="statusSearch">Search by Status (optional)</param>
-        /// <param name="typeSearch">Search by Type (optional)</param>
-        /// <param name="subTypeSearch">Search by Sub Type (optional)</param>
-        /// <param name="storeIds">Search by Store Ids (optional)</param>
-        /// <returns>Task of ApiResponse (RestApiPaginationResultVoucherSummary)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultVoucherSummary>> GetVouchersAsyncWithHttpInfo (string appId, int? pageIndex = null, int? pageSize = null, List<string> searchCodes = null, List<string> statusSearch = null, List<string> typeSearch = null, List<string> subTypeSearch = null, List<int?> storeIds = null)
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="request"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> SetVoucherValidityPeriodsSimplifiedAsyncWithHttpInfo (string appId, int? voucherId, SetVoucherValidityPeriodsSimplifiedRequest request)
         {
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->GetVouchers");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->SetVoucherValidityPeriodsSimplified");
+            // verify the required parameter 'voucherId' is set
+            if (voucherId == null)
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->SetVoucherValidityPeriodsSimplified");
+            // verify the required parameter 'request' is set
+            if (request == null)
+                throw new ApiException(400, "Missing required parameter 'request' when calling VouchersApi->SetVoucherValidityPeriodsSimplified");
 
-            var localVarPath = "/api/v1.0/{appId}/vouchers/summaries";
+            var localVarPath = "./api/v1.0/{appId}/vouchers/{voucherId}/validity-periods-simplified";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1048,6 +1973,11 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultVouc
 
             // to determine the Content-Type header
             String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
             };
             String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
 
@@ -1063,13 +1993,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultVouc
                 localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
 
             if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
-            if (pageIndex != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageIndex", pageIndex)); // query parameter
-            if (pageSize != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "pageSize", pageSize)); // query parameter
-            if (searchCodes != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "searchCodes", searchCodes)); // query parameter
-            if (statusSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "statusSearch", statusSearch)); // query parameter
-            if (typeSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "typeSearch", typeSearch)); // query parameter
-            if (subTypeSearch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "subTypeSearch", subTypeSearch)); // query parameter
-            if (storeIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeIds", storeIds)); // query parameter
+            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+            if (request != null && request.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(request); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = request; // byte array
+            }
 
             // authentication (oauth2) required
             // oauth required
@@ -1080,51 +2012,51 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultVouc
 
             // make the HTTP request
             IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
-                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
                 localVarPathParams, localVarHttpContentType);
 
             int localVarStatusCode = (int) localVarResponse.StatusCode;
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("GetVouchers", localVarResponse);
+                Exception exception = ExceptionFactory("SetVoucherValidityPeriodsSimplified", localVarResponse);
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<RestApiPaginationResultVoucherSummary>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (RestApiPaginationResultVoucherSummary) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultVoucherSummary)));
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
         }
 
         /// <summary>
-        /// [PRIVATE API] Updates voucher 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="voucher">Updated details for the voucher</param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucher"></param>
         /// <param name="storeId"> (optional)</param>
-        /// <param name="percentValue">Percent voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="lumpValue">Lump voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="freeItemId">Free Item Id (can have 1 of 3) (optional)</param>
+        /// <param name="percentValue"> (optional)</param>
+        /// <param name="lumpValue"> (optional)</param>
+        /// <param name="maxDiscountAmount"> (optional)</param>
         /// <returns>RestApiResultVoucherWithStats</returns>
-        public RestApiResultVoucherWithStats UpdateVoucher (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null)
+        public RestApiResultVoucherWithStats UpdateVoucher (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null)
         {
-             ApiResponse<RestApiResultVoucherWithStats> localVarResponse = UpdateVoucherWithHttpInfo(voucherId, voucher, storeId, percentValue, lumpValue, freeItemId);
+             ApiResponse<RestApiResultVoucherWithStats> localVarResponse = UpdateVoucherWithHttpInfo(voucherId, voucher, storeId, percentValue, lumpValue, maxDiscountAmount);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// [PRIVATE API] Updates voucher 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="voucher">Updated details for the voucher</param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucher"></param>
         /// <param name="storeId"> (optional)</param>
-        /// <param name="percentValue">Percent voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="lumpValue">Lump voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="freeItemId">Free Item Id (can have 1 of 3) (optional)</param>
+        /// <param name="percentValue"> (optional)</param>
+        /// <param name="lumpValue"> (optional)</param>
+        /// <param name="maxDiscountAmount"> (optional)</param>
         /// <returns>ApiResponse of RestApiResultVoucherWithStats</returns>
-        public ApiResponse< RestApiResultVoucherWithStats > UpdateVoucherWithHttpInfo (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null)
+        public ApiResponse< RestApiResultVoucherWithStats > UpdateVoucherWithHttpInfo (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null)
         {
             // verify the required parameter 'voucherId' is set
             if (voucherId == null)
@@ -1133,7 +2065,7 @@ public ApiResponse< RestApiResultVoucherWithStats > UpdateVoucherWithHttpInfo (i
             if (voucher == null)
                 throw new ApiException(400, "Missing required parameter 'voucher' when calling VouchersApi->UpdateVoucher");
 
-            var localVarPath = "/api/v1.0/vouchers/{voucherId}";
+            var localVarPath = "./api/v1.0/vouchers/{voucherId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1166,7 +2098,7 @@ public ApiResponse< RestApiResultVoucherWithStats > UpdateVoucherWithHttpInfo (i
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
             if (percentValue != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "percentValue", percentValue)); // query parameter
             if (lumpValue != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "lumpValue", lumpValue)); // query parameter
-            if (freeItemId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "freeItemId", freeItemId)); // query parameter
+            if (maxDiscountAmount != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "maxDiscountAmount", maxDiscountAmount)); // query parameter
             if (voucher != null && voucher.GetType() != typeof(byte[]))
             {
                 localVarPostBody = this.Configuration.ApiClient.Serialize(voucher); // http body (model) parameter
@@ -1197,40 +2129,40 @@ public ApiResponse< RestApiResultVoucherWithStats > UpdateVoucherWithHttpInfo (i
             }
 
             return new ApiResponse<RestApiResultVoucherWithStats>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultVoucherWithStats) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucherWithStats)));
         }
 
         /// <summary>
-        /// [PRIVATE API] Updates voucher 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="voucher">Updated details for the voucher</param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucher"></param>
         /// <param name="storeId"> (optional)</param>
-        /// <param name="percentValue">Percent voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="lumpValue">Lump voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="freeItemId">Free Item Id (can have 1 of 3) (optional)</param>
+        /// <param name="percentValue"> (optional)</param>
+        /// <param name="lumpValue"> (optional)</param>
+        /// <param name="maxDiscountAmount"> (optional)</param>
         /// <returns>Task of RestApiResultVoucherWithStats</returns>
-        public async System.Threading.Tasks.Task<RestApiResultVoucherWithStats> UpdateVoucherAsync (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null)
+        public async System.Threading.Tasks.Task<RestApiResultVoucherWithStats> UpdateVoucherAsync (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null)
         {
-             ApiResponse<RestApiResultVoucherWithStats> localVarResponse = await UpdateVoucherAsyncWithHttpInfo(voucherId, voucher, storeId, percentValue, lumpValue, freeItemId);
+             ApiResponse<RestApiResultVoucherWithStats> localVarResponse = await UpdateVoucherAsyncWithHttpInfo(voucherId, voucher, storeId, percentValue, lumpValue, maxDiscountAmount);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// [PRIVATE API] Updates voucher 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="voucherId">Id of the voucher</param>
-        /// <param name="voucher">Updated details for the voucher</param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucher"></param>
         /// <param name="storeId"> (optional)</param>
-        /// <param name="percentValue">Percent voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="lumpValue">Lump voucher value (can have 1 of 3) (optional)</param>
-        /// <param name="freeItemId">Free Item Id (can have 1 of 3) (optional)</param>
+        /// <param name="percentValue"> (optional)</param>
+        /// <param name="lumpValue"> (optional)</param>
+        /// <param name="maxDiscountAmount"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiResultVoucherWithStats)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> UpdateVoucherAsyncWithHttpInfo (int? voucherId, VoucherBase voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, int? freeItemId = null)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithStats>> UpdateVoucherAsyncWithHttpInfo (int? voucherId, UpdateVoucher voucher, List<int?> storeId = null, int? percentValue = null, double? lumpValue = null, double? maxDiscountAmount = null)
         {
             // verify the required parameter 'voucherId' is set
             if (voucherId == null)
@@ -1239,7 +2171,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithSta
             if (voucher == null)
                 throw new ApiException(400, "Missing required parameter 'voucher' when calling VouchersApi->UpdateVoucher");
 
-            var localVarPath = "/api/v1.0/vouchers/{voucherId}";
+            var localVarPath = "./api/v1.0/vouchers/{voucherId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1272,7 +2204,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithSta
             if (storeId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "storeId", storeId)); // query parameter
             if (percentValue != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "percentValue", percentValue)); // query parameter
             if (lumpValue != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "lumpValue", lumpValue)); // query parameter
-            if (freeItemId != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "freeItemId", freeItemId)); // query parameter
+            if (maxDiscountAmount != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "maxDiscountAmount", maxDiscountAmount)); // query parameter
             if (voucher != null && voucher.GetType() != typeof(byte[]))
             {
                 localVarPostBody = this.Configuration.ApiClient.Serialize(voucher); // http body (model) parameter
@@ -1303,9 +2235,206 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultVoucherWithSta
             }
 
             return new ApiResponse<RestApiResultVoucherWithStats>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultVoucherWithStats) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultVoucherWithStats)));
         }
 
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucherUsage"></param>
+        /// <returns></returns>
+        public void UpdateVoucherUsage (string appId, int? voucherId, UpdateVoucherUsage voucherUsage)
+        {
+             UpdateVoucherUsageWithHttpInfo(appId, voucherId, voucherUsage);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucherUsage"></param>
+        /// <returns>ApiResponse of Object(void)</returns>
+        public ApiResponse<Object> UpdateVoucherUsageWithHttpInfo (string appId, int? voucherId, UpdateVoucherUsage voucherUsage)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->UpdateVoucherUsage");
+            // verify the required parameter 'voucherId' is set
+            if (voucherId == null)
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->UpdateVoucherUsage");
+            // verify the required parameter 'voucherUsage' is set
+            if (voucherUsage == null)
+                throw new ApiException(400, "Missing required parameter 'voucherUsage' when calling VouchersApi->UpdateVoucherUsage");
+
+            var localVarPath = "./api/v1.0/{appId}/vouchers/{voucherId}/usage";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+            if (voucherUsage != null && voucherUsage.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(voucherUsage); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = voucherUsage; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateVoucherUsage", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucherUsage"></param>
+        /// <returns>Task of void</returns>
+        public async System.Threading.Tasks.Task UpdateVoucherUsageAsync (string appId, int? voucherId, UpdateVoucherUsage voucherUsage)
+        {
+             await UpdateVoucherUsageAsyncWithHttpInfo(appId, voucherId, voucherUsage);
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="voucherId"></param>
+        /// <param name="voucherUsage"></param>
+        /// <returns>Task of ApiResponse</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateVoucherUsageAsyncWithHttpInfo (string appId, int? voucherId, UpdateVoucherUsage voucherUsage)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling VouchersApi->UpdateVoucherUsage");
+            // verify the required parameter 'voucherId' is set
+            if (voucherId == null)
+                throw new ApiException(400, "Missing required parameter 'voucherId' when calling VouchersApi->UpdateVoucherUsage");
+            // verify the required parameter 'voucherUsage' is set
+            if (voucherUsage == null)
+                throw new ApiException(400, "Missing required parameter 'voucherUsage' when calling VouchersApi->UpdateVoucherUsage");
+
+            var localVarPath = "./api/v1.0/{appId}/vouchers/{voucherId}/usage";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (voucherId != null) localVarPathParams.Add("voucherId", this.Configuration.ApiClient.ParameterToString(voucherId)); // path parameter
+            if (voucherUsage != null && voucherUsage.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(voucherUsage); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = voucherUsage; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateVoucherUsage", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<Object>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                null);
+        }
+
     }
 }
diff --git a/src/Flipdish/Api/WebhooksApi.cs b/src/Flipdish/Api/WebhooksApi.cs
index 47e5e92d..22086e08 100644
--- a/src/Flipdish/Api/WebhooksApi.cs
+++ b/src/Flipdish/Api/WebhooksApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,111 +25,111 @@ public interface IWebhooksApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Create a webhook subscription for you Oauth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiIntegerResult</returns>
-        RestApiIntegerResult CraeteWebhookSubscription (string oauthAppId, WebhookSubscription webhookSubscription, string appId);
+        RestApiIntegerResult CreateWebhookSubscription (string oauthAppId, WebhookSubscription webhookSubscription, string appId);
 
         /// <summary>
-        /// Create a webhook subscription for you Oauth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiIntegerResult</returns>
-        ApiResponse<RestApiIntegerResult> CraeteWebhookSubscriptionWithHttpInfo (string oauthAppId, WebhookSubscription webhookSubscription, string appId);
+        ApiResponse<RestApiIntegerResult> CreateWebhookSubscriptionWithHttpInfo (string oauthAppId, WebhookSubscription webhookSubscription, string appId);
         /// <summary>
-        /// Add event name to your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void CreateWebhookSubscriptionEventNames (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId);
 
         /// <summary>
-        /// Add event name to your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> CreateWebhookSubscriptionEventNamesWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId);
         /// <summary>
-        /// Delete you webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void DeleteWebhookSubscription (string oauthAppId, int? webhookSubscriptionId, string appId);
 
         /// <summary>
-        /// Delete you webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteWebhookSubscriptionWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string appId);
         /// <summary>
-        /// Remove event name to your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void DeleteWebhookSubscriptionEventName (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId);
 
         /// <summary>
-        /// Remove event name to your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteWebhookSubscriptionEventNameWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId);
         /// <summary>
-        /// Get all webhook subscription event names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -140,7 +140,7 @@ public interface IWebhooksApi : IApiAccessor
         RestApiStringArrayResult GetWebhookEventNames (string appId);
 
         /// <summary>
-        /// Get all webhook subscription event names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -150,32 +150,32 @@ public interface IWebhooksApi : IApiAccessor
         /// <returns>ApiResponse of RestApiStringArrayResult</returns>
         ApiResponse<RestApiStringArrayResult> GetWebhookEventNamesWithHttpInfo (string appId);
         /// <summary>
-        /// Get your webhook subscriptions selected event names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiStringArrayResult</returns>
         RestApiStringArrayResult GetWebhookEventNamesBySubscriptionId (string oauthAppId, int? webhookSubscriptionId, string appId);
 
         /// <summary>
-        /// Get your webhook subscriptions selected event names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiStringArrayResult</returns>
         ApiResponse<RestApiStringArrayResult> GetWebhookEventNamesBySubscriptionIdWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string appId);
         /// <summary>
-        /// Get a sample event from a webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -190,7 +190,7 @@ public interface IWebhooksApi : IApiAccessor
         WebhookEventSample GetWebhookEventSample (string eventName, string appId, string oauthAppId, string webhookSubscriptionId, string version = null);
 
         /// <summary>
-        /// Get a sample event from a webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -204,46 +204,46 @@ public interface IWebhooksApi : IApiAccessor
         /// <returns>ApiResponse of WebhookEventSample</returns>
         ApiResponse<WebhookEventSample> GetWebhookEventSampleWithHttpInfo (string eventName, string appId, string oauthAppId, string webhookSubscriptionId, string version = null);
         /// <summary>
-        /// Get logs for your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="start">Start time</param>
-        /// <param name="end">End time</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultWebhookLog</returns>
         RestApiPaginationResultWebhookLog GetWebhookLogs (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get logs for your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="start">Start time</param>
-        /// <param name="end">End time</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultWebhookLog</returns>
         ApiResponse<RestApiPaginationResultWebhookLog> GetWebhookLogsWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// Get all webhook subscriptions by your Oauth App id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
@@ -251,153 +251,153 @@ public interface IWebhooksApi : IApiAccessor
         RestApiPaginationResultWebhookSubscription GetWebhookSubscriptions (string oauthAppId, string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get all webhook subscriptions by your Oauth App id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultWebhookSubscription</returns>
         ApiResponse<RestApiPaginationResultWebhookSubscription> GetWebhookSubscriptionsWithHttpInfo (string oauthAppId, string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// Update a webhook subscription object
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         void UpdateWebhookSubscription (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId);
 
         /// <summary>
-        /// Update a webhook subscription object
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> UpdateWebhookSubscriptionWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Create a webhook subscription for you Oauth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiIntegerResult</returns>
-        System.Threading.Tasks.Task<RestApiIntegerResult> CraeteWebhookSubscriptionAsync (string oauthAppId, WebhookSubscription webhookSubscription, string appId);
+        System.Threading.Tasks.Task<RestApiIntegerResult> CreateWebhookSubscriptionAsync (string oauthAppId, WebhookSubscription webhookSubscription, string appId);
 
         /// <summary>
-        /// Create a webhook subscription for you Oauth App
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiIntegerResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<RestApiIntegerResult>> CraeteWebhookSubscriptionAsyncWithHttpInfo (string oauthAppId, WebhookSubscription webhookSubscription, string appId);
+        System.Threading.Tasks.Task<ApiResponse<RestApiIntegerResult>> CreateWebhookSubscriptionAsyncWithHttpInfo (string oauthAppId, WebhookSubscription webhookSubscription, string appId);
         /// <summary>
-        /// Add event name to your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task CreateWebhookSubscriptionEventNamesAsync (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId);
 
         /// <summary>
-        /// Add event name to your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> CreateWebhookSubscriptionEventNamesAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId);
         /// <summary>
-        /// Delete you webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeleteWebhookSubscriptionAsync (string oauthAppId, int? webhookSubscriptionId, string appId);
 
         /// <summary>
-        /// Delete you webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebhookSubscriptionAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string appId);
         /// <summary>
-        /// Remove event name to your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeleteWebhookSubscriptionEventNameAsync (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId);
 
         /// <summary>
-        /// Remove event name to your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebhookSubscriptionEventNameAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId);
         /// <summary>
-        /// Get all webhook subscription event names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -408,7 +408,7 @@ public interface IWebhooksApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiStringArrayResult> GetWebhookEventNamesAsync (string appId);
 
         /// <summary>
-        /// Get all webhook subscription event names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -418,32 +418,32 @@ public interface IWebhooksApi : IApiAccessor
         /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> GetWebhookEventNamesAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Get your webhook subscriptions selected event names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiStringArrayResult</returns>
         System.Threading.Tasks.Task<RestApiStringArrayResult> GetWebhookEventNamesBySubscriptionIdAsync (string oauthAppId, int? webhookSubscriptionId, string appId);
 
         /// <summary>
-        /// Get your webhook subscriptions selected event names
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> GetWebhookEventNamesBySubscriptionIdAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string appId);
         /// <summary>
-        /// Get a sample event from a webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -458,7 +458,7 @@ public interface IWebhooksApi : IApiAccessor
         System.Threading.Tasks.Task<WebhookEventSample> GetWebhookEventSampleAsync (string eventName, string appId, string oauthAppId, string webhookSubscriptionId, string version = null);
 
         /// <summary>
-        /// Get a sample event from a webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -472,46 +472,46 @@ public interface IWebhooksApi : IApiAccessor
         /// <returns>Task of ApiResponse (WebhookEventSample)</returns>
         System.Threading.Tasks.Task<ApiResponse<WebhookEventSample>> GetWebhookEventSampleAsyncWithHttpInfo (string eventName, string appId, string oauthAppId, string webhookSubscriptionId, string version = null);
         /// <summary>
-        /// Get logs for your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="start">Start time</param>
-        /// <param name="end">End time</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultWebhookLog</returns>
         System.Threading.Tasks.Task<RestApiPaginationResultWebhookLog> GetWebhookLogsAsync (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get logs for your webhook subscription
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="start">Start time</param>
-        /// <param name="end">End time</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultWebhookLog)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultWebhookLog>> GetWebhookLogsAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// Get all webhook subscriptions by your Oauth App id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
@@ -519,42 +519,42 @@ public interface IWebhooksApi : IApiAccessor
         System.Threading.Tasks.Task<RestApiPaginationResultWebhookSubscription> GetWebhookSubscriptionsAsync (string oauthAppId, string appId, int? page = null, int? limit = null);
 
         /// <summary>
-        /// Get all webhook subscriptions by your Oauth App id
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultWebhookSubscription)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultWebhookSubscription>> GetWebhookSubscriptionsAsyncWithHttpInfo (string oauthAppId, string appId, int? page = null, int? limit = null);
         /// <summary>
-        /// Update a webhook subscription object
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task UpdateWebhookSubscriptionAsync (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId);
 
         /// <summary>
-        /// Update a webhook subscription object
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> UpdateWebhookSubscriptionAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId);
@@ -659,40 +659,40 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Create a webhook subscription for you Oauth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiIntegerResult</returns>
-        public RestApiIntegerResult CraeteWebhookSubscription (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
+        public RestApiIntegerResult CreateWebhookSubscription (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
         {
-             ApiResponse<RestApiIntegerResult> localVarResponse = CraeteWebhookSubscriptionWithHttpInfo(oauthAppId, webhookSubscription, appId);
+             ApiResponse<RestApiIntegerResult> localVarResponse = CreateWebhookSubscriptionWithHttpInfo(oauthAppId, webhookSubscription, appId);
              return localVarResponse.Data;
         }
 
         /// <summary>
-        /// Create a webhook subscription for you Oauth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiIntegerResult</returns>
-        public ApiResponse< RestApiIntegerResult > CraeteWebhookSubscriptionWithHttpInfo (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
+        public ApiResponse< RestApiIntegerResult > CreateWebhookSubscriptionWithHttpInfo (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
         {
             // verify the required parameter 'oauthAppId' is set
             if (oauthAppId == null)
-                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling WebhooksApi->CraeteWebhookSubscription");
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling WebhooksApi->CreateWebhookSubscription");
             // verify the required parameter 'webhookSubscription' is set
             if (webhookSubscription == null)
-                throw new ApiException(400, "Missing required parameter 'webhookSubscription' when calling WebhooksApi->CraeteWebhookSubscription");
+                throw new ApiException(400, "Missing required parameter 'webhookSubscription' when calling WebhooksApi->CreateWebhookSubscription");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->CraeteWebhookSubscription");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->CreateWebhookSubscription");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -748,51 +748,51 @@ public ApiResponse< RestApiIntegerResult > CraeteWebhookSubscriptionWithHttpInfo
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("CraeteWebhookSubscription", localVarResponse);
+                Exception exception = ExceptionFactory("CreateWebhookSubscription", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<RestApiIntegerResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiIntegerResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiIntegerResult)));
         }
 
         /// <summary>
-        /// Create a webhook subscription for you Oauth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiIntegerResult</returns>
-        public async System.Threading.Tasks.Task<RestApiIntegerResult> CraeteWebhookSubscriptionAsync (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
+        public async System.Threading.Tasks.Task<RestApiIntegerResult> CreateWebhookSubscriptionAsync (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
         {
-             ApiResponse<RestApiIntegerResult> localVarResponse = await CraeteWebhookSubscriptionAsyncWithHttpInfo(oauthAppId, webhookSubscription, appId);
+             ApiResponse<RestApiIntegerResult> localVarResponse = await CreateWebhookSubscriptionAsyncWithHttpInfo(oauthAppId, webhookSubscription, appId);
              return localVarResponse.Data;
 
         }
 
         /// <summary>
-        /// Create a webhook subscription for you Oauth App 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiIntegerResult)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<RestApiIntegerResult>> CraeteWebhookSubscriptionAsyncWithHttpInfo (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiIntegerResult>> CreateWebhookSubscriptionAsyncWithHttpInfo (string oauthAppId, WebhookSubscription webhookSubscription, string appId)
         {
             // verify the required parameter 'oauthAppId' is set
             if (oauthAppId == null)
-                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling WebhooksApi->CraeteWebhookSubscription");
+                throw new ApiException(400, "Missing required parameter 'oauthAppId' when calling WebhooksApi->CreateWebhookSubscription");
             // verify the required parameter 'webhookSubscription' is set
             if (webhookSubscription == null)
-                throw new ApiException(400, "Missing required parameter 'webhookSubscription' when calling WebhooksApi->CraeteWebhookSubscription");
+                throw new ApiException(400, "Missing required parameter 'webhookSubscription' when calling WebhooksApi->CreateWebhookSubscription");
             // verify the required parameter 'appId' is set
             if (appId == null)
-                throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->CraeteWebhookSubscription");
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->CreateWebhookSubscription");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -848,22 +848,22 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiIntegerResult>> Crae
 
             if (ExceptionFactory != null)
             {
-                Exception exception = ExceptionFactory("CraeteWebhookSubscription", localVarResponse);
+                Exception exception = ExceptionFactory("CreateWebhookSubscription", localVarResponse);
                 if (exception != null) throw exception;
             }
 
             return new ApiResponse<RestApiIntegerResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiIntegerResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiIntegerResult)));
         }
 
         /// <summary>
-        /// Add event name to your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void CreateWebhookSubscriptionEventNames (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
@@ -872,12 +872,12 @@ public void CreateWebhookSubscriptionEventNames (string oauthAppId, int? webhook
         }
 
         /// <summary>
-        /// Add event name to your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> CreateWebhookSubscriptionEventNamesWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
@@ -895,7 +895,7 @@ public ApiResponse<Object> CreateWebhookSubscriptionEventNamesWithHttpInfo (stri
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->CreateWebhookSubscriptionEventNames");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -945,17 +945,17 @@ public ApiResponse<Object> CreateWebhookSubscriptionEventNamesWithHttpInfo (stri
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Add event name to your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task CreateWebhookSubscriptionEventNamesAsync (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
@@ -965,12 +965,12 @@ public async System.Threading.Tasks.Task CreateWebhookSubscriptionEventNamesAsyn
         }
 
         /// <summary>
-        /// Add event name to your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateWebhookSubscriptionEventNamesAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
@@ -988,7 +988,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateWebhookSubsc
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->CreateWebhookSubscriptionEventNames");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1038,16 +1038,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> CreateWebhookSubsc
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete you webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void DeleteWebhookSubscription (string oauthAppId, int? webhookSubscriptionId, string appId)
@@ -1056,11 +1056,11 @@ public void DeleteWebhookSubscription (string oauthAppId, int? webhookSubscripti
         }
 
         /// <summary>
-        /// Delete you webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteWebhookSubscriptionWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string appId)
@@ -1075,7 +1075,7 @@ public ApiResponse<Object> DeleteWebhookSubscriptionWithHttpInfo (string oauthAp
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->DeleteWebhookSubscription");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1124,16 +1124,16 @@ public ApiResponse<Object> DeleteWebhookSubscriptionWithHttpInfo (string oauthAp
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete you webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeleteWebhookSubscriptionAsync (string oauthAppId, int? webhookSubscriptionId, string appId)
@@ -1143,11 +1143,11 @@ public async System.Threading.Tasks.Task DeleteWebhookSubscriptionAsync (string
         }
 
         /// <summary>
-        /// Delete you webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebhookSubscriptionAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string appId)
@@ -1162,7 +1162,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebhookSubsc
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->DeleteWebhookSubscription");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1211,17 +1211,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebhookSubsc
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Remove event name to your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void DeleteWebhookSubscriptionEventName (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
@@ -1230,12 +1230,12 @@ public void DeleteWebhookSubscriptionEventName (string oauthAppId, int? webhookS
         }
 
         /// <summary>
-        /// Remove event name to your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteWebhookSubscriptionEventNameWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
@@ -1253,7 +1253,7 @@ public ApiResponse<Object> DeleteWebhookSubscriptionEventNameWithHttpInfo (strin
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->DeleteWebhookSubscriptionEventName");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1303,17 +1303,17 @@ public ApiResponse<Object> DeleteWebhookSubscriptionEventNameWithHttpInfo (strin
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Remove event name to your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeleteWebhookSubscriptionEventNameAsync (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
@@ -1323,12 +1323,12 @@ public async System.Threading.Tasks.Task DeleteWebhookSubscriptionEventNameAsync
         }
 
         /// <summary>
-        /// Remove event name to your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="eventName">Webhook subscription event name</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="eventName"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebhookSubscriptionEventNameAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string eventName, string appId)
@@ -1346,7 +1346,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebhookSubsc
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->DeleteWebhookSubscriptionEventName");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1396,12 +1396,12 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebhookSubsc
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Get all webhook subscription event names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1413,7 +1413,7 @@ public RestApiStringArrayResult GetWebhookEventNames (string appId)
         }
 
         /// <summary>
-        /// Get all webhook subscription event names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1424,7 +1424,7 @@ public ApiResponse< RestApiStringArrayResult > GetWebhookEventNamesWithHttpInfo
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->GetWebhookEventNames");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/events";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/events";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1471,12 +1471,12 @@ public ApiResponse< RestApiStringArrayResult > GetWebhookEventNamesWithHttpInfo
             }
 
             return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
         }
 
         /// <summary>
-        /// Get all webhook subscription event names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1489,7 +1489,7 @@ public async System.Threading.Tasks.Task<RestApiStringArrayResult> GetWebhookEve
         }
 
         /// <summary>
-        /// Get all webhook subscription event names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1500,7 +1500,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->GetWebhookEventNames");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/events";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/events";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1547,16 +1547,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>>
             }
 
             return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
         }
 
         /// <summary>
-        /// Get your webhook subscriptions selected event names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>RestApiStringArrayResult</returns>
         public RestApiStringArrayResult GetWebhookEventNamesBySubscriptionId (string oauthAppId, int? webhookSubscriptionId, string appId)
@@ -1566,11 +1566,11 @@ public RestApiStringArrayResult GetWebhookEventNamesBySubscriptionId (string oau
         }
 
         /// <summary>
-        /// Get your webhook subscriptions selected event names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiStringArrayResult</returns>
         public ApiResponse< RestApiStringArrayResult > GetWebhookEventNamesBySubscriptionIdWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string appId)
@@ -1585,7 +1585,7 @@ public ApiResponse< RestApiStringArrayResult > GetWebhookEventNamesBySubscriptio
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->GetWebhookEventNamesBySubscriptionId");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1634,16 +1634,16 @@ public ApiResponse< RestApiStringArrayResult > GetWebhookEventNamesBySubscriptio
             }
 
             return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
         }
 
         /// <summary>
-        /// Get your webhook subscriptions selected event names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of RestApiStringArrayResult</returns>
         public async System.Threading.Tasks.Task<RestApiStringArrayResult> GetWebhookEventNamesBySubscriptionIdAsync (string oauthAppId, int? webhookSubscriptionId, string appId)
@@ -1654,11 +1654,11 @@ public async System.Threading.Tasks.Task<RestApiStringArrayResult> GetWebhookEve
         }
 
         /// <summary>
-        /// Get your webhook subscriptions selected event names 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiStringArrayResult)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>> GetWebhookEventNamesBySubscriptionIdAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, string appId)
@@ -1673,7 +1673,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>>
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->GetWebhookEventNamesBySubscriptionId");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1722,12 +1722,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiStringArrayResult>>
             }
 
             return new ApiResponse<RestApiStringArrayResult>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiStringArrayResult) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiStringArrayResult)));
         }
 
         /// <summary>
-        /// Get a sample event from a webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="eventName"></param>
@@ -1743,7 +1743,7 @@ public WebhookEventSample GetWebhookEventSample (string eventName, string appId,
         }
 
         /// <summary>
-        /// Get a sample event from a webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="eventName"></param>
@@ -1767,7 +1767,7 @@ public ApiResponse< WebhookEventSample > GetWebhookEventSampleWithHttpInfo (stri
             if (webhookSubscriptionId == null)
                 throw new ApiException(400, "Missing required parameter 'webhookSubscriptionId' when calling WebhooksApi->GetWebhookEventSample");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}/test";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}/test";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1818,12 +1818,12 @@ public ApiResponse< WebhookEventSample > GetWebhookEventSampleWithHttpInfo (stri
             }
 
             return new ApiResponse<WebhookEventSample>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (WebhookEventSample) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(WebhookEventSample)));
         }
 
         /// <summary>
-        /// Get a sample event from a webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="eventName"></param>
@@ -1840,7 +1840,7 @@ public async System.Threading.Tasks.Task<WebhookEventSample> GetWebhookEventSamp
         }
 
         /// <summary>
-        /// Get a sample event from a webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="eventName"></param>
@@ -1864,7 +1864,7 @@ public async System.Threading.Tasks.Task<ApiResponse<WebhookEventSample>> GetWeb
             if (webhookSubscriptionId == null)
                 throw new ApiException(400, "Missing required parameter 'webhookSubscriptionId' when calling WebhooksApi->GetWebhookEventSample");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}/test";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/events/{eventName}/test";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1915,21 +1915,21 @@ public async System.Threading.Tasks.Task<ApiResponse<WebhookEventSample>> GetWeb
             }
 
             return new ApiResponse<WebhookEventSample>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (WebhookEventSample) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(WebhookEventSample)));
         }
 
         /// <summary>
-        /// Get logs for your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="start">Start time</param>
-        /// <param name="end">End time</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>RestApiPaginationResultWebhookLog</returns>
         public RestApiPaginationResultWebhookLog GetWebhookLogs (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null)
         {
@@ -1938,16 +1938,16 @@ public RestApiPaginationResultWebhookLog GetWebhookLogs (string oauthAppId, int?
         }
 
         /// <summary>
-        /// Get logs for your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="start">Start time</param>
-        /// <param name="end">End time</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>ApiResponse of RestApiPaginationResultWebhookLog</returns>
         public ApiResponse< RestApiPaginationResultWebhookLog > GetWebhookLogsWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null)
         {
@@ -1967,7 +1967,7 @@ public ApiResponse< RestApiPaginationResultWebhookLog > GetWebhookLogsWithHttpIn
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->GetWebhookLogs");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/logs";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/logs";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2020,21 +2020,21 @@ public ApiResponse< RestApiPaginationResultWebhookLog > GetWebhookLogsWithHttpIn
             }
 
             return new ApiResponse<RestApiPaginationResultWebhookLog>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultWebhookLog) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultWebhookLog)));
         }
 
         /// <summary>
-        /// Get logs for your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="start">Start time</param>
-        /// <param name="end">End time</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of RestApiPaginationResultWebhookLog</returns>
         public async System.Threading.Tasks.Task<RestApiPaginationResultWebhookLog> GetWebhookLogsAsync (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null)
         {
@@ -2044,16 +2044,16 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultWebhookLog> GetW
         }
 
         /// <summary>
-        /// Get logs for your webhook subscription 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="start">Start time</param>
-        /// <param name="end">End time</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
         /// <param name="appId"></param>
-        /// <param name="page">Page number (optional)</param>
-        /// <param name="limit">Page size (optional)</param>
+        /// <param name="page"> (optional)</param>
+        /// <param name="limit"> (optional)</param>
         /// <returns>Task of ApiResponse (RestApiPaginationResultWebhookLog)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultWebhookLog>> GetWebhookLogsAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, DateTime? start, DateTime? end, string appId, int? page = null, int? limit = null)
         {
@@ -2073,7 +2073,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultWebh
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->GetWebhookLogs");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/logs";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}/logs";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2126,15 +2126,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultWebh
             }
 
             return new ApiResponse<RestApiPaginationResultWebhookLog>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultWebhookLog) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultWebhookLog)));
         }
 
         /// <summary>
-        /// Get all webhook subscriptions by your Oauth App id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
@@ -2146,10 +2146,10 @@ public RestApiPaginationResultWebhookSubscription GetWebhookSubscriptions (strin
         }
 
         /// <summary>
-        /// Get all webhook subscriptions by your Oauth App id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
@@ -2163,7 +2163,7 @@ public ApiResponse< RestApiPaginationResultWebhookSubscription > GetWebhookSubsc
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->GetWebhookSubscriptions");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2213,15 +2213,15 @@ public ApiResponse< RestApiPaginationResultWebhookSubscription > GetWebhookSubsc
             }
 
             return new ApiResponse<RestApiPaginationResultWebhookSubscription>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultWebhookSubscription) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultWebhookSubscription)));
         }
 
         /// <summary>
-        /// Get all webhook subscriptions by your Oauth App id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
@@ -2234,10 +2234,10 @@ public async System.Threading.Tasks.Task<RestApiPaginationResultWebhookSubscript
         }
 
         /// <summary>
-        /// Get all webhook subscriptions by your Oauth App id 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
+        /// <param name="oauthAppId"></param>
         /// <param name="appId"></param>
         /// <param name="page"> (optional)</param>
         /// <param name="limit"> (optional)</param>
@@ -2251,7 +2251,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultWebh
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->GetWebhookSubscriptions");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2301,17 +2301,17 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiPaginationResultWebh
             }
 
             return new ApiResponse<RestApiPaginationResultWebhookSubscription>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiPaginationResultWebhookSubscription) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiPaginationResultWebhookSubscription)));
         }
 
         /// <summary>
-        /// Update a webhook subscription object 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns></returns>
         public void UpdateWebhookSubscription (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId)
@@ -2320,12 +2320,12 @@ public void UpdateWebhookSubscription (string oauthAppId, int? webhookSubscripti
         }
 
         /// <summary>
-        /// Update a webhook subscription object 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> UpdateWebhookSubscriptionWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId)
@@ -2343,7 +2343,7 @@ public ApiResponse<Object> UpdateWebhookSubscriptionWithHttpInfo (string oauthAp
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->UpdateWebhookSubscription");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2405,17 +2405,17 @@ public ApiResponse<Object> UpdateWebhookSubscriptionWithHttpInfo (string oauthAp
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Update a webhook subscription object 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task UpdateWebhookSubscriptionAsync (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId)
@@ -2425,12 +2425,12 @@ public async System.Threading.Tasks.Task UpdateWebhookSubscriptionAsync (string
         }
 
         /// <summary>
-        /// Update a webhook subscription object 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="oauthAppId">Oauth App identifier</param>
-        /// <param name="webhookSubscriptionId">Webhook subscription identifier</param>
-        /// <param name="webhookSubscription">Webhook subscription object</param>
+        /// <param name="oauthAppId"></param>
+        /// <param name="webhookSubscriptionId"></param>
+        /// <param name="webhookSubscription"></param>
         /// <param name="appId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateWebhookSubscriptionAsyncWithHttpInfo (string oauthAppId, int? webhookSubscriptionId, WebhookSubscription webhookSubscription, string appId)
@@ -2448,7 +2448,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateWebhookSubsc
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebhooksApi->UpdateWebhookSubscription");
 
-            var localVarPath = "/api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}";
+            var localVarPath = "./api/v1.0/{appId}/webhooks/{oauthAppId}/subscriptions/{webhookSubscriptionId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -2510,7 +2510,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> UpdateWebhookSubsc
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/WebsiteApi.cs b/src/Flipdish/Api/WebsiteApi.cs
index 61d8a5f2..a9231af6 100644
--- a/src/Flipdish/Api/WebsiteApi.cs
+++ b/src/Flipdish/Api/WebsiteApi.cs
@@ -12,7 +12,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 using Flipdish.Client;
 using Flipdish.Model;
 
@@ -25,170 +25,170 @@ public interface IWebsiteApi : IApiAccessor
     {
         #region Synchronous Operations
         /// <summary>
-        /// Add a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonial">Testimonial to be added</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>RestApiResultWebsiteTestimonial</returns>
         RestApiResultWebsiteTestimonial AddTestimonial (string appId, WebsiteTestimonialBase testimonial);
 
         /// <summary>
-        /// Add a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonial">Testimonial to be added</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>ApiResponse of RestApiResultWebsiteTestimonial</returns>
         ApiResponse<RestApiResultWebsiteTestimonial> AddTestimonialWithHttpInfo (string appId, WebsiteTestimonialBase testimonial);
         /// <summary>
-        /// Delete a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to delete</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
         /// <returns></returns>
         void DeleteTestimonial (string appId, int? testimonialId);
 
         /// <summary>
-        /// Delete a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to delete</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteTestimonialWithHttpInfo (string appId, int? testimonialId);
         /// <summary>
-        /// Delete Website Image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageId">Id of the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageId"></param>
         /// <returns></returns>
         void DeleteWebsiteImage (string appId, int? imageId);
 
         /// <summary>
-        /// Delete Website Image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageId">Id of the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         ApiResponse<Object> DeleteWebsiteImageWithHttpInfo (string appId, int? imageId);
         /// <summary>
-        /// Edit a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to edit</param>
-        /// <param name="testimonial">New values of the testimonial</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>RestApiResultWebsiteTestimonial</returns>
         RestApiResultWebsiteTestimonial EditTestimonial (string appId, int? testimonialId, WebsiteTestimonialBase testimonial);
 
         /// <summary>
-        /// Edit a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to edit</param>
-        /// <param name="testimonial">New values of the testimonial</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>ApiResponse of RestApiResultWebsiteTestimonial</returns>
         ApiResponse<RestApiResultWebsiteTestimonial> EditTestimonialWithHttpInfo (string appId, int? testimonialId, WebsiteTestimonialBase testimonial);
         /// <summary>
-        /// Get Index Configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultIndexPage</returns>
         RestApiResultIndexPage GetIndexConfiguration (string appId);
 
         /// <summary>
-        /// Get Index Configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultIndexPage</returns>
         ApiResponse<RestApiResultIndexPage> GetIndexConfigurationWithHttpInfo (string appId);
         /// <summary>
-        /// Set Index Configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="indexPage">New index page definition</param>
+        /// <param name="appId"></param>
+        /// <param name="indexPage"></param>
         /// <returns>RestApiResultIndexPageBase</returns>
         RestApiResultIndexPageBase SetIndexConfiguration (string appId, IndexPageBase indexPage);
 
         /// <summary>
-        /// Set Index Configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="indexPage">New index page definition</param>
+        /// <param name="appId"></param>
+        /// <param name="indexPage"></param>
         /// <returns>ApiResponse of RestApiResultIndexPageBase</returns>
         ApiResponse<RestApiResultIndexPageBase> SetIndexConfigurationWithHttpInfo (string appId, IndexPageBase indexPage);
         /// <summary>
-        /// Upload Website Image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageLocation">Section for which to upload the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageLocation"></param>
         /// <param name="image">App Logo</param>
         /// <returns>RestApiResultWebsiteImage</returns>
         RestApiResultWebsiteImage UploadWebsiteImage (string appId, string imageLocation, System.IO.Stream image);
 
         /// <summary>
-        /// Upload Website Image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageLocation">Section for which to upload the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageLocation"></param>
         /// <param name="image">App Logo</param>
         /// <returns>ApiResponse of RestApiResultWebsiteImage</returns>
         ApiResponse<RestApiResultWebsiteImage> UploadWebsiteImageWithHttpInfo (string appId, string imageLocation, System.IO.Stream image);
         /// <summary>
-        /// Triggers a Check DNS Process
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -199,7 +199,7 @@ public interface IWebsiteApi : IApiAccessor
         void WebsiteCheckNow (string appId);
 
         /// <summary>
-        /// Triggers a Check DNS Process
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -211,170 +211,170 @@ public interface IWebsiteApi : IApiAccessor
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
-        /// Add a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonial">Testimonial to be added</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>Task of RestApiResultWebsiteTestimonial</returns>
         System.Threading.Tasks.Task<RestApiResultWebsiteTestimonial> AddTestimonialAsync (string appId, WebsiteTestimonialBase testimonial);
 
         /// <summary>
-        /// Add a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonial">Testimonial to be added</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>Task of ApiResponse (RestApiResultWebsiteTestimonial)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteTestimonial>> AddTestimonialAsyncWithHttpInfo (string appId, WebsiteTestimonialBase testimonial);
         /// <summary>
-        /// Delete a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to delete</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeleteTestimonialAsync (string appId, int? testimonialId);
 
         /// <summary>
-        /// Delete a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to delete</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteTestimonialAsyncWithHttpInfo (string appId, int? testimonialId);
         /// <summary>
-        /// Delete Website Image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageId">Id of the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageId"></param>
         /// <returns>Task of void</returns>
         System.Threading.Tasks.Task DeleteWebsiteImageAsync (string appId, int? imageId);
 
         /// <summary>
-        /// Delete Website Image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageId">Id of the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageId"></param>
         /// <returns>Task of ApiResponse</returns>
         System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebsiteImageAsyncWithHttpInfo (string appId, int? imageId);
         /// <summary>
-        /// Edit a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to edit</param>
-        /// <param name="testimonial">New values of the testimonial</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>Task of RestApiResultWebsiteTestimonial</returns>
         System.Threading.Tasks.Task<RestApiResultWebsiteTestimonial> EditTestimonialAsync (string appId, int? testimonialId, WebsiteTestimonialBase testimonial);
 
         /// <summary>
-        /// Edit a testimonial
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to edit</param>
-        /// <param name="testimonial">New values of the testimonial</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>Task of ApiResponse (RestApiResultWebsiteTestimonial)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteTestimonial>> EditTestimonialAsyncWithHttpInfo (string appId, int? testimonialId, WebsiteTestimonialBase testimonial);
         /// <summary>
-        /// Get Index Configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiResultIndexPage</returns>
         System.Threading.Tasks.Task<RestApiResultIndexPage> GetIndexConfigurationAsync (string appId);
 
         /// <summary>
-        /// Get Index Configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultIndexPage)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultIndexPage>> GetIndexConfigurationAsyncWithHttpInfo (string appId);
         /// <summary>
-        /// Set Index Configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="indexPage">New index page definition</param>
+        /// <param name="appId"></param>
+        /// <param name="indexPage"></param>
         /// <returns>Task of RestApiResultIndexPageBase</returns>
         System.Threading.Tasks.Task<RestApiResultIndexPageBase> SetIndexConfigurationAsync (string appId, IndexPageBase indexPage);
 
         /// <summary>
-        /// Set Index Configuration
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="indexPage">New index page definition</param>
+        /// <param name="appId"></param>
+        /// <param name="indexPage"></param>
         /// <returns>Task of ApiResponse (RestApiResultIndexPageBase)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultIndexPageBase>> SetIndexConfigurationAsyncWithHttpInfo (string appId, IndexPageBase indexPage);
         /// <summary>
-        /// Upload Website Image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageLocation">Section for which to upload the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageLocation"></param>
         /// <param name="image">App Logo</param>
         /// <returns>Task of RestApiResultWebsiteImage</returns>
         System.Threading.Tasks.Task<RestApiResultWebsiteImage> UploadWebsiteImageAsync (string appId, string imageLocation, System.IO.Stream image);
 
         /// <summary>
-        /// Upload Website Image
+        /// 
         /// </summary>
         /// <remarks>
         /// 
         /// </remarks>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageLocation">Section for which to upload the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageLocation"></param>
         /// <param name="image">App Logo</param>
         /// <returns>Task of ApiResponse (RestApiResultWebsiteImage)</returns>
         System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteImage>> UploadWebsiteImageAsyncWithHttpInfo (string appId, string imageLocation, System.IO.Stream image);
         /// <summary>
-        /// Triggers a Check DNS Process
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -385,7 +385,7 @@ public interface IWebsiteApi : IApiAccessor
         System.Threading.Tasks.Task WebsiteCheckNowAsync (string appId);
 
         /// <summary>
-        /// Triggers a Check DNS Process
+        /// 
         /// </summary>
         /// <remarks>
         /// 
@@ -495,11 +495,11 @@ public void AddDefaultHeader(string key, string value)
         }
 
         /// <summary>
-        /// Add a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonial">Testimonial to be added</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>RestApiResultWebsiteTestimonial</returns>
         public RestApiResultWebsiteTestimonial AddTestimonial (string appId, WebsiteTestimonialBase testimonial)
         {
@@ -508,11 +508,11 @@ public RestApiResultWebsiteTestimonial AddTestimonial (string appId, WebsiteTest
         }
 
         /// <summary>
-        /// Add a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonial">Testimonial to be added</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>ApiResponse of RestApiResultWebsiteTestimonial</returns>
         public ApiResponse< RestApiResultWebsiteTestimonial > AddTestimonialWithHttpInfo (string appId, WebsiteTestimonialBase testimonial)
         {
@@ -523,7 +523,7 @@ public ApiResponse< RestApiResultWebsiteTestimonial > AddTestimonialWithHttpInfo
             if (testimonial == null)
                 throw new ApiException(400, "Missing required parameter 'testimonial' when calling WebsiteApi->AddTestimonial");
 
-            var localVarPath = "/api/v1.0/{appId}/website/testimonial";
+            var localVarPath = "./api/v1.0/{appId}/website/testimonial";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -583,16 +583,16 @@ public ApiResponse< RestApiResultWebsiteTestimonial > AddTestimonialWithHttpInfo
             }
 
             return new ApiResponse<RestApiResultWebsiteTestimonial>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultWebsiteTestimonial) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWebsiteTestimonial)));
         }
 
         /// <summary>
-        /// Add a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonial">Testimonial to be added</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>Task of RestApiResultWebsiteTestimonial</returns>
         public async System.Threading.Tasks.Task<RestApiResultWebsiteTestimonial> AddTestimonialAsync (string appId, WebsiteTestimonialBase testimonial)
         {
@@ -602,11 +602,11 @@ public async System.Threading.Tasks.Task<RestApiResultWebsiteTestimonial> AddTes
         }
 
         /// <summary>
-        /// Add a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonial">Testimonial to be added</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>Task of ApiResponse (RestApiResultWebsiteTestimonial)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteTestimonial>> AddTestimonialAsyncWithHttpInfo (string appId, WebsiteTestimonialBase testimonial)
         {
@@ -617,7 +617,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteTestimo
             if (testimonial == null)
                 throw new ApiException(400, "Missing required parameter 'testimonial' when calling WebsiteApi->AddTestimonial");
 
-            var localVarPath = "/api/v1.0/{appId}/website/testimonial";
+            var localVarPath = "./api/v1.0/{appId}/website/testimonial";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -677,16 +677,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteTestimo
             }
 
             return new ApiResponse<RestApiResultWebsiteTestimonial>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultWebsiteTestimonial) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWebsiteTestimonial)));
         }
 
         /// <summary>
-        /// Delete a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to delete</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
         /// <returns></returns>
         public void DeleteTestimonial (string appId, int? testimonialId)
         {
@@ -694,11 +694,11 @@ public void DeleteTestimonial (string appId, int? testimonialId)
         }
 
         /// <summary>
-        /// Delete a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to delete</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteTestimonialWithHttpInfo (string appId, int? testimonialId)
         {
@@ -709,7 +709,7 @@ public ApiResponse<Object> DeleteTestimonialWithHttpInfo (string appId, int? tes
             if (testimonialId == null)
                 throw new ApiException(400, "Missing required parameter 'testimonialId' when calling WebsiteApi->DeleteTestimonial");
 
-            var localVarPath = "/api/v1.0/{appId}/website/testimonial/{testimonialId}";
+            var localVarPath = "./api/v1.0/{appId}/website/testimonial/{testimonialId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -757,16 +757,16 @@ public ApiResponse<Object> DeleteTestimonialWithHttpInfo (string appId, int? tes
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to delete</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeleteTestimonialAsync (string appId, int? testimonialId)
         {
@@ -775,11 +775,11 @@ public async System.Threading.Tasks.Task DeleteTestimonialAsync (string appId, i
         }
 
         /// <summary>
-        /// Delete a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to delete</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteTestimonialAsyncWithHttpInfo (string appId, int? testimonialId)
         {
@@ -790,7 +790,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteTestimonialA
             if (testimonialId == null)
                 throw new ApiException(400, "Missing required parameter 'testimonialId' when calling WebsiteApi->DeleteTestimonial");
 
-            var localVarPath = "/api/v1.0/{appId}/website/testimonial/{testimonialId}";
+            var localVarPath = "./api/v1.0/{appId}/website/testimonial/{testimonialId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -838,16 +838,16 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteTestimonialA
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete Website Image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageId">Id of the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageId"></param>
         /// <returns></returns>
         public void DeleteWebsiteImage (string appId, int? imageId)
         {
@@ -855,11 +855,11 @@ public void DeleteWebsiteImage (string appId, int? imageId)
         }
 
         /// <summary>
-        /// Delete Website Image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageId">Id of the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageId"></param>
         /// <returns>ApiResponse of Object(void)</returns>
         public ApiResponse<Object> DeleteWebsiteImageWithHttpInfo (string appId, int? imageId)
         {
@@ -870,7 +870,7 @@ public ApiResponse<Object> DeleteWebsiteImageWithHttpInfo (string appId, int? im
             if (imageId == null)
                 throw new ApiException(400, "Missing required parameter 'imageId' when calling WebsiteApi->DeleteWebsiteImage");
 
-            var localVarPath = "/api/v1.0/{appId}/website/image/{imageId}";
+            var localVarPath = "./api/v1.0/{appId}/website/image/{imageId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -918,16 +918,16 @@ public ApiResponse<Object> DeleteWebsiteImageWithHttpInfo (string appId, int? im
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Delete Website Image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageId">Id of the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageId"></param>
         /// <returns>Task of void</returns>
         public async System.Threading.Tasks.Task DeleteWebsiteImageAsync (string appId, int? imageId)
         {
@@ -936,11 +936,11 @@ public async System.Threading.Tasks.Task DeleteWebsiteImageAsync (string appId,
         }
 
         /// <summary>
-        /// Delete Website Image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageId">Id of the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageId"></param>
         /// <returns>Task of ApiResponse</returns>
         public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebsiteImageAsyncWithHttpInfo (string appId, int? imageId)
         {
@@ -951,7 +951,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebsiteImage
             if (imageId == null)
                 throw new ApiException(400, "Missing required parameter 'imageId' when calling WebsiteApi->DeleteWebsiteImage");
 
-            var localVarPath = "/api/v1.0/{appId}/website/image/{imageId}";
+            var localVarPath = "./api/v1.0/{appId}/website/image/{imageId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -999,17 +999,17 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> DeleteWebsiteImage
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Edit a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to edit</param>
-        /// <param name="testimonial">New values of the testimonial</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>RestApiResultWebsiteTestimonial</returns>
         public RestApiResultWebsiteTestimonial EditTestimonial (string appId, int? testimonialId, WebsiteTestimonialBase testimonial)
         {
@@ -1018,12 +1018,12 @@ public RestApiResultWebsiteTestimonial EditTestimonial (string appId, int? testi
         }
 
         /// <summary>
-        /// Edit a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to edit</param>
-        /// <param name="testimonial">New values of the testimonial</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>ApiResponse of RestApiResultWebsiteTestimonial</returns>
         public ApiResponse< RestApiResultWebsiteTestimonial > EditTestimonialWithHttpInfo (string appId, int? testimonialId, WebsiteTestimonialBase testimonial)
         {
@@ -1037,7 +1037,7 @@ public ApiResponse< RestApiResultWebsiteTestimonial > EditTestimonialWithHttpInf
             if (testimonial == null)
                 throw new ApiException(400, "Missing required parameter 'testimonial' when calling WebsiteApi->EditTestimonial");
 
-            var localVarPath = "/api/v1.0/{appId}/website/testimonial/{testimonialId}";
+            var localVarPath = "./api/v1.0/{appId}/website/testimonial/{testimonialId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1098,17 +1098,17 @@ public ApiResponse< RestApiResultWebsiteTestimonial > EditTestimonialWithHttpInf
             }
 
             return new ApiResponse<RestApiResultWebsiteTestimonial>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultWebsiteTestimonial) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWebsiteTestimonial)));
         }
 
         /// <summary>
-        /// Edit a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to edit</param>
-        /// <param name="testimonial">New values of the testimonial</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>Task of RestApiResultWebsiteTestimonial</returns>
         public async System.Threading.Tasks.Task<RestApiResultWebsiteTestimonial> EditTestimonialAsync (string appId, int? testimonialId, WebsiteTestimonialBase testimonial)
         {
@@ -1118,12 +1118,12 @@ public async System.Threading.Tasks.Task<RestApiResultWebsiteTestimonial> EditTe
         }
 
         /// <summary>
-        /// Edit a testimonial 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="testimonialId">Id of the testimonial to edit</param>
-        /// <param name="testimonial">New values of the testimonial</param>
+        /// <param name="appId"></param>
+        /// <param name="testimonialId"></param>
+        /// <param name="testimonial"></param>
         /// <returns>Task of ApiResponse (RestApiResultWebsiteTestimonial)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteTestimonial>> EditTestimonialAsyncWithHttpInfo (string appId, int? testimonialId, WebsiteTestimonialBase testimonial)
         {
@@ -1137,7 +1137,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteTestimo
             if (testimonial == null)
                 throw new ApiException(400, "Missing required parameter 'testimonial' when calling WebsiteApi->EditTestimonial");
 
-            var localVarPath = "/api/v1.0/{appId}/website/testimonial/{testimonialId}";
+            var localVarPath = "./api/v1.0/{appId}/website/testimonial/{testimonialId}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1198,15 +1198,15 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteTestimo
             }
 
             return new ApiResponse<RestApiResultWebsiteTestimonial>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultWebsiteTestimonial) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWebsiteTestimonial)));
         }
 
         /// <summary>
-        /// Get Index Configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>RestApiResultIndexPage</returns>
         public RestApiResultIndexPage GetIndexConfiguration (string appId)
         {
@@ -1215,10 +1215,10 @@ public RestApiResultIndexPage GetIndexConfiguration (string appId)
         }
 
         /// <summary>
-        /// Get Index Configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>ApiResponse of RestApiResultIndexPage</returns>
         public ApiResponse< RestApiResultIndexPage > GetIndexConfigurationWithHttpInfo (string appId)
         {
@@ -1226,7 +1226,7 @@ public ApiResponse< RestApiResultIndexPage > GetIndexConfigurationWithHttpInfo (
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebsiteApi->GetIndexConfiguration");
 
-            var localVarPath = "/api/v1.0/{appId}/website/index";
+            var localVarPath = "./api/v1.0/{appId}/website/index";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1273,15 +1273,15 @@ public ApiResponse< RestApiResultIndexPage > GetIndexConfigurationWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultIndexPage>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultIndexPage) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultIndexPage)));
         }
 
         /// <summary>
-        /// Get Index Configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>Task of RestApiResultIndexPage</returns>
         public async System.Threading.Tasks.Task<RestApiResultIndexPage> GetIndexConfigurationAsync (string appId)
         {
@@ -1291,10 +1291,10 @@ public async System.Threading.Tasks.Task<RestApiResultIndexPage> GetIndexConfigu
         }
 
         /// <summary>
-        /// Get Index Configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
+        /// <param name="appId"></param>
         /// <returns>Task of ApiResponse (RestApiResultIndexPage)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultIndexPage>> GetIndexConfigurationAsyncWithHttpInfo (string appId)
         {
@@ -1302,7 +1302,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultIndexPage>> Ge
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebsiteApi->GetIndexConfiguration");
 
-            var localVarPath = "/api/v1.0/{appId}/website/index";
+            var localVarPath = "./api/v1.0/{appId}/website/index";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1349,16 +1349,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultIndexPage>> Ge
             }
 
             return new ApiResponse<RestApiResultIndexPage>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultIndexPage) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultIndexPage)));
         }
 
         /// <summary>
-        /// Set Index Configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="indexPage">New index page definition</param>
+        /// <param name="appId"></param>
+        /// <param name="indexPage"></param>
         /// <returns>RestApiResultIndexPageBase</returns>
         public RestApiResultIndexPageBase SetIndexConfiguration (string appId, IndexPageBase indexPage)
         {
@@ -1367,11 +1367,11 @@ public RestApiResultIndexPageBase SetIndexConfiguration (string appId, IndexPage
         }
 
         /// <summary>
-        /// Set Index Configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="indexPage">New index page definition</param>
+        /// <param name="appId"></param>
+        /// <param name="indexPage"></param>
         /// <returns>ApiResponse of RestApiResultIndexPageBase</returns>
         public ApiResponse< RestApiResultIndexPageBase > SetIndexConfigurationWithHttpInfo (string appId, IndexPageBase indexPage)
         {
@@ -1382,7 +1382,7 @@ public ApiResponse< RestApiResultIndexPageBase > SetIndexConfigurationWithHttpIn
             if (indexPage == null)
                 throw new ApiException(400, "Missing required parameter 'indexPage' when calling WebsiteApi->SetIndexConfiguration");
 
-            var localVarPath = "/api/v1.0/{appId}/website/index";
+            var localVarPath = "./api/v1.0/{appId}/website/index";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1442,16 +1442,16 @@ public ApiResponse< RestApiResultIndexPageBase > SetIndexConfigurationWithHttpIn
             }
 
             return new ApiResponse<RestApiResultIndexPageBase>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultIndexPageBase) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultIndexPageBase)));
         }
 
         /// <summary>
-        /// Set Index Configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="indexPage">New index page definition</param>
+        /// <param name="appId"></param>
+        /// <param name="indexPage"></param>
         /// <returns>Task of RestApiResultIndexPageBase</returns>
         public async System.Threading.Tasks.Task<RestApiResultIndexPageBase> SetIndexConfigurationAsync (string appId, IndexPageBase indexPage)
         {
@@ -1461,11 +1461,11 @@ public async System.Threading.Tasks.Task<RestApiResultIndexPageBase> SetIndexCon
         }
 
         /// <summary>
-        /// Set Index Configuration 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="indexPage">New index page definition</param>
+        /// <param name="appId"></param>
+        /// <param name="indexPage"></param>
         /// <returns>Task of ApiResponse (RestApiResultIndexPageBase)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultIndexPageBase>> SetIndexConfigurationAsyncWithHttpInfo (string appId, IndexPageBase indexPage)
         {
@@ -1476,7 +1476,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultIndexPageBase>
             if (indexPage == null)
                 throw new ApiException(400, "Missing required parameter 'indexPage' when calling WebsiteApi->SetIndexConfiguration");
 
-            var localVarPath = "/api/v1.0/{appId}/website/index";
+            var localVarPath = "./api/v1.0/{appId}/website/index";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1536,16 +1536,16 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultIndexPageBase>
             }
 
             return new ApiResponse<RestApiResultIndexPageBase>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultIndexPageBase) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultIndexPageBase)));
         }
 
         /// <summary>
-        /// Upload Website Image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageLocation">Section for which to upload the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageLocation"></param>
         /// <param name="image">App Logo</param>
         /// <returns>RestApiResultWebsiteImage</returns>
         public RestApiResultWebsiteImage UploadWebsiteImage (string appId, string imageLocation, System.IO.Stream image)
@@ -1555,11 +1555,11 @@ public RestApiResultWebsiteImage UploadWebsiteImage (string appId, string imageL
         }
 
         /// <summary>
-        /// Upload Website Image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageLocation">Section for which to upload the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageLocation"></param>
         /// <param name="image">App Logo</param>
         /// <returns>ApiResponse of RestApiResultWebsiteImage</returns>
         public ApiResponse< RestApiResultWebsiteImage > UploadWebsiteImageWithHttpInfo (string appId, string imageLocation, System.IO.Stream image)
@@ -1574,7 +1574,7 @@ public ApiResponse< RestApiResultWebsiteImage > UploadWebsiteImageWithHttpInfo (
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling WebsiteApi->UploadWebsiteImage");
 
-            var localVarPath = "/api/v1.0/{appId}/website/image/{imageLocation}";
+            var localVarPath = "./api/v1.0/{appId}/website/image/{imageLocation}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1624,16 +1624,16 @@ public ApiResponse< RestApiResultWebsiteImage > UploadWebsiteImageWithHttpInfo (
             }
 
             return new ApiResponse<RestApiResultWebsiteImage>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultWebsiteImage) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWebsiteImage)));
         }
 
         /// <summary>
-        /// Upload Website Image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageLocation">Section for which to upload the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageLocation"></param>
         /// <param name="image">App Logo</param>
         /// <returns>Task of RestApiResultWebsiteImage</returns>
         public async System.Threading.Tasks.Task<RestApiResultWebsiteImage> UploadWebsiteImageAsync (string appId, string imageLocation, System.IO.Stream image)
@@ -1644,11 +1644,11 @@ public async System.Threading.Tasks.Task<RestApiResultWebsiteImage> UploadWebsit
         }
 
         /// <summary>
-        /// Upload Website Image 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="appId">Application identifier</param>
-        /// <param name="imageLocation">Section for which to upload the image</param>
+        /// <param name="appId"></param>
+        /// <param name="imageLocation"></param>
         /// <param name="image">App Logo</param>
         /// <returns>Task of ApiResponse (RestApiResultWebsiteImage)</returns>
         public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteImage>> UploadWebsiteImageAsyncWithHttpInfo (string appId, string imageLocation, System.IO.Stream image)
@@ -1663,7 +1663,7 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteImage>>
             if (image == null)
                 throw new ApiException(400, "Missing required parameter 'image' when calling WebsiteApi->UploadWebsiteImage");
 
-            var localVarPath = "/api/v1.0/{appId}/website/image/{imageLocation}";
+            var localVarPath = "./api/v1.0/{appId}/website/image/{imageLocation}";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1713,12 +1713,12 @@ public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWebsiteImage>>
             }
 
             return new ApiResponse<RestApiResultWebsiteImage>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 (RestApiResultWebsiteImage) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWebsiteImage)));
         }
 
         /// <summary>
-        /// Triggers a Check DNS Process 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1729,7 +1729,7 @@ public void WebsiteCheckNow (string appId)
         }
 
         /// <summary>
-        /// Triggers a Check DNS Process 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1740,7 +1740,7 @@ public ApiResponse<Object> WebsiteCheckNowWithHttpInfo (string appId)
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebsiteApi->WebsiteCheckNow");
 
-            var localVarPath = "/api/v1.0/{appId}/website/dnscheck";
+            var localVarPath = "./api/v1.0/{appId}/website/dnscheck";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1787,12 +1787,12 @@ public ApiResponse<Object> WebsiteCheckNowWithHttpInfo (string appId)
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
         /// <summary>
-        /// Triggers a Check DNS Process 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1804,7 +1804,7 @@ public async System.Threading.Tasks.Task WebsiteCheckNowAsync (string appId)
         }
 
         /// <summary>
-        /// Triggers a Check DNS Process 
+        ///  
         /// </summary>
         /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="appId"></param>
@@ -1815,7 +1815,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> WebsiteCheckNowAsy
             if (appId == null)
                 throw new ApiException(400, "Missing required parameter 'appId' when calling WebsiteApi->WebsiteCheckNow");
 
-            var localVarPath = "/api/v1.0/{appId}/website/dnscheck";
+            var localVarPath = "./api/v1.0/{appId}/website/dnscheck";
             var localVarPathParams = new Dictionary<String, String>();
             var localVarQueryParams = new List<KeyValuePair<String, String>>();
             var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
@@ -1862,7 +1862,7 @@ public async System.Threading.Tasks.Task<ApiResponse<Object>> WebsiteCheckNowAsy
             }
 
             return new ApiResponse<Object>(localVarStatusCode,
-                localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
                 null);
         }
 
diff --git a/src/Flipdish/Api/WhiteLabelBuildsApi.cs b/src/Flipdish/Api/WhiteLabelBuildsApi.cs
new file mode 100644
index 00000000..08c8f260
--- /dev/null
+++ b/src/Flipdish/Api/WhiteLabelBuildsApi.cs
@@ -0,0 +1,1209 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IWhiteLabelBuildsApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>string</returns>
+        string HealthCheck ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of string</returns>
+        ApiResponse<string> HealthCheckWithHttpInfo ();
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>RestApiResultBuildResultModel</returns>
+        RestApiResultBuildResultModel SubmitAndroidApps (string whiteLabelIds, string branch = null, string buildType = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultBuildResultModel</returns>
+        ApiResponse<RestApiResultBuildResultModel> SubmitAndroidAppsWithHttpInfo (string whiteLabelIds, string branch = null, string buildType = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="branch"></param>
+        /// <param name="lane"></param>
+        /// <param name="buildType"></param>
+        /// <returns>RestApiResultBuildResultModel</returns>
+        RestApiResultBuildResultModel SubmitAndroidBuild (string appId, string branch, string lane, string buildType);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="branch"></param>
+        /// <param name="lane"></param>
+        /// <param name="buildType"></param>
+        /// <returns>ApiResponse of RestApiResultBuildResultModel</returns>
+        ApiResponse<RestApiResultBuildResultModel> SubmitAndroidBuildWithHttpInfo (string appId, string branch, string lane, string buildType);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>RestApiResultBuildResultModel</returns>
+        RestApiResultBuildResultModel SubmitIosApps (string whiteLabelIds, string branch = null, string buildType = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultBuildResultModel</returns>
+        ApiResponse<RestApiResultBuildResultModel> SubmitIosAppsWithHttpInfo (string whiteLabelIds, string branch = null, string buildType = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="buildType"></param>
+        /// <param name="branch"></param>
+        /// <param name="submitForReview"> (optional)</param>
+        /// <returns>RestApiResultBuildResultModel</returns>
+        RestApiResultBuildResultModel SubmitIosBuild (string appId, string buildType, string branch, bool? submitForReview = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="buildType"></param>
+        /// <param name="branch"></param>
+        /// <param name="submitForReview"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultBuildResultModel</returns>
+        ApiResponse<RestApiResultBuildResultModel> SubmitIosBuildWithHttpInfo (string appId, string buildType, string branch, bool? submitForReview = null);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of string</returns>
+        System.Threading.Tasks.Task<string> HealthCheckAsync ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (string)</returns>
+        System.Threading.Tasks.Task<ApiResponse<string>> HealthCheckAsyncWithHttpInfo ();
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>Task of RestApiResultBuildResultModel</returns>
+        System.Threading.Tasks.Task<RestApiResultBuildResultModel> SubmitAndroidAppsAsync (string whiteLabelIds, string branch = null, string buildType = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultBuildResultModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultBuildResultModel>> SubmitAndroidAppsAsyncWithHttpInfo (string whiteLabelIds, string branch = null, string buildType = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="branch"></param>
+        /// <param name="lane"></param>
+        /// <param name="buildType"></param>
+        /// <returns>Task of RestApiResultBuildResultModel</returns>
+        System.Threading.Tasks.Task<RestApiResultBuildResultModel> SubmitAndroidBuildAsync (string appId, string branch, string lane, string buildType);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="branch"></param>
+        /// <param name="lane"></param>
+        /// <param name="buildType"></param>
+        /// <returns>Task of ApiResponse (RestApiResultBuildResultModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultBuildResultModel>> SubmitAndroidBuildAsyncWithHttpInfo (string appId, string branch, string lane, string buildType);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>Task of RestApiResultBuildResultModel</returns>
+        System.Threading.Tasks.Task<RestApiResultBuildResultModel> SubmitIosAppsAsync (string whiteLabelIds, string branch = null, string buildType = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultBuildResultModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultBuildResultModel>> SubmitIosAppsAsyncWithHttpInfo (string whiteLabelIds, string branch = null, string buildType = null);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="buildType"></param>
+        /// <param name="branch"></param>
+        /// <param name="submitForReview"> (optional)</param>
+        /// <returns>Task of RestApiResultBuildResultModel</returns>
+        System.Threading.Tasks.Task<RestApiResultBuildResultModel> SubmitIosBuildAsync (string appId, string buildType, string branch, bool? submitForReview = null);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="buildType"></param>
+        /// <param name="branch"></param>
+        /// <param name="submitForReview"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultBuildResultModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultBuildResultModel>> SubmitIosBuildAsyncWithHttpInfo (string appId, string buildType, string branch, bool? submitForReview = null);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class WhiteLabelBuildsApi : IWhiteLabelBuildsApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelBuildsApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public WhiteLabelBuildsApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelBuildsApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public WhiteLabelBuildsApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>string</returns>
+        public string HealthCheck ()
+        {
+             ApiResponse<string> localVarResponse = HealthCheckWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of string</returns>
+        public ApiResponse< string > HealthCheckWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/health";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("HealthCheck", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of string</returns>
+        public async System.Threading.Tasks.Task<string> HealthCheckAsync ()
+        {
+             ApiResponse<string> localVarResponse = await HealthCheckAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (string)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<string>> HealthCheckAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/health";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("HealthCheck", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>RestApiResultBuildResultModel</returns>
+        public RestApiResultBuildResultModel SubmitAndroidApps (string whiteLabelIds, string branch = null, string buildType = null)
+        {
+             ApiResponse<RestApiResultBuildResultModel> localVarResponse = SubmitAndroidAppsWithHttpInfo(whiteLabelIds, branch, buildType);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultBuildResultModel</returns>
+        public ApiResponse< RestApiResultBuildResultModel > SubmitAndroidAppsWithHttpInfo (string whiteLabelIds, string branch = null, string buildType = null)
+        {
+            // verify the required parameter 'whiteLabelIds' is set
+            if (whiteLabelIds == null)
+                throw new ApiException(400, "Missing required parameter 'whiteLabelIds' when calling WhiteLabelBuildsApi->SubmitAndroidApps");
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/android/multiple";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (whiteLabelIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "whiteLabelIds", whiteLabelIds)); // query parameter
+            if (branch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "branch", branch)); // query parameter
+            if (buildType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "buildType", buildType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SubmitAndroidApps", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBuildResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBuildResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBuildResultModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>Task of RestApiResultBuildResultModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultBuildResultModel> SubmitAndroidAppsAsync (string whiteLabelIds, string branch = null, string buildType = null)
+        {
+             ApiResponse<RestApiResultBuildResultModel> localVarResponse = await SubmitAndroidAppsAsyncWithHttpInfo(whiteLabelIds, branch, buildType);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultBuildResultModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBuildResultModel>> SubmitAndroidAppsAsyncWithHttpInfo (string whiteLabelIds, string branch = null, string buildType = null)
+        {
+            // verify the required parameter 'whiteLabelIds' is set
+            if (whiteLabelIds == null)
+                throw new ApiException(400, "Missing required parameter 'whiteLabelIds' when calling WhiteLabelBuildsApi->SubmitAndroidApps");
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/android/multiple";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (whiteLabelIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "whiteLabelIds", whiteLabelIds)); // query parameter
+            if (branch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "branch", branch)); // query parameter
+            if (buildType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "buildType", buildType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SubmitAndroidApps", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBuildResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBuildResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBuildResultModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="branch"></param>
+        /// <param name="lane"></param>
+        /// <param name="buildType"></param>
+        /// <returns>RestApiResultBuildResultModel</returns>
+        public RestApiResultBuildResultModel SubmitAndroidBuild (string appId, string branch, string lane, string buildType)
+        {
+             ApiResponse<RestApiResultBuildResultModel> localVarResponse = SubmitAndroidBuildWithHttpInfo(appId, branch, lane, buildType);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="branch"></param>
+        /// <param name="lane"></param>
+        /// <param name="buildType"></param>
+        /// <returns>ApiResponse of RestApiResultBuildResultModel</returns>
+        public ApiResponse< RestApiResultBuildResultModel > SubmitAndroidBuildWithHttpInfo (string appId, string branch, string lane, string buildType)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelBuildsApi->SubmitAndroidBuild");
+            // verify the required parameter 'branch' is set
+            if (branch == null)
+                throw new ApiException(400, "Missing required parameter 'branch' when calling WhiteLabelBuildsApi->SubmitAndroidBuild");
+            // verify the required parameter 'lane' is set
+            if (lane == null)
+                throw new ApiException(400, "Missing required parameter 'lane' when calling WhiteLabelBuildsApi->SubmitAndroidBuild");
+            // verify the required parameter 'buildType' is set
+            if (buildType == null)
+                throw new ApiException(400, "Missing required parameter 'buildType' when calling WhiteLabelBuildsApi->SubmitAndroidBuild");
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/{appId}/android";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (branch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "branch", branch)); // query parameter
+            if (lane != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "lane", lane)); // query parameter
+            if (buildType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "buildType", buildType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SubmitAndroidBuild", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBuildResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBuildResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBuildResultModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="branch"></param>
+        /// <param name="lane"></param>
+        /// <param name="buildType"></param>
+        /// <returns>Task of RestApiResultBuildResultModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultBuildResultModel> SubmitAndroidBuildAsync (string appId, string branch, string lane, string buildType)
+        {
+             ApiResponse<RestApiResultBuildResultModel> localVarResponse = await SubmitAndroidBuildAsyncWithHttpInfo(appId, branch, lane, buildType);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="branch"></param>
+        /// <param name="lane"></param>
+        /// <param name="buildType"></param>
+        /// <returns>Task of ApiResponse (RestApiResultBuildResultModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBuildResultModel>> SubmitAndroidBuildAsyncWithHttpInfo (string appId, string branch, string lane, string buildType)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelBuildsApi->SubmitAndroidBuild");
+            // verify the required parameter 'branch' is set
+            if (branch == null)
+                throw new ApiException(400, "Missing required parameter 'branch' when calling WhiteLabelBuildsApi->SubmitAndroidBuild");
+            // verify the required parameter 'lane' is set
+            if (lane == null)
+                throw new ApiException(400, "Missing required parameter 'lane' when calling WhiteLabelBuildsApi->SubmitAndroidBuild");
+            // verify the required parameter 'buildType' is set
+            if (buildType == null)
+                throw new ApiException(400, "Missing required parameter 'buildType' when calling WhiteLabelBuildsApi->SubmitAndroidBuild");
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/{appId}/android";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (branch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "branch", branch)); // query parameter
+            if (lane != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "lane", lane)); // query parameter
+            if (buildType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "buildType", buildType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SubmitAndroidBuild", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBuildResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBuildResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBuildResultModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>RestApiResultBuildResultModel</returns>
+        public RestApiResultBuildResultModel SubmitIosApps (string whiteLabelIds, string branch = null, string buildType = null)
+        {
+             ApiResponse<RestApiResultBuildResultModel> localVarResponse = SubmitIosAppsWithHttpInfo(whiteLabelIds, branch, buildType);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultBuildResultModel</returns>
+        public ApiResponse< RestApiResultBuildResultModel > SubmitIosAppsWithHttpInfo (string whiteLabelIds, string branch = null, string buildType = null)
+        {
+            // verify the required parameter 'whiteLabelIds' is set
+            if (whiteLabelIds == null)
+                throw new ApiException(400, "Missing required parameter 'whiteLabelIds' when calling WhiteLabelBuildsApi->SubmitIosApps");
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/ios/multiple";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (whiteLabelIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "whiteLabelIds", whiteLabelIds)); // query parameter
+            if (branch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "branch", branch)); // query parameter
+            if (buildType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "buildType", buildType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SubmitIosApps", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBuildResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBuildResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBuildResultModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>Task of RestApiResultBuildResultModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultBuildResultModel> SubmitIosAppsAsync (string whiteLabelIds, string branch = null, string buildType = null)
+        {
+             ApiResponse<RestApiResultBuildResultModel> localVarResponse = await SubmitIosAppsAsyncWithHttpInfo(whiteLabelIds, branch, buildType);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="whiteLabelIds"></param>
+        /// <param name="branch"> (optional)</param>
+        /// <param name="buildType"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultBuildResultModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBuildResultModel>> SubmitIosAppsAsyncWithHttpInfo (string whiteLabelIds, string branch = null, string buildType = null)
+        {
+            // verify the required parameter 'whiteLabelIds' is set
+            if (whiteLabelIds == null)
+                throw new ApiException(400, "Missing required parameter 'whiteLabelIds' when calling WhiteLabelBuildsApi->SubmitIosApps");
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/ios/multiple";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (whiteLabelIds != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "whiteLabelIds", whiteLabelIds)); // query parameter
+            if (branch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "branch", branch)); // query parameter
+            if (buildType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "buildType", buildType)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SubmitIosApps", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBuildResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBuildResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBuildResultModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="buildType"></param>
+        /// <param name="branch"></param>
+        /// <param name="submitForReview"> (optional)</param>
+        /// <returns>RestApiResultBuildResultModel</returns>
+        public RestApiResultBuildResultModel SubmitIosBuild (string appId, string buildType, string branch, bool? submitForReview = null)
+        {
+             ApiResponse<RestApiResultBuildResultModel> localVarResponse = SubmitIosBuildWithHttpInfo(appId, buildType, branch, submitForReview);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="buildType"></param>
+        /// <param name="branch"></param>
+        /// <param name="submitForReview"> (optional)</param>
+        /// <returns>ApiResponse of RestApiResultBuildResultModel</returns>
+        public ApiResponse< RestApiResultBuildResultModel > SubmitIosBuildWithHttpInfo (string appId, string buildType, string branch, bool? submitForReview = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelBuildsApi->SubmitIosBuild");
+            // verify the required parameter 'buildType' is set
+            if (buildType == null)
+                throw new ApiException(400, "Missing required parameter 'buildType' when calling WhiteLabelBuildsApi->SubmitIosBuild");
+            // verify the required parameter 'branch' is set
+            if (branch == null)
+                throw new ApiException(400, "Missing required parameter 'branch' when calling WhiteLabelBuildsApi->SubmitIosBuild");
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/{appId}/ios";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (buildType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "buildType", buildType)); // query parameter
+            if (branch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "branch", branch)); // query parameter
+            if (submitForReview != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "submitForReview", submitForReview)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SubmitIosBuild", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBuildResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBuildResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBuildResultModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="buildType"></param>
+        /// <param name="branch"></param>
+        /// <param name="submitForReview"> (optional)</param>
+        /// <returns>Task of RestApiResultBuildResultModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultBuildResultModel> SubmitIosBuildAsync (string appId, string buildType, string branch, bool? submitForReview = null)
+        {
+             ApiResponse<RestApiResultBuildResultModel> localVarResponse = await SubmitIosBuildAsyncWithHttpInfo(appId, buildType, branch, submitForReview);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="buildType"></param>
+        /// <param name="branch"></param>
+        /// <param name="submitForReview"> (optional)</param>
+        /// <returns>Task of ApiResponse (RestApiResultBuildResultModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultBuildResultModel>> SubmitIosBuildAsyncWithHttpInfo (string appId, string buildType, string branch, bool? submitForReview = null)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelBuildsApi->SubmitIosBuild");
+            // verify the required parameter 'buildType' is set
+            if (buildType == null)
+                throw new ApiException(400, "Missing required parameter 'buildType' when calling WhiteLabelBuildsApi->SubmitIosBuild");
+            // verify the required parameter 'branch' is set
+            if (branch == null)
+                throw new ApiException(400, "Missing required parameter 'branch' when calling WhiteLabelBuildsApi->SubmitIosBuild");
+
+            var localVarPath = "./api/v1.0/whitelabelbuilds/{appId}/ios";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (buildType != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "buildType", buildType)); // query parameter
+            if (branch != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "branch", branch)); // query parameter
+            if (submitForReview != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("", "submitForReview", submitForReview)); // query parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("SubmitIosBuild", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultBuildResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultBuildResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultBuildResultModel)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Api/WhiteLabelConfigApi.cs b/src/Flipdish/Api/WhiteLabelConfigApi.cs
new file mode 100644
index 00000000..93b989d1
--- /dev/null
+++ b/src/Flipdish/Api/WhiteLabelConfigApi.cs
@@ -0,0 +1,2204 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using RestSharp.Portable;
+using Flipdish.Client;
+using Flipdish.Model;
+
+namespace Flipdish.Api
+{
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public interface IWhiteLabelConfigApi : IApiAccessor
+    {
+        #region Synchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultAppGeneralConfigModel</returns>
+        RestApiResultAppGeneralConfigModel GetAppGeneralConfig (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultAppGeneralConfigModel</returns>
+        ApiResponse<RestApiResultAppGeneralConfigModel> GetAppGeneralConfigWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultAppStoreConfigModel</returns>
+        RestApiResultAppStoreConfigModel GetAppStoreConfig (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultAppStoreConfigModel</returns>
+        ApiResponse<RestApiResultAppStoreConfigModel> GetAppStoreConfigWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultPlayStoreConfigModel</returns>
+        RestApiResultPlayStoreConfigModel GetPlayStoreConfig (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultPlayStoreConfigModel</returns>
+        ApiResponse<RestApiResultPlayStoreConfigModel> GetPlayStoreConfigWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="wlid"></param>
+        /// <returns>RestApiResultWhiteLabelConfigModel</returns>
+        RestApiResultWhiteLabelConfigModel GetWhiteLabelConfig (int? wlid);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="wlid"></param>
+        /// <returns>ApiResponse of RestApiResultWhiteLabelConfigModel</returns>
+        ApiResponse<RestApiResultWhiteLabelConfigModel> GetWhiteLabelConfigWithHttpInfo (int? wlid);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultWhiteLabelConfigModel</returns>
+        RestApiResultWhiteLabelConfigModel GetWhiteLabelConfigByAppNameId (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultWhiteLabelConfigModel</returns>
+        ApiResponse<RestApiResultWhiteLabelConfigModel> GetWhiteLabelConfigByAppNameIdWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>string</returns>
+        string HealthCheck ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of string</returns>
+        ApiResponse<string> HealthCheckWithHttpInfo ();
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appGeneralConfig"></param>
+        /// <returns>RestApiResultAppGeneralConfigModel</returns>
+        RestApiResultAppGeneralConfigModel UpdateAppGeneralConfig (string appId, AppGeneralConfigModel appGeneralConfig);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appGeneralConfig"></param>
+        /// <returns>ApiResponse of RestApiResultAppGeneralConfigModel</returns>
+        ApiResponse<RestApiResultAppGeneralConfigModel> UpdateAppGeneralConfigWithHttpInfo (string appId, AppGeneralConfigModel appGeneralConfig);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreConfig"></param>
+        /// <returns>RestApiResultAppStoreConfigModel</returns>
+        RestApiResultAppStoreConfigModel UpdateAppStoreConfig (string appId, AppStoreConfigModel appStoreConfig);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreConfig"></param>
+        /// <returns>ApiResponse of RestApiResultAppStoreConfigModel</returns>
+        ApiResponse<RestApiResultAppStoreConfigModel> UpdateAppStoreConfigWithHttpInfo (string appId, AppStoreConfigModel appStoreConfig);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="playStoreConfig"></param>
+        /// <returns>RestApiResultPlayStoreConfigModel</returns>
+        RestApiResultPlayStoreConfigModel UpdatePlayStoreConfig (string appId, PlayStoreConfigModel playStoreConfig);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="playStoreConfig"></param>
+        /// <returns>ApiResponse of RestApiResultPlayStoreConfigModel</returns>
+        ApiResponse<RestApiResultPlayStoreConfigModel> UpdatePlayStoreConfigWithHttpInfo (string appId, PlayStoreConfigModel playStoreConfig);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="_file"></param>
+        /// <returns>RestApiResultAssetResultModel</returns>
+        RestApiResultAssetResultModel UploadAppStoreIcon (string appId, HttpPostedFileBase _file);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="_file"></param>
+        /// <returns>ApiResponse of RestApiResultAssetResultModel</returns>
+        ApiResponse<RestApiResultAssetResultModel> UploadAppStoreIconWithHttpInfo (string appId, HttpPostedFileBase _file);
+        #endregion Synchronous Operations
+        #region Asynchronous Operations
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultAppGeneralConfigModel</returns>
+        System.Threading.Tasks.Task<RestApiResultAppGeneralConfigModel> GetAppGeneralConfigAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppGeneralConfigModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppGeneralConfigModel>> GetAppGeneralConfigAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultAppStoreConfigModel</returns>
+        System.Threading.Tasks.Task<RestApiResultAppStoreConfigModel> GetAppStoreConfigAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreConfigModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreConfigModel>> GetAppStoreConfigAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultPlayStoreConfigModel</returns>
+        System.Threading.Tasks.Task<RestApiResultPlayStoreConfigModel> GetPlayStoreConfigAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultPlayStoreConfigModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultPlayStoreConfigModel>> GetPlayStoreConfigAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="wlid"></param>
+        /// <returns>Task of RestApiResultWhiteLabelConfigModel</returns>
+        System.Threading.Tasks.Task<RestApiResultWhiteLabelConfigModel> GetWhiteLabelConfigAsync (int? wlid);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="wlid"></param>
+        /// <returns>Task of ApiResponse (RestApiResultWhiteLabelConfigModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultWhiteLabelConfigModel>> GetWhiteLabelConfigAsyncWithHttpInfo (int? wlid);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultWhiteLabelConfigModel</returns>
+        System.Threading.Tasks.Task<RestApiResultWhiteLabelConfigModel> GetWhiteLabelConfigByAppNameIdAsync (string appId);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultWhiteLabelConfigModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultWhiteLabelConfigModel>> GetWhiteLabelConfigByAppNameIdAsyncWithHttpInfo (string appId);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of string</returns>
+        System.Threading.Tasks.Task<string> HealthCheckAsync ();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (string)</returns>
+        System.Threading.Tasks.Task<ApiResponse<string>> HealthCheckAsyncWithHttpInfo ();
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appGeneralConfig"></param>
+        /// <returns>Task of RestApiResultAppGeneralConfigModel</returns>
+        System.Threading.Tasks.Task<RestApiResultAppGeneralConfigModel> UpdateAppGeneralConfigAsync (string appId, AppGeneralConfigModel appGeneralConfig);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appGeneralConfig"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppGeneralConfigModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppGeneralConfigModel>> UpdateAppGeneralConfigAsyncWithHttpInfo (string appId, AppGeneralConfigModel appGeneralConfig);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreConfig"></param>
+        /// <returns>Task of RestApiResultAppStoreConfigModel</returns>
+        System.Threading.Tasks.Task<RestApiResultAppStoreConfigModel> UpdateAppStoreConfigAsync (string appId, AppStoreConfigModel appStoreConfig);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreConfig"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreConfigModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreConfigModel>> UpdateAppStoreConfigAsyncWithHttpInfo (string appId, AppStoreConfigModel appStoreConfig);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="playStoreConfig"></param>
+        /// <returns>Task of RestApiResultPlayStoreConfigModel</returns>
+        System.Threading.Tasks.Task<RestApiResultPlayStoreConfigModel> UpdatePlayStoreConfigAsync (string appId, PlayStoreConfigModel playStoreConfig);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="playStoreConfig"></param>
+        /// <returns>Task of ApiResponse (RestApiResultPlayStoreConfigModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultPlayStoreConfigModel>> UpdatePlayStoreConfigAsyncWithHttpInfo (string appId, PlayStoreConfigModel playStoreConfig);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="_file"></param>
+        /// <returns>Task of RestApiResultAssetResultModel</returns>
+        System.Threading.Tasks.Task<RestApiResultAssetResultModel> UploadAppStoreIconAsync (string appId, HttpPostedFileBase _file);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// 
+        /// </remarks>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="_file"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAssetResultModel)</returns>
+        System.Threading.Tasks.Task<ApiResponse<RestApiResultAssetResultModel>> UploadAppStoreIconAsyncWithHttpInfo (string appId, HttpPostedFileBase _file);
+        #endregion Asynchronous Operations
+    }
+
+    /// <summary>
+    /// Represents a collection of functions to interact with the API endpoints
+    /// </summary>
+    public partial class WhiteLabelConfigApi : IWhiteLabelConfigApi
+    {
+        private Flipdish.Client.ExceptionFactory _exceptionFactory = (name, response) => null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelConfigApi"/> class.
+        /// </summary>
+        /// <returns></returns>
+        public WhiteLabelConfigApi(String basePath)
+        {
+            this.Configuration = new Flipdish.Client.Configuration { BasePath = basePath };
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelConfigApi"/> class
+        /// using Configuration object
+        /// </summary>
+        /// <param name="configuration">An instance of Configuration</param>
+        /// <returns></returns>
+        public WhiteLabelConfigApi(Flipdish.Client.Configuration configuration = null)
+        {
+            if (configuration == null) // use the default one in Configuration
+                this.Configuration = Flipdish.Client.Configuration.Default;
+            else
+                this.Configuration = configuration;
+
+            ExceptionFactory = Flipdish.Client.Configuration.DefaultExceptionFactory;
+        }
+
+        /// <summary>
+        /// Gets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        public String GetBasePath()
+        {
+            return this.Configuration.ApiClient.RestClient.BaseUrl.ToString();
+        }
+
+        /// <summary>
+        /// Sets the base path of the API client.
+        /// </summary>
+        /// <value>The base path</value>
+        [Obsolete("SetBasePath is deprecated, please do 'Configuration.ApiClient = new ApiClient(\"http://new-path\")' instead.")]
+        public void SetBasePath(String basePath)
+        {
+            // do nothing
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration object
+        /// </summary>
+        /// <value>An instance of the Configuration</value>
+        public Flipdish.Client.Configuration Configuration {get; set;}
+
+        /// <summary>
+        /// Provides a factory method hook for the creation of exceptions.
+        /// </summary>
+        public Flipdish.Client.ExceptionFactory ExceptionFactory
+        {
+            get
+            {
+                if (_exceptionFactory != null && _exceptionFactory.GetInvocationList().Length > 1)
+                {
+                    throw new InvalidOperationException("Multicast delegate for ExceptionFactory is unsupported.");
+                }
+                return _exceptionFactory;
+            }
+            set { _exceptionFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets the default header.
+        /// </summary>
+        /// <returns>Dictionary of HTTP header</returns>
+        [Obsolete("DefaultHeader is deprecated, please use Configuration.DefaultHeader instead.")]
+        public IDictionary<String, String> DefaultHeader()
+        {
+            return new ReadOnlyDictionary<string, string>(this.Configuration.DefaultHeader);
+        }
+
+        /// <summary>
+        /// Add default header.
+        /// </summary>
+        /// <param name="key">Header field name.</param>
+        /// <param name="value">Header field value.</param>
+        /// <returns></returns>
+        [Obsolete("AddDefaultHeader is deprecated, please use Configuration.AddDefaultHeader instead.")]
+        public void AddDefaultHeader(string key, string value)
+        {
+            this.Configuration.AddDefaultHeader(key, value);
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultAppGeneralConfigModel</returns>
+        public RestApiResultAppGeneralConfigModel GetAppGeneralConfig (string appId)
+        {
+             ApiResponse<RestApiResultAppGeneralConfigModel> localVarResponse = GetAppGeneralConfigWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultAppGeneralConfigModel</returns>
+        public ApiResponse< RestApiResultAppGeneralConfigModel > GetAppGeneralConfigWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->GetAppGeneralConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/general";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppGeneralConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppGeneralConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppGeneralConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppGeneralConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultAppGeneralConfigModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppGeneralConfigModel> GetAppGeneralConfigAsync (string appId)
+        {
+             ApiResponse<RestApiResultAppGeneralConfigModel> localVarResponse = await GetAppGeneralConfigAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppGeneralConfigModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppGeneralConfigModel>> GetAppGeneralConfigAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->GetAppGeneralConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/general";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppGeneralConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppGeneralConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppGeneralConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppGeneralConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultAppStoreConfigModel</returns>
+        public RestApiResultAppStoreConfigModel GetAppStoreConfig (string appId)
+        {
+             ApiResponse<RestApiResultAppStoreConfigModel> localVarResponse = GetAppStoreConfigWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultAppStoreConfigModel</returns>
+        public ApiResponse< RestApiResultAppStoreConfigModel > GetAppStoreConfigWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->GetAppStoreConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/appstore";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppStoreConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultAppStoreConfigModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppStoreConfigModel> GetAppStoreConfigAsync (string appId)
+        {
+             ApiResponse<RestApiResultAppStoreConfigModel> localVarResponse = await GetAppStoreConfigAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreConfigModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreConfigModel>> GetAppStoreConfigAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->GetAppStoreConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/appstore";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetAppStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppStoreConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultPlayStoreConfigModel</returns>
+        public RestApiResultPlayStoreConfigModel GetPlayStoreConfig (string appId)
+        {
+             ApiResponse<RestApiResultPlayStoreConfigModel> localVarResponse = GetPlayStoreConfigWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultPlayStoreConfigModel</returns>
+        public ApiResponse< RestApiResultPlayStoreConfigModel > GetPlayStoreConfigWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->GetPlayStoreConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/playstore";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPlayStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPlayStoreConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPlayStoreConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPlayStoreConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultPlayStoreConfigModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultPlayStoreConfigModel> GetPlayStoreConfigAsync (string appId)
+        {
+             ApiResponse<RestApiResultPlayStoreConfigModel> localVarResponse = await GetPlayStoreConfigAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultPlayStoreConfigModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPlayStoreConfigModel>> GetPlayStoreConfigAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->GetPlayStoreConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/playstore";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetPlayStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPlayStoreConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPlayStoreConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPlayStoreConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="wlid"></param>
+        /// <returns>RestApiResultWhiteLabelConfigModel</returns>
+        public RestApiResultWhiteLabelConfigModel GetWhiteLabelConfig (int? wlid)
+        {
+             ApiResponse<RestApiResultWhiteLabelConfigModel> localVarResponse = GetWhiteLabelConfigWithHttpInfo(wlid);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="wlid"></param>
+        /// <returns>ApiResponse of RestApiResultWhiteLabelConfigModel</returns>
+        public ApiResponse< RestApiResultWhiteLabelConfigModel > GetWhiteLabelConfigWithHttpInfo (int? wlid)
+        {
+            // verify the required parameter 'wlid' is set
+            if (wlid == null)
+                throw new ApiException(400, "Missing required parameter 'wlid' when calling WhiteLabelConfigApi->GetWhiteLabelConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/id/{wlid}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (wlid != null) localVarPathParams.Add("wlid", this.Configuration.ApiClient.ParameterToString(wlid)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetWhiteLabelConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultWhiteLabelConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultWhiteLabelConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWhiteLabelConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="wlid"></param>
+        /// <returns>Task of RestApiResultWhiteLabelConfigModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultWhiteLabelConfigModel> GetWhiteLabelConfigAsync (int? wlid)
+        {
+             ApiResponse<RestApiResultWhiteLabelConfigModel> localVarResponse = await GetWhiteLabelConfigAsyncWithHttpInfo(wlid);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="wlid"></param>
+        /// <returns>Task of ApiResponse (RestApiResultWhiteLabelConfigModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWhiteLabelConfigModel>> GetWhiteLabelConfigAsyncWithHttpInfo (int? wlid)
+        {
+            // verify the required parameter 'wlid' is set
+            if (wlid == null)
+                throw new ApiException(400, "Missing required parameter 'wlid' when calling WhiteLabelConfigApi->GetWhiteLabelConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/id/{wlid}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (wlid != null) localVarPathParams.Add("wlid", this.Configuration.ApiClient.ParameterToString(wlid)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetWhiteLabelConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultWhiteLabelConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultWhiteLabelConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWhiteLabelConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>RestApiResultWhiteLabelConfigModel</returns>
+        public RestApiResultWhiteLabelConfigModel GetWhiteLabelConfigByAppNameId (string appId)
+        {
+             ApiResponse<RestApiResultWhiteLabelConfigModel> localVarResponse = GetWhiteLabelConfigByAppNameIdWithHttpInfo(appId);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>ApiResponse of RestApiResultWhiteLabelConfigModel</returns>
+        public ApiResponse< RestApiResultWhiteLabelConfigModel > GetWhiteLabelConfigByAppNameIdWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->GetWhiteLabelConfigByAppNameId");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/name/{appId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetWhiteLabelConfigByAppNameId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultWhiteLabelConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultWhiteLabelConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWhiteLabelConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of RestApiResultWhiteLabelConfigModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultWhiteLabelConfigModel> GetWhiteLabelConfigByAppNameIdAsync (string appId)
+        {
+             ApiResponse<RestApiResultWhiteLabelConfigModel> localVarResponse = await GetWhiteLabelConfigByAppNameIdAsyncWithHttpInfo(appId);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <returns>Task of ApiResponse (RestApiResultWhiteLabelConfigModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultWhiteLabelConfigModel>> GetWhiteLabelConfigByAppNameIdAsyncWithHttpInfo (string appId)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->GetWhiteLabelConfigByAppNameId");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/name/{appId}";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("GetWhiteLabelConfigByAppNameId", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultWhiteLabelConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultWhiteLabelConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultWhiteLabelConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>string</returns>
+        public string HealthCheck ()
+        {
+             ApiResponse<string> localVarResponse = HealthCheckWithHttpInfo();
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>ApiResponse of string</returns>
+        public ApiResponse< string > HealthCheckWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/health";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("HealthCheck", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of string</returns>
+        public async System.Threading.Tasks.Task<string> HealthCheckAsync ()
+        {
+             ApiResponse<string> localVarResponse = await HealthCheckAsyncWithHttpInfo();
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <returns>Task of ApiResponse (string)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<string>> HealthCheckAsyncWithHttpInfo ()
+        {
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/health";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("HealthCheck", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<string>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appGeneralConfig"></param>
+        /// <returns>RestApiResultAppGeneralConfigModel</returns>
+        public RestApiResultAppGeneralConfigModel UpdateAppGeneralConfig (string appId, AppGeneralConfigModel appGeneralConfig)
+        {
+             ApiResponse<RestApiResultAppGeneralConfigModel> localVarResponse = UpdateAppGeneralConfigWithHttpInfo(appId, appGeneralConfig);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appGeneralConfig"></param>
+        /// <returns>ApiResponse of RestApiResultAppGeneralConfigModel</returns>
+        public ApiResponse< RestApiResultAppGeneralConfigModel > UpdateAppGeneralConfigWithHttpInfo (string appId, AppGeneralConfigModel appGeneralConfig)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->UpdateAppGeneralConfig");
+            // verify the required parameter 'appGeneralConfig' is set
+            if (appGeneralConfig == null)
+                throw new ApiException(400, "Missing required parameter 'appGeneralConfig' when calling WhiteLabelConfigApi->UpdateAppGeneralConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/general";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appGeneralConfig != null && appGeneralConfig.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appGeneralConfig); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appGeneralConfig; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateAppGeneralConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppGeneralConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppGeneralConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppGeneralConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appGeneralConfig"></param>
+        /// <returns>Task of RestApiResultAppGeneralConfigModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppGeneralConfigModel> UpdateAppGeneralConfigAsync (string appId, AppGeneralConfigModel appGeneralConfig)
+        {
+             ApiResponse<RestApiResultAppGeneralConfigModel> localVarResponse = await UpdateAppGeneralConfigAsyncWithHttpInfo(appId, appGeneralConfig);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appGeneralConfig"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppGeneralConfigModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppGeneralConfigModel>> UpdateAppGeneralConfigAsyncWithHttpInfo (string appId, AppGeneralConfigModel appGeneralConfig)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->UpdateAppGeneralConfig");
+            // verify the required parameter 'appGeneralConfig' is set
+            if (appGeneralConfig == null)
+                throw new ApiException(400, "Missing required parameter 'appGeneralConfig' when calling WhiteLabelConfigApi->UpdateAppGeneralConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/general";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appGeneralConfig != null && appGeneralConfig.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appGeneralConfig); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appGeneralConfig; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateAppGeneralConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppGeneralConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppGeneralConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppGeneralConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreConfig"></param>
+        /// <returns>RestApiResultAppStoreConfigModel</returns>
+        public RestApiResultAppStoreConfigModel UpdateAppStoreConfig (string appId, AppStoreConfigModel appStoreConfig)
+        {
+             ApiResponse<RestApiResultAppStoreConfigModel> localVarResponse = UpdateAppStoreConfigWithHttpInfo(appId, appStoreConfig);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreConfig"></param>
+        /// <returns>ApiResponse of RestApiResultAppStoreConfigModel</returns>
+        public ApiResponse< RestApiResultAppStoreConfigModel > UpdateAppStoreConfigWithHttpInfo (string appId, AppStoreConfigModel appStoreConfig)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->UpdateAppStoreConfig");
+            // verify the required parameter 'appStoreConfig' is set
+            if (appStoreConfig == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreConfig' when calling WhiteLabelConfigApi->UpdateAppStoreConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/appstore";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appStoreConfig != null && appStoreConfig.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreConfig); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appStoreConfig; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateAppStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppStoreConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreConfig"></param>
+        /// <returns>Task of RestApiResultAppStoreConfigModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAppStoreConfigModel> UpdateAppStoreConfigAsync (string appId, AppStoreConfigModel appStoreConfig)
+        {
+             ApiResponse<RestApiResultAppStoreConfigModel> localVarResponse = await UpdateAppStoreConfigAsyncWithHttpInfo(appId, appStoreConfig);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="appStoreConfig"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAppStoreConfigModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAppStoreConfigModel>> UpdateAppStoreConfigAsyncWithHttpInfo (string appId, AppStoreConfigModel appStoreConfig)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->UpdateAppStoreConfig");
+            // verify the required parameter 'appStoreConfig' is set
+            if (appStoreConfig == null)
+                throw new ApiException(400, "Missing required parameter 'appStoreConfig' when calling WhiteLabelConfigApi->UpdateAppStoreConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/appstore";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (appStoreConfig != null && appStoreConfig.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(appStoreConfig); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = appStoreConfig; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdateAppStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAppStoreConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAppStoreConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAppStoreConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="playStoreConfig"></param>
+        /// <returns>RestApiResultPlayStoreConfigModel</returns>
+        public RestApiResultPlayStoreConfigModel UpdatePlayStoreConfig (string appId, PlayStoreConfigModel playStoreConfig)
+        {
+             ApiResponse<RestApiResultPlayStoreConfigModel> localVarResponse = UpdatePlayStoreConfigWithHttpInfo(appId, playStoreConfig);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="playStoreConfig"></param>
+        /// <returns>ApiResponse of RestApiResultPlayStoreConfigModel</returns>
+        public ApiResponse< RestApiResultPlayStoreConfigModel > UpdatePlayStoreConfigWithHttpInfo (string appId, PlayStoreConfigModel playStoreConfig)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->UpdatePlayStoreConfig");
+            // verify the required parameter 'playStoreConfig' is set
+            if (playStoreConfig == null)
+                throw new ApiException(400, "Missing required parameter 'playStoreConfig' when calling WhiteLabelConfigApi->UpdatePlayStoreConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/playstore";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (playStoreConfig != null && playStoreConfig.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(playStoreConfig); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = playStoreConfig; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePlayStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPlayStoreConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPlayStoreConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPlayStoreConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="playStoreConfig"></param>
+        /// <returns>Task of RestApiResultPlayStoreConfigModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultPlayStoreConfigModel> UpdatePlayStoreConfigAsync (string appId, PlayStoreConfigModel playStoreConfig)
+        {
+             ApiResponse<RestApiResultPlayStoreConfigModel> localVarResponse = await UpdatePlayStoreConfigAsyncWithHttpInfo(appId, playStoreConfig);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="playStoreConfig"></param>
+        /// <returns>Task of ApiResponse (RestApiResultPlayStoreConfigModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultPlayStoreConfigModel>> UpdatePlayStoreConfigAsyncWithHttpInfo (string appId, PlayStoreConfigModel playStoreConfig)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->UpdatePlayStoreConfig");
+            // verify the required parameter 'playStoreConfig' is set
+            if (playStoreConfig == null)
+                throw new ApiException(400, "Missing required parameter 'playStoreConfig' when calling WhiteLabelConfigApi->UpdatePlayStoreConfig");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/playstore";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (playStoreConfig != null && playStoreConfig.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(playStoreConfig); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = playStoreConfig; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UpdatePlayStoreConfig", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultPlayStoreConfigModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultPlayStoreConfigModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultPlayStoreConfigModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="_file"></param>
+        /// <returns>RestApiResultAssetResultModel</returns>
+        public RestApiResultAssetResultModel UploadAppStoreIcon (string appId, HttpPostedFileBase _file)
+        {
+             ApiResponse<RestApiResultAssetResultModel> localVarResponse = UploadAppStoreIconWithHttpInfo(appId, _file);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="_file"></param>
+        /// <returns>ApiResponse of RestApiResultAssetResultModel</returns>
+        public ApiResponse< RestApiResultAssetResultModel > UploadAppStoreIconWithHttpInfo (string appId, HttpPostedFileBase _file)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->UploadAppStoreIcon");
+            // verify the required parameter '_file' is set
+            if (_file == null)
+                throw new ApiException(400, "Missing required parameter '_file' when calling WhiteLabelConfigApi->UploadAppStoreIcon");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/app-store-icon";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (_file != null && _file.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(_file); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = _file; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadAppStoreIcon", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAssetResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAssetResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAssetResultModel)));
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="_file"></param>
+        /// <returns>Task of RestApiResultAssetResultModel</returns>
+        public async System.Threading.Tasks.Task<RestApiResultAssetResultModel> UploadAppStoreIconAsync (string appId, HttpPostedFileBase _file)
+        {
+             ApiResponse<RestApiResultAssetResultModel> localVarResponse = await UploadAppStoreIconAsyncWithHttpInfo(appId, _file);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <exception cref="Flipdish.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="appId"></param>
+        /// <param name="_file"></param>
+        /// <returns>Task of ApiResponse (RestApiResultAssetResultModel)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<RestApiResultAssetResultModel>> UploadAppStoreIconAsyncWithHttpInfo (string appId, HttpPostedFileBase _file)
+        {
+            // verify the required parameter 'appId' is set
+            if (appId == null)
+                throw new ApiException(400, "Missing required parameter 'appId' when calling WhiteLabelConfigApi->UploadAppStoreIcon");
+            // verify the required parameter '_file' is set
+            if (_file == null)
+                throw new ApiException(400, "Missing required parameter '_file' when calling WhiteLabelConfigApi->UploadAppStoreIcon");
+
+            var localVarPath = "./api/v1.0/whitelabelconfig/{appId}/app-store-icon";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json", 
+                "text/json", 
+                "application/xml", 
+                "text/xml", 
+                "application/x-www-form-urlencoded"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "application/json",
+                "text/json",
+                "application/xml",
+                "text/xml"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (appId != null) localVarPathParams.Add("appId", this.Configuration.ApiClient.ParameterToString(appId)); // path parameter
+            if (_file != null && _file.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(_file); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = _file; // byte array
+            }
+
+            // authentication (oauth2) required
+            // oauth required
+            if (!String.IsNullOrEmpty(this.Configuration.AccessToken))
+            {
+                localVarHeaderParams["Authorization"] = "Bearer " + this.Configuration.AccessToken;
+            }
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("UploadAppStoreIcon", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<RestApiResultAssetResultModel>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Key, x => x.Value.ToString()),
+                (RestApiResultAssetResultModel) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(RestApiResultAssetResultModel)));
+        }
+
+    }
+}
diff --git a/src/Flipdish/Client/ApiClient.cs b/src/Flipdish/Client/ApiClient.cs
index 549f4fae..715d95af 100644
--- a/src/Flipdish/Client/ApiClient.cs
+++ b/src/Flipdish/Client/ApiClient.cs
@@ -14,12 +14,12 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 using System.IO;
-using System.Web;
 using System.Linq;
 using System.Net;
 using System.Text;
 using Newtonsoft.Json;
-using RestSharp;
+using RestSharp.Portable;
+using RestSharp.Portable.HttpClient;
 
 namespace Flipdish.Client
 {
@@ -54,6 +54,7 @@ public ApiClient()
         {
             Configuration = Flipdish.Client.Configuration.Default;
             RestClient = new RestClient("https://api.flipdish.co");
+            RestClient.IgnoreResponseStatusCode = true;
         }
 
         /// <summary>
@@ -66,6 +67,7 @@ public ApiClient(Configuration config)
             Configuration = config ?? Flipdish.Client.Configuration.Default;
 
             RestClient = new RestClient(Configuration.BasePath);
+            RestClient.IgnoreResponseStatusCode = true;
         }
 
         /// <summary>
@@ -79,6 +81,7 @@ public ApiClient(String basePath = "https://api.flipdish.co")
                 throw new ArgumentException("basePath cannot be empty");
 
             RestClient = new RestClient(basePath);
+            RestClient.IgnoreResponseStatusCode = true;
             Configuration = Client.Configuration.Default;
         }
 
@@ -108,12 +111,14 @@ public ApiClient(String basePath = "https://api.flipdish.co")
 
         // Creates and sets up a RestRequest prior to a call.
         private RestRequest PrepareRequest(
-            String path, RestSharp.Method method, List<KeyValuePair<String, String>> queryParams, Object postBody,
+            String path, Method method, List<KeyValuePair<String, String>> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
             Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
             String contentType)
         {
             var request = new RestRequest(path, method);
+            // disable ResetSharp.Portable built-in serialization
+            request.Serializer = null;
 
             // add path parameter, if any
             foreach(var param in pathParams)
@@ -134,12 +139,12 @@ private RestRequest PrepareRequest(
             // add file parameter, if any
             foreach(var param in fileParams)
             {
-                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+                request.AddFile(param.Value);
             }
 
             if (postBody != null) // http body (model or byte[]) parameter
             {
-                request.AddParameter(contentType, postBody, ParameterType.RequestBody);
+                request.AddParameter(new Parameter { Value = postBody, Type = ParameterType.RequestBody, ContentType = contentType });
             }
 
             return request;
@@ -159,7 +164,7 @@ private RestRequest PrepareRequest(
         /// <param name="contentType">Content Type of the request</param>
         /// <returns>Object</returns>
         public Object CallApi(
-            String path, RestSharp.Method method, List<KeyValuePair<String, String>> queryParams, Object postBody,
+            String path, Method method, List<KeyValuePair<String, String>> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
             Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
             String contentType)
@@ -169,13 +174,13 @@ public Object CallApi(
                 pathParams, contentType);
 
             // set timeout
+            RestClient.Timeout = TimeSpan.FromMilliseconds(Configuration.Timeout);
             
-            RestClient.Timeout = Configuration.Timeout;
             // set user agent
             RestClient.UserAgent = Configuration.UserAgent;
 
             InterceptRequest(request);
-            var response = RestClient.Execute(request);
+            var response = RestClient.Execute(request).Result;
             InterceptResponse(request, response);
 
             return (Object) response;
@@ -194,7 +199,7 @@ public Object CallApi(
         /// <param name="contentType">Content type.</param>
         /// <returns>The Task instance.</returns>
         public async System.Threading.Tasks.Task<Object> CallApiAsync(
-            String path, RestSharp.Method method, List<KeyValuePair<String, String>> queryParams, Object postBody,
+            String path, Method method, List<KeyValuePair<String, String>> queryParams, Object postBody,
             Dictionary<String, String> headerParams, Dictionary<String, String> formParams,
             Dictionary<String, FileParameter> fileParams, Dictionary<String, String> pathParams,
             String contentType)
@@ -203,7 +208,7 @@ public async System.Threading.Tasks.Task<Object> CallApiAsync(
                 path, method, queryParams, postBody, headerParams, formParams, fileParams,
                 pathParams, contentType);
             InterceptRequest(request);
-            var response = await RestClient.ExecuteTaskAsync(request);
+            var response = await RestClient.Execute(request);
             InterceptResponse(request, response);
             return (Object)response;
         }
@@ -276,7 +281,7 @@ public string ParameterToString(object obj)
         /// <returns>Object representation of the JSON string.</returns>
         public object Deserialize(IRestResponse response, Type type)
         {
-            IList<Parameter> headers = response.Headers;
+            IHttpHeaders headers = response.Headers;
             if (type == typeof(byte[])) // return byte array
             {
                 return response.RawBytes;
diff --git a/src/Flipdish/Client/Configuration.cs b/src/Flipdish/Client/Configuration.cs
index 4bca5b2e..6e972fcb 100644
--- a/src/Flipdish/Client/Configuration.cs
+++ b/src/Flipdish/Client/Configuration.cs
@@ -57,11 +57,7 @@ public class Configuration : IReadableConfiguration
                     string.Format("Error calling {0}: {1}", methodName, response.Content),
                     response.Content);
             }
-            if (status == 0)
-            {
-                return new ApiException(status,
-                    string.Format("Error calling {0}: {1}", methodName, response.ErrorMessage), response.ErrorMessage);
-            }
+            
             return null;
         };
 
@@ -248,9 +244,8 @@ public virtual string BasePath {
         /// </summary>
         public virtual int Timeout
         {
-            
-            get { return ApiClient.RestClient.Timeout; }
-            set { ApiClient.RestClient.Timeout = value; }
+            get { return (int)ApiClient.RestClient.Timeout.GetValueOrDefault(TimeSpan.FromSeconds(0)).TotalMilliseconds; }
+            set { ApiClient.RestClient.Timeout = TimeSpan.FromMilliseconds(value); }
         }
 
         /// <summary>
@@ -419,8 +414,7 @@ public ApiClient CreateApiClient()
         public static String ToDebugReport()
         {
             String report = "C# SDK (Flipdish) Debug Report:\n";
-            report += "    OS: " + System.Environment.OSVersion + "\n";
-            report += "    .NET Framework Version: " + System.Environment.Version  + "\n";
+            report += "    OS: " + System.Runtime.InteropServices.RuntimeInformation.OSDescription + "\n";
             report += "    Version of the API: v1.0\n";
             report += "    SDK Package Version: 1.0.0\n";
 
diff --git a/src/Flipdish/Client/ExceptionFactory.cs b/src/Flipdish/Client/ExceptionFactory.cs
index 731f2d59..37cd1584 100644
--- a/src/Flipdish/Client/ExceptionFactory.cs
+++ b/src/Flipdish/Client/ExceptionFactory.cs
@@ -10,7 +10,7 @@
 
 
 using System;
-using RestSharp;
+using RestSharp.Portable;
 
 namespace Flipdish.Client
 {
diff --git a/src/Flipdish/Client/IApiAccessor.cs b/src/Flipdish/Client/IApiAccessor.cs
index 99224961..b4574ee8 100644
--- a/src/Flipdish/Client/IApiAccessor.cs
+++ b/src/Flipdish/Client/IApiAccessor.cs
@@ -13,7 +13,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using RestSharp;
+using RestSharp.Portable;
 
 namespace Flipdish.Client
 {
diff --git a/src/Flipdish/Flipdish.csproj b/src/Flipdish/Flipdish.csproj
index 51453899..af3b68fa 100644
--- a/src/Flipdish/Flipdish.csproj
+++ b/src/Flipdish/Flipdish.csproj
@@ -7,9 +7,9 @@ No description provided (generated by Swagger Codegen https://github.com/swagger
 OpenAPI spec version: v1.0
 
 -->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{4BF29234-5C39-4B57-9AB7-A80BB4210A51}</ProjectGuid>
@@ -17,7 +17,8 @@ OpenAPI spec version: v1.0
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Flipdish</RootNamespace>
     <AssemblyName>Flipdish</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,41 +39,14 @@ OpenAPI spec version: v1.0
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="JsonSubTypes">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-    </Reference>
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="**\*.cs"
              Exclude="obj\**" />
   </ItemGroup>
-  <ItemGroup>
-      <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 </Project>
 
diff --git a/src/Flipdish/Flipdish.nuspec b/src/Flipdish/Flipdish.nuspec
deleted file mode 100644
index c745d654..00000000
--- a/src/Flipdish/Flipdish.nuspec
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
-        <!-- The identifier that must be unique within the hosting gallery -->
-        <id>$id$</id>
-        <title>Flipdish Api Client Library</title>
-
-        <!-- The package version number that is used when resolving dependencies -->
-        <version>$version$</version>
-
-        <!-- Authors contain text that appears directly on the gallery -->
-        <authors>Flipdish</authors>
-
-        <!-- Owners are typically nuget.org identities that allow gallery
-             users to earily find other packages by the same owners.  -->
-        <owners>Flipdish</owners>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <developmentDependency>false</developmentDependency>
-
-        <!-- The description can be used in package manager UI. Note that the
-             nuget.org gallery uses information you add in the portal. -->
-        <description>Flipdish Client API C# library</description>
-
-        <!-- Dependencies are automatically installed when the package is installed -->
-        <dependencies>
-
-            <dependency id="NewtonSoft.Json" version="10.0.3" />
-            <dependency id="JsonSubTypes" version="1.2.0" />
-            <dependency id="RestSharp" version="105.1.0" />
-
-        </dependencies>
-    </metadata>
-    <files>
-
-        <!-- A readme.txt will be displayed when the package is installed -->
-        <file src="..\..\README.md" target="" />
-        <file src="..\..\docs\**\*.*" target="docs" />
-
-    </files>
-</package>
diff --git a/src/Flipdish/Model/Accept.cs b/src/Flipdish/Model/Accept.cs
index 91cc1d20..9b4d5aaf 100644
--- a/src/Flipdish/Model/Accept.cs
+++ b/src/Flipdish/Model/Accept.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Accept
     /// </summary>
     [DataContract]
-    public partial class Accept :  IEquatable<Accept>, IValidatableObject
+    public partial class Accept :  IEquatable<Accept>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Accept" /> class.
@@ -110,28 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // EstimatedMinutesForDelivery (int?) maximum
-            if(this.EstimatedMinutesForDelivery > (int?)200)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EstimatedMinutesForDelivery, must be a value less than or equal to 200.", new [] { "EstimatedMinutesForDelivery" });
-            }
-
-            // EstimatedMinutesForDelivery (int?) minimum
-            if(this.EstimatedMinutesForDelivery < (int?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EstimatedMinutesForDelivery, must be a value greater than or equal to 0.", new [] { "EstimatedMinutesForDelivery" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AcceptInvitationResult.cs b/src/Flipdish/Model/AcceptInvitationResult.cs
new file mode 100644
index 00000000..8d547ee4
--- /dev/null
+++ b/src/Flipdish/Model/AcceptInvitationResult.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// AcceptInvitationResult
+    /// </summary>
+    [DataContract]
+    public partial class AcceptInvitationResult :  IEquatable<AcceptInvitationResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcceptInvitationResult" /> class.
+        /// </summary>
+        /// <param name="isNewUser">Bool indicating if the user accepting the invitation is a new user.</param>
+        /// <param name="invitedEmailAddress">The email address that was invited..</param>
+        public AcceptInvitationResult(bool? isNewUser = default(bool?), string invitedEmailAddress = default(string))
+        {
+            this.IsNewUser = isNewUser;
+            this.InvitedEmailAddress = invitedEmailAddress;
+        }
+        
+        /// <summary>
+        /// Bool indicating if the user accepting the invitation is a new user
+        /// </summary>
+        /// <value>Bool indicating if the user accepting the invitation is a new user</value>
+        [DataMember(Name="IsNewUser", EmitDefaultValue=false)]
+        public bool? IsNewUser { get; set; }
+
+        /// <summary>
+        /// The email address that was invited.
+        /// </summary>
+        /// <value>The email address that was invited.</value>
+        [DataMember(Name="InvitedEmailAddress", EmitDefaultValue=false)]
+        public string InvitedEmailAddress { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AcceptInvitationResult {\n");
+            sb.Append("  IsNewUser: ").Append(IsNewUser).Append("\n");
+            sb.Append("  InvitedEmailAddress: ").Append(InvitedEmailAddress).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AcceptInvitationResult);
+        }
+
+        /// <summary>
+        /// Returns true if AcceptInvitationResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AcceptInvitationResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AcceptInvitationResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.IsNewUser == input.IsNewUser ||
+                    (this.IsNewUser != null &&
+                    this.IsNewUser.Equals(input.IsNewUser))
+                ) && 
+                (
+                    this.InvitedEmailAddress == input.InvitedEmailAddress ||
+                    (this.InvitedEmailAddress != null &&
+                    this.InvitedEmailAddress.Equals(input.InvitedEmailAddress))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.IsNewUser != null)
+                    hashCode = hashCode * 59 + this.IsNewUser.GetHashCode();
+                if (this.InvitedEmailAddress != null)
+                    hashCode = hashCode * 59 + this.InvitedEmailAddress.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AccountDetail.cs b/src/Flipdish/Model/AccountDetail.cs
index 4cdd8b6a..ff5927b5 100644
--- a/src/Flipdish/Model/AccountDetail.cs
+++ b/src/Flipdish/Model/AccountDetail.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Account details
     /// </summary>
     [DataContract]
-    public partial class AccountDetail :  IEquatable<AccountDetail>, IValidatableObject
+    public partial class AccountDetail :  IEquatable<AccountDetail>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AccountDetail" /> class.
@@ -43,7 +41,8 @@ public partial class AccountDetail :  IEquatable<AccountDetail>, IValidatableObj
         /// <param name="timeZoneInfoId">Time Zone Info Id.</param>
         /// <param name="displayTimesInUserLocalTimeZone">Display the time in time zone local to the user.</param>
         /// <param name="showHiddenFeatures">Show hidden features.</param>
-        public AccountDetail(string email = default(string), List<SignupStep> signupSteps = default(List<SignupStep>), bool? isVerified = default(bool?), bool? isSelfServeUser = default(bool?), int? accountId = default(int?), string name = default(string), string language = default(string), string timeZoneInfoId = default(string), bool? displayTimesInUserLocalTimeZone = default(bool?), bool? showHiddenFeatures = default(bool?))
+        /// <param name="createdAt">User created at.</param>
+        public AccountDetail(string email = default(string), List<SignupStep> signupSteps = default(List<SignupStep>), bool? isVerified = default(bool?), bool? isSelfServeUser = default(bool?), int? accountId = default(int?), string name = default(string), string language = default(string), string timeZoneInfoId = default(string), bool? displayTimesInUserLocalTimeZone = default(bool?), bool? showHiddenFeatures = default(bool?), DateTime? createdAt = default(DateTime?))
         {
             this.Email = email;
             this.SignupSteps = signupSteps;
@@ -55,6 +54,7 @@ public partial class AccountDetail :  IEquatable<AccountDetail>, IValidatableObj
             this.TimeZoneInfoId = timeZoneInfoId;
             this.DisplayTimesInUserLocalTimeZone = displayTimesInUserLocalTimeZone;
             this.ShowHiddenFeatures = showHiddenFeatures;
+            this.CreatedAt = createdAt;
         }
         
         /// <summary>
@@ -127,6 +127,13 @@ public partial class AccountDetail :  IEquatable<AccountDetail>, IValidatableObj
         [DataMember(Name="ShowHiddenFeatures", EmitDefaultValue=false)]
         public bool? ShowHiddenFeatures { get; set; }
 
+        /// <summary>
+        /// User created at
+        /// </summary>
+        /// <value>User created at</value>
+        [DataMember(Name="CreatedAt", EmitDefaultValue=false)]
+        public DateTime? CreatedAt { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -145,6 +152,7 @@ public override string ToString()
             sb.Append("  TimeZoneInfoId: ").Append(TimeZoneInfoId).Append("\n");
             sb.Append("  DisplayTimesInUserLocalTimeZone: ").Append(DisplayTimesInUserLocalTimeZone).Append("\n");
             sb.Append("  ShowHiddenFeatures: ").Append(ShowHiddenFeatures).Append("\n");
+            sb.Append("  CreatedAt: ").Append(CreatedAt).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -228,6 +236,11 @@ public bool Equals(AccountDetail input)
                     this.ShowHiddenFeatures == input.ShowHiddenFeatures ||
                     (this.ShowHiddenFeatures != null &&
                     this.ShowHiddenFeatures.Equals(input.ShowHiddenFeatures))
+                ) && 
+                (
+                    this.CreatedAt == input.CreatedAt ||
+                    (this.CreatedAt != null &&
+                    this.CreatedAt.Equals(input.CreatedAt))
                 );
         }
 
@@ -260,19 +273,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.DisplayTimesInUserLocalTimeZone.GetHashCode();
                 if (this.ShowHiddenFeatures != null)
                     hashCode = hashCode * 59 + this.ShowHiddenFeatures.GetHashCode();
+                if (this.CreatedAt != null)
+                    hashCode = hashCode * 59 + this.CreatedAt.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AccountDetailBase.cs b/src/Flipdish/Model/AccountDetailBase.cs
index 1a352425..7b872258 100644
--- a/src/Flipdish/Model/AccountDetailBase.cs
+++ b/src/Flipdish/Model/AccountDetailBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Account Details Base
     /// </summary>
     [DataContract]
-    public partial class AccountDetailBase :  IEquatable<AccountDetailBase>, IValidatableObject
+    public partial class AccountDetailBase :  IEquatable<AccountDetailBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AccountDetailBase" /> class.
@@ -38,13 +36,15 @@ public partial class AccountDetailBase :  IEquatable<AccountDetailBase>, IValida
         /// <param name="timeZoneInfoId">Time Zone Info Id.</param>
         /// <param name="displayTimesInUserLocalTimeZone">Display the time in time zone local to the user.</param>
         /// <param name="showHiddenFeatures">Show hidden features.</param>
-        public AccountDetailBase(string name = default(string), string language = default(string), string timeZoneInfoId = default(string), bool? displayTimesInUserLocalTimeZone = default(bool?), bool? showHiddenFeatures = default(bool?))
+        /// <param name="createdAt">User created at.</param>
+        public AccountDetailBase(string name = default(string), string language = default(string), string timeZoneInfoId = default(string), bool? displayTimesInUserLocalTimeZone = default(bool?), bool? showHiddenFeatures = default(bool?), DateTime? createdAt = default(DateTime?))
         {
             this.Name = name;
             this.Language = language;
             this.TimeZoneInfoId = timeZoneInfoId;
             this.DisplayTimesInUserLocalTimeZone = displayTimesInUserLocalTimeZone;
             this.ShowHiddenFeatures = showHiddenFeatures;
+            this.CreatedAt = createdAt;
         }
         
         /// <summary>
@@ -82,6 +82,13 @@ public partial class AccountDetailBase :  IEquatable<AccountDetailBase>, IValida
         [DataMember(Name="ShowHiddenFeatures", EmitDefaultValue=false)]
         public bool? ShowHiddenFeatures { get; set; }
 
+        /// <summary>
+        /// User created at
+        /// </summary>
+        /// <value>User created at</value>
+        [DataMember(Name="CreatedAt", EmitDefaultValue=false)]
+        public DateTime? CreatedAt { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -95,6 +102,7 @@ public override string ToString()
             sb.Append("  TimeZoneInfoId: ").Append(TimeZoneInfoId).Append("\n");
             sb.Append("  DisplayTimesInUserLocalTimeZone: ").Append(DisplayTimesInUserLocalTimeZone).Append("\n");
             sb.Append("  ShowHiddenFeatures: ").Append(ShowHiddenFeatures).Append("\n");
+            sb.Append("  CreatedAt: ").Append(CreatedAt).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -153,6 +161,11 @@ public bool Equals(AccountDetailBase input)
                     this.ShowHiddenFeatures == input.ShowHiddenFeatures ||
                     (this.ShowHiddenFeatures != null &&
                     this.ShowHiddenFeatures.Equals(input.ShowHiddenFeatures))
+                ) && 
+                (
+                    this.CreatedAt == input.CreatedAt ||
+                    (this.CreatedAt != null &&
+                    this.CreatedAt.Equals(input.CreatedAt))
                 );
         }
 
@@ -175,19 +188,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.DisplayTimesInUserLocalTimeZone.GetHashCode();
                 if (this.ShowHiddenFeatures != null)
                     hashCode = hashCode * 59 + this.ShowHiddenFeatures.GetHashCode();
+                if (this.CreatedAt != null)
+                    hashCode = hashCode * 59 + this.CreatedAt.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AccountFieldDefinition.cs b/src/Flipdish/Model/AccountFieldDefinition.cs
index b891592b..8119e122 100644
--- a/src/Flipdish/Model/AccountFieldDefinition.cs
+++ b/src/Flipdish/Model/AccountFieldDefinition.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents the format of a bank account field
     /// </summary>
     [DataContract]
-    public partial class AccountFieldDefinition :  IEquatable<AccountFieldDefinition>, IValidatableObject
+    public partial class AccountFieldDefinition :  IEquatable<AccountFieldDefinition>
     {
         /// <summary>
         /// Depending on the Key, the field&#39;s value will be stored in a different field in PayeeBankAccountData
@@ -320,16 +318,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AccountFieldKeyValuePair.cs b/src/Flipdish/Model/AccountFieldKeyValuePair.cs
index d9dff81e..181905f0 100644
--- a/src/Flipdish/Model/AccountFieldKeyValuePair.cs
+++ b/src/Flipdish/Model/AccountFieldKeyValuePair.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents one populated account field (its key and value)
     /// </summary>
     [DataContract]
-    public partial class AccountFieldKeyValuePair :  IEquatable<AccountFieldKeyValuePair>, IValidatableObject
+    public partial class AccountFieldKeyValuePair :  IEquatable<AccountFieldKeyValuePair>
     {
         /// <summary>
         /// Depending on the Key, the field&#39;s value will be stored in a different field in PayeeBankAccountData
@@ -214,16 +212,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AccountFieldsDefinitions.cs b/src/Flipdish/Model/AccountFieldsDefinitions.cs
index 46d0486e..9f6136b4 100644
--- a/src/Flipdish/Model/AccountFieldsDefinitions.cs
+++ b/src/Flipdish/Model/AccountFieldsDefinitions.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// List of field definitions per country
     /// </summary>
     [DataContract]
-    public partial class AccountFieldsDefinitions :  IEquatable<AccountFieldsDefinitions>, IValidatableObject
+    public partial class AccountFieldsDefinitions :  IEquatable<AccountFieldsDefinitions>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AccountFieldsDefinitions" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AddItemDetails.cs b/src/Flipdish/Model/AddItemDetails.cs
deleted file mode 100644
index 20547498..00000000
--- a/src/Flipdish/Model/AddItemDetails.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Add item details
-    /// </summary>
-    [DataContract]
-    public partial class AddItemDetails :  IEquatable<AddItemDetails>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AddItemDetails" /> class.
-        /// </summary>
-        /// <param name="promotionalItemId">Promotional Item Id.</param>
-        /// <param name="promotionalItemName">Promotional Item Name.</param>
-        public AddItemDetails(int? promotionalItemId = default(int?), string promotionalItemName = default(string))
-        {
-            this.PromotionalItemId = promotionalItemId;
-            this.PromotionalItemName = promotionalItemName;
-        }
-        
-        /// <summary>
-        /// Promotional Item Id
-        /// </summary>
-        /// <value>Promotional Item Id</value>
-        [DataMember(Name="PromotionalItemId", EmitDefaultValue=false)]
-        public int? PromotionalItemId { get; set; }
-
-        /// <summary>
-        /// Promotional Item Name
-        /// </summary>
-        /// <value>Promotional Item Name</value>
-        [DataMember(Name="PromotionalItemName", EmitDefaultValue=false)]
-        public string PromotionalItemName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AddItemDetails {\n");
-            sb.Append("  PromotionalItemId: ").Append(PromotionalItemId).Append("\n");
-            sb.Append("  PromotionalItemName: ").Append(PromotionalItemName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AddItemDetails);
-        }
-
-        /// <summary>
-        /// Returns true if AddItemDetails instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AddItemDetails to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AddItemDetails input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.PromotionalItemId == input.PromotionalItemId ||
-                    (this.PromotionalItemId != null &&
-                    this.PromotionalItemId.Equals(input.PromotionalItemId))
-                ) && 
-                (
-                    this.PromotionalItemName == input.PromotionalItemName ||
-                    (this.PromotionalItemName != null &&
-                    this.PromotionalItemName.Equals(input.PromotionalItemName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.PromotionalItemId != null)
-                    hashCode = hashCode * 59 + this.PromotionalItemId.GetHashCode();
-                if (this.PromotionalItemName != null)
-                    hashCode = hashCode * 59 + this.PromotionalItemName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AddressFormDisplayFormat.cs b/src/Flipdish/Model/AddressFormDisplayFormat.cs
index 5cab3b5e..c778a0e8 100644
--- a/src/Flipdish/Model/AddressFormDisplayFormat.cs
+++ b/src/Flipdish/Model/AddressFormDisplayFormat.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// AddressFormDisplayFormat
     /// </summary>
     [DataContract]
-    public partial class AddressFormDisplayFormat :  IEquatable<AddressFormDisplayFormat>, IValidatableObject
+    public partial class AddressFormDisplayFormat :  IEquatable<AddressFormDisplayFormat>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AddressFormDisplayFormat" /> class.
@@ -125,16 +123,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AddressFormResponse.cs b/src/Flipdish/Model/AddressFormResponse.cs
index f3f6a22a..e7a1885b 100644
--- a/src/Flipdish/Model/AddressFormResponse.cs
+++ b/src/Flipdish/Model/AddressFormResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// A response of a dyanmic form definition.
     /// </summary>
     [DataContract]
-    public partial class AddressFormResponse :  IEquatable<AddressFormResponse>, IValidatableObject
+    public partial class AddressFormResponse :  IEquatable<AddressFormResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AddressFormResponse" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AllMetadataResult.cs b/src/Flipdish/Model/AllMetadataResult.cs
index b906e6eb..e4e553de 100644
--- a/src/Flipdish/Model/AllMetadataResult.cs
+++ b/src/Flipdish/Model/AllMetadataResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// AllMetadataResult
     /// </summary>
     [DataContract]
-    public partial class AllMetadataResult :  IEquatable<AllMetadataResult>, IValidatableObject
+    public partial class AllMetadataResult :  IEquatable<AllMetadataResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AllMetadataResult" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Allergen.cs b/src/Flipdish/Model/Allergen.cs
new file mode 100644
index 00000000..ba88bb3f
--- /dev/null
+++ b/src/Flipdish/Model/Allergen.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Allergen.
+    /// </summary>
+    [DataContract]
+    public partial class Allergen :  IEquatable<Allergen>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Allergen" /> class.
+        /// </summary>
+        /// <param name="allergenId">A unique identifier for the allergen.</param>
+        /// <param name="localizedName">Localized name of the allergen.</param>
+        /// <param name="iconUrl">Url to the icon for the allergen.</param>
+        public Allergen(string allergenId = default(string), string localizedName = default(string), string iconUrl = default(string))
+        {
+            this.AllergenId = allergenId;
+            this.LocalizedName = localizedName;
+            this.IconUrl = iconUrl;
+        }
+        
+        /// <summary>
+        /// A unique identifier for the allergen
+        /// </summary>
+        /// <value>A unique identifier for the allergen</value>
+        [DataMember(Name="AllergenId", EmitDefaultValue=false)]
+        public string AllergenId { get; set; }
+
+        /// <summary>
+        /// Localized name of the allergen
+        /// </summary>
+        /// <value>Localized name of the allergen</value>
+        [DataMember(Name="LocalizedName", EmitDefaultValue=false)]
+        public string LocalizedName { get; set; }
+
+        /// <summary>
+        /// Url to the icon for the allergen
+        /// </summary>
+        /// <value>Url to the icon for the allergen</value>
+        [DataMember(Name="IconUrl", EmitDefaultValue=false)]
+        public string IconUrl { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Allergen {\n");
+            sb.Append("  AllergenId: ").Append(AllergenId).Append("\n");
+            sb.Append("  LocalizedName: ").Append(LocalizedName).Append("\n");
+            sb.Append("  IconUrl: ").Append(IconUrl).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Allergen);
+        }
+
+        /// <summary>
+        /// Returns true if Allergen instances are equal
+        /// </summary>
+        /// <param name="input">Instance of Allergen to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Allergen input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.AllergenId == input.AllergenId ||
+                    (this.AllergenId != null &&
+                    this.AllergenId.Equals(input.AllergenId))
+                ) && 
+                (
+                    this.LocalizedName == input.LocalizedName ||
+                    (this.LocalizedName != null &&
+                    this.LocalizedName.Equals(input.LocalizedName))
+                ) && 
+                (
+                    this.IconUrl == input.IconUrl ||
+                    (this.IconUrl != null &&
+                    this.IconUrl.Equals(input.IconUrl))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.AllergenId != null)
+                    hashCode = hashCode * 59 + this.AllergenId.GetHashCode();
+                if (this.LocalizedName != null)
+                    hashCode = hashCode * 59 + this.LocalizedName.GetHashCode();
+                if (this.IconUrl != null)
+                    hashCode = hashCode * 59 + this.IconUrl.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AnalyticsClientEvent.cs b/src/Flipdish/Model/AnalyticsClientEvent.cs
index c780c83e..97e0edc5 100644
--- a/src/Flipdish/Model/AnalyticsClientEvent.cs
+++ b/src/Flipdish/Model/AnalyticsClientEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Client Analytics event
     /// </summary>
     [DataContract]
-    public partial class AnalyticsClientEvent :  IEquatable<AnalyticsClientEvent>, IValidatableObject
+    public partial class AnalyticsClientEvent :  IEquatable<AnalyticsClientEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AnalyticsClientEvent" /> class.
@@ -44,8 +42,11 @@ public partial class AnalyticsClientEvent :  IEquatable<AnalyticsClientEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public AnalyticsClientEvent(string eventName = default(string), string eventType = default(string), string appType = default(string), string metadata = default(string), int? userId = default(int?), double? latitude = default(double?), double? longitude = default(double?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public AnalyticsClientEvent(string eventName = default(string), string eventType = default(string), string appType = default(string), string metadata = default(string), int? userId = default(int?), double? latitude = default(double?), double? longitude = default(double?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.EventType = eventType;
@@ -58,7 +59,10 @@ public partial class AnalyticsClientEvent :  IEquatable<AnalyticsClientEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -138,6 +142,13 @@ public partial class AnalyticsClientEvent :  IEquatable<AnalyticsClientEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -145,6 +156,20 @@ public partial class AnalyticsClientEvent :  IEquatable<AnalyticsClientEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -164,7 +189,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -254,10 +282,25 @@ public bool Equals(AnalyticsClientEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -292,21 +335,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ApmCurrencyDataPoint.cs b/src/Flipdish/Model/ApmCurrencyDataPoint.cs
index 64cc43bf..131586f8 100644
--- a/src/Flipdish/Model/ApmCurrencyDataPoint.cs
+++ b/src/Flipdish/Model/ApmCurrencyDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// A single data point in timeline graphs related to APM
     /// </summary>
     [DataContract]
-    public partial class ApmCurrencyDataPoint :  IEquatable<ApmCurrencyDataPoint>, IValidatableObject
+    public partial class ApmCurrencyDataPoint :  IEquatable<ApmCurrencyDataPoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ApmCurrencyDataPoint" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ApmDataPoint.cs b/src/Flipdish/Model/ApmDataPoint.cs
index f4e53b44..b91fc4b6 100644
--- a/src/Flipdish/Model/ApmDataPoint.cs
+++ b/src/Flipdish/Model/ApmDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// A single data point in timeline graphs related to APM
     /// </summary>
     [DataContract]
-    public partial class ApmDataPoint :  IEquatable<ApmDataPoint>, IValidatableObject
+    public partial class ApmDataPoint :  IEquatable<ApmDataPoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ApmDataPoint" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ApmHourlyDataPoint.cs b/src/Flipdish/Model/ApmHourlyDataPoint.cs
index 2344b226..d4524ee3 100644
--- a/src/Flipdish/Model/ApmHourlyDataPoint.cs
+++ b/src/Flipdish/Model/ApmHourlyDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Provides an average value for a single hour of day of the week
     /// </summary>
     [DataContract]
-    public partial class ApmHourlyDataPoint :  IEquatable<ApmHourlyDataPoint>, IValidatableObject
+    public partial class ApmHourlyDataPoint :  IEquatable<ApmHourlyDataPoint>
     {
         /// <summary>
         /// Day of the week
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ApmStatistics.cs b/src/Flipdish/Model/ApmStatistics.cs
index ca03cc5f..7ccefbf6 100644
--- a/src/Flipdish/Model/ApmStatistics.cs
+++ b/src/Flipdish/Model/ApmStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// APM Statistics
     /// </summary>
     [DataContract]
-    public partial class ApmStatistics :  IEquatable<ApmStatistics>, IValidatableObject
+    public partial class ApmStatistics :  IEquatable<ApmStatistics>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ApmStatistics" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ApmStatus.cs b/src/Flipdish/Model/ApmStatus.cs
index 10951ef3..8bd0af77 100644
--- a/src/Flipdish/Model/ApmStatus.cs
+++ b/src/Flipdish/Model/ApmStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// APM status
     /// </summary>
     [DataContract]
-    public partial class ApmStatus :  IEquatable<ApmStatus>, IValidatableObject
+    public partial class ApmStatus :  IEquatable<ApmStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ApmStatus" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/App.cs b/src/Flipdish/Model/App.cs
index d21b5fc9..fe09bf31 100644
--- a/src/Flipdish/Model/App.cs
+++ b/src/Flipdish/Model/App.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// App
     /// </summary>
     [DataContract]
-    public partial class App :  IEquatable<App>, IValidatableObject
+    public partial class App :  IEquatable<App>
     {
         /// <summary>
         /// App access level for the logged in user
@@ -56,47 +54,71 @@ public enum AppAccessLevelEnum
             [EnumMember(Value = "StoreOwner")]
             StoreOwner = 3,
             
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 4,
+            
             /// <summary>
             /// Enum ManagedOwner for value: ManagedOwner
             /// </summary>
             [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 4,
+            ManagedOwner = 5,
             
             /// <summary>
             /// Enum Integrator for value: Integrator
             /// </summary>
             [EnumMember(Value = "Integrator")]
-            Integrator = 5,
+            Integrator = 6,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 7,
             
             /// <summary>
             /// Enum StoreManager for value: StoreManager
             /// </summary>
             [EnumMember(Value = "StoreManager")]
-            StoreManager = 6,
+            StoreManager = 8,
             
             /// <summary>
             /// Enum StoreStaff for value: StoreStaff
             /// </summary>
             [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 7,
+            StoreStaff = 9,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 10,
             
             /// <summary>
             /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
             /// </summary>
             [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 8,
+            StoreReadOnlyAccess = 11,
             
             /// <summary>
             /// Enum FinanceManger for value: FinanceManger
             /// </summary>
             [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 9,
+            FinanceManger = 12,
+            
+            /// <summary>
+            /// Enum Onboarding for value: Onboarding
+            /// </summary>
+            [EnumMember(Value = "Onboarding")]
+            Onboarding = 13,
             
             /// <summary>
             /// Enum Support for value: Support
             /// </summary>
             [EnumMember(Value = "Support")]
-            Support = 10
+            Support = 14
         }
 
         /// <summary>
@@ -130,869 +152,1217 @@ public enum AppResourceSetEnum
             [EnumMember(Value = "UpdateApp")]
             UpdateApp = 3,
             
+            /// <summary>
+            /// Enum ViewAppName for value: ViewAppName
+            /// </summary>
+            [EnumMember(Value = "ViewAppName")]
+            ViewAppName = 4,
+            
             /// <summary>
             /// Enum EditAppAssets for value: EditAppAssets
             /// </summary>
             [EnumMember(Value = "EditAppAssets")]
-            EditAppAssets = 4,
+            EditAppAssets = 5,
+            
+            /// <summary>
+            /// Enum EditAppFeatures for value: EditAppFeatures
+            /// </summary>
+            [EnumMember(Value = "EditAppFeatures")]
+            EditAppFeatures = 6,
             
             /// <summary>
             /// Enum ViewTeammates for value: ViewTeammates
             /// </summary>
             [EnumMember(Value = "ViewTeammates")]
-            ViewTeammates = 5,
+            ViewTeammates = 7,
             
             /// <summary>
             /// Enum EditTeammates for value: EditTeammates
             /// </summary>
             [EnumMember(Value = "EditTeammates")]
-            EditTeammates = 6,
+            EditTeammates = 8,
             
             /// <summary>
             /// Enum CreateTeammateOwner for value: CreateTeammateOwner
             /// </summary>
             [EnumMember(Value = "CreateTeammateOwner")]
-            CreateTeammateOwner = 7,
+            CreateTeammateOwner = 9,
             
             /// <summary>
             /// Enum CreateTeammateManagedOwner for value: CreateTeammateManagedOwner
             /// </summary>
             [EnumMember(Value = "CreateTeammateManagedOwner")]
-            CreateTeammateManagedOwner = 8,
+            CreateTeammateManagedOwner = 10,
             
             /// <summary>
             /// Enum CreateTeammateStoreOwner for value: CreateTeammateStoreOwner
             /// </summary>
             [EnumMember(Value = "CreateTeammateStoreOwner")]
-            CreateTeammateStoreOwner = 9,
+            CreateTeammateStoreOwner = 11,
             
             /// <summary>
             /// Enum CreateTeammateStoreManager for value: CreateTeammateStoreManager
             /// </summary>
             [EnumMember(Value = "CreateTeammateStoreManager")]
-            CreateTeammateStoreManager = 10,
+            CreateTeammateStoreManager = 12,
             
             /// <summary>
             /// Enum CreateTeammateStoreStaff for value: CreateTeammateStoreStaff
             /// </summary>
             [EnumMember(Value = "CreateTeammateStoreStaff")]
-            CreateTeammateStoreStaff = 11,
+            CreateTeammateStoreStaff = 13,
             
             /// <summary>
             /// Enum CreateTeammateStoreReadAccess for value: CreateTeammateStoreReadAccess
             /// </summary>
             [EnumMember(Value = "CreateTeammateStoreReadAccess")]
-            CreateTeammateStoreReadAccess = 12,
+            CreateTeammateStoreReadAccess = 14,
             
             /// <summary>
             /// Enum CreateTeammateFinanceManager for value: CreateTeammateFinanceManager
             /// </summary>
             [EnumMember(Value = "CreateTeammateFinanceManager")]
-            CreateTeammateFinanceManager = 13,
+            CreateTeammateFinanceManager = 15,
             
             /// <summary>
             /// Enum CreateTeammateIntegrator for value: CreateTeammateIntegrator
             /// </summary>
             [EnumMember(Value = "CreateTeammateIntegrator")]
-            CreateTeammateIntegrator = 14,
+            CreateTeammateIntegrator = 16,
+            
+            /// <summary>
+            /// Enum CreateTeammateOnboarding for value: CreateTeammateOnboarding
+            /// </summary>
+            [EnumMember(Value = "CreateTeammateOnboarding")]
+            CreateTeammateOnboarding = 17,
+            
+            /// <summary>
+            /// Enum CreateTeammatePropertyManager for value: CreateTeammatePropertyManager
+            /// </summary>
+            [EnumMember(Value = "CreateTeammatePropertyManager")]
+            CreateTeammatePropertyManager = 18,
+            
+            /// <summary>
+            /// Enum CreateTeammatePropertyOwner for value: CreateTeammatePropertyOwner
+            /// </summary>
+            [EnumMember(Value = "CreateTeammatePropertyOwner")]
+            CreateTeammatePropertyOwner = 19,
+            
+            /// <summary>
+            /// Enum CreateTeammateStaffMember for value: CreateTeammateStaffMember
+            /// </summary>
+            [EnumMember(Value = "CreateTeammateStaffMember")]
+            CreateTeammateStaffMember = 20,
             
             /// <summary>
             /// Enum ViewApmConfigurations for value: ViewApmConfigurations
             /// </summary>
             [EnumMember(Value = "ViewApmConfigurations")]
-            ViewApmConfigurations = 15,
+            ViewApmConfigurations = 21,
             
             /// <summary>
             /// Enum EditApmConfigurations for value: EditApmConfigurations
             /// </summary>
             [EnumMember(Value = "EditApmConfigurations")]
-            EditApmConfigurations = 16,
+            EditApmConfigurations = 22,
             
             /// <summary>
             /// Enum ViewCampaignsConfigurations for value: ViewCampaignsConfigurations
             /// </summary>
             [EnumMember(Value = "ViewCampaignsConfigurations")]
-            ViewCampaignsConfigurations = 17,
+            ViewCampaignsConfigurations = 23,
             
             /// <summary>
             /// Enum CreateCampaignsConfigurations for value: CreateCampaignsConfigurations
             /// </summary>
             [EnumMember(Value = "CreateCampaignsConfigurations")]
-            CreateCampaignsConfigurations = 18,
+            CreateCampaignsConfigurations = 24,
             
             /// <summary>
             /// Enum UpdateCampaignsConfigurations for value: UpdateCampaignsConfigurations
             /// </summary>
             [EnumMember(Value = "UpdateCampaignsConfigurations")]
-            UpdateCampaignsConfigurations = 19,
+            UpdateCampaignsConfigurations = 25,
             
             /// <summary>
             /// Enum DeleteCampaignsConfigurations for value: DeleteCampaignsConfigurations
             /// </summary>
             [EnumMember(Value = "DeleteCampaignsConfigurations")]
-            DeleteCampaignsConfigurations = 20,
+            DeleteCampaignsConfigurations = 26,
+            
+            /// <summary>
+            /// Enum StampLoyaltyCardAgainstCampaignsConfigurations for value: StampLoyaltyCardAgainstCampaignsConfigurations
+            /// </summary>
+            [EnumMember(Value = "StampLoyaltyCardAgainstCampaignsConfigurations")]
+            StampLoyaltyCardAgainstCampaignsConfigurations = 27,
             
             /// <summary>
             /// Enum ViewDevelopersSettings for value: ViewDevelopersSettings
             /// </summary>
             [EnumMember(Value = "ViewDevelopersSettings")]
-            ViewDevelopersSettings = 21,
+            ViewDevelopersSettings = 28,
             
             /// <summary>
             /// Enum EditDevelopersSettings for value: EditDevelopersSettings
             /// </summary>
             [EnumMember(Value = "EditDevelopersSettings")]
-            EditDevelopersSettings = 22,
+            EditDevelopersSettings = 29,
             
             /// <summary>
             /// Enum ViewOrders for value: ViewOrders
             /// </summary>
             [EnumMember(Value = "ViewOrders")]
-            ViewOrders = 23,
+            ViewOrders = 30,
             
             /// <summary>
             /// Enum UpdateOrdersAccept for value: UpdateOrdersAccept
             /// </summary>
             [EnumMember(Value = "UpdateOrdersAccept")]
-            UpdateOrdersAccept = 24,
+            UpdateOrdersAccept = 31,
             
             /// <summary>
             /// Enum UpdateOrdersReject for value: UpdateOrdersReject
             /// </summary>
             [EnumMember(Value = "UpdateOrdersReject")]
-            UpdateOrdersReject = 25,
+            UpdateOrdersReject = 32,
             
             /// <summary>
             /// Enum UpdateOrdersRefund for value: UpdateOrdersRefund
             /// </summary>
             [EnumMember(Value = "UpdateOrdersRefund")]
-            UpdateOrdersRefund = 26,
+            UpdateOrdersRefund = 33,
             
             /// <summary>
             /// Enum UpdateOrdersDispatch for value: UpdateOrdersDispatch
             /// </summary>
             [EnumMember(Value = "UpdateOrdersDispatch")]
-            UpdateOrdersDispatch = 27,
+            UpdateOrdersDispatch = 34,
             
             /// <summary>
             /// Enum ViewStores for value: ViewStores
             /// </summary>
             [EnumMember(Value = "ViewStores")]
-            ViewStores = 28,
+            ViewStores = 35,
+            
+            /// <summary>
+            /// Enum CreateStores for value: CreateStores
+            /// </summary>
+            [EnumMember(Value = "CreateStores")]
+            CreateStores = 36,
             
             /// <summary>
             /// Enum EditStores for value: EditStores
             /// </summary>
             [EnumMember(Value = "EditStores")]
-            EditStores = 29,
+            EditStores = 37,
             
             /// <summary>
             /// Enum ViewStoresOpeningHours for value: ViewStoresOpeningHours
             /// </summary>
             [EnumMember(Value = "ViewStoresOpeningHours")]
-            ViewStoresOpeningHours = 30,
+            ViewStoresOpeningHours = 38,
             
             /// <summary>
             /// Enum UpdateStoresOpenForCollectionOrDelivery for value: UpdateStoresOpenForCollectionOrDelivery
             /// </summary>
             [EnumMember(Value = "UpdateStoresOpenForCollectionOrDelivery")]
-            UpdateStoresOpenForCollectionOrDelivery = 31,
+            UpdateStoresOpenForCollectionOrDelivery = 39,
             
             /// <summary>
             /// Enum UpdateStoresOpeningHours for value: UpdateStoresOpeningHours
             /// </summary>
             [EnumMember(Value = "UpdateStoresOpeningHours")]
-            UpdateStoresOpeningHours = 32,
+            UpdateStoresOpeningHours = 40,
             
             /// <summary>
             /// Enum ViewStoresOpeningHoursOverride for value: ViewStoresOpeningHoursOverride
             /// </summary>
             [EnumMember(Value = "ViewStoresOpeningHoursOverride")]
-            ViewStoresOpeningHoursOverride = 33,
+            ViewStoresOpeningHoursOverride = 41,
             
             /// <summary>
             /// Enum EditStoresOpeningHoursOverride for value: EditStoresOpeningHoursOverride
             /// </summary>
             [EnumMember(Value = "EditStoresOpeningHoursOverride")]
-            EditStoresOpeningHoursOverride = 34,
+            EditStoresOpeningHoursOverride = 42,
             
             /// <summary>
             /// Enum EditStoresOpeningHoursOverrideTemporary for value: EditStoresOpeningHoursOverrideTemporary
             /// </summary>
             [EnumMember(Value = "EditStoresOpeningHoursOverrideTemporary")]
-            EditStoresOpeningHoursOverrideTemporary = 35,
+            EditStoresOpeningHoursOverrideTemporary = 43,
             
             /// <summary>
             /// Enum UpdateStoresName for value: UpdateStoresName
             /// </summary>
             [EnumMember(Value = "UpdateStoresName")]
-            UpdateStoresName = 36,
+            UpdateStoresName = 44,
             
             /// <summary>
             /// Enum EditStoreKioskSettings for value: EditStoreKioskSettings
             /// </summary>
             [EnumMember(Value = "EditStoreKioskSettings")]
-            EditStoreKioskSettings = 37,
+            EditStoreKioskSettings = 45,
             
             /// <summary>
             /// Enum EditStoreOrderCapacity for value: EditStoreOrderCapacity
             /// </summary>
             [EnumMember(Value = "EditStoreOrderCapacity")]
-            EditStoreOrderCapacity = 38,
+            EditStoreOrderCapacity = 46,
+            
+            /// <summary>
+            /// Enum ArchiveStores for value: ArchiveStores
+            /// </summary>
+            [EnumMember(Value = "ArchiveStores")]
+            ArchiveStores = 47,
+            
+            /// <summary>
+            /// Enum PublishStores for value: PublishStores
+            /// </summary>
+            [EnumMember(Value = "PublishStores")]
+            PublishStores = 48,
             
             /// <summary>
             /// Enum UpdatePrinterTerminalsAssign for value: UpdatePrinterTerminalsAssign
             /// </summary>
             [EnumMember(Value = "UpdatePrinterTerminalsAssign")]
-            UpdatePrinterTerminalsAssign = 39,
+            UpdatePrinterTerminalsAssign = 49,
             
             /// <summary>
             /// Enum UpdatePrinterTerminalsToggle for value: UpdatePrinterTerminalsToggle
             /// </summary>
             [EnumMember(Value = "UpdatePrinterTerminalsToggle")]
-            UpdatePrinterTerminalsToggle = 40,
+            UpdatePrinterTerminalsToggle = 50,
             
             /// <summary>
             /// Enum EditStoreNotifications for value: EditStoreNotifications
             /// </summary>
             [EnumMember(Value = "EditStoreNotifications")]
-            EditStoreNotifications = 41,
+            EditStoreNotifications = 51,
             
             /// <summary>
             /// Enum ViewStoreGroups for value: ViewStoreGroups
             /// </summary>
             [EnumMember(Value = "ViewStoreGroups")]
-            ViewStoreGroups = 42,
+            ViewStoreGroups = 52,
             
             /// <summary>
             /// Enum CreateStoreGroups for value: CreateStoreGroups
             /// </summary>
             [EnumMember(Value = "CreateStoreGroups")]
-            CreateStoreGroups = 43,
+            CreateStoreGroups = 53,
             
             /// <summary>
             /// Enum UpdateStoreGroups for value: UpdateStoreGroups
             /// </summary>
             [EnumMember(Value = "UpdateStoreGroups")]
-            UpdateStoreGroups = 44,
+            UpdateStoreGroups = 54,
             
             /// <summary>
             /// Enum DeleteStoreGroups for value: DeleteStoreGroups
             /// </summary>
             [EnumMember(Value = "DeleteStoreGroups")]
-            DeleteStoreGroups = 45,
+            DeleteStoreGroups = 55,
             
             /// <summary>
             /// Enum ViewDeliveryZones for value: ViewDeliveryZones
             /// </summary>
             [EnumMember(Value = "ViewDeliveryZones")]
-            ViewDeliveryZones = 46,
+            ViewDeliveryZones = 56,
             
             /// <summary>
             /// Enum CreateDeliveryZones for value: CreateDeliveryZones
             /// </summary>
             [EnumMember(Value = "CreateDeliveryZones")]
-            CreateDeliveryZones = 47,
+            CreateDeliveryZones = 57,
             
             /// <summary>
             /// Enum UpdateDeliveryZones for value: UpdateDeliveryZones
             /// </summary>
             [EnumMember(Value = "UpdateDeliveryZones")]
-            UpdateDeliveryZones = 48,
+            UpdateDeliveryZones = 58,
             
             /// <summary>
             /// Enum DeleteDeliveryZones for value: DeleteDeliveryZones
             /// </summary>
             [EnumMember(Value = "DeleteDeliveryZones")]
-            DeleteDeliveryZones = 49,
+            DeleteDeliveryZones = 59,
             
             /// <summary>
             /// Enum ViewMenu for value: ViewMenu
             /// </summary>
             [EnumMember(Value = "ViewMenu")]
-            ViewMenu = 50,
+            ViewMenu = 60,
             
             /// <summary>
             /// Enum CreateMenu for value: CreateMenu
             /// </summary>
             [EnumMember(Value = "CreateMenu")]
-            CreateMenu = 51,
+            CreateMenu = 61,
             
             /// <summary>
             /// Enum UpdateMenu for value: UpdateMenu
             /// </summary>
             [EnumMember(Value = "UpdateMenu")]
-            UpdateMenu = 52,
+            UpdateMenu = 62,
             
             /// <summary>
             /// Enum DeleteMenu for value: DeleteMenu
             /// </summary>
             [EnumMember(Value = "DeleteMenu")]
-            DeleteMenu = 53,
+            DeleteMenu = 63,
             
             /// <summary>
             /// Enum UpdateMenuLock for value: UpdateMenuLock
             /// </summary>
             [EnumMember(Value = "UpdateMenuLock")]
-            UpdateMenuLock = 54,
+            UpdateMenuLock = 64,
             
             /// <summary>
             /// Enum UpdateMenuItemsHideTemporarily for value: UpdateMenuItemsHideTemporarily
             /// </summary>
             [EnumMember(Value = "UpdateMenuItemsHideTemporarily")]
-            UpdateMenuItemsHideTemporarily = 55,
+            UpdateMenuItemsHideTemporarily = 65,
             
             /// <summary>
             /// Enum EditMenuImage for value: EditMenuImage
             /// </summary>
             [EnumMember(Value = "EditMenuImage")]
-            EditMenuImage = 56,
+            EditMenuImage = 66,
             
             /// <summary>
             /// Enum ViewVouchers for value: ViewVouchers
             /// </summary>
             [EnumMember(Value = "ViewVouchers")]
-            ViewVouchers = 57,
+            ViewVouchers = 67,
             
             /// <summary>
             /// Enum EditVouchers for value: EditVouchers
             /// </summary>
             [EnumMember(Value = "EditVouchers")]
-            EditVouchers = 58,
-            
-            /// <summary>
-            /// Enum UpdateVouchersExtendDisable for value: UpdateVouchersExtendDisable
-            /// </summary>
-            [EnumMember(Value = "UpdateVouchersExtendDisable")]
-            UpdateVouchersExtendDisable = 59,
+            EditVouchers = 68,
             
             /// <summary>
             /// Enum ViewWebsiteContent for value: ViewWebsiteContent
             /// </summary>
             [EnumMember(Value = "ViewWebsiteContent")]
-            ViewWebsiteContent = 60,
+            ViewWebsiteContent = 69,
             
             /// <summary>
             /// Enum EditWebsiteContent for value: EditWebsiteContent
             /// </summary>
             [EnumMember(Value = "EditWebsiteContent")]
-            EditWebsiteContent = 61,
+            EditWebsiteContent = 70,
             
             /// <summary>
             /// Enum ViewWebsiteDnsVerified for value: ViewWebsiteDnsVerified
             /// </summary>
             [EnumMember(Value = "ViewWebsiteDnsVerified")]
-            ViewWebsiteDnsVerified = 62,
+            ViewWebsiteDnsVerified = 71,
             
             /// <summary>
             /// Enum ViewWebsiteCertificateCreated for value: ViewWebsiteCertificateCreated
             /// </summary>
             [EnumMember(Value = "ViewWebsiteCertificateCreated")]
-            ViewWebsiteCertificateCreated = 63,
+            ViewWebsiteCertificateCreated = 72,
             
             /// <summary>
             /// Enum ViewWebsiteCertificateRenewed for value: ViewWebsiteCertificateRenewed
             /// </summary>
             [EnumMember(Value = "ViewWebsiteCertificateRenewed")]
-            ViewWebsiteCertificateRenewed = 64,
+            ViewWebsiteCertificateRenewed = 73,
             
             /// <summary>
             /// Enum ViewBankAccounts for value: ViewBankAccounts
             /// </summary>
             [EnumMember(Value = "ViewBankAccounts")]
-            ViewBankAccounts = 65,
+            ViewBankAccounts = 74,
             
             /// <summary>
             /// Enum CreateBankAccounts for value: CreateBankAccounts
             /// </summary>
             [EnumMember(Value = "CreateBankAccounts")]
-            CreateBankAccounts = 66,
+            CreateBankAccounts = 75,
             
             /// <summary>
             /// Enum UpdateBankAccounts for value: UpdateBankAccounts
             /// </summary>
             [EnumMember(Value = "UpdateBankAccounts")]
-            UpdateBankAccounts = 67,
+            UpdateBankAccounts = 76,
             
             /// <summary>
             /// Enum UpdateBankAccountsAssign for value: UpdateBankAccountsAssign
             /// </summary>
             [EnumMember(Value = "UpdateBankAccountsAssign")]
-            UpdateBankAccountsAssign = 68,
+            UpdateBankAccountsAssign = 77,
             
             /// <summary>
             /// Enum ViewAssignedBankAccount for value: ViewAssignedBankAccount
             /// </summary>
             [EnumMember(Value = "ViewAssignedBankAccount")]
-            ViewAssignedBankAccount = 69,
+            ViewAssignedBankAccount = 78,
             
             /// <summary>
             /// Enum VerifyBankAccounts for value: VerifyBankAccounts
             /// </summary>
             [EnumMember(Value = "VerifyBankAccounts")]
-            VerifyBankAccounts = 70,
+            VerifyBankAccounts = 79,
             
             /// <summary>
             /// Enum ViewServiceChargeConfigurations for value: ViewServiceChargeConfigurations
             /// </summary>
             [EnumMember(Value = "ViewServiceChargeConfigurations")]
-            ViewServiceChargeConfigurations = 71,
+            ViewServiceChargeConfigurations = 80,
             
             /// <summary>
             /// Enum EditServiceChargeConfigurations for value: EditServiceChargeConfigurations
             /// </summary>
             [EnumMember(Value = "EditServiceChargeConfigurations")]
-            EditServiceChargeConfigurations = 72,
+            EditServiceChargeConfigurations = 81,
+            
+            /// <summary>
+            /// Enum EditStoreDeliveryZoneFees for value: EditStoreDeliveryZoneFees
+            /// </summary>
+            [EnumMember(Value = "EditStoreDeliveryZoneFees")]
+            EditStoreDeliveryZoneFees = 82,
+            
+            /// <summary>
+            /// Enum EditStoreDeliveryFeesLimited for value: EditStoreDeliveryFeesLimited
+            /// </summary>
+            [EnumMember(Value = "EditStoreDeliveryFeesLimited")]
+            EditStoreDeliveryFeesLimited = 83,
             
             /// <summary>
             /// Enum ViewHydraConfig for value: ViewHydraConfig
             /// </summary>
             [EnumMember(Value = "ViewHydraConfig")]
-            ViewHydraConfig = 73,
+            ViewHydraConfig = 84,
             
             /// <summary>
             /// Enum UpdateHydraConfigManage for value: UpdateHydraConfigManage
             /// </summary>
             [EnumMember(Value = "UpdateHydraConfigManage")]
-            UpdateHydraConfigManage = 74,
+            UpdateHydraConfigManage = 85,
             
             /// <summary>
             /// Enum InitiateBluetoothPairingMode for value: InitiateBluetoothPairingMode
             /// </summary>
             [EnumMember(Value = "InitiateBluetoothPairingMode")]
-            InitiateBluetoothPairingMode = 75,
+            InitiateBluetoothPairingMode = 86,
             
             /// <summary>
             /// Enum DeleteTerminal for value: DeleteTerminal
             /// </summary>
             [EnumMember(Value = "DeleteTerminal")]
-            DeleteTerminal = 76,
+            DeleteTerminal = 87,
             
             /// <summary>
             /// Enum ViewKioskTelemetry for value: ViewKioskTelemetry
             /// </summary>
             [EnumMember(Value = "ViewKioskTelemetry")]
-            ViewKioskTelemetry = 77,
+            ViewKioskTelemetry = 88,
             
             /// <summary>
             /// Enum ViewCustomers for value: ViewCustomers
             /// </summary>
             [EnumMember(Value = "ViewCustomers")]
-            ViewCustomers = 78,
+            ViewCustomers = 89,
             
             /// <summary>
             /// Enum EditCustomers for value: EditCustomers
             /// </summary>
             [EnumMember(Value = "EditCustomers")]
-            EditCustomers = 79,
+            EditCustomers = 90,
+            
+            /// <summary>
+            /// Enum CreateCustomers for value: CreateCustomers
+            /// </summary>
+            [EnumMember(Value = "CreateCustomers")]
+            CreateCustomers = 91,
             
             /// <summary>
             /// Enum CreateCatalogElements for value: CreateCatalogElements
             /// </summary>
             [EnumMember(Value = "CreateCatalogElements")]
-            CreateCatalogElements = 80,
+            CreateCatalogElements = 92,
             
             /// <summary>
             /// Enum UpdateCatalogElements for value: UpdateCatalogElements
             /// </summary>
             [EnumMember(Value = "UpdateCatalogElements")]
-            UpdateCatalogElements = 81,
+            UpdateCatalogElements = 93,
             
             /// <summary>
             /// Enum ViewCatalogElements for value: ViewCatalogElements
             /// </summary>
             [EnumMember(Value = "ViewCatalogElements")]
-            ViewCatalogElements = 82,
+            ViewCatalogElements = 94,
             
             /// <summary>
             /// Enum DeleteCatalogElements for value: DeleteCatalogElements
             /// </summary>
             [EnumMember(Value = "DeleteCatalogElements")]
-            DeleteCatalogElements = 83,
+            DeleteCatalogElements = 95,
             
             /// <summary>
             /// Enum ViewMetafieldDefinitions for value: ViewMetafieldDefinitions
             /// </summary>
             [EnumMember(Value = "ViewMetafieldDefinitions")]
-            ViewMetafieldDefinitions = 84,
+            ViewMetafieldDefinitions = 96,
             
             /// <summary>
             /// Enum CreateMetafieldDefinitions for value: CreateMetafieldDefinitions
             /// </summary>
             [EnumMember(Value = "CreateMetafieldDefinitions")]
-            CreateMetafieldDefinitions = 85,
+            CreateMetafieldDefinitions = 97,
             
             /// <summary>
             /// Enum UpdateMetafieldDefinitions for value: UpdateMetafieldDefinitions
             /// </summary>
             [EnumMember(Value = "UpdateMetafieldDefinitions")]
-            UpdateMetafieldDefinitions = 86,
+            UpdateMetafieldDefinitions = 98,
             
             /// <summary>
             /// Enum DeleteMetafieldDefinitions for value: DeleteMetafieldDefinitions
             /// </summary>
             [EnumMember(Value = "DeleteMetafieldDefinitions")]
-            DeleteMetafieldDefinitions = 87,
+            DeleteMetafieldDefinitions = 99,
             
             /// <summary>
             /// Enum UpdateMetafields for value: UpdateMetafields
             /// </summary>
             [EnumMember(Value = "UpdateMetafields")]
-            UpdateMetafields = 88,
+            UpdateMetafields = 100,
             
             /// <summary>
             /// Enum ViewCatalogMenuChanges for value: ViewCatalogMenuChanges
             /// </summary>
             [EnumMember(Value = "ViewCatalogMenuChanges")]
-            ViewCatalogMenuChanges = 89,
+            ViewCatalogMenuChanges = 101,
             
             /// <summary>
             /// Enum PublishCatalogMenuChanges for value: PublishCatalogMenuChanges
             /// </summary>
             [EnumMember(Value = "PublishCatalogMenuChanges")]
-            PublishCatalogMenuChanges = 90,
+            PublishCatalogMenuChanges = 102,
             
             /// <summary>
             /// Enum ViewAppStatistics for value: ViewAppStatistics
             /// </summary>
             [EnumMember(Value = "ViewAppStatistics")]
-            ViewAppStatistics = 91,
+            ViewAppStatistics = 103,
             
             /// <summary>
             /// Enum ViewApmStatistics for value: ViewApmStatistics
             /// </summary>
             [EnumMember(Value = "ViewApmStatistics")]
-            ViewApmStatistics = 92,
+            ViewApmStatistics = 104,
             
             /// <summary>
             /// Enum ViewCampaignsStatistics for value: ViewCampaignsStatistics
             /// </summary>
             [EnumMember(Value = "ViewCampaignsStatistics")]
-            ViewCampaignsStatistics = 93,
+            ViewCampaignsStatistics = 105,
             
             /// <summary>
             /// Enum ViewCustomerStatistics for value: ViewCustomerStatistics
             /// </summary>
             [EnumMember(Value = "ViewCustomerStatistics")]
-            ViewCustomerStatistics = 94,
+            ViewCustomerStatistics = 106,
             
             /// <summary>
             /// Enum ViewLiveStatistics for value: ViewLiveStatistics
             /// </summary>
             [EnumMember(Value = "ViewLiveStatistics")]
-            ViewLiveStatistics = 95,
+            ViewLiveStatistics = 107,
             
             /// <summary>
             /// Enum ViewOrderStatistics for value: ViewOrderStatistics
             /// </summary>
             [EnumMember(Value = "ViewOrderStatistics")]
-            ViewOrderStatistics = 96,
+            ViewOrderStatistics = 108,
             
             /// <summary>
             /// Enum ViewSalesStatistics for value: ViewSalesStatistics
             /// </summary>
             [EnumMember(Value = "ViewSalesStatistics")]
-            ViewSalesStatistics = 97,
+            ViewSalesStatistics = 109,
             
             /// <summary>
             /// Enum ViewSalesEndOfDayStatistics for value: ViewSalesEndOfDayStatistics
             /// </summary>
             [EnumMember(Value = "ViewSalesEndOfDayStatistics")]
-            ViewSalesEndOfDayStatistics = 98,
+            ViewSalesEndOfDayStatistics = 110,
             
             /// <summary>
             /// Enum ViewVouchersStatistics for value: ViewVouchersStatistics
             /// </summary>
             [EnumMember(Value = "ViewVouchersStatistics")]
-            ViewVouchersStatistics = 99,
+            ViewVouchersStatistics = 111,
             
             /// <summary>
             /// Enum DownloadCustomerCsvExport for value: DownloadCustomerCsvExport
             /// </summary>
             [EnumMember(Value = "DownloadCustomerCsvExport")]
-            DownloadCustomerCsvExport = 100,
+            DownloadCustomerCsvExport = 112,
             
             /// <summary>
             /// Enum ViewApmAuditLogs for value: ViewApmAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewApmAuditLogs")]
-            ViewApmAuditLogs = 101,
+            ViewApmAuditLogs = 113,
             
             /// <summary>
             /// Enum ViewStoreAuditLogs for value: ViewStoreAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewStoreAuditLogs")]
-            ViewStoreAuditLogs = 102,
+            ViewStoreAuditLogs = 114,
             
             /// <summary>
             /// Enum ViewMenuAuditLogs for value: ViewMenuAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewMenuAuditLogs")]
-            ViewMenuAuditLogs = 103,
+            ViewMenuAuditLogs = 115,
             
             /// <summary>
             /// Enum ViewBankAccountAuditLogs for value: ViewBankAccountAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewBankAccountAuditLogs")]
-            ViewBankAccountAuditLogs = 104,
+            ViewBankAccountAuditLogs = 116,
             
             /// <summary>
             /// Enum ViewFeeConfigurationsAuditLogs for value: ViewFeeConfigurationsAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewFeeConfigurationsAuditLogs")]
-            ViewFeeConfigurationsAuditLogs = 105,
+            ViewFeeConfigurationsAuditLogs = 117,
             
             /// <summary>
             /// Enum ViewOrdersAuditLogs for value: ViewOrdersAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewOrdersAuditLogs")]
-            ViewOrdersAuditLogs = 106,
+            ViewOrdersAuditLogs = 118,
             
             /// <summary>
             /// Enum ViewVouchersAuditLogs for value: ViewVouchersAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewVouchersAuditLogs")]
-            ViewVouchersAuditLogs = 107,
+            ViewVouchersAuditLogs = 119,
             
             /// <summary>
             /// Enum ViewUserEventsAuditLogs for value: ViewUserEventsAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewUserEventsAuditLogs")]
-            ViewUserEventsAuditLogs = 108,
+            ViewUserEventsAuditLogs = 120,
             
             /// <summary>
             /// Enum ViewCampaignsAuditLogs for value: ViewCampaignsAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewCampaignsAuditLogs")]
-            ViewCampaignsAuditLogs = 109,
+            ViewCampaignsAuditLogs = 121,
             
             /// <summary>
             /// Enum ViewTeammatesAuditLogs for value: ViewTeammatesAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewTeammatesAuditLogs")]
-            ViewTeammatesAuditLogs = 110,
+            ViewTeammatesAuditLogs = 122,
             
             /// <summary>
             /// Enum ViewAppAuditLogs for value: ViewAppAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewAppAuditLogs")]
-            ViewAppAuditLogs = 111,
+            ViewAppAuditLogs = 123,
             
             /// <summary>
             /// Enum ViewCustomerAuditLogs for value: ViewCustomerAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewCustomerAuditLogs")]
-            ViewCustomerAuditLogs = 112,
+            ViewCustomerAuditLogs = 124,
             
             /// <summary>
             /// Enum ViewPrinterAuditLogs for value: ViewPrinterAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewPrinterAuditLogs")]
-            ViewPrinterAuditLogs = 113,
+            ViewPrinterAuditLogs = 125,
             
             /// <summary>
             /// Enum ViewHydraAuditLogs for value: ViewHydraAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewHydraAuditLogs")]
-            ViewHydraAuditLogs = 114,
+            ViewHydraAuditLogs = 126,
             
             /// <summary>
             /// Enum ViewPushNotificationAuditLogs for value: ViewPushNotificationAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewPushNotificationAuditLogs")]
-            ViewPushNotificationAuditLogs = 115,
+            ViewPushNotificationAuditLogs = 127,
             
             /// <summary>
             /// Enum ViewStripeCustomConnectedAccountAuditLogs for value: ViewStripeCustomConnectedAccountAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewStripeCustomConnectedAccountAuditLogs")]
-            ViewStripeCustomConnectedAccountAuditLogs = 116,
+            ViewStripeCustomConnectedAccountAuditLogs = 128,
             
             /// <summary>
             /// Enum ViewKioskBluetoothDeviceAuditLogs for value: ViewKioskBluetoothDeviceAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewKioskBluetoothDeviceAuditLogs")]
-            ViewKioskBluetoothDeviceAuditLogs = 117,
+            ViewKioskBluetoothDeviceAuditLogs = 129,
             
             /// <summary>
             /// Enum ViewExternalAuditLogs for value: ViewExternalAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewExternalAuditLogs")]
-            ViewExternalAuditLogs = 118,
+            ViewExternalAuditLogs = 130,
             
             /// <summary>
             /// Enum CreateExternalAuditLogEvents for value: CreateExternalAuditLogEvents
             /// </summary>
             [EnumMember(Value = "CreateExternalAuditLogEvents")]
-            CreateExternalAuditLogEvents = 119,
+            CreateExternalAuditLogEvents = 131,
             
             /// <summary>
             /// Enum ViewCatalogAuditLogs for value: ViewCatalogAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewCatalogAuditLogs")]
-            ViewCatalogAuditLogs = 120,
+            ViewCatalogAuditLogs = 132,
             
             /// <summary>
             /// Enum ViewOrderFulfillmentAuditLogs for value: ViewOrderFulfillmentAuditLogs
             /// </summary>
             [EnumMember(Value = "ViewOrderFulfillmentAuditLogs")]
-            ViewOrderFulfillmentAuditLogs = 121,
+            ViewOrderFulfillmentAuditLogs = 133,
+            
+            /// <summary>
+            /// Enum ViewChannelAuditLogs for value: ViewChannelAuditLogs
+            /// </summary>
+            [EnumMember(Value = "ViewChannelAuditLogs")]
+            ViewChannelAuditLogs = 134,
+            
+            /// <summary>
+            /// Enum ViewAppStoreAuditLogs for value: ViewAppStoreAuditLogs
+            /// </summary>
+            [EnumMember(Value = "ViewAppStoreAuditLogs")]
+            ViewAppStoreAuditLogs = 135,
             
             /// <summary>
             /// Enum SendPushNotificationToCustomer for value: SendPushNotificationToCustomer
             /// </summary>
             [EnumMember(Value = "SendPushNotificationToCustomer")]
-            SendPushNotificationToCustomer = 122,
+            SendPushNotificationToCustomer = 136,
             
             /// <summary>
             /// Enum InviteDriverToApp for value: InviteDriverToApp
             /// </summary>
             [EnumMember(Value = "InviteDriverToApp")]
-            InviteDriverToApp = 123,
+            InviteDriverToApp = 137,
             
             /// <summary>
             /// Enum GetDriverForApp for value: GetDriverForApp
             /// </summary>
             [EnumMember(Value = "GetDriverForApp")]
-            GetDriverForApp = 124,
+            GetDriverForApp = 138,
             
             /// <summary>
             /// Enum RemoveDriverFromApp for value: RemoveDriverFromApp
             /// </summary>
             [EnumMember(Value = "RemoveDriverFromApp")]
-            RemoveDriverFromApp = 125,
+            RemoveDriverFromApp = 139,
             
             /// <summary>
             /// Enum AssignDriverToOrder for value: AssignDriverToOrder
             /// </summary>
             [EnumMember(Value = "AssignDriverToOrder")]
-            AssignDriverToOrder = 126,
+            AssignDriverToOrder = 140,
             
             /// <summary>
             /// Enum UnassignDriverFromOrder for value: UnassignDriverFromOrder
             /// </summary>
             [EnumMember(Value = "UnassignDriverFromOrder")]
-            UnassignDriverFromOrder = 127,
+            UnassignDriverFromOrder = 141,
             
             /// <summary>
             /// Enum UpdateOrdersDeliveryTrackingStatus for value: UpdateOrdersDeliveryTrackingStatus
             /// </summary>
             [EnumMember(Value = "UpdateOrdersDeliveryTrackingStatus")]
-            UpdateOrdersDeliveryTrackingStatus = 128,
+            UpdateOrdersDeliveryTrackingStatus = 142,
             
             /// <summary>
             /// Enum UpdateOrderFulfillmentStatus for value: UpdateOrderFulfillmentStatus
             /// </summary>
             [EnumMember(Value = "UpdateOrderFulfillmentStatus")]
-            UpdateOrderFulfillmentStatus = 129,
+            UpdateOrderFulfillmentStatus = 143,
             
             /// <summary>
             /// Enum ViewFulfillmentStatesConfiguration for value: ViewFulfillmentStatesConfiguration
             /// </summary>
             [EnumMember(Value = "ViewFulfillmentStatesConfiguration")]
-            ViewFulfillmentStatesConfiguration = 130,
+            ViewFulfillmentStatesConfiguration = 144,
             
             /// <summary>
             /// Enum CreateFulfillmentStatesConfiguration for value: CreateFulfillmentStatesConfiguration
             /// </summary>
             [EnumMember(Value = "CreateFulfillmentStatesConfiguration")]
-            CreateFulfillmentStatesConfiguration = 131,
+            CreateFulfillmentStatesConfiguration = 145,
             
             /// <summary>
             /// Enum UpdateFulfillmentStatesConfiguration for value: UpdateFulfillmentStatesConfiguration
             /// </summary>
             [EnumMember(Value = "UpdateFulfillmentStatesConfiguration")]
-            UpdateFulfillmentStatesConfiguration = 132,
+            UpdateFulfillmentStatesConfiguration = 146,
             
             /// <summary>
             /// Enum DeleteFulfillmentStatesConfiguration for value: DeleteFulfillmentStatesConfiguration
             /// </summary>
             [EnumMember(Value = "DeleteFulfillmentStatesConfiguration")]
-            DeleteFulfillmentStatesConfiguration = 133,
+            DeleteFulfillmentStatesConfiguration = 147,
             
             /// <summary>
             /// Enum ViewPayouts for value: ViewPayouts
             /// </summary>
             [EnumMember(Value = "ViewPayouts")]
-            ViewPayouts = 134,
+            ViewPayouts = 148,
             
             /// <summary>
             /// Enum ViewChannels for value: ViewChannels
             /// </summary>
             [EnumMember(Value = "ViewChannels")]
-            ViewChannels = 135,
+            ViewChannels = 149,
             
             /// <summary>
             /// Enum ViewOnboarding for value: ViewOnboarding
             /// </summary>
             [EnumMember(Value = "ViewOnboarding")]
-            ViewOnboarding = 136,
+            ViewOnboarding = 150,
             
             /// <summary>
             /// Enum UpdateOnboarding for value: UpdateOnboarding
             /// </summary>
             [EnumMember(Value = "UpdateOnboarding")]
-            UpdateOnboarding = 137,
+            UpdateOnboarding = 151,
+            
+            /// <summary>
+            /// Enum ViewClientDevices for value: ViewClientDevices
+            /// </summary>
+            [EnumMember(Value = "ViewClientDevices")]
+            ViewClientDevices = 152,
+            
+            /// <summary>
+            /// Enum UpdateClientDevices for value: UpdateClientDevices
+            /// </summary>
+            [EnumMember(Value = "UpdateClientDevices")]
+            UpdateClientDevices = 153,
+            
+            /// <summary>
+            /// Enum EnrollClientDevices for value: EnrollClientDevices
+            /// </summary>
+            [EnumMember(Value = "EnrollClientDevices")]
+            EnrollClientDevices = 154,
+            
+            /// <summary>
+            /// Enum AssignClientDevices for value: AssignClientDevices
+            /// </summary>
+            [EnumMember(Value = "AssignClientDevices")]
+            AssignClientDevices = 155,
+            
+            /// <summary>
+            /// Enum ViewClientAuditLogs for value: ViewClientAuditLogs
+            /// </summary>
+            [EnumMember(Value = "ViewClientAuditLogs")]
+            ViewClientAuditLogs = 156,
             
             /// <summary>
             /// Enum CreateAppStoreAppConfiguration for value: CreateAppStoreAppConfiguration
             /// </summary>
             [EnumMember(Value = "CreateAppStoreAppConfiguration")]
-            CreateAppStoreAppConfiguration = 138,
+            CreateAppStoreAppConfiguration = 157,
             
             /// <summary>
             /// Enum ViewAppStoreAppConfiguration for value: ViewAppStoreAppConfiguration
             /// </summary>
             [EnumMember(Value = "ViewAppStoreAppConfiguration")]
-            ViewAppStoreAppConfiguration = 139,
+            ViewAppStoreAppConfiguration = 158,
             
             /// <summary>
             /// Enum UpdateAppStoreAppConfiguration for value: UpdateAppStoreAppConfiguration
             /// </summary>
             [EnumMember(Value = "UpdateAppStoreAppConfiguration")]
-            UpdateAppStoreAppConfiguration = 140,
+            UpdateAppStoreAppConfiguration = 159,
             
             /// <summary>
             /// Enum DeleteAppStoreAppConfiguration for value: DeleteAppStoreAppConfiguration
             /// </summary>
             [EnumMember(Value = "DeleteAppStoreAppConfiguration")]
-            DeleteAppStoreAppConfiguration = 141,
+            DeleteAppStoreAppConfiguration = 160,
+            
+            /// <summary>
+            /// Enum UpdateAppStoreAppConfigurationSettings for value: UpdateAppStoreAppConfigurationSettings
+            /// </summary>
+            [EnumMember(Value = "UpdateAppStoreAppConfigurationSettings")]
+            UpdateAppStoreAppConfigurationSettings = 161,
+            
+            /// <summary>
+            /// Enum CreateAppStoreSubscription for value: CreateAppStoreSubscription
+            /// </summary>
+            [EnumMember(Value = "CreateAppStoreSubscription")]
+            CreateAppStoreSubscription = 162,
+            
+            /// <summary>
+            /// Enum UpdateAppStoreSubscription for value: UpdateAppStoreSubscription
+            /// </summary>
+            [EnumMember(Value = "UpdateAppStoreSubscription")]
+            UpdateAppStoreSubscription = 163,
+            
+            /// <summary>
+            /// Enum DeleteAppStoreSubscription for value: DeleteAppStoreSubscription
+            /// </summary>
+            [EnumMember(Value = "DeleteAppStoreSubscription")]
+            DeleteAppStoreSubscription = 164,
             
             /// <summary>
             /// Enum ViewSalesChannels for value: ViewSalesChannels
             /// </summary>
             [EnumMember(Value = "ViewSalesChannels")]
-            ViewSalesChannels = 142,
+            ViewSalesChannels = 165,
             
             /// <summary>
             /// Enum EditSalesChannels for value: EditSalesChannels
             /// </summary>
             [EnumMember(Value = "EditSalesChannels")]
-            EditSalesChannels = 143,
+            EditSalesChannels = 166,
             
             /// <summary>
             /// Enum ViewPayGreenWhiteLabelConfiguration for value: ViewPayGreenWhiteLabelConfiguration
             /// </summary>
             [EnumMember(Value = "ViewPayGreenWhiteLabelConfiguration")]
-            ViewPayGreenWhiteLabelConfiguration = 144,
+            ViewPayGreenWhiteLabelConfiguration = 167,
             
             /// <summary>
             /// Enum CreatePayGreenWhiteLabelConfiguration for value: CreatePayGreenWhiteLabelConfiguration
             /// </summary>
             [EnumMember(Value = "CreatePayGreenWhiteLabelConfiguration")]
-            CreatePayGreenWhiteLabelConfiguration = 145,
+            CreatePayGreenWhiteLabelConfiguration = 168,
             
             /// <summary>
             /// Enum UpdatePayGreenWhiteLabelConfiguration for value: UpdatePayGreenWhiteLabelConfiguration
             /// </summary>
             [EnumMember(Value = "UpdatePayGreenWhiteLabelConfiguration")]
-            UpdatePayGreenWhiteLabelConfiguration = 146,
+            UpdatePayGreenWhiteLabelConfiguration = 169,
             
             /// <summary>
             /// Enum UpdatePayGreenStoreConfiguration for value: UpdatePayGreenStoreConfiguration
             /// </summary>
             [EnumMember(Value = "UpdatePayGreenStoreConfiguration")]
-            UpdatePayGreenStoreConfiguration = 147
+            UpdatePayGreenStoreConfiguration = 170,
+            
+            /// <summary>
+            /// Enum ViewSubscriptions for value: ViewSubscriptions
+            /// </summary>
+            [EnumMember(Value = "ViewSubscriptions")]
+            ViewSubscriptions = 171,
+            
+            /// <summary>
+            /// Enum ViewInvoices for value: ViewInvoices
+            /// </summary>
+            [EnumMember(Value = "ViewInvoices")]
+            ViewInvoices = 172,
+            
+            /// <summary>
+            /// Enum EditAccountsBills for value: EditAccountsBills
+            /// </summary>
+            [EnumMember(Value = "EditAccountsBills")]
+            EditAccountsBills = 173,
+            
+            /// <summary>
+            /// Enum ViewAccountsBills for value: ViewAccountsBills
+            /// </summary>
+            [EnumMember(Value = "ViewAccountsBills")]
+            ViewAccountsBills = 174,
+            
+            /// <summary>
+            /// Enum EditAccountsCategories for value: EditAccountsCategories
+            /// </summary>
+            [EnumMember(Value = "EditAccountsCategories")]
+            EditAccountsCategories = 175,
+            
+            /// <summary>
+            /// Enum ViewAccountsCategories for value: ViewAccountsCategories
+            /// </summary>
+            [EnumMember(Value = "ViewAccountsCategories")]
+            ViewAccountsCategories = 176,
+            
+            /// <summary>
+            /// Enum EditAccountsCreditAccounts for value: EditAccountsCreditAccounts
+            /// </summary>
+            [EnumMember(Value = "EditAccountsCreditAccounts")]
+            EditAccountsCreditAccounts = 177,
+            
+            /// <summary>
+            /// Enum ViewAccountsCreditAccounts for value: ViewAccountsCreditAccounts
+            /// </summary>
+            [EnumMember(Value = "ViewAccountsCreditAccounts")]
+            ViewAccountsCreditAccounts = 178,
+            
+            /// <summary>
+            /// Enum EditAccountsCreditBooks for value: EditAccountsCreditBooks
+            /// </summary>
+            [EnumMember(Value = "EditAccountsCreditBooks")]
+            EditAccountsCreditBooks = 179,
+            
+            /// <summary>
+            /// Enum ViewAccountsCreditBooks for value: ViewAccountsCreditBooks
+            /// </summary>
+            [EnumMember(Value = "ViewAccountsCreditBooks")]
+            ViewAccountsCreditBooks = 180,
+            
+            /// <summary>
+            /// Enum EditAccountsExpenses for value: EditAccountsExpenses
+            /// </summary>
+            [EnumMember(Value = "EditAccountsExpenses")]
+            EditAccountsExpenses = 181,
+            
+            /// <summary>
+            /// Enum ViewAccountsExpenses for value: ViewAccountsExpenses
+            /// </summary>
+            [EnumMember(Value = "ViewAccountsExpenses")]
+            ViewAccountsExpenses = 182,
+            
+            /// <summary>
+            /// Enum EditAccountsTransactionAccounts for value: EditAccountsTransactionAccounts
+            /// </summary>
+            [EnumMember(Value = "EditAccountsTransactionAccounts")]
+            EditAccountsTransactionAccounts = 183,
+            
+            /// <summary>
+            /// Enum ViewAccountsTransactionAccounts for value: ViewAccountsTransactionAccounts
+            /// </summary>
+            [EnumMember(Value = "ViewAccountsTransactionAccounts")]
+            ViewAccountsTransactionAccounts = 184,
+            
+            /// <summary>
+            /// Enum EditDocumentExplorer for value: EditDocumentExplorer
+            /// </summary>
+            [EnumMember(Value = "EditDocumentExplorer")]
+            EditDocumentExplorer = 185,
+            
+            /// <summary>
+            /// Enum ViewDocumentExplorer for value: ViewDocumentExplorer
+            /// </summary>
+            [EnumMember(Value = "ViewDocumentExplorer")]
+            ViewDocumentExplorer = 186,
+            
+            /// <summary>
+            /// Enum ViewInventoryReports for value: ViewInventoryReports
+            /// </summary>
+            [EnumMember(Value = "ViewInventoryReports")]
+            ViewInventoryReports = 187,
+            
+            /// <summary>
+            /// Enum EditInventoryPurchaseOrders for value: EditInventoryPurchaseOrders
+            /// </summary>
+            [EnumMember(Value = "EditInventoryPurchaseOrders")]
+            EditInventoryPurchaseOrders = 188,
+            
+            /// <summary>
+            /// Enum ViewInventoryPurchaseOrders for value: ViewInventoryPurchaseOrders
+            /// </summary>
+            [EnumMember(Value = "ViewInventoryPurchaseOrders")]
+            ViewInventoryPurchaseOrders = 189,
+            
+            /// <summary>
+            /// Enum EditInventoryStockItems for value: EditInventoryStockItems
+            /// </summary>
+            [EnumMember(Value = "EditInventoryStockItems")]
+            EditInventoryStockItems = 190,
+            
+            /// <summary>
+            /// Enum ViewInventoryStockItems for value: ViewInventoryStockItems
+            /// </summary>
+            [EnumMember(Value = "ViewInventoryStockItems")]
+            ViewInventoryStockItems = 191,
+            
+            /// <summary>
+            /// Enum EditInventorySupplier for value: EditInventorySupplier
+            /// </summary>
+            [EnumMember(Value = "EditInventorySupplier")]
+            EditInventorySupplier = 192,
+            
+            /// <summary>
+            /// Enum ViewInventorySupplier for value: ViewInventorySupplier
+            /// </summary>
+            [EnumMember(Value = "ViewInventorySupplier")]
+            ViewInventorySupplier = 193,
+            
+            /// <summary>
+            /// Enum EditInventoryTrackingProfiles for value: EditInventoryTrackingProfiles
+            /// </summary>
+            [EnumMember(Value = "EditInventoryTrackingProfiles")]
+            EditInventoryTrackingProfiles = 194,
+            
+            /// <summary>
+            /// Enum ViewInventoryTrackingProfiles for value: ViewInventoryTrackingProfiles
+            /// </summary>
+            [EnumMember(Value = "ViewInventoryTrackingProfiles")]
+            ViewInventoryTrackingProfiles = 195,
+            
+            /// <summary>
+            /// Enum ViewPayrollReports for value: ViewPayrollReports
+            /// </summary>
+            [EnumMember(Value = "ViewPayrollReports")]
+            ViewPayrollReports = 196,
+            
+            /// <summary>
+            /// Enum EditPayrollHoliday for value: EditPayrollHoliday
+            /// </summary>
+            [EnumMember(Value = "EditPayrollHoliday")]
+            EditPayrollHoliday = 197,
+            
+            /// <summary>
+            /// Enum ViewPayrollHoliday for value: ViewPayrollHoliday
+            /// </summary>
+            [EnumMember(Value = "ViewPayrollHoliday")]
+            ViewPayrollHoliday = 198,
+            
+            /// <summary>
+            /// Enum EditPayrollRota for value: EditPayrollRota
+            /// </summary>
+            [EnumMember(Value = "EditPayrollRota")]
+            EditPayrollRota = 199,
+            
+            /// <summary>
+            /// Enum ViewPayrollRota for value: ViewPayrollRota
+            /// </summary>
+            [EnumMember(Value = "ViewPayrollRota")]
+            ViewPayrollRota = 200,
+            
+            /// <summary>
+            /// Enum EditPayrollStaff for value: EditPayrollStaff
+            /// </summary>
+            [EnumMember(Value = "EditPayrollStaff")]
+            EditPayrollStaff = 201,
+            
+            /// <summary>
+            /// Enum ViewPayrollStaff for value: ViewPayrollStaff
+            /// </summary>
+            [EnumMember(Value = "ViewPayrollStaff")]
+            ViewPayrollStaff = 202,
+            
+            /// <summary>
+            /// Enum ViewSalesReports for value: ViewSalesReports
+            /// </summary>
+            [EnumMember(Value = "ViewSalesReports")]
+            ViewSalesReports = 203,
+            
+            /// <summary>
+            /// Enum ViewCostReports for value: ViewCostReports
+            /// </summary>
+            [EnumMember(Value = "ViewCostReports")]
+            ViewCostReports = 204,
+            
+            /// <summary>
+            /// Enum ViewMenuReports for value: ViewMenuReports
+            /// </summary>
+            [EnumMember(Value = "ViewMenuReports")]
+            ViewMenuReports = 205
         }
 
 
@@ -1003,6 +1373,51 @@ public enum AppResourceSetEnum
         [DataMember(Name="AppResourceSet", EmitDefaultValue=false)]
         public List<AppResourceSetEnum> AppResourceSet { get; set; }
         /// <summary>
+        /// Web to App Redirect settings
+        /// </summary>
+        /// <value>Web to App Redirect settings</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum WebToAppRedirectEnum
+        {
+            
+            /// <summary>
+            /// Enum NoRedirect for value: NoRedirect
+            /// </summary>
+            [EnumMember(Value = "NoRedirect")]
+            NoRedirect = 1,
+            
+            /// <summary>
+            /// Enum RedirectOnce for value: RedirectOnce
+            /// </summary>
+            [EnumMember(Value = "RedirectOnce")]
+            RedirectOnce = 2,
+            
+            /// <summary>
+            /// Enum RedirectAlways for value: RedirectAlways
+            /// </summary>
+            [EnumMember(Value = "RedirectAlways")]
+            RedirectAlways = 3,
+            
+            /// <summary>
+            /// Enum SuggestPwa for value: SuggestPwa
+            /// </summary>
+            [EnumMember(Value = "SuggestPwa")]
+            SuggestPwa = 4,
+            
+            /// <summary>
+            /// Enum ForcePwa for value: ForcePwa
+            /// </summary>
+            [EnumMember(Value = "ForcePwa")]
+            ForcePwa = 5
+        }
+
+        /// <summary>
+        /// Web to App Redirect settings
+        /// </summary>
+        /// <value>Web to App Redirect settings</value>
+        [DataMember(Name="WebToAppRedirect", EmitDefaultValue=false)]
+        public WebToAppRedirectEnum? WebToAppRedirect { get; set; }
+        /// <summary>
         /// Application Category
         /// </summary>
         /// <value>Application Category</value>
@@ -1040,8 +1455,10 @@ public enum ApplicationCategoryEnum
         /// </summary>
         /// <param name="appId">App Identifier.</param>
         /// <param name="hasIosApp">Has iOS app in Apple App Store. This is readonly..</param>
+        /// <param name="iosAppStoreUrl">IOS App Store URL.</param>
         /// <param name="hasAndroidApp">Has Android app in Google Play Store. This is readonly..</param>
-        /// <param name="countryId">Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks.</param>
+        /// <param name="androidPlayStoreUrl">Android Play Store URL.</param>
+        /// <param name="displayDeliveryRestaurantScreen">Display delivery restaurant screen.</param>
         /// <param name="logoImageUrl">Application Logo..</param>
         /// <param name="languages">Languages that have been selected to be available to customers..</param>
         /// <param name="availableAppLanguages">Lists all languages that are supported by Flipdish..</param>
@@ -1051,18 +1468,27 @@ public enum ApplicationCategoryEnum
         /// <param name="mapCenter">Center of the map coordinates. This is used to center the map when the iOS and Android app first open.  This value is automatically set based on the locations of the Stores in the App..</param>
         /// <param name="mapNorthEast">North East(Top Right) Corner of the map coordinates. This is used to frame the map when the iOS and Android app first open.  This value is automatically set based on the locations of the Stores in the App..</param>
         /// <param name="mapSouthWest">South West (Bottom Left) Corner of the map coordinates. This is used to frame the map when the iOS and Android app first open.  This value is automatically set based on the locations of the Stores in the App..</param>
+        /// <param name="googleMapsApiKeyWeb">Key to be passed with Google Maps requests.</param>
+        /// <param name="orgId">Org Id.</param>
+        /// <param name="smsRestaurantName">SMS Restaurant Name.</param>
+        /// <param name="webToAppRedirect">Web to App Redirect settings.</param>
         /// <param name="name">App name.   This is used in various places on the Apple App Store, Google Play Store, mobile apps and websites..</param>
         /// <param name="hostName">HostName on which the web-ordering system is allowed to be hosted or that a Flipdish website is hosted on..</param>
         /// <param name="mainColor">Main color of the web / Android / iOS applications.</param>
+        /// <param name="kioskPrimaryColour">Primary colour used on the Kiosk.</param>
         /// <param name="applicationCategory">Application Category.</param>
-        /// <param name="isPanaceaEnabled">Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The aternative to using Panacea websites is to use a custom domain..</param>
+        /// <param name="isPanaceaEnabled">Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The alternative to using Panacea websites is to use a custom domain..</param>
+        /// <param name="panaceaVanityUrl">In case of IsPanaceaEnabled is true, the app can be accessed via https://my.flipdish.com/{PanaceaVanityUrl}.</param>
         /// <param name="cookieConsentPromptEnabled">Cookie Consent Prompt Enabled.</param>
-        public App(string appId = default(string), bool? hasIosApp = default(bool?), bool? hasAndroidApp = default(bool?), string countryId = default(string), string logoImageUrl = default(string), List<Language> languages = default(List<Language>), List<Language> availableAppLanguages = default(List<Language>), AppAccessLevelEnum? appAccessLevel = default(AppAccessLevelEnum?), List<AppResourceSetEnum> appResourceSet = default(List<AppResourceSetEnum>), List<string> features = default(List<string>), Coordinates mapCenter = default(Coordinates), Coordinates mapNorthEast = default(Coordinates), Coordinates mapSouthWest = default(Coordinates), string name = default(string), string hostName = default(string), string mainColor = default(string), ApplicationCategoryEnum? applicationCategory = default(ApplicationCategoryEnum?), bool? isPanaceaEnabled = default(bool?), bool? cookieConsentPromptEnabled = default(bool?))
+        /// <param name="countryId">Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks.</param>
+        public App(string appId = default(string), bool? hasIosApp = default(bool?), string iosAppStoreUrl = default(string), bool? hasAndroidApp = default(bool?), string androidPlayStoreUrl = default(string), bool? displayDeliveryRestaurantScreen = default(bool?), string logoImageUrl = default(string), List<Language> languages = default(List<Language>), List<Language> availableAppLanguages = default(List<Language>), AppAccessLevelEnum? appAccessLevel = default(AppAccessLevelEnum?), List<AppResourceSetEnum> appResourceSet = default(List<AppResourceSetEnum>), List<string> features = default(List<string>), Coordinates mapCenter = default(Coordinates), Coordinates mapNorthEast = default(Coordinates), Coordinates mapSouthWest = default(Coordinates), string googleMapsApiKeyWeb = default(string), string orgId = default(string), string smsRestaurantName = default(string), WebToAppRedirectEnum? webToAppRedirect = default(WebToAppRedirectEnum?), string name = default(string), string hostName = default(string), string mainColor = default(string), string kioskPrimaryColour = default(string), ApplicationCategoryEnum? applicationCategory = default(ApplicationCategoryEnum?), bool? isPanaceaEnabled = default(bool?), string panaceaVanityUrl = default(string), bool? cookieConsentPromptEnabled = default(bool?), string countryId = default(string))
         {
             this.AppId = appId;
             this.HasIosApp = hasIosApp;
+            this.IosAppStoreUrl = iosAppStoreUrl;
             this.HasAndroidApp = hasAndroidApp;
-            this.CountryId = countryId;
+            this.AndroidPlayStoreUrl = androidPlayStoreUrl;
+            this.DisplayDeliveryRestaurantScreen = displayDeliveryRestaurantScreen;
             this.LogoImageUrl = logoImageUrl;
             this.Languages = languages;
             this.AvailableAppLanguages = availableAppLanguages;
@@ -1072,12 +1498,19 @@ public enum ApplicationCategoryEnum
             this.MapCenter = mapCenter;
             this.MapNorthEast = mapNorthEast;
             this.MapSouthWest = mapSouthWest;
+            this.GoogleMapsApiKeyWeb = googleMapsApiKeyWeb;
+            this.OrgId = orgId;
+            this.SmsRestaurantName = smsRestaurantName;
+            this.WebToAppRedirect = webToAppRedirect;
             this.Name = name;
             this.HostName = hostName;
             this.MainColor = mainColor;
+            this.KioskPrimaryColour = kioskPrimaryColour;
             this.ApplicationCategory = applicationCategory;
             this.IsPanaceaEnabled = isPanaceaEnabled;
+            this.PanaceaVanityUrl = panaceaVanityUrl;
             this.CookieConsentPromptEnabled = cookieConsentPromptEnabled;
+            this.CountryId = countryId;
         }
         
         /// <summary>
@@ -1094,6 +1527,13 @@ public enum ApplicationCategoryEnum
         [DataMember(Name="HasIosApp", EmitDefaultValue=false)]
         public bool? HasIosApp { get; set; }
 
+        /// <summary>
+        /// IOS App Store URL
+        /// </summary>
+        /// <value>IOS App Store URL</value>
+        [DataMember(Name="IosAppStoreUrl", EmitDefaultValue=false)]
+        public string IosAppStoreUrl { get; set; }
+
         /// <summary>
         /// Has Android app in Google Play Store. This is readonly.
         /// </summary>
@@ -1102,11 +1542,18 @@ public enum ApplicationCategoryEnum
         public bool? HasAndroidApp { get; set; }
 
         /// <summary>
-        /// Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks
+        /// Android Play Store URL
         /// </summary>
-        /// <value>Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks</value>
-        [DataMember(Name="CountryId", EmitDefaultValue=false)]
-        public string CountryId { get; set; }
+        /// <value>Android Play Store URL</value>
+        [DataMember(Name="AndroidPlayStoreUrl", EmitDefaultValue=false)]
+        public string AndroidPlayStoreUrl { get; set; }
+
+        /// <summary>
+        /// Display delivery restaurant screen
+        /// </summary>
+        /// <value>Display delivery restaurant screen</value>
+        [DataMember(Name="DisplayDeliveryRestaurantScreen", EmitDefaultValue=false)]
+        public bool? DisplayDeliveryRestaurantScreen { get; set; }
 
         /// <summary>
         /// Application Logo.
@@ -1159,6 +1606,28 @@ public enum ApplicationCategoryEnum
         [DataMember(Name="MapSouthWest", EmitDefaultValue=false)]
         public Coordinates MapSouthWest { get; set; }
 
+        /// <summary>
+        /// Key to be passed with Google Maps requests
+        /// </summary>
+        /// <value>Key to be passed with Google Maps requests</value>
+        [DataMember(Name="GoogleMapsApiKeyWeb", EmitDefaultValue=false)]
+        public string GoogleMapsApiKeyWeb { get; set; }
+
+        /// <summary>
+        /// Org Id
+        /// </summary>
+        /// <value>Org Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// SMS Restaurant Name
+        /// </summary>
+        /// <value>SMS Restaurant Name</value>
+        [DataMember(Name="SmsRestaurantName", EmitDefaultValue=false)]
+        public string SmsRestaurantName { get; set; }
+
+
         /// <summary>
         /// App name.   This is used in various places on the Apple App Store, Google Play Store, mobile apps and websites.
         /// </summary>
@@ -1180,14 +1649,28 @@ public enum ApplicationCategoryEnum
         [DataMember(Name="MainColor", EmitDefaultValue=false)]
         public string MainColor { get; set; }
 
+        /// <summary>
+        /// Primary colour used on the Kiosk
+        /// </summary>
+        /// <value>Primary colour used on the Kiosk</value>
+        [DataMember(Name="KioskPrimaryColour", EmitDefaultValue=false)]
+        public string KioskPrimaryColour { get; set; }
+
 
         /// <summary>
-        /// Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The aternative to using Panacea websites is to use a custom domain.
+        /// Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The alternative to using Panacea websites is to use a custom domain.
         /// </summary>
-        /// <value>Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The aternative to using Panacea websites is to use a custom domain.</value>
+        /// <value>Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The alternative to using Panacea websites is to use a custom domain.</value>
         [DataMember(Name="IsPanaceaEnabled", EmitDefaultValue=false)]
         public bool? IsPanaceaEnabled { get; set; }
 
+        /// <summary>
+        /// In case of IsPanaceaEnabled is true, the app can be accessed via https://my.flipdish.com/{PanaceaVanityUrl}
+        /// </summary>
+        /// <value>In case of IsPanaceaEnabled is true, the app can be accessed via https://my.flipdish.com/{PanaceaVanityUrl}</value>
+        [DataMember(Name="PanaceaVanityUrl", EmitDefaultValue=false)]
+        public string PanaceaVanityUrl { get; set; }
+
         /// <summary>
         /// Cookie Consent Prompt Enabled
         /// </summary>
@@ -1195,6 +1678,13 @@ public enum ApplicationCategoryEnum
         [DataMember(Name="CookieConsentPromptEnabled", EmitDefaultValue=false)]
         public bool? CookieConsentPromptEnabled { get; set; }
 
+        /// <summary>
+        /// Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks
+        /// </summary>
+        /// <value>Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks</value>
+        [DataMember(Name="CountryId", EmitDefaultValue=false)]
+        public string CountryId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -1205,8 +1695,10 @@ public override string ToString()
             sb.Append("class App {\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  HasIosApp: ").Append(HasIosApp).Append("\n");
+            sb.Append("  IosAppStoreUrl: ").Append(IosAppStoreUrl).Append("\n");
             sb.Append("  HasAndroidApp: ").Append(HasAndroidApp).Append("\n");
-            sb.Append("  CountryId: ").Append(CountryId).Append("\n");
+            sb.Append("  AndroidPlayStoreUrl: ").Append(AndroidPlayStoreUrl).Append("\n");
+            sb.Append("  DisplayDeliveryRestaurantScreen: ").Append(DisplayDeliveryRestaurantScreen).Append("\n");
             sb.Append("  LogoImageUrl: ").Append(LogoImageUrl).Append("\n");
             sb.Append("  Languages: ").Append(Languages).Append("\n");
             sb.Append("  AvailableAppLanguages: ").Append(AvailableAppLanguages).Append("\n");
@@ -1216,12 +1708,19 @@ public override string ToString()
             sb.Append("  MapCenter: ").Append(MapCenter).Append("\n");
             sb.Append("  MapNorthEast: ").Append(MapNorthEast).Append("\n");
             sb.Append("  MapSouthWest: ").Append(MapSouthWest).Append("\n");
+            sb.Append("  GoogleMapsApiKeyWeb: ").Append(GoogleMapsApiKeyWeb).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  SmsRestaurantName: ").Append(SmsRestaurantName).Append("\n");
+            sb.Append("  WebToAppRedirect: ").Append(WebToAppRedirect).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  HostName: ").Append(HostName).Append("\n");
             sb.Append("  MainColor: ").Append(MainColor).Append("\n");
+            sb.Append("  KioskPrimaryColour: ").Append(KioskPrimaryColour).Append("\n");
             sb.Append("  ApplicationCategory: ").Append(ApplicationCategory).Append("\n");
             sb.Append("  IsPanaceaEnabled: ").Append(IsPanaceaEnabled).Append("\n");
+            sb.Append("  PanaceaVanityUrl: ").Append(PanaceaVanityUrl).Append("\n");
             sb.Append("  CookieConsentPromptEnabled: ").Append(CookieConsentPromptEnabled).Append("\n");
+            sb.Append("  CountryId: ").Append(CountryId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -1266,15 +1765,25 @@ public bool Equals(App input)
                     (this.HasIosApp != null &&
                     this.HasIosApp.Equals(input.HasIosApp))
                 ) && 
+                (
+                    this.IosAppStoreUrl == input.IosAppStoreUrl ||
+                    (this.IosAppStoreUrl != null &&
+                    this.IosAppStoreUrl.Equals(input.IosAppStoreUrl))
+                ) && 
                 (
                     this.HasAndroidApp == input.HasAndroidApp ||
                     (this.HasAndroidApp != null &&
                     this.HasAndroidApp.Equals(input.HasAndroidApp))
                 ) && 
                 (
-                    this.CountryId == input.CountryId ||
-                    (this.CountryId != null &&
-                    this.CountryId.Equals(input.CountryId))
+                    this.AndroidPlayStoreUrl == input.AndroidPlayStoreUrl ||
+                    (this.AndroidPlayStoreUrl != null &&
+                    this.AndroidPlayStoreUrl.Equals(input.AndroidPlayStoreUrl))
+                ) && 
+                (
+                    this.DisplayDeliveryRestaurantScreen == input.DisplayDeliveryRestaurantScreen ||
+                    (this.DisplayDeliveryRestaurantScreen != null &&
+                    this.DisplayDeliveryRestaurantScreen.Equals(input.DisplayDeliveryRestaurantScreen))
                 ) && 
                 (
                     this.LogoImageUrl == input.LogoImageUrl ||
@@ -1321,6 +1830,26 @@ public bool Equals(App input)
                     (this.MapSouthWest != null &&
                     this.MapSouthWest.Equals(input.MapSouthWest))
                 ) && 
+                (
+                    this.GoogleMapsApiKeyWeb == input.GoogleMapsApiKeyWeb ||
+                    (this.GoogleMapsApiKeyWeb != null &&
+                    this.GoogleMapsApiKeyWeb.Equals(input.GoogleMapsApiKeyWeb))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.SmsRestaurantName == input.SmsRestaurantName ||
+                    (this.SmsRestaurantName != null &&
+                    this.SmsRestaurantName.Equals(input.SmsRestaurantName))
+                ) && 
+                (
+                    this.WebToAppRedirect == input.WebToAppRedirect ||
+                    (this.WebToAppRedirect != null &&
+                    this.WebToAppRedirect.Equals(input.WebToAppRedirect))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -1336,6 +1865,11 @@ public bool Equals(App input)
                     (this.MainColor != null &&
                     this.MainColor.Equals(input.MainColor))
                 ) && 
+                (
+                    this.KioskPrimaryColour == input.KioskPrimaryColour ||
+                    (this.KioskPrimaryColour != null &&
+                    this.KioskPrimaryColour.Equals(input.KioskPrimaryColour))
+                ) && 
                 (
                     this.ApplicationCategory == input.ApplicationCategory ||
                     (this.ApplicationCategory != null &&
@@ -1346,10 +1880,20 @@ public bool Equals(App input)
                     (this.IsPanaceaEnabled != null &&
                     this.IsPanaceaEnabled.Equals(input.IsPanaceaEnabled))
                 ) && 
+                (
+                    this.PanaceaVanityUrl == input.PanaceaVanityUrl ||
+                    (this.PanaceaVanityUrl != null &&
+                    this.PanaceaVanityUrl.Equals(input.PanaceaVanityUrl))
+                ) && 
                 (
                     this.CookieConsentPromptEnabled == input.CookieConsentPromptEnabled ||
                     (this.CookieConsentPromptEnabled != null &&
                     this.CookieConsentPromptEnabled.Equals(input.CookieConsentPromptEnabled))
+                ) && 
+                (
+                    this.CountryId == input.CountryId ||
+                    (this.CountryId != null &&
+                    this.CountryId.Equals(input.CountryId))
                 );
         }
 
@@ -1366,10 +1910,14 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.HasIosApp != null)
                     hashCode = hashCode * 59 + this.HasIosApp.GetHashCode();
+                if (this.IosAppStoreUrl != null)
+                    hashCode = hashCode * 59 + this.IosAppStoreUrl.GetHashCode();
                 if (this.HasAndroidApp != null)
                     hashCode = hashCode * 59 + this.HasAndroidApp.GetHashCode();
-                if (this.CountryId != null)
-                    hashCode = hashCode * 59 + this.CountryId.GetHashCode();
+                if (this.AndroidPlayStoreUrl != null)
+                    hashCode = hashCode * 59 + this.AndroidPlayStoreUrl.GetHashCode();
+                if (this.DisplayDeliveryRestaurantScreen != null)
+                    hashCode = hashCode * 59 + this.DisplayDeliveryRestaurantScreen.GetHashCode();
                 if (this.LogoImageUrl != null)
                     hashCode = hashCode * 59 + this.LogoImageUrl.GetHashCode();
                 if (this.Languages != null)
@@ -1388,43 +1936,35 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.MapNorthEast.GetHashCode();
                 if (this.MapSouthWest != null)
                     hashCode = hashCode * 59 + this.MapSouthWest.GetHashCode();
+                if (this.GoogleMapsApiKeyWeb != null)
+                    hashCode = hashCode * 59 + this.GoogleMapsApiKeyWeb.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.SmsRestaurantName != null)
+                    hashCode = hashCode * 59 + this.SmsRestaurantName.GetHashCode();
+                if (this.WebToAppRedirect != null)
+                    hashCode = hashCode * 59 + this.WebToAppRedirect.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.HostName != null)
                     hashCode = hashCode * 59 + this.HostName.GetHashCode();
                 if (this.MainColor != null)
                     hashCode = hashCode * 59 + this.MainColor.GetHashCode();
+                if (this.KioskPrimaryColour != null)
+                    hashCode = hashCode * 59 + this.KioskPrimaryColour.GetHashCode();
                 if (this.ApplicationCategory != null)
                     hashCode = hashCode * 59 + this.ApplicationCategory.GetHashCode();
                 if (this.IsPanaceaEnabled != null)
                     hashCode = hashCode * 59 + this.IsPanaceaEnabled.GetHashCode();
+                if (this.PanaceaVanityUrl != null)
+                    hashCode = hashCode * 59 + this.PanaceaVanityUrl.GetHashCode();
                 if (this.CookieConsentPromptEnabled != null)
                     hashCode = hashCode * 59 + this.CookieConsentPromptEnabled.GetHashCode();
+                if (this.CountryId != null)
+                    hashCode = hashCode * 59 + this.CountryId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CountryId (string) maxLength
-            if(this.CountryId != null && this.CountryId.Length > 2)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CountryId, length must be less than 2.", new [] { "CountryId" });
-            }
-
-            // CountryId (string) minLength
-            if(this.CountryId != null && this.CountryId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CountryId, length must be greater than 0.", new [] { "CountryId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppChannelAssignment.cs b/src/Flipdish/Model/AppChannelAssignment.cs
index fadf9765..c4cb1e93 100644
--- a/src/Flipdish/Model/AppChannelAssignment.cs
+++ b/src/Flipdish/Model/AppChannelAssignment.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Describes a ChannelAssignment which is   when a AppId is assigned to a Sales Channel
     /// </summary>
     [DataContract]
-    public partial class AppChannelAssignment :  IEquatable<AppChannelAssignment>, IValidatableObject
+    public partial class AppChannelAssignment :  IEquatable<AppChannelAssignment>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AppChannelAssignment" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppCompliance.cs b/src/Flipdish/Model/AppCompliance.cs
index ef07e80a..fbe1a333 100644
--- a/src/Flipdish/Model/AppCompliance.cs
+++ b/src/Flipdish/Model/AppCompliance.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Application compliance model
     /// </summary>
     [DataContract]
-    public partial class AppCompliance :  IEquatable<AppCompliance>, IValidatableObject
+    public partial class AppCompliance :  IEquatable<AppCompliance>
     {
         /// <summary>
         /// Type of compliance.  This controls if the Flipdish websites and apps display cookie consent banners and adjust cookies to be inline with various regulations.   You should set this correctly based on your region.
@@ -62,10 +60,12 @@ public enum ComplianceTypeEnum
         /// </summary>
         /// <param name="appId">App ID.</param>
         /// <param name="complianceType">Type of compliance.  This controls if the Flipdish websites and apps display cookie consent banners and adjust cookies to be inline with various regulations.   You should set this correctly based on your region..</param>
-        public AppCompliance(string appId = default(string), ComplianceTypeEnum? complianceType = default(ComplianceTypeEnum?))
+        /// <param name="allowDisablingOfGdpr">For EU countries, we should not allow to change the option to “Default banner”, but all other countries should be able to do so..</param>
+        public AppCompliance(string appId = default(string), ComplianceTypeEnum? complianceType = default(ComplianceTypeEnum?), bool? allowDisablingOfGdpr = default(bool?))
         {
             this.AppId = appId;
             this.ComplianceType = complianceType;
+            this.AllowDisablingOfGdpr = allowDisablingOfGdpr;
         }
         
         /// <summary>
@@ -76,6 +76,13 @@ public enum ComplianceTypeEnum
         public string AppId { get; set; }
 
 
+        /// <summary>
+        /// For EU countries, we should not allow to change the option to “Default banner”, but all other countries should be able to do so.
+        /// </summary>
+        /// <value>For EU countries, we should not allow to change the option to “Default banner”, but all other countries should be able to do so.</value>
+        [DataMember(Name="AllowDisablingOfGdpr", EmitDefaultValue=false)]
+        public bool? AllowDisablingOfGdpr { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -86,6 +93,7 @@ public override string ToString()
             sb.Append("class AppCompliance {\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  ComplianceType: ").Append(ComplianceType).Append("\n");
+            sb.Append("  AllowDisablingOfGdpr: ").Append(AllowDisablingOfGdpr).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -129,6 +137,11 @@ public bool Equals(AppCompliance input)
                     this.ComplianceType == input.ComplianceType ||
                     (this.ComplianceType != null &&
                     this.ComplianceType.Equals(input.ComplianceType))
+                ) && 
+                (
+                    this.AllowDisablingOfGdpr == input.AllowDisablingOfGdpr ||
+                    (this.AllowDisablingOfGdpr != null &&
+                    this.AllowDisablingOfGdpr.Equals(input.AllowDisablingOfGdpr))
                 );
         }
 
@@ -145,19 +158,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.ComplianceType != null)
                     hashCode = hashCode * 59 + this.ComplianceType.GetHashCode();
+                if (this.AllowDisablingOfGdpr != null)
+                    hashCode = hashCode * 59 + this.AllowDisablingOfGdpr.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppConfigSalesChannel.cs b/src/Flipdish/Model/AppConfigSalesChannel.cs
index 2ce7c72a..749d2f53 100644
--- a/src/Flipdish/Model/AppConfigSalesChannel.cs
+++ b/src/Flipdish/Model/AppConfigSalesChannel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// App Config Sales Channel
     /// </summary>
     [DataContract]
-    public partial class AppConfigSalesChannel :  IEquatable<AppConfigSalesChannel>, IValidatableObject
+    public partial class AppConfigSalesChannel :  IEquatable<AppConfigSalesChannel>
     {
         /// <summary>
         /// Display a popup to users requesting their email address
@@ -109,9 +107,9 @@ public enum WebToAppRedirectEnum
         [DataMember(Name="WebToAppRedirect", EmitDefaultValue=false)]
         public WebToAppRedirectEnum? WebToAppRedirect { get; set; }
         /// <summary>
-        /// Address entry type
+        /// Address entry type - TextEntryManualDisallowed is the only supported configuration
         /// </summary>
-        /// <value>Address entry type</value>
+        /// <value>Address entry type - TextEntryManualDisallowed is the only supported configuration</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum AddressEntryTypeEnum
         {
@@ -136,9 +134,9 @@ public enum AddressEntryTypeEnum
         }
 
         /// <summary>
-        /// Address entry type
+        /// Address entry type - TextEntryManualDisallowed is the only supported configuration
         /// </summary>
-        /// <value>Address entry type</value>
+        /// <value>Address entry type - TextEntryManualDisallowed is the only supported configuration</value>
         [DataMember(Name="AddressEntryType", EmitDefaultValue=false)]
         public AddressEntryTypeEnum? AddressEntryType { get; set; }
         /// <summary>
@@ -146,7 +144,7 @@ public enum AddressEntryTypeEnum
         /// </summary>
         /// <param name="emailRequestMode">Display a popup to users requesting their email address.</param>
         /// <param name="webToAppRedirect">Sends users to their native apps or request them to install the pwa.</param>
-        /// <param name="addressEntryType">Address entry type.</param>
+        /// <param name="addressEntryType">Address entry type - TextEntryManualDisallowed is the only supported configuration.</param>
         /// <param name="displayDeliveryRestaurantListScreen">Display Pickup Restaurant List Screen.</param>
         public AppConfigSalesChannel(EmailRequestModeEnum? emailRequestMode = default(EmailRequestModeEnum?), WebToAppRedirectEnum? webToAppRedirect = default(WebToAppRedirectEnum?), AddressEntryTypeEnum? addressEntryType = default(AddressEntryTypeEnum?), bool? displayDeliveryRestaurantListScreen = default(bool?))
         {
@@ -254,16 +252,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppConfigUpdateModel.cs b/src/Flipdish/Model/AppConfigUpdateModel.cs
index 9282ccdb..05421cea 100644
--- a/src/Flipdish/Model/AppConfigUpdateModel.cs
+++ b/src/Flipdish/Model/AppConfigUpdateModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Application configuration
     /// </summary>
     [DataContract]
-    public partial class AppConfigUpdateModel :  IEquatable<AppConfigUpdateModel>, IValidatableObject
+    public partial class AppConfigUpdateModel :  IEquatable<AppConfigUpdateModel>
     {
         /// <summary>
         /// Application Category
@@ -69,17 +67,25 @@ public enum ApplicationCategoryEnum
         /// <param name="name">App name.   This is used in various places on the Apple App Store, Google Play Store, mobile apps and websites..</param>
         /// <param name="hostName">HostName on which the web-ordering system is allowed to be hosted or that a Flipdish website is hosted on..</param>
         /// <param name="mainColor">Main color of the web / Android / iOS applications.</param>
+        /// <param name="kioskPrimaryColour">Primary colour used on the Kiosk.</param>
         /// <param name="applicationCategory">Application Category.</param>
-        /// <param name="isPanaceaEnabled">Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The aternative to using Panacea websites is to use a custom domain..</param>
+        /// <param name="isPanaceaEnabled">Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The alternative to using Panacea websites is to use a custom domain..</param>
+        /// <param name="panaceaVanityUrl">In case of IsPanaceaEnabled is true, the app can be accessed via https://my.flipdish.com/{PanaceaVanityUrl}.</param>
         /// <param name="cookieConsentPromptEnabled">Cookie Consent Prompt Enabled.</param>
-        public AppConfigUpdateModel(string name = default(string), string hostName = default(string), string mainColor = default(string), ApplicationCategoryEnum? applicationCategory = default(ApplicationCategoryEnum?), bool? isPanaceaEnabled = default(bool?), bool? cookieConsentPromptEnabled = default(bool?))
+        /// <param name="logoImageUrl">Logo image URL.</param>
+        /// <param name="countryId">Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks.</param>
+        public AppConfigUpdateModel(string name = default(string), string hostName = default(string), string mainColor = default(string), string kioskPrimaryColour = default(string), ApplicationCategoryEnum? applicationCategory = default(ApplicationCategoryEnum?), bool? isPanaceaEnabled = default(bool?), string panaceaVanityUrl = default(string), bool? cookieConsentPromptEnabled = default(bool?), string logoImageUrl = default(string), string countryId = default(string))
         {
             this.Name = name;
             this.HostName = hostName;
             this.MainColor = mainColor;
+            this.KioskPrimaryColour = kioskPrimaryColour;
             this.ApplicationCategory = applicationCategory;
             this.IsPanaceaEnabled = isPanaceaEnabled;
+            this.PanaceaVanityUrl = panaceaVanityUrl;
             this.CookieConsentPromptEnabled = cookieConsentPromptEnabled;
+            this.LogoImageUrl = logoImageUrl;
+            this.CountryId = countryId;
         }
         
         /// <summary>
@@ -103,14 +109,28 @@ public enum ApplicationCategoryEnum
         [DataMember(Name="MainColor", EmitDefaultValue=false)]
         public string MainColor { get; set; }
 
+        /// <summary>
+        /// Primary colour used on the Kiosk
+        /// </summary>
+        /// <value>Primary colour used on the Kiosk</value>
+        [DataMember(Name="KioskPrimaryColour", EmitDefaultValue=false)]
+        public string KioskPrimaryColour { get; set; }
+
 
         /// <summary>
-        /// Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The aternative to using Panacea websites is to use a custom domain.
+        /// Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The alternative to using Panacea websites is to use a custom domain.
         /// </summary>
-        /// <value>Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The aternative to using Panacea websites is to use a custom domain.</value>
+        /// <value>Panacea is the term used for websites that are hosted on the my.flipdish.com domain. This value is true when the App&#39;s website is hosted on this domain.  The alternative to using Panacea websites is to use a custom domain.</value>
         [DataMember(Name="IsPanaceaEnabled", EmitDefaultValue=false)]
         public bool? IsPanaceaEnabled { get; set; }
 
+        /// <summary>
+        /// In case of IsPanaceaEnabled is true, the app can be accessed via https://my.flipdish.com/{PanaceaVanityUrl}
+        /// </summary>
+        /// <value>In case of IsPanaceaEnabled is true, the app can be accessed via https://my.flipdish.com/{PanaceaVanityUrl}</value>
+        [DataMember(Name="PanaceaVanityUrl", EmitDefaultValue=false)]
+        public string PanaceaVanityUrl { get; set; }
+
         /// <summary>
         /// Cookie Consent Prompt Enabled
         /// </summary>
@@ -118,6 +138,20 @@ public enum ApplicationCategoryEnum
         [DataMember(Name="CookieConsentPromptEnabled", EmitDefaultValue=false)]
         public bool? CookieConsentPromptEnabled { get; set; }
 
+        /// <summary>
+        /// Logo image URL
+        /// </summary>
+        /// <value>Logo image URL</value>
+        [DataMember(Name="LogoImageUrl", EmitDefaultValue=false)]
+        public string LogoImageUrl { get; set; }
+
+        /// <summary>
+        /// Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks
+        /// </summary>
+        /// <value>Country identifier in ISO 3166-1 alpha-2 format.   This code is set automatically based on the locations of the Stores in the App.     The App Country is used    - to determine how to parse mobile phone numbers that are entered in their local numbering format   - to determine if country specific payment methods should be offered   - in various fraud checks</value>
+        [DataMember(Name="CountryId", EmitDefaultValue=false)]
+        public string CountryId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -129,9 +163,13 @@ public override string ToString()
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  HostName: ").Append(HostName).Append("\n");
             sb.Append("  MainColor: ").Append(MainColor).Append("\n");
+            sb.Append("  KioskPrimaryColour: ").Append(KioskPrimaryColour).Append("\n");
             sb.Append("  ApplicationCategory: ").Append(ApplicationCategory).Append("\n");
             sb.Append("  IsPanaceaEnabled: ").Append(IsPanaceaEnabled).Append("\n");
+            sb.Append("  PanaceaVanityUrl: ").Append(PanaceaVanityUrl).Append("\n");
             sb.Append("  CookieConsentPromptEnabled: ").Append(CookieConsentPromptEnabled).Append("\n");
+            sb.Append("  LogoImageUrl: ").Append(LogoImageUrl).Append("\n");
+            sb.Append("  CountryId: ").Append(CountryId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -181,6 +219,11 @@ public bool Equals(AppConfigUpdateModel input)
                     (this.MainColor != null &&
                     this.MainColor.Equals(input.MainColor))
                 ) && 
+                (
+                    this.KioskPrimaryColour == input.KioskPrimaryColour ||
+                    (this.KioskPrimaryColour != null &&
+                    this.KioskPrimaryColour.Equals(input.KioskPrimaryColour))
+                ) && 
                 (
                     this.ApplicationCategory == input.ApplicationCategory ||
                     (this.ApplicationCategory != null &&
@@ -191,10 +234,25 @@ public bool Equals(AppConfigUpdateModel input)
                     (this.IsPanaceaEnabled != null &&
                     this.IsPanaceaEnabled.Equals(input.IsPanaceaEnabled))
                 ) && 
+                (
+                    this.PanaceaVanityUrl == input.PanaceaVanityUrl ||
+                    (this.PanaceaVanityUrl != null &&
+                    this.PanaceaVanityUrl.Equals(input.PanaceaVanityUrl))
+                ) && 
                 (
                     this.CookieConsentPromptEnabled == input.CookieConsentPromptEnabled ||
                     (this.CookieConsentPromptEnabled != null &&
                     this.CookieConsentPromptEnabled.Equals(input.CookieConsentPromptEnabled))
+                ) && 
+                (
+                    this.LogoImageUrl == input.LogoImageUrl ||
+                    (this.LogoImageUrl != null &&
+                    this.LogoImageUrl.Equals(input.LogoImageUrl))
+                ) && 
+                (
+                    this.CountryId == input.CountryId ||
+                    (this.CountryId != null &&
+                    this.CountryId.Equals(input.CountryId))
                 );
         }
 
@@ -213,25 +271,23 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.HostName.GetHashCode();
                 if (this.MainColor != null)
                     hashCode = hashCode * 59 + this.MainColor.GetHashCode();
+                if (this.KioskPrimaryColour != null)
+                    hashCode = hashCode * 59 + this.KioskPrimaryColour.GetHashCode();
                 if (this.ApplicationCategory != null)
                     hashCode = hashCode * 59 + this.ApplicationCategory.GetHashCode();
                 if (this.IsPanaceaEnabled != null)
                     hashCode = hashCode * 59 + this.IsPanaceaEnabled.GetHashCode();
+                if (this.PanaceaVanityUrl != null)
+                    hashCode = hashCode * 59 + this.PanaceaVanityUrl.GetHashCode();
                 if (this.CookieConsentPromptEnabled != null)
                     hashCode = hashCode * 59 + this.CookieConsentPromptEnabled.GetHashCode();
+                if (this.LogoImageUrl != null)
+                    hashCode = hashCode * 59 + this.LogoImageUrl.GetHashCode();
+                if (this.CountryId != null)
+                    hashCode = hashCode * 59 + this.CountryId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppConfiguration.cs b/src/Flipdish/Model/AppConfiguration.cs
deleted file mode 100644
index ddfa6da9..00000000
--- a/src/Flipdish/Model/AppConfiguration.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// AppConfiguration
-    /// </summary>
-    [DataContract]
-    public partial class AppConfiguration :  IEquatable<AppConfiguration>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfiguration" /> class.
-        /// </summary>
-        /// <param name="id">id.</param>
-        /// <param name="physicalRestaurants">physicalRestaurants.</param>
-        /// <param name="isEnabled">isEnabled.</param>
-        /// <param name="settings">settings.</param>
-        public AppConfiguration(string id = default(string), List<int?> physicalRestaurants = default(List<int?>), bool? isEnabled = default(bool?), List<AppConfigurationSetting> settings = default(List<AppConfigurationSetting>))
-        {
-            this.Id = id;
-            this.PhysicalRestaurants = physicalRestaurants;
-            this.IsEnabled = isEnabled;
-            this.Settings = settings;
-        }
-        
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or Sets PhysicalRestaurants
-        /// </summary>
-        [DataMember(Name="PhysicalRestaurants", EmitDefaultValue=false)]
-        public List<int?> PhysicalRestaurants { get; set; }
-
-        /// <summary>
-        /// Gets or Sets IsEnabled
-        /// </summary>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Settings
-        /// </summary>
-        [DataMember(Name="Settings", EmitDefaultValue=false)]
-        public List<AppConfigurationSetting> Settings { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppConfiguration {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  PhysicalRestaurants: ").Append(PhysicalRestaurants).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  Settings: ").Append(Settings).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppConfiguration);
-        }
-
-        /// <summary>
-        /// Returns true if AppConfiguration instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppConfiguration to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppConfiguration input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.PhysicalRestaurants == input.PhysicalRestaurants ||
-                    this.PhysicalRestaurants != null &&
-                    this.PhysicalRestaurants.SequenceEqual(input.PhysicalRestaurants)
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.Settings == input.Settings ||
-                    this.Settings != null &&
-                    this.Settings.SequenceEqual(input.Settings)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.PhysicalRestaurants != null)
-                    hashCode = hashCode * 59 + this.PhysicalRestaurants.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.Settings != null)
-                    hashCode = hashCode * 59 + this.Settings.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppConfigurationBase.cs b/src/Flipdish/Model/AppConfigurationBase.cs
deleted file mode 100644
index a0897dc3..00000000
--- a/src/Flipdish/Model/AppConfigurationBase.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Application Configuration Base
-    /// </summary>
-    [DataContract]
-    public partial class AppConfigurationBase :  IEquatable<AppConfigurationBase>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationBase" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected AppConfigurationBase() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationBase" /> class.
-        /// </summary>
-        /// <param name="id">Application Configuration Public Id (required).</param>
-        /// <param name="isEnabled">Is Enabled (required).</param>
-        /// <param name="physicalRestaurants">Physical Restaurant Id&#39;s.</param>
-        /// <param name="settings">Settings.</param>
-        public AppConfigurationBase(string id = default(string), bool? isEnabled = default(bool?), List<int?> physicalRestaurants = default(List<int?>), List<Setting> settings = default(List<Setting>))
-        {
-            // to ensure "id" is required (not null)
-            if (id == null)
-            {
-                throw new InvalidDataException("id is a required property for AppConfigurationBase and cannot be null");
-            }
-            else
-            {
-                this.Id = id;
-            }
-            // to ensure "isEnabled" is required (not null)
-            if (isEnabled == null)
-            {
-                throw new InvalidDataException("isEnabled is a required property for AppConfigurationBase and cannot be null");
-            }
-            else
-            {
-                this.IsEnabled = isEnabled;
-            }
-            this.PhysicalRestaurants = physicalRestaurants;
-            this.Settings = settings;
-        }
-        
-        /// <summary>
-        /// Application Configuration Public Id
-        /// </summary>
-        /// <value>Application Configuration Public Id</value>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Is Enabled
-        /// </summary>
-        /// <value>Is Enabled</value>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-        /// <summary>
-        /// Physical Restaurant Id&#39;s
-        /// </summary>
-        /// <value>Physical Restaurant Id&#39;s</value>
-        [DataMember(Name="PhysicalRestaurants", EmitDefaultValue=false)]
-        public List<int?> PhysicalRestaurants { get; set; }
-
-        /// <summary>
-        /// Settings
-        /// </summary>
-        /// <value>Settings</value>
-        [DataMember(Name="Settings", EmitDefaultValue=false)]
-        public List<Setting> Settings { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppConfigurationBase {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  PhysicalRestaurants: ").Append(PhysicalRestaurants).Append("\n");
-            sb.Append("  Settings: ").Append(Settings).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppConfigurationBase);
-        }
-
-        /// <summary>
-        /// Returns true if AppConfigurationBase instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppConfigurationBase to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppConfigurationBase input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.PhysicalRestaurants == input.PhysicalRestaurants ||
-                    this.PhysicalRestaurants != null &&
-                    this.PhysicalRestaurants.SequenceEqual(input.PhysicalRestaurants)
-                ) && 
-                (
-                    this.Settings == input.Settings ||
-                    this.Settings != null &&
-                    this.Settings.SequenceEqual(input.Settings)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.PhysicalRestaurants != null)
-                    hashCode = hashCode * 59 + this.PhysicalRestaurants.GetHashCode();
-                if (this.Settings != null)
-                    hashCode = hashCode * 59 + this.Settings.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppConfigurationDetail.cs b/src/Flipdish/Model/AppConfigurationDetail.cs
deleted file mode 100644
index e59af314..00000000
--- a/src/Flipdish/Model/AppConfigurationDetail.cs
+++ /dev/null
@@ -1,721 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Application configuration detail
-    /// </summary>
-    [DataContract]
-    public partial class AppConfigurationDetail :  IEquatable<AppConfigurationDetail>, IValidatableObject
-    {
-        /// <summary>
-        /// Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;
-        /// </summary>
-        /// <value>Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ConfigurationTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum ExternalLink for value: ExternalLink
-            /// </summary>
-            [EnumMember(Value = "ExternalLink")]
-            ExternalLink = 1,
-            
-            /// <summary>
-            /// Enum FlipdishHosted for value: FlipdishHosted
-            /// </summary>
-            [EnumMember(Value = "FlipdishHosted")]
-            FlipdishHosted = 2
-        }
-
-        /// <summary>
-        /// Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;
-        /// </summary>
-        /// <value>Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;</value>
-        [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
-        public ConfigurationTypeEnum ConfigurationType { get; set; }
-        /// <summary>
-        /// Store Selector Type
-        /// </summary>
-        /// <value>Store Selector Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum StoreSelectorTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum None for value: None
-            /// </summary>
-            [EnumMember(Value = "None")]
-            None = 1,
-            
-            /// <summary>
-            /// Enum Single for value: Single
-            /// </summary>
-            [EnumMember(Value = "Single")]
-            Single = 2,
-            
-            /// <summary>
-            /// Enum Multiple for value: Multiple
-            /// </summary>
-            [EnumMember(Value = "Multiple")]
-            Multiple = 3
-        }
-
-        /// <summary>
-        /// Store Selector Type
-        /// </summary>
-        /// <value>Store Selector Type</value>
-        [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
-        public StoreSelectorTypeEnum StoreSelectorType { get; set; }
-        /// <summary>
-        /// Teammate App Access Level
-        /// </summary>
-        /// <value>Teammate App Access Level</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum TeammateAppAccessLevelEnum
-        {
-            
-            /// <summary>
-            /// Enum Owner for value: Owner
-            /// </summary>
-            [EnumMember(Value = "Owner")]
-            Owner = 1,
-            
-            /// <summary>
-            /// Enum StoreOwner for value: StoreOwner
-            /// </summary>
-            [EnumMember(Value = "StoreOwner")]
-            StoreOwner = 2,
-            
-            /// <summary>
-            /// Enum ManagedOwner for value: ManagedOwner
-            /// </summary>
-            [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 3,
-            
-            /// <summary>
-            /// Enum Integrator for value: Integrator
-            /// </summary>
-            [EnumMember(Value = "Integrator")]
-            Integrator = 4,
-            
-            /// <summary>
-            /// Enum StoreManager for value: StoreManager
-            /// </summary>
-            [EnumMember(Value = "StoreManager")]
-            StoreManager = 5,
-            
-            /// <summary>
-            /// Enum StoreStaff for value: StoreStaff
-            /// </summary>
-            [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 6,
-            
-            /// <summary>
-            /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
-            /// </summary>
-            [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 7,
-            
-            /// <summary>
-            /// Enum FinanceManger for value: FinanceManger
-            /// </summary>
-            [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 8
-        }
-
-        /// <summary>
-        /// Teammate App Access Level
-        /// </summary>
-        /// <value>Teammate App Access Level</value>
-        [DataMember(Name="TeammateAppAccessLevel", EmitDefaultValue=false)]
-        public TeammateAppAccessLevelEnum? TeammateAppAccessLevel { get; set; }
-        /// <summary>
-        /// Permissions Type
-        /// </summary>
-        /// <value>Permissions Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum PermissionsTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Teammate for value: Teammate
-            /// </summary>
-            [EnumMember(Value = "Teammate")]
-            Teammate = 1
-        }
-
-        /// <summary>
-        /// Permissions Type
-        /// </summary>
-        /// <value>Permissions Type</value>
-        [DataMember(Name="PermissionsType", EmitDefaultValue=false)]
-        public PermissionsTypeEnum PermissionsType { get; set; }
-        /// <summary>
-        /// Application verification status
-        /// </summary>
-        /// <value>Application verification status</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum VerificationStatusEnum
-        {
-            
-            /// <summary>
-            /// Enum Draft for value: Draft
-            /// </summary>
-            [EnumMember(Value = "Draft")]
-            Draft = 1,
-            
-            /// <summary>
-            /// Enum Submitted for value: Submitted
-            /// </summary>
-            [EnumMember(Value = "Submitted")]
-            Submitted = 2,
-            
-            /// <summary>
-            /// Enum Verified for value: Verified
-            /// </summary>
-            [EnumMember(Value = "Verified")]
-            Verified = 3
-        }
-
-        /// <summary>
-        /// Application verification status
-        /// </summary>
-        /// <value>Application verification status</value>
-        [DataMember(Name="VerificationStatus", EmitDefaultValue=false)]
-        public VerificationStatusEnum VerificationStatus { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationDetail" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected AppConfigurationDetail() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationDetail" /> class.
-        /// </summary>
-        /// <param name="id">Application Configuration Public Id (required).</param>
-        /// <param name="appId">Whitelabel App Id (required).</param>
-        /// <param name="appStoreAppId">App Store App Id (required).</param>
-        /// <param name="isEnabled">Is Enabled (required).</param>
-        /// <param name="physicalRestaurants">Physical Restaurant Id&#39;s.</param>
-        /// <param name="settings">Settings.</param>
-        /// <param name="configurationType">Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt; (required).</param>
-        /// <param name="storeSelectorType">Store Selector Type (required).</param>
-        /// <param name="fieldGroups">Field Groups.</param>
-        /// <param name="setupInstructions">Setup Instructions.</param>
-        /// <param name="externalSetupLink">External Setup Link.</param>
-        /// <param name="oAuthAppId">OAuth App Id (required).</param>
-        /// <param name="teammateAppAccessLevel">Teammate App Access Level.</param>
-        /// <param name="permissionsType">Permissions Type (required).</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="verificationStatus">Application verification status (required).</param>
-        /// <param name="tags">Tags (required).</param>
-        /// <param name="regions">Regions (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppConfigurationDetail(string id = default(string), string appId = default(string), string appStoreAppId = default(string), bool? isEnabled = default(bool?), List<int?> physicalRestaurants = default(List<int?>), List<Setting> settings = default(List<Setting>), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), string oAuthAppId = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), string name = default(string), string description = default(string), string logo = default(string), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), List<string> tags = default(List<string>), List<string> regions = default(List<string>), string developerName = default(string))
-        {
-            // to ensure "id" is required (not null)
-            if (id == null)
-            {
-                throw new InvalidDataException("id is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.Id = id;
-            }
-            // to ensure "appId" is required (not null)
-            if (appId == null)
-            {
-                throw new InvalidDataException("appId is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.AppId = appId;
-            }
-            // to ensure "appStoreAppId" is required (not null)
-            if (appStoreAppId == null)
-            {
-                throw new InvalidDataException("appStoreAppId is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.AppStoreAppId = appStoreAppId;
-            }
-            // to ensure "isEnabled" is required (not null)
-            if (isEnabled == null)
-            {
-                throw new InvalidDataException("isEnabled is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.IsEnabled = isEnabled;
-            }
-            // to ensure "configurationType" is required (not null)
-            if (configurationType == null)
-            {
-                throw new InvalidDataException("configurationType is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.ConfigurationType = configurationType;
-            }
-            // to ensure "storeSelectorType" is required (not null)
-            if (storeSelectorType == null)
-            {
-                throw new InvalidDataException("storeSelectorType is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.StoreSelectorType = storeSelectorType;
-            }
-            // to ensure "oAuthAppId" is required (not null)
-            if (oAuthAppId == null)
-            {
-                throw new InvalidDataException("oAuthAppId is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.OAuthAppId = oAuthAppId;
-            }
-            // to ensure "permissionsType" is required (not null)
-            if (permissionsType == null)
-            {
-                throw new InvalidDataException("permissionsType is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.PermissionsType = permissionsType;
-            }
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            // to ensure "description" is required (not null)
-            if (description == null)
-            {
-                throw new InvalidDataException("description is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.Description = description;
-            }
-            // to ensure "verificationStatus" is required (not null)
-            if (verificationStatus == null)
-            {
-                throw new InvalidDataException("verificationStatus is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.VerificationStatus = verificationStatus;
-            }
-            // to ensure "tags" is required (not null)
-            if (tags == null)
-            {
-                throw new InvalidDataException("tags is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.Tags = tags;
-            }
-            // to ensure "regions" is required (not null)
-            if (regions == null)
-            {
-                throw new InvalidDataException("regions is a required property for AppConfigurationDetail and cannot be null");
-            }
-            else
-            {
-                this.Regions = regions;
-            }
-            this.PhysicalRestaurants = physicalRestaurants;
-            this.Settings = settings;
-            this.FieldGroups = fieldGroups;
-            this.SetupInstructions = setupInstructions;
-            this.ExternalSetupLink = externalSetupLink;
-            this.TeammateAppAccessLevel = teammateAppAccessLevel;
-            this.Logo = logo;
-            this.DeveloperName = developerName;
-        }
-        
-        /// <summary>
-        /// Application Configuration Public Id
-        /// </summary>
-        /// <value>Application Configuration Public Id</value>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Whitelabel App Id
-        /// </summary>
-        /// <value>Whitelabel App Id</value>
-        [DataMember(Name="AppId", EmitDefaultValue=false)]
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// App Store App Id
-        /// </summary>
-        /// <value>App Store App Id</value>
-        [DataMember(Name="AppStoreAppId", EmitDefaultValue=false)]
-        public string AppStoreAppId { get; set; }
-
-        /// <summary>
-        /// Is Enabled
-        /// </summary>
-        /// <value>Is Enabled</value>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-        /// <summary>
-        /// Physical Restaurant Id&#39;s
-        /// </summary>
-        /// <value>Physical Restaurant Id&#39;s</value>
-        [DataMember(Name="PhysicalRestaurants", EmitDefaultValue=false)]
-        public List<int?> PhysicalRestaurants { get; set; }
-
-        /// <summary>
-        /// Settings
-        /// </summary>
-        /// <value>Settings</value>
-        [DataMember(Name="Settings", EmitDefaultValue=false)]
-        public List<Setting> Settings { get; set; }
-
-
-
-        /// <summary>
-        /// Field Groups
-        /// </summary>
-        /// <value>Field Groups</value>
-        [DataMember(Name="FieldGroups", EmitDefaultValue=false)]
-        public List<FieldGroup> FieldGroups { get; set; }
-
-        /// <summary>
-        /// Setup Instructions
-        /// </summary>
-        /// <value>Setup Instructions</value>
-        [DataMember(Name="SetupInstructions", EmitDefaultValue=false)]
-        public string SetupInstructions { get; set; }
-
-        /// <summary>
-        /// External Setup Link
-        /// </summary>
-        /// <value>External Setup Link</value>
-        [DataMember(Name="ExternalSetupLink", EmitDefaultValue=false)]
-        public string ExternalSetupLink { get; set; }
-
-        /// <summary>
-        /// OAuth App Id
-        /// </summary>
-        /// <value>OAuth App Id</value>
-        [DataMember(Name="OAuthAppId", EmitDefaultValue=false)]
-        public string OAuthAppId { get; set; }
-
-
-
-        /// <summary>
-        /// Name
-        /// </summary>
-        /// <value>Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Logo
-        /// </summary>
-        /// <value>Logo</value>
-        [DataMember(Name="Logo", EmitDefaultValue=false)]
-        public string Logo { get; set; }
-
-
-        /// <summary>
-        /// Tags
-        /// </summary>
-        /// <value>Tags</value>
-        [DataMember(Name="Tags", EmitDefaultValue=false)]
-        public List<string> Tags { get; set; }
-
-        /// <summary>
-        /// Regions
-        /// </summary>
-        /// <value>Regions</value>
-        [DataMember(Name="Regions", EmitDefaultValue=false)]
-        public List<string> Regions { get; set; }
-
-        /// <summary>
-        /// Developer Name
-        /// </summary>
-        /// <value>Developer Name</value>
-        [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
-        public string DeveloperName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppConfigurationDetail {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  AppId: ").Append(AppId).Append("\n");
-            sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  PhysicalRestaurants: ").Append(PhysicalRestaurants).Append("\n");
-            sb.Append("  Settings: ").Append(Settings).Append("\n");
-            sb.Append("  ConfigurationType: ").Append(ConfigurationType).Append("\n");
-            sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
-            sb.Append("  FieldGroups: ").Append(FieldGroups).Append("\n");
-            sb.Append("  SetupInstructions: ").Append(SetupInstructions).Append("\n");
-            sb.Append("  ExternalSetupLink: ").Append(ExternalSetupLink).Append("\n");
-            sb.Append("  OAuthAppId: ").Append(OAuthAppId).Append("\n");
-            sb.Append("  TeammateAppAccessLevel: ").Append(TeammateAppAccessLevel).Append("\n");
-            sb.Append("  PermissionsType: ").Append(PermissionsType).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Logo: ").Append(Logo).Append("\n");
-            sb.Append("  VerificationStatus: ").Append(VerificationStatus).Append("\n");
-            sb.Append("  Tags: ").Append(Tags).Append("\n");
-            sb.Append("  Regions: ").Append(Regions).Append("\n");
-            sb.Append("  DeveloperName: ").Append(DeveloperName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppConfigurationDetail);
-        }
-
-        /// <summary>
-        /// Returns true if AppConfigurationDetail instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppConfigurationDetail to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppConfigurationDetail input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.AppId == input.AppId ||
-                    (this.AppId != null &&
-                    this.AppId.Equals(input.AppId))
-                ) && 
-                (
-                    this.AppStoreAppId == input.AppStoreAppId ||
-                    (this.AppStoreAppId != null &&
-                    this.AppStoreAppId.Equals(input.AppStoreAppId))
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.PhysicalRestaurants == input.PhysicalRestaurants ||
-                    this.PhysicalRestaurants != null &&
-                    this.PhysicalRestaurants.SequenceEqual(input.PhysicalRestaurants)
-                ) && 
-                (
-                    this.Settings == input.Settings ||
-                    this.Settings != null &&
-                    this.Settings.SequenceEqual(input.Settings)
-                ) && 
-                (
-                    this.ConfigurationType == input.ConfigurationType ||
-                    (this.ConfigurationType != null &&
-                    this.ConfigurationType.Equals(input.ConfigurationType))
-                ) && 
-                (
-                    this.StoreSelectorType == input.StoreSelectorType ||
-                    (this.StoreSelectorType != null &&
-                    this.StoreSelectorType.Equals(input.StoreSelectorType))
-                ) && 
-                (
-                    this.FieldGroups == input.FieldGroups ||
-                    this.FieldGroups != null &&
-                    this.FieldGroups.SequenceEqual(input.FieldGroups)
-                ) && 
-                (
-                    this.SetupInstructions == input.SetupInstructions ||
-                    (this.SetupInstructions != null &&
-                    this.SetupInstructions.Equals(input.SetupInstructions))
-                ) && 
-                (
-                    this.ExternalSetupLink == input.ExternalSetupLink ||
-                    (this.ExternalSetupLink != null &&
-                    this.ExternalSetupLink.Equals(input.ExternalSetupLink))
-                ) && 
-                (
-                    this.OAuthAppId == input.OAuthAppId ||
-                    (this.OAuthAppId != null &&
-                    this.OAuthAppId.Equals(input.OAuthAppId))
-                ) && 
-                (
-                    this.TeammateAppAccessLevel == input.TeammateAppAccessLevel ||
-                    (this.TeammateAppAccessLevel != null &&
-                    this.TeammateAppAccessLevel.Equals(input.TeammateAppAccessLevel))
-                ) && 
-                (
-                    this.PermissionsType == input.PermissionsType ||
-                    (this.PermissionsType != null &&
-                    this.PermissionsType.Equals(input.PermissionsType))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Logo == input.Logo ||
-                    (this.Logo != null &&
-                    this.Logo.Equals(input.Logo))
-                ) && 
-                (
-                    this.VerificationStatus == input.VerificationStatus ||
-                    (this.VerificationStatus != null &&
-                    this.VerificationStatus.Equals(input.VerificationStatus))
-                ) && 
-                (
-                    this.Tags == input.Tags ||
-                    this.Tags != null &&
-                    this.Tags.SequenceEqual(input.Tags)
-                ) && 
-                (
-                    this.Regions == input.Regions ||
-                    this.Regions != null &&
-                    this.Regions.SequenceEqual(input.Regions)
-                ) && 
-                (
-                    this.DeveloperName == input.DeveloperName ||
-                    (this.DeveloperName != null &&
-                    this.DeveloperName.Equals(input.DeveloperName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.AppId != null)
-                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
-                if (this.AppStoreAppId != null)
-                    hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.PhysicalRestaurants != null)
-                    hashCode = hashCode * 59 + this.PhysicalRestaurants.GetHashCode();
-                if (this.Settings != null)
-                    hashCode = hashCode * 59 + this.Settings.GetHashCode();
-                if (this.ConfigurationType != null)
-                    hashCode = hashCode * 59 + this.ConfigurationType.GetHashCode();
-                if (this.StoreSelectorType != null)
-                    hashCode = hashCode * 59 + this.StoreSelectorType.GetHashCode();
-                if (this.FieldGroups != null)
-                    hashCode = hashCode * 59 + this.FieldGroups.GetHashCode();
-                if (this.SetupInstructions != null)
-                    hashCode = hashCode * 59 + this.SetupInstructions.GetHashCode();
-                if (this.ExternalSetupLink != null)
-                    hashCode = hashCode * 59 + this.ExternalSetupLink.GetHashCode();
-                if (this.OAuthAppId != null)
-                    hashCode = hashCode * 59 + this.OAuthAppId.GetHashCode();
-                if (this.TeammateAppAccessLevel != null)
-                    hashCode = hashCode * 59 + this.TeammateAppAccessLevel.GetHashCode();
-                if (this.PermissionsType != null)
-                    hashCode = hashCode * 59 + this.PermissionsType.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Logo != null)
-                    hashCode = hashCode * 59 + this.Logo.GetHashCode();
-                if (this.VerificationStatus != null)
-                    hashCode = hashCode * 59 + this.VerificationStatus.GetHashCode();
-                if (this.Tags != null)
-                    hashCode = hashCode * 59 + this.Tags.GetHashCode();
-                if (this.Regions != null)
-                    hashCode = hashCode * 59 + this.Regions.GetHashCode();
-                if (this.DeveloperName != null)
-                    hashCode = hashCode * 59 + this.DeveloperName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppConfigurationHeader.cs b/src/Flipdish/Model/AppConfigurationHeader.cs
deleted file mode 100644
index 96862c5b..00000000
--- a/src/Flipdish/Model/AppConfigurationHeader.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Configured app item for list
-    /// </summary>
-    [DataContract]
-    public partial class AppConfigurationHeader :  IEquatable<AppConfigurationHeader>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationHeader" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected AppConfigurationHeader() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationHeader" /> class.
-        /// </summary>
-        /// <param name="appStoreAppId">AppStore App Id (required).</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppConfigurationHeader(string appStoreAppId = default(string), string name = default(string), string description = default(string), string logo = default(string), string developerName = default(string))
-        {
-            // to ensure "appStoreAppId" is required (not null)
-            if (appStoreAppId == null)
-            {
-                throw new InvalidDataException("appStoreAppId is a required property for AppConfigurationHeader and cannot be null");
-            }
-            else
-            {
-                this.AppStoreAppId = appStoreAppId;
-            }
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for AppConfigurationHeader and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            // to ensure "description" is required (not null)
-            if (description == null)
-            {
-                throw new InvalidDataException("description is a required property for AppConfigurationHeader and cannot be null");
-            }
-            else
-            {
-                this.Description = description;
-            }
-            this.Logo = logo;
-            this.DeveloperName = developerName;
-        }
-        
-        /// <summary>
-        /// AppStore App Id
-        /// </summary>
-        /// <value>AppStore App Id</value>
-        [DataMember(Name="AppStoreAppId", EmitDefaultValue=false)]
-        public string AppStoreAppId { get; set; }
-
-        /// <summary>
-        /// Name
-        /// </summary>
-        /// <value>Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Logo
-        /// </summary>
-        /// <value>Logo</value>
-        [DataMember(Name="Logo", EmitDefaultValue=false)]
-        public string Logo { get; set; }
-
-        /// <summary>
-        /// Developer Name
-        /// </summary>
-        /// <value>Developer Name</value>
-        [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
-        public string DeveloperName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppConfigurationHeader {\n");
-            sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Logo: ").Append(Logo).Append("\n");
-            sb.Append("  DeveloperName: ").Append(DeveloperName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppConfigurationHeader);
-        }
-
-        /// <summary>
-        /// Returns true if AppConfigurationHeader instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppConfigurationHeader to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppConfigurationHeader input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.AppStoreAppId == input.AppStoreAppId ||
-                    (this.AppStoreAppId != null &&
-                    this.AppStoreAppId.Equals(input.AppStoreAppId))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Logo == input.Logo ||
-                    (this.Logo != null &&
-                    this.Logo.Equals(input.Logo))
-                ) && 
-                (
-                    this.DeveloperName == input.DeveloperName ||
-                    (this.DeveloperName != null &&
-                    this.DeveloperName.Equals(input.DeveloperName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.AppStoreAppId != null)
-                    hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Logo != null)
-                    hashCode = hashCode * 59 + this.Logo.GetHashCode();
-                if (this.DeveloperName != null)
-                    hashCode = hashCode * 59 + this.DeveloperName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppConfigurationSetting.cs b/src/Flipdish/Model/AppConfigurationSetting.cs
deleted file mode 100644
index 6b0a4225..00000000
--- a/src/Flipdish/Model/AppConfigurationSetting.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// AppConfigurationSetting
-    /// </summary>
-    [DataContract]
-    public partial class AppConfigurationSetting :  IEquatable<AppConfigurationSetting>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationSetting" /> class.
-        /// </summary>
-        /// <param name="key">key.</param>
-        /// <param name="value">value.</param>
-        public AppConfigurationSetting(string key = default(string), string value = default(string))
-        {
-            this.Key = key;
-            this.Value = value;
-        }
-        
-        /// <summary>
-        /// Gets or Sets Key
-        /// </summary>
-        [DataMember(Name="Key", EmitDefaultValue=false)]
-        public string Key { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Value
-        /// </summary>
-        [DataMember(Name="Value", EmitDefaultValue=false)]
-        public string Value { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppConfigurationSetting {\n");
-            sb.Append("  Key: ").Append(Key).Append("\n");
-            sb.Append("  Value: ").Append(Value).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppConfigurationSetting);
-        }
-
-        /// <summary>
-        /// Returns true if AppConfigurationSetting instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppConfigurationSetting to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppConfigurationSetting input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Key == input.Key ||
-                    (this.Key != null &&
-                    this.Key.Equals(input.Key))
-                ) && 
-                (
-                    this.Value == input.Value ||
-                    (this.Value != null &&
-                    this.Value.Equals(input.Value))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Key != null)
-                    hashCode = hashCode * 59 + this.Key.GetHashCode();
-                if (this.Value != null)
-                    hashCode = hashCode * 59 + this.Value.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppConfigurationSummary.cs b/src/Flipdish/Model/AppConfigurationSummary.cs
deleted file mode 100644
index 8f2334b0..00000000
--- a/src/Flipdish/Model/AppConfigurationSummary.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Application Configuration Summary  &lt;remarks&gt;Header information for display in lists, like list of apps&lt;/remarks&gt;
-    /// </summary>
-    [DataContract]
-    public partial class AppConfigurationSummary :  IEquatable<AppConfigurationSummary>, IValidatableObject
-    {
-        /// <summary>
-        /// Configuration Type
-        /// </summary>
-        /// <value>Configuration Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ConfigurationTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum ExternalLink for value: ExternalLink
-            /// </summary>
-            [EnumMember(Value = "ExternalLink")]
-            ExternalLink = 1,
-            
-            /// <summary>
-            /// Enum FlipdishHosted for value: FlipdishHosted
-            /// </summary>
-            [EnumMember(Value = "FlipdishHosted")]
-            FlipdishHosted = 2
-        }
-
-        /// <summary>
-        /// Configuration Type
-        /// </summary>
-        /// <value>Configuration Type</value>
-        [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
-        public ConfigurationTypeEnum? ConfigurationType { get; set; }
-        /// <summary>
-        /// Store Selector Type
-        /// </summary>
-        /// <value>Store Selector Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum StoreSelectorTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum None for value: None
-            /// </summary>
-            [EnumMember(Value = "None")]
-            None = 1,
-            
-            /// <summary>
-            /// Enum Single for value: Single
-            /// </summary>
-            [EnumMember(Value = "Single")]
-            Single = 2,
-            
-            /// <summary>
-            /// Enum Multiple for value: Multiple
-            /// </summary>
-            [EnumMember(Value = "Multiple")]
-            Multiple = 3
-        }
-
-        /// <summary>
-        /// Store Selector Type
-        /// </summary>
-        /// <value>Store Selector Type</value>
-        [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
-        public StoreSelectorTypeEnum? StoreSelectorType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationSummary" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected AppConfigurationSummary() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppConfigurationSummary" /> class.
-        /// </summary>
-        /// <param name="id">Application Configuration Public Id (required).</param>
-        /// <param name="appId">Whitelabel App Id (required).</param>
-        /// <param name="isEnabled">Is Enabled (required).</param>
-        /// <param name="physicalRestaurants">List of restaurants (required).</param>
-        /// <param name="configurationType">Configuration Type.</param>
-        /// <param name="storeSelectorType">Store Selector Type.</param>
-        /// <param name="appStoreAppId">AppStore App Id (required).</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppConfigurationSummary(string id = default(string), string appId = default(string), bool? isEnabled = default(bool?), List<ConfiguredPhysicalRestaurant> physicalRestaurants = default(List<ConfiguredPhysicalRestaurant>), ConfigurationTypeEnum? configurationType = default(ConfigurationTypeEnum?), StoreSelectorTypeEnum? storeSelectorType = default(StoreSelectorTypeEnum?), string appStoreAppId = default(string), string name = default(string), string description = default(string), string logo = default(string), string developerName = default(string))
-        {
-            // to ensure "id" is required (not null)
-            if (id == null)
-            {
-                throw new InvalidDataException("id is a required property for AppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.Id = id;
-            }
-            // to ensure "appId" is required (not null)
-            if (appId == null)
-            {
-                throw new InvalidDataException("appId is a required property for AppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.AppId = appId;
-            }
-            // to ensure "isEnabled" is required (not null)
-            if (isEnabled == null)
-            {
-                throw new InvalidDataException("isEnabled is a required property for AppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.IsEnabled = isEnabled;
-            }
-            // to ensure "physicalRestaurants" is required (not null)
-            if (physicalRestaurants == null)
-            {
-                throw new InvalidDataException("physicalRestaurants is a required property for AppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.PhysicalRestaurants = physicalRestaurants;
-            }
-            // to ensure "appStoreAppId" is required (not null)
-            if (appStoreAppId == null)
-            {
-                throw new InvalidDataException("appStoreAppId is a required property for AppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.AppStoreAppId = appStoreAppId;
-            }
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for AppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            // to ensure "description" is required (not null)
-            if (description == null)
-            {
-                throw new InvalidDataException("description is a required property for AppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.Description = description;
-            }
-            this.ConfigurationType = configurationType;
-            this.StoreSelectorType = storeSelectorType;
-            this.Logo = logo;
-            this.DeveloperName = developerName;
-        }
-        
-        /// <summary>
-        /// Application Configuration Public Id
-        /// </summary>
-        /// <value>Application Configuration Public Id</value>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Whitelabel App Id
-        /// </summary>
-        /// <value>Whitelabel App Id</value>
-        [DataMember(Name="AppId", EmitDefaultValue=false)]
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// Is Enabled
-        /// </summary>
-        /// <value>Is Enabled</value>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-        /// <summary>
-        /// List of restaurants
-        /// </summary>
-        /// <value>List of restaurants</value>
-        [DataMember(Name="PhysicalRestaurants", EmitDefaultValue=false)]
-        public List<ConfiguredPhysicalRestaurant> PhysicalRestaurants { get; set; }
-
-
-
-        /// <summary>
-        /// AppStore App Id
-        /// </summary>
-        /// <value>AppStore App Id</value>
-        [DataMember(Name="AppStoreAppId", EmitDefaultValue=false)]
-        public string AppStoreAppId { get; set; }
-
-        /// <summary>
-        /// Name
-        /// </summary>
-        /// <value>Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Logo
-        /// </summary>
-        /// <value>Logo</value>
-        [DataMember(Name="Logo", EmitDefaultValue=false)]
-        public string Logo { get; set; }
-
-        /// <summary>
-        /// Developer Name
-        /// </summary>
-        /// <value>Developer Name</value>
-        [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
-        public string DeveloperName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppConfigurationSummary {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  AppId: ").Append(AppId).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  PhysicalRestaurants: ").Append(PhysicalRestaurants).Append("\n");
-            sb.Append("  ConfigurationType: ").Append(ConfigurationType).Append("\n");
-            sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
-            sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Logo: ").Append(Logo).Append("\n");
-            sb.Append("  DeveloperName: ").Append(DeveloperName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppConfigurationSummary);
-        }
-
-        /// <summary>
-        /// Returns true if AppConfigurationSummary instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppConfigurationSummary to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppConfigurationSummary input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.AppId == input.AppId ||
-                    (this.AppId != null &&
-                    this.AppId.Equals(input.AppId))
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.PhysicalRestaurants == input.PhysicalRestaurants ||
-                    this.PhysicalRestaurants != null &&
-                    this.PhysicalRestaurants.SequenceEqual(input.PhysicalRestaurants)
-                ) && 
-                (
-                    this.ConfigurationType == input.ConfigurationType ||
-                    (this.ConfigurationType != null &&
-                    this.ConfigurationType.Equals(input.ConfigurationType))
-                ) && 
-                (
-                    this.StoreSelectorType == input.StoreSelectorType ||
-                    (this.StoreSelectorType != null &&
-                    this.StoreSelectorType.Equals(input.StoreSelectorType))
-                ) && 
-                (
-                    this.AppStoreAppId == input.AppStoreAppId ||
-                    (this.AppStoreAppId != null &&
-                    this.AppStoreAppId.Equals(input.AppStoreAppId))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Logo == input.Logo ||
-                    (this.Logo != null &&
-                    this.Logo.Equals(input.Logo))
-                ) && 
-                (
-                    this.DeveloperName == input.DeveloperName ||
-                    (this.DeveloperName != null &&
-                    this.DeveloperName.Equals(input.DeveloperName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.AppId != null)
-                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.PhysicalRestaurants != null)
-                    hashCode = hashCode * 59 + this.PhysicalRestaurants.GetHashCode();
-                if (this.ConfigurationType != null)
-                    hashCode = hashCode * 59 + this.ConfigurationType.GetHashCode();
-                if (this.StoreSelectorType != null)
-                    hashCode = hashCode * 59 + this.StoreSelectorType.GetHashCode();
-                if (this.AppStoreAppId != null)
-                    hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Logo != null)
-                    hashCode = hashCode * 59 + this.Logo.GetHashCode();
-                if (this.DeveloperName != null)
-                    hashCode = hashCode * 59 + this.DeveloperName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppCreatedEvent.cs b/src/Flipdish/Model/AppCreatedEvent.cs
index fa4a86c8..348eb905 100644
--- a/src/Flipdish/Model/AppCreatedEvent.cs
+++ b/src/Flipdish/Model/AppCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Application created event
     /// </summary>
     [DataContract]
-    public partial class AppCreatedEvent :  IEquatable<AppCreatedEvent>, IValidatableObject
+    public partial class AppCreatedEvent :  IEquatable<AppCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AppCreatedEvent" /> class.
@@ -38,23 +36,31 @@ public partial class AppCreatedEvent :  IEquatable<AppCreatedEvent>, IValidatabl
         /// <param name="appName">App Name.</param>
         /// <param name="countryId">Country Id.</param>
         /// <param name="user">User information.</param>
+        /// <param name="accountId">Salesforce Account Id.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public AppCreatedEvent(string eventName = default(string), string description = default(string), string appName = default(string), string countryId = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public AppCreatedEvent(string eventName = default(string), string description = default(string), string appName = default(string), string countryId = default(string), UserEventInfo user = default(UserEventInfo), string accountId = default(string), string orgId = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
             this.AppName = appName;
             this.CountryId = countryId;
             this.User = user;
+            this.AccountId = accountId;
+            this.OrgId = orgId;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -92,6 +98,20 @@ public partial class AppCreatedEvent :  IEquatable<AppCreatedEvent>, IValidatabl
         [DataMember(Name="User", EmitDefaultValue=false)]
         public UserEventInfo User { get; set; }
 
+        /// <summary>
+        /// Salesforce Account Id
+        /// </summary>
+        /// <value>Salesforce Account Id</value>
+        [DataMember(Name="AccountId", EmitDefaultValue=false)]
+        public string AccountId { get; set; }
+
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// The identitfier of the event
         /// </summary>
@@ -127,6 +147,20 @@ public partial class AppCreatedEvent :  IEquatable<AppCreatedEvent>, IValidatabl
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -140,11 +174,15 @@ public override string ToString()
             sb.Append("  AppName: ").Append(AppName).Append("\n");
             sb.Append("  CountryId: ").Append(CountryId).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  AccountId: ").Append(AccountId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -204,6 +242,16 @@ public bool Equals(AppCreatedEvent input)
                     (this.User != null &&
                     this.User.Equals(input.User))
                 ) && 
+                (
+                    this.AccountId == input.AccountId ||
+                    (this.AccountId != null &&
+                    this.AccountId.Equals(input.AccountId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.FlipdishEventId == input.FlipdishEventId ||
                     (this.FlipdishEventId != null &&
@@ -228,6 +276,16 @@ public bool Equals(AppCreatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -250,6 +308,10 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.CountryId.GetHashCode();
                 if (this.User != null)
                     hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.AccountId != null)
+                    hashCode = hashCode * 59 + this.AccountId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.FlipdishEventId != null)
                     hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
                 if (this.CreateTime != null)
@@ -260,19 +322,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppDetail.cs b/src/Flipdish/Model/AppDetail.cs
deleted file mode 100644
index 55dc4f0f..00000000
--- a/src/Flipdish/Model/AppDetail.cs
+++ /dev/null
@@ -1,629 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Application
-    /// </summary>
-    [DataContract]
-    public partial class AppDetail :  IEquatable<AppDetail>, IValidatableObject
-    {
-        /// <summary>
-        /// Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;
-        /// </summary>
-        /// <value>Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ConfigurationTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum ExternalLink for value: ExternalLink
-            /// </summary>
-            [EnumMember(Value = "ExternalLink")]
-            ExternalLink = 1,
-            
-            /// <summary>
-            /// Enum FlipdishHosted for value: FlipdishHosted
-            /// </summary>
-            [EnumMember(Value = "FlipdishHosted")]
-            FlipdishHosted = 2
-        }
-
-        /// <summary>
-        /// Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;
-        /// </summary>
-        /// <value>Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;</value>
-        [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
-        public ConfigurationTypeEnum ConfigurationType { get; set; }
-        /// <summary>
-        /// Store Selector Type
-        /// </summary>
-        /// <value>Store Selector Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum StoreSelectorTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum None for value: None
-            /// </summary>
-            [EnumMember(Value = "None")]
-            None = 1,
-            
-            /// <summary>
-            /// Enum Single for value: Single
-            /// </summary>
-            [EnumMember(Value = "Single")]
-            Single = 2,
-            
-            /// <summary>
-            /// Enum Multiple for value: Multiple
-            /// </summary>
-            [EnumMember(Value = "Multiple")]
-            Multiple = 3
-        }
-
-        /// <summary>
-        /// Store Selector Type
-        /// </summary>
-        /// <value>Store Selector Type</value>
-        [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
-        public StoreSelectorTypeEnum StoreSelectorType { get; set; }
-        /// <summary>
-        /// Teammate App Access Level
-        /// </summary>
-        /// <value>Teammate App Access Level</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum TeammateAppAccessLevelEnum
-        {
-            
-            /// <summary>
-            /// Enum Owner for value: Owner
-            /// </summary>
-            [EnumMember(Value = "Owner")]
-            Owner = 1,
-            
-            /// <summary>
-            /// Enum StoreOwner for value: StoreOwner
-            /// </summary>
-            [EnumMember(Value = "StoreOwner")]
-            StoreOwner = 2,
-            
-            /// <summary>
-            /// Enum ManagedOwner for value: ManagedOwner
-            /// </summary>
-            [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 3,
-            
-            /// <summary>
-            /// Enum Integrator for value: Integrator
-            /// </summary>
-            [EnumMember(Value = "Integrator")]
-            Integrator = 4,
-            
-            /// <summary>
-            /// Enum StoreManager for value: StoreManager
-            /// </summary>
-            [EnumMember(Value = "StoreManager")]
-            StoreManager = 5,
-            
-            /// <summary>
-            /// Enum StoreStaff for value: StoreStaff
-            /// </summary>
-            [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 6,
-            
-            /// <summary>
-            /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
-            /// </summary>
-            [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 7,
-            
-            /// <summary>
-            /// Enum FinanceManger for value: FinanceManger
-            /// </summary>
-            [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 8
-        }
-
-        /// <summary>
-        /// Teammate App Access Level
-        /// </summary>
-        /// <value>Teammate App Access Level</value>
-        [DataMember(Name="TeammateAppAccessLevel", EmitDefaultValue=false)]
-        public TeammateAppAccessLevelEnum? TeammateAppAccessLevel { get; set; }
-        /// <summary>
-        /// Permissions Type
-        /// </summary>
-        /// <value>Permissions Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum PermissionsTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Teammate for value: Teammate
-            /// </summary>
-            [EnumMember(Value = "Teammate")]
-            Teammate = 1
-        }
-
-        /// <summary>
-        /// Permissions Type
-        /// </summary>
-        /// <value>Permissions Type</value>
-        [DataMember(Name="PermissionsType", EmitDefaultValue=false)]
-        public PermissionsTypeEnum PermissionsType { get; set; }
-        /// <summary>
-        /// Application verification status
-        /// </summary>
-        /// <value>Application verification status</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum VerificationStatusEnum
-        {
-            
-            /// <summary>
-            /// Enum Draft for value: Draft
-            /// </summary>
-            [EnumMember(Value = "Draft")]
-            Draft = 1,
-            
-            /// <summary>
-            /// Enum Submitted for value: Submitted
-            /// </summary>
-            [EnumMember(Value = "Submitted")]
-            Submitted = 2,
-            
-            /// <summary>
-            /// Enum Verified for value: Verified
-            /// </summary>
-            [EnumMember(Value = "Verified")]
-            Verified = 3
-        }
-
-        /// <summary>
-        /// Application verification status
-        /// </summary>
-        /// <value>Application verification status</value>
-        [DataMember(Name="VerificationStatus", EmitDefaultValue=false)]
-        public VerificationStatusEnum VerificationStatus { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppDetail" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected AppDetail() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppDetail" /> class.
-        /// </summary>
-        /// <param name="id">Integration Public Id (required).</param>
-        /// <param name="configurationType">Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt; (required).</param>
-        /// <param name="storeSelectorType">Store Selector Type (required).</param>
-        /// <param name="fieldGroups">Field Groups.</param>
-        /// <param name="setupInstructions">Setup Instructions.</param>
-        /// <param name="externalSetupLink">External Setup Link.</param>
-        /// <param name="oAuthAppId">OAuth App Id (required).</param>
-        /// <param name="teammateAppAccessLevel">Teammate App Access Level.</param>
-        /// <param name="permissionsType">Permissions Type (required).</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="isEnabled">Is application enabled.</param>
-        /// <param name="verificationStatus">Application verification status (required).</param>
-        /// <param name="tags">Tags (required).</param>
-        /// <param name="regions">Regions (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppDetail(string id = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), string oAuthAppId = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), string name = default(string), string description = default(string), string logo = default(string), bool? isEnabled = default(bool?), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), List<string> tags = default(List<string>), List<string> regions = default(List<string>), string developerName = default(string))
-        {
-            // to ensure "id" is required (not null)
-            if (id == null)
-            {
-                throw new InvalidDataException("id is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.Id = id;
-            }
-            // to ensure "configurationType" is required (not null)
-            if (configurationType == null)
-            {
-                throw new InvalidDataException("configurationType is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.ConfigurationType = configurationType;
-            }
-            // to ensure "storeSelectorType" is required (not null)
-            if (storeSelectorType == null)
-            {
-                throw new InvalidDataException("storeSelectorType is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.StoreSelectorType = storeSelectorType;
-            }
-            // to ensure "oAuthAppId" is required (not null)
-            if (oAuthAppId == null)
-            {
-                throw new InvalidDataException("oAuthAppId is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.OAuthAppId = oAuthAppId;
-            }
-            // to ensure "permissionsType" is required (not null)
-            if (permissionsType == null)
-            {
-                throw new InvalidDataException("permissionsType is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.PermissionsType = permissionsType;
-            }
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            // to ensure "description" is required (not null)
-            if (description == null)
-            {
-                throw new InvalidDataException("description is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.Description = description;
-            }
-            // to ensure "verificationStatus" is required (not null)
-            if (verificationStatus == null)
-            {
-                throw new InvalidDataException("verificationStatus is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.VerificationStatus = verificationStatus;
-            }
-            // to ensure "tags" is required (not null)
-            if (tags == null)
-            {
-                throw new InvalidDataException("tags is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.Tags = tags;
-            }
-            // to ensure "regions" is required (not null)
-            if (regions == null)
-            {
-                throw new InvalidDataException("regions is a required property for AppDetail and cannot be null");
-            }
-            else
-            {
-                this.Regions = regions;
-            }
-            this.FieldGroups = fieldGroups;
-            this.SetupInstructions = setupInstructions;
-            this.ExternalSetupLink = externalSetupLink;
-            this.TeammateAppAccessLevel = teammateAppAccessLevel;
-            this.Logo = logo;
-            this.IsEnabled = isEnabled;
-            this.DeveloperName = developerName;
-        }
-        
-        /// <summary>
-        /// Integration Public Id
-        /// </summary>
-        /// <value>Integration Public Id</value>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public string Id { get; set; }
-
-
-
-        /// <summary>
-        /// Field Groups
-        /// </summary>
-        /// <value>Field Groups</value>
-        [DataMember(Name="FieldGroups", EmitDefaultValue=false)]
-        public List<FieldGroup> FieldGroups { get; set; }
-
-        /// <summary>
-        /// Setup Instructions
-        /// </summary>
-        /// <value>Setup Instructions</value>
-        [DataMember(Name="SetupInstructions", EmitDefaultValue=false)]
-        public string SetupInstructions { get; set; }
-
-        /// <summary>
-        /// External Setup Link
-        /// </summary>
-        /// <value>External Setup Link</value>
-        [DataMember(Name="ExternalSetupLink", EmitDefaultValue=false)]
-        public string ExternalSetupLink { get; set; }
-
-        /// <summary>
-        /// OAuth App Id
-        /// </summary>
-        /// <value>OAuth App Id</value>
-        [DataMember(Name="OAuthAppId", EmitDefaultValue=false)]
-        public string OAuthAppId { get; set; }
-
-
-
-        /// <summary>
-        /// Name
-        /// </summary>
-        /// <value>Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Logo
-        /// </summary>
-        /// <value>Logo</value>
-        [DataMember(Name="Logo", EmitDefaultValue=false)]
-        public string Logo { get; set; }
-
-        /// <summary>
-        /// Is application enabled
-        /// </summary>
-        /// <value>Is application enabled</value>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-
-        /// <summary>
-        /// Tags
-        /// </summary>
-        /// <value>Tags</value>
-        [DataMember(Name="Tags", EmitDefaultValue=false)]
-        public List<string> Tags { get; set; }
-
-        /// <summary>
-        /// Regions
-        /// </summary>
-        /// <value>Regions</value>
-        [DataMember(Name="Regions", EmitDefaultValue=false)]
-        public List<string> Regions { get; set; }
-
-        /// <summary>
-        /// Developer Name
-        /// </summary>
-        /// <value>Developer Name</value>
-        [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
-        public string DeveloperName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppDetail {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  ConfigurationType: ").Append(ConfigurationType).Append("\n");
-            sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
-            sb.Append("  FieldGroups: ").Append(FieldGroups).Append("\n");
-            sb.Append("  SetupInstructions: ").Append(SetupInstructions).Append("\n");
-            sb.Append("  ExternalSetupLink: ").Append(ExternalSetupLink).Append("\n");
-            sb.Append("  OAuthAppId: ").Append(OAuthAppId).Append("\n");
-            sb.Append("  TeammateAppAccessLevel: ").Append(TeammateAppAccessLevel).Append("\n");
-            sb.Append("  PermissionsType: ").Append(PermissionsType).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Logo: ").Append(Logo).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  VerificationStatus: ").Append(VerificationStatus).Append("\n");
-            sb.Append("  Tags: ").Append(Tags).Append("\n");
-            sb.Append("  Regions: ").Append(Regions).Append("\n");
-            sb.Append("  DeveloperName: ").Append(DeveloperName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppDetail);
-        }
-
-        /// <summary>
-        /// Returns true if AppDetail instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppDetail to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppDetail input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.ConfigurationType == input.ConfigurationType ||
-                    (this.ConfigurationType != null &&
-                    this.ConfigurationType.Equals(input.ConfigurationType))
-                ) && 
-                (
-                    this.StoreSelectorType == input.StoreSelectorType ||
-                    (this.StoreSelectorType != null &&
-                    this.StoreSelectorType.Equals(input.StoreSelectorType))
-                ) && 
-                (
-                    this.FieldGroups == input.FieldGroups ||
-                    this.FieldGroups != null &&
-                    this.FieldGroups.SequenceEqual(input.FieldGroups)
-                ) && 
-                (
-                    this.SetupInstructions == input.SetupInstructions ||
-                    (this.SetupInstructions != null &&
-                    this.SetupInstructions.Equals(input.SetupInstructions))
-                ) && 
-                (
-                    this.ExternalSetupLink == input.ExternalSetupLink ||
-                    (this.ExternalSetupLink != null &&
-                    this.ExternalSetupLink.Equals(input.ExternalSetupLink))
-                ) && 
-                (
-                    this.OAuthAppId == input.OAuthAppId ||
-                    (this.OAuthAppId != null &&
-                    this.OAuthAppId.Equals(input.OAuthAppId))
-                ) && 
-                (
-                    this.TeammateAppAccessLevel == input.TeammateAppAccessLevel ||
-                    (this.TeammateAppAccessLevel != null &&
-                    this.TeammateAppAccessLevel.Equals(input.TeammateAppAccessLevel))
-                ) && 
-                (
-                    this.PermissionsType == input.PermissionsType ||
-                    (this.PermissionsType != null &&
-                    this.PermissionsType.Equals(input.PermissionsType))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Logo == input.Logo ||
-                    (this.Logo != null &&
-                    this.Logo.Equals(input.Logo))
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.VerificationStatus == input.VerificationStatus ||
-                    (this.VerificationStatus != null &&
-                    this.VerificationStatus.Equals(input.VerificationStatus))
-                ) && 
-                (
-                    this.Tags == input.Tags ||
-                    this.Tags != null &&
-                    this.Tags.SequenceEqual(input.Tags)
-                ) && 
-                (
-                    this.Regions == input.Regions ||
-                    this.Regions != null &&
-                    this.Regions.SequenceEqual(input.Regions)
-                ) && 
-                (
-                    this.DeveloperName == input.DeveloperName ||
-                    (this.DeveloperName != null &&
-                    this.DeveloperName.Equals(input.DeveloperName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.ConfigurationType != null)
-                    hashCode = hashCode * 59 + this.ConfigurationType.GetHashCode();
-                if (this.StoreSelectorType != null)
-                    hashCode = hashCode * 59 + this.StoreSelectorType.GetHashCode();
-                if (this.FieldGroups != null)
-                    hashCode = hashCode * 59 + this.FieldGroups.GetHashCode();
-                if (this.SetupInstructions != null)
-                    hashCode = hashCode * 59 + this.SetupInstructions.GetHashCode();
-                if (this.ExternalSetupLink != null)
-                    hashCode = hashCode * 59 + this.ExternalSetupLink.GetHashCode();
-                if (this.OAuthAppId != null)
-                    hashCode = hashCode * 59 + this.OAuthAppId.GetHashCode();
-                if (this.TeammateAppAccessLevel != null)
-                    hashCode = hashCode * 59 + this.TeammateAppAccessLevel.GetHashCode();
-                if (this.PermissionsType != null)
-                    hashCode = hashCode * 59 + this.PermissionsType.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Logo != null)
-                    hashCode = hashCode * 59 + this.Logo.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.VerificationStatus != null)
-                    hashCode = hashCode * 59 + this.VerificationStatus.GetHashCode();
-                if (this.Tags != null)
-                    hashCode = hashCode * 59 + this.Tags.GetHashCode();
-                if (this.Regions != null)
-                    hashCode = hashCode * 59 + this.Regions.GetHashCode();
-                if (this.DeveloperName != null)
-                    hashCode = hashCode * 59 + this.DeveloperName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppDetailBase.cs b/src/Flipdish/Model/AppDetailBase.cs
deleted file mode 100644
index 7745c7c1..00000000
--- a/src/Flipdish/Model/AppDetailBase.cs
+++ /dev/null
@@ -1,604 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Application Detail Base  &lt;remarks&gt;Used for creating new apps&lt;/remarks&gt;
-    /// </summary>
-    [DataContract]
-    public partial class AppDetailBase :  IEquatable<AppDetailBase>, IValidatableObject
-    {
-        /// <summary>
-        /// Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;
-        /// </summary>
-        /// <value>Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ConfigurationTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum ExternalLink for value: ExternalLink
-            /// </summary>
-            [EnumMember(Value = "ExternalLink")]
-            ExternalLink = 1,
-            
-            /// <summary>
-            /// Enum FlipdishHosted for value: FlipdishHosted
-            /// </summary>
-            [EnumMember(Value = "FlipdishHosted")]
-            FlipdishHosted = 2
-        }
-
-        /// <summary>
-        /// Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;
-        /// </summary>
-        /// <value>Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt;</value>
-        [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
-        public ConfigurationTypeEnum ConfigurationType { get; set; }
-        /// <summary>
-        /// Store Selector Type
-        /// </summary>
-        /// <value>Store Selector Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum StoreSelectorTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum None for value: None
-            /// </summary>
-            [EnumMember(Value = "None")]
-            None = 1,
-            
-            /// <summary>
-            /// Enum Single for value: Single
-            /// </summary>
-            [EnumMember(Value = "Single")]
-            Single = 2,
-            
-            /// <summary>
-            /// Enum Multiple for value: Multiple
-            /// </summary>
-            [EnumMember(Value = "Multiple")]
-            Multiple = 3
-        }
-
-        /// <summary>
-        /// Store Selector Type
-        /// </summary>
-        /// <value>Store Selector Type</value>
-        [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
-        public StoreSelectorTypeEnum StoreSelectorType { get; set; }
-        /// <summary>
-        /// Teammate App Access Level
-        /// </summary>
-        /// <value>Teammate App Access Level</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum TeammateAppAccessLevelEnum
-        {
-            
-            /// <summary>
-            /// Enum Owner for value: Owner
-            /// </summary>
-            [EnumMember(Value = "Owner")]
-            Owner = 1,
-            
-            /// <summary>
-            /// Enum StoreOwner for value: StoreOwner
-            /// </summary>
-            [EnumMember(Value = "StoreOwner")]
-            StoreOwner = 2,
-            
-            /// <summary>
-            /// Enum ManagedOwner for value: ManagedOwner
-            /// </summary>
-            [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 3,
-            
-            /// <summary>
-            /// Enum Integrator for value: Integrator
-            /// </summary>
-            [EnumMember(Value = "Integrator")]
-            Integrator = 4,
-            
-            /// <summary>
-            /// Enum StoreManager for value: StoreManager
-            /// </summary>
-            [EnumMember(Value = "StoreManager")]
-            StoreManager = 5,
-            
-            /// <summary>
-            /// Enum StoreStaff for value: StoreStaff
-            /// </summary>
-            [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 6,
-            
-            /// <summary>
-            /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
-            /// </summary>
-            [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 7,
-            
-            /// <summary>
-            /// Enum FinanceManger for value: FinanceManger
-            /// </summary>
-            [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 8
-        }
-
-        /// <summary>
-        /// Teammate App Access Level
-        /// </summary>
-        /// <value>Teammate App Access Level</value>
-        [DataMember(Name="TeammateAppAccessLevel", EmitDefaultValue=false)]
-        public TeammateAppAccessLevelEnum? TeammateAppAccessLevel { get; set; }
-        /// <summary>
-        /// Permissions Type
-        /// </summary>
-        /// <value>Permissions Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum PermissionsTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Teammate for value: Teammate
-            /// </summary>
-            [EnumMember(Value = "Teammate")]
-            Teammate = 1
-        }
-
-        /// <summary>
-        /// Permissions Type
-        /// </summary>
-        /// <value>Permissions Type</value>
-        [DataMember(Name="PermissionsType", EmitDefaultValue=false)]
-        public PermissionsTypeEnum PermissionsType { get; set; }
-        /// <summary>
-        /// Application verification status
-        /// </summary>
-        /// <value>Application verification status</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum VerificationStatusEnum
-        {
-            
-            /// <summary>
-            /// Enum Draft for value: Draft
-            /// </summary>
-            [EnumMember(Value = "Draft")]
-            Draft = 1,
-            
-            /// <summary>
-            /// Enum Submitted for value: Submitted
-            /// </summary>
-            [EnumMember(Value = "Submitted")]
-            Submitted = 2,
-            
-            /// <summary>
-            /// Enum Verified for value: Verified
-            /// </summary>
-            [EnumMember(Value = "Verified")]
-            Verified = 3
-        }
-
-        /// <summary>
-        /// Application verification status
-        /// </summary>
-        /// <value>Application verification status</value>
-        [DataMember(Name="VerificationStatus", EmitDefaultValue=false)]
-        public VerificationStatusEnum VerificationStatus { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppDetailBase" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected AppDetailBase() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppDetailBase" /> class.
-        /// </summary>
-        /// <param name="configurationType">Configuration Type  &lt;example&gt;ExternalLink&lt;/example&gt;&lt;example&gt;FlipdishHosted&lt;/example&gt; (required).</param>
-        /// <param name="storeSelectorType">Store Selector Type (required).</param>
-        /// <param name="fieldGroups">Field Groups.</param>
-        /// <param name="setupInstructions">Setup Instructions.</param>
-        /// <param name="externalSetupLink">External Setup Link.</param>
-        /// <param name="oAuthAppId">OAuth App Id (required).</param>
-        /// <param name="teammateAppAccessLevel">Teammate App Access Level.</param>
-        /// <param name="permissionsType">Permissions Type (required).</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="isEnabled">Is application enabled.</param>
-        /// <param name="verificationStatus">Application verification status (required).</param>
-        /// <param name="tags">Tags (required).</param>
-        /// <param name="regions">Regions (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppDetailBase(ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), string oAuthAppId = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), string name = default(string), string description = default(string), string logo = default(string), bool? isEnabled = default(bool?), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), List<string> tags = default(List<string>), List<string> regions = default(List<string>), string developerName = default(string))
-        {
-            // to ensure "configurationType" is required (not null)
-            if (configurationType == null)
-            {
-                throw new InvalidDataException("configurationType is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.ConfigurationType = configurationType;
-            }
-            // to ensure "storeSelectorType" is required (not null)
-            if (storeSelectorType == null)
-            {
-                throw new InvalidDataException("storeSelectorType is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.StoreSelectorType = storeSelectorType;
-            }
-            // to ensure "oAuthAppId" is required (not null)
-            if (oAuthAppId == null)
-            {
-                throw new InvalidDataException("oAuthAppId is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.OAuthAppId = oAuthAppId;
-            }
-            // to ensure "permissionsType" is required (not null)
-            if (permissionsType == null)
-            {
-                throw new InvalidDataException("permissionsType is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.PermissionsType = permissionsType;
-            }
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            // to ensure "description" is required (not null)
-            if (description == null)
-            {
-                throw new InvalidDataException("description is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.Description = description;
-            }
-            // to ensure "verificationStatus" is required (not null)
-            if (verificationStatus == null)
-            {
-                throw new InvalidDataException("verificationStatus is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.VerificationStatus = verificationStatus;
-            }
-            // to ensure "tags" is required (not null)
-            if (tags == null)
-            {
-                throw new InvalidDataException("tags is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.Tags = tags;
-            }
-            // to ensure "regions" is required (not null)
-            if (regions == null)
-            {
-                throw new InvalidDataException("regions is a required property for AppDetailBase and cannot be null");
-            }
-            else
-            {
-                this.Regions = regions;
-            }
-            this.FieldGroups = fieldGroups;
-            this.SetupInstructions = setupInstructions;
-            this.ExternalSetupLink = externalSetupLink;
-            this.TeammateAppAccessLevel = teammateAppAccessLevel;
-            this.Logo = logo;
-            this.IsEnabled = isEnabled;
-            this.DeveloperName = developerName;
-        }
-        
-
-
-        /// <summary>
-        /// Field Groups
-        /// </summary>
-        /// <value>Field Groups</value>
-        [DataMember(Name="FieldGroups", EmitDefaultValue=false)]
-        public List<FieldGroup> FieldGroups { get; set; }
-
-        /// <summary>
-        /// Setup Instructions
-        /// </summary>
-        /// <value>Setup Instructions</value>
-        [DataMember(Name="SetupInstructions", EmitDefaultValue=false)]
-        public string SetupInstructions { get; set; }
-
-        /// <summary>
-        /// External Setup Link
-        /// </summary>
-        /// <value>External Setup Link</value>
-        [DataMember(Name="ExternalSetupLink", EmitDefaultValue=false)]
-        public string ExternalSetupLink { get; set; }
-
-        /// <summary>
-        /// OAuth App Id
-        /// </summary>
-        /// <value>OAuth App Id</value>
-        [DataMember(Name="OAuthAppId", EmitDefaultValue=false)]
-        public string OAuthAppId { get; set; }
-
-
-
-        /// <summary>
-        /// Name
-        /// </summary>
-        /// <value>Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Logo
-        /// </summary>
-        /// <value>Logo</value>
-        [DataMember(Name="Logo", EmitDefaultValue=false)]
-        public string Logo { get; set; }
-
-        /// <summary>
-        /// Is application enabled
-        /// </summary>
-        /// <value>Is application enabled</value>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-
-        /// <summary>
-        /// Tags
-        /// </summary>
-        /// <value>Tags</value>
-        [DataMember(Name="Tags", EmitDefaultValue=false)]
-        public List<string> Tags { get; set; }
-
-        /// <summary>
-        /// Regions
-        /// </summary>
-        /// <value>Regions</value>
-        [DataMember(Name="Regions", EmitDefaultValue=false)]
-        public List<string> Regions { get; set; }
-
-        /// <summary>
-        /// Developer Name
-        /// </summary>
-        /// <value>Developer Name</value>
-        [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
-        public string DeveloperName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppDetailBase {\n");
-            sb.Append("  ConfigurationType: ").Append(ConfigurationType).Append("\n");
-            sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
-            sb.Append("  FieldGroups: ").Append(FieldGroups).Append("\n");
-            sb.Append("  SetupInstructions: ").Append(SetupInstructions).Append("\n");
-            sb.Append("  ExternalSetupLink: ").Append(ExternalSetupLink).Append("\n");
-            sb.Append("  OAuthAppId: ").Append(OAuthAppId).Append("\n");
-            sb.Append("  TeammateAppAccessLevel: ").Append(TeammateAppAccessLevel).Append("\n");
-            sb.Append("  PermissionsType: ").Append(PermissionsType).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Logo: ").Append(Logo).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  VerificationStatus: ").Append(VerificationStatus).Append("\n");
-            sb.Append("  Tags: ").Append(Tags).Append("\n");
-            sb.Append("  Regions: ").Append(Regions).Append("\n");
-            sb.Append("  DeveloperName: ").Append(DeveloperName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppDetailBase);
-        }
-
-        /// <summary>
-        /// Returns true if AppDetailBase instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppDetailBase to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppDetailBase input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.ConfigurationType == input.ConfigurationType ||
-                    (this.ConfigurationType != null &&
-                    this.ConfigurationType.Equals(input.ConfigurationType))
-                ) && 
-                (
-                    this.StoreSelectorType == input.StoreSelectorType ||
-                    (this.StoreSelectorType != null &&
-                    this.StoreSelectorType.Equals(input.StoreSelectorType))
-                ) && 
-                (
-                    this.FieldGroups == input.FieldGroups ||
-                    this.FieldGroups != null &&
-                    this.FieldGroups.SequenceEqual(input.FieldGroups)
-                ) && 
-                (
-                    this.SetupInstructions == input.SetupInstructions ||
-                    (this.SetupInstructions != null &&
-                    this.SetupInstructions.Equals(input.SetupInstructions))
-                ) && 
-                (
-                    this.ExternalSetupLink == input.ExternalSetupLink ||
-                    (this.ExternalSetupLink != null &&
-                    this.ExternalSetupLink.Equals(input.ExternalSetupLink))
-                ) && 
-                (
-                    this.OAuthAppId == input.OAuthAppId ||
-                    (this.OAuthAppId != null &&
-                    this.OAuthAppId.Equals(input.OAuthAppId))
-                ) && 
-                (
-                    this.TeammateAppAccessLevel == input.TeammateAppAccessLevel ||
-                    (this.TeammateAppAccessLevel != null &&
-                    this.TeammateAppAccessLevel.Equals(input.TeammateAppAccessLevel))
-                ) && 
-                (
-                    this.PermissionsType == input.PermissionsType ||
-                    (this.PermissionsType != null &&
-                    this.PermissionsType.Equals(input.PermissionsType))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Logo == input.Logo ||
-                    (this.Logo != null &&
-                    this.Logo.Equals(input.Logo))
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.VerificationStatus == input.VerificationStatus ||
-                    (this.VerificationStatus != null &&
-                    this.VerificationStatus.Equals(input.VerificationStatus))
-                ) && 
-                (
-                    this.Tags == input.Tags ||
-                    this.Tags != null &&
-                    this.Tags.SequenceEqual(input.Tags)
-                ) && 
-                (
-                    this.Regions == input.Regions ||
-                    this.Regions != null &&
-                    this.Regions.SequenceEqual(input.Regions)
-                ) && 
-                (
-                    this.DeveloperName == input.DeveloperName ||
-                    (this.DeveloperName != null &&
-                    this.DeveloperName.Equals(input.DeveloperName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.ConfigurationType != null)
-                    hashCode = hashCode * 59 + this.ConfigurationType.GetHashCode();
-                if (this.StoreSelectorType != null)
-                    hashCode = hashCode * 59 + this.StoreSelectorType.GetHashCode();
-                if (this.FieldGroups != null)
-                    hashCode = hashCode * 59 + this.FieldGroups.GetHashCode();
-                if (this.SetupInstructions != null)
-                    hashCode = hashCode * 59 + this.SetupInstructions.GetHashCode();
-                if (this.ExternalSetupLink != null)
-                    hashCode = hashCode * 59 + this.ExternalSetupLink.GetHashCode();
-                if (this.OAuthAppId != null)
-                    hashCode = hashCode * 59 + this.OAuthAppId.GetHashCode();
-                if (this.TeammateAppAccessLevel != null)
-                    hashCode = hashCode * 59 + this.TeammateAppAccessLevel.GetHashCode();
-                if (this.PermissionsType != null)
-                    hashCode = hashCode * 59 + this.PermissionsType.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Logo != null)
-                    hashCode = hashCode * 59 + this.Logo.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.VerificationStatus != null)
-                    hashCode = hashCode * 59 + this.VerificationStatus.GetHashCode();
-                if (this.Tags != null)
-                    hashCode = hashCode * 59 + this.Tags.GetHashCode();
-                if (this.Regions != null)
-                    hashCode = hashCode * 59 + this.Regions.GetHashCode();
-                if (this.DeveloperName != null)
-                    hashCode = hashCode * 59 + this.DeveloperName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppGeneralConfigModel.cs b/src/Flipdish/Model/AppGeneralConfigModel.cs
new file mode 100644
index 00000000..e855ccca
--- /dev/null
+++ b/src/Flipdish/Model/AppGeneralConfigModel.cs
@@ -0,0 +1,351 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// App general configuration model
+    /// </summary>
+    [DataContract]
+    public partial class AppGeneralConfigModel :  IEquatable<AppGeneralConfigModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppGeneralConfigModel" /> class.
+        /// </summary>
+        /// <param name="whiteLabelId">White label ID.</param>
+        /// <param name="deepLinkUrlScheme">Deep link URL scheme.</param>
+        /// <param name="smsRestaurantName">SMS restaurant name.</param>
+        /// <param name="nexmoSupportSmsNumber">Nexmo support SMS number.</param>
+        /// <param name="twilioSupportSmsNumber">Twilio support SMS number.</param>
+        /// <param name="fallbackPhoneNumberPrefix">Fallback phone number prefix.</param>
+        /// <param name="autocompletePhoneNumberLength">Autocomplete phone number length.</param>
+        /// <param name="contactFormType">Contact form type  None &#x3D; 0,  Email &#x3D; 1,  Intercom &#x3D; 2,  WebView &#x3D; 3,  FlipdishMessages &#x3D; 4.</param>
+        /// <param name="privateSupportEmailAddress">Private support email address.</param>
+        /// <param name="contactPhoneNumber">Contact phone number.</param>
+        /// <param name="deliveryEnabled">Delivery enabled.</param>
+        /// <param name="pickupEnabled">Pickup enabled.</param>
+        /// <param name="dineInEnabled">Dine in enabled.</param>
+        /// <param name="displayDeliveryRestaurantListScreen">Display delivery restaurant list screen.</param>
+        /// <param name="displayPickupRestaurantListScreen">Display pickup restaurant list screen.</param>
+        public AppGeneralConfigModel(int? whiteLabelId = default(int?), string deepLinkUrlScheme = default(string), string smsRestaurantName = default(string), string nexmoSupportSmsNumber = default(string), string twilioSupportSmsNumber = default(string), string fallbackPhoneNumberPrefix = default(string), int? autocompletePhoneNumberLength = default(int?), string contactFormType = default(string), string privateSupportEmailAddress = default(string), string contactPhoneNumber = default(string), bool? deliveryEnabled = default(bool?), bool? pickupEnabled = default(bool?), bool? dineInEnabled = default(bool?), bool? displayDeliveryRestaurantListScreen = default(bool?), bool? displayPickupRestaurantListScreen = default(bool?))
+        {
+            this.WhiteLabelId = whiteLabelId;
+            this.DeepLinkUrlScheme = deepLinkUrlScheme;
+            this.SmsRestaurantName = smsRestaurantName;
+            this.NexmoSupportSmsNumber = nexmoSupportSmsNumber;
+            this.TwilioSupportSmsNumber = twilioSupportSmsNumber;
+            this.FallbackPhoneNumberPrefix = fallbackPhoneNumberPrefix;
+            this.AutocompletePhoneNumberLength = autocompletePhoneNumberLength;
+            this.ContactFormType = contactFormType;
+            this.PrivateSupportEmailAddress = privateSupportEmailAddress;
+            this.ContactPhoneNumber = contactPhoneNumber;
+            this.DeliveryEnabled = deliveryEnabled;
+            this.PickupEnabled = pickupEnabled;
+            this.DineInEnabled = dineInEnabled;
+            this.DisplayDeliveryRestaurantListScreen = displayDeliveryRestaurantListScreen;
+            this.DisplayPickupRestaurantListScreen = displayPickupRestaurantListScreen;
+        }
+        
+        /// <summary>
+        /// White label ID
+        /// </summary>
+        /// <value>White label ID</value>
+        [DataMember(Name="WhiteLabelId", EmitDefaultValue=false)]
+        public int? WhiteLabelId { get; set; }
+
+        /// <summary>
+        /// Deep link URL scheme
+        /// </summary>
+        /// <value>Deep link URL scheme</value>
+        [DataMember(Name="DeepLinkUrlScheme", EmitDefaultValue=false)]
+        public string DeepLinkUrlScheme { get; set; }
+
+        /// <summary>
+        /// SMS restaurant name
+        /// </summary>
+        /// <value>SMS restaurant name</value>
+        [DataMember(Name="SmsRestaurantName", EmitDefaultValue=false)]
+        public string SmsRestaurantName { get; set; }
+
+        /// <summary>
+        /// Nexmo support SMS number
+        /// </summary>
+        /// <value>Nexmo support SMS number</value>
+        [DataMember(Name="NexmoSupportSmsNumber", EmitDefaultValue=false)]
+        public string NexmoSupportSmsNumber { get; set; }
+
+        /// <summary>
+        /// Twilio support SMS number
+        /// </summary>
+        /// <value>Twilio support SMS number</value>
+        [DataMember(Name="TwilioSupportSmsNumber", EmitDefaultValue=false)]
+        public string TwilioSupportSmsNumber { get; set; }
+
+        /// <summary>
+        /// Fallback phone number prefix
+        /// </summary>
+        /// <value>Fallback phone number prefix</value>
+        [DataMember(Name="FallbackPhoneNumberPrefix", EmitDefaultValue=false)]
+        public string FallbackPhoneNumberPrefix { get; set; }
+
+        /// <summary>
+        /// Autocomplete phone number length
+        /// </summary>
+        /// <value>Autocomplete phone number length</value>
+        [DataMember(Name="AutocompletePhoneNumberLength", EmitDefaultValue=false)]
+        public int? AutocompletePhoneNumberLength { get; set; }
+
+        /// <summary>
+        /// Contact form type  None &#x3D; 0,  Email &#x3D; 1,  Intercom &#x3D; 2,  WebView &#x3D; 3,  FlipdishMessages &#x3D; 4
+        /// </summary>
+        /// <value>Contact form type  None &#x3D; 0,  Email &#x3D; 1,  Intercom &#x3D; 2,  WebView &#x3D; 3,  FlipdishMessages &#x3D; 4</value>
+        [DataMember(Name="ContactFormType", EmitDefaultValue=false)]
+        public string ContactFormType { get; set; }
+
+        /// <summary>
+        /// Private support email address
+        /// </summary>
+        /// <value>Private support email address</value>
+        [DataMember(Name="PrivateSupportEmailAddress", EmitDefaultValue=false)]
+        public string PrivateSupportEmailAddress { get; set; }
+
+        /// <summary>
+        /// Contact phone number
+        /// </summary>
+        /// <value>Contact phone number</value>
+        [DataMember(Name="ContactPhoneNumber", EmitDefaultValue=false)]
+        public string ContactPhoneNumber { get; set; }
+
+        /// <summary>
+        /// Delivery enabled
+        /// </summary>
+        /// <value>Delivery enabled</value>
+        [DataMember(Name="DeliveryEnabled", EmitDefaultValue=false)]
+        public bool? DeliveryEnabled { get; set; }
+
+        /// <summary>
+        /// Pickup enabled
+        /// </summary>
+        /// <value>Pickup enabled</value>
+        [DataMember(Name="PickupEnabled", EmitDefaultValue=false)]
+        public bool? PickupEnabled { get; set; }
+
+        /// <summary>
+        /// Dine in enabled
+        /// </summary>
+        /// <value>Dine in enabled</value>
+        [DataMember(Name="DineInEnabled", EmitDefaultValue=false)]
+        public bool? DineInEnabled { get; set; }
+
+        /// <summary>
+        /// Display delivery restaurant list screen
+        /// </summary>
+        /// <value>Display delivery restaurant list screen</value>
+        [DataMember(Name="DisplayDeliveryRestaurantListScreen", EmitDefaultValue=false)]
+        public bool? DisplayDeliveryRestaurantListScreen { get; set; }
+
+        /// <summary>
+        /// Display pickup restaurant list screen
+        /// </summary>
+        /// <value>Display pickup restaurant list screen</value>
+        [DataMember(Name="DisplayPickupRestaurantListScreen", EmitDefaultValue=false)]
+        public bool? DisplayPickupRestaurantListScreen { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AppGeneralConfigModel {\n");
+            sb.Append("  WhiteLabelId: ").Append(WhiteLabelId).Append("\n");
+            sb.Append("  DeepLinkUrlScheme: ").Append(DeepLinkUrlScheme).Append("\n");
+            sb.Append("  SmsRestaurantName: ").Append(SmsRestaurantName).Append("\n");
+            sb.Append("  NexmoSupportSmsNumber: ").Append(NexmoSupportSmsNumber).Append("\n");
+            sb.Append("  TwilioSupportSmsNumber: ").Append(TwilioSupportSmsNumber).Append("\n");
+            sb.Append("  FallbackPhoneNumberPrefix: ").Append(FallbackPhoneNumberPrefix).Append("\n");
+            sb.Append("  AutocompletePhoneNumberLength: ").Append(AutocompletePhoneNumberLength).Append("\n");
+            sb.Append("  ContactFormType: ").Append(ContactFormType).Append("\n");
+            sb.Append("  PrivateSupportEmailAddress: ").Append(PrivateSupportEmailAddress).Append("\n");
+            sb.Append("  ContactPhoneNumber: ").Append(ContactPhoneNumber).Append("\n");
+            sb.Append("  DeliveryEnabled: ").Append(DeliveryEnabled).Append("\n");
+            sb.Append("  PickupEnabled: ").Append(PickupEnabled).Append("\n");
+            sb.Append("  DineInEnabled: ").Append(DineInEnabled).Append("\n");
+            sb.Append("  DisplayDeliveryRestaurantListScreen: ").Append(DisplayDeliveryRestaurantListScreen).Append("\n");
+            sb.Append("  DisplayPickupRestaurantListScreen: ").Append(DisplayPickupRestaurantListScreen).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AppGeneralConfigModel);
+        }
+
+        /// <summary>
+        /// Returns true if AppGeneralConfigModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AppGeneralConfigModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AppGeneralConfigModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelId == input.WhiteLabelId ||
+                    (this.WhiteLabelId != null &&
+                    this.WhiteLabelId.Equals(input.WhiteLabelId))
+                ) && 
+                (
+                    this.DeepLinkUrlScheme == input.DeepLinkUrlScheme ||
+                    (this.DeepLinkUrlScheme != null &&
+                    this.DeepLinkUrlScheme.Equals(input.DeepLinkUrlScheme))
+                ) && 
+                (
+                    this.SmsRestaurantName == input.SmsRestaurantName ||
+                    (this.SmsRestaurantName != null &&
+                    this.SmsRestaurantName.Equals(input.SmsRestaurantName))
+                ) && 
+                (
+                    this.NexmoSupportSmsNumber == input.NexmoSupportSmsNumber ||
+                    (this.NexmoSupportSmsNumber != null &&
+                    this.NexmoSupportSmsNumber.Equals(input.NexmoSupportSmsNumber))
+                ) && 
+                (
+                    this.TwilioSupportSmsNumber == input.TwilioSupportSmsNumber ||
+                    (this.TwilioSupportSmsNumber != null &&
+                    this.TwilioSupportSmsNumber.Equals(input.TwilioSupportSmsNumber))
+                ) && 
+                (
+                    this.FallbackPhoneNumberPrefix == input.FallbackPhoneNumberPrefix ||
+                    (this.FallbackPhoneNumberPrefix != null &&
+                    this.FallbackPhoneNumberPrefix.Equals(input.FallbackPhoneNumberPrefix))
+                ) && 
+                (
+                    this.AutocompletePhoneNumberLength == input.AutocompletePhoneNumberLength ||
+                    (this.AutocompletePhoneNumberLength != null &&
+                    this.AutocompletePhoneNumberLength.Equals(input.AutocompletePhoneNumberLength))
+                ) && 
+                (
+                    this.ContactFormType == input.ContactFormType ||
+                    (this.ContactFormType != null &&
+                    this.ContactFormType.Equals(input.ContactFormType))
+                ) && 
+                (
+                    this.PrivateSupportEmailAddress == input.PrivateSupportEmailAddress ||
+                    (this.PrivateSupportEmailAddress != null &&
+                    this.PrivateSupportEmailAddress.Equals(input.PrivateSupportEmailAddress))
+                ) && 
+                (
+                    this.ContactPhoneNumber == input.ContactPhoneNumber ||
+                    (this.ContactPhoneNumber != null &&
+                    this.ContactPhoneNumber.Equals(input.ContactPhoneNumber))
+                ) && 
+                (
+                    this.DeliveryEnabled == input.DeliveryEnabled ||
+                    (this.DeliveryEnabled != null &&
+                    this.DeliveryEnabled.Equals(input.DeliveryEnabled))
+                ) && 
+                (
+                    this.PickupEnabled == input.PickupEnabled ||
+                    (this.PickupEnabled != null &&
+                    this.PickupEnabled.Equals(input.PickupEnabled))
+                ) && 
+                (
+                    this.DineInEnabled == input.DineInEnabled ||
+                    (this.DineInEnabled != null &&
+                    this.DineInEnabled.Equals(input.DineInEnabled))
+                ) && 
+                (
+                    this.DisplayDeliveryRestaurantListScreen == input.DisplayDeliveryRestaurantListScreen ||
+                    (this.DisplayDeliveryRestaurantListScreen != null &&
+                    this.DisplayDeliveryRestaurantListScreen.Equals(input.DisplayDeliveryRestaurantListScreen))
+                ) && 
+                (
+                    this.DisplayPickupRestaurantListScreen == input.DisplayPickupRestaurantListScreen ||
+                    (this.DisplayPickupRestaurantListScreen != null &&
+                    this.DisplayPickupRestaurantListScreen.Equals(input.DisplayPickupRestaurantListScreen))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelId.GetHashCode();
+                if (this.DeepLinkUrlScheme != null)
+                    hashCode = hashCode * 59 + this.DeepLinkUrlScheme.GetHashCode();
+                if (this.SmsRestaurantName != null)
+                    hashCode = hashCode * 59 + this.SmsRestaurantName.GetHashCode();
+                if (this.NexmoSupportSmsNumber != null)
+                    hashCode = hashCode * 59 + this.NexmoSupportSmsNumber.GetHashCode();
+                if (this.TwilioSupportSmsNumber != null)
+                    hashCode = hashCode * 59 + this.TwilioSupportSmsNumber.GetHashCode();
+                if (this.FallbackPhoneNumberPrefix != null)
+                    hashCode = hashCode * 59 + this.FallbackPhoneNumberPrefix.GetHashCode();
+                if (this.AutocompletePhoneNumberLength != null)
+                    hashCode = hashCode * 59 + this.AutocompletePhoneNumberLength.GetHashCode();
+                if (this.ContactFormType != null)
+                    hashCode = hashCode * 59 + this.ContactFormType.GetHashCode();
+                if (this.PrivateSupportEmailAddress != null)
+                    hashCode = hashCode * 59 + this.PrivateSupportEmailAddress.GetHashCode();
+                if (this.ContactPhoneNumber != null)
+                    hashCode = hashCode * 59 + this.ContactPhoneNumber.GetHashCode();
+                if (this.DeliveryEnabled != null)
+                    hashCode = hashCode * 59 + this.DeliveryEnabled.GetHashCode();
+                if (this.PickupEnabled != null)
+                    hashCode = hashCode * 59 + this.PickupEnabled.GetHashCode();
+                if (this.DineInEnabled != null)
+                    hashCode = hashCode * 59 + this.DineInEnabled.GetHashCode();
+                if (this.DisplayDeliveryRestaurantListScreen != null)
+                    hashCode = hashCode * 59 + this.DisplayDeliveryRestaurantListScreen.GetHashCode();
+                if (this.DisplayPickupRestaurantListScreen != null)
+                    hashCode = hashCode * 59 + this.DisplayPickupRestaurantListScreen.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AppInstall.cs b/src/Flipdish/Model/AppInstall.cs
new file mode 100644
index 00000000..0e942bca
--- /dev/null
+++ b/src/Flipdish/Model/AppInstall.cs
@@ -0,0 +1,266 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// App Install information
+    /// </summary>
+    [DataContract]
+    public partial class AppInstall :  IEquatable<AppInstall>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppInstall" /> class.
+        /// </summary>
+        /// <param name="name">Name of the installed application..</param>
+        /// <param name="firstLogin">Date and time of the user&#39;s first login to the app..</param>
+        /// <param name="firstLoginHuman">Human-readable representation of the first login date..</param>
+        /// <param name="lastActivity">Date and time of the user&#39;s last activity in the app..</param>
+        /// <param name="lastActivityHuman">Human-readable representation of the last activity date..</param>
+        /// <param name="googleTokens">Number of Google push notification tokens associated with the app install..</param>
+        /// <param name="appleTokens">Number of Apple push notification tokens associated with the app install..</param>
+        /// <param name="orderCount">Number of orders placed by the user through this app install..</param>
+        /// <param name="userAgentAtSignup">User agent string at the time of signup..</param>
+        /// <param name="userAgentMostRecent">Most recent user agent string used by the user..</param>
+        public AppInstall(string name = default(string), DateTime? firstLogin = default(DateTime?), string firstLoginHuman = default(string), DateTime? lastActivity = default(DateTime?), string lastActivityHuman = default(string), int? googleTokens = default(int?), int? appleTokens = default(int?), int? orderCount = default(int?), string userAgentAtSignup = default(string), string userAgentMostRecent = default(string))
+        {
+            this.Name = name;
+            this.FirstLogin = firstLogin;
+            this.FirstLoginHuman = firstLoginHuman;
+            this.LastActivity = lastActivity;
+            this.LastActivityHuman = lastActivityHuman;
+            this.GoogleTokens = googleTokens;
+            this.AppleTokens = appleTokens;
+            this.OrderCount = orderCount;
+            this.UserAgentAtSignup = userAgentAtSignup;
+            this.UserAgentMostRecent = userAgentMostRecent;
+        }
+        
+        /// <summary>
+        /// Name of the installed application.
+        /// </summary>
+        /// <value>Name of the installed application.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Date and time of the user&#39;s first login to the app.
+        /// </summary>
+        /// <value>Date and time of the user&#39;s first login to the app.</value>
+        [DataMember(Name="FirstLogin", EmitDefaultValue=false)]
+        public DateTime? FirstLogin { get; set; }
+
+        /// <summary>
+        /// Human-readable representation of the first login date.
+        /// </summary>
+        /// <value>Human-readable representation of the first login date.</value>
+        [DataMember(Name="FirstLoginHuman", EmitDefaultValue=false)]
+        public string FirstLoginHuman { get; set; }
+
+        /// <summary>
+        /// Date and time of the user&#39;s last activity in the app.
+        /// </summary>
+        /// <value>Date and time of the user&#39;s last activity in the app.</value>
+        [DataMember(Name="LastActivity", EmitDefaultValue=false)]
+        public DateTime? LastActivity { get; set; }
+
+        /// <summary>
+        /// Human-readable representation of the last activity date.
+        /// </summary>
+        /// <value>Human-readable representation of the last activity date.</value>
+        [DataMember(Name="LastActivityHuman", EmitDefaultValue=false)]
+        public string LastActivityHuman { get; set; }
+
+        /// <summary>
+        /// Number of Google push notification tokens associated with the app install.
+        /// </summary>
+        /// <value>Number of Google push notification tokens associated with the app install.</value>
+        [DataMember(Name="GoogleTokens", EmitDefaultValue=false)]
+        public int? GoogleTokens { get; set; }
+
+        /// <summary>
+        /// Number of Apple push notification tokens associated with the app install.
+        /// </summary>
+        /// <value>Number of Apple push notification tokens associated with the app install.</value>
+        [DataMember(Name="AppleTokens", EmitDefaultValue=false)]
+        public int? AppleTokens { get; set; }
+
+        /// <summary>
+        /// Number of orders placed by the user through this app install.
+        /// </summary>
+        /// <value>Number of orders placed by the user through this app install.</value>
+        [DataMember(Name="OrderCount", EmitDefaultValue=false)]
+        public int? OrderCount { get; set; }
+
+        /// <summary>
+        /// User agent string at the time of signup.
+        /// </summary>
+        /// <value>User agent string at the time of signup.</value>
+        [DataMember(Name="UserAgentAtSignup", EmitDefaultValue=false)]
+        public string UserAgentAtSignup { get; set; }
+
+        /// <summary>
+        /// Most recent user agent string used by the user.
+        /// </summary>
+        /// <value>Most recent user agent string used by the user.</value>
+        [DataMember(Name="UserAgentMostRecent", EmitDefaultValue=false)]
+        public string UserAgentMostRecent { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AppInstall {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  FirstLogin: ").Append(FirstLogin).Append("\n");
+            sb.Append("  FirstLoginHuman: ").Append(FirstLoginHuman).Append("\n");
+            sb.Append("  LastActivity: ").Append(LastActivity).Append("\n");
+            sb.Append("  LastActivityHuman: ").Append(LastActivityHuman).Append("\n");
+            sb.Append("  GoogleTokens: ").Append(GoogleTokens).Append("\n");
+            sb.Append("  AppleTokens: ").Append(AppleTokens).Append("\n");
+            sb.Append("  OrderCount: ").Append(OrderCount).Append("\n");
+            sb.Append("  UserAgentAtSignup: ").Append(UserAgentAtSignup).Append("\n");
+            sb.Append("  UserAgentMostRecent: ").Append(UserAgentMostRecent).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AppInstall);
+        }
+
+        /// <summary>
+        /// Returns true if AppInstall instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AppInstall to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AppInstall input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.FirstLogin == input.FirstLogin ||
+                    (this.FirstLogin != null &&
+                    this.FirstLogin.Equals(input.FirstLogin))
+                ) && 
+                (
+                    this.FirstLoginHuman == input.FirstLoginHuman ||
+                    (this.FirstLoginHuman != null &&
+                    this.FirstLoginHuman.Equals(input.FirstLoginHuman))
+                ) && 
+                (
+                    this.LastActivity == input.LastActivity ||
+                    (this.LastActivity != null &&
+                    this.LastActivity.Equals(input.LastActivity))
+                ) && 
+                (
+                    this.LastActivityHuman == input.LastActivityHuman ||
+                    (this.LastActivityHuman != null &&
+                    this.LastActivityHuman.Equals(input.LastActivityHuman))
+                ) && 
+                (
+                    this.GoogleTokens == input.GoogleTokens ||
+                    (this.GoogleTokens != null &&
+                    this.GoogleTokens.Equals(input.GoogleTokens))
+                ) && 
+                (
+                    this.AppleTokens == input.AppleTokens ||
+                    (this.AppleTokens != null &&
+                    this.AppleTokens.Equals(input.AppleTokens))
+                ) && 
+                (
+                    this.OrderCount == input.OrderCount ||
+                    (this.OrderCount != null &&
+                    this.OrderCount.Equals(input.OrderCount))
+                ) && 
+                (
+                    this.UserAgentAtSignup == input.UserAgentAtSignup ||
+                    (this.UserAgentAtSignup != null &&
+                    this.UserAgentAtSignup.Equals(input.UserAgentAtSignup))
+                ) && 
+                (
+                    this.UserAgentMostRecent == input.UserAgentMostRecent ||
+                    (this.UserAgentMostRecent != null &&
+                    this.UserAgentMostRecent.Equals(input.UserAgentMostRecent))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.FirstLogin != null)
+                    hashCode = hashCode * 59 + this.FirstLogin.GetHashCode();
+                if (this.FirstLoginHuman != null)
+                    hashCode = hashCode * 59 + this.FirstLoginHuman.GetHashCode();
+                if (this.LastActivity != null)
+                    hashCode = hashCode * 59 + this.LastActivity.GetHashCode();
+                if (this.LastActivityHuman != null)
+                    hashCode = hashCode * 59 + this.LastActivityHuman.GetHashCode();
+                if (this.GoogleTokens != null)
+                    hashCode = hashCode * 59 + this.GoogleTokens.GetHashCode();
+                if (this.AppleTokens != null)
+                    hashCode = hashCode * 59 + this.AppleTokens.GetHashCode();
+                if (this.OrderCount != null)
+                    hashCode = hashCode * 59 + this.OrderCount.GetHashCode();
+                if (this.UserAgentAtSignup != null)
+                    hashCode = hashCode * 59 + this.UserAgentAtSignup.GetHashCode();
+                if (this.UserAgentMostRecent != null)
+                    hashCode = hashCode * 59 + this.UserAgentMostRecent.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AppLookup.cs b/src/Flipdish/Model/AppLookup.cs
new file mode 100644
index 00000000..c8a5e445
--- /dev/null
+++ b/src/Flipdish/Model/AppLookup.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// App lookup model
+    /// </summary>
+    [DataContract]
+    public partial class AppLookup :  IEquatable<AppLookup>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppLookup" /> class.
+        /// </summary>
+        /// <param name="appId">App id.</param>
+        public AppLookup(string appId = default(string))
+        {
+            this.AppId = appId;
+        }
+        
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AppLookup {\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AppLookup);
+        }
+
+        /// <summary>
+        /// Returns true if AppLookup instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AppLookup to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AppLookup input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AppStoreApp.cs b/src/Flipdish/Model/AppStoreApp.cs
index 446dc98a..62b8afdb 100644
--- a/src/Flipdish/Model/AppStoreApp.cs
+++ b/src/Flipdish/Model/AppStoreApp.cs
@@ -12,28 +12,25 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// App store app
+    /// AppStoreApp
     /// </summary>
     [DataContract]
-    public partial class AppStoreApp :  IEquatable<AppStoreApp>, IValidatableObject
+    public partial class AppStoreApp :  IEquatable<AppStoreApp>
     {
         /// <summary>
-        /// Application verification status
+        /// Defines VerificationStatus
         /// </summary>
-        /// <value>Application verification status</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum VerificationStatusEnum
         {
@@ -58,15 +55,13 @@ public enum VerificationStatusEnum
         }
 
         /// <summary>
-        /// Application verification status
+        /// Gets or Sets VerificationStatus
         /// </summary>
-        /// <value>Application verification status</value>
         [DataMember(Name="VerificationStatus", EmitDefaultValue=false)]
         public VerificationStatusEnum VerificationStatus { get; set; }
         /// <summary>
-        /// Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;
+        /// Defines ConfigurationType
         /// </summary>
-        /// <value>Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum ConfigurationTypeEnum
         {
@@ -85,15 +80,13 @@ public enum ConfigurationTypeEnum
         }
 
         /// <summary>
-        /// Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;
+        /// Gets or Sets ConfigurationType
         /// </summary>
-        /// <value>Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;</value>
         [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
         public ConfigurationTypeEnum ConfigurationType { get; set; }
         /// <summary>
-        /// Store selector type
+        /// Defines StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StoreSelectorTypeEnum
         {
@@ -118,15 +111,13 @@ public enum StoreSelectorTypeEnum
         }
 
         /// <summary>
-        /// Store selector type
+        /// Gets or Sets StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
         public StoreSelectorTypeEnum StoreSelectorType { get; set; }
         /// <summary>
-        /// Teammate app access level
+        /// Defines TeammateAppAccessLevel
         /// </summary>
-        /// <value>Teammate app access level</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum TeammateAppAccessLevelEnum
         {
@@ -143,53 +134,69 @@ public enum TeammateAppAccessLevelEnum
             [EnumMember(Value = "StoreOwner")]
             StoreOwner = 2,
             
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 3,
+            
             /// <summary>
             /// Enum ManagedOwner for value: ManagedOwner
             /// </summary>
             [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 3,
+            ManagedOwner = 4,
             
             /// <summary>
             /// Enum Integrator for value: Integrator
             /// </summary>
             [EnumMember(Value = "Integrator")]
-            Integrator = 4,
+            Integrator = 5,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 6,
             
             /// <summary>
             /// Enum StoreManager for value: StoreManager
             /// </summary>
             [EnumMember(Value = "StoreManager")]
-            StoreManager = 5,
+            StoreManager = 7,
             
             /// <summary>
             /// Enum StoreStaff for value: StoreStaff
             /// </summary>
             [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 6,
+            StoreStaff = 8,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 9,
             
             /// <summary>
             /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
             /// </summary>
             [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 7,
+            StoreReadOnlyAccess = 10,
             
             /// <summary>
             /// Enum FinanceManger for value: FinanceManger
             /// </summary>
             [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 8
+            FinanceManger = 11
         }
 
         /// <summary>
-        /// Teammate app access level
+        /// Gets or Sets TeammateAppAccessLevel
         /// </summary>
-        /// <value>Teammate app access level</value>
         [DataMember(Name="TeammateAppAccessLevel", EmitDefaultValue=false)]
         public TeammateAppAccessLevelEnum? TeammateAppAccessLevel { get; set; }
         /// <summary>
-        /// Permissions type
+        /// Defines PermissionsType
         /// </summary>
-        /// <value>Permissions type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum PermissionsTypeEnum
         {
@@ -202,9 +209,8 @@ public enum PermissionsTypeEnum
         }
 
         /// <summary>
-        /// Permissions type
+        /// Gets or Sets PermissionsType
         /// </summary>
-        /// <value>Permissions type</value>
         [DataMember(Name="PermissionsType", EmitDefaultValue=false)]
         public PermissionsTypeEnum PermissionsType { get; set; }
         /// <summary>
@@ -259,9 +265,8 @@ public enum CategoriesEnum
 
 
         /// <summary>
-        /// Categories
+        /// Gets or Sets Categories
         /// </summary>
-        /// <value>Categories</value>
         [DataMember(Name="Categories", EmitDefaultValue=false)]
         public List<CategoriesEnum> Categories { get; set; }
         /// <summary>
@@ -376,9 +381,8 @@ public enum CountriesEnum
 
 
         /// <summary>
-        /// Countries
+        /// Gets or Sets Countries
         /// </summary>
-        /// <value>Countries</value>
         [DataMember(Name="Countries", EmitDefaultValue=false)]
         public List<CountriesEnum> Countries { get; set; }
         /// <summary>
@@ -389,26 +393,30 @@ protected AppStoreApp() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreApp" /> class.
         /// </summary>
-        /// <param name="id">Unique App store app id (required).</param>
-        /// <param name="verificationStatus">Application verification status (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="oAuthAppId">OAuth App identifier (required).</param>
-        /// <param name="details">Details (required).</param>
-        /// <param name="configurationType">Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt; (required).</param>
-        /// <param name="storeSelectorType">Store selector type (required).</param>
-        /// <param name="fieldGroups">Field groups.</param>
-        /// <param name="setupInstructions">Setup instructions.</param>
-        /// <param name="externalSetupLink">External setup link.</param>
-        /// <param name="teammateAppAccessLevel">Teammate app access level.</param>
-        /// <param name="permissionsType">Permissions type (required).</param>
-        /// <param name="support">Support information.</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="isEnabled">Is application enabled.</param>
-        /// <param name="categories">Categories (required).</param>
-        /// <param name="countries">Countries (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppStoreApp(string id = default(string), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), string logo = default(string), string oAuthAppId = default(string), string details = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), AppStoreAppSupportInfo support = default(AppStoreAppSupportInfo), string name = default(string), string description = default(string), bool? isEnabled = default(bool?), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
+        /// <param name="id">id (required).</param>
+        /// <param name="verificationStatus">verificationStatus (required).</param>
+        /// <param name="logo">logo.</param>
+        /// <param name="oAuthAppId">oAuthAppId (required).</param>
+        /// <param name="_internal">_internal (required).</param>
+        /// <param name="details">details (required).</param>
+        /// <param name="configurationType">configurationType (required).</param>
+        /// <param name="storeSelectorType">storeSelectorType (required).</param>
+        /// <param name="fieldGroups">fieldGroups.</param>
+        /// <param name="setupInstructions">setupInstructions.</param>
+        /// <param name="externalSetupLink">externalSetupLink.</param>
+        /// <param name="teammateAppAccessLevel">teammateAppAccessLevel.</param>
+        /// <param name="permissionsType">permissionsType (required).</param>
+        /// <param name="support">support.</param>
+        /// <param name="externalFunctionActionUrl">externalFunctionActionUrl.</param>
+        /// <param name="externalFunctionSignatureKey">externalFunctionSignatureKey.</param>
+        /// <param name="isPaid">isPaid.</param>
+        /// <param name="name">name (required).</param>
+        /// <param name="description">description (required).</param>
+        /// <param name="isEnabled">isEnabled.</param>
+        /// <param name="categories">categories (required).</param>
+        /// <param name="countries">countries (required).</param>
+        /// <param name="developerName">developerName.</param>
+        public AppStoreApp(string id = default(string), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), string logo = default(string), string oAuthAppId = default(string), bool? _internal = default(bool?), string details = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), AppStoreAppSupportInfo support = default(AppStoreAppSupportInfo), string externalFunctionActionUrl = default(string), string externalFunctionSignatureKey = default(string), bool? isPaid = default(bool?), string name = default(string), string description = default(string), bool? isEnabled = default(bool?), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
         {
             // to ensure "id" is required (not null)
             if (id == null)
@@ -437,6 +445,15 @@ protected AppStoreApp() { }
             {
                 this.OAuthAppId = oAuthAppId;
             }
+            // to ensure "_internal" is required (not null)
+            if (_internal == null)
+            {
+                throw new InvalidDataException("_internal is a required property for AppStoreApp and cannot be null");
+            }
+            else
+            {
+                this.Internal = _internal;
+            }
             // to ensure "details" is required (not null)
             if (details == null)
             {
@@ -515,98 +532,113 @@ protected AppStoreApp() { }
             this.ExternalSetupLink = externalSetupLink;
             this.TeammateAppAccessLevel = teammateAppAccessLevel;
             this.Support = support;
+            this.ExternalFunctionActionUrl = externalFunctionActionUrl;
+            this.ExternalFunctionSignatureKey = externalFunctionSignatureKey;
+            this.IsPaid = isPaid;
             this.IsEnabled = isEnabled;
             this.DeveloperName = developerName;
         }
         
         /// <summary>
-        /// Unique App store app id
+        /// Gets or Sets Id
         /// </summary>
-        /// <value>Unique App store app id</value>
         [DataMember(Name="Id", EmitDefaultValue=false)]
         public string Id { get; set; }
 
 
         /// <summary>
-        /// Logo
+        /// Gets or Sets Logo
         /// </summary>
-        /// <value>Logo</value>
         [DataMember(Name="Logo", EmitDefaultValue=false)]
         public string Logo { get; set; }
 
         /// <summary>
-        /// OAuth App identifier
+        /// Gets or Sets OAuthAppId
         /// </summary>
-        /// <value>OAuth App identifier</value>
         [DataMember(Name="OAuthAppId", EmitDefaultValue=false)]
         public string OAuthAppId { get; set; }
 
         /// <summary>
-        /// Details
+        /// Gets or Sets Internal
+        /// </summary>
+        [DataMember(Name="Internal", EmitDefaultValue=false)]
+        public bool? Internal { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Details
         /// </summary>
-        /// <value>Details</value>
         [DataMember(Name="Details", EmitDefaultValue=false)]
         public string Details { get; set; }
 
 
 
         /// <summary>
-        /// Field groups
+        /// Gets or Sets FieldGroups
         /// </summary>
-        /// <value>Field groups</value>
         [DataMember(Name="FieldGroups", EmitDefaultValue=false)]
         public List<FieldGroup> FieldGroups { get; set; }
 
         /// <summary>
-        /// Setup instructions
+        /// Gets or Sets SetupInstructions
         /// </summary>
-        /// <value>Setup instructions</value>
         [DataMember(Name="SetupInstructions", EmitDefaultValue=false)]
         public string SetupInstructions { get; set; }
 
         /// <summary>
-        /// External setup link
+        /// Gets or Sets ExternalSetupLink
         /// </summary>
-        /// <value>External setup link</value>
         [DataMember(Name="ExternalSetupLink", EmitDefaultValue=false)]
         public string ExternalSetupLink { get; set; }
 
 
 
         /// <summary>
-        /// Support information
+        /// Gets or Sets Support
         /// </summary>
-        /// <value>Support information</value>
         [DataMember(Name="Support", EmitDefaultValue=false)]
         public AppStoreAppSupportInfo Support { get; set; }
 
         /// <summary>
-        /// Name
+        /// Gets or Sets ExternalFunctionActionUrl
+        /// </summary>
+        [DataMember(Name="ExternalFunctionActionUrl", EmitDefaultValue=false)]
+        public string ExternalFunctionActionUrl { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ExternalFunctionSignatureKey
+        /// </summary>
+        [DataMember(Name="ExternalFunctionSignatureKey", EmitDefaultValue=false)]
+        public string ExternalFunctionSignatureKey { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IsPaid
+        /// </summary>
+        [DataMember(Name="IsPaid", EmitDefaultValue=false)]
+        public bool? IsPaid { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Description
+        /// Gets or Sets Description
         /// </summary>
-        /// <value>Description</value>
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
         /// <summary>
-        /// Is application enabled
+        /// Gets or Sets IsEnabled
         /// </summary>
-        /// <value>Is application enabled</value>
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
 
 
         /// <summary>
-        /// Developer Name
+        /// Gets or Sets DeveloperName
         /// </summary>
-        /// <value>Developer Name</value>
         [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
         public string DeveloperName { get; set; }
 
@@ -622,6 +654,7 @@ public override string ToString()
             sb.Append("  VerificationStatus: ").Append(VerificationStatus).Append("\n");
             sb.Append("  Logo: ").Append(Logo).Append("\n");
             sb.Append("  OAuthAppId: ").Append(OAuthAppId).Append("\n");
+            sb.Append("  Internal: ").Append(Internal).Append("\n");
             sb.Append("  Details: ").Append(Details).Append("\n");
             sb.Append("  ConfigurationType: ").Append(ConfigurationType).Append("\n");
             sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
@@ -631,6 +664,9 @@ public override string ToString()
             sb.Append("  TeammateAppAccessLevel: ").Append(TeammateAppAccessLevel).Append("\n");
             sb.Append("  PermissionsType: ").Append(PermissionsType).Append("\n");
             sb.Append("  Support: ").Append(Support).Append("\n");
+            sb.Append("  ExternalFunctionActionUrl: ").Append(ExternalFunctionActionUrl).Append("\n");
+            sb.Append("  ExternalFunctionSignatureKey: ").Append(ExternalFunctionSignatureKey).Append("\n");
+            sb.Append("  IsPaid: ").Append(IsPaid).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
@@ -691,6 +727,11 @@ public bool Equals(AppStoreApp input)
                     (this.OAuthAppId != null &&
                     this.OAuthAppId.Equals(input.OAuthAppId))
                 ) && 
+                (
+                    this.Internal == input.Internal ||
+                    (this.Internal != null &&
+                    this.Internal.Equals(input.Internal))
+                ) && 
                 (
                     this.Details == input.Details ||
                     (this.Details != null &&
@@ -736,6 +777,21 @@ public bool Equals(AppStoreApp input)
                     (this.Support != null &&
                     this.Support.Equals(input.Support))
                 ) && 
+                (
+                    this.ExternalFunctionActionUrl == input.ExternalFunctionActionUrl ||
+                    (this.ExternalFunctionActionUrl != null &&
+                    this.ExternalFunctionActionUrl.Equals(input.ExternalFunctionActionUrl))
+                ) && 
+                (
+                    this.ExternalFunctionSignatureKey == input.ExternalFunctionSignatureKey ||
+                    (this.ExternalFunctionSignatureKey != null &&
+                    this.ExternalFunctionSignatureKey.Equals(input.ExternalFunctionSignatureKey))
+                ) && 
+                (
+                    this.IsPaid == input.IsPaid ||
+                    (this.IsPaid != null &&
+                    this.IsPaid.Equals(input.IsPaid))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -785,6 +841,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Logo.GetHashCode();
                 if (this.OAuthAppId != null)
                     hashCode = hashCode * 59 + this.OAuthAppId.GetHashCode();
+                if (this.Internal != null)
+                    hashCode = hashCode * 59 + this.Internal.GetHashCode();
                 if (this.Details != null)
                     hashCode = hashCode * 59 + this.Details.GetHashCode();
                 if (this.ConfigurationType != null)
@@ -803,6 +861,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.PermissionsType.GetHashCode();
                 if (this.Support != null)
                     hashCode = hashCode * 59 + this.Support.GetHashCode();
+                if (this.ExternalFunctionActionUrl != null)
+                    hashCode = hashCode * 59 + this.ExternalFunctionActionUrl.GetHashCode();
+                if (this.ExternalFunctionSignatureKey != null)
+                    hashCode = hashCode * 59 + this.ExternalFunctionSignatureKey.GetHashCode();
+                if (this.IsPaid != null)
+                    hashCode = hashCode * 59 + this.IsPaid.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Description != null)
@@ -818,16 +882,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppStoreAppConfiguration.cs b/src/Flipdish/Model/AppStoreAppConfiguration.cs
index bf8599b1..3d3c0c5c 100644
--- a/src/Flipdish/Model/AppStoreAppConfiguration.cs
+++ b/src/Flipdish/Model/AppStoreAppConfiguration.cs
@@ -12,28 +12,25 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// App store app configurations
+    /// AppStoreAppConfiguration
     /// </summary>
     [DataContract]
-    public partial class AppStoreAppConfiguration :  IEquatable<AppStoreAppConfiguration>, IValidatableObject
+    public partial class AppStoreAppConfiguration :  IEquatable<AppStoreAppConfiguration>
     {
         /// <summary>
-        /// Application verification status
+        /// Defines VerificationStatus
         /// </summary>
-        /// <value>Application verification status</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum VerificationStatusEnum
         {
@@ -58,15 +55,13 @@ public enum VerificationStatusEnum
         }
 
         /// <summary>
-        /// Application verification status
+        /// Gets or Sets VerificationStatus
         /// </summary>
-        /// <value>Application verification status</value>
         [DataMember(Name="VerificationStatus", EmitDefaultValue=false)]
         public VerificationStatusEnum VerificationStatus { get; set; }
         /// <summary>
-        /// Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;
+        /// Defines ConfigurationType
         /// </summary>
-        /// <value>Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum ConfigurationTypeEnum
         {
@@ -85,15 +80,13 @@ public enum ConfigurationTypeEnum
         }
 
         /// <summary>
-        /// Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;
+        /// Gets or Sets ConfigurationType
         /// </summary>
-        /// <value>Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;</value>
         [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
         public ConfigurationTypeEnum ConfigurationType { get; set; }
         /// <summary>
-        /// Store selector type
+        /// Defines StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StoreSelectorTypeEnum
         {
@@ -118,15 +111,13 @@ public enum StoreSelectorTypeEnum
         }
 
         /// <summary>
-        /// Store selector type
+        /// Gets or Sets StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
         public StoreSelectorTypeEnum StoreSelectorType { get; set; }
         /// <summary>
-        /// Teammate app access level
+        /// Defines TeammateAppAccessLevel
         /// </summary>
-        /// <value>Teammate app access level</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum TeammateAppAccessLevelEnum
         {
@@ -143,53 +134,69 @@ public enum TeammateAppAccessLevelEnum
             [EnumMember(Value = "StoreOwner")]
             StoreOwner = 2,
             
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 3,
+            
             /// <summary>
             /// Enum ManagedOwner for value: ManagedOwner
             /// </summary>
             [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 3,
+            ManagedOwner = 4,
             
             /// <summary>
             /// Enum Integrator for value: Integrator
             /// </summary>
             [EnumMember(Value = "Integrator")]
-            Integrator = 4,
+            Integrator = 5,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 6,
             
             /// <summary>
             /// Enum StoreManager for value: StoreManager
             /// </summary>
             [EnumMember(Value = "StoreManager")]
-            StoreManager = 5,
+            StoreManager = 7,
             
             /// <summary>
             /// Enum StoreStaff for value: StoreStaff
             /// </summary>
             [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 6,
+            StoreStaff = 8,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 9,
             
             /// <summary>
             /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
             /// </summary>
             [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 7,
+            StoreReadOnlyAccess = 10,
             
             /// <summary>
             /// Enum FinanceManger for value: FinanceManger
             /// </summary>
             [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 8
+            FinanceManger = 11
         }
 
         /// <summary>
-        /// Teammate app access level
+        /// Gets or Sets TeammateAppAccessLevel
         /// </summary>
-        /// <value>Teammate app access level</value>
         [DataMember(Name="TeammateAppAccessLevel", EmitDefaultValue=false)]
         public TeammateAppAccessLevelEnum? TeammateAppAccessLevel { get; set; }
         /// <summary>
-        /// Permissions type
+        /// Defines PermissionsType
         /// </summary>
-        /// <value>Permissions type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum PermissionsTypeEnum
         {
@@ -202,9 +209,8 @@ public enum PermissionsTypeEnum
         }
 
         /// <summary>
-        /// Permissions type
+        /// Gets or Sets PermissionsType
         /// </summary>
-        /// <value>Permissions type</value>
         [DataMember(Name="PermissionsType", EmitDefaultValue=false)]
         public PermissionsTypeEnum PermissionsType { get; set; }
         /// <summary>
@@ -259,9 +265,8 @@ public enum CategoriesEnum
 
 
         /// <summary>
-        /// Categories
+        /// Gets or Sets Categories
         /// </summary>
-        /// <value>Categories</value>
         [DataMember(Name="Categories", EmitDefaultValue=false)]
         public List<CategoriesEnum> Categories { get; set; }
         /// <summary>
@@ -376,9 +381,8 @@ public enum CountriesEnum
 
 
         /// <summary>
-        /// Countries
+        /// Gets or Sets Countries
         /// </summary>
-        /// <value>Countries</value>
         [DataMember(Name="Countries", EmitDefaultValue=false)]
         public List<CountriesEnum> Countries { get; set; }
         /// <summary>
@@ -389,30 +393,34 @@ protected AppStoreAppConfiguration() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreAppConfiguration" /> class.
         /// </summary>
-        /// <param name="id">Unique App store app configuration id (required).</param>
-        /// <param name="appId">App id (required).</param>
-        /// <param name="appStoreAppId">App store app id (required).</param>
-        /// <param name="isEnabled">Is enabled (required).</param>
-        /// <param name="storeIds">Stores id&#39;s.</param>
-        /// <param name="settings">Settings.</param>
-        /// <param name="verificationStatus">Application verification status (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="oAuthAppId">OAuth App identifier (required).</param>
-        /// <param name="details">Details (required).</param>
-        /// <param name="configurationType">Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt; (required).</param>
-        /// <param name="storeSelectorType">Store selector type (required).</param>
-        /// <param name="fieldGroups">Field groups.</param>
-        /// <param name="setupInstructions">Setup instructions.</param>
-        /// <param name="externalSetupLink">External setup link.</param>
-        /// <param name="teammateAppAccessLevel">Teammate app access level.</param>
-        /// <param name="permissionsType">Permissions type (required).</param>
-        /// <param name="support">Support information.</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="categories">Categories (required).</param>
-        /// <param name="countries">Countries (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppStoreAppConfiguration(string id = default(string), string appId = default(string), string appStoreAppId = default(string), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>), List<Setting> settings = default(List<Setting>), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), string logo = default(string), string oAuthAppId = default(string), string details = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), AppStoreAppSupportInfo support = default(AppStoreAppSupportInfo), string name = default(string), string description = default(string), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
+        /// <param name="id">id (required).</param>
+        /// <param name="appId">appId (required).</param>
+        /// <param name="appStoreAppId">appStoreAppId (required).</param>
+        /// <param name="isEnabled">isEnabled (required).</param>
+        /// <param name="storeIds">storeIds.</param>
+        /// <param name="settings">settings.</param>
+        /// <param name="verificationStatus">verificationStatus (required).</param>
+        /// <param name="logo">logo.</param>
+        /// <param name="oAuthAppId">oAuthAppId (required).</param>
+        /// <param name="_internal">_internal (required).</param>
+        /// <param name="details">details (required).</param>
+        /// <param name="configurationType">configurationType (required).</param>
+        /// <param name="storeSelectorType">storeSelectorType (required).</param>
+        /// <param name="fieldGroups">fieldGroups.</param>
+        /// <param name="setupInstructions">setupInstructions.</param>
+        /// <param name="externalSetupLink">externalSetupLink.</param>
+        /// <param name="teammateAppAccessLevel">teammateAppAccessLevel.</param>
+        /// <param name="permissionsType">permissionsType (required).</param>
+        /// <param name="support">support.</param>
+        /// <param name="externalFunctionActionUrl">externalFunctionActionUrl.</param>
+        /// <param name="externalFunctionSignatureKey">externalFunctionSignatureKey.</param>
+        /// <param name="isPaid">isPaid.</param>
+        /// <param name="name">name (required).</param>
+        /// <param name="description">description (required).</param>
+        /// <param name="categories">categories (required).</param>
+        /// <param name="countries">countries (required).</param>
+        /// <param name="developerName">developerName.</param>
+        public AppStoreAppConfiguration(string id = default(string), string appId = default(string), string appStoreAppId = default(string), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>), List<Setting> settings = default(List<Setting>), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), string logo = default(string), string oAuthAppId = default(string), bool? _internal = default(bool?), string details = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), AppStoreAppSupportInfo support = default(AppStoreAppSupportInfo), string externalFunctionActionUrl = default(string), string externalFunctionSignatureKey = default(string), bool? isPaid = default(bool?), string name = default(string), string description = default(string), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
         {
             // to ensure "id" is required (not null)
             if (id == null)
@@ -468,6 +476,15 @@ protected AppStoreAppConfiguration() { }
             {
                 this.OAuthAppId = oAuthAppId;
             }
+            // to ensure "_internal" is required (not null)
+            if (_internal == null)
+            {
+                throw new InvalidDataException("_internal is a required property for AppStoreAppConfiguration and cannot be null");
+            }
+            else
+            {
+                this.Internal = _internal;
+            }
             // to ensure "details" is required (not null)
             if (details == null)
             {
@@ -548,125 +565,136 @@ protected AppStoreAppConfiguration() { }
             this.ExternalSetupLink = externalSetupLink;
             this.TeammateAppAccessLevel = teammateAppAccessLevel;
             this.Support = support;
+            this.ExternalFunctionActionUrl = externalFunctionActionUrl;
+            this.ExternalFunctionSignatureKey = externalFunctionSignatureKey;
+            this.IsPaid = isPaid;
             this.DeveloperName = developerName;
         }
         
         /// <summary>
-        /// Unique App store app configuration id
+        /// Gets or Sets Id
         /// </summary>
-        /// <value>Unique App store app configuration id</value>
         [DataMember(Name="Id", EmitDefaultValue=false)]
         public string Id { get; set; }
 
         /// <summary>
-        /// App id
+        /// Gets or Sets AppId
         /// </summary>
-        /// <value>App id</value>
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
         /// <summary>
-        /// App store app id
+        /// Gets or Sets AppStoreAppId
         /// </summary>
-        /// <value>App store app id</value>
         [DataMember(Name="AppStoreAppId", EmitDefaultValue=false)]
         public string AppStoreAppId { get; set; }
 
         /// <summary>
-        /// Is enabled
+        /// Gets or Sets IsEnabled
         /// </summary>
-        /// <value>Is enabled</value>
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
         /// <summary>
-        /// Stores id&#39;s
+        /// Gets or Sets StoreIds
         /// </summary>
-        /// <value>Stores id&#39;s</value>
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
         /// <summary>
-        /// Settings
+        /// Gets or Sets Settings
         /// </summary>
-        /// <value>Settings</value>
         [DataMember(Name="Settings", EmitDefaultValue=false)]
         public List<Setting> Settings { get; set; }
 
 
         /// <summary>
-        /// Logo
+        /// Gets or Sets Logo
         /// </summary>
-        /// <value>Logo</value>
         [DataMember(Name="Logo", EmitDefaultValue=false)]
         public string Logo { get; set; }
 
         /// <summary>
-        /// OAuth App identifier
+        /// Gets or Sets OAuthAppId
         /// </summary>
-        /// <value>OAuth App identifier</value>
         [DataMember(Name="OAuthAppId", EmitDefaultValue=false)]
         public string OAuthAppId { get; set; }
 
         /// <summary>
-        /// Details
+        /// Gets or Sets Internal
+        /// </summary>
+        [DataMember(Name="Internal", EmitDefaultValue=false)]
+        public bool? Internal { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Details
         /// </summary>
-        /// <value>Details</value>
         [DataMember(Name="Details", EmitDefaultValue=false)]
         public string Details { get; set; }
 
 
 
         /// <summary>
-        /// Field groups
+        /// Gets or Sets FieldGroups
         /// </summary>
-        /// <value>Field groups</value>
         [DataMember(Name="FieldGroups", EmitDefaultValue=false)]
         public List<FieldGroup> FieldGroups { get; set; }
 
         /// <summary>
-        /// Setup instructions
+        /// Gets or Sets SetupInstructions
         /// </summary>
-        /// <value>Setup instructions</value>
         [DataMember(Name="SetupInstructions", EmitDefaultValue=false)]
         public string SetupInstructions { get; set; }
 
         /// <summary>
-        /// External setup link
+        /// Gets or Sets ExternalSetupLink
         /// </summary>
-        /// <value>External setup link</value>
         [DataMember(Name="ExternalSetupLink", EmitDefaultValue=false)]
         public string ExternalSetupLink { get; set; }
 
 
 
         /// <summary>
-        /// Support information
+        /// Gets or Sets Support
         /// </summary>
-        /// <value>Support information</value>
         [DataMember(Name="Support", EmitDefaultValue=false)]
         public AppStoreAppSupportInfo Support { get; set; }
 
         /// <summary>
-        /// Name
+        /// Gets or Sets ExternalFunctionActionUrl
+        /// </summary>
+        [DataMember(Name="ExternalFunctionActionUrl", EmitDefaultValue=false)]
+        public string ExternalFunctionActionUrl { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ExternalFunctionSignatureKey
+        /// </summary>
+        [DataMember(Name="ExternalFunctionSignatureKey", EmitDefaultValue=false)]
+        public string ExternalFunctionSignatureKey { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IsPaid
+        /// </summary>
+        [DataMember(Name="IsPaid", EmitDefaultValue=false)]
+        public bool? IsPaid { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Description
+        /// Gets or Sets Description
         /// </summary>
-        /// <value>Description</value>
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
 
 
         /// <summary>
-        /// Developer Name
+        /// Gets or Sets DeveloperName
         /// </summary>
-        /// <value>Developer Name</value>
         [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
         public string DeveloperName { get; set; }
 
@@ -687,6 +715,7 @@ public override string ToString()
             sb.Append("  VerificationStatus: ").Append(VerificationStatus).Append("\n");
             sb.Append("  Logo: ").Append(Logo).Append("\n");
             sb.Append("  OAuthAppId: ").Append(OAuthAppId).Append("\n");
+            sb.Append("  Internal: ").Append(Internal).Append("\n");
             sb.Append("  Details: ").Append(Details).Append("\n");
             sb.Append("  ConfigurationType: ").Append(ConfigurationType).Append("\n");
             sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
@@ -696,6 +725,9 @@ public override string ToString()
             sb.Append("  TeammateAppAccessLevel: ").Append(TeammateAppAccessLevel).Append("\n");
             sb.Append("  PermissionsType: ").Append(PermissionsType).Append("\n");
             sb.Append("  Support: ").Append(Support).Append("\n");
+            sb.Append("  ExternalFunctionActionUrl: ").Append(ExternalFunctionActionUrl).Append("\n");
+            sb.Append("  ExternalFunctionSignatureKey: ").Append(ExternalFunctionSignatureKey).Append("\n");
+            sb.Append("  IsPaid: ").Append(IsPaid).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  Categories: ").Append(Categories).Append("\n");
@@ -780,6 +812,11 @@ public bool Equals(AppStoreAppConfiguration input)
                     (this.OAuthAppId != null &&
                     this.OAuthAppId.Equals(input.OAuthAppId))
                 ) && 
+                (
+                    this.Internal == input.Internal ||
+                    (this.Internal != null &&
+                    this.Internal.Equals(input.Internal))
+                ) && 
                 (
                     this.Details == input.Details ||
                     (this.Details != null &&
@@ -825,6 +862,21 @@ public bool Equals(AppStoreAppConfiguration input)
                     (this.Support != null &&
                     this.Support.Equals(input.Support))
                 ) && 
+                (
+                    this.ExternalFunctionActionUrl == input.ExternalFunctionActionUrl ||
+                    (this.ExternalFunctionActionUrl != null &&
+                    this.ExternalFunctionActionUrl.Equals(input.ExternalFunctionActionUrl))
+                ) && 
+                (
+                    this.ExternalFunctionSignatureKey == input.ExternalFunctionSignatureKey ||
+                    (this.ExternalFunctionSignatureKey != null &&
+                    this.ExternalFunctionSignatureKey.Equals(input.ExternalFunctionSignatureKey))
+                ) && 
+                (
+                    this.IsPaid == input.IsPaid ||
+                    (this.IsPaid != null &&
+                    this.IsPaid.Equals(input.IsPaid))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -879,6 +931,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Logo.GetHashCode();
                 if (this.OAuthAppId != null)
                     hashCode = hashCode * 59 + this.OAuthAppId.GetHashCode();
+                if (this.Internal != null)
+                    hashCode = hashCode * 59 + this.Internal.GetHashCode();
                 if (this.Details != null)
                     hashCode = hashCode * 59 + this.Details.GetHashCode();
                 if (this.ConfigurationType != null)
@@ -897,6 +951,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.PermissionsType.GetHashCode();
                 if (this.Support != null)
                     hashCode = hashCode * 59 + this.Support.GetHashCode();
+                if (this.ExternalFunctionActionUrl != null)
+                    hashCode = hashCode * 59 + this.ExternalFunctionActionUrl.GetHashCode();
+                if (this.ExternalFunctionSignatureKey != null)
+                    hashCode = hashCode * 59 + this.ExternalFunctionSignatureKey.GetHashCode();
+                if (this.IsPaid != null)
+                    hashCode = hashCode * 59 + this.IsPaid.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Description != null)
@@ -910,16 +970,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppStoreAppConfigurationHeader.cs b/src/Flipdish/Model/AppStoreAppConfigurationHeader.cs
deleted file mode 100644
index eb37b734..00000000
--- a/src/Flipdish/Model/AppStoreAppConfigurationHeader.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// App store app configuration header information
-    /// </summary>
-    [DataContract]
-    public partial class AppStoreAppConfigurationHeader :  IEquatable<AppStoreAppConfigurationHeader>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppStoreAppConfigurationHeader" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected AppStoreAppConfigurationHeader() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppStoreAppConfigurationHeader" /> class.
-        /// </summary>
-        /// <param name="appStoreAppId">Unique App store app id (required).</param>
-        /// <param name="name">Name of Appstore app (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="developerName">Developer name.</param>
-        public AppStoreAppConfigurationHeader(string appStoreAppId = default(string), string name = default(string), string description = default(string), string logo = default(string), string developerName = default(string))
-        {
-            // to ensure "appStoreAppId" is required (not null)
-            if (appStoreAppId == null)
-            {
-                throw new InvalidDataException("appStoreAppId is a required property for AppStoreAppConfigurationHeader and cannot be null");
-            }
-            else
-            {
-                this.AppStoreAppId = appStoreAppId;
-            }
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for AppStoreAppConfigurationHeader and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            // to ensure "description" is required (not null)
-            if (description == null)
-            {
-                throw new InvalidDataException("description is a required property for AppStoreAppConfigurationHeader and cannot be null");
-            }
-            else
-            {
-                this.Description = description;
-            }
-            this.Logo = logo;
-            this.DeveloperName = developerName;
-        }
-        
-        /// <summary>
-        /// Unique App store app id
-        /// </summary>
-        /// <value>Unique App store app id</value>
-        [DataMember(Name="AppStoreAppId", EmitDefaultValue=false)]
-        public string AppStoreAppId { get; set; }
-
-        /// <summary>
-        /// Name of Appstore app
-        /// </summary>
-        /// <value>Name of Appstore app</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Logo
-        /// </summary>
-        /// <value>Logo</value>
-        [DataMember(Name="Logo", EmitDefaultValue=false)]
-        public string Logo { get; set; }
-
-        /// <summary>
-        /// Developer name
-        /// </summary>
-        /// <value>Developer name</value>
-        [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
-        public string DeveloperName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppStoreAppConfigurationHeader {\n");
-            sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Logo: ").Append(Logo).Append("\n");
-            sb.Append("  DeveloperName: ").Append(DeveloperName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppStoreAppConfigurationHeader);
-        }
-
-        /// <summary>
-        /// Returns true if AppStoreAppConfigurationHeader instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppStoreAppConfigurationHeader to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppStoreAppConfigurationHeader input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.AppStoreAppId == input.AppStoreAppId ||
-                    (this.AppStoreAppId != null &&
-                    this.AppStoreAppId.Equals(input.AppStoreAppId))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Logo == input.Logo ||
-                    (this.Logo != null &&
-                    this.Logo.Equals(input.Logo))
-                ) && 
-                (
-                    this.DeveloperName == input.DeveloperName ||
-                    (this.DeveloperName != null &&
-                    this.DeveloperName.Equals(input.DeveloperName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.AppStoreAppId != null)
-                    hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Logo != null)
-                    hashCode = hashCode * 59 + this.Logo.GetHashCode();
-                if (this.DeveloperName != null)
-                    hashCode = hashCode * 59 + this.DeveloperName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppStoreAppConfigurationSummary.cs b/src/Flipdish/Model/AppStoreAppConfigurationSummary.cs
index 87fe9f65..9d774115 100644
--- a/src/Flipdish/Model/AppStoreAppConfigurationSummary.cs
+++ b/src/Flipdish/Model/AppStoreAppConfigurationSummary.cs
@@ -12,28 +12,25 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// App store app configuration summary information
+    /// AppStoreAppConfigurationSummary
     /// </summary>
     [DataContract]
-    public partial class AppStoreAppConfigurationSummary :  IEquatable<AppStoreAppConfigurationSummary>, IValidatableObject
+    public partial class AppStoreAppConfigurationSummary :  IEquatable<AppStoreAppConfigurationSummary>
     {
         /// <summary>
-        /// Configuration type
+        /// Defines ConfigurationType
         /// </summary>
-        /// <value>Configuration type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum ConfigurationTypeEnum
         {
@@ -52,15 +49,13 @@ public enum ConfigurationTypeEnum
         }
 
         /// <summary>
-        /// Configuration type
+        /// Gets or Sets ConfigurationType
         /// </summary>
-        /// <value>Configuration type</value>
         [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
-        public ConfigurationTypeEnum? ConfigurationType { get; set; }
+        public ConfigurationTypeEnum ConfigurationType { get; set; }
         /// <summary>
-        /// Store selector type
+        /// Defines StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StoreSelectorTypeEnum
         {
@@ -85,11 +80,10 @@ public enum StoreSelectorTypeEnum
         }
 
         /// <summary>
-        /// Store selector type
+        /// Gets or Sets StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
-        public StoreSelectorTypeEnum? StoreSelectorType { get; set; }
+        public StoreSelectorTypeEnum StoreSelectorType { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreAppConfigurationSummary" /> class.
         /// </summary>
@@ -98,18 +92,19 @@ protected AppStoreAppConfigurationSummary() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreAppConfigurationSummary" /> class.
         /// </summary>
-        /// <param name="id">Unique App store app configuration id (required).</param>
-        /// <param name="appId">App Id (required).</param>
-        /// <param name="isEnabled">Is enabled (required).</param>
-        /// <param name="stores">List of stores (required).</param>
-        /// <param name="configurationType">Configuration type.</param>
-        /// <param name="storeSelectorType">Store selector type.</param>
-        /// <param name="appStoreAppId">Unique App store app id (required).</param>
-        /// <param name="name">Name of Appstore app (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="developerName">Developer name.</param>
-        public AppStoreAppConfigurationSummary(string id = default(string), string appId = default(string), bool? isEnabled = default(bool?), List<ConfiguredStore> stores = default(List<ConfiguredStore>), ConfigurationTypeEnum? configurationType = default(ConfigurationTypeEnum?), StoreSelectorTypeEnum? storeSelectorType = default(StoreSelectorTypeEnum?), string appStoreAppId = default(string), string name = default(string), string description = default(string), string logo = default(string), string developerName = default(string))
+        /// <param name="id">id (required).</param>
+        /// <param name="appId">appId (required).</param>
+        /// <param name="isEnabled">isEnabled (required).</param>
+        /// <param name="stores">stores (required).</param>
+        /// <param name="configurationType">configurationType (required).</param>
+        /// <param name="storeSelectorType">storeSelectorType (required).</param>
+        /// <param name="_internal">_internal (required).</param>
+        /// <param name="appStoreAppId">appStoreAppId (required).</param>
+        /// <param name="name">name (required).</param>
+        /// <param name="description">description (required).</param>
+        /// <param name="logo">logo.</param>
+        /// <param name="developerName">developerName.</param>
+        public AppStoreAppConfigurationSummary(string id = default(string), string appId = default(string), bool? isEnabled = default(bool?), List<ConfiguredStore> stores = default(List<ConfiguredStore>), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), bool? _internal = default(bool?), string appStoreAppId = default(string), string name = default(string), string description = default(string), string logo = default(string), string developerName = default(string))
         {
             // to ensure "id" is required (not null)
             if (id == null)
@@ -147,6 +142,33 @@ protected AppStoreAppConfigurationSummary() { }
             {
                 this.Stores = stores;
             }
+            // to ensure "configurationType" is required (not null)
+            if (configurationType == null)
+            {
+                throw new InvalidDataException("configurationType is a required property for AppStoreAppConfigurationSummary and cannot be null");
+            }
+            else
+            {
+                this.ConfigurationType = configurationType;
+            }
+            // to ensure "storeSelectorType" is required (not null)
+            if (storeSelectorType == null)
+            {
+                throw new InvalidDataException("storeSelectorType is a required property for AppStoreAppConfigurationSummary and cannot be null");
+            }
+            else
+            {
+                this.StoreSelectorType = storeSelectorType;
+            }
+            // to ensure "_internal" is required (not null)
+            if (_internal == null)
+            {
+                throw new InvalidDataException("_internal is a required property for AppStoreAppConfigurationSummary and cannot be null");
+            }
+            else
+            {
+                this.Internal = _internal;
+            }
             // to ensure "appStoreAppId" is required (not null)
             if (appStoreAppId == null)
             {
@@ -174,74 +196,69 @@ protected AppStoreAppConfigurationSummary() { }
             {
                 this.Description = description;
             }
-            this.ConfigurationType = configurationType;
-            this.StoreSelectorType = storeSelectorType;
             this.Logo = logo;
             this.DeveloperName = developerName;
         }
         
         /// <summary>
-        /// Unique App store app configuration id
+        /// Gets or Sets Id
         /// </summary>
-        /// <value>Unique App store app configuration id</value>
         [DataMember(Name="Id", EmitDefaultValue=false)]
         public string Id { get; set; }
 
         /// <summary>
-        /// App Id
+        /// Gets or Sets AppId
         /// </summary>
-        /// <value>App Id</value>
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
         /// <summary>
-        /// Is enabled
+        /// Gets or Sets IsEnabled
         /// </summary>
-        /// <value>Is enabled</value>
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
         /// <summary>
-        /// List of stores
+        /// Gets or Sets Stores
         /// </summary>
-        /// <value>List of stores</value>
         [DataMember(Name="Stores", EmitDefaultValue=false)]
         public List<ConfiguredStore> Stores { get; set; }
 
 
 
         /// <summary>
-        /// Unique App store app id
+        /// Gets or Sets Internal
+        /// </summary>
+        [DataMember(Name="Internal", EmitDefaultValue=false)]
+        public bool? Internal { get; set; }
+
+        /// <summary>
+        /// Gets or Sets AppStoreAppId
         /// </summary>
-        /// <value>Unique App store app id</value>
         [DataMember(Name="AppStoreAppId", EmitDefaultValue=false)]
         public string AppStoreAppId { get; set; }
 
         /// <summary>
-        /// Name of Appstore app
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name of Appstore app</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Description
+        /// Gets or Sets Description
         /// </summary>
-        /// <value>Description</value>
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
         /// <summary>
-        /// Logo
+        /// Gets or Sets Logo
         /// </summary>
-        /// <value>Logo</value>
         [DataMember(Name="Logo", EmitDefaultValue=false)]
         public string Logo { get; set; }
 
         /// <summary>
-        /// Developer name
+        /// Gets or Sets DeveloperName
         /// </summary>
-        /// <value>Developer name</value>
         [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
         public string DeveloperName { get; set; }
 
@@ -259,6 +276,7 @@ public override string ToString()
             sb.Append("  Stores: ").Append(Stores).Append("\n");
             sb.Append("  ConfigurationType: ").Append(ConfigurationType).Append("\n");
             sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
+            sb.Append("  Internal: ").Append(Internal).Append("\n");
             sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
@@ -328,6 +346,11 @@ public bool Equals(AppStoreAppConfigurationSummary input)
                     (this.StoreSelectorType != null &&
                     this.StoreSelectorType.Equals(input.StoreSelectorType))
                 ) && 
+                (
+                    this.Internal == input.Internal ||
+                    (this.Internal != null &&
+                    this.Internal.Equals(input.Internal))
+                ) && 
                 (
                     this.AppStoreAppId == input.AppStoreAppId ||
                     (this.AppStoreAppId != null &&
@@ -376,6 +399,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ConfigurationType.GetHashCode();
                 if (this.StoreSelectorType != null)
                     hashCode = hashCode * 59 + this.StoreSelectorType.GetHashCode();
+                if (this.Internal != null)
+                    hashCode = hashCode * 59 + this.Internal.GetHashCode();
                 if (this.AppStoreAppId != null)
                     hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
                 if (this.Name != null)
@@ -389,16 +414,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppStoreAppEntitlements.cs b/src/Flipdish/Model/AppStoreAppEntitlements.cs
new file mode 100644
index 00000000..ea37a9ac
--- /dev/null
+++ b/src/Flipdish/Model/AppStoreAppEntitlements.cs
@@ -0,0 +1,128 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// AppStoreAppEntitlements
+    /// </summary>
+    [DataContract]
+    public partial class AppStoreAppEntitlements :  IEquatable<AppStoreAppEntitlements>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppStoreAppEntitlements" /> class.
+        /// </summary>
+        /// <param name="entitlementQuantity">entitlementQuantity.</param>
+        /// <param name="currentUsage">currentUsage.</param>
+        public AppStoreAppEntitlements(int? entitlementQuantity = default(int?), int? currentUsage = default(int?))
+        {
+            this.EntitlementQuantity = entitlementQuantity;
+            this.CurrentUsage = currentUsage;
+        }
+        
+        /// <summary>
+        /// Gets or Sets EntitlementQuantity
+        /// </summary>
+        [DataMember(Name="EntitlementQuantity", EmitDefaultValue=false)]
+        public int? EntitlementQuantity { get; set; }
+
+        /// <summary>
+        /// Gets or Sets CurrentUsage
+        /// </summary>
+        [DataMember(Name="CurrentUsage", EmitDefaultValue=false)]
+        public int? CurrentUsage { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AppStoreAppEntitlements {\n");
+            sb.Append("  EntitlementQuantity: ").Append(EntitlementQuantity).Append("\n");
+            sb.Append("  CurrentUsage: ").Append(CurrentUsage).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AppStoreAppEntitlements);
+        }
+
+        /// <summary>
+        /// Returns true if AppStoreAppEntitlements instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AppStoreAppEntitlements to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AppStoreAppEntitlements input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EntitlementQuantity == input.EntitlementQuantity ||
+                    (this.EntitlementQuantity != null &&
+                    this.EntitlementQuantity.Equals(input.EntitlementQuantity))
+                ) && 
+                (
+                    this.CurrentUsage == input.CurrentUsage ||
+                    (this.CurrentUsage != null &&
+                    this.CurrentUsage.Equals(input.CurrentUsage))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EntitlementQuantity != null)
+                    hashCode = hashCode * 59 + this.EntitlementQuantity.GetHashCode();
+                if (this.CurrentUsage != null)
+                    hashCode = hashCode * 59 + this.CurrentUsage.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AppStoreAppSummary.cs b/src/Flipdish/Model/AppStoreAppSummary.cs
index d384ce6c..d2771060 100644
--- a/src/Flipdish/Model/AppStoreAppSummary.cs
+++ b/src/Flipdish/Model/AppStoreAppSummary.cs
@@ -12,28 +12,25 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// App store app summary information
+    /// AppStoreAppSummary
     /// </summary>
     [DataContract]
-    public partial class AppStoreAppSummary :  IEquatable<AppStoreAppSummary>, IValidatableObject
+    public partial class AppStoreAppSummary :  IEquatable<AppStoreAppSummary>
     {
         /// <summary>
-        /// Application verification status
+        /// Defines VerificationStatus
         /// </summary>
-        /// <value>Application verification status</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum VerificationStatusEnum
         {
@@ -58,9 +55,8 @@ public enum VerificationStatusEnum
         }
 
         /// <summary>
-        /// Application verification status
+        /// Gets or Sets VerificationStatus
         /// </summary>
-        /// <value>Application verification status</value>
         [DataMember(Name="VerificationStatus", EmitDefaultValue=false)]
         public VerificationStatusEnum VerificationStatus { get; set; }
         /// <summary>
@@ -115,9 +111,8 @@ public enum CategoriesEnum
 
 
         /// <summary>
-        /// Categories
+        /// Gets or Sets Categories
         /// </summary>
-        /// <value>Categories</value>
         [DataMember(Name="Categories", EmitDefaultValue=false)]
         public List<CategoriesEnum> Categories { get; set; }
         /// <summary>
@@ -232,9 +227,8 @@ public enum CountriesEnum
 
 
         /// <summary>
-        /// Countries
+        /// Gets or Sets Countries
         /// </summary>
-        /// <value>Countries</value>
         [DataMember(Name="Countries", EmitDefaultValue=false)]
         public List<CountriesEnum> Countries { get; set; }
         /// <summary>
@@ -245,17 +239,27 @@ protected AppStoreAppSummary() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreAppSummary" /> class.
         /// </summary>
-        /// <param name="id">Unique App store app id.</param>
-        /// <param name="verificationStatus">Application verification status (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="isEnabled">Is application enabled.</param>
-        /// <param name="categories">Categories (required).</param>
-        /// <param name="countries">Countries (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppStoreAppSummary(string id = default(string), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), string logo = default(string), string name = default(string), string description = default(string), bool? isEnabled = default(bool?), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
+        /// <param name="id">id (required).</param>
+        /// <param name="verificationStatus">verificationStatus (required).</param>
+        /// <param name="logo">logo.</param>
+        /// <param name="_internal">_internal (required).</param>
+        /// <param name="name">name (required).</param>
+        /// <param name="description">description (required).</param>
+        /// <param name="isEnabled">isEnabled.</param>
+        /// <param name="categories">categories (required).</param>
+        /// <param name="countries">countries (required).</param>
+        /// <param name="developerName">developerName.</param>
+        public AppStoreAppSummary(string id = default(string), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), string logo = default(string), bool? _internal = default(bool?), string name = default(string), string description = default(string), bool? isEnabled = default(bool?), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
         {
+            // to ensure "id" is required (not null)
+            if (id == null)
+            {
+                throw new InvalidDataException("id is a required property for AppStoreAppSummary and cannot be null");
+            }
+            else
+            {
+                this.Id = id;
+            }
             // to ensure "verificationStatus" is required (not null)
             if (verificationStatus == null)
             {
@@ -265,6 +269,15 @@ protected AppStoreAppSummary() { }
             {
                 this.VerificationStatus = verificationStatus;
             }
+            // to ensure "_internal" is required (not null)
+            if (_internal == null)
+            {
+                throw new InvalidDataException("_internal is a required property for AppStoreAppSummary and cannot be null");
+            }
+            else
+            {
+                this.Internal = _internal;
+            }
             // to ensure "name" is required (not null)
             if (name == null)
             {
@@ -301,54 +314,53 @@ protected AppStoreAppSummary() { }
             {
                 this.Countries = countries;
             }
-            this.Id = id;
             this.Logo = logo;
             this.IsEnabled = isEnabled;
             this.DeveloperName = developerName;
         }
         
         /// <summary>
-        /// Unique App store app id
+        /// Gets or Sets Id
         /// </summary>
-        /// <value>Unique App store app id</value>
         [DataMember(Name="Id", EmitDefaultValue=false)]
         public string Id { get; set; }
 
 
         /// <summary>
-        /// Logo
+        /// Gets or Sets Logo
         /// </summary>
-        /// <value>Logo</value>
         [DataMember(Name="Logo", EmitDefaultValue=false)]
         public string Logo { get; set; }
 
         /// <summary>
-        /// Name
+        /// Gets or Sets Internal
+        /// </summary>
+        [DataMember(Name="Internal", EmitDefaultValue=false)]
+        public bool? Internal { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Description
+        /// Gets or Sets Description
         /// </summary>
-        /// <value>Description</value>
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
         /// <summary>
-        /// Is application enabled
+        /// Gets or Sets IsEnabled
         /// </summary>
-        /// <value>Is application enabled</value>
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
 
 
         /// <summary>
-        /// Developer Name
+        /// Gets or Sets DeveloperName
         /// </summary>
-        /// <value>Developer Name</value>
         [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
         public string DeveloperName { get; set; }
 
@@ -363,6 +375,7 @@ public override string ToString()
             sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  VerificationStatus: ").Append(VerificationStatus).Append("\n");
             sb.Append("  Logo: ").Append(Logo).Append("\n");
+            sb.Append("  Internal: ").Append(Internal).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
@@ -418,6 +431,11 @@ public bool Equals(AppStoreAppSummary input)
                     (this.Logo != null &&
                     this.Logo.Equals(input.Logo))
                 ) && 
+                (
+                    this.Internal == input.Internal ||
+                    (this.Internal != null &&
+                    this.Internal.Equals(input.Internal))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -465,6 +483,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.VerificationStatus.GetHashCode();
                 if (this.Logo != null)
                     hashCode = hashCode * 59 + this.Logo.GetHashCode();
+                if (this.Internal != null)
+                    hashCode = hashCode * 59 + this.Internal.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Description != null)
@@ -480,16 +500,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppStoreAppSupportInfo.cs b/src/Flipdish/Model/AppStoreAppSupportInfo.cs
index 8236ebd3..9e43c588 100644
--- a/src/Flipdish/Model/AppStoreAppSupportInfo.cs
+++ b/src/Flipdish/Model/AppStoreAppSupportInfo.cs
@@ -12,33 +12,31 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// App store app support information
+    /// AppStoreAppSupportInfo
     /// </summary>
     [DataContract]
-    public partial class AppStoreAppSupportInfo :  IEquatable<AppStoreAppSupportInfo>, IValidatableObject
+    public partial class AppStoreAppSupportInfo :  IEquatable<AppStoreAppSupportInfo>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreAppSupportInfo" /> class.
         /// </summary>
-        /// <param name="privacyPolicy">Privacy policy url.</param>
-        /// <param name="termsOfUse">Terms of use url.</param>
-        /// <param name="companyWebsite">Company website url.</param>
-        /// <param name="learnMore">Learn more url.</param>
-        /// <param name="installationMessage">Installation message.</param>
-        /// <param name="supportEmail">Support email.</param>
+        /// <param name="privacyPolicy">privacyPolicy.</param>
+        /// <param name="termsOfUse">termsOfUse.</param>
+        /// <param name="companyWebsite">companyWebsite.</param>
+        /// <param name="learnMore">learnMore.</param>
+        /// <param name="installationMessage">installationMessage.</param>
+        /// <param name="supportEmail">supportEmail.</param>
         public AppStoreAppSupportInfo(string privacyPolicy = default(string), string termsOfUse = default(string), string companyWebsite = default(string), string learnMore = default(string), string installationMessage = default(string), string supportEmail = default(string))
         {
             this.PrivacyPolicy = privacyPolicy;
@@ -50,44 +48,38 @@ public partial class AppStoreAppSupportInfo :  IEquatable<AppStoreAppSupportInfo
         }
         
         /// <summary>
-        /// Privacy policy url
+        /// Gets or Sets PrivacyPolicy
         /// </summary>
-        /// <value>Privacy policy url</value>
         [DataMember(Name="PrivacyPolicy", EmitDefaultValue=false)]
         public string PrivacyPolicy { get; set; }
 
         /// <summary>
-        /// Terms of use url
+        /// Gets or Sets TermsOfUse
         /// </summary>
-        /// <value>Terms of use url</value>
         [DataMember(Name="TermsOfUse", EmitDefaultValue=false)]
         public string TermsOfUse { get; set; }
 
         /// <summary>
-        /// Company website url
+        /// Gets or Sets CompanyWebsite
         /// </summary>
-        /// <value>Company website url</value>
         [DataMember(Name="CompanyWebsite", EmitDefaultValue=false)]
         public string CompanyWebsite { get; set; }
 
         /// <summary>
-        /// Learn more url
+        /// Gets or Sets LearnMore
         /// </summary>
-        /// <value>Learn more url</value>
         [DataMember(Name="LearnMore", EmitDefaultValue=false)]
         public string LearnMore { get; set; }
 
         /// <summary>
-        /// Installation message
+        /// Gets or Sets InstallationMessage
         /// </summary>
-        /// <value>Installation message</value>
         [DataMember(Name="InstallationMessage", EmitDefaultValue=false)]
         public string InstallationMessage { get; set; }
 
         /// <summary>
-        /// Support email
+        /// Gets or Sets SupportEmail
         /// </summary>
-        /// <value>Support email</value>
         [DataMember(Name="SupportEmail", EmitDefaultValue=false)]
         public string SupportEmail { get; set; }
 
@@ -195,16 +187,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppStoreConfigCreatedEvent.cs b/src/Flipdish/Model/AppStoreConfigCreatedEvent.cs
index d04e6313..7b4d2192 100644
--- a/src/Flipdish/Model/AppStoreConfigCreatedEvent.cs
+++ b/src/Flipdish/Model/AppStoreConfigCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// AppStore Config Created event
     /// </summary>
     [DataContract]
-    public partial class AppStoreConfigCreatedEvent :  IEquatable<AppStoreConfigCreatedEvent>, IValidatableObject
+    public partial class AppStoreConfigCreatedEvent :  IEquatable<AppStoreConfigCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreConfigCreatedEvent" /> class.
@@ -36,21 +34,29 @@ public partial class AppStoreConfigCreatedEvent :  IEquatable<AppStoreConfigCrea
         /// <param name="eventName">The event name.</param>
         /// <param name="appStoreAppId">App Store App Id.</param>
         /// <param name="appStoreAppConfigurationId">App Store Configuration Id.</param>
+        /// <param name="user">User who has created the configuration.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public AppStoreConfigCreatedEvent(string eventName = default(string), string appStoreAppId = default(string), string appStoreAppConfigurationId = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public AppStoreConfigCreatedEvent(string eventName = default(string), string appStoreAppId = default(string), string appStoreAppConfigurationId = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.AppStoreAppId = appStoreAppId;
             this.AppStoreAppConfigurationId = appStoreAppConfigurationId;
+            this.User = user;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -74,6 +80,13 @@ public partial class AppStoreConfigCreatedEvent :  IEquatable<AppStoreConfigCrea
         [DataMember(Name="AppStoreAppConfigurationId", EmitDefaultValue=false)]
         public string AppStoreAppConfigurationId { get; set; }
 
+        /// <summary>
+        /// User who has created the configuration
+        /// </summary>
+        /// <value>User who has created the configuration</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// The identitfier of the event
         /// </summary>
@@ -102,6 +115,13 @@ public partial class AppStoreConfigCreatedEvent :  IEquatable<AppStoreConfigCrea
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +129,20 @@ public partial class AppStoreConfigCreatedEvent :  IEquatable<AppStoreConfigCrea
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -120,11 +154,15 @@ public override string ToString()
             sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
             sb.Append("  AppStoreAppConfigurationId: ").Append(AppStoreAppConfigurationId).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,6 +212,11 @@ public bool Equals(AppStoreConfigCreatedEvent input)
                     (this.AppStoreAppConfigurationId != null &&
                     this.AppStoreAppConfigurationId.Equals(input.AppStoreAppConfigurationId))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.FlipdishEventId == input.FlipdishEventId ||
                     (this.FlipdishEventId != null &&
@@ -194,10 +237,25 @@ public bool Equals(AppStoreConfigCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -216,6 +274,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
                 if (this.AppStoreAppConfigurationId != null)
                     hashCode = hashCode * 59 + this.AppStoreAppConfigurationId.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.FlipdishEventId != null)
                     hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
                 if (this.CreateTime != null)
@@ -224,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppStoreConfigDeletedEvent.cs b/src/Flipdish/Model/AppStoreConfigDeletedEvent.cs
index 24ba24c1..e29d5288 100644
--- a/src/Flipdish/Model/AppStoreConfigDeletedEvent.cs
+++ b/src/Flipdish/Model/AppStoreConfigDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// AppStore Config Deleted event
     /// </summary>
     [DataContract]
-    public partial class AppStoreConfigDeletedEvent :  IEquatable<AppStoreConfigDeletedEvent>, IValidatableObject
+    public partial class AppStoreConfigDeletedEvent :  IEquatable<AppStoreConfigDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreConfigDeletedEvent" /> class.
@@ -36,21 +34,29 @@ public partial class AppStoreConfigDeletedEvent :  IEquatable<AppStoreConfigDele
         /// <param name="eventName">The event name.</param>
         /// <param name="appStoreAppId">App Store Id.</param>
         /// <param name="appStoreAppConfigurationId">App Store Configuration Id.</param>
+        /// <param name="user">User who has deleted the configuration.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public AppStoreConfigDeletedEvent(string eventName = default(string), string appStoreAppId = default(string), string appStoreAppConfigurationId = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public AppStoreConfigDeletedEvent(string eventName = default(string), string appStoreAppId = default(string), string appStoreAppConfigurationId = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.AppStoreAppId = appStoreAppId;
             this.AppStoreAppConfigurationId = appStoreAppConfigurationId;
+            this.User = user;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -74,6 +80,13 @@ public partial class AppStoreConfigDeletedEvent :  IEquatable<AppStoreConfigDele
         [DataMember(Name="AppStoreAppConfigurationId", EmitDefaultValue=false)]
         public string AppStoreAppConfigurationId { get; set; }
 
+        /// <summary>
+        /// User who has deleted the configuration
+        /// </summary>
+        /// <value>User who has deleted the configuration</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// The identitfier of the event
         /// </summary>
@@ -102,6 +115,13 @@ public partial class AppStoreConfigDeletedEvent :  IEquatable<AppStoreConfigDele
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +129,20 @@ public partial class AppStoreConfigDeletedEvent :  IEquatable<AppStoreConfigDele
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -120,11 +154,15 @@ public override string ToString()
             sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
             sb.Append("  AppStoreAppConfigurationId: ").Append(AppStoreAppConfigurationId).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,6 +212,11 @@ public bool Equals(AppStoreConfigDeletedEvent input)
                     (this.AppStoreAppConfigurationId != null &&
                     this.AppStoreAppConfigurationId.Equals(input.AppStoreAppConfigurationId))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.FlipdishEventId == input.FlipdishEventId ||
                     (this.FlipdishEventId != null &&
@@ -194,10 +237,25 @@ public bool Equals(AppStoreConfigDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -216,6 +274,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
                 if (this.AppStoreAppConfigurationId != null)
                     hashCode = hashCode * 59 + this.AppStoreAppConfigurationId.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.FlipdishEventId != null)
                     hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
                 if (this.CreateTime != null)
@@ -224,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppStoreConfigModel.cs b/src/Flipdish/Model/AppStoreConfigModel.cs
new file mode 100644
index 00000000..076512b0
--- /dev/null
+++ b/src/Flipdish/Model/AppStoreConfigModel.cs
@@ -0,0 +1,351 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// App Store configuration model
+    /// </summary>
+    [DataContract]
+    public partial class AppStoreConfigModel :  IEquatable<AppStoreConfigModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppStoreConfigModel" /> class.
+        /// </summary>
+        /// <param name="whiteLabelId">White label ID.</param>
+        /// <param name="readyToPublishToAppStore">Ready to publish to app store.</param>
+        /// <param name="appStoreName">App store name.</param>
+        /// <param name="appStoreAppleId">App Store Apple ID.</param>
+        /// <param name="appStoreUrl">App Store URL.</param>
+        /// <param name="appStoreId">App Store ID.</param>
+        /// <param name="appStorePassword">App Store password.</param>
+        /// <param name="teamId">Team ID.</param>
+        /// <param name="appGroupId">App Group ID.</param>
+        /// <param name="bundleId">Bundle ID.</param>
+        /// <param name="appStoreSigningIdentity">App Store signing identity.</param>
+        /// <param name="appStoreToken">App Store token.</param>
+        /// <param name="appStoreMerchantId">App Store merchant ID.</param>
+        /// <param name="p8PrivateKey">P8 private key.</param>
+        /// <param name="p8PrivateKeyId">P8 private key ID.</param>
+        public AppStoreConfigModel(int? whiteLabelId = default(int?), bool? readyToPublishToAppStore = default(bool?), string appStoreName = default(string), string appStoreAppleId = default(string), string appStoreUrl = default(string), string appStoreId = default(string), string appStorePassword = default(string), string teamId = default(string), string appGroupId = default(string), string bundleId = default(string), string appStoreSigningIdentity = default(string), string appStoreToken = default(string), string appStoreMerchantId = default(string), string p8PrivateKey = default(string), string p8PrivateKeyId = default(string))
+        {
+            this.WhiteLabelId = whiteLabelId;
+            this.ReadyToPublishToAppStore = readyToPublishToAppStore;
+            this.AppStoreName = appStoreName;
+            this.AppStoreAppleId = appStoreAppleId;
+            this.AppStoreUrl = appStoreUrl;
+            this.AppStoreId = appStoreId;
+            this.AppStorePassword = appStorePassword;
+            this.TeamId = teamId;
+            this.AppGroupId = appGroupId;
+            this.BundleId = bundleId;
+            this.AppStoreSigningIdentity = appStoreSigningIdentity;
+            this.AppStoreToken = appStoreToken;
+            this.AppStoreMerchantId = appStoreMerchantId;
+            this.P8PrivateKey = p8PrivateKey;
+            this.P8PrivateKeyId = p8PrivateKeyId;
+        }
+        
+        /// <summary>
+        /// White label ID
+        /// </summary>
+        /// <value>White label ID</value>
+        [DataMember(Name="WhiteLabelId", EmitDefaultValue=false)]
+        public int? WhiteLabelId { get; set; }
+
+        /// <summary>
+        /// Ready to publish to app store
+        /// </summary>
+        /// <value>Ready to publish to app store</value>
+        [DataMember(Name="ReadyToPublishToAppStore", EmitDefaultValue=false)]
+        public bool? ReadyToPublishToAppStore { get; set; }
+
+        /// <summary>
+        /// App store name
+        /// </summary>
+        /// <value>App store name</value>
+        [DataMember(Name="AppStoreName", EmitDefaultValue=false)]
+        public string AppStoreName { get; set; }
+
+        /// <summary>
+        /// App Store Apple ID
+        /// </summary>
+        /// <value>App Store Apple ID</value>
+        [DataMember(Name="AppStoreAppleId", EmitDefaultValue=false)]
+        public string AppStoreAppleId { get; set; }
+
+        /// <summary>
+        /// App Store URL
+        /// </summary>
+        /// <value>App Store URL</value>
+        [DataMember(Name="AppStoreUrl", EmitDefaultValue=false)]
+        public string AppStoreUrl { get; set; }
+
+        /// <summary>
+        /// App Store ID
+        /// </summary>
+        /// <value>App Store ID</value>
+        [DataMember(Name="AppStoreId", EmitDefaultValue=false)]
+        public string AppStoreId { get; set; }
+
+        /// <summary>
+        /// App Store password
+        /// </summary>
+        /// <value>App Store password</value>
+        [DataMember(Name="AppStorePassword", EmitDefaultValue=false)]
+        public string AppStorePassword { get; set; }
+
+        /// <summary>
+        /// Team ID
+        /// </summary>
+        /// <value>Team ID</value>
+        [DataMember(Name="TeamId", EmitDefaultValue=false)]
+        public string TeamId { get; set; }
+
+        /// <summary>
+        /// App Group ID
+        /// </summary>
+        /// <value>App Group ID</value>
+        [DataMember(Name="AppGroupId", EmitDefaultValue=false)]
+        public string AppGroupId { get; set; }
+
+        /// <summary>
+        /// Bundle ID
+        /// </summary>
+        /// <value>Bundle ID</value>
+        [DataMember(Name="BundleId", EmitDefaultValue=false)]
+        public string BundleId { get; set; }
+
+        /// <summary>
+        /// App Store signing identity
+        /// </summary>
+        /// <value>App Store signing identity</value>
+        [DataMember(Name="AppStoreSigningIdentity", EmitDefaultValue=false)]
+        public string AppStoreSigningIdentity { get; set; }
+
+        /// <summary>
+        /// App Store token
+        /// </summary>
+        /// <value>App Store token</value>
+        [DataMember(Name="AppStoreToken", EmitDefaultValue=false)]
+        public string AppStoreToken { get; set; }
+
+        /// <summary>
+        /// App Store merchant ID
+        /// </summary>
+        /// <value>App Store merchant ID</value>
+        [DataMember(Name="AppStoreMerchantId", EmitDefaultValue=false)]
+        public string AppStoreMerchantId { get; set; }
+
+        /// <summary>
+        /// P8 private key
+        /// </summary>
+        /// <value>P8 private key</value>
+        [DataMember(Name="P8PrivateKey", EmitDefaultValue=false)]
+        public string P8PrivateKey { get; set; }
+
+        /// <summary>
+        /// P8 private key ID
+        /// </summary>
+        /// <value>P8 private key ID</value>
+        [DataMember(Name="P8PrivateKeyId", EmitDefaultValue=false)]
+        public string P8PrivateKeyId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AppStoreConfigModel {\n");
+            sb.Append("  WhiteLabelId: ").Append(WhiteLabelId).Append("\n");
+            sb.Append("  ReadyToPublishToAppStore: ").Append(ReadyToPublishToAppStore).Append("\n");
+            sb.Append("  AppStoreName: ").Append(AppStoreName).Append("\n");
+            sb.Append("  AppStoreAppleId: ").Append(AppStoreAppleId).Append("\n");
+            sb.Append("  AppStoreUrl: ").Append(AppStoreUrl).Append("\n");
+            sb.Append("  AppStoreId: ").Append(AppStoreId).Append("\n");
+            sb.Append("  AppStorePassword: ").Append(AppStorePassword).Append("\n");
+            sb.Append("  TeamId: ").Append(TeamId).Append("\n");
+            sb.Append("  AppGroupId: ").Append(AppGroupId).Append("\n");
+            sb.Append("  BundleId: ").Append(BundleId).Append("\n");
+            sb.Append("  AppStoreSigningIdentity: ").Append(AppStoreSigningIdentity).Append("\n");
+            sb.Append("  AppStoreToken: ").Append(AppStoreToken).Append("\n");
+            sb.Append("  AppStoreMerchantId: ").Append(AppStoreMerchantId).Append("\n");
+            sb.Append("  P8PrivateKey: ").Append(P8PrivateKey).Append("\n");
+            sb.Append("  P8PrivateKeyId: ").Append(P8PrivateKeyId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AppStoreConfigModel);
+        }
+
+        /// <summary>
+        /// Returns true if AppStoreConfigModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AppStoreConfigModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AppStoreConfigModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelId == input.WhiteLabelId ||
+                    (this.WhiteLabelId != null &&
+                    this.WhiteLabelId.Equals(input.WhiteLabelId))
+                ) && 
+                (
+                    this.ReadyToPublishToAppStore == input.ReadyToPublishToAppStore ||
+                    (this.ReadyToPublishToAppStore != null &&
+                    this.ReadyToPublishToAppStore.Equals(input.ReadyToPublishToAppStore))
+                ) && 
+                (
+                    this.AppStoreName == input.AppStoreName ||
+                    (this.AppStoreName != null &&
+                    this.AppStoreName.Equals(input.AppStoreName))
+                ) && 
+                (
+                    this.AppStoreAppleId == input.AppStoreAppleId ||
+                    (this.AppStoreAppleId != null &&
+                    this.AppStoreAppleId.Equals(input.AppStoreAppleId))
+                ) && 
+                (
+                    this.AppStoreUrl == input.AppStoreUrl ||
+                    (this.AppStoreUrl != null &&
+                    this.AppStoreUrl.Equals(input.AppStoreUrl))
+                ) && 
+                (
+                    this.AppStoreId == input.AppStoreId ||
+                    (this.AppStoreId != null &&
+                    this.AppStoreId.Equals(input.AppStoreId))
+                ) && 
+                (
+                    this.AppStorePassword == input.AppStorePassword ||
+                    (this.AppStorePassword != null &&
+                    this.AppStorePassword.Equals(input.AppStorePassword))
+                ) && 
+                (
+                    this.TeamId == input.TeamId ||
+                    (this.TeamId != null &&
+                    this.TeamId.Equals(input.TeamId))
+                ) && 
+                (
+                    this.AppGroupId == input.AppGroupId ||
+                    (this.AppGroupId != null &&
+                    this.AppGroupId.Equals(input.AppGroupId))
+                ) && 
+                (
+                    this.BundleId == input.BundleId ||
+                    (this.BundleId != null &&
+                    this.BundleId.Equals(input.BundleId))
+                ) && 
+                (
+                    this.AppStoreSigningIdentity == input.AppStoreSigningIdentity ||
+                    (this.AppStoreSigningIdentity != null &&
+                    this.AppStoreSigningIdentity.Equals(input.AppStoreSigningIdentity))
+                ) && 
+                (
+                    this.AppStoreToken == input.AppStoreToken ||
+                    (this.AppStoreToken != null &&
+                    this.AppStoreToken.Equals(input.AppStoreToken))
+                ) && 
+                (
+                    this.AppStoreMerchantId == input.AppStoreMerchantId ||
+                    (this.AppStoreMerchantId != null &&
+                    this.AppStoreMerchantId.Equals(input.AppStoreMerchantId))
+                ) && 
+                (
+                    this.P8PrivateKey == input.P8PrivateKey ||
+                    (this.P8PrivateKey != null &&
+                    this.P8PrivateKey.Equals(input.P8PrivateKey))
+                ) && 
+                (
+                    this.P8PrivateKeyId == input.P8PrivateKeyId ||
+                    (this.P8PrivateKeyId != null &&
+                    this.P8PrivateKeyId.Equals(input.P8PrivateKeyId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelId.GetHashCode();
+                if (this.ReadyToPublishToAppStore != null)
+                    hashCode = hashCode * 59 + this.ReadyToPublishToAppStore.GetHashCode();
+                if (this.AppStoreName != null)
+                    hashCode = hashCode * 59 + this.AppStoreName.GetHashCode();
+                if (this.AppStoreAppleId != null)
+                    hashCode = hashCode * 59 + this.AppStoreAppleId.GetHashCode();
+                if (this.AppStoreUrl != null)
+                    hashCode = hashCode * 59 + this.AppStoreUrl.GetHashCode();
+                if (this.AppStoreId != null)
+                    hashCode = hashCode * 59 + this.AppStoreId.GetHashCode();
+                if (this.AppStorePassword != null)
+                    hashCode = hashCode * 59 + this.AppStorePassword.GetHashCode();
+                if (this.TeamId != null)
+                    hashCode = hashCode * 59 + this.TeamId.GetHashCode();
+                if (this.AppGroupId != null)
+                    hashCode = hashCode * 59 + this.AppGroupId.GetHashCode();
+                if (this.BundleId != null)
+                    hashCode = hashCode * 59 + this.BundleId.GetHashCode();
+                if (this.AppStoreSigningIdentity != null)
+                    hashCode = hashCode * 59 + this.AppStoreSigningIdentity.GetHashCode();
+                if (this.AppStoreToken != null)
+                    hashCode = hashCode * 59 + this.AppStoreToken.GetHashCode();
+                if (this.AppStoreMerchantId != null)
+                    hashCode = hashCode * 59 + this.AppStoreMerchantId.GetHashCode();
+                if (this.P8PrivateKey != null)
+                    hashCode = hashCode * 59 + this.P8PrivateKey.GetHashCode();
+                if (this.P8PrivateKeyId != null)
+                    hashCode = hashCode * 59 + this.P8PrivateKeyId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AppStoreConfigUpdatedEvent.cs b/src/Flipdish/Model/AppStoreConfigUpdatedEvent.cs
index 48e6a131..181d1b39 100644
--- a/src/Flipdish/Model/AppStoreConfigUpdatedEvent.cs
+++ b/src/Flipdish/Model/AppStoreConfigUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// AppStore Config Updated event
     /// </summary>
     [DataContract]
-    public partial class AppStoreConfigUpdatedEvent :  IEquatable<AppStoreConfigUpdatedEvent>, IValidatableObject
+    public partial class AppStoreConfigUpdatedEvent :  IEquatable<AppStoreConfigUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AppStoreConfigUpdatedEvent" /> class.
@@ -36,21 +34,29 @@ public partial class AppStoreConfigUpdatedEvent :  IEquatable<AppStoreConfigUpda
         /// <param name="eventName">The event name.</param>
         /// <param name="appStoreAppId">App Store Id.</param>
         /// <param name="appStoreAppConfiguration">App Configuration.</param>
+        /// <param name="user">User who has update the configuration.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public AppStoreConfigUpdatedEvent(string eventName = default(string), string appStoreAppId = default(string), UpdateAppStoreAppConfigurationWebhookDTO appStoreAppConfiguration = default(UpdateAppStoreAppConfigurationWebhookDTO), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public AppStoreConfigUpdatedEvent(string eventName = default(string), string appStoreAppId = default(string), UpdateAppStoreAppConfigurationWebhookDTO appStoreAppConfiguration = default(UpdateAppStoreAppConfigurationWebhookDTO), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.AppStoreAppId = appStoreAppId;
             this.AppStoreAppConfiguration = appStoreAppConfiguration;
+            this.User = user;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -74,6 +80,13 @@ public partial class AppStoreConfigUpdatedEvent :  IEquatable<AppStoreConfigUpda
         [DataMember(Name="AppStoreAppConfiguration", EmitDefaultValue=false)]
         public UpdateAppStoreAppConfigurationWebhookDTO AppStoreAppConfiguration { get; set; }
 
+        /// <summary>
+        /// User who has update the configuration
+        /// </summary>
+        /// <value>User who has update the configuration</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// The identitfier of the event
         /// </summary>
@@ -102,6 +115,13 @@ public partial class AppStoreConfigUpdatedEvent :  IEquatable<AppStoreConfigUpda
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +129,20 @@ public partial class AppStoreConfigUpdatedEvent :  IEquatable<AppStoreConfigUpda
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -120,11 +154,15 @@ public override string ToString()
             sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
             sb.Append("  AppStoreAppConfiguration: ").Append(AppStoreAppConfiguration).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,6 +212,11 @@ public bool Equals(AppStoreConfigUpdatedEvent input)
                     (this.AppStoreAppConfiguration != null &&
                     this.AppStoreAppConfiguration.Equals(input.AppStoreAppConfiguration))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.FlipdishEventId == input.FlipdishEventId ||
                     (this.FlipdishEventId != null &&
@@ -194,10 +237,25 @@ public bool Equals(AppStoreConfigUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -216,6 +274,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
                 if (this.AppStoreAppConfiguration != null)
                     hashCode = hashCode * 59 + this.AppStoreAppConfiguration.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.FlipdishEventId != null)
                     hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
                 if (this.CreateTime != null)
@@ -224,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AppStoreSubscriptionChangeJobUpdatedEvent.cs b/src/Flipdish/Model/AppStoreSubscriptionChangeJobUpdatedEvent.cs
new file mode 100644
index 00000000..3b1531a3
--- /dev/null
+++ b/src/Flipdish/Model/AppStoreSubscriptionChangeJobUpdatedEvent.cs
@@ -0,0 +1,283 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Subscription change job status updated event
+    /// </summary>
+    [DataContract]
+    public partial class AppStoreSubscriptionChangeJobUpdatedEvent :  IEquatable<AppStoreSubscriptionChangeJobUpdatedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppStoreSubscriptionChangeJobUpdatedEvent" /> class.
+        /// </summary>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="appStoreAppId">App Store Id.</param>
+        /// <param name="status">Status.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public AppStoreSubscriptionChangeJobUpdatedEvent(string eventName = default(string), string appStoreAppId = default(string), string status = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.EventName = eventName;
+            this.AppStoreAppId = appStoreAppId;
+            this.Status = status;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// App Store Id
+        /// </summary>
+        /// <value>App Store Id</value>
+        [DataMember(Name="AppStoreAppId", EmitDefaultValue=false)]
+        public string AppStoreAppId { get; set; }
+
+        /// <summary>
+        /// Status
+        /// </summary>
+        /// <value>Status</value>
+        [DataMember(Name="Status", EmitDefaultValue=false)]
+        public string Status { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AppStoreSubscriptionChangeJobUpdatedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AppStoreSubscriptionChangeJobUpdatedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if AppStoreSubscriptionChangeJobUpdatedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AppStoreSubscriptionChangeJobUpdatedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AppStoreSubscriptionChangeJobUpdatedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.AppStoreAppId == input.AppStoreAppId ||
+                    (this.AppStoreAppId != null &&
+                    this.AppStoreAppId.Equals(input.AppStoreAppId))
+                ) && 
+                (
+                    this.Status == input.Status ||
+                    (this.Status != null &&
+                    this.Status.Equals(input.Status))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.AppStoreAppId != null)
+                    hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
+                if (this.Status != null)
+                    hashCode = hashCode * 59 + this.Status.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AppSummary.cs b/src/Flipdish/Model/AppSummary.cs
deleted file mode 100644
index 7928d9fc..00000000
--- a/src/Flipdish/Model/AppSummary.cs
+++ /dev/null
@@ -1,333 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Application Summary  &lt;remarks&gt;Header information for display in lists, like list of apps&lt;/remarks&gt;
-    /// </summary>
-    [DataContract]
-    public partial class AppSummary :  IEquatable<AppSummary>, IValidatableObject
-    {
-        /// <summary>
-        /// Application verification status
-        /// </summary>
-        /// <value>Application verification status</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum VerificationStatusEnum
-        {
-            
-            /// <summary>
-            /// Enum Draft for value: Draft
-            /// </summary>
-            [EnumMember(Value = "Draft")]
-            Draft = 1,
-            
-            /// <summary>
-            /// Enum Submitted for value: Submitted
-            /// </summary>
-            [EnumMember(Value = "Submitted")]
-            Submitted = 2,
-            
-            /// <summary>
-            /// Enum Verified for value: Verified
-            /// </summary>
-            [EnumMember(Value = "Verified")]
-            Verified = 3
-        }
-
-        /// <summary>
-        /// Application verification status
-        /// </summary>
-        /// <value>Application verification status</value>
-        [DataMember(Name="VerificationStatus", EmitDefaultValue=false)]
-        public VerificationStatusEnum VerificationStatus { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppSummary" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected AppSummary() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppSummary" /> class.
-        /// </summary>
-        /// <param name="id">Integration Public Id.</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="logo">Logo.</param>
-        /// <param name="isEnabled">Is application enabled.</param>
-        /// <param name="verificationStatus">Application verification status (required).</param>
-        /// <param name="tags">Tags (required).</param>
-        /// <param name="regions">Regions (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public AppSummary(string id = default(string), string name = default(string), string description = default(string), string logo = default(string), bool? isEnabled = default(bool?), VerificationStatusEnum verificationStatus = default(VerificationStatusEnum), List<string> tags = default(List<string>), List<string> regions = default(List<string>), string developerName = default(string))
-        {
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for AppSummary and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            // to ensure "description" is required (not null)
-            if (description == null)
-            {
-                throw new InvalidDataException("description is a required property for AppSummary and cannot be null");
-            }
-            else
-            {
-                this.Description = description;
-            }
-            // to ensure "verificationStatus" is required (not null)
-            if (verificationStatus == null)
-            {
-                throw new InvalidDataException("verificationStatus is a required property for AppSummary and cannot be null");
-            }
-            else
-            {
-                this.VerificationStatus = verificationStatus;
-            }
-            // to ensure "tags" is required (not null)
-            if (tags == null)
-            {
-                throw new InvalidDataException("tags is a required property for AppSummary and cannot be null");
-            }
-            else
-            {
-                this.Tags = tags;
-            }
-            // to ensure "regions" is required (not null)
-            if (regions == null)
-            {
-                throw new InvalidDataException("regions is a required property for AppSummary and cannot be null");
-            }
-            else
-            {
-                this.Regions = regions;
-            }
-            this.Id = id;
-            this.Logo = logo;
-            this.IsEnabled = isEnabled;
-            this.DeveloperName = developerName;
-        }
-        
-        /// <summary>
-        /// Integration Public Id
-        /// </summary>
-        /// <value>Integration Public Id</value>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Name
-        /// </summary>
-        /// <value>Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Logo
-        /// </summary>
-        /// <value>Logo</value>
-        [DataMember(Name="Logo", EmitDefaultValue=false)]
-        public string Logo { get; set; }
-
-        /// <summary>
-        /// Is application enabled
-        /// </summary>
-        /// <value>Is application enabled</value>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-
-        /// <summary>
-        /// Tags
-        /// </summary>
-        /// <value>Tags</value>
-        [DataMember(Name="Tags", EmitDefaultValue=false)]
-        public List<string> Tags { get; set; }
-
-        /// <summary>
-        /// Regions
-        /// </summary>
-        /// <value>Regions</value>
-        [DataMember(Name="Regions", EmitDefaultValue=false)]
-        public List<string> Regions { get; set; }
-
-        /// <summary>
-        /// Developer Name
-        /// </summary>
-        /// <value>Developer Name</value>
-        [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
-        public string DeveloperName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class AppSummary {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Logo: ").Append(Logo).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  VerificationStatus: ").Append(VerificationStatus).Append("\n");
-            sb.Append("  Tags: ").Append(Tags).Append("\n");
-            sb.Append("  Regions: ").Append(Regions).Append("\n");
-            sb.Append("  DeveloperName: ").Append(DeveloperName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as AppSummary);
-        }
-
-        /// <summary>
-        /// Returns true if AppSummary instances are equal
-        /// </summary>
-        /// <param name="input">Instance of AppSummary to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(AppSummary input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Logo == input.Logo ||
-                    (this.Logo != null &&
-                    this.Logo.Equals(input.Logo))
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.VerificationStatus == input.VerificationStatus ||
-                    (this.VerificationStatus != null &&
-                    this.VerificationStatus.Equals(input.VerificationStatus))
-                ) && 
-                (
-                    this.Tags == input.Tags ||
-                    this.Tags != null &&
-                    this.Tags.SequenceEqual(input.Tags)
-                ) && 
-                (
-                    this.Regions == input.Regions ||
-                    this.Regions != null &&
-                    this.Regions.SequenceEqual(input.Regions)
-                ) && 
-                (
-                    this.DeveloperName == input.DeveloperName ||
-                    (this.DeveloperName != null &&
-                    this.DeveloperName.Equals(input.DeveloperName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Logo != null)
-                    hashCode = hashCode * 59 + this.Logo.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.VerificationStatus != null)
-                    hashCode = hashCode * 59 + this.VerificationStatus.GetHashCode();
-                if (this.Tags != null)
-                    hashCode = hashCode * 59 + this.Tags.GetHashCode();
-                if (this.Regions != null)
-                    hashCode = hashCode * 59 + this.Regions.GetHashCode();
-                if (this.DeveloperName != null)
-                    hashCode = hashCode * 59 + this.DeveloperName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/AppUpdatedEvent.cs b/src/Flipdish/Model/AppUpdatedEvent.cs
index 04e7fb89..b231c449 100644
--- a/src/Flipdish/Model/AppUpdatedEvent.cs
+++ b/src/Flipdish/Model/AppUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Application updated event
     /// </summary>
     [DataContract]
-    public partial class AppUpdatedEvent :  IEquatable<AppUpdatedEvent>, IValidatableObject
+    public partial class AppUpdatedEvent :  IEquatable<AppUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AppUpdatedEvent" /> class.
@@ -39,12 +37,16 @@ public partial class AppUpdatedEvent :  IEquatable<AppUpdatedEvent>, IValidatabl
         /// <param name="appName">App Name.</param>
         /// <param name="countryId">Country Id.</param>
         /// <param name="user">User information.</param>
+        /// <param name="app">App - Whitelabel config.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public AppUpdatedEvent(string eventName = default(string), string description = default(string), string changes = default(string), string appName = default(string), string countryId = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public AppUpdatedEvent(string eventName = default(string), string description = default(string), string changes = default(string), string appName = default(string), string countryId = default(string), UserEventInfo user = default(UserEventInfo), App app = default(App), string orgId = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,11 +54,15 @@ public partial class AppUpdatedEvent :  IEquatable<AppUpdatedEvent>, IValidatabl
             this.AppName = appName;
             this.CountryId = countryId;
             this.User = user;
+            this.App = app;
+            this.OrgId = orgId;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -101,6 +107,20 @@ public partial class AppUpdatedEvent :  IEquatable<AppUpdatedEvent>, IValidatabl
         [DataMember(Name="User", EmitDefaultValue=false)]
         public UserEventInfo User { get; set; }
 
+        /// <summary>
+        /// App - Whitelabel config
+        /// </summary>
+        /// <value>App - Whitelabel config</value>
+        [DataMember(Name="App", EmitDefaultValue=false)]
+        public App App { get; set; }
+
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// The identitfier of the event
         /// </summary>
@@ -136,6 +156,20 @@ public partial class AppUpdatedEvent :  IEquatable<AppUpdatedEvent>, IValidatabl
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -150,11 +184,15 @@ public override string ToString()
             sb.Append("  AppName: ").Append(AppName).Append("\n");
             sb.Append("  CountryId: ").Append(CountryId).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  App: ").Append(App).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -219,6 +257,16 @@ public bool Equals(AppUpdatedEvent input)
                     (this.User != null &&
                     this.User.Equals(input.User))
                 ) && 
+                (
+                    this.App == input.App ||
+                    (this.App != null &&
+                    this.App.Equals(input.App))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.FlipdishEventId == input.FlipdishEventId ||
                     (this.FlipdishEventId != null &&
@@ -243,6 +291,16 @@ public bool Equals(AppUpdatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -267,6 +325,10 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.CountryId.GetHashCode();
                 if (this.User != null)
                     hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.App != null)
+                    hashCode = hashCode * 59 + this.App.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.FlipdishEventId != null)
                     hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
                 if (this.CreateTime != null)
@@ -277,19 +339,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AssetResultModel.cs b/src/Flipdish/Model/AssetResultModel.cs
new file mode 100644
index 00000000..abf25946
--- /dev/null
+++ b/src/Flipdish/Model/AssetResultModel.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Asset result model
+    /// </summary>
+    [DataContract]
+    public partial class AssetResultModel :  IEquatable<AssetResultModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssetResultModel" /> class.
+        /// </summary>
+        /// <param name="message">Asset result message.</param>
+        /// <param name="assetUrl">Asset URL or path.</param>
+        /// <param name="assetName">Asset name.</param>
+        public AssetResultModel(string message = default(string), string assetUrl = default(string), string assetName = default(string))
+        {
+            this.Message = message;
+            this.AssetUrl = assetUrl;
+            this.AssetName = assetName;
+        }
+        
+        /// <summary>
+        /// Asset result message
+        /// </summary>
+        /// <value>Asset result message</value>
+        [DataMember(Name="Message", EmitDefaultValue=false)]
+        public string Message { get; set; }
+
+        /// <summary>
+        /// Asset URL or path
+        /// </summary>
+        /// <value>Asset URL or path</value>
+        [DataMember(Name="AssetUrl", EmitDefaultValue=false)]
+        public string AssetUrl { get; set; }
+
+        /// <summary>
+        /// Asset name
+        /// </summary>
+        /// <value>Asset name</value>
+        [DataMember(Name="AssetName", EmitDefaultValue=false)]
+        public string AssetName { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class AssetResultModel {\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("  AssetUrl: ").Append(AssetUrl).Append("\n");
+            sb.Append("  AssetName: ").Append(AssetName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as AssetResultModel);
+        }
+
+        /// <summary>
+        /// Returns true if AssetResultModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of AssetResultModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(AssetResultModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Message == input.Message ||
+                    (this.Message != null &&
+                    this.Message.Equals(input.Message))
+                ) && 
+                (
+                    this.AssetUrl == input.AssetUrl ||
+                    (this.AssetUrl != null &&
+                    this.AssetUrl.Equals(input.AssetUrl))
+                ) && 
+                (
+                    this.AssetName == input.AssetName ||
+                    (this.AssetName != null &&
+                    this.AssetName.Equals(input.AssetName))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Message != null)
+                    hashCode = hashCode * 59 + this.Message.GetHashCode();
+                if (this.AssetUrl != null)
+                    hashCode = hashCode * 59 + this.AssetUrl.GetHashCode();
+                if (this.AssetName != null)
+                    hashCode = hashCode * 59 + this.AssetName.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/AssignedBankAccount.cs b/src/Flipdish/Model/AssignedBankAccount.cs
index 7c85ac57..1f1b6f40 100644
--- a/src/Flipdish/Model/AssignedBankAccount.cs
+++ b/src/Flipdish/Model/AssignedBankAccount.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Assigned to Store Bank Account
     /// </summary>
     [DataContract]
-    public partial class AssignedBankAccount :  IEquatable<AssignedBankAccount>, IValidatableObject
+    public partial class AssignedBankAccount :  IEquatable<AssignedBankAccount>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AssignedBankAccount" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/AuditLogFieldChangeInformation.cs b/src/Flipdish/Model/AuditLogFieldChangeInformation.cs
index df60eefd..2476646c 100644
--- a/src/Flipdish/Model/AuditLogFieldChangeInformation.cs
+++ b/src/Flipdish/Model/AuditLogFieldChangeInformation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Change information for a field
     /// </summary>
     [DataContract]
-    public partial class AuditLogFieldChangeInformation :  IEquatable<AuditLogFieldChangeInformation>, IValidatableObject
+    public partial class AuditLogFieldChangeInformation :  IEquatable<AuditLogFieldChangeInformation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AuditLogFieldChangeInformation" /> class.
@@ -178,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BalanceDetails.cs b/src/Flipdish/Model/BalanceDetails.cs
index 4b1b25b2..4928528f 100644
--- a/src/Flipdish/Model/BalanceDetails.cs
+++ b/src/Flipdish/Model/BalanceDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,13 +26,13 @@ namespace Flipdish.Model
     /// Period opening and closing balance
     /// </summary>
     [DataContract]
-    public partial class BalanceDetails :  IEquatable<BalanceDetails>, IValidatableObject
+    public partial class BalanceDetails :  IEquatable<BalanceDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="BalanceDetails" /> class.
         /// </summary>
-        /// <param name="openingBalance">openingBalance.</param>
-        /// <param name="closingBalance">closingBalance.</param>
+        /// <param name="openingBalance">OpeningBalance..</param>
+        /// <param name="closingBalance">ClosingBalance..</param>
         public BalanceDetails(double? openingBalance = default(double?), double? closingBalance = default(double?))
         {
             this.OpeningBalance = openingBalance;
@@ -42,14 +40,16 @@ public partial class BalanceDetails :  IEquatable<BalanceDetails>, IValidatableO
         }
         
         /// <summary>
-        /// Gets or Sets OpeningBalance
+        /// OpeningBalance.
         /// </summary>
+        /// <value>OpeningBalance.</value>
         [DataMember(Name="OpeningBalance", EmitDefaultValue=false)]
         public double? OpeningBalance { get; set; }
 
         /// <summary>
-        /// Gets or Sets ClosingBalance
+        /// ClosingBalance.
         /// </summary>
+        /// <value>ClosingBalance.</value>
         [DataMember(Name="ClosingBalance", EmitDefaultValue=false)]
         public double? ClosingBalance { get; set; }
 
@@ -125,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BankAccount.cs b/src/Flipdish/Model/BankAccount.cs
index 08ca76bc..68e29128 100644
--- a/src/Flipdish/Model/BankAccount.cs
+++ b/src/Flipdish/Model/BankAccount.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// BANK ACCOUNT
     /// </summary>
     [DataContract]
-    public partial class BankAccount :  IEquatable<BankAccount>, IValidatableObject
+    public partial class BankAccount :  IEquatable<BankAccount>
     {
         /// <summary>
         /// Status of Account
@@ -79,12 +77,14 @@ public enum AccountStateEnum
         /// <param name="populatedAccountFields">A list of one or more populated account fields (field key-value pairs).  If this list contains at least one item, the Iban, Swift and NationalClearingCode fields should be ignored..</param>
         /// <param name="accountState">Status of Account.</param>
         /// <param name="storeNames">Store Names that are attached to this account.</param>
+        /// <param name="storeIds">Store Ids that are attached to this account.</param>
         /// <param name="bankAddress">Address lf the bank.</param>
         /// <param name="bankCountryCode">CountryCode of the Bank Account.</param>
         /// <param name="accountHolderAddress">Account Holders Address.</param>
         /// <param name="accountHolderCountryCode">Account Holders Country Code.</param>
         /// <param name="vatNumber">Account Holders Vat Number.</param>
-        public BankAccount(int? id = default(int?), string accountName = default(string), string iban = default(string), string swift = default(string), List<AccountFieldKeyValuePair> populatedAccountFields = default(List<AccountFieldKeyValuePair>), AccountStateEnum? accountState = default(AccountStateEnum?), List<string> storeNames = default(List<string>), string bankAddress = default(string), string bankCountryCode = default(string), string accountHolderAddress = default(string), string accountHolderCountryCode = default(string), string vatNumber = default(string))
+        /// <param name="stripeAccountId">Stripe Id of the connected account.</param>
+        public BankAccount(int? id = default(int?), string accountName = default(string), string iban = default(string), string swift = default(string), List<AccountFieldKeyValuePair> populatedAccountFields = default(List<AccountFieldKeyValuePair>), AccountStateEnum? accountState = default(AccountStateEnum?), List<string> storeNames = default(List<string>), List<int?> storeIds = default(List<int?>), string bankAddress = default(string), string bankCountryCode = default(string), string accountHolderAddress = default(string), string accountHolderCountryCode = default(string), string vatNumber = default(string), string stripeAccountId = default(string))
         {
             this.Id = id;
             this.AccountName = accountName;
@@ -93,11 +93,13 @@ public enum AccountStateEnum
             this.PopulatedAccountFields = populatedAccountFields;
             this.AccountState = accountState;
             this.StoreNames = storeNames;
+            this.StoreIds = storeIds;
             this.BankAddress = bankAddress;
             this.BankCountryCode = bankCountryCode;
             this.AccountHolderAddress = accountHolderAddress;
             this.AccountHolderCountryCode = accountHolderCountryCode;
             this.VatNumber = vatNumber;
+            this.StripeAccountId = stripeAccountId;
         }
         
         /// <summary>
@@ -143,6 +145,13 @@ public enum AccountStateEnum
         [DataMember(Name="StoreNames", EmitDefaultValue=false)]
         public List<string> StoreNames { get; set; }
 
+        /// <summary>
+        /// Store Ids that are attached to this account
+        /// </summary>
+        /// <value>Store Ids that are attached to this account</value>
+        [DataMember(Name="StoreIds", EmitDefaultValue=false)]
+        public List<int?> StoreIds { get; set; }
+
         /// <summary>
         /// Address lf the bank
         /// </summary>
@@ -178,6 +187,13 @@ public enum AccountStateEnum
         [DataMember(Name="VatNumber", EmitDefaultValue=false)]
         public string VatNumber { get; set; }
 
+        /// <summary>
+        /// Stripe Id of the connected account
+        /// </summary>
+        /// <value>Stripe Id of the connected account</value>
+        [DataMember(Name="StripeAccountId", EmitDefaultValue=false)]
+        public string StripeAccountId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -193,11 +209,13 @@ public override string ToString()
             sb.Append("  PopulatedAccountFields: ").Append(PopulatedAccountFields).Append("\n");
             sb.Append("  AccountState: ").Append(AccountState).Append("\n");
             sb.Append("  StoreNames: ").Append(StoreNames).Append("\n");
+            sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
             sb.Append("  BankAddress: ").Append(BankAddress).Append("\n");
             sb.Append("  BankCountryCode: ").Append(BankCountryCode).Append("\n");
             sb.Append("  AccountHolderAddress: ").Append(AccountHolderAddress).Append("\n");
             sb.Append("  AccountHolderCountryCode: ").Append(AccountHolderCountryCode).Append("\n");
             sb.Append("  VatNumber: ").Append(VatNumber).Append("\n");
+            sb.Append("  StripeAccountId: ").Append(StripeAccountId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -267,6 +285,11 @@ public bool Equals(BankAccount input)
                     this.StoreNames != null &&
                     this.StoreNames.SequenceEqual(input.StoreNames)
                 ) && 
+                (
+                    this.StoreIds == input.StoreIds ||
+                    this.StoreIds != null &&
+                    this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
                 (
                     this.BankAddress == input.BankAddress ||
                     (this.BankAddress != null &&
@@ -291,6 +314,11 @@ public bool Equals(BankAccount input)
                     this.VatNumber == input.VatNumber ||
                     (this.VatNumber != null &&
                     this.VatNumber.Equals(input.VatNumber))
+                ) && 
+                (
+                    this.StripeAccountId == input.StripeAccountId ||
+                    (this.StripeAccountId != null &&
+                    this.StripeAccountId.Equals(input.StripeAccountId))
                 );
         }
 
@@ -317,6 +345,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AccountState.GetHashCode();
                 if (this.StoreNames != null)
                     hashCode = hashCode * 59 + this.StoreNames.GetHashCode();
+                if (this.StoreIds != null)
+                    hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
                 if (this.BankAddress != null)
                     hashCode = hashCode * 59 + this.BankAddress.GetHashCode();
                 if (this.BankCountryCode != null)
@@ -327,19 +357,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AccountHolderCountryCode.GetHashCode();
                 if (this.VatNumber != null)
                     hashCode = hashCode * 59 + this.VatNumber.GetHashCode();
+                if (this.StripeAccountId != null)
+                    hashCode = hashCode * 59 + this.StripeAccountId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BankAccountAssignedEvent.cs b/src/Flipdish/Model/BankAccountAssignedEvent.cs
new file mode 100644
index 00000000..3174082c
--- /dev/null
+++ b/src/Flipdish/Model/BankAccountAssignedEvent.cs
@@ -0,0 +1,300 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// BankAccountAssignedEvent
+    /// </summary>
+    [DataContract]
+    public partial class BankAccountAssignedEvent :  IEquatable<BankAccountAssignedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BankAccountAssignedEvent" /> class.
+        /// </summary>
+        /// <param name="orgId">Organisation Id.</param>
+        /// <param name="bankAccount">The assigned bank account.</param>
+        /// <param name="description">Event description.</param>
+        /// <param name="user">Updated by user.</param>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public BankAccountAssignedEvent(string orgId = default(string), BankAccount bankAccount = default(BankAccount), string description = default(string), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.OrgId = orgId;
+            this.BankAccount = bankAccount;
+            this.Description = description;
+            this.User = user;
+            this.EventName = eventName;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// The assigned bank account
+        /// </summary>
+        /// <value>The assigned bank account</value>
+        [DataMember(Name="BankAccount", EmitDefaultValue=false)]
+        public BankAccount BankAccount { get; set; }
+
+        /// <summary>
+        /// Event description
+        /// </summary>
+        /// <value>Event description</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Updated by user
+        /// </summary>
+        /// <value>Updated by user</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class BankAccountAssignedEvent {\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  BankAccount: ").Append(BankAccount).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as BankAccountAssignedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if BankAccountAssignedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of BankAccountAssignedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(BankAccountAssignedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.BankAccount == input.BankAccount ||
+                    (this.BankAccount != null &&
+                    this.BankAccount.Equals(input.BankAccount))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.BankAccount != null)
+                    hashCode = hashCode * 59 + this.BankAccount.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/BankAccountCreate.cs b/src/Flipdish/Model/BankAccountCreate.cs
index bb66ea4c..ac4953c1 100644
--- a/src/Flipdish/Model/BankAccountCreate.cs
+++ b/src/Flipdish/Model/BankAccountCreate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// BankAccountCreate
     /// </summary>
     [DataContract]
-    public partial class BankAccountCreate :  IEquatable<BankAccountCreate>, IValidatableObject
+    public partial class BankAccountCreate :  IEquatable<BankAccountCreate>
     {
         /// <summary>
         /// Currency of Account
@@ -1068,16 +1066,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BankAccountCreatedEvent.cs b/src/Flipdish/Model/BankAccountCreatedEvent.cs
index 4f3d02f0..f6966b6a 100644
--- a/src/Flipdish/Model/BankAccountCreatedEvent.cs
+++ b/src/Flipdish/Model/BankAccountCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,29 +26,44 @@ namespace Flipdish.Model
     /// BankAccountCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class BankAccountCreatedEvent :  IEquatable<BankAccountCreatedEvent>, IValidatableObject
+    public partial class BankAccountCreatedEvent :  IEquatable<BankAccountCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="BankAccountCreatedEvent" /> class.
         /// </summary>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="bankAccount">The create bank account.</param>
+        /// <param name="user">Updated by user.</param>
         /// <param name="eventName">The event name.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public BankAccountCreatedEvent(BankAccount bankAccount = default(BankAccount), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public BankAccountCreatedEvent(string orgId = default(string), BankAccount bankAccount = default(BankAccount), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
+            this.OrgId = orgId;
             this.BankAccount = bankAccount;
+            this.User = user;
             this.EventName = eventName;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// The create bank account
         /// </summary>
@@ -58,6 +71,13 @@ public partial class BankAccountCreatedEvent :  IEquatable<BankAccountCreatedEve
         [DataMember(Name="BankAccount", EmitDefaultValue=false)]
         public BankAccount BankAccount { get; set; }
 
+        /// <summary>
+        /// Updated by user
+        /// </summary>
+        /// <value>Updated by user</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// The event name
         /// </summary>
@@ -100,6 +120,20 @@ public partial class BankAccountCreatedEvent :  IEquatable<BankAccountCreatedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -108,13 +142,17 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class BankAccountCreatedEvent {\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  BankAccount: ").Append(BankAccount).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -149,11 +187,21 @@ public bool Equals(BankAccountCreatedEvent input)
                 return false;
 
             return 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.BankAccount == input.BankAccount ||
                     (this.BankAccount != null &&
                     this.BankAccount.Equals(input.BankAccount))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.EventName == input.EventName ||
                     (this.EventName != null &&
@@ -183,6 +231,16 @@ public bool Equals(BankAccountCreatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -195,8 +253,12 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.BankAccount != null)
                     hashCode = hashCode * 59 + this.BankAccount.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
                 if (this.FlipdishEventId != null)
@@ -209,19 +271,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BankAccountDeletedEvent.cs b/src/Flipdish/Model/BankAccountDeletedEvent.cs
index a118699c..0494cfc6 100644
--- a/src/Flipdish/Model/BankAccountDeletedEvent.cs
+++ b/src/Flipdish/Model/BankAccountDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,29 +26,44 @@ namespace Flipdish.Model
     /// BankAccountDeletedEvent
     /// </summary>
     [DataContract]
-    public partial class BankAccountDeletedEvent :  IEquatable<BankAccountDeletedEvent>, IValidatableObject
+    public partial class BankAccountDeletedEvent :  IEquatable<BankAccountDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="BankAccountDeletedEvent" /> class.
         /// </summary>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="bankAccount">The create bank account.</param>
+        /// <param name="user">Updated by user.</param>
         /// <param name="eventName">The event name.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public BankAccountDeletedEvent(BankAccount bankAccount = default(BankAccount), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public BankAccountDeletedEvent(string orgId = default(string), BankAccount bankAccount = default(BankAccount), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
+            this.OrgId = orgId;
             this.BankAccount = bankAccount;
+            this.User = user;
             this.EventName = eventName;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// The create bank account
         /// </summary>
@@ -58,6 +71,13 @@ public partial class BankAccountDeletedEvent :  IEquatable<BankAccountDeletedEve
         [DataMember(Name="BankAccount", EmitDefaultValue=false)]
         public BankAccount BankAccount { get; set; }
 
+        /// <summary>
+        /// Updated by user
+        /// </summary>
+        /// <value>Updated by user</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// The event name
         /// </summary>
@@ -100,6 +120,20 @@ public partial class BankAccountDeletedEvent :  IEquatable<BankAccountDeletedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -108,13 +142,17 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class BankAccountDeletedEvent {\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  BankAccount: ").Append(BankAccount).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -149,11 +187,21 @@ public bool Equals(BankAccountDeletedEvent input)
                 return false;
 
             return 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.BankAccount == input.BankAccount ||
                     (this.BankAccount != null &&
                     this.BankAccount.Equals(input.BankAccount))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.EventName == input.EventName ||
                     (this.EventName != null &&
@@ -183,6 +231,16 @@ public bool Equals(BankAccountDeletedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -195,8 +253,12 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.BankAccount != null)
                     hashCode = hashCode * 59 + this.BankAccount.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
                 if (this.FlipdishEventId != null)
@@ -209,19 +271,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BankAccountDetail.cs b/src/Flipdish/Model/BankAccountDetail.cs
index 49c51ca6..0d16cf32 100644
--- a/src/Flipdish/Model/BankAccountDetail.cs
+++ b/src/Flipdish/Model/BankAccountDetail.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// BankAccountDetail
     /// </summary>
     [DataContract]
-    public partial class BankAccountDetail :  IEquatable<BankAccountDetail>, IValidatableObject
+    public partial class BankAccountDetail :  IEquatable<BankAccountDetail>
     {
         /// <summary>
         /// Status of Account
@@ -1169,16 +1167,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BankAccountDetailsUpdateRequest.cs b/src/Flipdish/Model/BankAccountDetailsUpdateRequest.cs
index e42ac2e6..89931546 100644
--- a/src/Flipdish/Model/BankAccountDetailsUpdateRequest.cs
+++ b/src/Flipdish/Model/BankAccountDetailsUpdateRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a request to update bank account information details
     /// </summary>
     [DataContract]
-    public partial class BankAccountDetailsUpdateRequest :  IEquatable<BankAccountDetailsUpdateRequest>, IValidatableObject
+    public partial class BankAccountDetailsUpdateRequest :  IEquatable<BankAccountDetailsUpdateRequest>
     {
         /// <summary>
         /// Business Type
@@ -330,16 +328,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BankAccountSummary.cs b/src/Flipdish/Model/BankAccountSummary.cs
index ef2f106c..95d85827 100644
--- a/src/Flipdish/Model/BankAccountSummary.cs
+++ b/src/Flipdish/Model/BankAccountSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// BankAccountSummary
     /// </summary>
     [DataContract]
-    public partial class BankAccountSummary :  IEquatable<BankAccountSummary>, IValidatableObject
+    public partial class BankAccountSummary :  IEquatable<BankAccountSummary>
     {
         /// <summary>
         /// Status of Account
@@ -113,8 +111,12 @@ public enum BusinessTypeEnum
         /// </summary>
         /// <param name="id">Id of this account.</param>
         /// <param name="storeNames">Store Names that are attached to this account.</param>
+        /// <param name="storeIds">Store Ids that are attached to this account.</param>
         /// <param name="accountState">Status of Account.</param>
         /// <param name="currencyCode">Currency of Account.</param>
+        /// <param name="vatNumber">Account Holders Vat Number.</param>
+        /// <param name="accountHolderAddress">Account Holders Address.</param>
+        /// <param name="accountHolderCountryCode">Account Holders Country Code.</param>
         /// <param name="stripeConnectedAccountInfo">Information about the Stripe connected account associated with this bank account (if any).</param>
         /// <param name="accountName">Name of this account.</param>
         /// <param name="iban">IBAN of this account.</param>
@@ -123,12 +125,16 @@ public enum BusinessTypeEnum
         /// <param name="populatedAccountFields">A list of one or more populated account fields (field key-value pairs).  If this list contains at least one item, the Iban, Swift and NationalClearingCode fields will be ignored..</param>
         /// <param name="rejectionReason">Reason for Rejection.</param>
         /// <param name="businessType">Business Type.</param>
-        public BankAccountSummary(int? id = default(int?), List<string> storeNames = default(List<string>), AccountStateEnum? accountState = default(AccountStateEnum?), string currencyCode = default(string), StripeConnectedAccountInfo stripeConnectedAccountInfo = default(StripeConnectedAccountInfo), string accountName = default(string), string iban = default(string), string swift = default(string), string nationalClearingCode = default(string), List<AccountFieldKeyValuePair> populatedAccountFields = default(List<AccountFieldKeyValuePair>), string rejectionReason = default(string), BusinessTypeEnum? businessType = default(BusinessTypeEnum?))
+        public BankAccountSummary(int? id = default(int?), List<string> storeNames = default(List<string>), List<int?> storeIds = default(List<int?>), AccountStateEnum? accountState = default(AccountStateEnum?), string currencyCode = default(string), string vatNumber = default(string), string accountHolderAddress = default(string), string accountHolderCountryCode = default(string), StripeConnectedAccountInfo stripeConnectedAccountInfo = default(StripeConnectedAccountInfo), string accountName = default(string), string iban = default(string), string swift = default(string), string nationalClearingCode = default(string), List<AccountFieldKeyValuePair> populatedAccountFields = default(List<AccountFieldKeyValuePair>), string rejectionReason = default(string), BusinessTypeEnum? businessType = default(BusinessTypeEnum?))
         {
             this.Id = id;
             this.StoreNames = storeNames;
+            this.StoreIds = storeIds;
             this.AccountState = accountState;
             this.CurrencyCode = currencyCode;
+            this.VatNumber = vatNumber;
+            this.AccountHolderAddress = accountHolderAddress;
+            this.AccountHolderCountryCode = accountHolderCountryCode;
             this.StripeConnectedAccountInfo = stripeConnectedAccountInfo;
             this.AccountName = accountName;
             this.Iban = iban;
@@ -153,6 +159,13 @@ public enum BusinessTypeEnum
         [DataMember(Name="StoreNames", EmitDefaultValue=false)]
         public List<string> StoreNames { get; set; }
 
+        /// <summary>
+        /// Store Ids that are attached to this account
+        /// </summary>
+        /// <value>Store Ids that are attached to this account</value>
+        [DataMember(Name="StoreIds", EmitDefaultValue=false)]
+        public List<int?> StoreIds { get; set; }
+
 
         /// <summary>
         /// Currency of Account
@@ -161,6 +174,27 @@ public enum BusinessTypeEnum
         [DataMember(Name="CurrencyCode", EmitDefaultValue=false)]
         public string CurrencyCode { get; set; }
 
+        /// <summary>
+        /// Account Holders Vat Number
+        /// </summary>
+        /// <value>Account Holders Vat Number</value>
+        [DataMember(Name="VatNumber", EmitDefaultValue=false)]
+        public string VatNumber { get; set; }
+
+        /// <summary>
+        /// Account Holders Address
+        /// </summary>
+        /// <value>Account Holders Address</value>
+        [DataMember(Name="AccountHolderAddress", EmitDefaultValue=false)]
+        public string AccountHolderAddress { get; set; }
+
+        /// <summary>
+        /// Account Holders Country Code
+        /// </summary>
+        /// <value>Account Holders Country Code</value>
+        [DataMember(Name="AccountHolderCountryCode", EmitDefaultValue=false)]
+        public string AccountHolderCountryCode { get; set; }
+
         /// <summary>
         /// Information about the Stripe connected account associated with this bank account (if any)
         /// </summary>
@@ -221,8 +255,12 @@ public override string ToString()
             sb.Append("class BankAccountSummary {\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  StoreNames: ").Append(StoreNames).Append("\n");
+            sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
             sb.Append("  AccountState: ").Append(AccountState).Append("\n");
             sb.Append("  CurrencyCode: ").Append(CurrencyCode).Append("\n");
+            sb.Append("  VatNumber: ").Append(VatNumber).Append("\n");
+            sb.Append("  AccountHolderAddress: ").Append(AccountHolderAddress).Append("\n");
+            sb.Append("  AccountHolderCountryCode: ").Append(AccountHolderCountryCode).Append("\n");
             sb.Append("  StripeConnectedAccountInfo: ").Append(StripeConnectedAccountInfo).Append("\n");
             sb.Append("  AccountName: ").Append(AccountName).Append("\n");
             sb.Append("  Iban: ").Append(Iban).Append("\n");
@@ -275,6 +313,11 @@ public bool Equals(BankAccountSummary input)
                     this.StoreNames != null &&
                     this.StoreNames.SequenceEqual(input.StoreNames)
                 ) && 
+                (
+                    this.StoreIds == input.StoreIds ||
+                    this.StoreIds != null &&
+                    this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
                 (
                     this.AccountState == input.AccountState ||
                     (this.AccountState != null &&
@@ -285,6 +328,21 @@ public bool Equals(BankAccountSummary input)
                     (this.CurrencyCode != null &&
                     this.CurrencyCode.Equals(input.CurrencyCode))
                 ) && 
+                (
+                    this.VatNumber == input.VatNumber ||
+                    (this.VatNumber != null &&
+                    this.VatNumber.Equals(input.VatNumber))
+                ) && 
+                (
+                    this.AccountHolderAddress == input.AccountHolderAddress ||
+                    (this.AccountHolderAddress != null &&
+                    this.AccountHolderAddress.Equals(input.AccountHolderAddress))
+                ) && 
+                (
+                    this.AccountHolderCountryCode == input.AccountHolderCountryCode ||
+                    (this.AccountHolderCountryCode != null &&
+                    this.AccountHolderCountryCode.Equals(input.AccountHolderCountryCode))
+                ) && 
                 (
                     this.StripeConnectedAccountInfo == input.StripeConnectedAccountInfo ||
                     (this.StripeConnectedAccountInfo != null &&
@@ -340,10 +398,18 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Id.GetHashCode();
                 if (this.StoreNames != null)
                     hashCode = hashCode * 59 + this.StoreNames.GetHashCode();
+                if (this.StoreIds != null)
+                    hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
                 if (this.AccountState != null)
                     hashCode = hashCode * 59 + this.AccountState.GetHashCode();
                 if (this.CurrencyCode != null)
                     hashCode = hashCode * 59 + this.CurrencyCode.GetHashCode();
+                if (this.VatNumber != null)
+                    hashCode = hashCode * 59 + this.VatNumber.GetHashCode();
+                if (this.AccountHolderAddress != null)
+                    hashCode = hashCode * 59 + this.AccountHolderAddress.GetHashCode();
+                if (this.AccountHolderCountryCode != null)
+                    hashCode = hashCode * 59 + this.AccountHolderCountryCode.GetHashCode();
                 if (this.StripeConnectedAccountInfo != null)
                     hashCode = hashCode * 59 + this.StripeConnectedAccountInfo.GetHashCode();
                 if (this.AccountName != null)
@@ -363,16 +429,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BankAccountUpdatedEvent.cs b/src/Flipdish/Model/BankAccountUpdatedEvent.cs
index 5daaef1c..68a48d94 100644
--- a/src/Flipdish/Model/BankAccountUpdatedEvent.cs
+++ b/src/Flipdish/Model/BankAccountUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,29 +26,44 @@ namespace Flipdish.Model
     /// BankAccountUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class BankAccountUpdatedEvent :  IEquatable<BankAccountUpdatedEvent>, IValidatableObject
+    public partial class BankAccountUpdatedEvent :  IEquatable<BankAccountUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="BankAccountUpdatedEvent" /> class.
         /// </summary>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="bankAccount">The create bank account.</param>
+        /// <param name="user">Updated by user.</param>
         /// <param name="eventName">The event name.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public BankAccountUpdatedEvent(BankAccount bankAccount = default(BankAccount), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public BankAccountUpdatedEvent(string orgId = default(string), BankAccount bankAccount = default(BankAccount), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
+            this.OrgId = orgId;
             this.BankAccount = bankAccount;
+            this.User = user;
             this.EventName = eventName;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// The create bank account
         /// </summary>
@@ -58,6 +71,13 @@ public partial class BankAccountUpdatedEvent :  IEquatable<BankAccountUpdatedEve
         [DataMember(Name="BankAccount", EmitDefaultValue=false)]
         public BankAccount BankAccount { get; set; }
 
+        /// <summary>
+        /// Updated by user
+        /// </summary>
+        /// <value>Updated by user</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// The event name
         /// </summary>
@@ -100,6 +120,20 @@ public partial class BankAccountUpdatedEvent :  IEquatable<BankAccountUpdatedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -108,13 +142,17 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class BankAccountUpdatedEvent {\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  BankAccount: ").Append(BankAccount).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -149,11 +187,21 @@ public bool Equals(BankAccountUpdatedEvent input)
                 return false;
 
             return 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.BankAccount == input.BankAccount ||
                     (this.BankAccount != null &&
                     this.BankAccount.Equals(input.BankAccount))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.EventName == input.EventName ||
                     (this.EventName != null &&
@@ -183,6 +231,16 @@ public bool Equals(BankAccountUpdatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -195,8 +253,12 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.BankAccount != null)
                     hashCode = hashCode * 59 + this.BankAccount.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
                 if (this.FlipdishEventId != null)
@@ -209,19 +271,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BluetoothTerminalStatus.cs b/src/Flipdish/Model/BluetoothTerminalStatus.cs
index 2732112f..b84788b6 100644
--- a/src/Flipdish/Model/BluetoothTerminalStatus.cs
+++ b/src/Flipdish/Model/BluetoothTerminalStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Status of the bluetooth terminal
     /// </summary>
     [DataContract]
-    public partial class BluetoothTerminalStatus :  IEquatable<BluetoothTerminalStatus>, IValidatableObject
+    public partial class BluetoothTerminalStatus :  IEquatable<BluetoothTerminalStatus>
     {
         /// <summary>
         /// Device Type
@@ -290,16 +288,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BuildResultModel.cs b/src/Flipdish/Model/BuildResultModel.cs
new file mode 100644
index 00000000..c9e7dfb2
--- /dev/null
+++ b/src/Flipdish/Model/BuildResultModel.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Build result model
+    /// </summary>
+    [DataContract]
+    public partial class BuildResultModel :  IEquatable<BuildResultModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BuildResultModel" /> class.
+        /// </summary>
+        /// <param name="message">Build result message.</param>
+        /// <param name="buildId">Build ID or reference.</param>
+        public BuildResultModel(string message = default(string), string buildId = default(string))
+        {
+            this.Message = message;
+            this.BuildId = buildId;
+        }
+        
+        /// <summary>
+        /// Build result message
+        /// </summary>
+        /// <value>Build result message</value>
+        [DataMember(Name="Message", EmitDefaultValue=false)]
+        public string Message { get; set; }
+
+        /// <summary>
+        /// Build ID or reference
+        /// </summary>
+        /// <value>Build ID or reference</value>
+        [DataMember(Name="BuildId", EmitDefaultValue=false)]
+        public string BuildId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class BuildResultModel {\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("  BuildId: ").Append(BuildId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as BuildResultModel);
+        }
+
+        /// <summary>
+        /// Returns true if BuildResultModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of BuildResultModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(BuildResultModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Message == input.Message ||
+                    (this.Message != null &&
+                    this.Message.Equals(input.Message))
+                ) && 
+                (
+                    this.BuildId == input.BuildId ||
+                    (this.BuildId != null &&
+                    this.BuildId.Equals(input.BuildId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Message != null)
+                    hashCode = hashCode * 59 + this.Message.GetHashCode();
+                if (this.BuildId != null)
+                    hashCode = hashCode * 59 + this.BuildId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/BusinessHoursOverride.cs b/src/Flipdish/Model/BusinessHoursOverride.cs
index e1d74088..d86b2169 100644
--- a/src/Flipdish/Model/BusinessHoursOverride.cs
+++ b/src/Flipdish/Model/BusinessHoursOverride.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// BusinessHoursOverride
     /// </summary>
     [DataContract]
-    public partial class BusinessHoursOverride :  IEquatable<BusinessHoursOverride>, IValidatableObject
+    public partial class BusinessHoursOverride :  IEquatable<BusinessHoursOverride>
     {
         /// <summary>
         /// Delivery or Pickup
@@ -247,16 +245,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BusinessHoursOverrideBase.cs b/src/Flipdish/Model/BusinessHoursOverrideBase.cs
index 0b6195ac..9a837304 100644
--- a/src/Flipdish/Model/BusinessHoursOverrideBase.cs
+++ b/src/Flipdish/Model/BusinessHoursOverrideBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// BusinessHoursOverrideBase
     /// </summary>
     [DataContract]
-    public partial class BusinessHoursOverrideBase :  IEquatable<BusinessHoursOverrideBase>, IValidatableObject
+    public partial class BusinessHoursOverrideBase :  IEquatable<BusinessHoursOverrideBase>
     {
         /// <summary>
         /// Delivery or Pickup
@@ -230,16 +228,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BusinessHoursPeriod.cs b/src/Flipdish/Model/BusinessHoursPeriod.cs
index 7d828ae7..51fed083 100644
--- a/src/Flipdish/Model/BusinessHoursPeriod.cs
+++ b/src/Flipdish/Model/BusinessHoursPeriod.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Business hours period
     /// </summary>
     [DataContract]
-    public partial class BusinessHoursPeriod :  IEquatable<BusinessHoursPeriod>, IValidatableObject
+    public partial class BusinessHoursPeriod :  IEquatable<BusinessHoursPeriod>
     {
         /// <summary>
         /// Day of week
@@ -280,16 +278,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/BusinessHoursPeriodBase.cs b/src/Flipdish/Model/BusinessHoursPeriodBase.cs
index b37be98a..e4f34537 100644
--- a/src/Flipdish/Model/BusinessHoursPeriodBase.cs
+++ b/src/Flipdish/Model/BusinessHoursPeriodBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Business hours period
     /// </summary>
     [DataContract]
-    public partial class BusinessHoursPeriodBase :  IEquatable<BusinessHoursPeriodBase>, IValidatableObject
+    public partial class BusinessHoursPeriodBase :  IEquatable<BusinessHoursPeriodBase>
     {
         /// <summary>
         /// Day of week
@@ -229,16 +227,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CampaignStatistics.cs b/src/Flipdish/Model/CampaignStatistics.cs
index fdddbae7..39b796b4 100644
--- a/src/Flipdish/Model/CampaignStatistics.cs
+++ b/src/Flipdish/Model/CampaignStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,16 +26,16 @@ namespace Flipdish.Model
     /// Campaign statistics
     /// </summary>
     [DataContract]
-    public partial class CampaignStatistics :  IEquatable<CampaignStatistics>, IValidatableObject
+    public partial class CampaignStatistics :  IEquatable<CampaignStatistics>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CampaignStatistics" /> class.
         /// </summary>
-        /// <param name="vouchersIssued">Number of issued vouchers.</param>
-        /// <param name="vouchersRedeemed">Number of redeemed vouchers.</param>
-        /// <param name="conversion">Conversion percentage of campaign (VouchersIssued / VouchersRedeemed).</param>
-        /// <param name="salesGenerated">Sales generated by campaign (TotalAmount - FeeChargedToCustomer ie. the discounted sale value).</param>
-        /// <param name="returnOfInvestment">Return of investment percentage of campaign (TotalAmount / DiscountAmount).</param>
+        /// <param name="vouchersIssued">Deprecated. Number of issued vouchers.  This field is always zero..</param>
+        /// <param name="vouchersRedeemed">Deprecated. Number of redeemed vouchers. This field is always zero.  This field is always zero..</param>
+        /// <param name="conversion">Deprecated. Conversion of campaign (VouchersIssued / VouchersRedeemed).  This field is always zero..</param>
+        /// <param name="salesGenerated">Deprecated.  Sales generated by campaign (TotalAmount - FeeChargedToCustomer ie. the discounted sale value).  This field is always zero..</param>
+        /// <param name="returnOfInvestment">Deprecated.  Return of investment of campaign (TotalAmount / DiscountAmount).  This field is always zero..</param>
         public CampaignStatistics(int? vouchersIssued = default(int?), int? vouchersRedeemed = default(int?), double? conversion = default(double?), double? salesGenerated = default(double?), double? returnOfInvestment = default(double?))
         {
             this.VouchersIssued = vouchersIssued;
@@ -48,37 +46,37 @@ public partial class CampaignStatistics :  IEquatable<CampaignStatistics>, IVali
         }
         
         /// <summary>
-        /// Number of issued vouchers
+        /// Deprecated. Number of issued vouchers.  This field is always zero.
         /// </summary>
-        /// <value>Number of issued vouchers</value>
+        /// <value>Deprecated. Number of issued vouchers.  This field is always zero.</value>
         [DataMember(Name="VouchersIssued", EmitDefaultValue=false)]
         public int? VouchersIssued { get; set; }
 
         /// <summary>
-        /// Number of redeemed vouchers
+        /// Deprecated. Number of redeemed vouchers. This field is always zero.  This field is always zero.
         /// </summary>
-        /// <value>Number of redeemed vouchers</value>
+        /// <value>Deprecated. Number of redeemed vouchers. This field is always zero.  This field is always zero.</value>
         [DataMember(Name="VouchersRedeemed", EmitDefaultValue=false)]
         public int? VouchersRedeemed { get; set; }
 
         /// <summary>
-        /// Conversion percentage of campaign (VouchersIssued / VouchersRedeemed)
+        /// Deprecated. Conversion of campaign (VouchersIssued / VouchersRedeemed).  This field is always zero.
         /// </summary>
-        /// <value>Conversion percentage of campaign (VouchersIssued / VouchersRedeemed)</value>
+        /// <value>Deprecated. Conversion of campaign (VouchersIssued / VouchersRedeemed).  This field is always zero.</value>
         [DataMember(Name="Conversion", EmitDefaultValue=false)]
         public double? Conversion { get; set; }
 
         /// <summary>
-        /// Sales generated by campaign (TotalAmount - FeeChargedToCustomer ie. the discounted sale value)
+        /// Deprecated.  Sales generated by campaign (TotalAmount - FeeChargedToCustomer ie. the discounted sale value).  This field is always zero.
         /// </summary>
-        /// <value>Sales generated by campaign (TotalAmount - FeeChargedToCustomer ie. the discounted sale value)</value>
+        /// <value>Deprecated.  Sales generated by campaign (TotalAmount - FeeChargedToCustomer ie. the discounted sale value).  This field is always zero.</value>
         [DataMember(Name="SalesGenerated", EmitDefaultValue=false)]
         public double? SalesGenerated { get; set; }
 
         /// <summary>
-        /// Return of investment percentage of campaign (TotalAmount / DiscountAmount)
+        /// Deprecated.  Return of investment of campaign (TotalAmount / DiscountAmount).  This field is always zero.
         /// </summary>
-        /// <value>Return of investment percentage of campaign (TotalAmount / DiscountAmount)</value>
+        /// <value>Deprecated.  Return of investment of campaign (TotalAmount / DiscountAmount).  This field is always zero.</value>
         [DataMember(Name="ReturnOfInvestment", EmitDefaultValue=false)]
         public double? ReturnOfInvestment { get; set; }
 
@@ -178,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CancellationToken.cs b/src/Flipdish/Model/CancellationToken.cs
new file mode 100644
index 00000000..107b89b0
--- /dev/null
+++ b/src/Flipdish/Model/CancellationToken.cs
@@ -0,0 +1,139 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// CancellationToken
+    /// </summary>
+    [DataContract]
+    public partial class CancellationToken :  IEquatable<CancellationToken>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CancellationToken" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        public CancellationToken()
+        {
+        }
+        
+        /// <summary>
+        /// Gets or Sets IsCancellationRequested
+        /// </summary>
+        [DataMember(Name="IsCancellationRequested", EmitDefaultValue=false)]
+        public bool? IsCancellationRequested { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets CanBeCanceled
+        /// </summary>
+        [DataMember(Name="CanBeCanceled", EmitDefaultValue=false)]
+        public bool? CanBeCanceled { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets WaitHandle
+        /// </summary>
+        [DataMember(Name="WaitHandle", EmitDefaultValue=false)]
+        public WaitHandle WaitHandle { get; private set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CancellationToken {\n");
+            sb.Append("  IsCancellationRequested: ").Append(IsCancellationRequested).Append("\n");
+            sb.Append("  CanBeCanceled: ").Append(CanBeCanceled).Append("\n");
+            sb.Append("  WaitHandle: ").Append(WaitHandle).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CancellationToken);
+        }
+
+        /// <summary>
+        /// Returns true if CancellationToken instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CancellationToken to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CancellationToken input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.IsCancellationRequested == input.IsCancellationRequested ||
+                    (this.IsCancellationRequested != null &&
+                    this.IsCancellationRequested.Equals(input.IsCancellationRequested))
+                ) && 
+                (
+                    this.CanBeCanceled == input.CanBeCanceled ||
+                    (this.CanBeCanceled != null &&
+                    this.CanBeCanceled.Equals(input.CanBeCanceled))
+                ) && 
+                (
+                    this.WaitHandle == input.WaitHandle ||
+                    (this.WaitHandle != null &&
+                    this.WaitHandle.Equals(input.WaitHandle))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.IsCancellationRequested != null)
+                    hashCode = hashCode * 59 + this.IsCancellationRequested.GetHashCode();
+                if (this.CanBeCanceled != null)
+                    hashCode = hashCode * 59 + this.CanBeCanceled.GetHashCode();
+                if (this.WaitHandle != null)
+                    hashCode = hashCode * 59 + this.WaitHandle.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/Card.cs b/src/Flipdish/Model/Card.cs
deleted file mode 100644
index b68fd25c..00000000
--- a/src/Flipdish/Model/Card.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Credit card
-    /// </summary>
-    [DataContract]
-    public partial class Card :  IEquatable<Card>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Card" /> class.
-        /// </summary>
-        /// <param name="last4Digit">Last four digits.</param>
-        /// <param name="expiryMonth">Expiry month.</param>
-        /// <param name="expiryYear">Expiry yaer.</param>
-        public Card(string last4Digit = default(string), int? expiryMonth = default(int?), int? expiryYear = default(int?))
-        {
-            this.Last4Digit = last4Digit;
-            this.ExpiryMonth = expiryMonth;
-            this.ExpiryYear = expiryYear;
-        }
-        
-        /// <summary>
-        /// Last four digits
-        /// </summary>
-        /// <value>Last four digits</value>
-        [DataMember(Name="Last4Digit", EmitDefaultValue=false)]
-        public string Last4Digit { get; set; }
-
-        /// <summary>
-        /// Expiry month
-        /// </summary>
-        /// <value>Expiry month</value>
-        [DataMember(Name="ExpiryMonth", EmitDefaultValue=false)]
-        public int? ExpiryMonth { get; set; }
-
-        /// <summary>
-        /// Expiry yaer
-        /// </summary>
-        /// <value>Expiry yaer</value>
-        [DataMember(Name="ExpiryYear", EmitDefaultValue=false)]
-        public int? ExpiryYear { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class Card {\n");
-            sb.Append("  Last4Digit: ").Append(Last4Digit).Append("\n");
-            sb.Append("  ExpiryMonth: ").Append(ExpiryMonth).Append("\n");
-            sb.Append("  ExpiryYear: ").Append(ExpiryYear).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Card);
-        }
-
-        /// <summary>
-        /// Returns true if Card instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Card to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Card input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Last4Digit == input.Last4Digit ||
-                    (this.Last4Digit != null &&
-                    this.Last4Digit.Equals(input.Last4Digit))
-                ) && 
-                (
-                    this.ExpiryMonth == input.ExpiryMonth ||
-                    (this.ExpiryMonth != null &&
-                    this.ExpiryMonth.Equals(input.ExpiryMonth))
-                ) && 
-                (
-                    this.ExpiryYear == input.ExpiryYear ||
-                    (this.ExpiryYear != null &&
-                    this.ExpiryYear.Equals(input.ExpiryYear))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Last4Digit != null)
-                    hashCode = hashCode * 59 + this.Last4Digit.GetHashCode();
-                if (this.ExpiryMonth != null)
-                    hashCode = hashCode * 59 + this.ExpiryMonth.GetHashCode();
-                if (this.ExpiryYear != null)
-                    hashCode = hashCode * 59 + this.ExpiryYear.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CardBase.cs b/src/Flipdish/Model/CardBase.cs
deleted file mode 100644
index a5fa2893..00000000
--- a/src/Flipdish/Model/CardBase.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Credit card Base
-    /// </summary>
-    [DataContract]
-    public partial class CardBase :  IEquatable<CardBase>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CardBase" /> class.
-        /// </summary>
-        /// <param name="expiryMonth">Expiry month.</param>
-        /// <param name="expiryYear">Expiry yaer.</param>
-        public CardBase(int? expiryMonth = default(int?), int? expiryYear = default(int?))
-        {
-            this.ExpiryMonth = expiryMonth;
-            this.ExpiryYear = expiryYear;
-        }
-        
-        /// <summary>
-        /// Expiry month
-        /// </summary>
-        /// <value>Expiry month</value>
-        [DataMember(Name="ExpiryMonth", EmitDefaultValue=false)]
-        public int? ExpiryMonth { get; set; }
-
-        /// <summary>
-        /// Expiry yaer
-        /// </summary>
-        /// <value>Expiry yaer</value>
-        [DataMember(Name="ExpiryYear", EmitDefaultValue=false)]
-        public int? ExpiryYear { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CardBase {\n");
-            sb.Append("  ExpiryMonth: ").Append(ExpiryMonth).Append("\n");
-            sb.Append("  ExpiryYear: ").Append(ExpiryYear).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CardBase);
-        }
-
-        /// <summary>
-        /// Returns true if CardBase instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CardBase to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CardBase input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.ExpiryMonth == input.ExpiryMonth ||
-                    (this.ExpiryMonth != null &&
-                    this.ExpiryMonth.Equals(input.ExpiryMonth))
-                ) && 
-                (
-                    this.ExpiryYear == input.ExpiryYear ||
-                    (this.ExpiryYear != null &&
-                    this.ExpiryYear.Equals(input.ExpiryYear))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.ExpiryMonth != null)
-                    hashCode = hashCode * 59 + this.ExpiryMonth.GetHashCode();
-                if (this.ExpiryYear != null)
-                    hashCode = hashCode * 59 + this.ExpiryYear.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CardReader.cs b/src/Flipdish/Model/CardReader.cs
index 13355e5f..c9b390ff 100644
--- a/src/Flipdish/Model/CardReader.cs
+++ b/src/Flipdish/Model/CardReader.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Card reader
     /// </summary>
     [DataContract]
-    public partial class CardReader :  IEquatable<CardReader>, IValidatableObject
+    public partial class CardReader :  IEquatable<CardReader>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CardReader" /> class.
@@ -229,16 +227,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CardReaderRegistrationRequest.cs b/src/Flipdish/Model/CardReaderRegistrationRequest.cs
index e55865c0..4acdb121 100644
--- a/src/Flipdish/Model/CardReaderRegistrationRequest.cs
+++ b/src/Flipdish/Model/CardReaderRegistrationRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Card reader registration request
     /// </summary>
     [DataContract]
-    public partial class CardReaderRegistrationRequest :  IEquatable<CardReaderRegistrationRequest>, IValidatableObject
+    public partial class CardReaderRegistrationRequest :  IEquatable<CardReaderRegistrationRequest>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CardReaderRegistrationRequest" /> class.
@@ -140,16 +138,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CardWithToken.cs b/src/Flipdish/Model/CardWithToken.cs
deleted file mode 100644
index 01896748..00000000
--- a/src/Flipdish/Model/CardWithToken.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Card with token
-    /// </summary>
-    [DataContract]
-    public partial class CardWithToken :  IEquatable<CardWithToken>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CardWithToken" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected CardWithToken() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CardWithToken" /> class.
-        /// </summary>
-        /// <param name="token">Token (required).</param>
-        public CardWithToken(string token = default(string))
-        {
-            // to ensure "token" is required (not null)
-            if (token == null)
-            {
-                throw new InvalidDataException("token is a required property for CardWithToken and cannot be null");
-            }
-            else
-            {
-                this.Token = token;
-            }
-        }
-        
-        /// <summary>
-        /// Token
-        /// </summary>
-        /// <value>Token</value>
-        [DataMember(Name="Token", EmitDefaultValue=false)]
-        public string Token { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CardWithToken {\n");
-            sb.Append("  Token: ").Append(Token).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CardWithToken);
-        }
-
-        /// <summary>
-        /// Returns true if CardWithToken instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CardWithToken to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CardWithToken input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Token == input.Token ||
-                    (this.Token != null &&
-                    this.Token.Equals(input.Token))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Token != null)
-                    hashCode = hashCode * 59 + this.Token.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/Cart.cs b/src/Flipdish/Model/Cart.cs
deleted file mode 100644
index 36aef228..00000000
--- a/src/Flipdish/Model/Cart.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Defines the cart
-    /// </summary>
-    [DataContract]
-    public partial class Cart :  IEquatable<Cart>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Cart" /> class.
-        /// </summary>
-        /// <param name="lineItems">Line items from the cart.</param>
-        /// <param name="cartAmount">Total cart price.</param>
-        /// <param name="tip">Total tip amount.</param>
-        public Cart(List<LineItem> lineItems = default(List<LineItem>), Price cartAmount = default(Price), Price tip = default(Price))
-        {
-            this.LineItems = lineItems;
-            this.CartAmount = cartAmount;
-            this.Tip = tip;
-        }
-        
-        /// <summary>
-        /// Line items from the cart
-        /// </summary>
-        /// <value>Line items from the cart</value>
-        [DataMember(Name="LineItems", EmitDefaultValue=false)]
-        public List<LineItem> LineItems { get; set; }
-
-        /// <summary>
-        /// Total cart price
-        /// </summary>
-        /// <value>Total cart price</value>
-        [DataMember(Name="CartAmount", EmitDefaultValue=false)]
-        public Price CartAmount { get; set; }
-
-        /// <summary>
-        /// Total tip amount
-        /// </summary>
-        /// <value>Total tip amount</value>
-        [DataMember(Name="Tip", EmitDefaultValue=false)]
-        public Price Tip { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class Cart {\n");
-            sb.Append("  LineItems: ").Append(LineItems).Append("\n");
-            sb.Append("  CartAmount: ").Append(CartAmount).Append("\n");
-            sb.Append("  Tip: ").Append(Tip).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Cart);
-        }
-
-        /// <summary>
-        /// Returns true if Cart instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Cart to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Cart input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.LineItems == input.LineItems ||
-                    this.LineItems != null &&
-                    this.LineItems.SequenceEqual(input.LineItems)
-                ) && 
-                (
-                    this.CartAmount == input.CartAmount ||
-                    (this.CartAmount != null &&
-                    this.CartAmount.Equals(input.CartAmount))
-                ) && 
-                (
-                    this.Tip == input.Tip ||
-                    (this.Tip != null &&
-                    this.Tip.Equals(input.Tip))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.LineItems != null)
-                    hashCode = hashCode * 59 + this.LineItems.GetHashCode();
-                if (this.CartAmount != null)
-                    hashCode = hashCode * 59 + this.CartAmount.GetHashCode();
-                if (this.Tip != null)
-                    hashCode = hashCode * 59 + this.Tip.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CatalogGroup.cs b/src/Flipdish/Model/CatalogGroup.cs
deleted file mode 100644
index 291f8826..00000000
--- a/src/Flipdish/Model/CatalogGroup.cs
+++ /dev/null
@@ -1,416 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// CatalogGroup
-    /// </summary>
-    [DataContract]
-    public partial class CatalogGroup :  IEquatable<CatalogGroup>, IValidatableObject
-    {
-        /// <summary>
-        /// Type of group (ModifierGroup, etc)
-        /// </summary>
-        /// <value>Type of group (ModifierGroup, etc)</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum GroupTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum ModifierGroup for value: ModifierGroup
-            /// </summary>
-            [EnumMember(Value = "ModifierGroup")]
-            ModifierGroup = 1
-        }
-
-        /// <summary>
-        /// Type of group (ModifierGroup, etc)
-        /// </summary>
-        /// <value>Type of group (ModifierGroup, etc)</value>
-        [DataMember(Name="GroupType", EmitDefaultValue=false)]
-        public GroupTypeEnum GroupType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CatalogGroup" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected CatalogGroup() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CatalogGroup" /> class.
-        /// </summary>
-        /// <param name="catalogGroupId">Unique catalog group id.</param>
-        /// <param name="catalogItemId">Unique catalog item id.</param>
-        /// <param name="isArchived">Returns true if the group is archived.</param>
-        /// <param name="minSelectCount">Minimum number of items that the user has to select.</param>
-        /// <param name="maxSelectCount">Maximum number of items that the user has to select.</param>
-        /// <param name="items">Collection of items associated with this product.</param>
-        /// <param name="metafields">Collection of metafields.</param>
-        /// <param name="groupType">Type of group (ModifierGroup, etc) (required).</param>
-        /// <param name="sku">Stock Keeping Unit (SKU) (required).</param>
-        /// <param name="name">Group name (required).</param>
-        /// <param name="autogenerateDisplayText">Autogenerate display text in ordering applications.</param>
-        /// <param name="imageFileName">Image File Name.</param>
-        public CatalogGroup(string catalogGroupId = default(string), string catalogItemId = default(string), bool? isArchived = default(bool?), int? minSelectCount = default(int?), int? maxSelectCount = default(int?), List<CatalogItemReference> items = default(List<CatalogItemReference>), List<Metafield> metafields = default(List<Metafield>), GroupTypeEnum groupType = default(GroupTypeEnum), string sku = default(string), string name = default(string), bool? autogenerateDisplayText = default(bool?), string imageFileName = default(string))
-        {
-            // to ensure "groupType" is required (not null)
-            if (groupType == null)
-            {
-                throw new InvalidDataException("groupType is a required property for CatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.GroupType = groupType;
-            }
-            // to ensure "sku" is required (not null)
-            if (sku == null)
-            {
-                throw new InvalidDataException("sku is a required property for CatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.Sku = sku;
-            }
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for CatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            this.CatalogGroupId = catalogGroupId;
-            this.CatalogItemId = catalogItemId;
-            this.IsArchived = isArchived;
-            this.MinSelectCount = minSelectCount;
-            this.MaxSelectCount = maxSelectCount;
-            this.Items = items;
-            this.Metafields = metafields;
-            this.AutogenerateDisplayText = autogenerateDisplayText;
-            this.ImageFileName = imageFileName;
-        }
-        
-        /// <summary>
-        /// Unique catalog group id
-        /// </summary>
-        /// <value>Unique catalog group id</value>
-        [DataMember(Name="CatalogGroupId", EmitDefaultValue=false)]
-        public string CatalogGroupId { get; set; }
-
-        /// <summary>
-        /// Unique catalog item id
-        /// </summary>
-        /// <value>Unique catalog item id</value>
-        [DataMember(Name="CatalogItemId", EmitDefaultValue=false)]
-        public string CatalogItemId { get; set; }
-
-        /// <summary>
-        /// Returns true if the group is archived
-        /// </summary>
-        /// <value>Returns true if the group is archived</value>
-        [DataMember(Name="IsArchived", EmitDefaultValue=false)]
-        public bool? IsArchived { get; set; }
-
-        /// <summary>
-        /// Minimum number of items that the user has to select
-        /// </summary>
-        /// <value>Minimum number of items that the user has to select</value>
-        [DataMember(Name="MinSelectCount", EmitDefaultValue=false)]
-        public int? MinSelectCount { get; set; }
-
-        /// <summary>
-        /// Maximum number of items that the user has to select
-        /// </summary>
-        /// <value>Maximum number of items that the user has to select</value>
-        [DataMember(Name="MaxSelectCount", EmitDefaultValue=false)]
-        public int? MaxSelectCount { get; set; }
-
-        /// <summary>
-        /// Collection of items associated with this product
-        /// </summary>
-        /// <value>Collection of items associated with this product</value>
-        [DataMember(Name="Items", EmitDefaultValue=false)]
-        public List<CatalogItemReference> Items { get; set; }
-
-        /// <summary>
-        /// Collection of metafields
-        /// </summary>
-        /// <value>Collection of metafields</value>
-        [DataMember(Name="Metafields", EmitDefaultValue=false)]
-        public List<Metafield> Metafields { get; set; }
-
-
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Group name
-        /// </summary>
-        /// <value>Group name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Autogenerate display text in ordering applications
-        /// </summary>
-        /// <value>Autogenerate display text in ordering applications</value>
-        [DataMember(Name="AutogenerateDisplayText", EmitDefaultValue=false)]
-        public bool? AutogenerateDisplayText { get; set; }
-
-        /// <summary>
-        /// Image File Name
-        /// </summary>
-        /// <value>Image File Name</value>
-        [DataMember(Name="ImageFileName", EmitDefaultValue=false)]
-        public string ImageFileName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CatalogGroup {\n");
-            sb.Append("  CatalogGroupId: ").Append(CatalogGroupId).Append("\n");
-            sb.Append("  CatalogItemId: ").Append(CatalogItemId).Append("\n");
-            sb.Append("  IsArchived: ").Append(IsArchived).Append("\n");
-            sb.Append("  MinSelectCount: ").Append(MinSelectCount).Append("\n");
-            sb.Append("  MaxSelectCount: ").Append(MaxSelectCount).Append("\n");
-            sb.Append("  Items: ").Append(Items).Append("\n");
-            sb.Append("  Metafields: ").Append(Metafields).Append("\n");
-            sb.Append("  GroupType: ").Append(GroupType).Append("\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  AutogenerateDisplayText: ").Append(AutogenerateDisplayText).Append("\n");
-            sb.Append("  ImageFileName: ").Append(ImageFileName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CatalogGroup);
-        }
-
-        /// <summary>
-        /// Returns true if CatalogGroup instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CatalogGroup to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CatalogGroup input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.CatalogGroupId == input.CatalogGroupId ||
-                    (this.CatalogGroupId != null &&
-                    this.CatalogGroupId.Equals(input.CatalogGroupId))
-                ) && 
-                (
-                    this.CatalogItemId == input.CatalogItemId ||
-                    (this.CatalogItemId != null &&
-                    this.CatalogItemId.Equals(input.CatalogItemId))
-                ) && 
-                (
-                    this.IsArchived == input.IsArchived ||
-                    (this.IsArchived != null &&
-                    this.IsArchived.Equals(input.IsArchived))
-                ) && 
-                (
-                    this.MinSelectCount == input.MinSelectCount ||
-                    (this.MinSelectCount != null &&
-                    this.MinSelectCount.Equals(input.MinSelectCount))
-                ) && 
-                (
-                    this.MaxSelectCount == input.MaxSelectCount ||
-                    (this.MaxSelectCount != null &&
-                    this.MaxSelectCount.Equals(input.MaxSelectCount))
-                ) && 
-                (
-                    this.Items == input.Items ||
-                    this.Items != null &&
-                    this.Items.SequenceEqual(input.Items)
-                ) && 
-                (
-                    this.Metafields == input.Metafields ||
-                    this.Metafields != null &&
-                    this.Metafields.SequenceEqual(input.Metafields)
-                ) && 
-                (
-                    this.GroupType == input.GroupType ||
-                    (this.GroupType != null &&
-                    this.GroupType.Equals(input.GroupType))
-                ) && 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.AutogenerateDisplayText == input.AutogenerateDisplayText ||
-                    (this.AutogenerateDisplayText != null &&
-                    this.AutogenerateDisplayText.Equals(input.AutogenerateDisplayText))
-                ) && 
-                (
-                    this.ImageFileName == input.ImageFileName ||
-                    (this.ImageFileName != null &&
-                    this.ImageFileName.Equals(input.ImageFileName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.CatalogGroupId != null)
-                    hashCode = hashCode * 59 + this.CatalogGroupId.GetHashCode();
-                if (this.CatalogItemId != null)
-                    hashCode = hashCode * 59 + this.CatalogItemId.GetHashCode();
-                if (this.IsArchived != null)
-                    hashCode = hashCode * 59 + this.IsArchived.GetHashCode();
-                if (this.MinSelectCount != null)
-                    hashCode = hashCode * 59 + this.MinSelectCount.GetHashCode();
-                if (this.MaxSelectCount != null)
-                    hashCode = hashCode * 59 + this.MaxSelectCount.GetHashCode();
-                if (this.Items != null)
-                    hashCode = hashCode * 59 + this.Items.GetHashCode();
-                if (this.Metafields != null)
-                    hashCode = hashCode * 59 + this.Metafields.GetHashCode();
-                if (this.GroupType != null)
-                    hashCode = hashCode * 59 + this.GroupType.GetHashCode();
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.AutogenerateDisplayText != null)
-                    hashCode = hashCode * 59 + this.AutogenerateDisplayText.GetHashCode();
-                if (this.ImageFileName != null)
-                    hashCode = hashCode * 59 + this.ImageFileName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogGroupId (string) maxLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be less than 30.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogGroupId (string) minLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be greater than 0.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CatalogGroupArchivedEvent.cs b/src/Flipdish/Model/CatalogGroupArchivedEvent.cs
index 4b88d0b7..121881d8 100644
--- a/src/Flipdish/Model/CatalogGroupArchivedEvent.cs
+++ b/src/Flipdish/Model/CatalogGroupArchivedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CatalogGroupArchivedEvent
     /// </summary>
     [DataContract]
-    public partial class CatalogGroupArchivedEvent :  IEquatable<CatalogGroupArchivedEvent>, IValidatableObject
+    public partial class CatalogGroupArchivedEvent :  IEquatable<CatalogGroupArchivedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogGroupArchivedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class CatalogGroupArchivedEvent :  IEquatable<CatalogGroupArchive
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CatalogGroupArchivedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Group group = default(Group), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CatalogGroupArchivedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Group group = default(Group), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class CatalogGroupArchivedEvent :  IEquatable<CatalogGroupArchive
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class CatalogGroupArchivedEvent :  IEquatable<CatalogGroupArchive
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class CatalogGroupArchivedEvent :  IEquatable<CatalogGroupArchive
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(CatalogGroupArchivedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CatalogGroupCreatedEvent.cs b/src/Flipdish/Model/CatalogGroupCreatedEvent.cs
index 8f8e703a..d0d1698f 100644
--- a/src/Flipdish/Model/CatalogGroupCreatedEvent.cs
+++ b/src/Flipdish/Model/CatalogGroupCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CatalogGroupCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class CatalogGroupCreatedEvent :  IEquatable<CatalogGroupCreatedEvent>, IValidatableObject
+    public partial class CatalogGroupCreatedEvent :  IEquatable<CatalogGroupCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogGroupCreatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class CatalogGroupCreatedEvent :  IEquatable<CatalogGroupCreatedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CatalogGroupCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Group group = default(Group), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CatalogGroupCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Group group = default(Group), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class CatalogGroupCreatedEvent :  IEquatable<CatalogGroupCreatedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class CatalogGroupCreatedEvent :  IEquatable<CatalogGroupCreatedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class CatalogGroupCreatedEvent :  IEquatable<CatalogGroupCreatedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(CatalogGroupCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CatalogGroupReference.cs b/src/Flipdish/Model/CatalogGroupReference.cs
index a4fc48b3..31dd24d0 100644
--- a/src/Flipdish/Model/CatalogGroupReference.cs
+++ b/src/Flipdish/Model/CatalogGroupReference.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Reference to an existing {Flipdish.PublicModels.V1.Catalog.Groups.Group}
+    /// Reference to an existing {Flipdish.Menus.PublicModels.V1.Catalog.Groups.Group}
     /// </summary>
     [DataContract]
-    public partial class CatalogGroupReference :  IEquatable<CatalogGroupReference>, IValidatableObject
+    public partial class CatalogGroupReference :  IEquatable<CatalogGroupReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -59,7 +57,7 @@ protected CatalogGroupReference() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogGroupReference" /> class.
         /// </summary>
-        /// <param name="group">Details of the referenced {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem}.</param>
+        /// <param name="group">Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Items.CatalogItem}.</param>
         /// <param name="catalogGroupId">Identifier of the ProductId to use as SubProduct (required).</param>
         /// <param name="catalogItemId">Identifier of the ProductId to use as SubProduct.</param>
         /// <param name="groupType">Type of the SupProduct (required).</param>
@@ -88,9 +86,9 @@ protected CatalogGroupReference() { }
         }
         
         /// <summary>
-        /// Details of the referenced {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem}
+        /// Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Items.CatalogItem}
         /// </summary>
-        /// <value>Details of the referenced {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem}</value>
+        /// <value>Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Items.CatalogItem}</value>
         [DataMember(Name="Group", EmitDefaultValue=false)]
         public Group Group { get; set; }
 
@@ -197,40 +195,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogGroupId (string) maxLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be less than 30.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogGroupId (string) minLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be greater than 0.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CatalogGroupUpdatedEvent.cs b/src/Flipdish/Model/CatalogGroupUpdatedEvent.cs
index 30951b69..e2e29b7a 100644
--- a/src/Flipdish/Model/CatalogGroupUpdatedEvent.cs
+++ b/src/Flipdish/Model/CatalogGroupUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CatalogGroupUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class CatalogGroupUpdatedEvent :  IEquatable<CatalogGroupUpdatedEvent>, IValidatableObject
+    public partial class CatalogGroupUpdatedEvent :  IEquatable<CatalogGroupUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogGroupUpdatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class CatalogGroupUpdatedEvent :  IEquatable<CatalogGroupUpdatedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CatalogGroupUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Group group = default(Group), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CatalogGroupUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Group group = default(Group), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class CatalogGroupUpdatedEvent :  IEquatable<CatalogGroupUpdatedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class CatalogGroupUpdatedEvent :  IEquatable<CatalogGroupUpdatedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class CatalogGroupUpdatedEvent :  IEquatable<CatalogGroupUpdatedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(CatalogGroupUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CatalogImage.cs b/src/Flipdish/Model/CatalogImage.cs
index d3b9676b..03cd81db 100644
--- a/src/Flipdish/Model/CatalogImage.cs
+++ b/src/Flipdish/Model/CatalogImage.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Catalog Image
     /// </summary>
     [DataContract]
-    public partial class CatalogImage :  IEquatable<CatalogImage>, IValidatableObject
+    public partial class CatalogImage :  IEquatable<CatalogImage>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogImage" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CatalogItem.cs b/src/Flipdish/Model/CatalogItem.cs
index 7a0beb16..0b94598f 100644
--- a/src/Flipdish/Model/CatalogItem.cs
+++ b/src/Flipdish/Model/CatalogItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CatalogItem
     /// </summary>
     [DataContract]
-    public partial class CatalogItem :  IEquatable<CatalogItem>, IValidatableObject
+    public partial class CatalogItem :  IEquatable<CatalogItem>
     {
         /// <summary>
         /// Type of item (Product, Modifier, etc)
@@ -338,82 +336,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 3000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 3000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CatalogItemArchivedEvent.cs b/src/Flipdish/Model/CatalogItemArchivedEvent.cs
index a7a2dc5e..a5d723b9 100644
--- a/src/Flipdish/Model/CatalogItemArchivedEvent.cs
+++ b/src/Flipdish/Model/CatalogItemArchivedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CatalogItemArchivedEvent
     /// </summary>
     [DataContract]
-    public partial class CatalogItemArchivedEvent :  IEquatable<CatalogItemArchivedEvent>, IValidatableObject
+    public partial class CatalogItemArchivedEvent :  IEquatable<CatalogItemArchivedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogItemArchivedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class CatalogItemArchivedEvent :  IEquatable<CatalogItemArchivedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CatalogItemArchivedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), CatalogItem catalogItem = default(CatalogItem), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CatalogItemArchivedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), CatalogItem catalogItem = default(CatalogItem), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class CatalogItemArchivedEvent :  IEquatable<CatalogItemArchivedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class CatalogItemArchivedEvent :  IEquatable<CatalogItemArchivedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class CatalogItemArchivedEvent :  IEquatable<CatalogItemArchivedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(CatalogItemArchivedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CatalogItemCreatedEvent.cs b/src/Flipdish/Model/CatalogItemCreatedEvent.cs
index 9dd5a597..c2eb057e 100644
--- a/src/Flipdish/Model/CatalogItemCreatedEvent.cs
+++ b/src/Flipdish/Model/CatalogItemCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CatalogItemCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class CatalogItemCreatedEvent :  IEquatable<CatalogItemCreatedEvent>, IValidatableObject
+    public partial class CatalogItemCreatedEvent :  IEquatable<CatalogItemCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogItemCreatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class CatalogItemCreatedEvent :  IEquatable<CatalogItemCreatedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CatalogItemCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), CatalogItem catalogItem = default(CatalogItem), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CatalogItemCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), CatalogItem catalogItem = default(CatalogItem), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class CatalogItemCreatedEvent :  IEquatable<CatalogItemCreatedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class CatalogItemCreatedEvent :  IEquatable<CatalogItemCreatedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class CatalogItemCreatedEvent :  IEquatable<CatalogItemCreatedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(CatalogItemCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CatalogItemReference.cs b/src/Flipdish/Model/CatalogItemReference.cs
deleted file mode 100644
index 28c85e00..00000000
--- a/src/Flipdish/Model/CatalogItemReference.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Catalog Item associated
-    /// </summary>
-    [DataContract]
-    public partial class CatalogItemReference :  IEquatable<CatalogItemReference>, IValidatableObject
-    {
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ItemTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Product for value: Product
-            /// </summary>
-            [EnumMember(Value = "Product")]
-            Product = 1,
-            
-            /// <summary>
-            /// Enum Modifier for value: Modifier
-            /// </summary>
-            [EnumMember(Value = "Modifier")]
-            Modifier = 2
-        }
-
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [DataMember(Name="ItemType", EmitDefaultValue=false)]
-        public ItemTypeEnum ItemType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CatalogItemReference" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected CatalogItemReference() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CatalogItemReference" /> class.
-        /// </summary>
-        /// <param name="item">Details of the referenced {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem}.</param>
-        /// <param name="catalogItemId">Identifier of the CatalogItemId to use as SubProduct (required).</param>
-        /// <param name="itemType">Type of the SupProduct (required).</param>
-        /// <param name="preselectedQuantity">Quantity of the modifier that will be set when the parent product is placed in the basket.</param>
-        public CatalogItemReference(CatalogItem item = default(CatalogItem), string catalogItemId = default(string), ItemTypeEnum itemType = default(ItemTypeEnum), int? preselectedQuantity = default(int?))
-        {
-            // to ensure "catalogItemId" is required (not null)
-            if (catalogItemId == null)
-            {
-                throw new InvalidDataException("catalogItemId is a required property for CatalogItemReference and cannot be null");
-            }
-            else
-            {
-                this.CatalogItemId = catalogItemId;
-            }
-            // to ensure "itemType" is required (not null)
-            if (itemType == null)
-            {
-                throw new InvalidDataException("itemType is a required property for CatalogItemReference and cannot be null");
-            }
-            else
-            {
-                this.ItemType = itemType;
-            }
-            this.Item = item;
-            this.PreselectedQuantity = preselectedQuantity;
-        }
-        
-        /// <summary>
-        /// Details of the referenced {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem}
-        /// </summary>
-        /// <value>Details of the referenced {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem}</value>
-        [DataMember(Name="Item", EmitDefaultValue=false)]
-        public CatalogItem Item { get; set; }
-
-        /// <summary>
-        /// Identifier of the CatalogItemId to use as SubProduct
-        /// </summary>
-        /// <value>Identifier of the CatalogItemId to use as SubProduct</value>
-        [DataMember(Name="CatalogItemId", EmitDefaultValue=false)]
-        public string CatalogItemId { get; set; }
-
-
-        /// <summary>
-        /// Quantity of the modifier that will be set when the parent product is placed in the basket
-        /// </summary>
-        /// <value>Quantity of the modifier that will be set when the parent product is placed in the basket</value>
-        [DataMember(Name="PreselectedQuantity", EmitDefaultValue=false)]
-        public int? PreselectedQuantity { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CatalogItemReference {\n");
-            sb.Append("  Item: ").Append(Item).Append("\n");
-            sb.Append("  CatalogItemId: ").Append(CatalogItemId).Append("\n");
-            sb.Append("  ItemType: ").Append(ItemType).Append("\n");
-            sb.Append("  PreselectedQuantity: ").Append(PreselectedQuantity).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CatalogItemReference);
-        }
-
-        /// <summary>
-        /// Returns true if CatalogItemReference instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CatalogItemReference to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CatalogItemReference input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Item == input.Item ||
-                    (this.Item != null &&
-                    this.Item.Equals(input.Item))
-                ) && 
-                (
-                    this.CatalogItemId == input.CatalogItemId ||
-                    (this.CatalogItemId != null &&
-                    this.CatalogItemId.Equals(input.CatalogItemId))
-                ) && 
-                (
-                    this.ItemType == input.ItemType ||
-                    (this.ItemType != null &&
-                    this.ItemType.Equals(input.ItemType))
-                ) && 
-                (
-                    this.PreselectedQuantity == input.PreselectedQuantity ||
-                    (this.PreselectedQuantity != null &&
-                    this.PreselectedQuantity.Equals(input.PreselectedQuantity))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Item != null)
-                    hashCode = hashCode * 59 + this.Item.GetHashCode();
-                if (this.CatalogItemId != null)
-                    hashCode = hashCode * 59 + this.CatalogItemId.GetHashCode();
-                if (this.ItemType != null)
-                    hashCode = hashCode * 59 + this.ItemType.GetHashCode();
-                if (this.PreselectedQuantity != null)
-                    hashCode = hashCode * 59 + this.PreselectedQuantity.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CatalogItemUpdatedEvent.cs b/src/Flipdish/Model/CatalogItemUpdatedEvent.cs
index b71ae55d..454d2314 100644
--- a/src/Flipdish/Model/CatalogItemUpdatedEvent.cs
+++ b/src/Flipdish/Model/CatalogItemUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CatalogItemUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class CatalogItemUpdatedEvent :  IEquatable<CatalogItemUpdatedEvent>, IValidatableObject
+    public partial class CatalogItemUpdatedEvent :  IEquatable<CatalogItemUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogItemUpdatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class CatalogItemUpdatedEvent :  IEquatable<CatalogItemUpdatedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CatalogItemUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), CatalogItem catalogItem = default(CatalogItem), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CatalogItemUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), CatalogItem catalogItem = default(CatalogItem), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class CatalogItemUpdatedEvent :  IEquatable<CatalogItemUpdatedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class CatalogItemUpdatedEvent :  IEquatable<CatalogItemUpdatedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class CatalogItemUpdatedEvent :  IEquatable<CatalogItemUpdatedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(CatalogItemUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CertificateCreatedEvent.cs b/src/Flipdish/Model/CertificateCreatedEvent.cs
index a0b61f43..4450ccf6 100644
--- a/src/Flipdish/Model/CertificateCreatedEvent.cs
+++ b/src/Flipdish/Model/CertificateCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// The DNS for the Hostname verified
     /// </summary>
     [DataContract]
-    public partial class CertificateCreatedEvent :  IEquatable<CertificateCreatedEvent>, IValidatableObject
+    public partial class CertificateCreatedEvent :  IEquatable<CertificateCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CertificateCreatedEvent" /> class.
@@ -39,8 +37,11 @@ public partial class CertificateCreatedEvent :  IEquatable<CertificateCreatedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CertificateCreatedEvent(string hostname = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CertificateCreatedEvent(string hostname = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.Hostname = hostname;
             this.EventName = eventName;
@@ -48,7 +49,10 @@ public partial class CertificateCreatedEvent :  IEquatable<CertificateCreatedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -93,6 +97,13 @@ public partial class CertificateCreatedEvent :  IEquatable<CertificateCreatedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -100,6 +111,20 @@ public partial class CertificateCreatedEvent :  IEquatable<CertificateCreatedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -114,7 +139,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -179,10 +207,25 @@ public bool Equals(CertificateCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -207,21 +250,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CertificateRenewedEvent.cs b/src/Flipdish/Model/CertificateRenewedEvent.cs
index 1a7c87df..f8c97cf1 100644
--- a/src/Flipdish/Model/CertificateRenewedEvent.cs
+++ b/src/Flipdish/Model/CertificateRenewedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// The DNS for the Hostname verified
     /// </summary>
     [DataContract]
-    public partial class CertificateRenewedEvent :  IEquatable<CertificateRenewedEvent>, IValidatableObject
+    public partial class CertificateRenewedEvent :  IEquatable<CertificateRenewedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CertificateRenewedEvent" /> class.
@@ -39,8 +37,11 @@ public partial class CertificateRenewedEvent :  IEquatable<CertificateRenewedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CertificateRenewedEvent(string hostname = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CertificateRenewedEvent(string hostname = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.Hostname = hostname;
             this.EventName = eventName;
@@ -48,7 +49,10 @@ public partial class CertificateRenewedEvent :  IEquatable<CertificateRenewedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -93,6 +97,13 @@ public partial class CertificateRenewedEvent :  IEquatable<CertificateRenewedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -100,6 +111,20 @@ public partial class CertificateRenewedEvent :  IEquatable<CertificateRenewedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -114,7 +139,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -179,10 +207,25 @@ public bool Equals(CertificateRenewedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -207,21 +250,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ChangePasswordModel.cs b/src/Flipdish/Model/ChangePasswordModel.cs
index 5f3fd2ec..a700f8ee 100644
--- a/src/Flipdish/Model/ChangePasswordModel.cs
+++ b/src/Flipdish/Model/ChangePasswordModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Change password model
     /// </summary>
     [DataContract]
-    public partial class ChangePasswordModel :  IEquatable<ChangePasswordModel>, IValidatableObject
+    public partial class ChangePasswordModel :  IEquatable<ChangePasswordModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ChangePasswordModel" /> class.
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Channel.cs b/src/Flipdish/Model/Channel.cs
index c7affacf..39c47fd8 100644
--- a/src/Flipdish/Model/Channel.cs
+++ b/src/Flipdish/Model/Channel.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Channel
+    /// Channel.
     /// </summary>
     [DataContract]
-    public partial class Channel :  IEquatable<Channel>, IValidatableObject
+    public partial class Channel :  IEquatable<Channel>
     {
         /// <summary>
         /// Channel Source
@@ -216,16 +214,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ChannelStoreMapping.cs b/src/Flipdish/Model/ChannelStoreMapping.cs
deleted file mode 100644
index f644f7d9..00000000
--- a/src/Flipdish/Model/ChannelStoreMapping.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Describes a channel store mapping
-    /// </summary>
-    [DataContract]
-    public partial class ChannelStoreMapping :  IEquatable<ChannelStoreMapping>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChannelStoreMapping" /> class.
-        /// </summary>
-        /// <param name="storeId">storeId.</param>
-        /// <param name="channelStoreId">channelStoreId.</param>
-        public ChannelStoreMapping(int? storeId = default(int?), string channelStoreId = default(string))
-        {
-            this.StoreId = storeId;
-            this.ChannelStoreId = channelStoreId;
-        }
-        
-        /// <summary>
-        /// Gets or Sets StoreId
-        /// </summary>
-        [DataMember(Name="StoreId", EmitDefaultValue=false)]
-        public int? StoreId { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ChannelStoreId
-        /// </summary>
-        [DataMember(Name="ChannelStoreId", EmitDefaultValue=false)]
-        public string ChannelStoreId { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class ChannelStoreMapping {\n");
-            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
-            sb.Append("  ChannelStoreId: ").Append(ChannelStoreId).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as ChannelStoreMapping);
-        }
-
-        /// <summary>
-        /// Returns true if ChannelStoreMapping instances are equal
-        /// </summary>
-        /// <param name="input">Instance of ChannelStoreMapping to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(ChannelStoreMapping input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.StoreId == input.StoreId ||
-                    (this.StoreId != null &&
-                    this.StoreId.Equals(input.StoreId))
-                ) && 
-                (
-                    this.ChannelStoreId == input.ChannelStoreId ||
-                    (this.ChannelStoreId != null &&
-                    this.ChannelStoreId.Equals(input.ChannelStoreId))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.StoreId != null)
-                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
-                if (this.ChannelStoreId != null)
-                    hashCode = hashCode * 59 + this.ChannelStoreId.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/ChannelStoresUpdatedEvent.cs b/src/Flipdish/Model/ChannelStoresUpdatedEvent.cs
new file mode 100644
index 00000000..d99a0393
--- /dev/null
+++ b/src/Flipdish/Model/ChannelStoresUpdatedEvent.cs
@@ -0,0 +1,300 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Channel Stores Updated Event
+    /// </summary>
+    [DataContract]
+    public partial class ChannelStoresUpdatedEvent :  IEquatable<ChannelStoresUpdatedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ChannelStoresUpdatedEvent" /> class.
+        /// </summary>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="channelId">ID of the channel.</param>
+        /// <param name="storeIds">List of store ids.</param>
+        /// <param name="user">User info.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public ChannelStoresUpdatedEvent(string eventName = default(string), int? channelId = default(int?), List<int?> storeIds = default(List<int?>), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.EventName = eventName;
+            this.ChannelId = channelId;
+            this.StoreIds = storeIds;
+            this.User = user;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// ID of the channel
+        /// </summary>
+        /// <value>ID of the channel</value>
+        [DataMember(Name="ChannelId", EmitDefaultValue=false)]
+        public int? ChannelId { get; set; }
+
+        /// <summary>
+        /// List of store ids
+        /// </summary>
+        /// <value>List of store ids</value>
+        [DataMember(Name="StoreIds", EmitDefaultValue=false)]
+        public List<int?> StoreIds { get; set; }
+
+        /// <summary>
+        /// User info
+        /// </summary>
+        /// <value>User info</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ChannelStoresUpdatedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  ChannelId: ").Append(ChannelId).Append("\n");
+            sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ChannelStoresUpdatedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if ChannelStoresUpdatedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ChannelStoresUpdatedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ChannelStoresUpdatedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.ChannelId == input.ChannelId ||
+                    (this.ChannelId != null &&
+                    this.ChannelId.Equals(input.ChannelId))
+                ) && 
+                (
+                    this.StoreIds == input.StoreIds ||
+                    this.StoreIds != null &&
+                    this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.ChannelId != null)
+                    hashCode = hashCode * 59 + this.ChannelId.GetHashCode();
+                if (this.StoreIds != null)
+                    hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ChargebackDetails.cs b/src/Flipdish/Model/ChargebackDetails.cs
index 953648fe..0f849b2d 100644
--- a/src/Flipdish/Model/ChargebackDetails.cs
+++ b/src/Flipdish/Model/ChargebackDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,18 +26,20 @@ namespace Flipdish.Model
     /// Chargebacks breakdown
     /// </summary>
     [DataContract]
-    public partial class ChargebackDetails :  IEquatable<ChargebackDetails>, IValidatableObject
+    public partial class ChargebackDetails :  IEquatable<ChargebackDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ChargebackDetails" /> class.
         /// </summary>
         /// <param name="chargebackAmount">Chargeback amount.</param>
+        /// <param name="posSalesChargebackAmount">POS Chargeback amount.</param>
         /// <param name="chargebackRefundedFees">Chargeback refunded feeds.</param>
         /// <param name="chargebacksCount">Number of chargebacks.</param>
         /// <param name="totalChargebackCost">Total amount.</param>
-        public ChargebackDetails(double? chargebackAmount = default(double?), double? chargebackRefundedFees = default(double?), int? chargebacksCount = default(int?), double? totalChargebackCost = default(double?))
+        public ChargebackDetails(double? chargebackAmount = default(double?), double? posSalesChargebackAmount = default(double?), double? chargebackRefundedFees = default(double?), int? chargebacksCount = default(int?), double? totalChargebackCost = default(double?))
         {
             this.ChargebackAmount = chargebackAmount;
+            this.PosSalesChargebackAmount = posSalesChargebackAmount;
             this.ChargebackRefundedFees = chargebackRefundedFees;
             this.ChargebacksCount = chargebacksCount;
             this.TotalChargebackCost = totalChargebackCost;
@@ -52,6 +52,13 @@ public partial class ChargebackDetails :  IEquatable<ChargebackDetails>, IValida
         [DataMember(Name="ChargebackAmount", EmitDefaultValue=false)]
         public double? ChargebackAmount { get; set; }
 
+        /// <summary>
+        /// POS Chargeback amount
+        /// </summary>
+        /// <value>POS Chargeback amount</value>
+        [DataMember(Name="PosSalesChargebackAmount", EmitDefaultValue=false)]
+        public double? PosSalesChargebackAmount { get; set; }
+
         /// <summary>
         /// Chargeback refunded feeds
         /// </summary>
@@ -82,6 +89,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class ChargebackDetails {\n");
             sb.Append("  ChargebackAmount: ").Append(ChargebackAmount).Append("\n");
+            sb.Append("  PosSalesChargebackAmount: ").Append(PosSalesChargebackAmount).Append("\n");
             sb.Append("  ChargebackRefundedFees: ").Append(ChargebackRefundedFees).Append("\n");
             sb.Append("  ChargebacksCount: ").Append(ChargebacksCount).Append("\n");
             sb.Append("  TotalChargebackCost: ").Append(TotalChargebackCost).Append("\n");
@@ -124,6 +132,11 @@ public bool Equals(ChargebackDetails input)
                     (this.ChargebackAmount != null &&
                     this.ChargebackAmount.Equals(input.ChargebackAmount))
                 ) && 
+                (
+                    this.PosSalesChargebackAmount == input.PosSalesChargebackAmount ||
+                    (this.PosSalesChargebackAmount != null &&
+                    this.PosSalesChargebackAmount.Equals(input.PosSalesChargebackAmount))
+                ) && 
                 (
                     this.ChargebackRefundedFees == input.ChargebackRefundedFees ||
                     (this.ChargebackRefundedFees != null &&
@@ -152,6 +165,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.ChargebackAmount != null)
                     hashCode = hashCode * 59 + this.ChargebackAmount.GetHashCode();
+                if (this.PosSalesChargebackAmount != null)
+                    hashCode = hashCode * 59 + this.PosSalesChargebackAmount.GetHashCode();
                 if (this.ChargebackRefundedFees != null)
                     hashCode = hashCode * 59 + this.ChargebackRefundedFees.GetHashCode();
                 if (this.ChargebacksCount != null)
@@ -161,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ClientDevice.cs b/src/Flipdish/Model/ClientDevice.cs
new file mode 100644
index 00000000..0bc31919
--- /dev/null
+++ b/src/Flipdish/Model/ClientDevice.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Client Device
+    /// </summary>
+    [DataContract]
+    public partial class ClientDevice :  IEquatable<ClientDevice>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClientDevice" /> class.
+        /// </summary>
+        /// <param name="deviceModel">Device Model.</param>
+        /// <param name="deviceId">Device Id.</param>
+        /// <param name="deviceName">Device Name.</param>
+        public ClientDevice(string deviceModel = default(string), string deviceId = default(string), string deviceName = default(string))
+        {
+            this.DeviceModel = deviceModel;
+            this.DeviceId = deviceId;
+            this.DeviceName = deviceName;
+        }
+        
+        /// <summary>
+        /// Device Model
+        /// </summary>
+        /// <value>Device Model</value>
+        [DataMember(Name="DeviceModel", EmitDefaultValue=false)]
+        public string DeviceModel { get; set; }
+
+        /// <summary>
+        /// Device Id
+        /// </summary>
+        /// <value>Device Id</value>
+        [DataMember(Name="DeviceId", EmitDefaultValue=false)]
+        public string DeviceId { get; set; }
+
+        /// <summary>
+        /// Device Name
+        /// </summary>
+        /// <value>Device Name</value>
+        [DataMember(Name="DeviceName", EmitDefaultValue=false)]
+        public string DeviceName { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ClientDevice {\n");
+            sb.Append("  DeviceModel: ").Append(DeviceModel).Append("\n");
+            sb.Append("  DeviceId: ").Append(DeviceId).Append("\n");
+            sb.Append("  DeviceName: ").Append(DeviceName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ClientDevice);
+        }
+
+        /// <summary>
+        /// Returns true if ClientDevice instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ClientDevice to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ClientDevice input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeviceModel == input.DeviceModel ||
+                    (this.DeviceModel != null &&
+                    this.DeviceModel.Equals(input.DeviceModel))
+                ) && 
+                (
+                    this.DeviceId == input.DeviceId ||
+                    (this.DeviceId != null &&
+                    this.DeviceId.Equals(input.DeviceId))
+                ) && 
+                (
+                    this.DeviceName == input.DeviceName ||
+                    (this.DeviceName != null &&
+                    this.DeviceName.Equals(input.DeviceName))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeviceModel != null)
+                    hashCode = hashCode * 59 + this.DeviceModel.GetHashCode();
+                if (this.DeviceId != null)
+                    hashCode = hashCode * 59 + this.DeviceId.GetHashCode();
+                if (this.DeviceName != null)
+                    hashCode = hashCode * 59 + this.DeviceName.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ClientDeviceAssignEnrolledDevice.cs b/src/Flipdish/Model/ClientDeviceAssignEnrolledDevice.cs
new file mode 100644
index 00000000..555df15b
--- /dev/null
+++ b/src/Flipdish/Model/ClientDeviceAssignEnrolledDevice.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Assign enrolled device to AppId
+    /// </summary>
+    [DataContract]
+    public partial class ClientDeviceAssignEnrolledDevice :  IEquatable<ClientDeviceAssignEnrolledDevice>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClientDeviceAssignEnrolledDevice" /> class.
+        /// </summary>
+        /// <param name="deviceModel">Device Model.</param>
+        /// <param name="pinCode">Pin Code.</param>
+        public ClientDeviceAssignEnrolledDevice(string deviceModel = default(string), string pinCode = default(string))
+        {
+            this.DeviceModel = deviceModel;
+            this.PinCode = pinCode;
+        }
+        
+        /// <summary>
+        /// Device Model
+        /// </summary>
+        /// <value>Device Model</value>
+        [DataMember(Name="DeviceModel", EmitDefaultValue=false)]
+        public string DeviceModel { get; set; }
+
+        /// <summary>
+        /// Pin Code
+        /// </summary>
+        /// <value>Pin Code</value>
+        [DataMember(Name="PinCode", EmitDefaultValue=false)]
+        public string PinCode { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ClientDeviceAssignEnrolledDevice {\n");
+            sb.Append("  DeviceModel: ").Append(DeviceModel).Append("\n");
+            sb.Append("  PinCode: ").Append(PinCode).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ClientDeviceAssignEnrolledDevice);
+        }
+
+        /// <summary>
+        /// Returns true if ClientDeviceAssignEnrolledDevice instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ClientDeviceAssignEnrolledDevice to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ClientDeviceAssignEnrolledDevice input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeviceModel == input.DeviceModel ||
+                    (this.DeviceModel != null &&
+                    this.DeviceModel.Equals(input.DeviceModel))
+                ) && 
+                (
+                    this.PinCode == input.PinCode ||
+                    (this.PinCode != null &&
+                    this.PinCode.Equals(input.PinCode))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeviceModel != null)
+                    hashCode = hashCode * 59 + this.DeviceModel.GetHashCode();
+                if (this.PinCode != null)
+                    hashCode = hashCode * 59 + this.PinCode.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ClientDeviceEnroll.cs b/src/Flipdish/Model/ClientDeviceEnroll.cs
new file mode 100644
index 00000000..a6336e0f
--- /dev/null
+++ b/src/Flipdish/Model/ClientDeviceEnroll.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Enroll a client device
+    /// </summary>
+    [DataContract]
+    public partial class ClientDeviceEnroll :  IEquatable<ClientDeviceEnroll>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClientDeviceEnroll" /> class.
+        /// </summary>
+        /// <param name="deviceModel">Device model.</param>
+        /// <param name="deviceId">Device Id.</param>
+        /// <param name="deviceName">Device Name.</param>
+        public ClientDeviceEnroll(string deviceModel = default(string), string deviceId = default(string), string deviceName = default(string))
+        {
+            this.DeviceModel = deviceModel;
+            this.DeviceId = deviceId;
+            this.DeviceName = deviceName;
+        }
+        
+        /// <summary>
+        /// Device model
+        /// </summary>
+        /// <value>Device model</value>
+        [DataMember(Name="DeviceModel", EmitDefaultValue=false)]
+        public string DeviceModel { get; set; }
+
+        /// <summary>
+        /// Device Id
+        /// </summary>
+        /// <value>Device Id</value>
+        [DataMember(Name="DeviceId", EmitDefaultValue=false)]
+        public string DeviceId { get; set; }
+
+        /// <summary>
+        /// Device Name
+        /// </summary>
+        /// <value>Device Name</value>
+        [DataMember(Name="DeviceName", EmitDefaultValue=false)]
+        public string DeviceName { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ClientDeviceEnroll {\n");
+            sb.Append("  DeviceModel: ").Append(DeviceModel).Append("\n");
+            sb.Append("  DeviceId: ").Append(DeviceId).Append("\n");
+            sb.Append("  DeviceName: ").Append(DeviceName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ClientDeviceEnroll);
+        }
+
+        /// <summary>
+        /// Returns true if ClientDeviceEnroll instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ClientDeviceEnroll to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ClientDeviceEnroll input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeviceModel == input.DeviceModel ||
+                    (this.DeviceModel != null &&
+                    this.DeviceModel.Equals(input.DeviceModel))
+                ) && 
+                (
+                    this.DeviceId == input.DeviceId ||
+                    (this.DeviceId != null &&
+                    this.DeviceId.Equals(input.DeviceId))
+                ) && 
+                (
+                    this.DeviceName == input.DeviceName ||
+                    (this.DeviceName != null &&
+                    this.DeviceName.Equals(input.DeviceName))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeviceModel != null)
+                    hashCode = hashCode * 59 + this.DeviceModel.GetHashCode();
+                if (this.DeviceId != null)
+                    hashCode = hashCode * 59 + this.DeviceId.GetHashCode();
+                if (this.DeviceName != null)
+                    hashCode = hashCode * 59 + this.DeviceName.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ClientDeviceEnrollmentResult.cs b/src/Flipdish/Model/ClientDeviceEnrollmentResult.cs
new file mode 100644
index 00000000..9e9a7a42
--- /dev/null
+++ b/src/Flipdish/Model/ClientDeviceEnrollmentResult.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Device enrollment result
+    /// </summary>
+    [DataContract]
+    public partial class ClientDeviceEnrollmentResult :  IEquatable<ClientDeviceEnrollmentResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClientDeviceEnrollmentResult" /> class.
+        /// </summary>
+        /// <param name="pinCode">PIN Code for assigning.</param>
+        public ClientDeviceEnrollmentResult(string pinCode = default(string))
+        {
+            this.PinCode = pinCode;
+        }
+        
+        /// <summary>
+        /// PIN Code for assigning
+        /// </summary>
+        /// <value>PIN Code for assigning</value>
+        [DataMember(Name="PinCode", EmitDefaultValue=false)]
+        public string PinCode { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ClientDeviceEnrollmentResult {\n");
+            sb.Append("  PinCode: ").Append(PinCode).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ClientDeviceEnrollmentResult);
+        }
+
+        /// <summary>
+        /// Returns true if ClientDeviceEnrollmentResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ClientDeviceEnrollmentResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ClientDeviceEnrollmentResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PinCode == input.PinCode ||
+                    (this.PinCode != null &&
+                    this.PinCode.Equals(input.PinCode))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PinCode != null)
+                    hashCode = hashCode * 59 + this.PinCode.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ClientDeviceSummary.cs b/src/Flipdish/Model/ClientDeviceSummary.cs
new file mode 100644
index 00000000..9b3affb5
--- /dev/null
+++ b/src/Flipdish/Model/ClientDeviceSummary.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Client Device summary (header fields)
+    /// </summary>
+    [DataContract]
+    public partial class ClientDeviceSummary :  IEquatable<ClientDeviceSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClientDeviceSummary" /> class.
+        /// </summary>
+        /// <param name="deviceModel">Device Model.</param>
+        /// <param name="deviceId">Device Id.</param>
+        /// <param name="deviceName">Device Name.</param>
+        public ClientDeviceSummary(string deviceModel = default(string), string deviceId = default(string), string deviceName = default(string))
+        {
+            this.DeviceModel = deviceModel;
+            this.DeviceId = deviceId;
+            this.DeviceName = deviceName;
+        }
+        
+        /// <summary>
+        /// Device Model
+        /// </summary>
+        /// <value>Device Model</value>
+        [DataMember(Name="DeviceModel", EmitDefaultValue=false)]
+        public string DeviceModel { get; set; }
+
+        /// <summary>
+        /// Device Id
+        /// </summary>
+        /// <value>Device Id</value>
+        [DataMember(Name="DeviceId", EmitDefaultValue=false)]
+        public string DeviceId { get; set; }
+
+        /// <summary>
+        /// Device Name
+        /// </summary>
+        /// <value>Device Name</value>
+        [DataMember(Name="DeviceName", EmitDefaultValue=false)]
+        public string DeviceName { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ClientDeviceSummary {\n");
+            sb.Append("  DeviceModel: ").Append(DeviceModel).Append("\n");
+            sb.Append("  DeviceId: ").Append(DeviceId).Append("\n");
+            sb.Append("  DeviceName: ").Append(DeviceName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ClientDeviceSummary);
+        }
+
+        /// <summary>
+        /// Returns true if ClientDeviceSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ClientDeviceSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ClientDeviceSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeviceModel == input.DeviceModel ||
+                    (this.DeviceModel != null &&
+                    this.DeviceModel.Equals(input.DeviceModel))
+                ) && 
+                (
+                    this.DeviceId == input.DeviceId ||
+                    (this.DeviceId != null &&
+                    this.DeviceId.Equals(input.DeviceId))
+                ) && 
+                (
+                    this.DeviceName == input.DeviceName ||
+                    (this.DeviceName != null &&
+                    this.DeviceName.Equals(input.DeviceName))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeviceModel != null)
+                    hashCode = hashCode * 59 + this.DeviceModel.GetHashCode();
+                if (this.DeviceId != null)
+                    hashCode = hashCode * 59 + this.DeviceId.GetHashCode();
+                if (this.DeviceName != null)
+                    hashCode = hashCode * 59 + this.DeviceName.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ConfiguredAppHeader.cs b/src/Flipdish/Model/ConfiguredAppHeader.cs
deleted file mode 100644
index 98eb2845..00000000
--- a/src/Flipdish/Model/ConfiguredAppHeader.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Configured app item for list
-    /// </summary>
-    [DataContract]
-    public partial class ConfiguredAppHeader :  IEquatable<ConfiguredAppHeader>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConfiguredAppHeader" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected ConfiguredAppHeader() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConfiguredAppHeader" /> class.
-        /// </summary>
-        /// <param name="name">Name (required).</param>
-        /// <param name="appStoreAppId">AppStore App Id (required).</param>
-        public ConfiguredAppHeader(string name = default(string), string appStoreAppId = default(string))
-        {
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for ConfiguredAppHeader and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            // to ensure "appStoreAppId" is required (not null)
-            if (appStoreAppId == null)
-            {
-                throw new InvalidDataException("appStoreAppId is a required property for ConfiguredAppHeader and cannot be null");
-            }
-            else
-            {
-                this.AppStoreAppId = appStoreAppId;
-            }
-        }
-        
-        /// <summary>
-        /// Name
-        /// </summary>
-        /// <value>Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// AppStore App Id
-        /// </summary>
-        /// <value>AppStore App Id</value>
-        [DataMember(Name="AppStoreAppId", EmitDefaultValue=false)]
-        public string AppStoreAppId { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class ConfiguredAppHeader {\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  AppStoreAppId: ").Append(AppStoreAppId).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as ConfiguredAppHeader);
-        }
-
-        /// <summary>
-        /// Returns true if ConfiguredAppHeader instances are equal
-        /// </summary>
-        /// <param name="input">Instance of ConfiguredAppHeader to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(ConfiguredAppHeader input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.AppStoreAppId == input.AppStoreAppId ||
-                    (this.AppStoreAppId != null &&
-                    this.AppStoreAppId.Equals(input.AppStoreAppId))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.AppStoreAppId != null)
-                    hashCode = hashCode * 59 + this.AppStoreAppId.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/ConfiguredPhysicalRestaurant.cs b/src/Flipdish/Model/ConfiguredPhysicalRestaurant.cs
deleted file mode 100644
index 7150db4e..00000000
--- a/src/Flipdish/Model/ConfiguredPhysicalRestaurant.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Configured stores
-    /// </summary>
-    [DataContract]
-    public partial class ConfiguredPhysicalRestaurant :  IEquatable<ConfiguredPhysicalRestaurant>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConfiguredPhysicalRestaurant" /> class.
-        /// </summary>
-        /// <param name="storeId">Store id.</param>
-        /// <param name="name">Name of store.</param>
-        public ConfiguredPhysicalRestaurant(int? storeId = default(int?), string name = default(string))
-        {
-            this.StoreId = storeId;
-            this.Name = name;
-        }
-        
-        /// <summary>
-        /// Store id
-        /// </summary>
-        /// <value>Store id</value>
-        [DataMember(Name="StoreId", EmitDefaultValue=false)]
-        public int? StoreId { get; set; }
-
-        /// <summary>
-        /// Name of store
-        /// </summary>
-        /// <value>Name of store</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class ConfiguredPhysicalRestaurant {\n");
-            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as ConfiguredPhysicalRestaurant);
-        }
-
-        /// <summary>
-        /// Returns true if ConfiguredPhysicalRestaurant instances are equal
-        /// </summary>
-        /// <param name="input">Instance of ConfiguredPhysicalRestaurant to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(ConfiguredPhysicalRestaurant input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.StoreId == input.StoreId ||
-                    (this.StoreId != null &&
-                    this.StoreId.Equals(input.StoreId))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.StoreId != null)
-                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/ConfiguredStore.cs b/src/Flipdish/Model/ConfiguredStore.cs
index b35023af..3f3e9019 100644
--- a/src/Flipdish/Model/ConfiguredStore.cs
+++ b/src/Flipdish/Model/ConfiguredStore.cs
@@ -12,29 +12,27 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Configured stores
+    /// ConfiguredStore
     /// </summary>
     [DataContract]
-    public partial class ConfiguredStore :  IEquatable<ConfiguredStore>, IValidatableObject
+    public partial class ConfiguredStore :  IEquatable<ConfiguredStore>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ConfiguredStore" /> class.
         /// </summary>
-        /// <param name="storeId">Store id.</param>
-        /// <param name="name">Name of store.</param>
+        /// <param name="storeId">storeId.</param>
+        /// <param name="name">name.</param>
         public ConfiguredStore(int? storeId = default(int?), string name = default(string))
         {
             this.StoreId = storeId;
@@ -42,16 +40,14 @@ public partial class ConfiguredStore :  IEquatable<ConfiguredStore>, IValidatabl
         }
         
         /// <summary>
-        /// Store id
+        /// Gets or Sets StoreId
         /// </summary>
-        /// <value>Store id</value>
         [DataMember(Name="StoreId", EmitDefaultValue=false)]
         public int? StoreId { get; set; }
 
         /// <summary>
-        /// Name of store
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name of store</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
@@ -127,16 +123,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Contact.cs b/src/Flipdish/Model/Contact.cs
deleted file mode 100644
index 45bbff2c..00000000
--- a/src/Flipdish/Model/Contact.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Contact information for the user
-    /// </summary>
-    [DataContract]
-    public partial class Contact :  IEquatable<Contact>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Contact" /> class.
-        /// </summary>
-        /// <param name="email">Email Address.</param>
-        /// <param name="phoneNumber">International format Phone Number.</param>
-        /// <param name="firstName">First Name.</param>
-        /// <param name="lastName">Last Name.</param>
-        public Contact(string email = default(string), string phoneNumber = default(string), string firstName = default(string), string lastName = default(string))
-        {
-            this.Email = email;
-            this.PhoneNumber = phoneNumber;
-            this.FirstName = firstName;
-            this.LastName = lastName;
-        }
-        
-        /// <summary>
-        /// Email Address
-        /// </summary>
-        /// <value>Email Address</value>
-        [DataMember(Name="Email", EmitDefaultValue=false)]
-        public string Email { get; set; }
-
-        /// <summary>
-        /// International format Phone Number
-        /// </summary>
-        /// <value>International format Phone Number</value>
-        [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
-        public string PhoneNumber { get; set; }
-
-        /// <summary>
-        /// First Name
-        /// </summary>
-        /// <value>First Name</value>
-        [DataMember(Name="FirstName", EmitDefaultValue=false)]
-        public string FirstName { get; set; }
-
-        /// <summary>
-        /// Last Name
-        /// </summary>
-        /// <value>Last Name</value>
-        [DataMember(Name="LastName", EmitDefaultValue=false)]
-        public string LastName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class Contact {\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
-            sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
-            sb.Append("  FirstName: ").Append(FirstName).Append("\n");
-            sb.Append("  LastName: ").Append(LastName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Contact);
-        }
-
-        /// <summary>
-        /// Returns true if Contact instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Contact to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Contact input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Email == input.Email ||
-                    (this.Email != null &&
-                    this.Email.Equals(input.Email))
-                ) && 
-                (
-                    this.PhoneNumber == input.PhoneNumber ||
-                    (this.PhoneNumber != null &&
-                    this.PhoneNumber.Equals(input.PhoneNumber))
-                ) && 
-                (
-                    this.FirstName == input.FirstName ||
-                    (this.FirstName != null &&
-                    this.FirstName.Equals(input.FirstName))
-                ) && 
-                (
-                    this.LastName == input.LastName ||
-                    (this.LastName != null &&
-                    this.LastName.Equals(input.LastName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Email != null)
-                    hashCode = hashCode * 59 + this.Email.GetHashCode();
-                if (this.PhoneNumber != null)
-                    hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
-                if (this.FirstName != null)
-                    hashCode = hashCode * 59 + this.FirstName.GetHashCode();
-                if (this.LastName != null)
-                    hashCode = hashCode * 59 + this.LastName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/Coordinates.cs b/src/Flipdish/Model/Coordinates.cs
index f9a907c4..272b16ab 100644
--- a/src/Flipdish/Model/Coordinates.cs
+++ b/src/Flipdish/Model/Coordinates.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Coordinates
     /// </summary>
     [DataContract]
-    public partial class Coordinates :  IEquatable<Coordinates>, IValidatableObject
+    public partial class Coordinates :  IEquatable<Coordinates>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Coordinates" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CountryFormResponse.cs b/src/Flipdish/Model/CountryFormResponse.cs
index edf43a9c..d1bcf4d1 100644
--- a/src/Flipdish/Model/CountryFormResponse.cs
+++ b/src/Flipdish/Model/CountryFormResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Country
     /// </summary>
     [DataContract]
-    public partial class CountryFormResponse :  IEquatable<CountryFormResponse>, IValidatableObject
+    public partial class CountryFormResponse :  IEquatable<CountryFormResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CountryFormResponse" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CountryWithAccountFieldsDefinitions.cs b/src/Flipdish/Model/CountryWithAccountFieldsDefinitions.cs
index 00e8e742..093bc5a0 100644
--- a/src/Flipdish/Model/CountryWithAccountFieldsDefinitions.cs
+++ b/src/Flipdish/Model/CountryWithAccountFieldsDefinitions.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// List of field definitions per country
     /// </summary>
     [DataContract]
-    public partial class CountryWithAccountFieldsDefinitions :  IEquatable<CountryWithAccountFieldsDefinitions>, IValidatableObject
+    public partial class CountryWithAccountFieldsDefinitions :  IEquatable<CountryWithAccountFieldsDefinitions>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CountryWithAccountFieldsDefinitions" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateAccountModel.cs b/src/Flipdish/Model/CreateAccountModel.cs
index db4510ea..d587dea3 100644
--- a/src/Flipdish/Model/CreateAccountModel.cs
+++ b/src/Flipdish/Model/CreateAccountModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create account model
     /// </summary>
     [DataContract]
-    public partial class CreateAccountModel :  IEquatable<CreateAccountModel>, IValidatableObject
+    public partial class CreateAccountModel :  IEquatable<CreateAccountModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateAccountModel" /> class.
@@ -38,12 +36,13 @@ protected CreateAccountModel() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateAccountModel" /> class.
         /// </summary>
-        /// <param name="email">Email addres (required).</param>
+        /// <param name="email">Email address (required).</param>
         /// <param name="storeName">Store name (required).</param>
         /// <param name="languageId">LanguageId.</param>
         /// <param name="rid">Referral ID.</param>
         /// <param name="cid">Campaign ID.</param>
-        public CreateAccountModel(string email = default(string), string storeName = default(string), string languageId = default(string), int? rid = default(int?), string cid = default(string))
+        /// <param name="recaptchaToken">Google Recaptcha Token.</param>
+        public CreateAccountModel(string email = default(string), string storeName = default(string), string languageId = default(string), int? rid = default(int?), string cid = default(string), string recaptchaToken = default(string))
         {
             // to ensure "email" is required (not null)
             if (email == null)
@@ -66,12 +65,13 @@ protected CreateAccountModel() { }
             this.LanguageId = languageId;
             this.Rid = rid;
             this.Cid = cid;
+            this.RecaptchaToken = recaptchaToken;
         }
         
         /// <summary>
-        /// Email addres
+        /// Email address
         /// </summary>
-        /// <value>Email addres</value>
+        /// <value>Email address</value>
         [DataMember(Name="Email", EmitDefaultValue=false)]
         public string Email { get; set; }
 
@@ -103,6 +103,13 @@ protected CreateAccountModel() { }
         [DataMember(Name="Cid", EmitDefaultValue=false)]
         public string Cid { get; set; }
 
+        /// <summary>
+        /// Google Recaptcha Token
+        /// </summary>
+        /// <value>Google Recaptcha Token</value>
+        [DataMember(Name="RecaptchaToken", EmitDefaultValue=false)]
+        public string RecaptchaToken { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -116,6 +123,7 @@ public override string ToString()
             sb.Append("  LanguageId: ").Append(LanguageId).Append("\n");
             sb.Append("  Rid: ").Append(Rid).Append("\n");
             sb.Append("  Cid: ").Append(Cid).Append("\n");
+            sb.Append("  RecaptchaToken: ").Append(RecaptchaToken).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,6 +182,11 @@ public bool Equals(CreateAccountModel input)
                     this.Cid == input.Cid ||
                     (this.Cid != null &&
                     this.Cid.Equals(input.Cid))
+                ) && 
+                (
+                    this.RecaptchaToken == input.RecaptchaToken ||
+                    (this.RecaptchaToken != null &&
+                    this.RecaptchaToken.Equals(input.RecaptchaToken))
                 );
         }
 
@@ -196,19 +209,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Rid.GetHashCode();
                 if (this.Cid != null)
                     hashCode = hashCode * 59 + this.Cid.GetHashCode();
+                if (this.RecaptchaToken != null)
+                    hashCode = hashCode * 59 + this.RecaptchaToken.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateAppParameters.cs b/src/Flipdish/Model/CreateAppParameters.cs
new file mode 100644
index 00000000..753b7198
--- /dev/null
+++ b/src/Flipdish/Model/CreateAppParameters.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// The parameters required to create a new app.
+    /// </summary>
+    [DataContract]
+    public partial class CreateAppParameters :  IEquatable<CreateAppParameters>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateAppParameters" /> class.
+        /// </summary>
+        /// <param name="name">The name of the brand that this app/white-label represents..</param>
+        public CreateAppParameters(string name = default(string))
+        {
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// The name of the brand that this app/white-label represents.
+        /// </summary>
+        /// <value>The name of the brand that this app/white-label represents.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CreateAppParameters {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CreateAppParameters);
+        }
+
+        /// <summary>
+        /// Returns true if CreateAppParameters instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CreateAppParameters to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CreateAppParameters input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CreateAppStoreApp.cs b/src/Flipdish/Model/CreateAppStoreApp.cs
index c1573080..d95fdb6f 100644
--- a/src/Flipdish/Model/CreateAppStoreApp.cs
+++ b/src/Flipdish/Model/CreateAppStoreApp.cs
@@ -12,28 +12,25 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Create App store app
+    /// CreateAppStoreApp
     /// </summary>
     [DataContract]
-    public partial class CreateAppStoreApp :  IEquatable<CreateAppStoreApp>, IValidatableObject
+    public partial class CreateAppStoreApp :  IEquatable<CreateAppStoreApp>
     {
         /// <summary>
-        /// Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;
+        /// Defines ConfigurationType
         /// </summary>
-        /// <value>Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum ConfigurationTypeEnum
         {
@@ -52,15 +49,13 @@ public enum ConfigurationTypeEnum
         }
 
         /// <summary>
-        /// Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;
+        /// Gets or Sets ConfigurationType
         /// </summary>
-        /// <value>Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;</value>
         [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
         public ConfigurationTypeEnum ConfigurationType { get; set; }
         /// <summary>
-        /// Store selector type
+        /// Defines StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StoreSelectorTypeEnum
         {
@@ -85,15 +80,13 @@ public enum StoreSelectorTypeEnum
         }
 
         /// <summary>
-        /// Store selector type
+        /// Gets or Sets StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
         public StoreSelectorTypeEnum StoreSelectorType { get; set; }
         /// <summary>
-        /// Teammate app access level
+        /// Defines TeammateAppAccessLevel
         /// </summary>
-        /// <value>Teammate app access level</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum TeammateAppAccessLevelEnum
         {
@@ -110,53 +103,69 @@ public enum TeammateAppAccessLevelEnum
             [EnumMember(Value = "StoreOwner")]
             StoreOwner = 2,
             
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 3,
+            
             /// <summary>
             /// Enum ManagedOwner for value: ManagedOwner
             /// </summary>
             [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 3,
+            ManagedOwner = 4,
             
             /// <summary>
             /// Enum Integrator for value: Integrator
             /// </summary>
             [EnumMember(Value = "Integrator")]
-            Integrator = 4,
+            Integrator = 5,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 6,
             
             /// <summary>
             /// Enum StoreManager for value: StoreManager
             /// </summary>
             [EnumMember(Value = "StoreManager")]
-            StoreManager = 5,
+            StoreManager = 7,
             
             /// <summary>
             /// Enum StoreStaff for value: StoreStaff
             /// </summary>
             [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 6,
+            StoreStaff = 8,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 9,
             
             /// <summary>
             /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
             /// </summary>
             [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 7,
+            StoreReadOnlyAccess = 10,
             
             /// <summary>
             /// Enum FinanceManger for value: FinanceManger
             /// </summary>
             [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 8
+            FinanceManger = 11
         }
 
         /// <summary>
-        /// Teammate app access level
+        /// Gets or Sets TeammateAppAccessLevel
         /// </summary>
-        /// <value>Teammate app access level</value>
         [DataMember(Name="TeammateAppAccessLevel", EmitDefaultValue=false)]
         public TeammateAppAccessLevelEnum? TeammateAppAccessLevel { get; set; }
         /// <summary>
-        /// Permissions type
+        /// Defines PermissionsType
         /// </summary>
-        /// <value>Permissions type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum PermissionsTypeEnum
         {
@@ -169,9 +178,8 @@ public enum PermissionsTypeEnum
         }
 
         /// <summary>
-        /// Permissions type
+        /// Gets or Sets PermissionsType
         /// </summary>
-        /// <value>Permissions type</value>
         [DataMember(Name="PermissionsType", EmitDefaultValue=false)]
         public PermissionsTypeEnum PermissionsType { get; set; }
         /// <summary>
@@ -226,9 +234,8 @@ public enum CategoriesEnum
 
 
         /// <summary>
-        /// Categories
+        /// Gets or Sets Categories
         /// </summary>
-        /// <value>Categories</value>
         [DataMember(Name="Categories", EmitDefaultValue=false)]
         public List<CategoriesEnum> Categories { get; set; }
         /// <summary>
@@ -343,9 +350,8 @@ public enum CountriesEnum
 
 
         /// <summary>
-        /// Countries
+        /// Gets or Sets Countries
         /// </summary>
-        /// <value>Countries</value>
         [DataMember(Name="Countries", EmitDefaultValue=false)]
         public List<CountriesEnum> Countries { get; set; }
         /// <summary>
@@ -356,22 +362,25 @@ protected CreateAppStoreApp() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateAppStoreApp" /> class.
         /// </summary>
-        /// <param name="details">Details (required).</param>
-        /// <param name="configurationType">Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt; (required).</param>
-        /// <param name="storeSelectorType">Store selector type (required).</param>
-        /// <param name="fieldGroups">Field groups.</param>
-        /// <param name="setupInstructions">Setup instructions.</param>
-        /// <param name="externalSetupLink">External setup link.</param>
-        /// <param name="teammateAppAccessLevel">Teammate app access level.</param>
-        /// <param name="permissionsType">Permissions type (required).</param>
-        /// <param name="support">Support information.</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="isEnabled">Is application enabled.</param>
-        /// <param name="categories">Categories (required).</param>
-        /// <param name="countries">Countries (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public CreateAppStoreApp(string details = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), AppStoreAppSupportInfo support = default(AppStoreAppSupportInfo), string name = default(string), string description = default(string), bool? isEnabled = default(bool?), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
+        /// <param name="details">details (required).</param>
+        /// <param name="configurationType">configurationType (required).</param>
+        /// <param name="storeSelectorType">storeSelectorType (required).</param>
+        /// <param name="fieldGroups">fieldGroups.</param>
+        /// <param name="setupInstructions">setupInstructions.</param>
+        /// <param name="externalSetupLink">externalSetupLink.</param>
+        /// <param name="teammateAppAccessLevel">teammateAppAccessLevel.</param>
+        /// <param name="permissionsType">permissionsType (required).</param>
+        /// <param name="support">support.</param>
+        /// <param name="externalFunctionActionUrl">externalFunctionActionUrl.</param>
+        /// <param name="externalFunctionSignatureKey">externalFunctionSignatureKey.</param>
+        /// <param name="isPaid">isPaid.</param>
+        /// <param name="name">name (required).</param>
+        /// <param name="description">description (required).</param>
+        /// <param name="isEnabled">isEnabled.</param>
+        /// <param name="categories">categories (required).</param>
+        /// <param name="countries">countries (required).</param>
+        /// <param name="developerName">developerName.</param>
+        public CreateAppStoreApp(string details = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), AppStoreAppSupportInfo support = default(AppStoreAppSupportInfo), string externalFunctionActionUrl = default(string), string externalFunctionSignatureKey = default(string), bool? isPaid = default(bool?), string name = default(string), string description = default(string), bool? isEnabled = default(bool?), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
         {
             // to ensure "details" is required (not null)
             if (details == null)
@@ -450,76 +459,88 @@ protected CreateAppStoreApp() { }
             this.ExternalSetupLink = externalSetupLink;
             this.TeammateAppAccessLevel = teammateAppAccessLevel;
             this.Support = support;
+            this.ExternalFunctionActionUrl = externalFunctionActionUrl;
+            this.ExternalFunctionSignatureKey = externalFunctionSignatureKey;
+            this.IsPaid = isPaid;
             this.IsEnabled = isEnabled;
             this.DeveloperName = developerName;
         }
         
         /// <summary>
-        /// Details
+        /// Gets or Sets Details
         /// </summary>
-        /// <value>Details</value>
         [DataMember(Name="Details", EmitDefaultValue=false)]
         public string Details { get; set; }
 
 
 
         /// <summary>
-        /// Field groups
+        /// Gets or Sets FieldGroups
         /// </summary>
-        /// <value>Field groups</value>
         [DataMember(Name="FieldGroups", EmitDefaultValue=false)]
         public List<FieldGroup> FieldGroups { get; set; }
 
         /// <summary>
-        /// Setup instructions
+        /// Gets or Sets SetupInstructions
         /// </summary>
-        /// <value>Setup instructions</value>
         [DataMember(Name="SetupInstructions", EmitDefaultValue=false)]
         public string SetupInstructions { get; set; }
 
         /// <summary>
-        /// External setup link
+        /// Gets or Sets ExternalSetupLink
         /// </summary>
-        /// <value>External setup link</value>
         [DataMember(Name="ExternalSetupLink", EmitDefaultValue=false)]
         public string ExternalSetupLink { get; set; }
 
 
 
         /// <summary>
-        /// Support information
+        /// Gets or Sets Support
         /// </summary>
-        /// <value>Support information</value>
         [DataMember(Name="Support", EmitDefaultValue=false)]
         public AppStoreAppSupportInfo Support { get; set; }
 
         /// <summary>
-        /// Name
+        /// Gets or Sets ExternalFunctionActionUrl
+        /// </summary>
+        [DataMember(Name="ExternalFunctionActionUrl", EmitDefaultValue=false)]
+        public string ExternalFunctionActionUrl { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ExternalFunctionSignatureKey
+        /// </summary>
+        [DataMember(Name="ExternalFunctionSignatureKey", EmitDefaultValue=false)]
+        public string ExternalFunctionSignatureKey { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IsPaid
+        /// </summary>
+        [DataMember(Name="IsPaid", EmitDefaultValue=false)]
+        public bool? IsPaid { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Description
+        /// Gets or Sets Description
         /// </summary>
-        /// <value>Description</value>
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
         /// <summary>
-        /// Is application enabled
+        /// Gets or Sets IsEnabled
         /// </summary>
-        /// <value>Is application enabled</value>
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
 
 
         /// <summary>
-        /// Developer Name
+        /// Gets or Sets DeveloperName
         /// </summary>
-        /// <value>Developer Name</value>
         [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
         public string DeveloperName { get; set; }
 
@@ -540,6 +561,9 @@ public override string ToString()
             sb.Append("  TeammateAppAccessLevel: ").Append(TeammateAppAccessLevel).Append("\n");
             sb.Append("  PermissionsType: ").Append(PermissionsType).Append("\n");
             sb.Append("  Support: ").Append(Support).Append("\n");
+            sb.Append("  ExternalFunctionActionUrl: ").Append(ExternalFunctionActionUrl).Append("\n");
+            sb.Append("  ExternalFunctionSignatureKey: ").Append(ExternalFunctionSignatureKey).Append("\n");
+            sb.Append("  IsPaid: ").Append(IsPaid).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
@@ -625,6 +649,21 @@ public bool Equals(CreateAppStoreApp input)
                     (this.Support != null &&
                     this.Support.Equals(input.Support))
                 ) && 
+                (
+                    this.ExternalFunctionActionUrl == input.ExternalFunctionActionUrl ||
+                    (this.ExternalFunctionActionUrl != null &&
+                    this.ExternalFunctionActionUrl.Equals(input.ExternalFunctionActionUrl))
+                ) && 
+                (
+                    this.ExternalFunctionSignatureKey == input.ExternalFunctionSignatureKey ||
+                    (this.ExternalFunctionSignatureKey != null &&
+                    this.ExternalFunctionSignatureKey.Equals(input.ExternalFunctionSignatureKey))
+                ) && 
+                (
+                    this.IsPaid == input.IsPaid ||
+                    (this.IsPaid != null &&
+                    this.IsPaid.Equals(input.IsPaid))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -684,6 +723,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.PermissionsType.GetHashCode();
                 if (this.Support != null)
                     hashCode = hashCode * 59 + this.Support.GetHashCode();
+                if (this.ExternalFunctionActionUrl != null)
+                    hashCode = hashCode * 59 + this.ExternalFunctionActionUrl.GetHashCode();
+                if (this.ExternalFunctionSignatureKey != null)
+                    hashCode = hashCode * 59 + this.ExternalFunctionSignatureKey.GetHashCode();
+                if (this.IsPaid != null)
+                    hashCode = hashCode * 59 + this.IsPaid.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Description != null)
@@ -699,16 +744,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateBasicAccountModel.cs b/src/Flipdish/Model/CreateBasicAccountModel.cs
new file mode 100644
index 00000000..12949fbb
--- /dev/null
+++ b/src/Flipdish/Model/CreateBasicAccountModel.cs
@@ -0,0 +1,143 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Basic attributes for creating an account
+    /// </summary>
+    [DataContract]
+    public partial class CreateBasicAccountModel :  IEquatable<CreateBasicAccountModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateBasicAccountModel" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected CreateBasicAccountModel() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateBasicAccountModel" /> class.
+        /// </summary>
+        /// <param name="storeName">Store name (required).</param>
+        /// <param name="languageId">LanguageId.</param>
+        public CreateBasicAccountModel(string storeName = default(string), string languageId = default(string))
+        {
+            // to ensure "storeName" is required (not null)
+            if (storeName == null)
+            {
+                throw new InvalidDataException("storeName is a required property for CreateBasicAccountModel and cannot be null");
+            }
+            else
+            {
+                this.StoreName = storeName;
+            }
+            this.LanguageId = languageId;
+        }
+        
+        /// <summary>
+        /// Store name
+        /// </summary>
+        /// <value>Store name</value>
+        [DataMember(Name="StoreName", EmitDefaultValue=false)]
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// LanguageId
+        /// </summary>
+        /// <value>LanguageId</value>
+        [DataMember(Name="LanguageId", EmitDefaultValue=false)]
+        public string LanguageId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CreateBasicAccountModel {\n");
+            sb.Append("  StoreName: ").Append(StoreName).Append("\n");
+            sb.Append("  LanguageId: ").Append(LanguageId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CreateBasicAccountModel);
+        }
+
+        /// <summary>
+        /// Returns true if CreateBasicAccountModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CreateBasicAccountModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CreateBasicAccountModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.StoreName == input.StoreName ||
+                    (this.StoreName != null &&
+                    this.StoreName.Equals(input.StoreName))
+                ) && 
+                (
+                    this.LanguageId == input.LanguageId ||
+                    (this.LanguageId != null &&
+                    this.LanguageId.Equals(input.LanguageId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.StoreName != null)
+                    hashCode = hashCode * 59 + this.StoreName.GetHashCode();
+                if (this.LanguageId != null)
+                    hashCode = hashCode * 59 + this.LanguageId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CreateCatalogGroup.cs b/src/Flipdish/Model/CreateCatalogGroup.cs
deleted file mode 100644
index 2b07a2c3..00000000
--- a/src/Flipdish/Model/CreateCatalogGroup.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Create a Catalog Group
-    /// </summary>
-    [DataContract]
-    public partial class CreateCatalogGroup :  IEquatable<CreateCatalogGroup>, IValidatableObject
-    {
-        /// <summary>
-        /// Type of group (ModifierGroup, etc)
-        /// </summary>
-        /// <value>Type of group (ModifierGroup, etc)</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum GroupTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum ModifierGroup for value: ModifierGroup
-            /// </summary>
-            [EnumMember(Value = "ModifierGroup")]
-            ModifierGroup = 1
-        }
-
-        /// <summary>
-        /// Type of group (ModifierGroup, etc)
-        /// </summary>
-        /// <value>Type of group (ModifierGroup, etc)</value>
-        [DataMember(Name="GroupType", EmitDefaultValue=false)]
-        public GroupTypeEnum GroupType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateCatalogGroup" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected CreateCatalogGroup() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateCatalogGroup" /> class.
-        /// </summary>
-        /// <param name="minSelectCount">Minimum number of items that the user has to select.</param>
-        /// <param name="maxSelectCount">Maximum number of items that the user has to select.</param>
-        /// <param name="items">Collection of items associated with this group.</param>
-        /// <param name="metafields">Collection of metafields.</param>
-        /// <param name="groupType">Type of group (ModifierGroup, etc) (required).</param>
-        /// <param name="sku">Stock Keeping Unit (SKU) (required).</param>
-        /// <param name="name">Group name (required).</param>
-        /// <param name="autogenerateDisplayText">Autogenerate display text in ordering applications.</param>
-        /// <param name="imageFileName">Image File Name.</param>
-        public CreateCatalogGroup(int? minSelectCount = default(int?), int? maxSelectCount = default(int?), List<CreateCatalogItemReference> items = default(List<CreateCatalogItemReference>), List<Metafield> metafields = default(List<Metafield>), GroupTypeEnum groupType = default(GroupTypeEnum), string sku = default(string), string name = default(string), bool? autogenerateDisplayText = default(bool?), string imageFileName = default(string))
-        {
-            // to ensure "groupType" is required (not null)
-            if (groupType == null)
-            {
-                throw new InvalidDataException("groupType is a required property for CreateCatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.GroupType = groupType;
-            }
-            // to ensure "sku" is required (not null)
-            if (sku == null)
-            {
-                throw new InvalidDataException("sku is a required property for CreateCatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.Sku = sku;
-            }
-            // to ensure "name" is required (not null)
-            if (name == null)
-            {
-                throw new InvalidDataException("name is a required property for CreateCatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.Name = name;
-            }
-            this.MinSelectCount = minSelectCount;
-            this.MaxSelectCount = maxSelectCount;
-            this.Items = items;
-            this.Metafields = metafields;
-            this.AutogenerateDisplayText = autogenerateDisplayText;
-            this.ImageFileName = imageFileName;
-        }
-        
-        /// <summary>
-        /// Minimum number of items that the user has to select
-        /// </summary>
-        /// <value>Minimum number of items that the user has to select</value>
-        [DataMember(Name="MinSelectCount", EmitDefaultValue=false)]
-        public int? MinSelectCount { get; set; }
-
-        /// <summary>
-        /// Maximum number of items that the user has to select
-        /// </summary>
-        /// <value>Maximum number of items that the user has to select</value>
-        [DataMember(Name="MaxSelectCount", EmitDefaultValue=false)]
-        public int? MaxSelectCount { get; set; }
-
-        /// <summary>
-        /// Collection of items associated with this group
-        /// </summary>
-        /// <value>Collection of items associated with this group</value>
-        [DataMember(Name="Items", EmitDefaultValue=false)]
-        public List<CreateCatalogItemReference> Items { get; set; }
-
-        /// <summary>
-        /// Collection of metafields
-        /// </summary>
-        /// <value>Collection of metafields</value>
-        [DataMember(Name="Metafields", EmitDefaultValue=false)]
-        public List<Metafield> Metafields { get; set; }
-
-
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Group name
-        /// </summary>
-        /// <value>Group name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Autogenerate display text in ordering applications
-        /// </summary>
-        /// <value>Autogenerate display text in ordering applications</value>
-        [DataMember(Name="AutogenerateDisplayText", EmitDefaultValue=false)]
-        public bool? AutogenerateDisplayText { get; set; }
-
-        /// <summary>
-        /// Image File Name
-        /// </summary>
-        /// <value>Image File Name</value>
-        [DataMember(Name="ImageFileName", EmitDefaultValue=false)]
-        public string ImageFileName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CreateCatalogGroup {\n");
-            sb.Append("  MinSelectCount: ").Append(MinSelectCount).Append("\n");
-            sb.Append("  MaxSelectCount: ").Append(MaxSelectCount).Append("\n");
-            sb.Append("  Items: ").Append(Items).Append("\n");
-            sb.Append("  Metafields: ").Append(Metafields).Append("\n");
-            sb.Append("  GroupType: ").Append(GroupType).Append("\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  AutogenerateDisplayText: ").Append(AutogenerateDisplayText).Append("\n");
-            sb.Append("  ImageFileName: ").Append(ImageFileName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CreateCatalogGroup);
-        }
-
-        /// <summary>
-        /// Returns true if CreateCatalogGroup instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CreateCatalogGroup to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CreateCatalogGroup input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.MinSelectCount == input.MinSelectCount ||
-                    (this.MinSelectCount != null &&
-                    this.MinSelectCount.Equals(input.MinSelectCount))
-                ) && 
-                (
-                    this.MaxSelectCount == input.MaxSelectCount ||
-                    (this.MaxSelectCount != null &&
-                    this.MaxSelectCount.Equals(input.MaxSelectCount))
-                ) && 
-                (
-                    this.Items == input.Items ||
-                    this.Items != null &&
-                    this.Items.SequenceEqual(input.Items)
-                ) && 
-                (
-                    this.Metafields == input.Metafields ||
-                    this.Metafields != null &&
-                    this.Metafields.SequenceEqual(input.Metafields)
-                ) && 
-                (
-                    this.GroupType == input.GroupType ||
-                    (this.GroupType != null &&
-                    this.GroupType.Equals(input.GroupType))
-                ) && 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.AutogenerateDisplayText == input.AutogenerateDisplayText ||
-                    (this.AutogenerateDisplayText != null &&
-                    this.AutogenerateDisplayText.Equals(input.AutogenerateDisplayText))
-                ) && 
-                (
-                    this.ImageFileName == input.ImageFileName ||
-                    (this.ImageFileName != null &&
-                    this.ImageFileName.Equals(input.ImageFileName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.MinSelectCount != null)
-                    hashCode = hashCode * 59 + this.MinSelectCount.GetHashCode();
-                if (this.MaxSelectCount != null)
-                    hashCode = hashCode * 59 + this.MaxSelectCount.GetHashCode();
-                if (this.Items != null)
-                    hashCode = hashCode * 59 + this.Items.GetHashCode();
-                if (this.Metafields != null)
-                    hashCode = hashCode * 59 + this.Metafields.GetHashCode();
-                if (this.GroupType != null)
-                    hashCode = hashCode * 59 + this.GroupType.GetHashCode();
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.AutogenerateDisplayText != null)
-                    hashCode = hashCode * 59 + this.AutogenerateDisplayText.GetHashCode();
-                if (this.ImageFileName != null)
-                    hashCode = hashCode * 59 + this.ImageFileName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CreateCatalogGroupReference.cs b/src/Flipdish/Model/CreateCatalogGroupReference.cs
index 8e5be590..5489c494 100644
--- a/src/Flipdish/Model/CreateCatalogGroupReference.cs
+++ b/src/Flipdish/Model/CreateCatalogGroupReference.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Information to create a reference to a {Flipdish.PublicModels.V1.Catalog.Groups.Group}
+    /// Information to create a reference to a {Flipdish.Menus.PublicModels.V1.Catalog.Groups.Group}
     /// </summary>
     [DataContract]
-    public partial class CreateCatalogGroupReference :  IEquatable<CreateCatalogGroupReference>, IValidatableObject
+    public partial class CreateCatalogGroupReference :  IEquatable<CreateCatalogGroupReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -180,40 +178,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogGroupId (string) maxLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be less than 30.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogGroupId (string) minLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be greater than 0.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateCatalogItem.cs b/src/Flipdish/Model/CreateCatalogItem.cs
index e0637edb..b609b4eb 100644
--- a/src/Flipdish/Model/CreateCatalogItem.cs
+++ b/src/Flipdish/Model/CreateCatalogItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create a Catalog Item
     /// </summary>
     [DataContract]
-    public partial class CreateCatalogItem :  IEquatable<CreateCatalogItem>, IValidatableObject
+    public partial class CreateCatalogItem :  IEquatable<CreateCatalogItem>
     {
         /// <summary>
         /// Type of item (Product, Modifier, etc)
@@ -304,70 +302,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 3000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 3000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateCatalogItemReference.cs b/src/Flipdish/Model/CreateCatalogItemReference.cs
deleted file mode 100644
index ca344002..00000000
--- a/src/Flipdish/Model/CreateCatalogItemReference.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Information to create a reference to a {Flipdish.PublicModels.V1.Catalog.Items.CatalogItem}
-    /// </summary>
-    [DataContract]
-    public partial class CreateCatalogItemReference :  IEquatable<CreateCatalogItemReference>, IValidatableObject
-    {
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ItemTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Product for value: Product
-            /// </summary>
-            [EnumMember(Value = "Product")]
-            Product = 1,
-            
-            /// <summary>
-            /// Enum Modifier for value: Modifier
-            /// </summary>
-            [EnumMember(Value = "Modifier")]
-            Modifier = 2
-        }
-
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [DataMember(Name="ItemType", EmitDefaultValue=false)]
-        public ItemTypeEnum ItemType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateCatalogItemReference" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected CreateCatalogItemReference() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateCatalogItemReference" /> class.
-        /// </summary>
-        /// <param name="catalogItemId">Identifier of the CatalogItemId to use as SubProduct (required).</param>
-        /// <param name="itemType">Type of the SupProduct (required).</param>
-        /// <param name="preselectedQuantity">Quantity of the modifier that will be set when the parent product is placed in the basket.</param>
-        public CreateCatalogItemReference(string catalogItemId = default(string), ItemTypeEnum itemType = default(ItemTypeEnum), int? preselectedQuantity = default(int?))
-        {
-            // to ensure "catalogItemId" is required (not null)
-            if (catalogItemId == null)
-            {
-                throw new InvalidDataException("catalogItemId is a required property for CreateCatalogItemReference and cannot be null");
-            }
-            else
-            {
-                this.CatalogItemId = catalogItemId;
-            }
-            // to ensure "itemType" is required (not null)
-            if (itemType == null)
-            {
-                throw new InvalidDataException("itemType is a required property for CreateCatalogItemReference and cannot be null");
-            }
-            else
-            {
-                this.ItemType = itemType;
-            }
-            this.PreselectedQuantity = preselectedQuantity;
-        }
-        
-        /// <summary>
-        /// Identifier of the CatalogItemId to use as SubProduct
-        /// </summary>
-        /// <value>Identifier of the CatalogItemId to use as SubProduct</value>
-        [DataMember(Name="CatalogItemId", EmitDefaultValue=false)]
-        public string CatalogItemId { get; set; }
-
-
-        /// <summary>
-        /// Quantity of the modifier that will be set when the parent product is placed in the basket
-        /// </summary>
-        /// <value>Quantity of the modifier that will be set when the parent product is placed in the basket</value>
-        [DataMember(Name="PreselectedQuantity", EmitDefaultValue=false)]
-        public int? PreselectedQuantity { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CreateCatalogItemReference {\n");
-            sb.Append("  CatalogItemId: ").Append(CatalogItemId).Append("\n");
-            sb.Append("  ItemType: ").Append(ItemType).Append("\n");
-            sb.Append("  PreselectedQuantity: ").Append(PreselectedQuantity).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CreateCatalogItemReference);
-        }
-
-        /// <summary>
-        /// Returns true if CreateCatalogItemReference instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CreateCatalogItemReference to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CreateCatalogItemReference input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.CatalogItemId == input.CatalogItemId ||
-                    (this.CatalogItemId != null &&
-                    this.CatalogItemId.Equals(input.CatalogItemId))
-                ) && 
-                (
-                    this.ItemType == input.ItemType ||
-                    (this.ItemType != null &&
-                    this.ItemType.Equals(input.ItemType))
-                ) && 
-                (
-                    this.PreselectedQuantity == input.PreselectedQuantity ||
-                    (this.PreselectedQuantity != null &&
-                    this.PreselectedQuantity.Equals(input.PreselectedQuantity))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.CatalogItemId != null)
-                    hashCode = hashCode * 59 + this.CatalogItemId.GetHashCode();
-                if (this.ItemType != null)
-                    hashCode = hashCode * 59 + this.ItemType.GetHashCode();
-                if (this.PreselectedQuantity != null)
-                    hashCode = hashCode * 59 + this.PreselectedQuantity.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CreateEndUserFeeConfig.cs b/src/Flipdish/Model/CreateEndUserFeeConfig.cs
new file mode 100644
index 00000000..8c79e8b4
--- /dev/null
+++ b/src/Flipdish/Model/CreateEndUserFeeConfig.cs
@@ -0,0 +1,284 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Input model for setting an end user fee config
+    /// </summary>
+    [DataContract]
+    public partial class CreateEndUserFeeConfig :  IEquatable<CreateEndUserFeeConfig>
+    {
+        /// <summary>
+        /// The order channel this fee config applies to
+        /// </summary>
+        /// <value>The order channel this fee config applies to</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ChannelEnum
+        {
+            
+            /// <summary>
+            /// Enum WebApp for value: WebApp
+            /// </summary>
+            [EnumMember(Value = "WebApp")]
+            WebApp = 1,
+            
+            /// <summary>
+            /// Enum InStore for value: InStore
+            /// </summary>
+            [EnumMember(Value = "InStore")]
+            InStore = 2,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 3
+        }
+
+        /// <summary>
+        /// The order channel this fee config applies to
+        /// </summary>
+        /// <value>The order channel this fee config applies to</value>
+        [DataMember(Name="Channel", EmitDefaultValue=false)]
+        public ChannelEnum Channel { get; set; }
+        /// <summary>
+        /// The payment method this fee config applies to
+        /// </summary>
+        /// <value>The payment method this fee config applies to</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum PaymentMethodEnum
+        {
+            
+            /// <summary>
+            /// Enum Cash for value: Cash
+            /// </summary>
+            [EnumMember(Value = "Cash")]
+            Cash = 1,
+            
+            /// <summary>
+            /// Enum Card for value: Card
+            /// </summary>
+            [EnumMember(Value = "Card")]
+            Card = 2
+        }
+
+        /// <summary>
+        /// The payment method this fee config applies to
+        /// </summary>
+        /// <value>The payment method this fee config applies to</value>
+        [DataMember(Name="PaymentMethod", EmitDefaultValue=false)]
+        public PaymentMethodEnum PaymentMethod { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateEndUserFeeConfig" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected CreateEndUserFeeConfig() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateEndUserFeeConfig" /> class.
+        /// </summary>
+        /// <param name="channel">The order channel this fee config applies to (required).</param>
+        /// <param name="paymentMethod">The payment method this fee config applies to (required).</param>
+        /// <param name="minOrderAmount">Order amount below which MinFixedFee is charged instead of the percent/fixed calculation.</param>
+        /// <param name="minFixedFee">Fixed fee charged for orders at or below MinOrderAmount.</param>
+        /// <param name="percentFee">Percentage fee applied to the order amount.</param>
+        /// <param name="fixedFee">Fixed fee compared against the percentage fee - the greater of the two is charged.</param>
+        /// <param name="cap">Maximum fee that can be charged.</param>
+        public CreateEndUserFeeConfig(ChannelEnum channel = default(ChannelEnum), PaymentMethodEnum paymentMethod = default(PaymentMethodEnum), double? minOrderAmount = default(double?), double? minFixedFee = default(double?), double? percentFee = default(double?), double? fixedFee = default(double?), double? cap = default(double?))
+        {
+            // to ensure "channel" is required (not null)
+            if (channel == null)
+            {
+                throw new InvalidDataException("channel is a required property for CreateEndUserFeeConfig and cannot be null");
+            }
+            else
+            {
+                this.Channel = channel;
+            }
+            // to ensure "paymentMethod" is required (not null)
+            if (paymentMethod == null)
+            {
+                throw new InvalidDataException("paymentMethod is a required property for CreateEndUserFeeConfig and cannot be null");
+            }
+            else
+            {
+                this.PaymentMethod = paymentMethod;
+            }
+            this.MinOrderAmount = minOrderAmount;
+            this.MinFixedFee = minFixedFee;
+            this.PercentFee = percentFee;
+            this.FixedFee = fixedFee;
+            this.Cap = cap;
+        }
+        
+
+
+        /// <summary>
+        /// Order amount below which MinFixedFee is charged instead of the percent/fixed calculation
+        /// </summary>
+        /// <value>Order amount below which MinFixedFee is charged instead of the percent/fixed calculation</value>
+        [DataMember(Name="MinOrderAmount", EmitDefaultValue=false)]
+        public double? MinOrderAmount { get; set; }
+
+        /// <summary>
+        /// Fixed fee charged for orders at or below MinOrderAmount
+        /// </summary>
+        /// <value>Fixed fee charged for orders at or below MinOrderAmount</value>
+        [DataMember(Name="MinFixedFee", EmitDefaultValue=false)]
+        public double? MinFixedFee { get; set; }
+
+        /// <summary>
+        /// Percentage fee applied to the order amount
+        /// </summary>
+        /// <value>Percentage fee applied to the order amount</value>
+        [DataMember(Name="PercentFee", EmitDefaultValue=false)]
+        public double? PercentFee { get; set; }
+
+        /// <summary>
+        /// Fixed fee compared against the percentage fee - the greater of the two is charged
+        /// </summary>
+        /// <value>Fixed fee compared against the percentage fee - the greater of the two is charged</value>
+        [DataMember(Name="FixedFee", EmitDefaultValue=false)]
+        public double? FixedFee { get; set; }
+
+        /// <summary>
+        /// Maximum fee that can be charged
+        /// </summary>
+        /// <value>Maximum fee that can be charged</value>
+        [DataMember(Name="Cap", EmitDefaultValue=false)]
+        public double? Cap { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CreateEndUserFeeConfig {\n");
+            sb.Append("  Channel: ").Append(Channel).Append("\n");
+            sb.Append("  PaymentMethod: ").Append(PaymentMethod).Append("\n");
+            sb.Append("  MinOrderAmount: ").Append(MinOrderAmount).Append("\n");
+            sb.Append("  MinFixedFee: ").Append(MinFixedFee).Append("\n");
+            sb.Append("  PercentFee: ").Append(PercentFee).Append("\n");
+            sb.Append("  FixedFee: ").Append(FixedFee).Append("\n");
+            sb.Append("  Cap: ").Append(Cap).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CreateEndUserFeeConfig);
+        }
+
+        /// <summary>
+        /// Returns true if CreateEndUserFeeConfig instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CreateEndUserFeeConfig to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CreateEndUserFeeConfig input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Channel == input.Channel ||
+                    (this.Channel != null &&
+                    this.Channel.Equals(input.Channel))
+                ) && 
+                (
+                    this.PaymentMethod == input.PaymentMethod ||
+                    (this.PaymentMethod != null &&
+                    this.PaymentMethod.Equals(input.PaymentMethod))
+                ) && 
+                (
+                    this.MinOrderAmount == input.MinOrderAmount ||
+                    (this.MinOrderAmount != null &&
+                    this.MinOrderAmount.Equals(input.MinOrderAmount))
+                ) && 
+                (
+                    this.MinFixedFee == input.MinFixedFee ||
+                    (this.MinFixedFee != null &&
+                    this.MinFixedFee.Equals(input.MinFixedFee))
+                ) && 
+                (
+                    this.PercentFee == input.PercentFee ||
+                    (this.PercentFee != null &&
+                    this.PercentFee.Equals(input.PercentFee))
+                ) && 
+                (
+                    this.FixedFee == input.FixedFee ||
+                    (this.FixedFee != null &&
+                    this.FixedFee.Equals(input.FixedFee))
+                ) && 
+                (
+                    this.Cap == input.Cap ||
+                    (this.Cap != null &&
+                    this.Cap.Equals(input.Cap))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Channel != null)
+                    hashCode = hashCode * 59 + this.Channel.GetHashCode();
+                if (this.PaymentMethod != null)
+                    hashCode = hashCode * 59 + this.PaymentMethod.GetHashCode();
+                if (this.MinOrderAmount != null)
+                    hashCode = hashCode * 59 + this.MinOrderAmount.GetHashCode();
+                if (this.MinFixedFee != null)
+                    hashCode = hashCode * 59 + this.MinFixedFee.GetHashCode();
+                if (this.PercentFee != null)
+                    hashCode = hashCode * 59 + this.PercentFee.GetHashCode();
+                if (this.FixedFee != null)
+                    hashCode = hashCode * 59 + this.FixedFee.GetHashCode();
+                if (this.Cap != null)
+                    hashCode = hashCode * 59 + this.Cap.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CreateFulfillmentStatesConfiguration.cs b/src/Flipdish/Model/CreateFulfillmentStatesConfiguration.cs
new file mode 100644
index 00000000..4808e7c3
--- /dev/null
+++ b/src/Flipdish/Model/CreateFulfillmentStatesConfiguration.cs
@@ -0,0 +1,208 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Create fulfillment states configuration
+    /// </summary>
+    [DataContract]
+    public partial class CreateFulfillmentStatesConfiguration :  IEquatable<CreateFulfillmentStatesConfiguration>
+    {
+        /// <summary>
+        /// Store Selector Type
+        /// </summary>
+        /// <value>Store Selector Type</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum StoreSelectorTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
+            /// <summary>
+            /// Enum Single for value: Single
+            /// </summary>
+            [EnumMember(Value = "Single")]
+            Single = 2,
+            
+            /// <summary>
+            /// Enum Multiple for value: Multiple
+            /// </summary>
+            [EnumMember(Value = "Multiple")]
+            Multiple = 3
+        }
+
+        /// <summary>
+        /// Store Selector Type
+        /// </summary>
+        /// <value>Store Selector Type</value>
+        [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
+        public StoreSelectorTypeEnum? StoreSelectorType { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateFulfillmentStatesConfiguration" /> class.
+        /// </summary>
+        /// <param name="storeIds">Stores id&#39;s.</param>
+        /// <param name="storeSelectorType">Store Selector Type.</param>
+        /// <param name="states">Settings.</param>
+        /// <param name="automaticTransitionsEnabled">Enable automatic transitions.</param>
+        /// <param name="name">Name.</param>
+        public CreateFulfillmentStatesConfiguration(List<int?> storeIds = default(List<int?>), StoreSelectorTypeEnum? storeSelectorType = default(StoreSelectorTypeEnum?), List<FulfillmentStatusConfigurationItem> states = default(List<FulfillmentStatusConfigurationItem>), bool? automaticTransitionsEnabled = default(bool?), string name = default(string))
+        {
+            this.StoreIds = storeIds;
+            this.StoreSelectorType = storeSelectorType;
+            this.States = states;
+            this.AutomaticTransitionsEnabled = automaticTransitionsEnabled;
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Stores id&#39;s
+        /// </summary>
+        /// <value>Stores id&#39;s</value>
+        [DataMember(Name="StoreIds", EmitDefaultValue=false)]
+        public List<int?> StoreIds { get; set; }
+
+
+        /// <summary>
+        /// Settings
+        /// </summary>
+        /// <value>Settings</value>
+        [DataMember(Name="States", EmitDefaultValue=false)]
+        public List<FulfillmentStatusConfigurationItem> States { get; set; }
+
+        /// <summary>
+        /// Enable automatic transitions
+        /// </summary>
+        /// <value>Enable automatic transitions</value>
+        [DataMember(Name="AutomaticTransitionsEnabled", EmitDefaultValue=false)]
+        public bool? AutomaticTransitionsEnabled { get; set; }
+
+        /// <summary>
+        /// Name
+        /// </summary>
+        /// <value>Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CreateFulfillmentStatesConfiguration {\n");
+            sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
+            sb.Append("  States: ").Append(States).Append("\n");
+            sb.Append("  AutomaticTransitionsEnabled: ").Append(AutomaticTransitionsEnabled).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CreateFulfillmentStatesConfiguration);
+        }
+
+        /// <summary>
+        /// Returns true if CreateFulfillmentStatesConfiguration instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CreateFulfillmentStatesConfiguration to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CreateFulfillmentStatesConfiguration input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.StoreIds == input.StoreIds ||
+                    this.StoreIds != null &&
+                    this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.StoreSelectorType == input.StoreSelectorType ||
+                    (this.StoreSelectorType != null &&
+                    this.StoreSelectorType.Equals(input.StoreSelectorType))
+                ) && 
+                (
+                    this.States == input.States ||
+                    this.States != null &&
+                    this.States.SequenceEqual(input.States)
+                ) && 
+                (
+                    this.AutomaticTransitionsEnabled == input.AutomaticTransitionsEnabled ||
+                    (this.AutomaticTransitionsEnabled != null &&
+                    this.AutomaticTransitionsEnabled.Equals(input.AutomaticTransitionsEnabled))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.StoreIds != null)
+                    hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.StoreSelectorType != null)
+                    hashCode = hashCode * 59 + this.StoreSelectorType.GetHashCode();
+                if (this.States != null)
+                    hashCode = hashCode * 59 + this.States.GetHashCode();
+                if (this.AutomaticTransitionsEnabled != null)
+                    hashCode = hashCode * 59 + this.AutomaticTransitionsEnabled.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CreateFullMenu.cs b/src/Flipdish/Model/CreateFullMenu.cs
index 94153858..6b5c1c6e 100644
--- a/src/Flipdish/Model/CreateFullMenu.cs
+++ b/src/Flipdish/Model/CreateFullMenu.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create menu object
     /// </summary>
     [DataContract]
-    public partial class CreateFullMenu :  IEquatable<CreateFullMenu>, IValidatableObject
+    public partial class CreateFullMenu :  IEquatable<CreateFullMenu>
     {
         /// <summary>
         /// Menu section behaviour
@@ -89,12 +87,13 @@ public enum TaxTypeEnum
         /// </summary>
         /// <param name="name">Name of Menu, only shown in portal.</param>
         /// <param name="imageUrl">Image url.</param>
-        /// <param name="menuSections">Menu sections (startes, main etc).</param>
+        /// <param name="menuSections">Menu sections (starters, main etc).</param>
         /// <param name="taxRates">Menu tax rates.</param>
         /// <param name="displaySectionLinks">Display menu section link on UI.</param>
         /// <param name="menuSectionBehaviour">Menu section behaviour.</param>
         /// <param name="taxType">Tax type.</param>
-        public CreateFullMenu(string name = default(string), string imageUrl = default(string), List<CreateFullMenuSection> menuSections = default(List<CreateFullMenuSection>), List<CreateMenuTaxRate> taxRates = default(List<CreateMenuTaxRate>), bool? displaySectionLinks = default(bool?), MenuSectionBehaviourEnum? menuSectionBehaviour = default(MenuSectionBehaviourEnum?), TaxTypeEnum? taxType = default(TaxTypeEnum?))
+        /// <param name="isIntegrated">Flag to indicate if the menu is integrated (contains metadata).</param>
+        public CreateFullMenu(string name = default(string), string imageUrl = default(string), List<CreateFullMenuSection> menuSections = default(List<CreateFullMenuSection>), List<CreateMenuTaxRate> taxRates = default(List<CreateMenuTaxRate>), bool? displaySectionLinks = default(bool?), MenuSectionBehaviourEnum? menuSectionBehaviour = default(MenuSectionBehaviourEnum?), TaxTypeEnum? taxType = default(TaxTypeEnum?), bool? isIntegrated = default(bool?))
         {
             this.Name = name;
             this.ImageUrl = imageUrl;
@@ -103,6 +102,7 @@ public enum TaxTypeEnum
             this.DisplaySectionLinks = displaySectionLinks;
             this.MenuSectionBehaviour = menuSectionBehaviour;
             this.TaxType = taxType;
+            this.IsIntegrated = isIntegrated;
         }
         
         /// <summary>
@@ -120,9 +120,9 @@ public enum TaxTypeEnum
         public string ImageUrl { get; set; }
 
         /// <summary>
-        /// Menu sections (startes, main etc)
+        /// Menu sections (starters, main etc)
         /// </summary>
-        /// <value>Menu sections (startes, main etc)</value>
+        /// <value>Menu sections (starters, main etc)</value>
         [DataMember(Name="MenuSections", EmitDefaultValue=false)]
         public List<CreateFullMenuSection> MenuSections { get; set; }
 
@@ -142,6 +142,13 @@ public enum TaxTypeEnum
 
 
 
+        /// <summary>
+        /// Flag to indicate if the menu is integrated (contains metadata)
+        /// </summary>
+        /// <value>Flag to indicate if the menu is integrated (contains metadata)</value>
+        [DataMember(Name="IsIntegrated", EmitDefaultValue=false)]
+        public bool? IsIntegrated { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -157,6 +164,7 @@ public override string ToString()
             sb.Append("  DisplaySectionLinks: ").Append(DisplaySectionLinks).Append("\n");
             sb.Append("  MenuSectionBehaviour: ").Append(MenuSectionBehaviour).Append("\n");
             sb.Append("  TaxType: ").Append(TaxType).Append("\n");
+            sb.Append("  IsIntegrated: ").Append(IsIntegrated).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -225,6 +233,11 @@ public bool Equals(CreateFullMenu input)
                     this.TaxType == input.TaxType ||
                     (this.TaxType != null &&
                     this.TaxType.Equals(input.TaxType))
+                ) && 
+                (
+                    this.IsIntegrated == input.IsIntegrated ||
+                    (this.IsIntegrated != null &&
+                    this.IsIntegrated.Equals(input.IsIntegrated))
                 );
         }
 
@@ -251,19 +264,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.MenuSectionBehaviour.GetHashCode();
                 if (this.TaxType != null)
                     hashCode = hashCode * 59 + this.TaxType.GetHashCode();
+                if (this.IsIntegrated != null)
+                    hashCode = hashCode * 59 + this.IsIntegrated.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateFullMenuItemOptionSet.cs b/src/Flipdish/Model/CreateFullMenuItemOptionSet.cs
index 568ee6a9..c170c232 100644
--- a/src/Flipdish/Model/CreateFullMenuItemOptionSet.cs
+++ b/src/Flipdish/Model/CreateFullMenuItemOptionSet.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create menu item option set
     /// </summary>
     [DataContract]
-    public partial class CreateFullMenuItemOptionSet :  IEquatable<CreateFullMenuItemOptionSet>, IValidatableObject
+    public partial class CreateFullMenuItemOptionSet :  IEquatable<CreateFullMenuItemOptionSet>
     {
         /// <summary>
         /// Small | Medium | Large  Affects the layout of the menu.
@@ -80,7 +78,8 @@ public enum CellLayoutTypeEnum
         /// <param name="minSelectCount">Minimum items must be selected.</param>
         /// <param name="maxSelectCount">Maximum number of items can be selected.</param>
         /// <param name="cellLayoutType">Small | Medium | Large  Affects the layout of the menu..</param>
-        public CreateFullMenuItemOptionSet(int? menuItemOptionSetId = default(int?), List<CreateFullMenuItemOptionSetItem> menuItemOptionSetItems = default(List<CreateFullMenuItemOptionSetItem>), string name = default(string), bool? isMasterOptionSet = default(bool?), int? displayOrder = default(int?), int? minSelectCount = default(int?), int? maxSelectCount = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?))
+        /// <param name="publicId">Permanent reference to the item..</param>
+        public CreateFullMenuItemOptionSet(int? menuItemOptionSetId = default(int?), List<CreateFullMenuItemOptionSetItem> menuItemOptionSetItems = default(List<CreateFullMenuItemOptionSetItem>), string name = default(string), bool? isMasterOptionSet = default(bool?), int? displayOrder = default(int?), int? minSelectCount = default(int?), int? maxSelectCount = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), Guid? publicId = default(Guid?))
         {
             this.MenuItemOptionSetId = menuItemOptionSetId;
             this.MenuItemOptionSetItems = menuItemOptionSetItems;
@@ -90,6 +89,7 @@ public enum CellLayoutTypeEnum
             this.MinSelectCount = minSelectCount;
             this.MaxSelectCount = maxSelectCount;
             this.CellLayoutType = cellLayoutType;
+            this.PublicId = publicId;
         }
         
         /// <summary>
@@ -142,6 +142,13 @@ public enum CellLayoutTypeEnum
         public int? MaxSelectCount { get; set; }
 
 
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -158,6 +165,7 @@ public override string ToString()
             sb.Append("  MinSelectCount: ").Append(MinSelectCount).Append("\n");
             sb.Append("  MaxSelectCount: ").Append(MaxSelectCount).Append("\n");
             sb.Append("  CellLayoutType: ").Append(CellLayoutType).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -231,6 +239,11 @@ public bool Equals(CreateFullMenuItemOptionSet input)
                     this.CellLayoutType == input.CellLayoutType ||
                     (this.CellLayoutType != null &&
                     this.CellLayoutType.Equals(input.CellLayoutType))
+                ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
                 );
         }
 
@@ -259,31 +272,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.MaxSelectCount.GetHashCode();
                 if (this.CellLayoutType != null)
                     hashCode = hashCode * 59 + this.CellLayoutType.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateFullMenuItemOptionSetItem.cs b/src/Flipdish/Model/CreateFullMenuItemOptionSetItem.cs
index 75502f52..7e9bc9da 100644
--- a/src/Flipdish/Model/CreateFullMenuItemOptionSetItem.cs
+++ b/src/Flipdish/Model/CreateFullMenuItemOptionSetItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create menu item option set item
     /// </summary>
     [DataContract]
-    public partial class CreateFullMenuItemOptionSetItem :  IEquatable<CreateFullMenuItemOptionSetItem>, IValidatableObject
+    public partial class CreateFullMenuItemOptionSetItem :  IEquatable<CreateFullMenuItemOptionSetItem>
     {
         /// <summary>
         /// Small | Medium | Large  Affects the layout of the menu.
@@ -78,11 +76,13 @@ public enum CellLayoutTypeEnum
         /// <param name="nextMenuItemOptionSetId">if null, next option set is next. if -1, this is the final option set.</param>
         /// <param name="name">Name.</param>
         /// <param name="price">Price.</param>
+        /// <param name="depositReturnFee">An optional fee that can be added to the price of the item..</param>
         /// <param name="isAvailable">Is available.</param>
         /// <param name="displayOrder">Display order. Displayed in ascending order..</param>
         /// <param name="cellLayoutType">Small | Medium | Large  Affects the layout of the menu..</param>
         /// <param name="imageUrl">Image url.</param>
-        public CreateFullMenuItemOptionSetItem(int? menuItemOptionSetItemId = default(int?), List<CreateMetadata> metadata = default(List<CreateMetadata>), string taxRateName = default(string), int? nextMenuItemOptionSetId = default(int?), string name = default(string), double? price = default(double?), bool? isAvailable = default(bool?), int? displayOrder = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), string imageUrl = default(string))
+        /// <param name="publicId">Permanent reference to the item..</param>
+        public CreateFullMenuItemOptionSetItem(int? menuItemOptionSetItemId = default(int?), List<CreateMetadata> metadata = default(List<CreateMetadata>), string taxRateName = default(string), int? nextMenuItemOptionSetId = default(int?), string name = default(string), double? price = default(double?), double? depositReturnFee = default(double?), bool? isAvailable = default(bool?), int? displayOrder = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), string imageUrl = default(string), Guid? publicId = default(Guid?))
         {
             this.MenuItemOptionSetItemId = menuItemOptionSetItemId;
             this.Metadata = metadata;
@@ -90,10 +90,12 @@ public enum CellLayoutTypeEnum
             this.NextMenuItemOptionSetId = nextMenuItemOptionSetId;
             this.Name = name;
             this.Price = price;
+            this.DepositReturnFee = depositReturnFee;
             this.IsAvailable = isAvailable;
             this.DisplayOrder = displayOrder;
             this.CellLayoutType = cellLayoutType;
             this.ImageUrl = imageUrl;
+            this.PublicId = publicId;
         }
         
         /// <summary>
@@ -138,6 +140,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="Price", EmitDefaultValue=false)]
         public double? Price { get; set; }
 
+        /// <summary>
+        /// An optional fee that can be added to the price of the item.
+        /// </summary>
+        /// <value>An optional fee that can be added to the price of the item.</value>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
         /// <summary>
         /// Is available
         /// </summary>
@@ -160,6 +169,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="ImageUrl", EmitDefaultValue=false)]
         public string ImageUrl { get; set; }
 
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -174,10 +190,12 @@ public override string ToString()
             sb.Append("  NextMenuItemOptionSetId: ").Append(NextMenuItemOptionSetId).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Price: ").Append(Price).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
             sb.Append("  IsAvailable: ").Append(IsAvailable).Append("\n");
             sb.Append("  DisplayOrder: ").Append(DisplayOrder).Append("\n");
             sb.Append("  CellLayoutType: ").Append(CellLayoutType).Append("\n");
             sb.Append("  ImageUrl: ").Append(ImageUrl).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -242,6 +260,11 @@ public bool Equals(CreateFullMenuItemOptionSetItem input)
                     (this.Price != null &&
                     this.Price.Equals(input.Price))
                 ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
+                ) && 
                 (
                     this.IsAvailable == input.IsAvailable ||
                     (this.IsAvailable != null &&
@@ -261,6 +284,11 @@ public bool Equals(CreateFullMenuItemOptionSetItem input)
                     this.ImageUrl == input.ImageUrl ||
                     (this.ImageUrl != null &&
                     this.ImageUrl.Equals(input.ImageUrl))
+                ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
                 );
         }
 
@@ -285,6 +313,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Price != null)
                     hashCode = hashCode * 59 + this.Price.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
                 if (this.IsAvailable != null)
                     hashCode = hashCode * 59 + this.IsAvailable.GetHashCode();
                 if (this.DisplayOrder != null)
@@ -293,19 +323,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.CellLayoutType.GetHashCode();
                 if (this.ImageUrl != null)
                     hashCode = hashCode * 59 + this.ImageUrl.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateFullMenuSection.cs b/src/Flipdish/Model/CreateFullMenuSection.cs
index 21aade64..af25e767 100644
--- a/src/Flipdish/Model/CreateFullMenuSection.cs
+++ b/src/Flipdish/Model/CreateFullMenuSection.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create menu section
     /// </summary>
     [DataContract]
-    public partial class CreateFullMenuSection :  IEquatable<CreateFullMenuSection>, IValidatableObject
+    public partial class CreateFullMenuSection :  IEquatable<CreateFullMenuSection>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateFullMenuSection" /> class.
@@ -42,7 +40,8 @@ public partial class CreateFullMenuSection :  IEquatable<CreateFullMenuSection>,
         /// <param name="isHiddenFromCustomers">Is hidden from customer. Perhaps when the item is out of stock..</param>
         /// <param name="imageUrl">Image url.</param>
         /// <param name="menuSectionId">Menu Section Id.</param>
-        public CreateFullMenuSection(MenuSectionAvailability menuSectionAvailability = default(MenuSectionAvailability), List<CreateFullMenuSectionItem> menuItems = default(List<CreateFullMenuSectionItem>), string name = default(string), string description = default(string), int? displayOrder = default(int?), bool? isAvailable = default(bool?), bool? isHiddenFromCustomers = default(bool?), string imageUrl = default(string), int? menuSectionId = default(int?))
+        /// <param name="publicId">Permanent reference to the item..</param>
+        public CreateFullMenuSection(MenuSectionAvailability menuSectionAvailability = default(MenuSectionAvailability), List<CreateFullMenuSectionItem> menuItems = default(List<CreateFullMenuSectionItem>), string name = default(string), string description = default(string), int? displayOrder = default(int?), bool? isAvailable = default(bool?), bool? isHiddenFromCustomers = default(bool?), string imageUrl = default(string), int? menuSectionId = default(int?), Guid? publicId = default(Guid?))
         {
             this.MenuSectionAvailability = menuSectionAvailability;
             this.MenuItems = menuItems;
@@ -53,6 +52,7 @@ public partial class CreateFullMenuSection :  IEquatable<CreateFullMenuSection>,
             this.IsHiddenFromCustomers = isHiddenFromCustomers;
             this.ImageUrl = imageUrl;
             this.MenuSectionId = menuSectionId;
+            this.PublicId = publicId;
         }
         
         /// <summary>
@@ -118,6 +118,13 @@ public partial class CreateFullMenuSection :  IEquatable<CreateFullMenuSection>,
         [DataMember(Name="MenuSectionId", EmitDefaultValue=false)]
         public int? MenuSectionId { get; set; }
 
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -135,6 +142,7 @@ public override string ToString()
             sb.Append("  IsHiddenFromCustomers: ").Append(IsHiddenFromCustomers).Append("\n");
             sb.Append("  ImageUrl: ").Append(ImageUrl).Append("\n");
             sb.Append("  MenuSectionId: ").Append(MenuSectionId).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -213,6 +221,11 @@ public bool Equals(CreateFullMenuSection input)
                     this.MenuSectionId == input.MenuSectionId ||
                     (this.MenuSectionId != null &&
                     this.MenuSectionId.Equals(input.MenuSectionId))
+                ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
                 );
         }
 
@@ -243,31 +256,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ImageUrl.GetHashCode();
                 if (this.MenuSectionId != null)
                     hashCode = hashCode * 59 + this.MenuSectionId.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateFullMenuSectionItem.cs b/src/Flipdish/Model/CreateFullMenuSectionItem.cs
index 449d2710..63cc1bac 100644
--- a/src/Flipdish/Model/CreateFullMenuSectionItem.cs
+++ b/src/Flipdish/Model/CreateFullMenuSectionItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create menu section item
     /// </summary>
     [DataContract]
-    public partial class CreateFullMenuSectionItem :  IEquatable<CreateFullMenuSectionItem>, IValidatableObject
+    public partial class CreateFullMenuSectionItem :  IEquatable<CreateFullMenuSectionItem>
     {
         /// <summary>
         /// Spiciness rating
@@ -118,6 +116,7 @@ public enum CellLayoutTypeEnum
         /// <param name="description">Description (like \&quot;A lovely dish from the east\&quot;).</param>
         /// <param name="spicinessRating">Spiciness rating.</param>
         /// <param name="price">Price - this is only used when there is no master option set and should be set to 0 if a master option set exists..</param>
+        /// <param name="depositReturnFee">An optional fee that can be added to the price of the item..</param>
         /// <param name="displayOrder">Display order.</param>
         /// <param name="alcohol">To be set true if the item or an option of the item contains an alcoholic drink..</param>
         /// <param name="isAvailable">True if we accept orders for this item still.</param>
@@ -126,7 +125,9 @@ public enum CellLayoutTypeEnum
         /// <param name="imageName">Image url.</param>
         /// <param name="imageUrl">Image url.</param>
         /// <param name="menuItemId">Menu Item Id.</param>
-        public CreateFullMenuSectionItem(List<CreateFullMenuItemOptionSet> menuItemOptionSets = default(List<CreateFullMenuItemOptionSet>), List<CreateMetadata> metadata = default(List<CreateMetadata>), string taxRateName = default(string), string name = default(string), string description = default(string), SpicinessRatingEnum? spicinessRating = default(SpicinessRatingEnum?), double? price = default(double?), int? displayOrder = default(int?), bool? alcohol = default(bool?), bool? isAvailable = default(bool?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), bool? disableVouchers = default(bool?), string imageName = default(string), string imageUrl = default(string), int? menuItemId = default(int?))
+        /// <param name="excludeFromVoucherDiscounting">If true, the item is excluded from voucher discount calculations.</param>
+        /// <param name="publicId">Permanent reference to the item..</param>
+        public CreateFullMenuSectionItem(List<CreateFullMenuItemOptionSet> menuItemOptionSets = default(List<CreateFullMenuItemOptionSet>), List<CreateMetadata> metadata = default(List<CreateMetadata>), string taxRateName = default(string), string name = default(string), string description = default(string), SpicinessRatingEnum? spicinessRating = default(SpicinessRatingEnum?), double? price = default(double?), double? depositReturnFee = default(double?), int? displayOrder = default(int?), bool? alcohol = default(bool?), bool? isAvailable = default(bool?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), bool? disableVouchers = default(bool?), string imageName = default(string), string imageUrl = default(string), int? menuItemId = default(int?), bool? excludeFromVoucherDiscounting = default(bool?), Guid? publicId = default(Guid?))
         {
             this.MenuItemOptionSets = menuItemOptionSets;
             this.Metadata = metadata;
@@ -135,6 +136,7 @@ public enum CellLayoutTypeEnum
             this.Description = description;
             this.SpicinessRating = spicinessRating;
             this.Price = price;
+            this.DepositReturnFee = depositReturnFee;
             this.DisplayOrder = displayOrder;
             this.Alcohol = alcohol;
             this.IsAvailable = isAvailable;
@@ -143,6 +145,8 @@ public enum CellLayoutTypeEnum
             this.ImageName = imageName;
             this.ImageUrl = imageUrl;
             this.MenuItemId = menuItemId;
+            this.ExcludeFromVoucherDiscounting = excludeFromVoucherDiscounting;
+            this.PublicId = publicId;
         }
         
         /// <summary>
@@ -188,6 +192,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="Price", EmitDefaultValue=false)]
         public double? Price { get; set; }
 
+        /// <summary>
+        /// An optional fee that can be added to the price of the item.
+        /// </summary>
+        /// <value>An optional fee that can be added to the price of the item.</value>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
         /// <summary>
         /// Display order
         /// </summary>
@@ -238,6 +249,20 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="MenuItemId", EmitDefaultValue=false)]
         public int? MenuItemId { get; set; }
 
+        /// <summary>
+        /// If true, the item is excluded from voucher discount calculations
+        /// </summary>
+        /// <value>If true, the item is excluded from voucher discount calculations</value>
+        [DataMember(Name="ExcludeFromVoucherDiscounting", EmitDefaultValue=false)]
+        public bool? ExcludeFromVoucherDiscounting { get; set; }
+
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -253,6 +278,7 @@ public override string ToString()
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  SpicinessRating: ").Append(SpicinessRating).Append("\n");
             sb.Append("  Price: ").Append(Price).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
             sb.Append("  DisplayOrder: ").Append(DisplayOrder).Append("\n");
             sb.Append("  Alcohol: ").Append(Alcohol).Append("\n");
             sb.Append("  IsAvailable: ").Append(IsAvailable).Append("\n");
@@ -261,6 +287,8 @@ public override string ToString()
             sb.Append("  ImageName: ").Append(ImageName).Append("\n");
             sb.Append("  ImageUrl: ").Append(ImageUrl).Append("\n");
             sb.Append("  MenuItemId: ").Append(MenuItemId).Append("\n");
+            sb.Append("  ExcludeFromVoucherDiscounting: ").Append(ExcludeFromVoucherDiscounting).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -330,6 +358,11 @@ public bool Equals(CreateFullMenuSectionItem input)
                     (this.Price != null &&
                     this.Price.Equals(input.Price))
                 ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
+                ) && 
                 (
                     this.DisplayOrder == input.DisplayOrder ||
                     (this.DisplayOrder != null &&
@@ -369,6 +402,16 @@ public bool Equals(CreateFullMenuSectionItem input)
                     this.MenuItemId == input.MenuItemId ||
                     (this.MenuItemId != null &&
                     this.MenuItemId.Equals(input.MenuItemId))
+                ) && 
+                (
+                    this.ExcludeFromVoucherDiscounting == input.ExcludeFromVoucherDiscounting ||
+                    (this.ExcludeFromVoucherDiscounting != null &&
+                    this.ExcludeFromVoucherDiscounting.Equals(input.ExcludeFromVoucherDiscounting))
+                ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
                 );
         }
 
@@ -395,6 +438,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.SpicinessRating.GetHashCode();
                 if (this.Price != null)
                     hashCode = hashCode * 59 + this.Price.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
                 if (this.DisplayOrder != null)
                     hashCode = hashCode * 59 + this.DisplayOrder.GetHashCode();
                 if (this.Alcohol != null)
@@ -411,31 +456,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ImageUrl.GetHashCode();
                 if (this.MenuItemId != null)
                     hashCode = hashCode * 59 + this.MenuItemId.GetHashCode();
+                if (this.ExcludeFromVoucherDiscounting != null)
+                    hashCode = hashCode * 59 + this.ExcludeFromVoucherDiscounting.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateGroup.cs b/src/Flipdish/Model/CreateGroup.cs
index 7986e519..049d452c 100644
--- a/src/Flipdish/Model/CreateGroup.cs
+++ b/src/Flipdish/Model/CreateGroup.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create a Catalog Group
     /// </summary>
     [DataContract]
-    public partial class CreateGroup :  IEquatable<CreateGroup>, IValidatableObject
+    public partial class CreateGroup :  IEquatable<CreateGroup>
     {
         /// <summary>
         /// Type of group (ModifierGroup, etc)
@@ -290,52 +288,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateGroupReference.cs b/src/Flipdish/Model/CreateGroupReference.cs
index 6c672aa1..f53a5d6f 100644
--- a/src/Flipdish/Model/CreateGroupReference.cs
+++ b/src/Flipdish/Model/CreateGroupReference.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Information to create a reference to a {System.Text.RegularExpressions.Group}
     /// </summary>
     [DataContract]
-    public partial class CreateGroupReference :  IEquatable<CreateGroupReference>, IValidatableObject
+    public partial class CreateGroupReference :  IEquatable<CreateGroupReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -163,28 +161,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateLocation.cs b/src/Flipdish/Model/CreateLocation.cs
index fb511bf7..04811708 100644
--- a/src/Flipdish/Model/CreateLocation.cs
+++ b/src/Flipdish/Model/CreateLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Input model for creating a Location
     /// </summary>
     [DataContract]
-    public partial class CreateLocation :  IEquatable<CreateLocation>, IValidatableObject
+    public partial class CreateLocation :  IEquatable<CreateLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateLocation" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateLocationArea.cs b/src/Flipdish/Model/CreateLocationArea.cs
index 160e8293..2e3c9d5b 100644
--- a/src/Flipdish/Model/CreateLocationArea.cs
+++ b/src/Flipdish/Model/CreateLocationArea.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Input model for creating a LocationArea
     /// </summary>
     [DataContract]
-    public partial class CreateLocationArea :  IEquatable<CreateLocationArea>, IValidatableObject
+    public partial class CreateLocationArea :  IEquatable<CreateLocationArea>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateLocationArea" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateMenuSectionItemFromCatalogItems.cs b/src/Flipdish/Model/CreateMenuSectionItemFromCatalogItems.cs
index b6536f21..779fad75 100644
--- a/src/Flipdish/Model/CreateMenuSectionItemFromCatalogItems.cs
+++ b/src/Flipdish/Model/CreateMenuSectionItemFromCatalogItems.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Add CatalogItems to a Menu
     /// </summary>
     [DataContract]
-    public partial class CreateMenuSectionItemFromCatalogItems :  IEquatable<CreateMenuSectionItemFromCatalogItems>, IValidatableObject
+    public partial class CreateMenuSectionItemFromCatalogItems :  IEquatable<CreateMenuSectionItemFromCatalogItems>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateMenuSectionItemFromCatalogItems" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateMenuSectionItemFromProducts.cs b/src/Flipdish/Model/CreateMenuSectionItemFromProducts.cs
deleted file mode 100644
index a611383c..00000000
--- a/src/Flipdish/Model/CreateMenuSectionItemFromProducts.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Add Product to a Menu
-    /// </summary>
-    [DataContract]
-    public partial class CreateMenuSectionItemFromProducts :  IEquatable<CreateMenuSectionItemFromProducts>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateMenuSectionItemFromProducts" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected CreateMenuSectionItemFromProducts() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateMenuSectionItemFromProducts" /> class.
-        /// </summary>
-        /// <param name="productItems">List of Products to add to the section (required).</param>
-        public CreateMenuSectionItemFromProducts(List<ProductItem> productItems = default(List<ProductItem>))
-        {
-            // to ensure "productItems" is required (not null)
-            if (productItems == null)
-            {
-                throw new InvalidDataException("productItems is a required property for CreateMenuSectionItemFromProducts and cannot be null");
-            }
-            else
-            {
-                this.ProductItems = productItems;
-            }
-        }
-        
-        /// <summary>
-        /// List of Products to add to the section
-        /// </summary>
-        /// <value>List of Products to add to the section</value>
-        [DataMember(Name="ProductItems", EmitDefaultValue=false)]
-        public List<ProductItem> ProductItems { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CreateMenuSectionItemFromProducts {\n");
-            sb.Append("  ProductItems: ").Append(ProductItems).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CreateMenuSectionItemFromProducts);
-        }
-
-        /// <summary>
-        /// Returns true if CreateMenuSectionItemFromProducts instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CreateMenuSectionItemFromProducts to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CreateMenuSectionItemFromProducts input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.ProductItems == input.ProductItems ||
-                    this.ProductItems != null &&
-                    this.ProductItems.SequenceEqual(input.ProductItems)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.ProductItems != null)
-                    hashCode = hashCode * 59 + this.ProductItems.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CreateMenuTaxRate.cs b/src/Flipdish/Model/CreateMenuTaxRate.cs
index d6633c73..d6923667 100644
--- a/src/Flipdish/Model/CreateMenuTaxRate.cs
+++ b/src/Flipdish/Model/CreateMenuTaxRate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Tax Rates Associated with a Menu
     /// </summary>
     [DataContract]
-    public partial class CreateMenuTaxRate :  IEquatable<CreateMenuTaxRate>, IValidatableObject
+    public partial class CreateMenuTaxRate :  IEquatable<CreateMenuTaxRate>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateMenuTaxRate" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateMetadata.cs b/src/Flipdish/Model/CreateMetadata.cs
index 61108474..54443cf5 100644
--- a/src/Flipdish/Model/CreateMetadata.cs
+++ b/src/Flipdish/Model/CreateMetadata.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create metadata
     /// </summary>
     [DataContract]
-    public partial class CreateMetadata :  IEquatable<CreateMetadata>, IValidatableObject
+    public partial class CreateMetadata :  IEquatable<CreateMetadata>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateMetadata" /> class.
@@ -144,40 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Key (string) maxLength
-            if(this.Key != null && this.Key.Length > 128)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Key, length must be less than 128.", new [] { "Key" });
-            }
-
-            // Key (string) minLength
-            if(this.Key != null && this.Key.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Key, length must be greater than 0.", new [] { "Key" });
-            }
-
-            // Value (string) maxLength
-            if(this.Value != null && this.Value.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Value, length must be less than 4000.", new [] { "Value" });
-            }
-
-            // Value (string) minLength
-            if(this.Value != null && this.Value.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Value, length must be greater than 0.", new [] { "Value" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateMetafieldDefinition.cs b/src/Flipdish/Model/CreateMetafieldDefinition.cs
index 00fe385a..65f6ffaa 100644
--- a/src/Flipdish/Model/CreateMetafieldDefinition.cs
+++ b/src/Flipdish/Model/CreateMetafieldDefinition.cs
@@ -12,28 +12,26 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Information to create a {Flipdish.PublicModels.V1.Metafields.MetafieldDefinition}
+    /// Information to create a {Flipdish.Metafields.PublicModels.V1.MetafieldDefinition}
     /// </summary>
     [DataContract]
-    public partial class CreateMetafieldDefinition :  IEquatable<CreateMetafieldDefinition>, IValidatableObject
+    public partial class CreateMetafieldDefinition :  IEquatable<CreateMetafieldDefinition>
     {
         /// <summary>
-        /// The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}
+        /// The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}
         /// </summary>
-        /// <value>The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}</value>
+        /// <value>The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum OwnerEntityEnum
         {
@@ -58,9 +56,9 @@ public enum OwnerEntityEnum
         }
 
         /// <summary>
-        /// The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}
+        /// The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}
         /// </summary>
-        /// <value>The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}</value>
+        /// <value>The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}</value>
         [DataMember(Name="OwnerEntity", EmitDefaultValue=false)]
         public OwnerEntityEnum? OwnerEntity { get; set; }
         /// <summary>
@@ -71,23 +69,29 @@ public enum OwnerEntityEnum
         public enum ValueTypeEnum
         {
             
+            /// <summary>
+            /// Enum Boolean for value: Boolean
+            /// </summary>
+            [EnumMember(Value = "Boolean")]
+            Boolean = 1,
+            
             /// <summary>
             /// Enum Json for value: Json
             /// </summary>
             [EnumMember(Value = "Json")]
-            Json = 1,
+            Json = 2,
             
             /// <summary>
             /// Enum SingleLineString for value: SingleLineString
             /// </summary>
             [EnumMember(Value = "SingleLineString")]
-            SingleLineString = 2,
+            SingleLineString = 3,
             
             /// <summary>
             /// Enum MultiLineString for value: MultiLineString
             /// </summary>
             [EnumMember(Value = "MultiLineString")]
-            MultiLineString = 3
+            MultiLineString = 4
         }
 
         /// <summary>
@@ -132,7 +136,7 @@ protected CreateMetafieldDefinition() { }
         /// Initializes a new instance of the <see cref="CreateMetafieldDefinition" /> class.
         /// </summary>
         /// <param name="isReadOnly">Indicates if a definition can be edited or not.</param>
-        /// <param name="ownerEntity">The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}.</param>
+        /// <param name="ownerEntity">The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}.</param>
         /// <param name="key">Key of the metafield.  The key must have two parts, separated by a dot. The first part acts as a category, for organizational purposes.  The parts can be composed of lowercase letters, numbers, hyphen and underscore (required).</param>
         /// <param name="valueType">The excepted type for the Value field.</param>
         /// <param name="name">Field Name (required).</param>
@@ -325,16 +329,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateModifier.cs b/src/Flipdish/Model/CreateModifier.cs
deleted file mode 100644
index f3bd047e..00000000
--- a/src/Flipdish/Model/CreateModifier.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Create a modifier
-    /// </summary>
-    [DataContract]
-    public partial class CreateModifier :  IEquatable<CreateModifier>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateModifier" /> class.
-        /// </summary>
-        /// <param name="sku">Stock Keeping Unit (SKU).</param>
-        /// <param name="name">Product name.</param>
-        /// <param name="description">Product description.</param>
-        /// <param name="price">Product price.</param>
-        /// <param name="imageFileName">Image File Name.</param>
-        public CreateModifier(string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), string imageFileName = default(string))
-        {
-            this.Sku = sku;
-            this.Name = name;
-            this.Description = description;
-            this.Price = price;
-            this.ImageFileName = imageFileName;
-        }
-        
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Product name
-        /// </summary>
-        /// <value>Product name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Product description
-        /// </summary>
-        /// <value>Product description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Product price
-        /// </summary>
-        /// <value>Product price</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public double? Price { get; set; }
-
-        /// <summary>
-        /// Image File Name
-        /// </summary>
-        /// <value>Image File Name</value>
-        [DataMember(Name="ImageFileName", EmitDefaultValue=false)]
-        public string ImageFileName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CreateModifier {\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  ImageFileName: ").Append(ImageFileName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CreateModifier);
-        }
-
-        /// <summary>
-        /// Returns true if CreateModifier instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CreateModifier to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CreateModifier input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.ImageFileName == input.ImageFileName ||
-                    (this.ImageFileName != null &&
-                    this.ImageFileName.Equals(input.ImageFileName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.ImageFileName != null)
-                    hashCode = hashCode * 59 + this.ImageFileName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 200)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 200.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 1000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 1000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CreateModifierGroup.cs b/src/Flipdish/Model/CreateModifierGroup.cs
deleted file mode 100644
index 292c04fe..00000000
--- a/src/Flipdish/Model/CreateModifierGroup.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Information to create a Modifier Group
-    /// </summary>
-    [DataContract]
-    public partial class CreateModifierGroup :  IEquatable<CreateModifierGroup>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateModifierGroup" /> class.
-        /// </summary>
-        /// <param name="minSelection">Minimum number of items that the user has to select.</param>
-        /// <param name="maxSelection">Maximum number of items that the user has to select.</param>
-        /// <param name="subProducts">Collection of products associated with this product.</param>
-        /// <param name="sku">Stock Keeping Unit (SKU).</param>
-        /// <param name="name">Product name.</param>
-        /// <param name="description">Product description.</param>
-        /// <param name="price">Product price.</param>
-        /// <param name="imageFileName">Image File Name.</param>
-        public CreateModifierGroup(int? minSelection = default(int?), int? maxSelection = default(int?), List<ModifierGroupSubProduct> subProducts = default(List<ModifierGroupSubProduct>), string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), string imageFileName = default(string))
-        {
-            this.MinSelection = minSelection;
-            this.MaxSelection = maxSelection;
-            this.SubProducts = subProducts;
-            this.Sku = sku;
-            this.Name = name;
-            this.Description = description;
-            this.Price = price;
-            this.ImageFileName = imageFileName;
-        }
-        
-        /// <summary>
-        /// Minimum number of items that the user has to select
-        /// </summary>
-        /// <value>Minimum number of items that the user has to select</value>
-        [DataMember(Name="MinSelection", EmitDefaultValue=false)]
-        public int? MinSelection { get; set; }
-
-        /// <summary>
-        /// Maximum number of items that the user has to select
-        /// </summary>
-        /// <value>Maximum number of items that the user has to select</value>
-        [DataMember(Name="MaxSelection", EmitDefaultValue=false)]
-        public int? MaxSelection { get; set; }
-
-        /// <summary>
-        /// Collection of products associated with this product
-        /// </summary>
-        /// <value>Collection of products associated with this product</value>
-        [DataMember(Name="SubProducts", EmitDefaultValue=false)]
-        public List<ModifierGroupSubProduct> SubProducts { get; set; }
-
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Product name
-        /// </summary>
-        /// <value>Product name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Product description
-        /// </summary>
-        /// <value>Product description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Product price
-        /// </summary>
-        /// <value>Product price</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public double? Price { get; set; }
-
-        /// <summary>
-        /// Image File Name
-        /// </summary>
-        /// <value>Image File Name</value>
-        [DataMember(Name="ImageFileName", EmitDefaultValue=false)]
-        public string ImageFileName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CreateModifierGroup {\n");
-            sb.Append("  MinSelection: ").Append(MinSelection).Append("\n");
-            sb.Append("  MaxSelection: ").Append(MaxSelection).Append("\n");
-            sb.Append("  SubProducts: ").Append(SubProducts).Append("\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  ImageFileName: ").Append(ImageFileName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CreateModifierGroup);
-        }
-
-        /// <summary>
-        /// Returns true if CreateModifierGroup instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CreateModifierGroup to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CreateModifierGroup input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.MinSelection == input.MinSelection ||
-                    (this.MinSelection != null &&
-                    this.MinSelection.Equals(input.MinSelection))
-                ) && 
-                (
-                    this.MaxSelection == input.MaxSelection ||
-                    (this.MaxSelection != null &&
-                    this.MaxSelection.Equals(input.MaxSelection))
-                ) && 
-                (
-                    this.SubProducts == input.SubProducts ||
-                    this.SubProducts != null &&
-                    this.SubProducts.SequenceEqual(input.SubProducts)
-                ) && 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.ImageFileName == input.ImageFileName ||
-                    (this.ImageFileName != null &&
-                    this.ImageFileName.Equals(input.ImageFileName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.MinSelection != null)
-                    hashCode = hashCode * 59 + this.MinSelection.GetHashCode();
-                if (this.MaxSelection != null)
-                    hashCode = hashCode * 59 + this.MaxSelection.GetHashCode();
-                if (this.SubProducts != null)
-                    hashCode = hashCode * 59 + this.SubProducts.GetHashCode();
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.ImageFileName != null)
-                    hashCode = hashCode * 59 + this.ImageFileName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 200)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 200.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 1000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 1000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CreatePayGreenConfigurationRequest.cs b/src/Flipdish/Model/CreatePayGreenConfigurationRequest.cs
new file mode 100644
index 00000000..ce79ac67
--- /dev/null
+++ b/src/Flipdish/Model/CreatePayGreenConfigurationRequest.cs
@@ -0,0 +1,164 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// CreatePayGreenConfigurationRequest.
+    /// </summary>
+    [DataContract]
+    public partial class CreatePayGreenConfigurationRequest :  IEquatable<CreatePayGreenConfigurationRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreatePayGreenConfigurationRequest" /> class.
+        /// </summary>
+        /// <param name="name">Name..</param>
+        /// <param name="payGreenId">PayGreenId..</param>
+        /// <param name="payGreenPrivateKey">PayGreenPrivateKey..</param>
+        /// <param name="assignedStores">AssignedStores..</param>
+        public CreatePayGreenConfigurationRequest(string name = default(string), string payGreenId = default(string), string payGreenPrivateKey = default(string), List<int?> assignedStores = default(List<int?>))
+        {
+            this.Name = name;
+            this.PayGreenId = payGreenId;
+            this.PayGreenPrivateKey = payGreenPrivateKey;
+            this.AssignedStores = assignedStores;
+        }
+        
+        /// <summary>
+        /// Name.
+        /// </summary>
+        /// <value>Name.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// PayGreenId.
+        /// </summary>
+        /// <value>PayGreenId.</value>
+        [DataMember(Name="PayGreenId", EmitDefaultValue=false)]
+        public string PayGreenId { get; set; }
+
+        /// <summary>
+        /// PayGreenPrivateKey.
+        /// </summary>
+        /// <value>PayGreenPrivateKey.</value>
+        [DataMember(Name="PayGreenPrivateKey", EmitDefaultValue=false)]
+        public string PayGreenPrivateKey { get; set; }
+
+        /// <summary>
+        /// AssignedStores.
+        /// </summary>
+        /// <value>AssignedStores.</value>
+        [DataMember(Name="AssignedStores", EmitDefaultValue=false)]
+        public List<int?> AssignedStores { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CreatePayGreenConfigurationRequest {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  PayGreenId: ").Append(PayGreenId).Append("\n");
+            sb.Append("  PayGreenPrivateKey: ").Append(PayGreenPrivateKey).Append("\n");
+            sb.Append("  AssignedStores: ").Append(AssignedStores).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CreatePayGreenConfigurationRequest);
+        }
+
+        /// <summary>
+        /// Returns true if CreatePayGreenConfigurationRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CreatePayGreenConfigurationRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CreatePayGreenConfigurationRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.PayGreenId == input.PayGreenId ||
+                    (this.PayGreenId != null &&
+                    this.PayGreenId.Equals(input.PayGreenId))
+                ) && 
+                (
+                    this.PayGreenPrivateKey == input.PayGreenPrivateKey ||
+                    (this.PayGreenPrivateKey != null &&
+                    this.PayGreenPrivateKey.Equals(input.PayGreenPrivateKey))
+                ) && 
+                (
+                    this.AssignedStores == input.AssignedStores ||
+                    this.AssignedStores != null &&
+                    this.AssignedStores.SequenceEqual(input.AssignedStores)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.PayGreenId != null)
+                    hashCode = hashCode * 59 + this.PayGreenId.GetHashCode();
+                if (this.PayGreenPrivateKey != null)
+                    hashCode = hashCode * 59 + this.PayGreenPrivateKey.GetHashCode();
+                if (this.AssignedStores != null)
+                    hashCode = hashCode * 59 + this.AssignedStores.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CreateProduct.cs b/src/Flipdish/Model/CreateProduct.cs
index 7858fcc0..36cdc704 100644
--- a/src/Flipdish/Model/CreateProduct.cs
+++ b/src/Flipdish/Model/CreateProduct.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Create a Catalog Item
     /// </summary>
     [DataContract]
-    public partial class CreateProduct :  IEquatable<CreateProduct>, IValidatableObject
+    public partial class CreateProduct :  IEquatable<CreateProduct>
     {
         /// <summary>
         /// Type of item (Product, Modifier, etc)
@@ -304,70 +302,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 3000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 3000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateProductReference.cs b/src/Flipdish/Model/CreateProductReference.cs
index d4d6f8b0..67780f05 100644
--- a/src/Flipdish/Model/CreateProductReference.cs
+++ b/src/Flipdish/Model/CreateProductReference.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Information to create a reference to a {Flipdish.PublicModels.V1.Catalog.Product}
+    /// Information to create a reference to a {Flipdish.Menus.PublicModels.V1.Catalog.Product}
     /// </summary>
     [DataContract]
-    public partial class CreateProductReference :  IEquatable<CreateProductReference>, IValidatableObject
+    public partial class CreateProductReference :  IEquatable<CreateProductReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -186,28 +184,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreatePromotion.cs b/src/Flipdish/Model/CreatePromotion.cs
new file mode 100644
index 00000000..2dcc2753
--- /dev/null
+++ b/src/Flipdish/Model/CreatePromotion.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Create Promotion
+    /// </summary>
+    [DataContract]
+    public partial class CreatePromotion :  IEquatable<CreatePromotion>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreatePromotion" /> class.
+        /// </summary>
+        /// <param name="name">Promotion Name.</param>
+        /// <param name="menuItemPublicIds">Promotion Menu Item Awards.</param>
+        public CreatePromotion(string name = default(string), List<Guid?> menuItemPublicIds = default(List<Guid?>))
+        {
+            this.Name = name;
+            this.MenuItemPublicIds = menuItemPublicIds;
+        }
+        
+        /// <summary>
+        /// Promotion Name
+        /// </summary>
+        /// <value>Promotion Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Promotion Menu Item Awards
+        /// </summary>
+        /// <value>Promotion Menu Item Awards</value>
+        [DataMember(Name="MenuItemPublicIds", EmitDefaultValue=false)]
+        public List<Guid?> MenuItemPublicIds { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CreatePromotion {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  MenuItemPublicIds: ").Append(MenuItemPublicIds).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CreatePromotion);
+        }
+
+        /// <summary>
+        /// Returns true if CreatePromotion instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CreatePromotion to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CreatePromotion input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.MenuItemPublicIds == input.MenuItemPublicIds ||
+                    this.MenuItemPublicIds != null &&
+                    this.MenuItemPublicIds.SequenceEqual(input.MenuItemPublicIds)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.MenuItemPublicIds != null)
+                    hashCode = hashCode * 59 + this.MenuItemPublicIds.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CreateSimpleProduct.cs b/src/Flipdish/Model/CreateSimpleProduct.cs
deleted file mode 100644
index ef08ad98..00000000
--- a/src/Flipdish/Model/CreateSimpleProduct.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Information to create a Simple Product
-    /// </summary>
-    [DataContract]
-    public partial class CreateSimpleProduct :  IEquatable<CreateSimpleProduct>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateSimpleProduct" /> class.
-        /// </summary>
-        /// <param name="subProducts">Collection of products associated with this product.</param>
-        /// <param name="sku">Stock Keeping Unit (SKU).</param>
-        /// <param name="name">Product name.</param>
-        /// <param name="description">Product description.</param>
-        /// <param name="price">Product price.</param>
-        /// <param name="imageFileName">Image File Name.</param>
-        public CreateSimpleProduct(List<SimpleProductSubProduct> subProducts = default(List<SimpleProductSubProduct>), string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), string imageFileName = default(string))
-        {
-            this.SubProducts = subProducts;
-            this.Sku = sku;
-            this.Name = name;
-            this.Description = description;
-            this.Price = price;
-            this.ImageFileName = imageFileName;
-        }
-        
-        /// <summary>
-        /// Collection of products associated with this product
-        /// </summary>
-        /// <value>Collection of products associated with this product</value>
-        [DataMember(Name="SubProducts", EmitDefaultValue=false)]
-        public List<SimpleProductSubProduct> SubProducts { get; set; }
-
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Product name
-        /// </summary>
-        /// <value>Product name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Product description
-        /// </summary>
-        /// <value>Product description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Product price
-        /// </summary>
-        /// <value>Product price</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public double? Price { get; set; }
-
-        /// <summary>
-        /// Image File Name
-        /// </summary>
-        /// <value>Image File Name</value>
-        [DataMember(Name="ImageFileName", EmitDefaultValue=false)]
-        public string ImageFileName { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class CreateSimpleProduct {\n");
-            sb.Append("  SubProducts: ").Append(SubProducts).Append("\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  ImageFileName: ").Append(ImageFileName).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as CreateSimpleProduct);
-        }
-
-        /// <summary>
-        /// Returns true if CreateSimpleProduct instances are equal
-        /// </summary>
-        /// <param name="input">Instance of CreateSimpleProduct to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(CreateSimpleProduct input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.SubProducts == input.SubProducts ||
-                    this.SubProducts != null &&
-                    this.SubProducts.SequenceEqual(input.SubProducts)
-                ) && 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.ImageFileName == input.ImageFileName ||
-                    (this.ImageFileName != null &&
-                    this.ImageFileName.Equals(input.ImageFileName))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.SubProducts != null)
-                    hashCode = hashCode * 59 + this.SubProducts.GetHashCode();
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.ImageFileName != null)
-                    hashCode = hashCode * 59 + this.ImageFileName.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 200)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 200.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 1000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 1000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/CreateTeammate.cs b/src/Flipdish/Model/CreateTeammate.cs
index b16faac9..320395b7 100644
--- a/src/Flipdish/Model/CreateTeammate.cs
+++ b/src/Flipdish/Model/CreateTeammate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CreateTeammate
     /// </summary>
     [DataContract]
-    public partial class CreateTeammate :  IEquatable<CreateTeammate>, IValidatableObject
+    public partial class CreateTeammate :  IEquatable<CreateTeammate>
     {
         /// <summary>
         /// App access level
@@ -56,47 +54,71 @@ public enum AppAccessLevelEnum
             [EnumMember(Value = "StoreOwner")]
             StoreOwner = 3,
             
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 4,
+            
             /// <summary>
             /// Enum ManagedOwner for value: ManagedOwner
             /// </summary>
             [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 4,
+            ManagedOwner = 5,
             
             /// <summary>
             /// Enum Integrator for value: Integrator
             /// </summary>
             [EnumMember(Value = "Integrator")]
-            Integrator = 5,
+            Integrator = 6,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 7,
             
             /// <summary>
             /// Enum StoreManager for value: StoreManager
             /// </summary>
             [EnumMember(Value = "StoreManager")]
-            StoreManager = 6,
+            StoreManager = 8,
             
             /// <summary>
             /// Enum StoreStaff for value: StoreStaff
             /// </summary>
             [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 7,
+            StoreStaff = 9,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 10,
             
             /// <summary>
             /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
             /// </summary>
             [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 8,
+            StoreReadOnlyAccess = 11,
             
             /// <summary>
             /// Enum FinanceManger for value: FinanceManger
             /// </summary>
             [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 9,
+            FinanceManger = 12,
+            
+            /// <summary>
+            /// Enum Onboarding for value: Onboarding
+            /// </summary>
+            [EnumMember(Value = "Onboarding")]
+            Onboarding = 13,
             
             /// <summary>
             /// Enum Support for value: Support
             /// </summary>
             [EnumMember(Value = "Support")]
-            Support = 10
+            Support = 14
         }
 
         /// <summary>
@@ -112,12 +134,14 @@ public enum AppAccessLevelEnum
         /// <param name="appAccessLevel">App access level.</param>
         /// <param name="hasAccessToAllStores">The user has access to all stores for the app (including new stores that added later).</param>
         /// <param name="storeIds">Store IDs the user has access to (if HasAccessToAllStores is false).</param>
-        public CreateTeammate(string email = default(string), AppAccessLevelEnum? appAccessLevel = default(AppAccessLevelEnum?), bool? hasAccessToAllStores = default(bool?), List<int?> storeIds = default(List<int?>))
+        /// <param name="propertyIds">Property Ids the user has access to (if HasAccessToAllStores is false).</param>
+        public CreateTeammate(string email = default(string), AppAccessLevelEnum? appAccessLevel = default(AppAccessLevelEnum?), bool? hasAccessToAllStores = default(bool?), List<int?> storeIds = default(List<int?>), List<string> propertyIds = default(List<string>))
         {
             this.Email = email;
             this.AppAccessLevel = appAccessLevel;
             this.HasAccessToAllStores = hasAccessToAllStores;
             this.StoreIds = storeIds;
+            this.PropertyIds = propertyIds;
         }
         
         /// <summary>
@@ -142,6 +166,13 @@ public enum AppAccessLevelEnum
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
+        /// <summary>
+        /// Property Ids the user has access to (if HasAccessToAllStores is false)
+        /// </summary>
+        /// <value>Property Ids the user has access to (if HasAccessToAllStores is false)</value>
+        [DataMember(Name="PropertyIds", EmitDefaultValue=false)]
+        public List<string> PropertyIds { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,6 +185,7 @@ public override string ToString()
             sb.Append("  AppAccessLevel: ").Append(AppAccessLevel).Append("\n");
             sb.Append("  HasAccessToAllStores: ").Append(HasAccessToAllStores).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  PropertyIds: ").Append(PropertyIds).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -207,6 +239,11 @@ public bool Equals(CreateTeammate input)
                     this.StoreIds == input.StoreIds ||
                     this.StoreIds != null &&
                     this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.PropertyIds == input.PropertyIds ||
+                    this.PropertyIds != null &&
+                    this.PropertyIds.SequenceEqual(input.PropertyIds)
                 );
         }
 
@@ -227,19 +264,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.HasAccessToAllStores.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.PropertyIds != null)
+                    hashCode = hashCode * 59 + this.PropertyIds.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreateUserDeliveryLocationRequest.cs b/src/Flipdish/Model/CreateUserDeliveryLocationRequest.cs
new file mode 100644
index 00000000..33f6db07
--- /dev/null
+++ b/src/Flipdish/Model/CreateUserDeliveryLocationRequest.cs
@@ -0,0 +1,232 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Create a delivery location for a user (admin).
+    /// </summary>
+    [DataContract]
+    public partial class CreateUserDeliveryLocationRequest :  IEquatable<CreateUserDeliveryLocationRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateUserDeliveryLocationRequest" /> class.
+        /// </summary>
+        /// <param name="building">Building..</param>
+        /// <param name="street">Street..</param>
+        /// <param name="town">Town..</param>
+        /// <param name="postCode">PostCode..</param>
+        /// <param name="fullAddressJson">FullAddressJson..</param>
+        /// <param name="deliveryInstructions">DeliveryInstructions..</param>
+        /// <param name="coordinates">Coordinates..</param>
+        /// <param name="isDisplayed">Passed through to the same parameter position as legacy admin MVC (maps to IsCustomAddress in map service)..</param>
+        public CreateUserDeliveryLocationRequest(string building = default(string), string street = default(string), string town = default(string), string postCode = default(string), string fullAddressJson = default(string), string deliveryInstructions = default(string), Coordinates coordinates = default(Coordinates), bool? isDisplayed = default(bool?))
+        {
+            this.Building = building;
+            this.Street = street;
+            this.Town = town;
+            this.PostCode = postCode;
+            this.FullAddressJson = fullAddressJson;
+            this.DeliveryInstructions = deliveryInstructions;
+            this.Coordinates = coordinates;
+            this.IsDisplayed = isDisplayed;
+        }
+        
+        /// <summary>
+        /// Building.
+        /// </summary>
+        /// <value>Building.</value>
+        [DataMember(Name="Building", EmitDefaultValue=false)]
+        public string Building { get; set; }
+
+        /// <summary>
+        /// Street.
+        /// </summary>
+        /// <value>Street.</value>
+        [DataMember(Name="Street", EmitDefaultValue=false)]
+        public string Street { get; set; }
+
+        /// <summary>
+        /// Town.
+        /// </summary>
+        /// <value>Town.</value>
+        [DataMember(Name="Town", EmitDefaultValue=false)]
+        public string Town { get; set; }
+
+        /// <summary>
+        /// PostCode.
+        /// </summary>
+        /// <value>PostCode.</value>
+        [DataMember(Name="PostCode", EmitDefaultValue=false)]
+        public string PostCode { get; set; }
+
+        /// <summary>
+        /// FullAddressJson.
+        /// </summary>
+        /// <value>FullAddressJson.</value>
+        [DataMember(Name="FullAddressJson", EmitDefaultValue=false)]
+        public string FullAddressJson { get; set; }
+
+        /// <summary>
+        /// DeliveryInstructions.
+        /// </summary>
+        /// <value>DeliveryInstructions.</value>
+        [DataMember(Name="DeliveryInstructions", EmitDefaultValue=false)]
+        public string DeliveryInstructions { get; set; }
+
+        /// <summary>
+        /// Coordinates.
+        /// </summary>
+        /// <value>Coordinates.</value>
+        [DataMember(Name="Coordinates", EmitDefaultValue=false)]
+        public Coordinates Coordinates { get; set; }
+
+        /// <summary>
+        /// Passed through to the same parameter position as legacy admin MVC (maps to IsCustomAddress in map service).
+        /// </summary>
+        /// <value>Passed through to the same parameter position as legacy admin MVC (maps to IsCustomAddress in map service).</value>
+        [DataMember(Name="IsDisplayed", EmitDefaultValue=false)]
+        public bool? IsDisplayed { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CreateUserDeliveryLocationRequest {\n");
+            sb.Append("  Building: ").Append(Building).Append("\n");
+            sb.Append("  Street: ").Append(Street).Append("\n");
+            sb.Append("  Town: ").Append(Town).Append("\n");
+            sb.Append("  PostCode: ").Append(PostCode).Append("\n");
+            sb.Append("  FullAddressJson: ").Append(FullAddressJson).Append("\n");
+            sb.Append("  DeliveryInstructions: ").Append(DeliveryInstructions).Append("\n");
+            sb.Append("  Coordinates: ").Append(Coordinates).Append("\n");
+            sb.Append("  IsDisplayed: ").Append(IsDisplayed).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CreateUserDeliveryLocationRequest);
+        }
+
+        /// <summary>
+        /// Returns true if CreateUserDeliveryLocationRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CreateUserDeliveryLocationRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CreateUserDeliveryLocationRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Building == input.Building ||
+                    (this.Building != null &&
+                    this.Building.Equals(input.Building))
+                ) && 
+                (
+                    this.Street == input.Street ||
+                    (this.Street != null &&
+                    this.Street.Equals(input.Street))
+                ) && 
+                (
+                    this.Town == input.Town ||
+                    (this.Town != null &&
+                    this.Town.Equals(input.Town))
+                ) && 
+                (
+                    this.PostCode == input.PostCode ||
+                    (this.PostCode != null &&
+                    this.PostCode.Equals(input.PostCode))
+                ) && 
+                (
+                    this.FullAddressJson == input.FullAddressJson ||
+                    (this.FullAddressJson != null &&
+                    this.FullAddressJson.Equals(input.FullAddressJson))
+                ) && 
+                (
+                    this.DeliveryInstructions == input.DeliveryInstructions ||
+                    (this.DeliveryInstructions != null &&
+                    this.DeliveryInstructions.Equals(input.DeliveryInstructions))
+                ) && 
+                (
+                    this.Coordinates == input.Coordinates ||
+                    (this.Coordinates != null &&
+                    this.Coordinates.Equals(input.Coordinates))
+                ) && 
+                (
+                    this.IsDisplayed == input.IsDisplayed ||
+                    (this.IsDisplayed != null &&
+                    this.IsDisplayed.Equals(input.IsDisplayed))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Building != null)
+                    hashCode = hashCode * 59 + this.Building.GetHashCode();
+                if (this.Street != null)
+                    hashCode = hashCode * 59 + this.Street.GetHashCode();
+                if (this.Town != null)
+                    hashCode = hashCode * 59 + this.Town.GetHashCode();
+                if (this.PostCode != null)
+                    hashCode = hashCode * 59 + this.PostCode.GetHashCode();
+                if (this.FullAddressJson != null)
+                    hashCode = hashCode * 59 + this.FullAddressJson.GetHashCode();
+                if (this.DeliveryInstructions != null)
+                    hashCode = hashCode * 59 + this.DeliveryInstructions.GetHashCode();
+                if (this.Coordinates != null)
+                    hashCode = hashCode * 59 + this.Coordinates.GetHashCode();
+                if (this.IsDisplayed != null)
+                    hashCode = hashCode * 59 + this.IsDisplayed.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CreateVoucher.cs b/src/Flipdish/Model/CreateVoucher.cs
index 88d0df4b..b2dd46f9 100644
--- a/src/Flipdish/Model/CreateVoucher.cs
+++ b/src/Flipdish/Model/CreateVoucher.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Voucher
+    /// Create Voucher
     /// </summary>
     [DataContract]
-    public partial class CreateVoucher :  IEquatable<CreateVoucher>, IValidatableObject
+    public partial class CreateVoucher :  IEquatable<CreateVoucher>
     {
         /// <summary>
         /// Voucher Type
@@ -60,7 +58,13 @@ public enum VoucherTypeEnum
             /// Enum CreditNote for value: CreditNote
             /// </summary>
             [EnumMember(Value = "CreditNote")]
-            CreditNote = 4
+            CreditNote = 4,
+            
+            /// <summary>
+            /// Enum FreeDelivery for value: FreeDelivery
+            /// </summary>
+            [EnumMember(Value = "FreeDelivery")]
+            FreeDelivery = 5
         }
 
         /// <summary>
@@ -70,16 +74,124 @@ public enum VoucherTypeEnum
         [DataMember(Name="VoucherType", EmitDefaultValue=false)]
         public VoucherTypeEnum? VoucherType { get; set; }
         /// <summary>
+        /// Defines ChannelRestrictions
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ChannelRestrictionsEnum
+        {
+            
+            /// <summary>
+            /// Enum Ios for value: Ios
+            /// </summary>
+            [EnumMember(Value = "Ios")]
+            Ios = 1,
+            
+            /// <summary>
+            /// Enum Android for value: Android
+            /// </summary>
+            [EnumMember(Value = "Android")]
+            Android = 2,
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 3,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 4,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 5,
+            
+            /// <summary>
+            /// Enum Google for value: Google
+            /// </summary>
+            [EnumMember(Value = "Google")]
+            Google = 6
+        }
+
+
+        /// <summary>
+        /// Limit the channels this voucher can be used on
+        /// </summary>
+        /// <value>Limit the channels this voucher can be used on</value>
+        [DataMember(Name="ChannelRestrictions", EmitDefaultValue=false)]
+        public List<ChannelRestrictionsEnum> ChannelRestrictions { get; set; }
+        /// <summary>
+        /// Voucher Subtype
+        /// </summary>
+        /// <value>Voucher Subtype</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum VoucherSubTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
+            /// <summary>
+            /// Enum SignUp for value: SignUp
+            /// </summary>
+            [EnumMember(Value = "SignUp")]
+            SignUp = 2,
+            
+            /// <summary>
+            /// Enum Loyalty for value: Loyalty
+            /// </summary>
+            [EnumMember(Value = "Loyalty")]
+            Loyalty = 3,
+            
+            /// <summary>
+            /// Enum Loyalty25 for value: Loyalty25
+            /// </summary>
+            [EnumMember(Value = "Loyalty25")]
+            Loyalty25 = 4,
+            
+            /// <summary>
+            /// Enum Retention for value: Retention
+            /// </summary>
+            [EnumMember(Value = "Retention")]
+            Retention = 5,
+            
+            /// <summary>
+            /// Enum SecondaryRetention for value: SecondaryRetention
+            /// </summary>
+            [EnumMember(Value = "SecondaryRetention")]
+            SecondaryRetention = 6,
+            
+            /// <summary>
+            /// Enum Custom for value: Custom
+            /// </summary>
+            [EnumMember(Value = "Custom")]
+            Custom = 7
+        }
+
+        /// <summary>
+        /// Voucher Subtype
+        /// </summary>
+        /// <value>Voucher Subtype</value>
+        [DataMember(Name="VoucherSubType", EmitDefaultValue=false)]
+        public VoucherSubTypeEnum? VoucherSubType { get; set; }
+        /// <summary>
         /// Initializes a new instance of the <see cref="CreateVoucher" /> class.
         /// </summary>
         /// <param name="voucherType">Voucher Type.</param>
-        /// <param name="stores">Stores that this voucher applies to.</param>
-        /// <param name="addItemDetails">Add item details.</param>
+        /// <param name="promotion">Create Promotion details.</param>
         /// <param name="creditNoteDetails">Credit note details.</param>
         /// <param name="lumpDiscountDetails">Lump discount details.</param>
         /// <param name="percentDiscountDetails">Percent discount details.</param>
         /// <param name="code">Voucher Code.</param>
         /// <param name="description">Voucher Description (Visible on printout).</param>
+        /// <param name="stores">Stores that this voucher applies to.</param>
         /// <param name="validOnOrdersOver">Valid on orders on or above.</param>
         /// <param name="takesPriority">Takes priority.</param>
         /// <param name="isEnabled">Is voucher enabled.</param>
@@ -92,18 +204,26 @@ public enum VoucherTypeEnum
         /// <param name="isValidForFirstOrderOnly">Valid only on the first order by the customer.</param>
         /// <param name="isValidOncePerCustomer">Valid once per customer.</param>
         /// <param name="isValidOnlyOnce">Valid only once, by any customer (once used cannot be used again by any other customer).</param>
+        /// <param name="isDiscoverable">Enables the voucher to be offered in the Voucher Discoverability feature.</param>
+        /// <param name="isPromoted">Marks the voucher as promoted.</param>
+        /// <param name="forceDiscount">Force the discount to be applied which bypasses some menu restrictions.</param>
         /// <param name="startDate">Voucher Starts On (Time in UTC).</param>
         /// <param name="expiryDate">Voucher Expires On (Time in UTC).</param>
-        public CreateVoucher(VoucherTypeEnum? voucherType = default(VoucherTypeEnum?), List<int?> stores = default(List<int?>), AddItemDetails addItemDetails = default(AddItemDetails), CreditNoteDetails creditNoteDetails = default(CreditNoteDetails), LumpDiscountDetails lumpDiscountDetails = default(LumpDiscountDetails), PercentDiscountDetails percentDiscountDetails = default(PercentDiscountDetails), string code = default(string), string description = default(string), double? validOnOrdersOver = default(double?), bool? takesPriority = default(bool?), bool? isEnabled = default(bool?), bool? isAutomaticallyApplied = default(bool?), bool? includeDeliveryFee = default(bool?), bool? isValidForDeliveryOrders = default(bool?), bool? isValidForPickupOrders = default(bool?), bool? isValidForOrdersPayedOnline = default(bool?), bool? isValidForOrdersPayedByCash = default(bool?), bool? isValidForFirstOrderOnly = default(bool?), bool? isValidOncePerCustomer = default(bool?), bool? isValidOnlyOnce = default(bool?), DateTime? startDate = default(DateTime?), DateTime? expiryDate = default(DateTime?))
+        /// <param name="channelRestrictions">Limit the channels this voucher can be used on.</param>
+        /// <param name="validityPeriods">Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated..</param>
+        /// <param name="voucherSubType">Voucher Subtype.</param>
+        /// <param name="customerId">Customer UserID.</param>
+        /// <param name="maxRedemptions">Maximum number of times the voucher can be redeemed (used).</param>
+        public CreateVoucher(VoucherTypeEnum? voucherType = default(VoucherTypeEnum?), CreatePromotion promotion = default(CreatePromotion), CreditNoteDetails creditNoteDetails = default(CreditNoteDetails), LumpDiscountDetails lumpDiscountDetails = default(LumpDiscountDetails), PercentDiscountDetails percentDiscountDetails = default(PercentDiscountDetails), string code = default(string), string description = default(string), List<int?> stores = default(List<int?>), double? validOnOrdersOver = default(double?), bool? takesPriority = default(bool?), bool? isEnabled = default(bool?), bool? isAutomaticallyApplied = default(bool?), bool? includeDeliveryFee = default(bool?), bool? isValidForDeliveryOrders = default(bool?), bool? isValidForPickupOrders = default(bool?), bool? isValidForOrdersPayedOnline = default(bool?), bool? isValidForOrdersPayedByCash = default(bool?), bool? isValidForFirstOrderOnly = default(bool?), bool? isValidOncePerCustomer = default(bool?), bool? isValidOnlyOnce = default(bool?), bool? isDiscoverable = default(bool?), bool? isPromoted = default(bool?), bool? forceDiscount = default(bool?), DateTime? startDate = default(DateTime?), DateTime? expiryDate = default(DateTime?), List<ChannelRestrictionsEnum> channelRestrictions = default(List<ChannelRestrictionsEnum>), List<ValidityPeriod> validityPeriods = default(List<ValidityPeriod>), VoucherSubTypeEnum? voucherSubType = default(VoucherSubTypeEnum?), int? customerId = default(int?), int? maxRedemptions = default(int?))
         {
             this.VoucherType = voucherType;
-            this.Stores = stores;
-            this.AddItemDetails = addItemDetails;
+            this.Promotion = promotion;
             this.CreditNoteDetails = creditNoteDetails;
             this.LumpDiscountDetails = lumpDiscountDetails;
             this.PercentDiscountDetails = percentDiscountDetails;
             this.Code = code;
             this.Description = description;
+            this.Stores = stores;
             this.ValidOnOrdersOver = validOnOrdersOver;
             this.TakesPriority = takesPriority;
             this.IsEnabled = isEnabled;
@@ -116,24 +236,25 @@ public enum VoucherTypeEnum
             this.IsValidForFirstOrderOnly = isValidForFirstOrderOnly;
             this.IsValidOncePerCustomer = isValidOncePerCustomer;
             this.IsValidOnlyOnce = isValidOnlyOnce;
+            this.IsDiscoverable = isDiscoverable;
+            this.IsPromoted = isPromoted;
+            this.ForceDiscount = forceDiscount;
             this.StartDate = startDate;
             this.ExpiryDate = expiryDate;
+            this.ChannelRestrictions = channelRestrictions;
+            this.ValidityPeriods = validityPeriods;
+            this.VoucherSubType = voucherSubType;
+            this.CustomerId = customerId;
+            this.MaxRedemptions = maxRedemptions;
         }
         
 
         /// <summary>
-        /// Stores that this voucher applies to
-        /// </summary>
-        /// <value>Stores that this voucher applies to</value>
-        [DataMember(Name="Stores", EmitDefaultValue=false)]
-        public List<int?> Stores { get; set; }
-
-        /// <summary>
-        /// Add item details
+        /// Create Promotion details
         /// </summary>
-        /// <value>Add item details</value>
-        [DataMember(Name="AddItemDetails", EmitDefaultValue=false)]
-        public AddItemDetails AddItemDetails { get; set; }
+        /// <value>Create Promotion details</value>
+        [DataMember(Name="Promotion", EmitDefaultValue=false)]
+        public CreatePromotion Promotion { get; set; }
 
         /// <summary>
         /// Credit note details
@@ -170,6 +291,13 @@ public enum VoucherTypeEnum
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
+        /// <summary>
+        /// Stores that this voucher applies to
+        /// </summary>
+        /// <value>Stores that this voucher applies to</value>
+        [DataMember(Name="Stores", EmitDefaultValue=false)]
+        public List<int?> Stores { get; set; }
+
         /// <summary>
         /// Valid on orders on or above
         /// </summary>
@@ -254,6 +382,27 @@ public enum VoucherTypeEnum
         [DataMember(Name="IsValidOnlyOnce", EmitDefaultValue=false)]
         public bool? IsValidOnlyOnce { get; set; }
 
+        /// <summary>
+        /// Enables the voucher to be offered in the Voucher Discoverability feature
+        /// </summary>
+        /// <value>Enables the voucher to be offered in the Voucher Discoverability feature</value>
+        [DataMember(Name="IsDiscoverable", EmitDefaultValue=false)]
+        public bool? IsDiscoverable { get; set; }
+
+        /// <summary>
+        /// Marks the voucher as promoted
+        /// </summary>
+        /// <value>Marks the voucher as promoted</value>
+        [DataMember(Name="IsPromoted", EmitDefaultValue=false)]
+        public bool? IsPromoted { get; set; }
+
+        /// <summary>
+        /// Force the discount to be applied which bypasses some menu restrictions
+        /// </summary>
+        /// <value>Force the discount to be applied which bypasses some menu restrictions</value>
+        [DataMember(Name="ForceDiscount", EmitDefaultValue=false)]
+        public bool? ForceDiscount { get; set; }
+
         /// <summary>
         /// Voucher Starts On (Time in UTC)
         /// </summary>
@@ -268,6 +417,29 @@ public enum VoucherTypeEnum
         [DataMember(Name="ExpiryDate", EmitDefaultValue=false)]
         public DateTime? ExpiryDate { get; set; }
 
+
+        /// <summary>
+        /// Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated.
+        /// </summary>
+        /// <value>Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated.</value>
+        [DataMember(Name="ValidityPeriods", EmitDefaultValue=false)]
+        public List<ValidityPeriod> ValidityPeriods { get; set; }
+
+
+        /// <summary>
+        /// Customer UserID
+        /// </summary>
+        /// <value>Customer UserID</value>
+        [DataMember(Name="CustomerId", EmitDefaultValue=false)]
+        public int? CustomerId { get; set; }
+
+        /// <summary>
+        /// Maximum number of times the voucher can be redeemed (used)
+        /// </summary>
+        /// <value>Maximum number of times the voucher can be redeemed (used)</value>
+        [DataMember(Name="MaxRedemptions", EmitDefaultValue=false)]
+        public int? MaxRedemptions { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -277,13 +449,13 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class CreateVoucher {\n");
             sb.Append("  VoucherType: ").Append(VoucherType).Append("\n");
-            sb.Append("  Stores: ").Append(Stores).Append("\n");
-            sb.Append("  AddItemDetails: ").Append(AddItemDetails).Append("\n");
+            sb.Append("  Promotion: ").Append(Promotion).Append("\n");
             sb.Append("  CreditNoteDetails: ").Append(CreditNoteDetails).Append("\n");
             sb.Append("  LumpDiscountDetails: ").Append(LumpDiscountDetails).Append("\n");
             sb.Append("  PercentDiscountDetails: ").Append(PercentDiscountDetails).Append("\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  Stores: ").Append(Stores).Append("\n");
             sb.Append("  ValidOnOrdersOver: ").Append(ValidOnOrdersOver).Append("\n");
             sb.Append("  TakesPriority: ").Append(TakesPriority).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
@@ -296,8 +468,16 @@ public override string ToString()
             sb.Append("  IsValidForFirstOrderOnly: ").Append(IsValidForFirstOrderOnly).Append("\n");
             sb.Append("  IsValidOncePerCustomer: ").Append(IsValidOncePerCustomer).Append("\n");
             sb.Append("  IsValidOnlyOnce: ").Append(IsValidOnlyOnce).Append("\n");
+            sb.Append("  IsDiscoverable: ").Append(IsDiscoverable).Append("\n");
+            sb.Append("  IsPromoted: ").Append(IsPromoted).Append("\n");
+            sb.Append("  ForceDiscount: ").Append(ForceDiscount).Append("\n");
             sb.Append("  StartDate: ").Append(StartDate).Append("\n");
             sb.Append("  ExpiryDate: ").Append(ExpiryDate).Append("\n");
+            sb.Append("  ChannelRestrictions: ").Append(ChannelRestrictions).Append("\n");
+            sb.Append("  ValidityPeriods: ").Append(ValidityPeriods).Append("\n");
+            sb.Append("  VoucherSubType: ").Append(VoucherSubType).Append("\n");
+            sb.Append("  CustomerId: ").Append(CustomerId).Append("\n");
+            sb.Append("  MaxRedemptions: ").Append(MaxRedemptions).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -338,14 +518,9 @@ public bool Equals(CreateVoucher input)
                     this.VoucherType.Equals(input.VoucherType))
                 ) && 
                 (
-                    this.Stores == input.Stores ||
-                    this.Stores != null &&
-                    this.Stores.SequenceEqual(input.Stores)
-                ) && 
-                (
-                    this.AddItemDetails == input.AddItemDetails ||
-                    (this.AddItemDetails != null &&
-                    this.AddItemDetails.Equals(input.AddItemDetails))
+                    this.Promotion == input.Promotion ||
+                    (this.Promotion != null &&
+                    this.Promotion.Equals(input.Promotion))
                 ) && 
                 (
                     this.CreditNoteDetails == input.CreditNoteDetails ||
@@ -372,6 +547,11 @@ public bool Equals(CreateVoucher input)
                     (this.Description != null &&
                     this.Description.Equals(input.Description))
                 ) && 
+                (
+                    this.Stores == input.Stores ||
+                    this.Stores != null &&
+                    this.Stores.SequenceEqual(input.Stores)
+                ) && 
                 (
                     this.ValidOnOrdersOver == input.ValidOnOrdersOver ||
                     (this.ValidOnOrdersOver != null &&
@@ -432,6 +612,21 @@ public bool Equals(CreateVoucher input)
                     (this.IsValidOnlyOnce != null &&
                     this.IsValidOnlyOnce.Equals(input.IsValidOnlyOnce))
                 ) && 
+                (
+                    this.IsDiscoverable == input.IsDiscoverable ||
+                    (this.IsDiscoverable != null &&
+                    this.IsDiscoverable.Equals(input.IsDiscoverable))
+                ) && 
+                (
+                    this.IsPromoted == input.IsPromoted ||
+                    (this.IsPromoted != null &&
+                    this.IsPromoted.Equals(input.IsPromoted))
+                ) && 
+                (
+                    this.ForceDiscount == input.ForceDiscount ||
+                    (this.ForceDiscount != null &&
+                    this.ForceDiscount.Equals(input.ForceDiscount))
+                ) && 
                 (
                     this.StartDate == input.StartDate ||
                     (this.StartDate != null &&
@@ -441,6 +636,31 @@ public bool Equals(CreateVoucher input)
                     this.ExpiryDate == input.ExpiryDate ||
                     (this.ExpiryDate != null &&
                     this.ExpiryDate.Equals(input.ExpiryDate))
+                ) && 
+                (
+                    this.ChannelRestrictions == input.ChannelRestrictions ||
+                    this.ChannelRestrictions != null &&
+                    this.ChannelRestrictions.SequenceEqual(input.ChannelRestrictions)
+                ) && 
+                (
+                    this.ValidityPeriods == input.ValidityPeriods ||
+                    this.ValidityPeriods != null &&
+                    this.ValidityPeriods.SequenceEqual(input.ValidityPeriods)
+                ) && 
+                (
+                    this.VoucherSubType == input.VoucherSubType ||
+                    (this.VoucherSubType != null &&
+                    this.VoucherSubType.Equals(input.VoucherSubType))
+                ) && 
+                (
+                    this.CustomerId == input.CustomerId ||
+                    (this.CustomerId != null &&
+                    this.CustomerId.Equals(input.CustomerId))
+                ) && 
+                (
+                    this.MaxRedemptions == input.MaxRedemptions ||
+                    (this.MaxRedemptions != null &&
+                    this.MaxRedemptions.Equals(input.MaxRedemptions))
                 );
         }
 
@@ -455,10 +675,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.VoucherType != null)
                     hashCode = hashCode * 59 + this.VoucherType.GetHashCode();
-                if (this.Stores != null)
-                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
-                if (this.AddItemDetails != null)
-                    hashCode = hashCode * 59 + this.AddItemDetails.GetHashCode();
+                if (this.Promotion != null)
+                    hashCode = hashCode * 59 + this.Promotion.GetHashCode();
                 if (this.CreditNoteDetails != null)
                     hashCode = hashCode * 59 + this.CreditNoteDetails.GetHashCode();
                 if (this.LumpDiscountDetails != null)
@@ -469,6 +687,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Code.GetHashCode();
                 if (this.Description != null)
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.Stores != null)
+                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
                 if (this.ValidOnOrdersOver != null)
                     hashCode = hashCode * 59 + this.ValidOnOrdersOver.GetHashCode();
                 if (this.TakesPriority != null)
@@ -493,23 +713,29 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.IsValidOncePerCustomer.GetHashCode();
                 if (this.IsValidOnlyOnce != null)
                     hashCode = hashCode * 59 + this.IsValidOnlyOnce.GetHashCode();
+                if (this.IsDiscoverable != null)
+                    hashCode = hashCode * 59 + this.IsDiscoverable.GetHashCode();
+                if (this.IsPromoted != null)
+                    hashCode = hashCode * 59 + this.IsPromoted.GetHashCode();
+                if (this.ForceDiscount != null)
+                    hashCode = hashCode * 59 + this.ForceDiscount.GetHashCode();
                 if (this.StartDate != null)
                     hashCode = hashCode * 59 + this.StartDate.GetHashCode();
                 if (this.ExpiryDate != null)
                     hashCode = hashCode * 59 + this.ExpiryDate.GetHashCode();
+                if (this.ChannelRestrictions != null)
+                    hashCode = hashCode * 59 + this.ChannelRestrictions.GetHashCode();
+                if (this.ValidityPeriods != null)
+                    hashCode = hashCode * 59 + this.ValidityPeriods.GetHashCode();
+                if (this.VoucherSubType != null)
+                    hashCode = hashCode * 59 + this.VoucherSubType.GetHashCode();
+                if (this.CustomerId != null)
+                    hashCode = hashCode * 59 + this.CustomerId.GetHashCode();
+                if (this.MaxRedemptions != null)
+                    hashCode = hashCode * 59 + this.MaxRedemptions.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreatedMenuSectionItems.cs b/src/Flipdish/Model/CreatedMenuSectionItems.cs
index 830515bb..2f9d204b 100644
--- a/src/Flipdish/Model/CreatedMenuSectionItems.cs
+++ b/src/Flipdish/Model/CreatedMenuSectionItems.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Response for the creation of multiple Menu Section Items
     /// </summary>
     [DataContract]
-    public partial class CreatedMenuSectionItems :  IEquatable<CreatedMenuSectionItems>, IValidatableObject
+    public partial class CreatedMenuSectionItems :  IEquatable<CreatedMenuSectionItems>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreatedMenuSectionItems" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CreditNoteDetails.cs b/src/Flipdish/Model/CreditNoteDetails.cs
index d6acc1ee..51009096 100644
--- a/src/Flipdish/Model/CreditNoteDetails.cs
+++ b/src/Flipdish/Model/CreditNoteDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Credit note details
     /// </summary>
     [DataContract]
-    public partial class CreditNoteDetails :  IEquatable<CreditNoteDetails>, IValidatableObject
+    public partial class CreditNoteDetails :  IEquatable<CreditNoteDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CreditNoteDetails" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CrossSellMenuItems.cs b/src/Flipdish/Model/CrossSellMenuItems.cs
new file mode 100644
index 00000000..ea6b3091
--- /dev/null
+++ b/src/Flipdish/Model/CrossSellMenuItems.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Menu Items for Cross-Sell
+    /// </summary>
+    [DataContract]
+    public partial class CrossSellMenuItems :  IEquatable<CrossSellMenuItems>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CrossSellMenuItems" /> class.
+        /// </summary>
+        /// <param name="menuItemIds">Menu Item Id&#39;s.</param>
+        public CrossSellMenuItems(List<int?> menuItemIds = default(List<int?>))
+        {
+            this.MenuItemIds = menuItemIds;
+        }
+        
+        /// <summary>
+        /// Menu Item Id&#39;s
+        /// </summary>
+        /// <value>Menu Item Id&#39;s</value>
+        [DataMember(Name="MenuItemIds", EmitDefaultValue=false)]
+        public List<int?> MenuItemIds { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CrossSellMenuItems {\n");
+            sb.Append("  MenuItemIds: ").Append(MenuItemIds).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CrossSellMenuItems);
+        }
+
+        /// <summary>
+        /// Returns true if CrossSellMenuItems instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CrossSellMenuItems to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CrossSellMenuItems input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.MenuItemIds == input.MenuItemIds ||
+                    this.MenuItemIds != null &&
+                    this.MenuItemIds.SequenceEqual(input.MenuItemIds)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.MenuItemIds != null)
+                    hashCode = hashCode * 59 + this.MenuItemIds.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CspReport.cs b/src/Flipdish/Model/CspReport.cs
index 5acd8867..a7af04b7 100644
--- a/src/Flipdish/Model/CspReport.cs
+++ b/src/Flipdish/Model/CspReport.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CspReport
     /// </summary>
     [DataContract]
-    public partial class CspReport :  IEquatable<CspReport>, IValidatableObject
+    public partial class CspReport :  IEquatable<CspReport>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CspReport" /> class.
@@ -205,16 +203,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CspReportRequest.cs b/src/Flipdish/Model/CspReportRequest.cs
index 4a8e0790..fe68f6ea 100644
--- a/src/Flipdish/Model/CspReportRequest.cs
+++ b/src/Flipdish/Model/CspReportRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CspReportRequest
     /// </summary>
     [DataContract]
-    public partial class CspReportRequest :  IEquatable<CspReportRequest>, IValidatableObject
+    public partial class CspReportRequest :  IEquatable<CspReportRequest>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CspReportRequest" /> class.
@@ -109,16 +107,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CurrencyData.cs b/src/Flipdish/Model/CurrencyData.cs
index 619222f5..2e96f2b2 100644
--- a/src/Flipdish/Model/CurrencyData.cs
+++ b/src/Flipdish/Model/CurrencyData.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// A single currency data piece, with no date
     /// </summary>
     [DataContract]
-    public partial class CurrencyData :  IEquatable<CurrencyData>, IValidatableObject
+    public partial class CurrencyData :  IEquatable<CurrencyData>
     {
         /// <summary>
         /// Currency
@@ -814,16 +812,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Customer.cs b/src/Flipdish/Model/Customer.cs
index 0ff08b41..9cb6241e 100644
--- a/src/Flipdish/Model/Customer.cs
+++ b/src/Flipdish/Model/Customer.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,20 +26,24 @@ namespace Flipdish.Model
     /// Defines a customer
     /// </summary>
     [DataContract]
-    public partial class Customer :  IEquatable<Customer>, IValidatableObject
+    public partial class Customer :  IEquatable<Customer>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Customer" /> class.
         /// </summary>
         /// <param name="customerId">Id of the customer.</param>
+        /// <param name="name">Customer name.</param>
         /// <param name="registrationDate">Customer registration date.</param>
+        /// <param name="phoneNumber">Phone Number in international format.</param>
         /// <param name="cashOrdersEnabled">Customer can place cash orders.</param>
         /// <param name="cardOrdersEnabled">Customer can place card orders.</param>
         /// <param name="marketingEnabled">Customer can receive marketing.</param>
-        public Customer(int? customerId = default(int?), DateTime? registrationDate = default(DateTime?), bool? cashOrdersEnabled = default(bool?), bool? cardOrdersEnabled = default(bool?), bool? marketingEnabled = default(bool?))
+        public Customer(int? customerId = default(int?), string name = default(string), DateTime? registrationDate = default(DateTime?), string phoneNumber = default(string), bool? cashOrdersEnabled = default(bool?), bool? cardOrdersEnabled = default(bool?), bool? marketingEnabled = default(bool?))
         {
             this.CustomerId = customerId;
+            this.Name = name;
             this.RegistrationDate = registrationDate;
+            this.PhoneNumber = phoneNumber;
             this.CashOrdersEnabled = cashOrdersEnabled;
             this.CardOrdersEnabled = cardOrdersEnabled;
             this.MarketingEnabled = marketingEnabled;
@@ -54,6 +56,13 @@ public partial class Customer :  IEquatable<Customer>, IValidatableObject
         [DataMember(Name="CustomerId", EmitDefaultValue=false)]
         public int? CustomerId { get; set; }
 
+        /// <summary>
+        /// Customer name
+        /// </summary>
+        /// <value>Customer name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
         /// <summary>
         /// Customer registration date
         /// </summary>
@@ -61,6 +70,13 @@ public partial class Customer :  IEquatable<Customer>, IValidatableObject
         [DataMember(Name="RegistrationDate", EmitDefaultValue=false)]
         public DateTime? RegistrationDate { get; set; }
 
+        /// <summary>
+        /// Phone Number in international format
+        /// </summary>
+        /// <value>Phone Number in international format</value>
+        [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
+        public string PhoneNumber { get; set; }
+
         /// <summary>
         /// Customer can place cash orders
         /// </summary>
@@ -91,7 +107,9 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class Customer {\n");
             sb.Append("  CustomerId: ").Append(CustomerId).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  RegistrationDate: ").Append(RegistrationDate).Append("\n");
+            sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
             sb.Append("  CashOrdersEnabled: ").Append(CashOrdersEnabled).Append("\n");
             sb.Append("  CardOrdersEnabled: ").Append(CardOrdersEnabled).Append("\n");
             sb.Append("  MarketingEnabled: ").Append(MarketingEnabled).Append("\n");
@@ -134,11 +152,21 @@ public bool Equals(Customer input)
                     (this.CustomerId != null &&
                     this.CustomerId.Equals(input.CustomerId))
                 ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
                 (
                     this.RegistrationDate == input.RegistrationDate ||
                     (this.RegistrationDate != null &&
                     this.RegistrationDate.Equals(input.RegistrationDate))
                 ) && 
+                (
+                    this.PhoneNumber == input.PhoneNumber ||
+                    (this.PhoneNumber != null &&
+                    this.PhoneNumber.Equals(input.PhoneNumber))
+                ) && 
                 (
                     this.CashOrdersEnabled == input.CashOrdersEnabled ||
                     (this.CashOrdersEnabled != null &&
@@ -167,8 +195,12 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.CustomerId != null)
                     hashCode = hashCode * 59 + this.CustomerId.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.RegistrationDate != null)
                     hashCode = hashCode * 59 + this.RegistrationDate.GetHashCode();
+                if (this.PhoneNumber != null)
+                    hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
                 if (this.CashOrdersEnabled != null)
                     hashCode = hashCode * 59 + this.CashOrdersEnabled.GetHashCode();
                 if (this.CardOrdersEnabled != null)
@@ -178,16 +210,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CustomerConsentUpdatedEvent.cs b/src/Flipdish/Model/CustomerConsentUpdatedEvent.cs
index 4d43ec46..50397b74 100644
--- a/src/Flipdish/Model/CustomerConsentUpdatedEvent.cs
+++ b/src/Flipdish/Model/CustomerConsentUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,13 @@ namespace Flipdish.Model
     /// Customer consent updated
     /// </summary>
     [DataContract]
-    public partial class CustomerConsentUpdatedEvent :  IEquatable<CustomerConsentUpdatedEvent>, IValidatableObject
+    public partial class CustomerConsentUpdatedEvent :  IEquatable<CustomerConsentUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomerConsentUpdatedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="enabled">Enabled.</param>
         /// <param name="description">Description.</param>
         /// <param name="user">Customer User info.</param>
@@ -42,9 +41,12 @@ public partial class CustomerConsentUpdatedEvent :  IEquatable<CustomerConsentUp
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CustomerConsentUpdatedEvent(string eventName = default(string), bool? enabled = default(bool?), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CustomerConsentUpdatedEvent(string eventName = default(string), string orgId = default(string), bool? enabled = default(bool?), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.Enabled = enabled;
             this.Description = description;
             this.User = user;
@@ -53,6 +55,8 @@ public partial class CustomerConsentUpdatedEvent :  IEquatable<CustomerConsentUp
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -62,6 +66,13 @@ public partial class CustomerConsentUpdatedEvent :  IEquatable<CustomerConsentUp
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Enabled
         /// </summary>
@@ -118,6 +129,20 @@ public partial class CustomerConsentUpdatedEvent :  IEquatable<CustomerConsentUp
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -127,6 +152,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class CustomerConsentUpdatedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  Enabled: ").Append(Enabled).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
@@ -135,6 +161,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,6 +202,11 @@ public bool Equals(CustomerConsentUpdatedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.Enabled == input.Enabled ||
                     (this.Enabled != null &&
@@ -213,6 +246,16 @@ public bool Equals(CustomerConsentUpdatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -227,6 +270,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.Enabled != null)
                     hashCode = hashCode * 59 + this.Enabled.GetHashCode();
                 if (this.Description != null)
@@ -243,19 +288,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CustomerCreateModel.cs b/src/Flipdish/Model/CustomerCreateModel.cs
new file mode 100644
index 00000000..e655b4df
--- /dev/null
+++ b/src/Flipdish/Model/CustomerCreateModel.cs
@@ -0,0 +1,238 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Defines a customer create model
+    /// </summary>
+    [DataContract]
+    public partial class CustomerCreateModel :  IEquatable<CustomerCreateModel>
+    {
+        /// <summary>
+        /// Customer AppType
+        /// </summary>
+        /// <value>Customer AppType</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum AppTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Unknown for value: Unknown
+            /// </summary>
+            [EnumMember(Value = "Unknown")]
+            Unknown = 1,
+            
+            /// <summary>
+            /// Enum Ios for value: Ios
+            /// </summary>
+            [EnumMember(Value = "Ios")]
+            Ios = 2,
+            
+            /// <summary>
+            /// Enum Android for value: Android
+            /// </summary>
+            [EnumMember(Value = "Android")]
+            Android = 3,
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 4,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 5,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 6,
+            
+            /// <summary>
+            /// Enum TelephoneCall for value: TelephoneCall
+            /// </summary>
+            [EnumMember(Value = "TelephoneCall")]
+            TelephoneCall = 7,
+            
+            /// <summary>
+            /// Enum Sms for value: Sms
+            /// </summary>
+            [EnumMember(Value = "Sms")]
+            Sms = 8,
+            
+            /// <summary>
+            /// Enum PwaAndroid for value: PwaAndroid
+            /// </summary>
+            [EnumMember(Value = "PwaAndroid")]
+            PwaAndroid = 9,
+            
+            /// <summary>
+            /// Enum PwaIos for value: PwaIos
+            /// </summary>
+            [EnumMember(Value = "PwaIos")]
+            PwaIos = 10,
+            
+            /// <summary>
+            /// Enum Google for value: Google
+            /// </summary>
+            [EnumMember(Value = "Google")]
+            Google = 11
+        }
+
+        /// <summary>
+        /// Customer AppType
+        /// </summary>
+        /// <value>Customer AppType</value>
+        [DataMember(Name="AppType", EmitDefaultValue=false)]
+        public AppTypeEnum? AppType { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomerCreateModel" /> class.
+        /// </summary>
+        /// <param name="phoneNumber">Customer Phone Number.</param>
+        /// <param name="appType">Customer AppType.</param>
+        /// <param name="name">Customer Name.</param>
+        /// <param name="marketingEnabled">marketingEnabled.</param>
+        public CustomerCreateModel(string phoneNumber = default(string), AppTypeEnum? appType = default(AppTypeEnum?), string name = default(string), bool? marketingEnabled = default(bool?))
+        {
+            this.PhoneNumber = phoneNumber;
+            this.AppType = appType;
+            this.Name = name;
+            this.MarketingEnabled = marketingEnabled;
+        }
+        
+        /// <summary>
+        /// Customer Phone Number
+        /// </summary>
+        /// <value>Customer Phone Number</value>
+        [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
+        public string PhoneNumber { get; set; }
+
+
+        /// <summary>
+        /// Customer Name
+        /// </summary>
+        /// <value>Customer Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MarketingEnabled
+        /// </summary>
+        [DataMember(Name="MarketingEnabled", EmitDefaultValue=false)]
+        public bool? MarketingEnabled { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CustomerCreateModel {\n");
+            sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
+            sb.Append("  AppType: ").Append(AppType).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  MarketingEnabled: ").Append(MarketingEnabled).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CustomerCreateModel);
+        }
+
+        /// <summary>
+        /// Returns true if CustomerCreateModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CustomerCreateModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CustomerCreateModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PhoneNumber == input.PhoneNumber ||
+                    (this.PhoneNumber != null &&
+                    this.PhoneNumber.Equals(input.PhoneNumber))
+                ) && 
+                (
+                    this.AppType == input.AppType ||
+                    (this.AppType != null &&
+                    this.AppType.Equals(input.AppType))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.MarketingEnabled == input.MarketingEnabled ||
+                    (this.MarketingEnabled != null &&
+                    this.MarketingEnabled.Equals(input.MarketingEnabled))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PhoneNumber != null)
+                    hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
+                if (this.AppType != null)
+                    hashCode = hashCode * 59 + this.AppType.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.MarketingEnabled != null)
+                    hashCode = hashCode * 59 + this.MarketingEnabled.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CustomerCreatedEvent.cs b/src/Flipdish/Model/CustomerCreatedEvent.cs
index 5dc34607..b7c3b622 100644
--- a/src/Flipdish/Model/CustomerCreatedEvent.cs
+++ b/src/Flipdish/Model/CustomerCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,13 @@ namespace Flipdish.Model
     /// Customer created event
     /// </summary>
     [DataContract]
-    public partial class CustomerCreatedEvent :  IEquatable<CustomerCreatedEvent>, IValidatableObject
+    public partial class CustomerCreatedEvent :  IEquatable<CustomerCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomerCreatedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="user">Customer User info.</param>
         /// <param name="description">Description.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
@@ -41,9 +40,12 @@ public partial class CustomerCreatedEvent :  IEquatable<CustomerCreatedEvent>, I
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CustomerCreatedEvent(string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CustomerCreatedEvent(string eventName = default(string), string orgId = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.User = user;
             this.Description = description;
             this.FlipdishEventId = flipdishEventId;
@@ -51,6 +53,8 @@ public partial class CustomerCreatedEvent :  IEquatable<CustomerCreatedEvent>, I
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -60,6 +64,13 @@ public partial class CustomerCreatedEvent :  IEquatable<CustomerCreatedEvent>, I
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Customer User info
         /// </summary>
@@ -109,6 +120,20 @@ public partial class CustomerCreatedEvent :  IEquatable<CustomerCreatedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -118,6 +143,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class CustomerCreatedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
@@ -125,6 +151,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -164,6 +192,11 @@ public bool Equals(CustomerCreatedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.User == input.User ||
                     (this.User != null &&
@@ -198,6 +231,16 @@ public bool Equals(CustomerCreatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -212,6 +255,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.User != null)
                     hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.Description != null)
@@ -226,19 +271,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CustomerDeliveryTrackingOrder.cs b/src/Flipdish/Model/CustomerDeliveryTrackingOrder.cs
index ebd921f7..40fccf5a 100644
--- a/src/Flipdish/Model/CustomerDeliveryTrackingOrder.cs
+++ b/src/Flipdish/Model/CustomerDeliveryTrackingOrder.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Defines the order data required for customer driver tracking
     /// </summary>
     [DataContract]
-    public partial class CustomerDeliveryTrackingOrder :  IEquatable<CustomerDeliveryTrackingOrder>, IValidatableObject
+    public partial class CustomerDeliveryTrackingOrder :  IEquatable<CustomerDeliveryTrackingOrder>
     {
         /// <summary>
         /// Currency
@@ -1102,16 +1100,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CustomerDeliveryTrackingOrderLine.cs b/src/Flipdish/Model/CustomerDeliveryTrackingOrderLine.cs
index 57244c6e..c439beda 100644
--- a/src/Flipdish/Model/CustomerDeliveryTrackingOrderLine.cs
+++ b/src/Flipdish/Model/CustomerDeliveryTrackingOrderLine.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Defines an order line for driver tracking
     /// </summary>
     [DataContract]
-    public partial class CustomerDeliveryTrackingOrderLine :  IEquatable<CustomerDeliveryTrackingOrderLine>, IValidatableObject
+    public partial class CustomerDeliveryTrackingOrderLine :  IEquatable<CustomerDeliveryTrackingOrderLine>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomerDeliveryTrackingOrderLine" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CustomerMessages.cs b/src/Flipdish/Model/CustomerMessages.cs
new file mode 100644
index 00000000..6f31c9bd
--- /dev/null
+++ b/src/Flipdish/Model/CustomerMessages.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Delivery and pickup menu messages for a customer
+    /// </summary>
+    [DataContract]
+    public partial class CustomerMessages :  IEquatable<CustomerMessages>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CustomerMessages" /> class.
+        /// </summary>
+        /// <param name="deliveryMenuMessage">Delivery menu message.</param>
+        /// <param name="pickupMenuMessage">Pickup menu message.</param>
+        public CustomerMessages(string deliveryMenuMessage = default(string), string pickupMenuMessage = default(string))
+        {
+            this.DeliveryMenuMessage = deliveryMenuMessage;
+            this.PickupMenuMessage = pickupMenuMessage;
+        }
+        
+        /// <summary>
+        /// Delivery menu message
+        /// </summary>
+        /// <value>Delivery menu message</value>
+        [DataMember(Name="DeliveryMenuMessage", EmitDefaultValue=false)]
+        public string DeliveryMenuMessage { get; set; }
+
+        /// <summary>
+        /// Pickup menu message
+        /// </summary>
+        /// <value>Pickup menu message</value>
+        [DataMember(Name="PickupMenuMessage", EmitDefaultValue=false)]
+        public string PickupMenuMessage { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CustomerMessages {\n");
+            sb.Append("  DeliveryMenuMessage: ").Append(DeliveryMenuMessage).Append("\n");
+            sb.Append("  PickupMenuMessage: ").Append(PickupMenuMessage).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CustomerMessages);
+        }
+
+        /// <summary>
+        /// Returns true if CustomerMessages instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CustomerMessages to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CustomerMessages input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeliveryMenuMessage == input.DeliveryMenuMessage ||
+                    (this.DeliveryMenuMessage != null &&
+                    this.DeliveryMenuMessage.Equals(input.DeliveryMenuMessage))
+                ) && 
+                (
+                    this.PickupMenuMessage == input.PickupMenuMessage ||
+                    (this.PickupMenuMessage != null &&
+                    this.PickupMenuMessage.Equals(input.PickupMenuMessage))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeliveryMenuMessage != null)
+                    hashCode = hashCode * 59 + this.DeliveryMenuMessage.GetHashCode();
+                if (this.PickupMenuMessage != null)
+                    hashCode = hashCode * 59 + this.PickupMenuMessage.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/CustomerSummary.cs b/src/Flipdish/Model/CustomerSummary.cs
index ac1d917c..485c8dba 100644
--- a/src/Flipdish/Model/CustomerSummary.cs
+++ b/src/Flipdish/Model/CustomerSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Customer summary
     /// </summary>
     [DataContract]
-    public partial class CustomerSummary :  IEquatable<CustomerSummary>, IValidatableObject
+    public partial class CustomerSummary :  IEquatable<CustomerSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomerSummary" /> class.
@@ -38,13 +36,15 @@ public partial class CustomerSummary :  IEquatable<CustomerSummary>, IValidatabl
         /// <param name="emailAddress">Customer email address.</param>
         /// <param name="phoneNumberLocalFormat">Customer local phone number.</param>
         /// <param name="phoneNumber">Customer phone number.</param>
-        public CustomerSummary(int? id = default(int?), string name = default(string), string emailAddress = default(string), string phoneNumberLocalFormat = default(string), string phoneNumber = default(string))
+        /// <param name="languagePreference">Preferred language of the consumer.</param>
+        public CustomerSummary(int? id = default(int?), string name = default(string), string emailAddress = default(string), string phoneNumberLocalFormat = default(string), string phoneNumber = default(string), string languagePreference = default(string))
         {
             this.Id = id;
             this.Name = name;
             this.EmailAddress = emailAddress;
             this.PhoneNumberLocalFormat = phoneNumberLocalFormat;
             this.PhoneNumber = phoneNumber;
+            this.LanguagePreference = languagePreference;
         }
         
         /// <summary>
@@ -82,6 +82,13 @@ public partial class CustomerSummary :  IEquatable<CustomerSummary>, IValidatabl
         [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
         public string PhoneNumber { get; set; }
 
+        /// <summary>
+        /// Preferred language of the consumer
+        /// </summary>
+        /// <value>Preferred language of the consumer</value>
+        [DataMember(Name="LanguagePreference", EmitDefaultValue=false)]
+        public string LanguagePreference { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -95,6 +102,7 @@ public override string ToString()
             sb.Append("  EmailAddress: ").Append(EmailAddress).Append("\n");
             sb.Append("  PhoneNumberLocalFormat: ").Append(PhoneNumberLocalFormat).Append("\n");
             sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
+            sb.Append("  LanguagePreference: ").Append(LanguagePreference).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -153,6 +161,11 @@ public bool Equals(CustomerSummary input)
                     this.PhoneNumber == input.PhoneNumber ||
                     (this.PhoneNumber != null &&
                     this.PhoneNumber.Equals(input.PhoneNumber))
+                ) && 
+                (
+                    this.LanguagePreference == input.LanguagePreference ||
+                    (this.LanguagePreference != null &&
+                    this.LanguagePreference.Equals(input.LanguagePreference))
                 );
         }
 
@@ -175,19 +188,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.PhoneNumberLocalFormat.GetHashCode();
                 if (this.PhoneNumber != null)
                     hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
+                if (this.LanguagePreference != null)
+                    hashCode = hashCode * 59 + this.LanguagePreference.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CustomerUpdateModel.cs b/src/Flipdish/Model/CustomerUpdateModel.cs
index 9cc89e18..c56ce657 100644
--- a/src/Flipdish/Model/CustomerUpdateModel.cs
+++ b/src/Flipdish/Model/CustomerUpdateModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Defines a customer update model
     /// </summary>
     [DataContract]
-    public partial class CustomerUpdateModel :  IEquatable<CustomerUpdateModel>, IValidatableObject
+    public partial class CustomerUpdateModel :  IEquatable<CustomerUpdateModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomerUpdateModel" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/CustomerUpdatedEvent.cs b/src/Flipdish/Model/CustomerUpdatedEvent.cs
index 4d77f8f9..7b7a5954 100644
--- a/src/Flipdish/Model/CustomerUpdatedEvent.cs
+++ b/src/Flipdish/Model/CustomerUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Customer updated event
     /// </summary>
     [DataContract]
-    public partial class CustomerUpdatedEvent :  IEquatable<CustomerUpdatedEvent>, IValidatableObject
+    public partial class CustomerUpdatedEvent :  IEquatable<CustomerUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomerUpdatedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class CustomerUpdatedEvent :  IEquatable<CustomerUpdatedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public CustomerUpdatedEvent(string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public CustomerUpdatedEvent(string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.User = user;
@@ -50,7 +51,10 @@ public partial class CustomerUpdatedEvent :  IEquatable<CustomerUpdatedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class CustomerUpdatedEvent :  IEquatable<CustomerUpdatedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class CustomerUpdatedEvent :  IEquatable<CustomerUpdatedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(CustomerUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Customers.cs b/src/Flipdish/Model/Customers.cs
new file mode 100644
index 00000000..c4fdd96e
--- /dev/null
+++ b/src/Flipdish/Model/Customers.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Defines a list of customers
+    /// </summary>
+    [DataContract]
+    public partial class Customers :  IEquatable<Customers>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Customers" /> class.
+        /// </summary>
+        /// <param name="items">List of customers.</param>
+        public Customers(List<Customer> items = default(List<Customer>))
+        {
+            this.Items = items;
+        }
+        
+        /// <summary>
+        /// List of customers
+        /// </summary>
+        /// <value>List of customers</value>
+        [DataMember(Name="Items", EmitDefaultValue=false)]
+        public List<Customer> Items { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Customers {\n");
+            sb.Append("  Items: ").Append(Items).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Customers);
+        }
+
+        /// <summary>
+        /// Returns true if Customers instances are equal
+        /// </summary>
+        /// <param name="input">Instance of Customers to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Customers input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Items == input.Items ||
+                    this.Items != null &&
+                    this.Items.SequenceEqual(input.Items)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Items != null)
+                    hashCode = hashCode * 59 + this.Items.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/DashboardEmbed.cs b/src/Flipdish/Model/DashboardEmbed.cs
index 12c4424a..ab990f48 100644
--- a/src/Flipdish/Model/DashboardEmbed.cs
+++ b/src/Flipdish/Model/DashboardEmbed.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// SSO Embed URL Information
     /// </summary>
     [DataContract]
-    public partial class DashboardEmbed :  IEquatable<DashboardEmbed>, IValidatableObject
+    public partial class DashboardEmbed :  IEquatable<DashboardEmbed>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardEmbed" /> class.
@@ -110,28 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // EmbedUrl (string) maxLength
-            if(this.EmbedUrl != null && this.EmbedUrl.Length > 2048)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EmbedUrl, length must be less than 2048.", new [] { "EmbedUrl" });
-            }
-
-            // EmbedUrl (string) minLength
-            if(this.EmbedUrl != null && this.EmbedUrl.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EmbedUrl, length must be greater than 0.", new [] { "EmbedUrl" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DeliveryLocation.cs b/src/Flipdish/Model/DeliveryLocation.cs
index cb4e7f54..cf7fe369 100644
--- a/src/Flipdish/Model/DeliveryLocation.cs
+++ b/src/Flipdish/Model/DeliveryLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Delivery location
     /// </summary>
     [DataContract]
-    public partial class DeliveryLocation :  IEquatable<DeliveryLocation>, IValidatableObject
+    public partial class DeliveryLocation :  IEquatable<DeliveryLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DeliveryLocation" /> class.
@@ -212,16 +210,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DeliveryZone.cs b/src/Flipdish/Model/DeliveryZone.cs
index 4b37c848..96b05f93 100644
--- a/src/Flipdish/Model/DeliveryZone.cs
+++ b/src/Flipdish/Model/DeliveryZone.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,19 +26,21 @@ namespace Flipdish.Model
     /// Delivery Zone
     /// </summary>
     [DataContract]
-    public partial class DeliveryZone :  IEquatable<DeliveryZone>, IValidatableObject
+    public partial class DeliveryZone :  IEquatable<DeliveryZone>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DeliveryZone" /> class.
         /// </summary>
         /// <param name="id">Delivery Fee Area Id.</param>
+        /// <param name="feeChargedToStore">Delivery Fee charged to store.</param>
         /// <param name="deliveryFee">Delivery fee (will not be set below 0).</param>
         /// <param name="minimumDeliveryOrderAmount">Minimum delivery order amount (will not be set below 0).</param>
         /// <param name="wellKnownText">Spatial data in Well Known Text format  We also support CIRCLE((0 0, 200)) - (centerLong centerLat, radius in m).</param>
         /// <param name="isEnabled">Is delivery zone enabled.</param>
-        public DeliveryZone(int? id = default(int?), double? deliveryFee = default(double?), double? minimumDeliveryOrderAmount = default(double?), string wellKnownText = default(string), bool? isEnabled = default(bool?))
+        public DeliveryZone(int? id = default(int?), double? feeChargedToStore = default(double?), double? deliveryFee = default(double?), double? minimumDeliveryOrderAmount = default(double?), string wellKnownText = default(string), bool? isEnabled = default(bool?))
         {
             this.Id = id;
+            this.FeeChargedToStore = feeChargedToStore;
             this.DeliveryFee = deliveryFee;
             this.MinimumDeliveryOrderAmount = minimumDeliveryOrderAmount;
             this.WellKnownText = wellKnownText;
@@ -54,6 +54,13 @@ public partial class DeliveryZone :  IEquatable<DeliveryZone>, IValidatableObjec
         [DataMember(Name="Id", EmitDefaultValue=false)]
         public int? Id { get; set; }
 
+        /// <summary>
+        /// Delivery Fee charged to store
+        /// </summary>
+        /// <value>Delivery Fee charged to store</value>
+        [DataMember(Name="FeeChargedToStore", EmitDefaultValue=false)]
+        public double? FeeChargedToStore { get; set; }
+
         /// <summary>
         /// Delivery fee (will not be set below 0)
         /// </summary>
@@ -91,6 +98,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class DeliveryZone {\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  FeeChargedToStore: ").Append(FeeChargedToStore).Append("\n");
             sb.Append("  DeliveryFee: ").Append(DeliveryFee).Append("\n");
             sb.Append("  MinimumDeliveryOrderAmount: ").Append(MinimumDeliveryOrderAmount).Append("\n");
             sb.Append("  WellKnownText: ").Append(WellKnownText).Append("\n");
@@ -134,6 +142,11 @@ public bool Equals(DeliveryZone input)
                     (this.Id != null &&
                     this.Id.Equals(input.Id))
                 ) && 
+                (
+                    this.FeeChargedToStore == input.FeeChargedToStore ||
+                    (this.FeeChargedToStore != null &&
+                    this.FeeChargedToStore.Equals(input.FeeChargedToStore))
+                ) && 
                 (
                     this.DeliveryFee == input.DeliveryFee ||
                     (this.DeliveryFee != null &&
@@ -167,6 +180,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.Id != null)
                     hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.FeeChargedToStore != null)
+                    hashCode = hashCode * 59 + this.FeeChargedToStore.GetHashCode();
                 if (this.DeliveryFee != null)
                     hashCode = hashCode * 59 + this.DeliveryFee.GetHashCode();
                 if (this.MinimumDeliveryOrderAmount != null)
@@ -178,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DeliveryZoneBase.cs b/src/Flipdish/Model/DeliveryZoneBase.cs
index af5d8c1c..5286e87d 100644
--- a/src/Flipdish/Model/DeliveryZoneBase.cs
+++ b/src/Flipdish/Model/DeliveryZoneBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Delivery Zone Base
     /// </summary>
     [DataContract]
-    public partial class DeliveryZoneBase :  IEquatable<DeliveryZoneBase>, IValidatableObject
+    public partial class DeliveryZoneBase :  IEquatable<DeliveryZoneBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DeliveryZoneBase" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DeliveryZoneCreatedEvent.cs b/src/Flipdish/Model/DeliveryZoneCreatedEvent.cs
index d7fcf125..611ad41e 100644
--- a/src/Flipdish/Model/DeliveryZoneCreatedEvent.cs
+++ b/src/Flipdish/Model/DeliveryZoneCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Delivery Zone Created Event
     /// </summary>
     [DataContract]
-    public partial class DeliveryZoneCreatedEvent :  IEquatable<DeliveryZoneCreatedEvent>, IValidatableObject
+    public partial class DeliveryZoneCreatedEvent :  IEquatable<DeliveryZoneCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DeliveryZoneCreatedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class DeliveryZoneCreatedEvent :  IEquatable<DeliveryZoneCreatedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public DeliveryZoneCreatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), DeliveryZone deliveryZone = default(DeliveryZone), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public DeliveryZoneCreatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), DeliveryZone deliveryZone = default(DeliveryZone), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -56,7 +57,10 @@ public partial class DeliveryZoneCreatedEvent :  IEquatable<DeliveryZoneCreatedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class DeliveryZoneCreatedEvent :  IEquatable<DeliveryZoneCreatedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class DeliveryZoneCreatedEvent :  IEquatable<DeliveryZoneCreatedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(DeliveryZoneCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DeliveryZoneDeletedEvent.cs b/src/Flipdish/Model/DeliveryZoneDeletedEvent.cs
index 7a8b8d01..17dfa87d 100644
--- a/src/Flipdish/Model/DeliveryZoneDeletedEvent.cs
+++ b/src/Flipdish/Model/DeliveryZoneDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Delivery Zone Deleted Event
     /// </summary>
     [DataContract]
-    public partial class DeliveryZoneDeletedEvent :  IEquatable<DeliveryZoneDeletedEvent>, IValidatableObject
+    public partial class DeliveryZoneDeletedEvent :  IEquatable<DeliveryZoneDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DeliveryZoneDeletedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class DeliveryZoneDeletedEvent :  IEquatable<DeliveryZoneDeletedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public DeliveryZoneDeletedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), DeliveryZone deliveryZone = default(DeliveryZone), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public DeliveryZoneDeletedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), DeliveryZone deliveryZone = default(DeliveryZone), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -56,7 +57,10 @@ public partial class DeliveryZoneDeletedEvent :  IEquatable<DeliveryZoneDeletedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class DeliveryZoneDeletedEvent :  IEquatable<DeliveryZoneDeletedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class DeliveryZoneDeletedEvent :  IEquatable<DeliveryZoneDeletedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(DeliveryZoneDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DeliveryZoneUpdatedEvent.cs b/src/Flipdish/Model/DeliveryZoneUpdatedEvent.cs
index 41af2e38..3949f87f 100644
--- a/src/Flipdish/Model/DeliveryZoneUpdatedEvent.cs
+++ b/src/Flipdish/Model/DeliveryZoneUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Delivery Zone Updated Event
     /// </summary>
     [DataContract]
-    public partial class DeliveryZoneUpdatedEvent :  IEquatable<DeliveryZoneUpdatedEvent>, IValidatableObject
+    public partial class DeliveryZoneUpdatedEvent :  IEquatable<DeliveryZoneUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DeliveryZoneUpdatedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class DeliveryZoneUpdatedEvent :  IEquatable<DeliveryZoneUpdatedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public DeliveryZoneUpdatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), DeliveryZone deliveryZone = default(DeliveryZone), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public DeliveryZoneUpdatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), DeliveryZone deliveryZone = default(DeliveryZone), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -56,7 +57,10 @@ public partial class DeliveryZoneUpdatedEvent :  IEquatable<DeliveryZoneUpdatedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class DeliveryZoneUpdatedEvent :  IEquatable<DeliveryZoneUpdatedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class DeliveryZoneUpdatedEvent :  IEquatable<DeliveryZoneUpdatedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(DeliveryZoneUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DepositReturnFeesSummary.cs b/src/Flipdish/Model/DepositReturnFeesSummary.cs
new file mode 100644
index 00000000..5e735939
--- /dev/null
+++ b/src/Flipdish/Model/DepositReturnFeesSummary.cs
@@ -0,0 +1,144 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// DepositReturnFeesSummary
+    /// </summary>
+    [DataContract]
+    public partial class DepositReturnFeesSummary :  IEquatable<DepositReturnFeesSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DepositReturnFeesSummary" /> class.
+        /// </summary>
+        /// <param name="count">count.</param>
+        /// <param name="fee">fee.</param>
+        /// <param name="total">total.</param>
+        public DepositReturnFeesSummary(int? count = default(int?), double? fee = default(double?), double? total = default(double?))
+        {
+            this.Count = count;
+            this.Fee = fee;
+            this.Total = total;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Count
+        /// </summary>
+        [DataMember(Name="Count", EmitDefaultValue=false)]
+        public int? Count { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Fee
+        /// </summary>
+        [DataMember(Name="Fee", EmitDefaultValue=false)]
+        public double? Fee { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Total
+        /// </summary>
+        [DataMember(Name="Total", EmitDefaultValue=false)]
+        public double? Total { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class DepositReturnFeesSummary {\n");
+            sb.Append("  Count: ").Append(Count).Append("\n");
+            sb.Append("  Fee: ").Append(Fee).Append("\n");
+            sb.Append("  Total: ").Append(Total).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as DepositReturnFeesSummary);
+        }
+
+        /// <summary>
+        /// Returns true if DepositReturnFeesSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of DepositReturnFeesSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(DepositReturnFeesSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Count == input.Count ||
+                    (this.Count != null &&
+                    this.Count.Equals(input.Count))
+                ) && 
+                (
+                    this.Fee == input.Fee ||
+                    (this.Fee != null &&
+                    this.Fee.Equals(input.Fee))
+                ) && 
+                (
+                    this.Total == input.Total ||
+                    (this.Total != null &&
+                    this.Total.Equals(input.Total))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Count != null)
+                    hashCode = hashCode * 59 + this.Count.GetHashCode();
+                if (this.Fee != null)
+                    hashCode = hashCode * 59 + this.Fee.GetHashCode();
+                if (this.Total != null)
+                    hashCode = hashCode * 59 + this.Total.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/DeviceSettings.cs b/src/Flipdish/Model/DeviceSettings.cs
index a914f8c7..2fa25317 100644
--- a/src/Flipdish/Model/DeviceSettings.cs
+++ b/src/Flipdish/Model/DeviceSettings.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Device settings for Hydra
     /// </summary>
     [DataContract]
-    public partial class DeviceSettings :  IEquatable<DeviceSettings>, IValidatableObject
+    public partial class DeviceSettings :  IEquatable<DeviceSettings>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DeviceSettings" /> class.
@@ -173,52 +171,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Volume (int?) maximum
-            if(this.Volume > (int?)10)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Volume, must be a value less than or equal to 10.", new [] { "Volume" });
-            }
-
-            // Volume (int?) minimum
-            if(this.Volume < (int?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Volume, must be a value greater than or equal to 0.", new [] { "Volume" });
-            }
-
-            // FontSize (double?) maximum
-            if(this.FontSize > (double?)100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FontSize, must be a value less than or equal to 100.", new [] { "FontSize" });
-            }
-
-            // FontSize (double?) minimum
-            if(this.FontSize < (double?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for FontSize, must be a value greater than or equal to 1.", new [] { "FontSize" });
-            }
-
-            // Brightness (int?) maximum
-            if(this.Brightness > (int?)100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Brightness, must be a value less than or equal to 100.", new [] { "Brightness" });
-            }
-
-            // Brightness (int?) minimum
-            if(this.Brightness < (int?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Brightness, must be a value greater than or equal to 0.", new [] { "Brightness" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DnsRecordInformation.cs b/src/Flipdish/Model/DnsRecordInformation.cs
index 8836cb48..f88d3cc9 100644
--- a/src/Flipdish/Model/DnsRecordInformation.cs
+++ b/src/Flipdish/Model/DnsRecordInformation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Holds the information for the A and CNAME Records of a domain.
     /// </summary>
     [DataContract]
-    public partial class DnsRecordInformation :  IEquatable<DnsRecordInformation>, IValidatableObject
+    public partial class DnsRecordInformation :  IEquatable<DnsRecordInformation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DnsRecordInformation" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DnsVerifiedEvent.cs b/src/Flipdish/Model/DnsVerifiedEvent.cs
index fc8abe4c..467a4bc3 100644
--- a/src/Flipdish/Model/DnsVerifiedEvent.cs
+++ b/src/Flipdish/Model/DnsVerifiedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// The DNS for the Hostname verified
     /// </summary>
     [DataContract]
-    public partial class DnsVerifiedEvent :  IEquatable<DnsVerifiedEvent>, IValidatableObject
+    public partial class DnsVerifiedEvent :  IEquatable<DnsVerifiedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DnsVerifiedEvent" /> class.
@@ -39,8 +37,11 @@ public partial class DnsVerifiedEvent :  IEquatable<DnsVerifiedEvent>, IValidata
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public DnsVerifiedEvent(string hostname = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public DnsVerifiedEvent(string hostname = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.Hostname = hostname;
             this.EventName = eventName;
@@ -48,7 +49,10 @@ public partial class DnsVerifiedEvent :  IEquatable<DnsVerifiedEvent>, IValidata
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -93,6 +97,13 @@ public partial class DnsVerifiedEvent :  IEquatable<DnsVerifiedEvent>, IValidata
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -100,6 +111,20 @@ public partial class DnsVerifiedEvent :  IEquatable<DnsVerifiedEvent>, IValidata
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -114,7 +139,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -179,10 +207,25 @@ public bool Equals(DnsVerifiedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -207,21 +250,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Driver.cs b/src/Flipdish/Model/Driver.cs
deleted file mode 100644
index fc153e3e..00000000
--- a/src/Flipdish/Model/Driver.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Driver
-    /// </summary>
-    [DataContract]
-    public partial class Driver :  IEquatable<Driver>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Driver" /> class.
-        /// </summary>
-        /// <param name="userId">User Id.</param>
-        /// <param name="userName">User Name.</param>
-        /// <param name="userPhoneNumber">User Phone Number.</param>
-        /// <param name="stores">stores.</param>
-        /// <param name="profileImageUrl">Profile image url.</param>
-        /// <param name="driverKey">Driver Key.</param>
-        public Driver(int? userId = default(int?), string userName = default(string), string userPhoneNumber = default(string), List<DriverStore> stores = default(List<DriverStore>), string profileImageUrl = default(string), string driverKey = default(string))
-        {
-            this.UserId = userId;
-            this.UserName = userName;
-            this.UserPhoneNumber = userPhoneNumber;
-            this.Stores = stores;
-            this.ProfileImageUrl = profileImageUrl;
-            this.DriverKey = driverKey;
-        }
-        
-        /// <summary>
-        /// User Id
-        /// </summary>
-        /// <value>User Id</value>
-        [DataMember(Name="UserId", EmitDefaultValue=false)]
-        public int? UserId { get; set; }
-
-        /// <summary>
-        /// User Name
-        /// </summary>
-        /// <value>User Name</value>
-        [DataMember(Name="UserName", EmitDefaultValue=false)]
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// User Phone Number
-        /// </summary>
-        /// <value>User Phone Number</value>
-        [DataMember(Name="UserPhoneNumber", EmitDefaultValue=false)]
-        public string UserPhoneNumber { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Stores
-        /// </summary>
-        [DataMember(Name="Stores", EmitDefaultValue=false)]
-        public List<DriverStore> Stores { get; set; }
-
-        /// <summary>
-        /// Profile image url
-        /// </summary>
-        /// <value>Profile image url</value>
-        [DataMember(Name="ProfileImageUrl", EmitDefaultValue=false)]
-        public string ProfileImageUrl { get; set; }
-
-        /// <summary>
-        /// Driver Key
-        /// </summary>
-        /// <value>Driver Key</value>
-        [DataMember(Name="DriverKey", EmitDefaultValue=false)]
-        public string DriverKey { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class Driver {\n");
-            sb.Append("  UserId: ").Append(UserId).Append("\n");
-            sb.Append("  UserName: ").Append(UserName).Append("\n");
-            sb.Append("  UserPhoneNumber: ").Append(UserPhoneNumber).Append("\n");
-            sb.Append("  Stores: ").Append(Stores).Append("\n");
-            sb.Append("  ProfileImageUrl: ").Append(ProfileImageUrl).Append("\n");
-            sb.Append("  DriverKey: ").Append(DriverKey).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Driver);
-        }
-
-        /// <summary>
-        /// Returns true if Driver instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Driver to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Driver input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.UserId == input.UserId ||
-                    (this.UserId != null &&
-                    this.UserId.Equals(input.UserId))
-                ) && 
-                (
-                    this.UserName == input.UserName ||
-                    (this.UserName != null &&
-                    this.UserName.Equals(input.UserName))
-                ) && 
-                (
-                    this.UserPhoneNumber == input.UserPhoneNumber ||
-                    (this.UserPhoneNumber != null &&
-                    this.UserPhoneNumber.Equals(input.UserPhoneNumber))
-                ) && 
-                (
-                    this.Stores == input.Stores ||
-                    this.Stores != null &&
-                    this.Stores.SequenceEqual(input.Stores)
-                ) && 
-                (
-                    this.ProfileImageUrl == input.ProfileImageUrl ||
-                    (this.ProfileImageUrl != null &&
-                    this.ProfileImageUrl.Equals(input.ProfileImageUrl))
-                ) && 
-                (
-                    this.DriverKey == input.DriverKey ||
-                    (this.DriverKey != null &&
-                    this.DriverKey.Equals(input.DriverKey))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.UserId != null)
-                    hashCode = hashCode * 59 + this.UserId.GetHashCode();
-                if (this.UserName != null)
-                    hashCode = hashCode * 59 + this.UserName.GetHashCode();
-                if (this.UserPhoneNumber != null)
-                    hashCode = hashCode * 59 + this.UserPhoneNumber.GetHashCode();
-                if (this.Stores != null)
-                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
-                if (this.ProfileImageUrl != null)
-                    hashCode = hashCode * 59 + this.ProfileImageUrl.GetHashCode();
-                if (this.DriverKey != null)
-                    hashCode = hashCode * 59 + this.DriverKey.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/DriverInvitation.cs b/src/Flipdish/Model/DriverInvitation.cs
deleted file mode 100644
index b52f8549..00000000
--- a/src/Flipdish/Model/DriverInvitation.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// DriverInvitation
-    /// </summary>
-    [DataContract]
-    public partial class DriverInvitation :  IEquatable<DriverInvitation>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DriverInvitation" /> class.
-        /// </summary>
-        /// <param name="phoneNumber">Phone number.</param>
-        /// <param name="name">Driver&#39;s name.</param>
-        /// <param name="storeIds">Assigned store IDs.</param>
-        public DriverInvitation(string phoneNumber = default(string), string name = default(string), List<int?> storeIds = default(List<int?>))
-        {
-            this.PhoneNumber = phoneNumber;
-            this.Name = name;
-            this.StoreIds = storeIds;
-        }
-        
-        /// <summary>
-        /// Phone number
-        /// </summary>
-        /// <value>Phone number</value>
-        [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
-        public string PhoneNumber { get; set; }
-
-        /// <summary>
-        /// Driver&#39;s name
-        /// </summary>
-        /// <value>Driver&#39;s name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Assigned store IDs
-        /// </summary>
-        /// <value>Assigned store IDs</value>
-        [DataMember(Name="StoreIds", EmitDefaultValue=false)]
-        public List<int?> StoreIds { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class DriverInvitation {\n");
-            sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as DriverInvitation);
-        }
-
-        /// <summary>
-        /// Returns true if DriverInvitation instances are equal
-        /// </summary>
-        /// <param name="input">Instance of DriverInvitation to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(DriverInvitation input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.PhoneNumber == input.PhoneNumber ||
-                    (this.PhoneNumber != null &&
-                    this.PhoneNumber.Equals(input.PhoneNumber))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.StoreIds == input.StoreIds ||
-                    this.StoreIds != null &&
-                    this.StoreIds.SequenceEqual(input.StoreIds)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.PhoneNumber != null)
-                    hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.StoreIds != null)
-                    hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/DriverLoginModel.cs b/src/Flipdish/Model/DriverLoginModel.cs
index 874669f4..c0a56d0c 100644
--- a/src/Flipdish/Model/DriverLoginModel.cs
+++ b/src/Flipdish/Model/DriverLoginModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Driver Login model
     /// </summary>
     [DataContract]
-    public partial class DriverLoginModel :  IEquatable<DriverLoginModel>, IValidatableObject
+    public partial class DriverLoginModel :  IEquatable<DriverLoginModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DriverLoginModel" /> class.
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DriverRequestLoginPinModel.cs b/src/Flipdish/Model/DriverRequestLoginPinModel.cs
index 7ae15e6b..7b97e9ee 100644
--- a/src/Flipdish/Model/DriverRequestLoginPinModel.cs
+++ b/src/Flipdish/Model/DriverRequestLoginPinModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Driver Request Login Pin model
     /// </summary>
     [DataContract]
-    public partial class DriverRequestLoginPinModel :  IEquatable<DriverRequestLoginPinModel>, IValidatableObject
+    public partial class DriverRequestLoginPinModel :  IEquatable<DriverRequestLoginPinModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DriverRequestLoginPinModel" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DriverStore.cs b/src/Flipdish/Model/DriverStore.cs
deleted file mode 100644
index 65fa25d0..00000000
--- a/src/Flipdish/Model/DriverStore.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// DriverStore
-    /// </summary>
-    [DataContract]
-    public partial class DriverStore :  IEquatable<DriverStore>, IValidatableObject
-    {
-        /// <summary>
-        /// Presence
-        /// </summary>
-        /// <value>Presence</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum PresenceEnum
-        {
-            
-            /// <summary>
-            /// Enum Offline for value: Offline
-            /// </summary>
-            [EnumMember(Value = "Offline")]
-            Offline = 1,
-            
-            /// <summary>
-            /// Enum Online for value: Online
-            /// </summary>
-            [EnumMember(Value = "Online")]
-            Online = 2
-        }
-
-        /// <summary>
-        /// Presence
-        /// </summary>
-        /// <value>Presence</value>
-        [DataMember(Name="Presence", EmitDefaultValue=false)]
-        public PresenceEnum? Presence { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DriverStore" /> class.
-        /// </summary>
-        /// <param name="storeId">Store identifier.</param>
-        /// <param name="storeName">Store name.</param>
-        /// <param name="presence">Presence.</param>
-        public DriverStore(int? storeId = default(int?), string storeName = default(string), PresenceEnum? presence = default(PresenceEnum?))
-        {
-            this.StoreId = storeId;
-            this.StoreName = storeName;
-            this.Presence = presence;
-        }
-        
-        /// <summary>
-        /// Store identifier
-        /// </summary>
-        /// <value>Store identifier</value>
-        [DataMember(Name="StoreId", EmitDefaultValue=false)]
-        public int? StoreId { get; set; }
-
-        /// <summary>
-        /// Store name
-        /// </summary>
-        /// <value>Store name</value>
-        [DataMember(Name="StoreName", EmitDefaultValue=false)]
-        public string StoreName { get; set; }
-
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class DriverStore {\n");
-            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
-            sb.Append("  StoreName: ").Append(StoreName).Append("\n");
-            sb.Append("  Presence: ").Append(Presence).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as DriverStore);
-        }
-
-        /// <summary>
-        /// Returns true if DriverStore instances are equal
-        /// </summary>
-        /// <param name="input">Instance of DriverStore to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(DriverStore input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.StoreId == input.StoreId ||
-                    (this.StoreId != null &&
-                    this.StoreId.Equals(input.StoreId))
-                ) && 
-                (
-                    this.StoreName == input.StoreName ||
-                    (this.StoreName != null &&
-                    this.StoreName.Equals(input.StoreName))
-                ) && 
-                (
-                    this.Presence == input.Presence ||
-                    (this.Presence != null &&
-                    this.Presence.Equals(input.Presence))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.StoreId != null)
-                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
-                if (this.StoreName != null)
-                    hashCode = hashCode * 59 + this.StoreName.GetHashCode();
-                if (this.Presence != null)
-                    hashCode = hashCode * 59 + this.Presence.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/DynamicFormField.cs b/src/Flipdish/Model/DynamicFormField.cs
index 3548b1ed..5c41f167 100644
--- a/src/Flipdish/Model/DynamicFormField.cs
+++ b/src/Flipdish/Model/DynamicFormField.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// DynamicFormField
     /// </summary>
     [DataContract]
-    public partial class DynamicFormField :  IEquatable<DynamicFormField>, IValidatableObject
+    public partial class DynamicFormField :  IEquatable<DynamicFormField>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DynamicFormField" /> class.
@@ -40,7 +38,8 @@ public partial class DynamicFormField :  IEquatable<DynamicFormField>, IValidata
         /// <param name="mapping">mapping.</param>
         /// <param name="modifiers">modifiers.</param>
         /// <param name="value">value.</param>
-        public DynamicFormField(string identifier = default(string), string label = default(string), string placeholder = default(string), DynamicFormRules rules = default(DynamicFormRules), Dictionary<string, string> mapping = default(Dictionary<string, string>), List<string> modifiers = default(List<string>), Object value = default(Object))
+        /// <param name="scopes">scopes.</param>
+        public DynamicFormField(string identifier = default(string), string label = default(string), string placeholder = default(string), DynamicFormRules rules = default(DynamicFormRules), Dictionary<string, string> mapping = default(Dictionary<string, string>), List<string> modifiers = default(List<string>), Object value = default(Object), string scopes = default(string))
         {
             this.Identifier = identifier;
             this.Label = label;
@@ -49,6 +48,7 @@ public partial class DynamicFormField :  IEquatable<DynamicFormField>, IValidata
             this.Mapping = mapping;
             this.Modifiers = modifiers;
             this.Value = value;
+            this.Scopes = scopes;
         }
         
         /// <summary>
@@ -93,6 +93,12 @@ public partial class DynamicFormField :  IEquatable<DynamicFormField>, IValidata
         [DataMember(Name="Value", EmitDefaultValue=false)]
         public Object Value { get; set; }
 
+        /// <summary>
+        /// Gets or Sets Scopes
+        /// </summary>
+        [DataMember(Name="Scopes", EmitDefaultValue=false)]
+        public string Scopes { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -108,6 +114,7 @@ public override string ToString()
             sb.Append("  Mapping: ").Append(Mapping).Append("\n");
             sb.Append("  Modifiers: ").Append(Modifiers).Append("\n");
             sb.Append("  Value: ").Append(Value).Append("\n");
+            sb.Append("  Scopes: ").Append(Scopes).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -176,6 +183,11 @@ public bool Equals(DynamicFormField input)
                     this.Value == input.Value ||
                     (this.Value != null &&
                     this.Value.Equals(input.Value))
+                ) && 
+                (
+                    this.Scopes == input.Scopes ||
+                    (this.Scopes != null &&
+                    this.Scopes.Equals(input.Scopes))
                 );
         }
 
@@ -202,19 +214,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Modifiers.GetHashCode();
                 if (this.Value != null)
                     hashCode = hashCode * 59 + this.Value.GetHashCode();
+                if (this.Scopes != null)
+                    hashCode = hashCode * 59 + this.Scopes.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DynamicFormFieldMapping.cs b/src/Flipdish/Model/DynamicFormFieldMapping.cs
deleted file mode 100644
index 356fa311..00000000
--- a/src/Flipdish/Model/DynamicFormFieldMapping.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// DynamicFormFieldMapping
-    /// </summary>
-    [DataContract]
-    public partial class DynamicFormFieldMapping :  IEquatable<DynamicFormFieldMapping>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DynamicFormFieldMapping" /> class.
-        /// </summary>
-        /// <param name="source">source.</param>
-        public DynamicFormFieldMapping(string source = default(string))
-        {
-            this.Source = source;
-        }
-        
-        /// <summary>
-        /// Gets or Sets Source
-        /// </summary>
-        [DataMember(Name="Source", EmitDefaultValue=false)]
-        public string Source { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class DynamicFormFieldMapping {\n");
-            sb.Append("  Source: ").Append(Source).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as DynamicFormFieldMapping);
-        }
-
-        /// <summary>
-        /// Returns true if DynamicFormFieldMapping instances are equal
-        /// </summary>
-        /// <param name="input">Instance of DynamicFormFieldMapping to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(DynamicFormFieldMapping input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Source == input.Source ||
-                    (this.Source != null &&
-                    this.Source.Equals(input.Source))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Source != null)
-                    hashCode = hashCode * 59 + this.Source.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/DynamicFormFieldOption.cs b/src/Flipdish/Model/DynamicFormFieldOption.cs
index 227e3c21..50af8157 100644
--- a/src/Flipdish/Model/DynamicFormFieldOption.cs
+++ b/src/Flipdish/Model/DynamicFormFieldOption.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// DynamicFormFieldOption
     /// </summary>
     [DataContract]
-    public partial class DynamicFormFieldOption :  IEquatable<DynamicFormFieldOption>, IValidatableObject
+    public partial class DynamicFormFieldOption :  IEquatable<DynamicFormFieldOption>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DynamicFormFieldOption" /> class.
@@ -125,16 +123,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DynamicFormRule.cs b/src/Flipdish/Model/DynamicFormRule.cs
index 00a6321a..a87e376e 100644
--- a/src/Flipdish/Model/DynamicFormRule.cs
+++ b/src/Flipdish/Model/DynamicFormRule.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// DynamicFormRule
     /// </summary>
     [DataContract]
-    public partial class DynamicFormRule :  IEquatable<DynamicFormRule>, IValidatableObject
+    public partial class DynamicFormRule :  IEquatable<DynamicFormRule>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DynamicFormRule" /> class.
@@ -141,16 +139,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/DynamicFormRules.cs b/src/Flipdish/Model/DynamicFormRules.cs
index 799cba23..85e50687 100644
--- a/src/Flipdish/Model/DynamicFormRules.cs
+++ b/src/Flipdish/Model/DynamicFormRules.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// DynamicFormRules
     /// </summary>
     [DataContract]
-    public partial class DynamicFormRules :  IEquatable<DynamicFormRules>, IValidatableObject
+    public partial class DynamicFormRules :  IEquatable<DynamicFormRules>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DynamicFormRules" /> class.
@@ -173,16 +171,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/EmvNotificationEvent.cs b/src/Flipdish/Model/EmvNotificationEvent.cs
index 9ec78db4..d717a0a6 100644
--- a/src/Flipdish/Model/EmvNotificationEvent.cs
+++ b/src/Flipdish/Model/EmvNotificationEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Terminal Notification
     /// </summary>
     [DataContract]
-    public partial class EmvNotificationEvent :  IEquatable<EmvNotificationEvent>, IValidatableObject
+    public partial class EmvNotificationEvent :  IEquatable<EmvNotificationEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="EmvNotificationEvent" /> class.
@@ -48,8 +46,11 @@ public partial class EmvNotificationEvent :  IEquatable<EmvNotificationEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public EmvNotificationEvent(string eventName = default(string), string notification = default(string), Order order = default(Order), string terminalId = default(string), string description = default(string), string expDate = default(string), string cardType = default(string), string paymentMethod = default(string), string accountNumber = default(string), string authCode = default(string), string providerMessage = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public EmvNotificationEvent(string eventName = default(string), string notification = default(string), Order order = default(Order), string terminalId = default(string), string description = default(string), string expDate = default(string), string cardType = default(string), string paymentMethod = default(string), string accountNumber = default(string), string authCode = default(string), string providerMessage = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Notification = notification;
@@ -66,7 +67,10 @@ public partial class EmvNotificationEvent :  IEquatable<EmvNotificationEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -174,6 +178,13 @@ public partial class EmvNotificationEvent :  IEquatable<EmvNotificationEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -181,6 +192,20 @@ public partial class EmvNotificationEvent :  IEquatable<EmvNotificationEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -204,7 +229,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -314,10 +342,25 @@ public bool Equals(EmvNotificationEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -360,21 +403,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/EmvTerminal.cs b/src/Flipdish/Model/EmvTerminal.cs
index fd04b1b8..d8de9306 100644
--- a/src/Flipdish/Model/EmvTerminal.cs
+++ b/src/Flipdish/Model/EmvTerminal.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// EMV Payment Terminal
     /// </summary>
     [DataContract]
-    public partial class EmvTerminal :  IEquatable<EmvTerminal>, IValidatableObject
+    public partial class EmvTerminal :  IEquatable<EmvTerminal>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="EmvTerminal" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/EmvTerminalWithAssignments.cs b/src/Flipdish/Model/EmvTerminalWithAssignments.cs
index 6f4bf3bb..e6d8d023 100644
--- a/src/Flipdish/Model/EmvTerminalWithAssignments.cs
+++ b/src/Flipdish/Model/EmvTerminalWithAssignments.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// EMV Payment Terminal
     /// </summary>
     [DataContract]
-    public partial class EmvTerminalWithAssignments :  IEquatable<EmvTerminalWithAssignments>, IValidatableObject
+    public partial class EmvTerminalWithAssignments :  IEquatable<EmvTerminalWithAssignments>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="EmvTerminalWithAssignments" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/EndUserFeeConfig.cs b/src/Flipdish/Model/EndUserFeeConfig.cs
new file mode 100644
index 00000000..a450d1e9
--- /dev/null
+++ b/src/Flipdish/Model/EndUserFeeConfig.cs
@@ -0,0 +1,263 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Tiered end user fee config for a given order channel and payment method
+    /// </summary>
+    [DataContract]
+    public partial class EndUserFeeConfig :  IEquatable<EndUserFeeConfig>
+    {
+        /// <summary>
+        /// The order channel this fee config applies to
+        /// </summary>
+        /// <value>The order channel this fee config applies to</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ChannelEnum
+        {
+            
+            /// <summary>
+            /// Enum WebApp for value: WebApp
+            /// </summary>
+            [EnumMember(Value = "WebApp")]
+            WebApp = 1,
+            
+            /// <summary>
+            /// Enum InStore for value: InStore
+            /// </summary>
+            [EnumMember(Value = "InStore")]
+            InStore = 2,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 3
+        }
+
+        /// <summary>
+        /// The order channel this fee config applies to
+        /// </summary>
+        /// <value>The order channel this fee config applies to</value>
+        [DataMember(Name="Channel", EmitDefaultValue=false)]
+        public ChannelEnum? Channel { get; set; }
+        /// <summary>
+        /// The payment method this fee config applies to
+        /// </summary>
+        /// <value>The payment method this fee config applies to</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum PaymentMethodEnum
+        {
+            
+            /// <summary>
+            /// Enum Cash for value: Cash
+            /// </summary>
+            [EnumMember(Value = "Cash")]
+            Cash = 1,
+            
+            /// <summary>
+            /// Enum Card for value: Card
+            /// </summary>
+            [EnumMember(Value = "Card")]
+            Card = 2
+        }
+
+        /// <summary>
+        /// The payment method this fee config applies to
+        /// </summary>
+        /// <value>The payment method this fee config applies to</value>
+        [DataMember(Name="PaymentMethod", EmitDefaultValue=false)]
+        public PaymentMethodEnum? PaymentMethod { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EndUserFeeConfig" /> class.
+        /// </summary>
+        /// <param name="channel">The order channel this fee config applies to.</param>
+        /// <param name="paymentMethod">The payment method this fee config applies to.</param>
+        /// <param name="minOrderAmount">Order amount below which MinFixedFee is charged instead of the percent/fixed calculation.</param>
+        /// <param name="minFixedFee">Fixed fee charged for orders at or below MinOrderAmount.</param>
+        /// <param name="percentFee">Percentage fee applied to the order amount.</param>
+        /// <param name="fixedFee">Fixed fee compared against the percentage fee - the greater of the two is charged.</param>
+        /// <param name="cap">Maximum fee that can be charged.</param>
+        public EndUserFeeConfig(ChannelEnum? channel = default(ChannelEnum?), PaymentMethodEnum? paymentMethod = default(PaymentMethodEnum?), double? minOrderAmount = default(double?), double? minFixedFee = default(double?), double? percentFee = default(double?), double? fixedFee = default(double?), double? cap = default(double?))
+        {
+            this.Channel = channel;
+            this.PaymentMethod = paymentMethod;
+            this.MinOrderAmount = minOrderAmount;
+            this.MinFixedFee = minFixedFee;
+            this.PercentFee = percentFee;
+            this.FixedFee = fixedFee;
+            this.Cap = cap;
+        }
+        
+
+
+        /// <summary>
+        /// Order amount below which MinFixedFee is charged instead of the percent/fixed calculation
+        /// </summary>
+        /// <value>Order amount below which MinFixedFee is charged instead of the percent/fixed calculation</value>
+        [DataMember(Name="MinOrderAmount", EmitDefaultValue=false)]
+        public double? MinOrderAmount { get; set; }
+
+        /// <summary>
+        /// Fixed fee charged for orders at or below MinOrderAmount
+        /// </summary>
+        /// <value>Fixed fee charged for orders at or below MinOrderAmount</value>
+        [DataMember(Name="MinFixedFee", EmitDefaultValue=false)]
+        public double? MinFixedFee { get; set; }
+
+        /// <summary>
+        /// Percentage fee applied to the order amount
+        /// </summary>
+        /// <value>Percentage fee applied to the order amount</value>
+        [DataMember(Name="PercentFee", EmitDefaultValue=false)]
+        public double? PercentFee { get; set; }
+
+        /// <summary>
+        /// Fixed fee compared against the percentage fee - the greater of the two is charged
+        /// </summary>
+        /// <value>Fixed fee compared against the percentage fee - the greater of the two is charged</value>
+        [DataMember(Name="FixedFee", EmitDefaultValue=false)]
+        public double? FixedFee { get; set; }
+
+        /// <summary>
+        /// Maximum fee that can be charged
+        /// </summary>
+        /// <value>Maximum fee that can be charged</value>
+        [DataMember(Name="Cap", EmitDefaultValue=false)]
+        public double? Cap { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class EndUserFeeConfig {\n");
+            sb.Append("  Channel: ").Append(Channel).Append("\n");
+            sb.Append("  PaymentMethod: ").Append(PaymentMethod).Append("\n");
+            sb.Append("  MinOrderAmount: ").Append(MinOrderAmount).Append("\n");
+            sb.Append("  MinFixedFee: ").Append(MinFixedFee).Append("\n");
+            sb.Append("  PercentFee: ").Append(PercentFee).Append("\n");
+            sb.Append("  FixedFee: ").Append(FixedFee).Append("\n");
+            sb.Append("  Cap: ").Append(Cap).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as EndUserFeeConfig);
+        }
+
+        /// <summary>
+        /// Returns true if EndUserFeeConfig instances are equal
+        /// </summary>
+        /// <param name="input">Instance of EndUserFeeConfig to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(EndUserFeeConfig input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Channel == input.Channel ||
+                    (this.Channel != null &&
+                    this.Channel.Equals(input.Channel))
+                ) && 
+                (
+                    this.PaymentMethod == input.PaymentMethod ||
+                    (this.PaymentMethod != null &&
+                    this.PaymentMethod.Equals(input.PaymentMethod))
+                ) && 
+                (
+                    this.MinOrderAmount == input.MinOrderAmount ||
+                    (this.MinOrderAmount != null &&
+                    this.MinOrderAmount.Equals(input.MinOrderAmount))
+                ) && 
+                (
+                    this.MinFixedFee == input.MinFixedFee ||
+                    (this.MinFixedFee != null &&
+                    this.MinFixedFee.Equals(input.MinFixedFee))
+                ) && 
+                (
+                    this.PercentFee == input.PercentFee ||
+                    (this.PercentFee != null &&
+                    this.PercentFee.Equals(input.PercentFee))
+                ) && 
+                (
+                    this.FixedFee == input.FixedFee ||
+                    (this.FixedFee != null &&
+                    this.FixedFee.Equals(input.FixedFee))
+                ) && 
+                (
+                    this.Cap == input.Cap ||
+                    (this.Cap != null &&
+                    this.Cap.Equals(input.Cap))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Channel != null)
+                    hashCode = hashCode * 59 + this.Channel.GetHashCode();
+                if (this.PaymentMethod != null)
+                    hashCode = hashCode * 59 + this.PaymentMethod.GetHashCode();
+                if (this.MinOrderAmount != null)
+                    hashCode = hashCode * 59 + this.MinOrderAmount.GetHashCode();
+                if (this.MinFixedFee != null)
+                    hashCode = hashCode * 59 + this.MinFixedFee.GetHashCode();
+                if (this.PercentFee != null)
+                    hashCode = hashCode * 59 + this.PercentFee.GetHashCode();
+                if (this.FixedFee != null)
+                    hashCode = hashCode * 59 + this.FixedFee.GetHashCode();
+                if (this.Cap != null)
+                    hashCode = hashCode * 59 + this.Cap.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/EventSearchResult.cs b/src/Flipdish/Model/EventSearchResult.cs
index 9631fb7a..1d3bfe63 100644
--- a/src/Flipdish/Model/EventSearchResult.cs
+++ b/src/Flipdish/Model/EventSearchResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// EventSearchResult
     /// </summary>
     [DataContract]
-    public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValidatableObject
+    public partial class EventSearchResult :  IEquatable<EventSearchResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="EventSearchResult" /> class.
@@ -40,6 +38,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         /// <param name="orderDispatchedEvent">Order dispatched events.</param>
         /// <param name="orderCustomerTrackingCreatedEvent">Order delivery tracking created events.</param>
         /// <param name="orderDeliveryTrackingStatusUpdatedEvent">Order delivery tracking updated events.</param>
+        /// <param name="orderBatchPublishedEvent">Order Batch published event.</param>
         /// <param name="orderCreatedEvent">Order created events.</param>
         /// <param name="orderRatingUpdatedEvent">Order rating updated events.</param>
         /// <param name="orderRefundedEvent">Order refunded events.</param>
@@ -67,6 +66,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         /// <param name="storeLogoUpdatedEvent">Store logo updated events.</param>
         /// <param name="storeLogoDeletedEvent">Store logo deleted events.</param>
         /// <param name="menuCreatedEvent">Menu created events.</param>
+        /// <param name="menuAsyncCreationCompletedEvent">Menu async creation completed events.</param>
         /// <param name="menuUpdatedEvent">Menu updated events.</param>
         /// <param name="menuUploadedEvent">Menu uploaded events.</param>
         /// <param name="menuBulkEditEvent">Menu bulk events.</param>
@@ -98,6 +98,8 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         /// <param name="printerUnassignedFromStoreEvent">Printer unassigned from store event.</param>
         /// <param name="phoneCallStartedEvent">Phone call started event.</param>
         /// <param name="phoneCallEndedEvent">Phone call ended event.</param>
+        /// <param name="telephonyConfigUpdatedEvent">Telephony config updated event.</param>
+        /// <param name="channelStoresUpdatedEvent">Channel stores updated event.</param>
         /// <param name="loyaltyCampaignCreatedEvent">Loyalty campaign created event.</param>
         /// <param name="loyaltyCampaignDeletedEvent">Loyalty campaign deleted event.</param>
         /// <param name="loyaltyCampaignUpdatedEvent">Loyalty campaign updated event.</param>
@@ -114,6 +116,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         /// <param name="voucherCreatedEvent">Voucher created event.</param>
         /// <param name="voucherUpdatedEvent">Voucher updated event.</param>
         /// <param name="voucherDeletedEvent">Voucher deleted event.</param>
+        /// <param name="voucherAppliedEvent">Voucher applied event.</param>
         /// <param name="teammateInviteSentEvent">Teammate invite sent event.</param>
         /// <param name="teammateInviteAcceptedEvent">Teammate invite accepted event.</param>
         /// <param name="teammateUpdatedEvent">Teammate updated event.</param>
@@ -123,6 +126,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         /// <param name="bankAccountDeletedEvent">Bank account updated event.</param>
         /// <param name="bankAccountAssignedEvent">Bank account assigned event.</param>
         /// <param name="hydraAssignedEvent">Hydra assigned event.</param>
+        /// <param name="hydraCreatedEvent">Hydra created event.</param>
         /// <param name="hydraRequestResetEvent">Hydra reset requested event.</param>
         /// <param name="hydraStoreAssignedEvent">Hydra store assigned event.</param>
         /// <param name="hydraStoreUnassignedEvent">Hydra store unassigned.</param>
@@ -153,6 +157,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         /// <param name="appStoreConfigCreatedEvent">App Store Config Created.</param>
         /// <param name="appStoreConfigUpdatedEvent">App Store Config Updated.</param>
         /// <param name="appStoreConfigDeletedEvent">App Store Config Deleted.</param>
+        /// <param name="appStoreSubscriptionChangeJobUpdatedEvent">App Store Subscription Change Job Updated.</param>
         /// <param name="catalogItemCreatedEvent">Catalog Item Created.</param>
         /// <param name="catalogItemUpdatedEvent">Catalog Item Updated.</param>
         /// <param name="catalogItemArchivedEvent">Catalog Item Archived.</param>
@@ -165,7 +170,10 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         /// <param name="locationCreatedEvent">Location created event.</param>
         /// <param name="locationDeletedEvent">Location deleted event.</param>
         /// <param name="storeServiceChargeUpdatedEvent">Service Charge Updated Event.</param>
-        public EventSearchResult(List<AppCreatedEvent> appCreatedEvent = default(List<AppCreatedEvent>), List<AppUpdatedEvent> appUpdatedEvent = default(List<AppUpdatedEvent>), List<AnalyticsClientEvent> analyticsClientEvent = default(List<AnalyticsClientEvent>), List<OrderAcceptedEvent> orderAcceptedEvent = default(List<OrderAcceptedEvent>), List<OrderDispatchedEvent> orderDispatchedEvent = default(List<OrderDispatchedEvent>), List<OrderCustomerTrackingCreatedEvent> orderCustomerTrackingCreatedEvent = default(List<OrderCustomerTrackingCreatedEvent>), List<OrderDeliveryTrackingStatusUpdatedEvent> orderDeliveryTrackingStatusUpdatedEvent = default(List<OrderDeliveryTrackingStatusUpdatedEvent>), List<OrderCreatedEvent> orderCreatedEvent = default(List<OrderCreatedEvent>), List<OrderRatingUpdatedEvent> orderRatingUpdatedEvent = default(List<OrderRatingUpdatedEvent>), List<OrderRefundedEvent> orderRefundedEvent = default(List<OrderRefundedEvent>), List<OrderRejectedEvent> orderRejectedEvent = default(List<OrderRejectedEvent>), List<OrderTipUpdatedEvent> orderTipUpdatedEvent = default(List<OrderTipUpdatedEvent>), List<EmvNotificationEvent> orderTerminalNotifications = default(List<EmvNotificationEvent>), List<StoreCreatedEvent> storeCreatedEvent = default(List<StoreCreatedEvent>), List<StoreDeletedEvent> storeDeletedEvent = default(List<StoreDeletedEvent>), List<StoreAddressUpdatedEvent> storeAddressUpdatedEvent = default(List<StoreAddressUpdatedEvent>), List<StoreKioskSettingUpdatedEvent> storeKioskSettingUpdatedEvent = default(List<StoreKioskSettingUpdatedEvent>), List<DeliveryZoneCreatedEvent> deliveryZoneCreatedEvent = default(List<DeliveryZoneCreatedEvent>), List<DeliveryZoneUpdatedEvent> deliveryZoneUpdatedEvent = default(List<DeliveryZoneUpdatedEvent>), List<DeliveryZoneDeletedEvent> deliveryZoneDeletedEvent = default(List<DeliveryZoneDeletedEvent>), List<StoreOpeningHoursUpdatedEvent> storeOpeningHoursUpdatedEvent = default(List<StoreOpeningHoursUpdatedEvent>), List<StoreMenuAssignedEvent> storeMenuAssignedEvent = default(List<StoreMenuAssignedEvent>), List<StoreBusinessHoursOverrideCreatedEvent> storeBusinessHoursOverrideCreatedEvent = default(List<StoreBusinessHoursOverrideCreatedEvent>), List<StoreBusinessHoursOverrideDeletedEvent> storeBusinessHoursOverrideDeletedEvent = default(List<StoreBusinessHoursOverrideDeletedEvent>), List<StoreArchivedEvent> storeArchivedEvent = default(List<StoreArchivedEvent>), List<StoreUnarchivedEvent> storeUnarchivedEvent = default(List<StoreUnarchivedEvent>), List<StorePublishedEvent> storePublishedEvent = default(List<StorePublishedEvent>), List<StoreUnpublishedEvent> storeUnpublishedEvent = default(List<StoreUnpublishedEvent>), List<StoreUpdatedEvent> storeUpdatedEvent = default(List<StoreUpdatedEvent>), List<StorePreOrderConfigUpdatedEvent> storePreOrderConfigUpdatedEvent = default(List<StorePreOrderConfigUpdatedEvent>), List<StoreLogoCreatedEvent> storeLogoCreatedEvent = default(List<StoreLogoCreatedEvent>), List<StoreLogoUpdatedEvent> storeLogoUpdatedEvent = default(List<StoreLogoUpdatedEvent>), List<StoreLogoDeletedEvent> storeLogoDeletedEvent = default(List<StoreLogoDeletedEvent>), List<MenuCreatedEvent> menuCreatedEvent = default(List<MenuCreatedEvent>), List<MenuUpdatedEvent> menuUpdatedEvent = default(List<MenuUpdatedEvent>), List<MenuUploadedEvent> menuUploadedEvent = default(List<MenuUploadedEvent>), List<MenuBulkEditEvent> menuBulkEditEvent = default(List<MenuBulkEditEvent>), List<MenuSectionCreatedEvent> menuSectionCreatedEvent = default(List<MenuSectionCreatedEvent>), List<MenuSectionUpdatedEvent> menuSectionUpdatedEvent = default(List<MenuSectionUpdatedEvent>), List<MenuSectionDeletedEvent> menuSectionDeletedEvent = default(List<MenuSectionDeletedEvent>), List<MenuSectionItemCreatedEvent> menuSectionItemCreatedEvent = default(List<MenuSectionItemCreatedEvent>), List<MenuSectionItemUpdatedEvent> menuSectionItemUpdatedEvent = default(List<MenuSectionItemUpdatedEvent>), List<MenuSectionItemDeletedEvent> menuSectionItemDeletedEvent = default(List<MenuSectionItemDeletedEvent>), List<MenuItemOptionSetCreatedEvent> menuItemOptionSetCreatedEvent = default(List<MenuItemOptionSetCreatedEvent>), List<MenuItemOptionSetUpdatedEvent> menuItemOptionSetUpdatedEvent = default(List<MenuItemOptionSetUpdatedEvent>), List<MenuItemOptionSetDeletedEvent> menuItemOptionSetDeletedEvent = default(List<MenuItemOptionSetDeletedEvent>), List<MenuItemOptionSetItemCreatedEvent> menuItemOptionSetItemCreatedEvent = default(List<MenuItemOptionSetItemCreatedEvent>), List<MenuItemOptionSetItemUpdatedEvent> menuItemOptionSetItemUpdatedEvent = default(List<MenuItemOptionSetItemUpdatedEvent>), List<MenuItemOptionSetItemDeletedEvent> menuItemOptionSetItemDeletedEvent = default(List<MenuItemOptionSetItemDeletedEvent>), List<MenuCheckpointCreatedEvent> menuCheckpointCreatedEvent = default(List<MenuCheckpointCreatedEvent>), List<StoreGroupCreatedEvent> storeGroupCreatedEvent = default(List<StoreGroupCreatedEvent>), List<StoreGroupUpdatedEvent> storeGroupUpdatedEvent = default(List<StoreGroupUpdatedEvent>), List<StoreGroupDeletedEvent> storeGroupDeletedEvent = default(List<StoreGroupDeletedEvent>), List<CustomerCreatedEvent> customerCreatedEvent = default(List<CustomerCreatedEvent>), List<CustomerUpdatedEvent> customerUpdatedEvent = default(List<CustomerUpdatedEvent>), List<CustomerConsentUpdatedEvent> customerConsentUpdatedEvent = default(List<CustomerConsentUpdatedEvent>), List<WebhookSubscriptionCreatedEvent> webhookSubscriptionCreatedEvent = default(List<WebhookSubscriptionCreatedEvent>), List<WebhookSubscriptionUpdatedEvent> webhookSubscriptionUpdatedEvent = default(List<WebhookSubscriptionUpdatedEvent>), List<WebhookSubscriptionDeletedEvent> webhookSubscriptionDeletedEvent = default(List<WebhookSubscriptionDeletedEvent>), List<PrinterTurnedOnEvent> printerTurnedOnEvent = default(List<PrinterTurnedOnEvent>), List<PrinterTurnedOffEvent> printerTurnedOffEvent = default(List<PrinterTurnedOffEvent>), List<PrinterAssignedToStoreEvent> printerAssignedToStoreEvent = default(List<PrinterAssignedToStoreEvent>), List<PrinterUnassignedFromStoreEvent> printerUnassignedFromStoreEvent = default(List<PrinterUnassignedFromStoreEvent>), List<PhoneCallStartedEvent> phoneCallStartedEvent = default(List<PhoneCallStartedEvent>), List<PhoneCallEndedEvent> phoneCallEndedEvent = default(List<PhoneCallEndedEvent>), List<LoyaltyCampaignCreatedEvent> loyaltyCampaignCreatedEvent = default(List<LoyaltyCampaignCreatedEvent>), List<LoyaltyCampaignDeletedEvent> loyaltyCampaignDeletedEvent = default(List<LoyaltyCampaignDeletedEvent>), List<LoyaltyCampaignUpdatedEvent> loyaltyCampaignUpdatedEvent = default(List<LoyaltyCampaignUpdatedEvent>), List<RetentionCampaignCreatedEvent> retentionCampaignCreatedEvent = default(List<RetentionCampaignCreatedEvent>), List<RetentionCampaignDeletedEvent> retentionCampaignDeletedEvent = default(List<RetentionCampaignDeletedEvent>), List<RetentionCampaignUpdatedEvent> retentionCampaignUpdatedEvent = default(List<RetentionCampaignUpdatedEvent>), List<SmsReceivedEvent> smsReceivedEvent = default(List<SmsReceivedEvent>), List<UserLoginEvent> userLoginEvent = default(List<UserLoginEvent>), List<UserCreatedEvent> userCreatedEvent = default(List<UserCreatedEvent>), List<UserUpdatedEvent> userUpdatedEvent = default(List<UserUpdatedEvent>), List<UserDeletedEvent> userDeletedEvent = default(List<UserDeletedEvent>), List<UserPasswordCreatedEvent> userCreatedPasswordEvent = default(List<UserPasswordCreatedEvent>), List<UserAnsweredSignupQuestionsEvent> userAnsweredSignupQuestionsEvent = default(List<UserAnsweredSignupQuestionsEvent>), List<VoucherCreatedEvent> voucherCreatedEvent = default(List<VoucherCreatedEvent>), List<VoucherUpdatedEvent> voucherUpdatedEvent = default(List<VoucherUpdatedEvent>), List<VoucherDeletedEvent> voucherDeletedEvent = default(List<VoucherDeletedEvent>), List<TeammateInviteSentEvent> teammateInviteSentEvent = default(List<TeammateInviteSentEvent>), List<TeammateInviteAcceptedEvent> teammateInviteAcceptedEvent = default(List<TeammateInviteAcceptedEvent>), List<TeammateUpdatedEvent> teammateUpdatedEvent = default(List<TeammateUpdatedEvent>), List<TeammateDeletedEvent> teammateDeletedEvent = default(List<TeammateDeletedEvent>), List<BankAccountCreatedEvent> bankAccountCreatedEvent = default(List<BankAccountCreatedEvent>), List<BankAccountUpdatedEvent> bankAccountUpdatedEvent = default(List<BankAccountUpdatedEvent>), List<BankAccountDeletedEvent> bankAccountDeletedEvent = default(List<BankAccountDeletedEvent>), List<BankAccountDeletedEvent> bankAccountAssignedEvent = default(List<BankAccountDeletedEvent>), List<HydraAssignedEvent> hydraAssignedEvent = default(List<HydraAssignedEvent>), List<HydraRequestResetEvent> hydraRequestResetEvent = default(List<HydraRequestResetEvent>), List<HydraStoreAssignedEvent> hydraStoreAssignedEvent = default(List<HydraStoreAssignedEvent>), List<HydraStoreUnassignedEvent> hydraStoreUnassignedEvent = default(List<HydraStoreUnassignedEvent>), List<HydraSettingChangedEvent> hydraSettingChangedEvent = default(List<HydraSettingChangedEvent>), List<HydraUnAssignedEvent> hydraUnAssignedEvent = default(List<HydraUnAssignedEvent>), List<HydraConnectionStatusChangedEvent> hydraConnectionStatusChangedEvent = default(List<HydraConnectionStatusChangedEvent>), List<KioskBluetoothPairingModeEvent> kioskBluetoothPairingModeEvent = default(List<KioskBluetoothPairingModeEvent>), List<KioskBluetoothUnpairingModeEvent> kioskBluetoothUnpairingModeEvent = default(List<KioskBluetoothUnpairingModeEvent>), List<KioskBluetoothTerminalUnpairedEvent> kioskBluetoothTerminalUnpairedEvent = default(List<KioskBluetoothTerminalUnpairedEvent>), List<KioskTerminalActionStateChangedEvent> kioskTerminalActionStateChangedEvent = default(List<KioskTerminalActionStateChangedEvent>), List<KioskBluetoothTerminalUpdatedEvent> kioskBluetoothTerminalUpdatedEvent = default(List<KioskBluetoothTerminalUpdatedEvent>), List<KioskBluetoothTerminalInitiateUpdateCheckEvent> kioskBluetoothTerminalInitiateUpdateCheckEvent = default(List<KioskBluetoothTerminalInitiateUpdateCheckEvent>), List<KioskBluetoothInstallUpdateInitiateEvent> kioskBluetoothInstallUpdateInitiateEvent = default(List<KioskBluetoothInstallUpdateInitiateEvent>), List<KioskBluetoothTerminalCancelUpdateEvent> kioskBluetoothTerminalCancelUpdateEvent = default(List<KioskBluetoothTerminalCancelUpdateEvent>), List<KioskBluetoothTerminalFirmwareVersionStatusEvent> kioskBluetoothTerminalFirmwareVersionStatusEvent = default(List<KioskBluetoothTerminalFirmwareVersionStatusEvent>), List<KioskBluetoothTerminalInstallationStatusEvent> kioskBluetoothTerminalInstallationStatusEvent = default(List<KioskBluetoothTerminalInstallationStatusEvent>), List<PushNotificationScheduledEvent> pushNotificationScheduledEvent = default(List<PushNotificationScheduledEvent>), List<PushNotificationSentEvent> pushNotificationSentEvent = default(List<PushNotificationSentEvent>), List<PushNotificationDeletedEvent> pushNotificationDeletedEvent = default(List<PushNotificationDeletedEvent>), List<DnsVerifiedEvent> dnsVerifiedEvent = default(List<DnsVerifiedEvent>), List<CertificateCreatedEvent> certificateCreatedEvent = default(List<CertificateCreatedEvent>), List<CertificateRenewedEvent> certificateRenewedEvent = default(List<CertificateRenewedEvent>), List<WebsiteVanityUrlUpdatedEvent> websiteVanityUrlUpdatedEvent = default(List<WebsiteVanityUrlUpdatedEvent>), List<WebsiteUpdatedEvent> websiteUpdatedEvent = default(List<WebsiteUpdatedEvent>), List<OrderCapacityConfigUpdatedEvent> orderCapacityUpdatedEvent = default(List<OrderCapacityConfigUpdatedEvent>), List<ExternalStoreEvent> externalStoreEvent = default(List<ExternalStoreEvent>), List<OrderFulfillmentStatusUpdatedEvent> orderFulfillmentStatusUpdatedEvent = default(List<OrderFulfillmentStatusUpdatedEvent>), List<AppStoreConfigCreatedEvent> appStoreConfigCreatedEvent = default(List<AppStoreConfigCreatedEvent>), List<AppStoreConfigUpdatedEvent> appStoreConfigUpdatedEvent = default(List<AppStoreConfigUpdatedEvent>), List<AppStoreConfigDeletedEvent> appStoreConfigDeletedEvent = default(List<AppStoreConfigDeletedEvent>), List<CatalogItemCreatedEvent> catalogItemCreatedEvent = default(List<CatalogItemCreatedEvent>), List<CatalogItemUpdatedEvent> catalogItemUpdatedEvent = default(List<CatalogItemUpdatedEvent>), List<CatalogItemArchivedEvent> catalogItemArchivedEvent = default(List<CatalogItemArchivedEvent>), List<CatalogGroupCreatedEvent> catalogGroupCreatedEvent = default(List<CatalogGroupCreatedEvent>), List<CatalogGroupUpdatedEvent> catalogGroupUpdatedEvent = default(List<CatalogGroupUpdatedEvent>), List<CatalogGroupArchivedEvent> catalogGroupArchivedEvent = default(List<CatalogGroupArchivedEvent>), List<StoreTipUpdatedEvent> storeTipUpdatedEvent = default(List<StoreTipUpdatedEvent>), List<LocationAreaCreatedEvent> locationAreaCreatedEvent = default(List<LocationAreaCreatedEvent>), List<LocationAreaUpdatedEvent> locationAreaUpdatedEvent = default(List<LocationAreaUpdatedEvent>), List<LocationCreatedEvent> locationCreatedEvent = default(List<LocationCreatedEvent>), List<LocationDeletedEvent> locationDeletedEvent = default(List<LocationDeletedEvent>), List<StoreServiceChargeUpdatedEvent> storeServiceChargeUpdatedEvent = default(List<StoreServiceChargeUpdatedEvent>))
+        /// <param name="mobileAppsSubmissionStatusUpdatedEvent">Mobile Submission Status Updated Event.</param>
+        /// <param name="mobileAppsSubmissionUpdatedEvent">Mobile Submission Updated Event.</param>
+        /// <param name="storeFeeConfigUpdatedEvent">Store Fee Config Updated Event.</param>
+        public EventSearchResult(List<AppCreatedEvent> appCreatedEvent = default(List<AppCreatedEvent>), List<AppUpdatedEvent> appUpdatedEvent = default(List<AppUpdatedEvent>), List<AnalyticsClientEvent> analyticsClientEvent = default(List<AnalyticsClientEvent>), List<OrderAcceptedEvent> orderAcceptedEvent = default(List<OrderAcceptedEvent>), List<OrderDispatchedEvent> orderDispatchedEvent = default(List<OrderDispatchedEvent>), List<OrderCustomerTrackingCreatedEvent> orderCustomerTrackingCreatedEvent = default(List<OrderCustomerTrackingCreatedEvent>), List<OrderDeliveryTrackingStatusUpdatedEvent> orderDeliveryTrackingStatusUpdatedEvent = default(List<OrderDeliveryTrackingStatusUpdatedEvent>), List<OrderBatchPublishedEvent> orderBatchPublishedEvent = default(List<OrderBatchPublishedEvent>), List<OrderCreatedEvent> orderCreatedEvent = default(List<OrderCreatedEvent>), List<OrderRatingUpdatedEvent> orderRatingUpdatedEvent = default(List<OrderRatingUpdatedEvent>), List<OrderRefundedEvent> orderRefundedEvent = default(List<OrderRefundedEvent>), List<OrderRejectedEvent> orderRejectedEvent = default(List<OrderRejectedEvent>), List<OrderTipUpdatedEvent> orderTipUpdatedEvent = default(List<OrderTipUpdatedEvent>), List<EmvNotificationEvent> orderTerminalNotifications = default(List<EmvNotificationEvent>), List<StoreCreatedEvent> storeCreatedEvent = default(List<StoreCreatedEvent>), List<StoreDeletedEvent> storeDeletedEvent = default(List<StoreDeletedEvent>), List<StoreAddressUpdatedEvent> storeAddressUpdatedEvent = default(List<StoreAddressUpdatedEvent>), List<StoreKioskSettingUpdatedEvent> storeKioskSettingUpdatedEvent = default(List<StoreKioskSettingUpdatedEvent>), List<DeliveryZoneCreatedEvent> deliveryZoneCreatedEvent = default(List<DeliveryZoneCreatedEvent>), List<DeliveryZoneUpdatedEvent> deliveryZoneUpdatedEvent = default(List<DeliveryZoneUpdatedEvent>), List<DeliveryZoneDeletedEvent> deliveryZoneDeletedEvent = default(List<DeliveryZoneDeletedEvent>), List<StoreOpeningHoursUpdatedEvent> storeOpeningHoursUpdatedEvent = default(List<StoreOpeningHoursUpdatedEvent>), List<StoreMenuAssignedEvent> storeMenuAssignedEvent = default(List<StoreMenuAssignedEvent>), List<StoreBusinessHoursOverrideCreatedEvent> storeBusinessHoursOverrideCreatedEvent = default(List<StoreBusinessHoursOverrideCreatedEvent>), List<StoreBusinessHoursOverrideDeletedEvent> storeBusinessHoursOverrideDeletedEvent = default(List<StoreBusinessHoursOverrideDeletedEvent>), List<StoreArchivedEvent> storeArchivedEvent = default(List<StoreArchivedEvent>), List<StoreUnarchivedEvent> storeUnarchivedEvent = default(List<StoreUnarchivedEvent>), List<StorePublishedEvent> storePublishedEvent = default(List<StorePublishedEvent>), List<StoreUnpublishedEvent> storeUnpublishedEvent = default(List<StoreUnpublishedEvent>), List<StoreUpdatedEvent> storeUpdatedEvent = default(List<StoreUpdatedEvent>), List<StorePreOrderConfigUpdatedEvent> storePreOrderConfigUpdatedEvent = default(List<StorePreOrderConfigUpdatedEvent>), List<StoreLogoCreatedEvent> storeLogoCreatedEvent = default(List<StoreLogoCreatedEvent>), List<StoreLogoUpdatedEvent> storeLogoUpdatedEvent = default(List<StoreLogoUpdatedEvent>), List<StoreLogoDeletedEvent> storeLogoDeletedEvent = default(List<StoreLogoDeletedEvent>), List<MenuCreatedEvent> menuCreatedEvent = default(List<MenuCreatedEvent>), List<MenuAsyncCreationCompletedEvent> menuAsyncCreationCompletedEvent = default(List<MenuAsyncCreationCompletedEvent>), List<MenuUpdatedEvent> menuUpdatedEvent = default(List<MenuUpdatedEvent>), List<MenuUploadedEvent> menuUploadedEvent = default(List<MenuUploadedEvent>), List<MenuBulkEditEvent> menuBulkEditEvent = default(List<MenuBulkEditEvent>), List<MenuSectionCreatedEvent> menuSectionCreatedEvent = default(List<MenuSectionCreatedEvent>), List<MenuSectionUpdatedEvent> menuSectionUpdatedEvent = default(List<MenuSectionUpdatedEvent>), List<MenuSectionDeletedEvent> menuSectionDeletedEvent = default(List<MenuSectionDeletedEvent>), List<MenuSectionItemCreatedEvent> menuSectionItemCreatedEvent = default(List<MenuSectionItemCreatedEvent>), List<MenuSectionItemUpdatedEvent> menuSectionItemUpdatedEvent = default(List<MenuSectionItemUpdatedEvent>), List<MenuSectionItemDeletedEvent> menuSectionItemDeletedEvent = default(List<MenuSectionItemDeletedEvent>), List<MenuItemOptionSetCreatedEvent> menuItemOptionSetCreatedEvent = default(List<MenuItemOptionSetCreatedEvent>), List<MenuItemOptionSetUpdatedEvent> menuItemOptionSetUpdatedEvent = default(List<MenuItemOptionSetUpdatedEvent>), List<MenuItemOptionSetDeletedEvent> menuItemOptionSetDeletedEvent = default(List<MenuItemOptionSetDeletedEvent>), List<MenuItemOptionSetItemCreatedEvent> menuItemOptionSetItemCreatedEvent = default(List<MenuItemOptionSetItemCreatedEvent>), List<MenuItemOptionSetItemUpdatedEvent> menuItemOptionSetItemUpdatedEvent = default(List<MenuItemOptionSetItemUpdatedEvent>), List<MenuItemOptionSetItemDeletedEvent> menuItemOptionSetItemDeletedEvent = default(List<MenuItemOptionSetItemDeletedEvent>), List<MenuCheckpointCreatedEvent> menuCheckpointCreatedEvent = default(List<MenuCheckpointCreatedEvent>), List<StoreGroupCreatedEvent> storeGroupCreatedEvent = default(List<StoreGroupCreatedEvent>), List<StoreGroupUpdatedEvent> storeGroupUpdatedEvent = default(List<StoreGroupUpdatedEvent>), List<StoreGroupDeletedEvent> storeGroupDeletedEvent = default(List<StoreGroupDeletedEvent>), List<CustomerCreatedEvent> customerCreatedEvent = default(List<CustomerCreatedEvent>), List<CustomerUpdatedEvent> customerUpdatedEvent = default(List<CustomerUpdatedEvent>), List<CustomerConsentUpdatedEvent> customerConsentUpdatedEvent = default(List<CustomerConsentUpdatedEvent>), List<WebhookSubscriptionCreatedEvent> webhookSubscriptionCreatedEvent = default(List<WebhookSubscriptionCreatedEvent>), List<WebhookSubscriptionUpdatedEvent> webhookSubscriptionUpdatedEvent = default(List<WebhookSubscriptionUpdatedEvent>), List<WebhookSubscriptionDeletedEvent> webhookSubscriptionDeletedEvent = default(List<WebhookSubscriptionDeletedEvent>), List<PrinterTurnedOnEvent> printerTurnedOnEvent = default(List<PrinterTurnedOnEvent>), List<PrinterTurnedOffEvent> printerTurnedOffEvent = default(List<PrinterTurnedOffEvent>), List<PrinterAssignedToStoreEvent> printerAssignedToStoreEvent = default(List<PrinterAssignedToStoreEvent>), List<PrinterUnassignedFromStoreEvent> printerUnassignedFromStoreEvent = default(List<PrinterUnassignedFromStoreEvent>), List<PhoneCallStartedEvent> phoneCallStartedEvent = default(List<PhoneCallStartedEvent>), List<PhoneCallEndedEvent> phoneCallEndedEvent = default(List<PhoneCallEndedEvent>), List<TelephonyConfigUpdatedEvent> telephonyConfigUpdatedEvent = default(List<TelephonyConfigUpdatedEvent>), List<ChannelStoresUpdatedEvent> channelStoresUpdatedEvent = default(List<ChannelStoresUpdatedEvent>), List<LoyaltyCampaignCreatedEvent> loyaltyCampaignCreatedEvent = default(List<LoyaltyCampaignCreatedEvent>), List<LoyaltyCampaignDeletedEvent> loyaltyCampaignDeletedEvent = default(List<LoyaltyCampaignDeletedEvent>), List<LoyaltyCampaignUpdatedEvent> loyaltyCampaignUpdatedEvent = default(List<LoyaltyCampaignUpdatedEvent>), List<RetentionCampaignCreatedEvent> retentionCampaignCreatedEvent = default(List<RetentionCampaignCreatedEvent>), List<RetentionCampaignDeletedEvent> retentionCampaignDeletedEvent = default(List<RetentionCampaignDeletedEvent>), List<RetentionCampaignUpdatedEvent> retentionCampaignUpdatedEvent = default(List<RetentionCampaignUpdatedEvent>), List<SmsReceivedEvent> smsReceivedEvent = default(List<SmsReceivedEvent>), List<UserLoginEvent> userLoginEvent = default(List<UserLoginEvent>), List<UserCreatedEvent> userCreatedEvent = default(List<UserCreatedEvent>), List<UserUpdatedEvent> userUpdatedEvent = default(List<UserUpdatedEvent>), List<UserDeletedEvent> userDeletedEvent = default(List<UserDeletedEvent>), List<UserPasswordCreatedEvent> userCreatedPasswordEvent = default(List<UserPasswordCreatedEvent>), List<UserAnsweredSignupQuestionsEvent> userAnsweredSignupQuestionsEvent = default(List<UserAnsweredSignupQuestionsEvent>), List<VoucherCreatedEvent> voucherCreatedEvent = default(List<VoucherCreatedEvent>), List<VoucherUpdatedEvent> voucherUpdatedEvent = default(List<VoucherUpdatedEvent>), List<VoucherDeletedEvent> voucherDeletedEvent = default(List<VoucherDeletedEvent>), List<VoucherAppliedEvent> voucherAppliedEvent = default(List<VoucherAppliedEvent>), List<TeammateInviteSentEvent> teammateInviteSentEvent = default(List<TeammateInviteSentEvent>), List<TeammateInviteAcceptedEvent> teammateInviteAcceptedEvent = default(List<TeammateInviteAcceptedEvent>), List<TeammateUpdatedEvent> teammateUpdatedEvent = default(List<TeammateUpdatedEvent>), List<TeammateDeletedEvent> teammateDeletedEvent = default(List<TeammateDeletedEvent>), List<BankAccountCreatedEvent> bankAccountCreatedEvent = default(List<BankAccountCreatedEvent>), List<BankAccountUpdatedEvent> bankAccountUpdatedEvent = default(List<BankAccountUpdatedEvent>), List<BankAccountDeletedEvent> bankAccountDeletedEvent = default(List<BankAccountDeletedEvent>), List<BankAccountAssignedEvent> bankAccountAssignedEvent = default(List<BankAccountAssignedEvent>), List<HydraAssignedEvent> hydraAssignedEvent = default(List<HydraAssignedEvent>), List<HydraCreatedEvent> hydraCreatedEvent = default(List<HydraCreatedEvent>), List<HydraRequestResetEvent> hydraRequestResetEvent = default(List<HydraRequestResetEvent>), List<HydraStoreAssignedEvent> hydraStoreAssignedEvent = default(List<HydraStoreAssignedEvent>), List<HydraStoreUnassignedEvent> hydraStoreUnassignedEvent = default(List<HydraStoreUnassignedEvent>), List<HydraSettingChangedEvent> hydraSettingChangedEvent = default(List<HydraSettingChangedEvent>), List<HydraUnAssignedEvent> hydraUnAssignedEvent = default(List<HydraUnAssignedEvent>), List<HydraConnectionStatusChangedEvent> hydraConnectionStatusChangedEvent = default(List<HydraConnectionStatusChangedEvent>), List<KioskBluetoothPairingModeEvent> kioskBluetoothPairingModeEvent = default(List<KioskBluetoothPairingModeEvent>), List<KioskBluetoothUnpairingModeEvent> kioskBluetoothUnpairingModeEvent = default(List<KioskBluetoothUnpairingModeEvent>), List<KioskBluetoothTerminalUnpairedEvent> kioskBluetoothTerminalUnpairedEvent = default(List<KioskBluetoothTerminalUnpairedEvent>), List<KioskTerminalActionStateChangedEvent> kioskTerminalActionStateChangedEvent = default(List<KioskTerminalActionStateChangedEvent>), List<KioskBluetoothTerminalUpdatedEvent> kioskBluetoothTerminalUpdatedEvent = default(List<KioskBluetoothTerminalUpdatedEvent>), List<KioskBluetoothTerminalInitiateUpdateCheckEvent> kioskBluetoothTerminalInitiateUpdateCheckEvent = default(List<KioskBluetoothTerminalInitiateUpdateCheckEvent>), List<KioskBluetoothInstallUpdateInitiateEvent> kioskBluetoothInstallUpdateInitiateEvent = default(List<KioskBluetoothInstallUpdateInitiateEvent>), List<KioskBluetoothTerminalCancelUpdateEvent> kioskBluetoothTerminalCancelUpdateEvent = default(List<KioskBluetoothTerminalCancelUpdateEvent>), List<KioskBluetoothTerminalFirmwareVersionStatusEvent> kioskBluetoothTerminalFirmwareVersionStatusEvent = default(List<KioskBluetoothTerminalFirmwareVersionStatusEvent>), List<KioskBluetoothTerminalInstallationStatusEvent> kioskBluetoothTerminalInstallationStatusEvent = default(List<KioskBluetoothTerminalInstallationStatusEvent>), List<PushNotificationScheduledEvent> pushNotificationScheduledEvent = default(List<PushNotificationScheduledEvent>), List<PushNotificationSentEvent> pushNotificationSentEvent = default(List<PushNotificationSentEvent>), List<PushNotificationDeletedEvent> pushNotificationDeletedEvent = default(List<PushNotificationDeletedEvent>), List<DnsVerifiedEvent> dnsVerifiedEvent = default(List<DnsVerifiedEvent>), List<CertificateCreatedEvent> certificateCreatedEvent = default(List<CertificateCreatedEvent>), List<CertificateRenewedEvent> certificateRenewedEvent = default(List<CertificateRenewedEvent>), List<WebsiteVanityUrlUpdatedEvent> websiteVanityUrlUpdatedEvent = default(List<WebsiteVanityUrlUpdatedEvent>), List<WebsiteUpdatedEvent> websiteUpdatedEvent = default(List<WebsiteUpdatedEvent>), List<OrderCapacityConfigUpdatedEvent> orderCapacityUpdatedEvent = default(List<OrderCapacityConfigUpdatedEvent>), List<ExternalStoreEvent> externalStoreEvent = default(List<ExternalStoreEvent>), List<OrderFulfillmentStatusUpdatedEvent> orderFulfillmentStatusUpdatedEvent = default(List<OrderFulfillmentStatusUpdatedEvent>), List<AppStoreConfigCreatedEvent> appStoreConfigCreatedEvent = default(List<AppStoreConfigCreatedEvent>), List<AppStoreConfigUpdatedEvent> appStoreConfigUpdatedEvent = default(List<AppStoreConfigUpdatedEvent>), List<AppStoreConfigDeletedEvent> appStoreConfigDeletedEvent = default(List<AppStoreConfigDeletedEvent>), List<AppStoreSubscriptionChangeJobUpdatedEvent> appStoreSubscriptionChangeJobUpdatedEvent = default(List<AppStoreSubscriptionChangeJobUpdatedEvent>), List<CatalogItemCreatedEvent> catalogItemCreatedEvent = default(List<CatalogItemCreatedEvent>), List<CatalogItemUpdatedEvent> catalogItemUpdatedEvent = default(List<CatalogItemUpdatedEvent>), List<CatalogItemArchivedEvent> catalogItemArchivedEvent = default(List<CatalogItemArchivedEvent>), List<CatalogGroupCreatedEvent> catalogGroupCreatedEvent = default(List<CatalogGroupCreatedEvent>), List<CatalogGroupUpdatedEvent> catalogGroupUpdatedEvent = default(List<CatalogGroupUpdatedEvent>), List<CatalogGroupArchivedEvent> catalogGroupArchivedEvent = default(List<CatalogGroupArchivedEvent>), List<StoreTipUpdatedEvent> storeTipUpdatedEvent = default(List<StoreTipUpdatedEvent>), List<LocationAreaCreatedEvent> locationAreaCreatedEvent = default(List<LocationAreaCreatedEvent>), List<LocationAreaUpdatedEvent> locationAreaUpdatedEvent = default(List<LocationAreaUpdatedEvent>), List<LocationCreatedEvent> locationCreatedEvent = default(List<LocationCreatedEvent>), List<LocationDeletedEvent> locationDeletedEvent = default(List<LocationDeletedEvent>), List<StoreServiceChargeUpdatedEvent> storeServiceChargeUpdatedEvent = default(List<StoreServiceChargeUpdatedEvent>), List<MobileAppsSubmissionStatusUpdatedEvent> mobileAppsSubmissionStatusUpdatedEvent = default(List<MobileAppsSubmissionStatusUpdatedEvent>), List<MobileAppsSubmissionUpdatedEvent> mobileAppsSubmissionUpdatedEvent = default(List<MobileAppsSubmissionUpdatedEvent>), List<StoreFeeConfigUpdatedEvent> storeFeeConfigUpdatedEvent = default(List<StoreFeeConfigUpdatedEvent>))
         {
             this.AppCreatedEvent = appCreatedEvent;
             this.AppUpdatedEvent = appUpdatedEvent;
@@ -174,6 +182,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
             this.OrderDispatchedEvent = orderDispatchedEvent;
             this.OrderCustomerTrackingCreatedEvent = orderCustomerTrackingCreatedEvent;
             this.OrderDeliveryTrackingStatusUpdatedEvent = orderDeliveryTrackingStatusUpdatedEvent;
+            this.OrderBatchPublishedEvent = orderBatchPublishedEvent;
             this.OrderCreatedEvent = orderCreatedEvent;
             this.OrderRatingUpdatedEvent = orderRatingUpdatedEvent;
             this.OrderRefundedEvent = orderRefundedEvent;
@@ -201,6 +210,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
             this.StoreLogoUpdatedEvent = storeLogoUpdatedEvent;
             this.StoreLogoDeletedEvent = storeLogoDeletedEvent;
             this.MenuCreatedEvent = menuCreatedEvent;
+            this.MenuAsyncCreationCompletedEvent = menuAsyncCreationCompletedEvent;
             this.MenuUpdatedEvent = menuUpdatedEvent;
             this.MenuUploadedEvent = menuUploadedEvent;
             this.MenuBulkEditEvent = menuBulkEditEvent;
@@ -232,6 +242,8 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
             this.PrinterUnassignedFromStoreEvent = printerUnassignedFromStoreEvent;
             this.PhoneCallStartedEvent = phoneCallStartedEvent;
             this.PhoneCallEndedEvent = phoneCallEndedEvent;
+            this.TelephonyConfigUpdatedEvent = telephonyConfigUpdatedEvent;
+            this.ChannelStoresUpdatedEvent = channelStoresUpdatedEvent;
             this.LoyaltyCampaignCreatedEvent = loyaltyCampaignCreatedEvent;
             this.LoyaltyCampaignDeletedEvent = loyaltyCampaignDeletedEvent;
             this.LoyaltyCampaignUpdatedEvent = loyaltyCampaignUpdatedEvent;
@@ -248,6 +260,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
             this.VoucherCreatedEvent = voucherCreatedEvent;
             this.VoucherUpdatedEvent = voucherUpdatedEvent;
             this.VoucherDeletedEvent = voucherDeletedEvent;
+            this.VoucherAppliedEvent = voucherAppliedEvent;
             this.TeammateInviteSentEvent = teammateInviteSentEvent;
             this.TeammateInviteAcceptedEvent = teammateInviteAcceptedEvent;
             this.TeammateUpdatedEvent = teammateUpdatedEvent;
@@ -257,6 +270,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
             this.BankAccountDeletedEvent = bankAccountDeletedEvent;
             this.BankAccountAssignedEvent = bankAccountAssignedEvent;
             this.HydraAssignedEvent = hydraAssignedEvent;
+            this.HydraCreatedEvent = hydraCreatedEvent;
             this.HydraRequestResetEvent = hydraRequestResetEvent;
             this.HydraStoreAssignedEvent = hydraStoreAssignedEvent;
             this.HydraStoreUnassignedEvent = hydraStoreUnassignedEvent;
@@ -287,6 +301,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
             this.AppStoreConfigCreatedEvent = appStoreConfigCreatedEvent;
             this.AppStoreConfigUpdatedEvent = appStoreConfigUpdatedEvent;
             this.AppStoreConfigDeletedEvent = appStoreConfigDeletedEvent;
+            this.AppStoreSubscriptionChangeJobUpdatedEvent = appStoreSubscriptionChangeJobUpdatedEvent;
             this.CatalogItemCreatedEvent = catalogItemCreatedEvent;
             this.CatalogItemUpdatedEvent = catalogItemUpdatedEvent;
             this.CatalogItemArchivedEvent = catalogItemArchivedEvent;
@@ -299,6 +314,9 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
             this.LocationCreatedEvent = locationCreatedEvent;
             this.LocationDeletedEvent = locationDeletedEvent;
             this.StoreServiceChargeUpdatedEvent = storeServiceChargeUpdatedEvent;
+            this.MobileAppsSubmissionStatusUpdatedEvent = mobileAppsSubmissionStatusUpdatedEvent;
+            this.MobileAppsSubmissionUpdatedEvent = mobileAppsSubmissionUpdatedEvent;
+            this.StoreFeeConfigUpdatedEvent = storeFeeConfigUpdatedEvent;
         }
         
         /// <summary>
@@ -350,6 +368,13 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         [DataMember(Name="OrderDeliveryTrackingStatusUpdatedEvent", EmitDefaultValue=false)]
         public List<OrderDeliveryTrackingStatusUpdatedEvent> OrderDeliveryTrackingStatusUpdatedEvent { get; set; }
 
+        /// <summary>
+        /// Order Batch published event
+        /// </summary>
+        /// <value>Order Batch published event</value>
+        [DataMember(Name="OrderBatchPublishedEvent", EmitDefaultValue=false)]
+        public List<OrderBatchPublishedEvent> OrderBatchPublishedEvent { get; set; }
+
         /// <summary>
         /// Order created events
         /// </summary>
@@ -539,6 +564,13 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         [DataMember(Name="MenuCreatedEvent", EmitDefaultValue=false)]
         public List<MenuCreatedEvent> MenuCreatedEvent { get; set; }
 
+        /// <summary>
+        /// Menu async creation completed events
+        /// </summary>
+        /// <value>Menu async creation completed events</value>
+        [DataMember(Name="MenuAsyncCreationCompletedEvent", EmitDefaultValue=false)]
+        public List<MenuAsyncCreationCompletedEvent> MenuAsyncCreationCompletedEvent { get; set; }
+
         /// <summary>
         /// Menu updated events
         /// </summary>
@@ -756,6 +788,20 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         [DataMember(Name="PhoneCallEndedEvent", EmitDefaultValue=false)]
         public List<PhoneCallEndedEvent> PhoneCallEndedEvent { get; set; }
 
+        /// <summary>
+        /// Telephony config updated event
+        /// </summary>
+        /// <value>Telephony config updated event</value>
+        [DataMember(Name="TelephonyConfigUpdatedEvent", EmitDefaultValue=false)]
+        public List<TelephonyConfigUpdatedEvent> TelephonyConfigUpdatedEvent { get; set; }
+
+        /// <summary>
+        /// Channel stores updated event
+        /// </summary>
+        /// <value>Channel stores updated event</value>
+        [DataMember(Name="ChannelStoresUpdatedEvent", EmitDefaultValue=false)]
+        public List<ChannelStoresUpdatedEvent> ChannelStoresUpdatedEvent { get; set; }
+
         /// <summary>
         /// Loyalty campaign created event
         /// </summary>
@@ -868,6 +914,13 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         [DataMember(Name="VoucherDeletedEvent", EmitDefaultValue=false)]
         public List<VoucherDeletedEvent> VoucherDeletedEvent { get; set; }
 
+        /// <summary>
+        /// Voucher applied event
+        /// </summary>
+        /// <value>Voucher applied event</value>
+        [DataMember(Name="VoucherAppliedEvent", EmitDefaultValue=false)]
+        public List<VoucherAppliedEvent> VoucherAppliedEvent { get; set; }
+
         /// <summary>
         /// Teammate invite sent event
         /// </summary>
@@ -922,7 +975,7 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         /// </summary>
         /// <value>Bank account assigned event</value>
         [DataMember(Name="BankAccountAssignedEvent", EmitDefaultValue=false)]
-        public List<BankAccountDeletedEvent> BankAccountAssignedEvent { get; set; }
+        public List<BankAccountAssignedEvent> BankAccountAssignedEvent { get; set; }
 
         /// <summary>
         /// Hydra assigned event
@@ -931,6 +984,13 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         [DataMember(Name="HydraAssignedEvent", EmitDefaultValue=false)]
         public List<HydraAssignedEvent> HydraAssignedEvent { get; set; }
 
+        /// <summary>
+        /// Hydra created event
+        /// </summary>
+        /// <value>Hydra created event</value>
+        [DataMember(Name="HydraCreatedEvent", EmitDefaultValue=false)]
+        public List<HydraCreatedEvent> HydraCreatedEvent { get; set; }
+
         /// <summary>
         /// Hydra reset requested event
         /// </summary>
@@ -1141,6 +1201,13 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         [DataMember(Name="AppStoreConfigDeletedEvent", EmitDefaultValue=false)]
         public List<AppStoreConfigDeletedEvent> AppStoreConfigDeletedEvent { get; set; }
 
+        /// <summary>
+        /// App Store Subscription Change Job Updated
+        /// </summary>
+        /// <value>App Store Subscription Change Job Updated</value>
+        [DataMember(Name="AppStoreSubscriptionChangeJobUpdatedEvent", EmitDefaultValue=false)]
+        public List<AppStoreSubscriptionChangeJobUpdatedEvent> AppStoreSubscriptionChangeJobUpdatedEvent { get; set; }
+
         /// <summary>
         /// Catalog Item Created
         /// </summary>
@@ -1225,6 +1292,27 @@ public partial class EventSearchResult :  IEquatable<EventSearchResult>, IValida
         [DataMember(Name="StoreServiceChargeUpdatedEvent", EmitDefaultValue=false)]
         public List<StoreServiceChargeUpdatedEvent> StoreServiceChargeUpdatedEvent { get; set; }
 
+        /// <summary>
+        /// Mobile Submission Status Updated Event
+        /// </summary>
+        /// <value>Mobile Submission Status Updated Event</value>
+        [DataMember(Name="MobileAppsSubmissionStatusUpdatedEvent", EmitDefaultValue=false)]
+        public List<MobileAppsSubmissionStatusUpdatedEvent> MobileAppsSubmissionStatusUpdatedEvent { get; set; }
+
+        /// <summary>
+        /// Mobile Submission Updated Event
+        /// </summary>
+        /// <value>Mobile Submission Updated Event</value>
+        [DataMember(Name="MobileAppsSubmissionUpdatedEvent", EmitDefaultValue=false)]
+        public List<MobileAppsSubmissionUpdatedEvent> MobileAppsSubmissionUpdatedEvent { get; set; }
+
+        /// <summary>
+        /// Store Fee Config Updated Event
+        /// </summary>
+        /// <value>Store Fee Config Updated Event</value>
+        [DataMember(Name="StoreFeeConfigUpdatedEvent", EmitDefaultValue=false)]
+        public List<StoreFeeConfigUpdatedEvent> StoreFeeConfigUpdatedEvent { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -1240,6 +1328,7 @@ public override string ToString()
             sb.Append("  OrderDispatchedEvent: ").Append(OrderDispatchedEvent).Append("\n");
             sb.Append("  OrderCustomerTrackingCreatedEvent: ").Append(OrderCustomerTrackingCreatedEvent).Append("\n");
             sb.Append("  OrderDeliveryTrackingStatusUpdatedEvent: ").Append(OrderDeliveryTrackingStatusUpdatedEvent).Append("\n");
+            sb.Append("  OrderBatchPublishedEvent: ").Append(OrderBatchPublishedEvent).Append("\n");
             sb.Append("  OrderCreatedEvent: ").Append(OrderCreatedEvent).Append("\n");
             sb.Append("  OrderRatingUpdatedEvent: ").Append(OrderRatingUpdatedEvent).Append("\n");
             sb.Append("  OrderRefundedEvent: ").Append(OrderRefundedEvent).Append("\n");
@@ -1267,6 +1356,7 @@ public override string ToString()
             sb.Append("  StoreLogoUpdatedEvent: ").Append(StoreLogoUpdatedEvent).Append("\n");
             sb.Append("  StoreLogoDeletedEvent: ").Append(StoreLogoDeletedEvent).Append("\n");
             sb.Append("  MenuCreatedEvent: ").Append(MenuCreatedEvent).Append("\n");
+            sb.Append("  MenuAsyncCreationCompletedEvent: ").Append(MenuAsyncCreationCompletedEvent).Append("\n");
             sb.Append("  MenuUpdatedEvent: ").Append(MenuUpdatedEvent).Append("\n");
             sb.Append("  MenuUploadedEvent: ").Append(MenuUploadedEvent).Append("\n");
             sb.Append("  MenuBulkEditEvent: ").Append(MenuBulkEditEvent).Append("\n");
@@ -1298,6 +1388,8 @@ public override string ToString()
             sb.Append("  PrinterUnassignedFromStoreEvent: ").Append(PrinterUnassignedFromStoreEvent).Append("\n");
             sb.Append("  PhoneCallStartedEvent: ").Append(PhoneCallStartedEvent).Append("\n");
             sb.Append("  PhoneCallEndedEvent: ").Append(PhoneCallEndedEvent).Append("\n");
+            sb.Append("  TelephonyConfigUpdatedEvent: ").Append(TelephonyConfigUpdatedEvent).Append("\n");
+            sb.Append("  ChannelStoresUpdatedEvent: ").Append(ChannelStoresUpdatedEvent).Append("\n");
             sb.Append("  LoyaltyCampaignCreatedEvent: ").Append(LoyaltyCampaignCreatedEvent).Append("\n");
             sb.Append("  LoyaltyCampaignDeletedEvent: ").Append(LoyaltyCampaignDeletedEvent).Append("\n");
             sb.Append("  LoyaltyCampaignUpdatedEvent: ").Append(LoyaltyCampaignUpdatedEvent).Append("\n");
@@ -1314,6 +1406,7 @@ public override string ToString()
             sb.Append("  VoucherCreatedEvent: ").Append(VoucherCreatedEvent).Append("\n");
             sb.Append("  VoucherUpdatedEvent: ").Append(VoucherUpdatedEvent).Append("\n");
             sb.Append("  VoucherDeletedEvent: ").Append(VoucherDeletedEvent).Append("\n");
+            sb.Append("  VoucherAppliedEvent: ").Append(VoucherAppliedEvent).Append("\n");
             sb.Append("  TeammateInviteSentEvent: ").Append(TeammateInviteSentEvent).Append("\n");
             sb.Append("  TeammateInviteAcceptedEvent: ").Append(TeammateInviteAcceptedEvent).Append("\n");
             sb.Append("  TeammateUpdatedEvent: ").Append(TeammateUpdatedEvent).Append("\n");
@@ -1323,6 +1416,7 @@ public override string ToString()
             sb.Append("  BankAccountDeletedEvent: ").Append(BankAccountDeletedEvent).Append("\n");
             sb.Append("  BankAccountAssignedEvent: ").Append(BankAccountAssignedEvent).Append("\n");
             sb.Append("  HydraAssignedEvent: ").Append(HydraAssignedEvent).Append("\n");
+            sb.Append("  HydraCreatedEvent: ").Append(HydraCreatedEvent).Append("\n");
             sb.Append("  HydraRequestResetEvent: ").Append(HydraRequestResetEvent).Append("\n");
             sb.Append("  HydraStoreAssignedEvent: ").Append(HydraStoreAssignedEvent).Append("\n");
             sb.Append("  HydraStoreUnassignedEvent: ").Append(HydraStoreUnassignedEvent).Append("\n");
@@ -1353,6 +1447,7 @@ public override string ToString()
             sb.Append("  AppStoreConfigCreatedEvent: ").Append(AppStoreConfigCreatedEvent).Append("\n");
             sb.Append("  AppStoreConfigUpdatedEvent: ").Append(AppStoreConfigUpdatedEvent).Append("\n");
             sb.Append("  AppStoreConfigDeletedEvent: ").Append(AppStoreConfigDeletedEvent).Append("\n");
+            sb.Append("  AppStoreSubscriptionChangeJobUpdatedEvent: ").Append(AppStoreSubscriptionChangeJobUpdatedEvent).Append("\n");
             sb.Append("  CatalogItemCreatedEvent: ").Append(CatalogItemCreatedEvent).Append("\n");
             sb.Append("  CatalogItemUpdatedEvent: ").Append(CatalogItemUpdatedEvent).Append("\n");
             sb.Append("  CatalogItemArchivedEvent: ").Append(CatalogItemArchivedEvent).Append("\n");
@@ -1365,6 +1460,9 @@ public override string ToString()
             sb.Append("  LocationCreatedEvent: ").Append(LocationCreatedEvent).Append("\n");
             sb.Append("  LocationDeletedEvent: ").Append(LocationDeletedEvent).Append("\n");
             sb.Append("  StoreServiceChargeUpdatedEvent: ").Append(StoreServiceChargeUpdatedEvent).Append("\n");
+            sb.Append("  MobileAppsSubmissionStatusUpdatedEvent: ").Append(MobileAppsSubmissionStatusUpdatedEvent).Append("\n");
+            sb.Append("  MobileAppsSubmissionUpdatedEvent: ").Append(MobileAppsSubmissionUpdatedEvent).Append("\n");
+            sb.Append("  StoreFeeConfigUpdatedEvent: ").Append(StoreFeeConfigUpdatedEvent).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -1434,6 +1532,11 @@ public bool Equals(EventSearchResult input)
                     this.OrderDeliveryTrackingStatusUpdatedEvent != null &&
                     this.OrderDeliveryTrackingStatusUpdatedEvent.SequenceEqual(input.OrderDeliveryTrackingStatusUpdatedEvent)
                 ) && 
+                (
+                    this.OrderBatchPublishedEvent == input.OrderBatchPublishedEvent ||
+                    this.OrderBatchPublishedEvent != null &&
+                    this.OrderBatchPublishedEvent.SequenceEqual(input.OrderBatchPublishedEvent)
+                ) && 
                 (
                     this.OrderCreatedEvent == input.OrderCreatedEvent ||
                     this.OrderCreatedEvent != null &&
@@ -1569,6 +1672,11 @@ public bool Equals(EventSearchResult input)
                     this.MenuCreatedEvent != null &&
                     this.MenuCreatedEvent.SequenceEqual(input.MenuCreatedEvent)
                 ) && 
+                (
+                    this.MenuAsyncCreationCompletedEvent == input.MenuAsyncCreationCompletedEvent ||
+                    this.MenuAsyncCreationCompletedEvent != null &&
+                    this.MenuAsyncCreationCompletedEvent.SequenceEqual(input.MenuAsyncCreationCompletedEvent)
+                ) && 
                 (
                     this.MenuUpdatedEvent == input.MenuUpdatedEvent ||
                     this.MenuUpdatedEvent != null &&
@@ -1724,6 +1832,16 @@ public bool Equals(EventSearchResult input)
                     this.PhoneCallEndedEvent != null &&
                     this.PhoneCallEndedEvent.SequenceEqual(input.PhoneCallEndedEvent)
                 ) && 
+                (
+                    this.TelephonyConfigUpdatedEvent == input.TelephonyConfigUpdatedEvent ||
+                    this.TelephonyConfigUpdatedEvent != null &&
+                    this.TelephonyConfigUpdatedEvent.SequenceEqual(input.TelephonyConfigUpdatedEvent)
+                ) && 
+                (
+                    this.ChannelStoresUpdatedEvent == input.ChannelStoresUpdatedEvent ||
+                    this.ChannelStoresUpdatedEvent != null &&
+                    this.ChannelStoresUpdatedEvent.SequenceEqual(input.ChannelStoresUpdatedEvent)
+                ) && 
                 (
                     this.LoyaltyCampaignCreatedEvent == input.LoyaltyCampaignCreatedEvent ||
                     this.LoyaltyCampaignCreatedEvent != null &&
@@ -1804,6 +1922,11 @@ public bool Equals(EventSearchResult input)
                     this.VoucherDeletedEvent != null &&
                     this.VoucherDeletedEvent.SequenceEqual(input.VoucherDeletedEvent)
                 ) && 
+                (
+                    this.VoucherAppliedEvent == input.VoucherAppliedEvent ||
+                    this.VoucherAppliedEvent != null &&
+                    this.VoucherAppliedEvent.SequenceEqual(input.VoucherAppliedEvent)
+                ) && 
                 (
                     this.TeammateInviteSentEvent == input.TeammateInviteSentEvent ||
                     this.TeammateInviteSentEvent != null &&
@@ -1849,6 +1972,11 @@ public bool Equals(EventSearchResult input)
                     this.HydraAssignedEvent != null &&
                     this.HydraAssignedEvent.SequenceEqual(input.HydraAssignedEvent)
                 ) && 
+                (
+                    this.HydraCreatedEvent == input.HydraCreatedEvent ||
+                    this.HydraCreatedEvent != null &&
+                    this.HydraCreatedEvent.SequenceEqual(input.HydraCreatedEvent)
+                ) && 
                 (
                     this.HydraRequestResetEvent == input.HydraRequestResetEvent ||
                     this.HydraRequestResetEvent != null &&
@@ -1999,6 +2127,11 @@ public bool Equals(EventSearchResult input)
                     this.AppStoreConfigDeletedEvent != null &&
                     this.AppStoreConfigDeletedEvent.SequenceEqual(input.AppStoreConfigDeletedEvent)
                 ) && 
+                (
+                    this.AppStoreSubscriptionChangeJobUpdatedEvent == input.AppStoreSubscriptionChangeJobUpdatedEvent ||
+                    this.AppStoreSubscriptionChangeJobUpdatedEvent != null &&
+                    this.AppStoreSubscriptionChangeJobUpdatedEvent.SequenceEqual(input.AppStoreSubscriptionChangeJobUpdatedEvent)
+                ) && 
                 (
                     this.CatalogItemCreatedEvent == input.CatalogItemCreatedEvent ||
                     this.CatalogItemCreatedEvent != null &&
@@ -2058,6 +2191,21 @@ public bool Equals(EventSearchResult input)
                     this.StoreServiceChargeUpdatedEvent == input.StoreServiceChargeUpdatedEvent ||
                     this.StoreServiceChargeUpdatedEvent != null &&
                     this.StoreServiceChargeUpdatedEvent.SequenceEqual(input.StoreServiceChargeUpdatedEvent)
+                ) && 
+                (
+                    this.MobileAppsSubmissionStatusUpdatedEvent == input.MobileAppsSubmissionStatusUpdatedEvent ||
+                    this.MobileAppsSubmissionStatusUpdatedEvent != null &&
+                    this.MobileAppsSubmissionStatusUpdatedEvent.SequenceEqual(input.MobileAppsSubmissionStatusUpdatedEvent)
+                ) && 
+                (
+                    this.MobileAppsSubmissionUpdatedEvent == input.MobileAppsSubmissionUpdatedEvent ||
+                    this.MobileAppsSubmissionUpdatedEvent != null &&
+                    this.MobileAppsSubmissionUpdatedEvent.SequenceEqual(input.MobileAppsSubmissionUpdatedEvent)
+                ) && 
+                (
+                    this.StoreFeeConfigUpdatedEvent == input.StoreFeeConfigUpdatedEvent ||
+                    this.StoreFeeConfigUpdatedEvent != null &&
+                    this.StoreFeeConfigUpdatedEvent.SequenceEqual(input.StoreFeeConfigUpdatedEvent)
                 );
         }
 
@@ -2084,6 +2232,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OrderCustomerTrackingCreatedEvent.GetHashCode();
                 if (this.OrderDeliveryTrackingStatusUpdatedEvent != null)
                     hashCode = hashCode * 59 + this.OrderDeliveryTrackingStatusUpdatedEvent.GetHashCode();
+                if (this.OrderBatchPublishedEvent != null)
+                    hashCode = hashCode * 59 + this.OrderBatchPublishedEvent.GetHashCode();
                 if (this.OrderCreatedEvent != null)
                     hashCode = hashCode * 59 + this.OrderCreatedEvent.GetHashCode();
                 if (this.OrderRatingUpdatedEvent != null)
@@ -2138,6 +2288,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.StoreLogoDeletedEvent.GetHashCode();
                 if (this.MenuCreatedEvent != null)
                     hashCode = hashCode * 59 + this.MenuCreatedEvent.GetHashCode();
+                if (this.MenuAsyncCreationCompletedEvent != null)
+                    hashCode = hashCode * 59 + this.MenuAsyncCreationCompletedEvent.GetHashCode();
                 if (this.MenuUpdatedEvent != null)
                     hashCode = hashCode * 59 + this.MenuUpdatedEvent.GetHashCode();
                 if (this.MenuUploadedEvent != null)
@@ -2200,6 +2352,10 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.PhoneCallStartedEvent.GetHashCode();
                 if (this.PhoneCallEndedEvent != null)
                     hashCode = hashCode * 59 + this.PhoneCallEndedEvent.GetHashCode();
+                if (this.TelephonyConfigUpdatedEvent != null)
+                    hashCode = hashCode * 59 + this.TelephonyConfigUpdatedEvent.GetHashCode();
+                if (this.ChannelStoresUpdatedEvent != null)
+                    hashCode = hashCode * 59 + this.ChannelStoresUpdatedEvent.GetHashCode();
                 if (this.LoyaltyCampaignCreatedEvent != null)
                     hashCode = hashCode * 59 + this.LoyaltyCampaignCreatedEvent.GetHashCode();
                 if (this.LoyaltyCampaignDeletedEvent != null)
@@ -2232,6 +2388,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.VoucherUpdatedEvent.GetHashCode();
                 if (this.VoucherDeletedEvent != null)
                     hashCode = hashCode * 59 + this.VoucherDeletedEvent.GetHashCode();
+                if (this.VoucherAppliedEvent != null)
+                    hashCode = hashCode * 59 + this.VoucherAppliedEvent.GetHashCode();
                 if (this.TeammateInviteSentEvent != null)
                     hashCode = hashCode * 59 + this.TeammateInviteSentEvent.GetHashCode();
                 if (this.TeammateInviteAcceptedEvent != null)
@@ -2250,6 +2408,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.BankAccountAssignedEvent.GetHashCode();
                 if (this.HydraAssignedEvent != null)
                     hashCode = hashCode * 59 + this.HydraAssignedEvent.GetHashCode();
+                if (this.HydraCreatedEvent != null)
+                    hashCode = hashCode * 59 + this.HydraCreatedEvent.GetHashCode();
                 if (this.HydraRequestResetEvent != null)
                     hashCode = hashCode * 59 + this.HydraRequestResetEvent.GetHashCode();
                 if (this.HydraStoreAssignedEvent != null)
@@ -2310,6 +2470,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppStoreConfigUpdatedEvent.GetHashCode();
                 if (this.AppStoreConfigDeletedEvent != null)
                     hashCode = hashCode * 59 + this.AppStoreConfigDeletedEvent.GetHashCode();
+                if (this.AppStoreSubscriptionChangeJobUpdatedEvent != null)
+                    hashCode = hashCode * 59 + this.AppStoreSubscriptionChangeJobUpdatedEvent.GetHashCode();
                 if (this.CatalogItemCreatedEvent != null)
                     hashCode = hashCode * 59 + this.CatalogItemCreatedEvent.GetHashCode();
                 if (this.CatalogItemUpdatedEvent != null)
@@ -2334,19 +2496,15 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.LocationDeletedEvent.GetHashCode();
                 if (this.StoreServiceChargeUpdatedEvent != null)
                     hashCode = hashCode * 59 + this.StoreServiceChargeUpdatedEvent.GetHashCode();
+                if (this.MobileAppsSubmissionStatusUpdatedEvent != null)
+                    hashCode = hashCode * 59 + this.MobileAppsSubmissionStatusUpdatedEvent.GetHashCode();
+                if (this.MobileAppsSubmissionUpdatedEvent != null)
+                    hashCode = hashCode * 59 + this.MobileAppsSubmissionUpdatedEvent.GetHashCode();
+                if (this.StoreFeeConfigUpdatedEvent != null)
+                    hashCode = hashCode * 59 + this.StoreFeeConfigUpdatedEvent.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ExecuteConfigurationActionRequest.cs b/src/Flipdish/Model/ExecuteConfigurationActionRequest.cs
new file mode 100644
index 00000000..30750e5d
--- /dev/null
+++ b/src/Flipdish/Model/ExecuteConfigurationActionRequest.cs
@@ -0,0 +1,128 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// ExecuteConfigurationActionRequest
+    /// </summary>
+    [DataContract]
+    public partial class ExecuteConfigurationActionRequest :  IEquatable<ExecuteConfigurationActionRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExecuteConfigurationActionRequest" /> class.
+        /// </summary>
+        /// <param name="key">key.</param>
+        /// <param name="action">action.</param>
+        public ExecuteConfigurationActionRequest(string key = default(string), string action = default(string))
+        {
+            this.Key = key;
+            this.Action = action;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Key
+        /// </summary>
+        [DataMember(Name="Key", EmitDefaultValue=false)]
+        public string Key { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Action
+        /// </summary>
+        [DataMember(Name="Action", EmitDefaultValue=false)]
+        public string Action { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ExecuteConfigurationActionRequest {\n");
+            sb.Append("  Key: ").Append(Key).Append("\n");
+            sb.Append("  Action: ").Append(Action).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ExecuteConfigurationActionRequest);
+        }
+
+        /// <summary>
+        /// Returns true if ExecuteConfigurationActionRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ExecuteConfigurationActionRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ExecuteConfigurationActionRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Key == input.Key ||
+                    (this.Key != null &&
+                    this.Key.Equals(input.Key))
+                ) && 
+                (
+                    this.Action == input.Action ||
+                    (this.Action != null &&
+                    this.Action.Equals(input.Action))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Key != null)
+                    hashCode = hashCode * 59 + this.Key.GetHashCode();
+                if (this.Action != null)
+                    hashCode = hashCode * 59 + this.Action.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ExecuteConfigurationActionResult.cs b/src/Flipdish/Model/ExecuteConfigurationActionResult.cs
new file mode 100644
index 00000000..bc54c343
--- /dev/null
+++ b/src/Flipdish/Model/ExecuteConfigurationActionResult.cs
@@ -0,0 +1,186 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// ExecuteConfigurationActionResult
+    /// </summary>
+    [DataContract]
+    public partial class ExecuteConfigurationActionResult :  IEquatable<ExecuteConfigurationActionResult>
+    {
+        /// <summary>
+        /// Defines RedirectTarget
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum RedirectTargetEnum
+        {
+            
+            /// <summary>
+            /// Enum Default for value: Default
+            /// </summary>
+            [EnumMember(Value = "Default")]
+            Default = 1,
+            
+            /// <summary>
+            /// Enum NewWindow for value: NewWindow
+            /// </summary>
+            [EnumMember(Value = "NewWindow")]
+            NewWindow = 2,
+            
+            /// <summary>
+            /// Enum Popup for value: Popup
+            /// </summary>
+            [EnumMember(Value = "Popup")]
+            Popup = 3
+        }
+
+        /// <summary>
+        /// Gets or Sets RedirectTarget
+        /// </summary>
+        [DataMember(Name="RedirectTarget", EmitDefaultValue=false)]
+        public RedirectTargetEnum? RedirectTarget { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExecuteConfigurationActionResult" /> class.
+        /// </summary>
+        /// <param name="errorMessage">errorMessage.</param>
+        /// <param name="infoMessage">infoMessage.</param>
+        /// <param name="redirectUrl">redirectUrl.</param>
+        /// <param name="redirectTarget">redirectTarget.</param>
+        public ExecuteConfigurationActionResult(string errorMessage = default(string), string infoMessage = default(string), string redirectUrl = default(string), RedirectTargetEnum? redirectTarget = default(RedirectTargetEnum?))
+        {
+            this.ErrorMessage = errorMessage;
+            this.InfoMessage = infoMessage;
+            this.RedirectUrl = redirectUrl;
+            this.RedirectTarget = redirectTarget;
+        }
+        
+        /// <summary>
+        /// Gets or Sets ErrorMessage
+        /// </summary>
+        [DataMember(Name="ErrorMessage", EmitDefaultValue=false)]
+        public string ErrorMessage { get; set; }
+
+        /// <summary>
+        /// Gets or Sets InfoMessage
+        /// </summary>
+        [DataMember(Name="InfoMessage", EmitDefaultValue=false)]
+        public string InfoMessage { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RedirectUrl
+        /// </summary>
+        [DataMember(Name="RedirectUrl", EmitDefaultValue=false)]
+        public string RedirectUrl { get; set; }
+
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ExecuteConfigurationActionResult {\n");
+            sb.Append("  ErrorMessage: ").Append(ErrorMessage).Append("\n");
+            sb.Append("  InfoMessage: ").Append(InfoMessage).Append("\n");
+            sb.Append("  RedirectUrl: ").Append(RedirectUrl).Append("\n");
+            sb.Append("  RedirectTarget: ").Append(RedirectTarget).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ExecuteConfigurationActionResult);
+        }
+
+        /// <summary>
+        /// Returns true if ExecuteConfigurationActionResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ExecuteConfigurationActionResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ExecuteConfigurationActionResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.ErrorMessage == input.ErrorMessage ||
+                    (this.ErrorMessage != null &&
+                    this.ErrorMessage.Equals(input.ErrorMessage))
+                ) && 
+                (
+                    this.InfoMessage == input.InfoMessage ||
+                    (this.InfoMessage != null &&
+                    this.InfoMessage.Equals(input.InfoMessage))
+                ) && 
+                (
+                    this.RedirectUrl == input.RedirectUrl ||
+                    (this.RedirectUrl != null &&
+                    this.RedirectUrl.Equals(input.RedirectUrl))
+                ) && 
+                (
+                    this.RedirectTarget == input.RedirectTarget ||
+                    (this.RedirectTarget != null &&
+                    this.RedirectTarget.Equals(input.RedirectTarget))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.ErrorMessage != null)
+                    hashCode = hashCode * 59 + this.ErrorMessage.GetHashCode();
+                if (this.InfoMessage != null)
+                    hashCode = hashCode * 59 + this.InfoMessage.GetHashCode();
+                if (this.RedirectUrl != null)
+                    hashCode = hashCode * 59 + this.RedirectUrl.GetHashCode();
+                if (this.RedirectTarget != null)
+                    hashCode = hashCode * 59 + this.RedirectTarget.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ExternalStoreAuditLog.cs b/src/Flipdish/Model/ExternalStoreAuditLog.cs
index 1aa3014a..80222e00 100644
--- a/src/Flipdish/Model/ExternalStoreAuditLog.cs
+++ b/src/Flipdish/Model/ExternalStoreAuditLog.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// External event
     /// </summary>
     [DataContract]
-    public partial class ExternalStoreAuditLog :  IEquatable<ExternalStoreAuditLog>, IValidatableObject
+    public partial class ExternalStoreAuditLog :  IEquatable<ExternalStoreAuditLog>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ExternalStoreAuditLog" /> class.
@@ -348,16 +346,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ExternalStoreEvent.cs b/src/Flipdish/Model/ExternalStoreEvent.cs
index 8474cd21..d3da3783 100644
--- a/src/Flipdish/Model/ExternalStoreEvent.cs
+++ b/src/Flipdish/Model/ExternalStoreEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// External event
     /// </summary>
     [DataContract]
-    public partial class ExternalStoreEvent :  IEquatable<ExternalStoreEvent>, IValidatableObject
+    public partial class ExternalStoreEvent :  IEquatable<ExternalStoreEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ExternalStoreEvent" /> class.
@@ -51,8 +49,11 @@ public partial class ExternalStoreEvent :  IEquatable<ExternalStoreEvent>, IVali
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public ExternalStoreEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), string descriptionFormat = default(string), string descriptionFields = default(string), string descriptionId = default(string), string ref1 = default(string), string ref2 = default(string), string ref3 = default(string), string ref4 = default(string), int? orderId = default(int?), List<string> tags = default(List<string>), List<FieldChangeInformation> fieldChanges = default(List<FieldChangeInformation>), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public ExternalStoreEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), string descriptionFormat = default(string), string descriptionFields = default(string), string descriptionId = default(string), string ref1 = default(string), string ref2 = default(string), string ref3 = default(string), string ref4 = default(string), int? orderId = default(int?), List<string> tags = default(List<string>), List<FieldChangeInformation> fieldChanges = default(List<FieldChangeInformation>), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -72,7 +73,10 @@ public partial class ExternalStoreEvent :  IEquatable<ExternalStoreEvent>, IVali
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -201,6 +205,13 @@ public partial class ExternalStoreEvent :  IEquatable<ExternalStoreEvent>, IVali
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -208,6 +219,20 @@ public partial class ExternalStoreEvent :  IEquatable<ExternalStoreEvent>, IVali
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -234,7 +259,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -359,10 +387,25 @@ public bool Equals(ExternalStoreEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -411,21 +454,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FeeSummary.cs b/src/Flipdish/Model/FeeSummary.cs
index 739035b2..2485a3fa 100644
--- a/src/Flipdish/Model/FeeSummary.cs
+++ b/src/Flipdish/Model/FeeSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Fee Summary
     /// </summary>
     [DataContract]
-    public partial class FeeSummary :  IEquatable<FeeSummary>, IValidatableObject
+    public partial class FeeSummary :  IEquatable<FeeSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FeeSummary" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Field.cs b/src/Flipdish/Model/Field.cs
index d5ce5d6e..4d342ce7 100644
--- a/src/Flipdish/Model/Field.cs
+++ b/src/Flipdish/Model/Field.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,11 @@ namespace Flipdish.Model
     /// Field
     /// </summary>
     [DataContract]
-    public partial class Field :  IEquatable<Field>, IValidatableObject
+    public partial class Field :  IEquatable<Field>
     {
         /// <summary>
-        /// Field Type
+        /// Defines FieldType
         /// </summary>
-        /// <value>Field Type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum FieldTypeEnum
         {
@@ -90,13 +87,18 @@ public enum FieldTypeEnum
             /// Enum Boolean for value: Boolean
             /// </summary>
             [EnumMember(Value = "Boolean")]
-            Boolean = 9
+            Boolean = 9,
+            
+            /// <summary>
+            /// Enum ActionButton for value: ActionButton
+            /// </summary>
+            [EnumMember(Value = "ActionButton")]
+            ActionButton = 10
         }
 
         /// <summary>
-        /// Field Type
+        /// Gets or Sets FieldType
         /// </summary>
-        /// <value>Field Type</value>
         [DataMember(Name="FieldType", EmitDefaultValue=false)]
         public FieldTypeEnum FieldType { get; set; }
         /// <summary>
@@ -107,16 +109,17 @@ protected Field() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="Field" /> class.
         /// </summary>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="key">Key (required).</param>
-        /// <param name="tooltip">Tooltip.</param>
-        /// <param name="position">Position (required).</param>
-        /// <param name="defaultValue">Default Value.</param>
-        /// <param name="validValues">Valid Values  &lt;remarks&gt;Used typically for dropdown/select&lt;/remarks&gt;.</param>
-        /// <param name="validationRegex">Validation Regex.</param>
-        /// <param name="fieldType">Field Type (required).</param>
-        public Field(string name = default(string), string description = default(string), string key = default(string), string tooltip = default(string), int? position = default(int?), string defaultValue = default(string), List<ValidValue> validValues = default(List<ValidValue>), string validationRegex = default(string), FieldTypeEnum fieldType = default(FieldTypeEnum))
+        /// <param name="name">name (required).</param>
+        /// <param name="description">description (required).</param>
+        /// <param name="key">key (required).</param>
+        /// <param name="tooltip">tooltip.</param>
+        /// <param name="position">position (required).</param>
+        /// <param name="defaultValue">defaultValue.</param>
+        /// <param name="validValues">validValues.</param>
+        /// <param name="validationRegex">validationRegex.</param>
+        /// <param name="fieldType">fieldType (required).</param>
+        /// <param name="isFlipdishRestricted">isFlipdishRestricted.</param>
+        public Field(string name = default(string), string description = default(string), string key = default(string), string tooltip = default(string), int? position = default(int?), string defaultValue = default(string), List<ValidValue> validValues = default(List<ValidValue>), string validationRegex = default(string), FieldTypeEnum fieldType = default(FieldTypeEnum), bool? isFlipdishRestricted = default(bool?))
         {
             // to ensure "name" is required (not null)
             if (name == null)
@@ -167,65 +170,64 @@ protected Field() { }
             this.DefaultValue = defaultValue;
             this.ValidValues = validValues;
             this.ValidationRegex = validationRegex;
+            this.IsFlipdishRestricted = isFlipdishRestricted;
         }
         
         /// <summary>
-        /// Name
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Description
+        /// Gets or Sets Description
         /// </summary>
-        /// <value>Description</value>
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
         /// <summary>
-        /// Key
+        /// Gets or Sets Key
         /// </summary>
-        /// <value>Key</value>
         [DataMember(Name="Key", EmitDefaultValue=false)]
         public string Key { get; set; }
 
         /// <summary>
-        /// Tooltip
+        /// Gets or Sets Tooltip
         /// </summary>
-        /// <value>Tooltip</value>
         [DataMember(Name="Tooltip", EmitDefaultValue=false)]
         public string Tooltip { get; set; }
 
         /// <summary>
-        /// Position
+        /// Gets or Sets Position
         /// </summary>
-        /// <value>Position</value>
         [DataMember(Name="Position", EmitDefaultValue=false)]
         public int? Position { get; set; }
 
         /// <summary>
-        /// Default Value
+        /// Gets or Sets DefaultValue
         /// </summary>
-        /// <value>Default Value</value>
         [DataMember(Name="DefaultValue", EmitDefaultValue=false)]
         public string DefaultValue { get; set; }
 
         /// <summary>
-        /// Valid Values  &lt;remarks&gt;Used typically for dropdown/select&lt;/remarks&gt;
+        /// Gets or Sets ValidValues
         /// </summary>
-        /// <value>Valid Values  &lt;remarks&gt;Used typically for dropdown/select&lt;/remarks&gt;</value>
         [DataMember(Name="ValidValues", EmitDefaultValue=false)]
         public List<ValidValue> ValidValues { get; set; }
 
         /// <summary>
-        /// Validation Regex
+        /// Gets or Sets ValidationRegex
         /// </summary>
-        /// <value>Validation Regex</value>
         [DataMember(Name="ValidationRegex", EmitDefaultValue=false)]
         public string ValidationRegex { get; set; }
 
 
+        /// <summary>
+        /// Gets or Sets IsFlipdishRestricted
+        /// </summary>
+        [DataMember(Name="IsFlipdishRestricted", EmitDefaultValue=false)]
+        public bool? IsFlipdishRestricted { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -243,6 +245,7 @@ public override string ToString()
             sb.Append("  ValidValues: ").Append(ValidValues).Append("\n");
             sb.Append("  ValidationRegex: ").Append(ValidationRegex).Append("\n");
             sb.Append("  FieldType: ").Append(FieldType).Append("\n");
+            sb.Append("  IsFlipdishRestricted: ").Append(IsFlipdishRestricted).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -321,6 +324,11 @@ public bool Equals(Field input)
                     this.FieldType == input.FieldType ||
                     (this.FieldType != null &&
                     this.FieldType.Equals(input.FieldType))
+                ) && 
+                (
+                    this.IsFlipdishRestricted == input.IsFlipdishRestricted ||
+                    (this.IsFlipdishRestricted != null &&
+                    this.IsFlipdishRestricted.Equals(input.IsFlipdishRestricted))
                 );
         }
 
@@ -351,31 +359,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ValidationRegex.GetHashCode();
                 if (this.FieldType != null)
                     hashCode = hashCode * 59 + this.FieldType.GetHashCode();
+                if (this.IsFlipdishRestricted != null)
+                    hashCode = hashCode * 59 + this.IsFlipdishRestricted.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Position (int?) maximum
-            if(this.Position > (int?)1000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Position, must be a value less than or equal to 1000.", new [] { "Position" });
-            }
-
-            // Position (int?) minimum
-            if(this.Position < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Position, must be a value greater than or equal to 1.", new [] { "Position" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FieldChangeInformation.cs b/src/Flipdish/Model/FieldChangeInformation.cs
index 285e58f9..a051dfab 100644
--- a/src/Flipdish/Model/FieldChangeInformation.cs
+++ b/src/Flipdish/Model/FieldChangeInformation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Change information for a field
     /// </summary>
     [DataContract]
-    public partial class FieldChangeInformation :  IEquatable<FieldChangeInformation>, IValidatableObject
+    public partial class FieldChangeInformation :  IEquatable<FieldChangeInformation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FieldChangeInformation" /> class.
@@ -178,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FieldGroup.cs b/src/Flipdish/Model/FieldGroup.cs
index bde972a7..a0e90b58 100644
--- a/src/Flipdish/Model/FieldGroup.cs
+++ b/src/Flipdish/Model/FieldGroup.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Field group
+    /// FieldGroup
     /// </summary>
     [DataContract]
-    public partial class FieldGroup :  IEquatable<FieldGroup>, IValidatableObject
+    public partial class FieldGroup :  IEquatable<FieldGroup>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FieldGroup" /> class.
@@ -38,11 +36,11 @@ protected FieldGroup() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="FieldGroup" /> class.
         /// </summary>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description.</param>
-        /// <param name="tooltip">Tooltip  &lt;remarks&gt;Displays on text hover&lt;/remarks&gt;.</param>
-        /// <param name="position">Position  &lt;remarks&gt;Position order in the field groups to display&lt;/remarks&gt; (required).</param>
-        /// <param name="fields">Fields.</param>
+        /// <param name="name">name (required).</param>
+        /// <param name="description">description.</param>
+        /// <param name="tooltip">tooltip.</param>
+        /// <param name="position">position (required).</param>
+        /// <param name="fields">fields.</param>
         public FieldGroup(string name = default(string), string description = default(string), string tooltip = default(string), int? position = default(int?), List<Field> fields = default(List<Field>))
         {
             // to ensure "name" is required (not null)
@@ -69,37 +67,32 @@ protected FieldGroup() { }
         }
         
         /// <summary>
-        /// Name
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Description
+        /// Gets or Sets Description
         /// </summary>
-        /// <value>Description</value>
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
         /// <summary>
-        /// Tooltip  &lt;remarks&gt;Displays on text hover&lt;/remarks&gt;
+        /// Gets or Sets Tooltip
         /// </summary>
-        /// <value>Tooltip  &lt;remarks&gt;Displays on text hover&lt;/remarks&gt;</value>
         [DataMember(Name="Tooltip", EmitDefaultValue=false)]
         public string Tooltip { get; set; }
 
         /// <summary>
-        /// Position  &lt;remarks&gt;Position order in the field groups to display&lt;/remarks&gt;
+        /// Gets or Sets Position
         /// </summary>
-        /// <value>Position  &lt;remarks&gt;Position order in the field groups to display&lt;/remarks&gt;</value>
         [DataMember(Name="Position", EmitDefaultValue=false)]
         public int? Position { get; set; }
 
         /// <summary>
-        /// Fields
+        /// Gets or Sets Fields
         /// </summary>
-        /// <value>Fields</value>
         [DataMember(Name="Fields", EmitDefaultValue=false)]
         public List<Field> Fields { get; set; }
 
@@ -199,28 +192,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Position (int?) maximum
-            if(this.Position > (int?)1000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Position, must be a value less than or equal to 1000.", new [] { "Position" });
-            }
-
-            // Position (int?) minimum
-            if(this.Position < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Position, must be a value greater than or equal to 1.", new [] { "Position" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FirebaseApp.cs b/src/Flipdish/Model/FirebaseApp.cs
new file mode 100644
index 00000000..086bf8f3
--- /dev/null
+++ b/src/Flipdish/Model/FirebaseApp.cs
@@ -0,0 +1,164 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// FirebaseApp.
+    /// </summary>
+    [DataContract]
+    public partial class FirebaseApp :  IEquatable<FirebaseApp>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FirebaseApp" /> class.
+        /// </summary>
+        /// <param name="whitelabelId">WhitelabelId..</param>
+        /// <param name="packageId">PackageId..</param>
+        /// <param name="firebaseAppId">FirebaseAppId..</param>
+        /// <param name="firebaseProjectId">FirebaseProjectId..</param>
+        public FirebaseApp(int? whitelabelId = default(int?), string packageId = default(string), string firebaseAppId = default(string), string firebaseProjectId = default(string))
+        {
+            this.WhitelabelId = whitelabelId;
+            this.PackageId = packageId;
+            this.FirebaseAppId = firebaseAppId;
+            this.FirebaseProjectId = firebaseProjectId;
+        }
+        
+        /// <summary>
+        /// WhitelabelId.
+        /// </summary>
+        /// <value>WhitelabelId.</value>
+        [DataMember(Name="WhitelabelId", EmitDefaultValue=false)]
+        public int? WhitelabelId { get; set; }
+
+        /// <summary>
+        /// PackageId.
+        /// </summary>
+        /// <value>PackageId.</value>
+        [DataMember(Name="PackageId", EmitDefaultValue=false)]
+        public string PackageId { get; set; }
+
+        /// <summary>
+        /// FirebaseAppId.
+        /// </summary>
+        /// <value>FirebaseAppId.</value>
+        [DataMember(Name="FirebaseAppId", EmitDefaultValue=false)]
+        public string FirebaseAppId { get; set; }
+
+        /// <summary>
+        /// FirebaseProjectId.
+        /// </summary>
+        /// <value>FirebaseProjectId.</value>
+        [DataMember(Name="FirebaseProjectId", EmitDefaultValue=false)]
+        public string FirebaseProjectId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class FirebaseApp {\n");
+            sb.Append("  WhitelabelId: ").Append(WhitelabelId).Append("\n");
+            sb.Append("  PackageId: ").Append(PackageId).Append("\n");
+            sb.Append("  FirebaseAppId: ").Append(FirebaseAppId).Append("\n");
+            sb.Append("  FirebaseProjectId: ").Append(FirebaseProjectId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as FirebaseApp);
+        }
+
+        /// <summary>
+        /// Returns true if FirebaseApp instances are equal
+        /// </summary>
+        /// <param name="input">Instance of FirebaseApp to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(FirebaseApp input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhitelabelId == input.WhitelabelId ||
+                    (this.WhitelabelId != null &&
+                    this.WhitelabelId.Equals(input.WhitelabelId))
+                ) && 
+                (
+                    this.PackageId == input.PackageId ||
+                    (this.PackageId != null &&
+                    this.PackageId.Equals(input.PackageId))
+                ) && 
+                (
+                    this.FirebaseAppId == input.FirebaseAppId ||
+                    (this.FirebaseAppId != null &&
+                    this.FirebaseAppId.Equals(input.FirebaseAppId))
+                ) && 
+                (
+                    this.FirebaseProjectId == input.FirebaseProjectId ||
+                    (this.FirebaseProjectId != null &&
+                    this.FirebaseProjectId.Equals(input.FirebaseProjectId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhitelabelId != null)
+                    hashCode = hashCode * 59 + this.WhitelabelId.GetHashCode();
+                if (this.PackageId != null)
+                    hashCode = hashCode * 59 + this.PackageId.GetHashCode();
+                if (this.FirebaseAppId != null)
+                    hashCode = hashCode * 59 + this.FirebaseAppId.GetHashCode();
+                if (this.FirebaseProjectId != null)
+                    hashCode = hashCode * 59 + this.FirebaseProjectId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/FlipdishAccountName.cs b/src/Flipdish/Model/FlipdishAccountName.cs
new file mode 100644
index 00000000..35db7b0a
--- /dev/null
+++ b/src/Flipdish/Model/FlipdishAccountName.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Flipdish Account Name
+    /// </summary>
+    [DataContract]
+    public partial class FlipdishAccountName :  IEquatable<FlipdishAccountName>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FlipdishAccountName" /> class.
+        /// </summary>
+        /// <param name="payeeBankAccountDataId">Payee Bank Account Data Id.</param>
+        /// <param name="flipdishAccountId">Flipdish Account Id.</param>
+        /// <param name="name">Account Name.</param>
+        public FlipdishAccountName(int? payeeBankAccountDataId = default(int?), int? flipdishAccountId = default(int?), string name = default(string))
+        {
+            this.PayeeBankAccountDataId = payeeBankAccountDataId;
+            this.FlipdishAccountId = flipdishAccountId;
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Payee Bank Account Data Id
+        /// </summary>
+        /// <value>Payee Bank Account Data Id</value>
+        [DataMember(Name="PayeeBankAccountDataId", EmitDefaultValue=false)]
+        public int? PayeeBankAccountDataId { get; set; }
+
+        /// <summary>
+        /// Flipdish Account Id
+        /// </summary>
+        /// <value>Flipdish Account Id</value>
+        [DataMember(Name="FlipdishAccountId", EmitDefaultValue=false)]
+        public int? FlipdishAccountId { get; set; }
+
+        /// <summary>
+        /// Account Name
+        /// </summary>
+        /// <value>Account Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class FlipdishAccountName {\n");
+            sb.Append("  PayeeBankAccountDataId: ").Append(PayeeBankAccountDataId).Append("\n");
+            sb.Append("  FlipdishAccountId: ").Append(FlipdishAccountId).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as FlipdishAccountName);
+        }
+
+        /// <summary>
+        /// Returns true if FlipdishAccountName instances are equal
+        /// </summary>
+        /// <param name="input">Instance of FlipdishAccountName to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(FlipdishAccountName input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PayeeBankAccountDataId == input.PayeeBankAccountDataId ||
+                    (this.PayeeBankAccountDataId != null &&
+                    this.PayeeBankAccountDataId.Equals(input.PayeeBankAccountDataId))
+                ) && 
+                (
+                    this.FlipdishAccountId == input.FlipdishAccountId ||
+                    (this.FlipdishAccountId != null &&
+                    this.FlipdishAccountId.Equals(input.FlipdishAccountId))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PayeeBankAccountDataId != null)
+                    hashCode = hashCode * 59 + this.PayeeBankAccountDataId.GetHashCode();
+                if (this.FlipdishAccountId != null)
+                    hashCode = hashCode * 59 + this.FlipdishAccountId.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/FlipdishEventBase.cs b/src/Flipdish/Model/FlipdishEventBase.cs
index 6a5acd13..255d078b 100644
--- a/src/Flipdish/Model/FlipdishEventBase.cs
+++ b/src/Flipdish/Model/FlipdishEventBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Base Event
     /// </summary>
     [DataContract]
-    public partial class FlipdishEventBase :  IEquatable<FlipdishEventBase>, IValidatableObject
+    public partial class FlipdishEventBase :  IEquatable<FlipdishEventBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FlipdishEventBase" /> class.
@@ -38,15 +36,21 @@ public partial class FlipdishEventBase :  IEquatable<FlipdishEventBase>, IValida
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public FlipdishEventBase(string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public FlipdishEventBase(string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -84,6 +88,13 @@ public partial class FlipdishEventBase :  IEquatable<FlipdishEventBase>, IValida
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -91,6 +102,20 @@ public partial class FlipdishEventBase :  IEquatable<FlipdishEventBase>, IValida
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -104,7 +129,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -164,10 +192,25 @@ public bool Equals(FlipdishEventBase input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -190,21 +233,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FlipdishFeesDetails.cs b/src/Flipdish/Model/FlipdishFeesDetails.cs
index 2aa280ed..585a5d59 100644
--- a/src/Flipdish/Model/FlipdishFeesDetails.cs
+++ b/src/Flipdish/Model/FlipdishFeesDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,25 +26,29 @@ namespace Flipdish.Model
     /// Fees breakdown
     /// </summary>
     [DataContract]
-    public partial class FlipdishFeesDetails :  IEquatable<FlipdishFeesDetails>, IValidatableObject
+    public partial class FlipdishFeesDetails :  IEquatable<FlipdishFeesDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FlipdishFeesDetails" /> class.
         /// </summary>
         /// <param name="onlineSalesFees">Fees on online sales.</param>
         /// <param name="cashSalesFees">Fees on cash sales.</param>
+        /// <param name="posSalesFees">Fees of POS sales.</param>
         /// <param name="totalSalesFees">Total online and cash sales.</param>
         /// <param name="onlineSalesRefundedFees">Fees on refunds for online sales.</param>
         /// <param name="cashSalesRefundedFees">Fees on refunds for cash sales.</param>
+        /// <param name="posSalesRefundedFees">Fees on refunds for POS sales.</param>
         /// <param name="salesFeesVat">VAT on sales fees.</param>
         /// <param name="totalFees">Total fees.</param>
-        public FlipdishFeesDetails(double? onlineSalesFees = default(double?), double? cashSalesFees = default(double?), double? totalSalesFees = default(double?), double? onlineSalesRefundedFees = default(double?), double? cashSalesRefundedFees = default(double?), double? salesFeesVat = default(double?), double? totalFees = default(double?))
+        public FlipdishFeesDetails(double? onlineSalesFees = default(double?), double? cashSalesFees = default(double?), double? posSalesFees = default(double?), double? totalSalesFees = default(double?), double? onlineSalesRefundedFees = default(double?), double? cashSalesRefundedFees = default(double?), double? posSalesRefundedFees = default(double?), double? salesFeesVat = default(double?), double? totalFees = default(double?))
         {
             this.OnlineSalesFees = onlineSalesFees;
             this.CashSalesFees = cashSalesFees;
+            this.PosSalesFees = posSalesFees;
             this.TotalSalesFees = totalSalesFees;
             this.OnlineSalesRefundedFees = onlineSalesRefundedFees;
             this.CashSalesRefundedFees = cashSalesRefundedFees;
+            this.PosSalesRefundedFees = posSalesRefundedFees;
             this.SalesFeesVat = salesFeesVat;
             this.TotalFees = totalFees;
         }
@@ -65,6 +67,13 @@ public partial class FlipdishFeesDetails :  IEquatable<FlipdishFeesDetails>, IVa
         [DataMember(Name="CashSalesFees", EmitDefaultValue=false)]
         public double? CashSalesFees { get; set; }
 
+        /// <summary>
+        /// Fees of POS sales
+        /// </summary>
+        /// <value>Fees of POS sales</value>
+        [DataMember(Name="PosSalesFees", EmitDefaultValue=false)]
+        public double? PosSalesFees { get; set; }
+
         /// <summary>
         /// Total online and cash sales
         /// </summary>
@@ -86,6 +95,13 @@ public partial class FlipdishFeesDetails :  IEquatable<FlipdishFeesDetails>, IVa
         [DataMember(Name="CashSalesRefundedFees", EmitDefaultValue=false)]
         public double? CashSalesRefundedFees { get; set; }
 
+        /// <summary>
+        /// Fees on refunds for POS sales
+        /// </summary>
+        /// <value>Fees on refunds for POS sales</value>
+        [DataMember(Name="PosSalesRefundedFees", EmitDefaultValue=false)]
+        public double? PosSalesRefundedFees { get; set; }
+
         /// <summary>
         /// VAT on sales fees
         /// </summary>
@@ -110,9 +126,11 @@ public override string ToString()
             sb.Append("class FlipdishFeesDetails {\n");
             sb.Append("  OnlineSalesFees: ").Append(OnlineSalesFees).Append("\n");
             sb.Append("  CashSalesFees: ").Append(CashSalesFees).Append("\n");
+            sb.Append("  PosSalesFees: ").Append(PosSalesFees).Append("\n");
             sb.Append("  TotalSalesFees: ").Append(TotalSalesFees).Append("\n");
             sb.Append("  OnlineSalesRefundedFees: ").Append(OnlineSalesRefundedFees).Append("\n");
             sb.Append("  CashSalesRefundedFees: ").Append(CashSalesRefundedFees).Append("\n");
+            sb.Append("  PosSalesRefundedFees: ").Append(PosSalesRefundedFees).Append("\n");
             sb.Append("  SalesFeesVat: ").Append(SalesFeesVat).Append("\n");
             sb.Append("  TotalFees: ").Append(TotalFees).Append("\n");
             sb.Append("}\n");
@@ -159,6 +177,11 @@ public bool Equals(FlipdishFeesDetails input)
                     (this.CashSalesFees != null &&
                     this.CashSalesFees.Equals(input.CashSalesFees))
                 ) && 
+                (
+                    this.PosSalesFees == input.PosSalesFees ||
+                    (this.PosSalesFees != null &&
+                    this.PosSalesFees.Equals(input.PosSalesFees))
+                ) && 
                 (
                     this.TotalSalesFees == input.TotalSalesFees ||
                     (this.TotalSalesFees != null &&
@@ -174,6 +197,11 @@ public bool Equals(FlipdishFeesDetails input)
                     (this.CashSalesRefundedFees != null &&
                     this.CashSalesRefundedFees.Equals(input.CashSalesRefundedFees))
                 ) && 
+                (
+                    this.PosSalesRefundedFees == input.PosSalesRefundedFees ||
+                    (this.PosSalesRefundedFees != null &&
+                    this.PosSalesRefundedFees.Equals(input.PosSalesRefundedFees))
+                ) && 
                 (
                     this.SalesFeesVat == input.SalesFeesVat ||
                     (this.SalesFeesVat != null &&
@@ -199,12 +227,16 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OnlineSalesFees.GetHashCode();
                 if (this.CashSalesFees != null)
                     hashCode = hashCode * 59 + this.CashSalesFees.GetHashCode();
+                if (this.PosSalesFees != null)
+                    hashCode = hashCode * 59 + this.PosSalesFees.GetHashCode();
                 if (this.TotalSalesFees != null)
                     hashCode = hashCode * 59 + this.TotalSalesFees.GetHashCode();
                 if (this.OnlineSalesRefundedFees != null)
                     hashCode = hashCode * 59 + this.OnlineSalesRefundedFees.GetHashCode();
                 if (this.CashSalesRefundedFees != null)
                     hashCode = hashCode * 59 + this.CashSalesRefundedFees.GetHashCode();
+                if (this.PosSalesRefundedFees != null)
+                    hashCode = hashCode * 59 + this.PosSalesRefundedFees.GetHashCode();
                 if (this.SalesFeesVat != null)
                     hashCode = hashCode * 59 + this.SalesFeesVat.GetHashCode();
                 if (this.TotalFees != null)
@@ -212,16 +244,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FulfillentStatusActionItem.cs b/src/Flipdish/Model/FulfillentStatusActionItem.cs
index bd00f973..03f1fa77 100644
--- a/src/Flipdish/Model/FulfillentStatusActionItem.cs
+++ b/src/Flipdish/Model/FulfillentStatusActionItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Action item for next fulfillment status selector
     /// </summary>
     [DataContract]
-    public partial class FulfillentStatusActionItem :  IEquatable<FulfillentStatusActionItem>, IValidatableObject
+    public partial class FulfillentStatusActionItem :  IEquatable<FulfillentStatusActionItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FulfillentStatusActionItem" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FulfillmentInfo.cs b/src/Flipdish/Model/FulfillmentInfo.cs
deleted file mode 100644
index 73cf64f5..00000000
--- a/src/Flipdish/Model/FulfillmentInfo.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Fulfillment information (required for all orders)
-    /// </summary>
-    [DataContract]
-    public partial class FulfillmentInfo :  IEquatable<FulfillmentInfo>, IValidatableObject
-    {
-        /// <summary>
-        /// [Required] Dispatch Type (i.e Pickup / Delivery)
-        /// </summary>
-        /// <value>[Required] Dispatch Type (i.e Pickup / Delivery)</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum DispatchTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Delivery for value: Delivery
-            /// </summary>
-            [EnumMember(Value = "Delivery")]
-            Delivery = 1,
-            
-            /// <summary>
-            /// Enum Pickup for value: Pickup
-            /// </summary>
-            [EnumMember(Value = "Pickup")]
-            Pickup = 2
-        }
-
-        /// <summary>
-        /// [Required] Dispatch Type (i.e Pickup / Delivery)
-        /// </summary>
-        /// <value>[Required] Dispatch Type (i.e Pickup / Delivery)</value>
-        [DataMember(Name="DispatchType", EmitDefaultValue=false)]
-        public DispatchTypeEnum? DispatchType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FulfillmentInfo" /> class.
-        /// </summary>
-        /// <param name="dispatchType">[Required] Dispatch Type (i.e Pickup / Delivery).</param>
-        /// <param name="requestedForUtc">[Required] Time the order is requested for.</param>
-        /// <param name="location">Location the order is to be delivered to  [Required] Delivery  [Not Required] Pickup.</param>
-        /// <param name="dispatchAmount">Price of the dispatch, normally 0 for collection and a value for delivery  [Required] Delivery  [Not Required] Pickup.</param>
-        public FulfillmentInfo(DispatchTypeEnum? dispatchType = default(DispatchTypeEnum?), DateTime? requestedForUtc = default(DateTime?), Location location = default(Location), Price dispatchAmount = default(Price))
-        {
-            this.DispatchType = dispatchType;
-            this.RequestedForUtc = requestedForUtc;
-            this.Location = location;
-            this.DispatchAmount = dispatchAmount;
-        }
-        
-
-        /// <summary>
-        /// [Required] Time the order is requested for
-        /// </summary>
-        /// <value>[Required] Time the order is requested for</value>
-        [DataMember(Name="RequestedForUtc", EmitDefaultValue=false)]
-        public DateTime? RequestedForUtc { get; set; }
-
-        /// <summary>
-        /// Location the order is to be delivered to  [Required] Delivery  [Not Required] Pickup
-        /// </summary>
-        /// <value>Location the order is to be delivered to  [Required] Delivery  [Not Required] Pickup</value>
-        [DataMember(Name="Location", EmitDefaultValue=false)]
-        public Location Location { get; set; }
-
-        /// <summary>
-        /// Price of the dispatch, normally 0 for collection and a value for delivery  [Required] Delivery  [Not Required] Pickup
-        /// </summary>
-        /// <value>Price of the dispatch, normally 0 for collection and a value for delivery  [Required] Delivery  [Not Required] Pickup</value>
-        [DataMember(Name="DispatchAmount", EmitDefaultValue=false)]
-        public Price DispatchAmount { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class FulfillmentInfo {\n");
-            sb.Append("  DispatchType: ").Append(DispatchType).Append("\n");
-            sb.Append("  RequestedForUtc: ").Append(RequestedForUtc).Append("\n");
-            sb.Append("  Location: ").Append(Location).Append("\n");
-            sb.Append("  DispatchAmount: ").Append(DispatchAmount).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as FulfillmentInfo);
-        }
-
-        /// <summary>
-        /// Returns true if FulfillmentInfo instances are equal
-        /// </summary>
-        /// <param name="input">Instance of FulfillmentInfo to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(FulfillmentInfo input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.DispatchType == input.DispatchType ||
-                    (this.DispatchType != null &&
-                    this.DispatchType.Equals(input.DispatchType))
-                ) && 
-                (
-                    this.RequestedForUtc == input.RequestedForUtc ||
-                    (this.RequestedForUtc != null &&
-                    this.RequestedForUtc.Equals(input.RequestedForUtc))
-                ) && 
-                (
-                    this.Location == input.Location ||
-                    (this.Location != null &&
-                    this.Location.Equals(input.Location))
-                ) && 
-                (
-                    this.DispatchAmount == input.DispatchAmount ||
-                    (this.DispatchAmount != null &&
-                    this.DispatchAmount.Equals(input.DispatchAmount))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.DispatchType != null)
-                    hashCode = hashCode * 59 + this.DispatchType.GetHashCode();
-                if (this.RequestedForUtc != null)
-                    hashCode = hashCode * 59 + this.RequestedForUtc.GetHashCode();
-                if (this.Location != null)
-                    hashCode = hashCode * 59 + this.Location.GetHashCode();
-                if (this.DispatchAmount != null)
-                    hashCode = hashCode * 59 + this.DispatchAmount.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/FulfillmentStatesConfiguration.cs b/src/Flipdish/Model/FulfillmentStatesConfiguration.cs
index da294469..c753d497 100644
--- a/src/Flipdish/Model/FulfillmentStatesConfiguration.cs
+++ b/src/Flipdish/Model/FulfillmentStatesConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Fulfillment States Configuration
     /// </summary>
     [DataContract]
-    public partial class FulfillmentStatesConfiguration :  IEquatable<FulfillmentStatesConfiguration>, IValidatableObject
+    public partial class FulfillmentStatesConfiguration :  IEquatable<FulfillmentStatesConfiguration>
     {
         /// <summary>
         /// Store Selector Type
@@ -67,14 +65,16 @@ public enum StoreSelectorTypeEnum
         /// Initializes a new instance of the <see cref="FulfillmentStatesConfiguration" /> class.
         /// </summary>
         /// <param name="states">States.</param>
+        /// <param name="automaticTransitionsEnabled">Enable automatic transitions.</param>
         /// <param name="appId">AppId.</param>
         /// <param name="configurationUid">Configuration Uid.</param>
         /// <param name="storeSelectorType">Store Selector Type.</param>
         /// <param name="storeIds">Store Ids.</param>
         /// <param name="name">Name.</param>
-        public FulfillmentStatesConfiguration(List<FulfillmentStatusConfigurationItem> states = default(List<FulfillmentStatusConfigurationItem>), string appId = default(string), string configurationUid = default(string), StoreSelectorTypeEnum? storeSelectorType = default(StoreSelectorTypeEnum?), List<int?> storeIds = default(List<int?>), string name = default(string))
+        public FulfillmentStatesConfiguration(List<FulfillmentStatusConfigurationItem> states = default(List<FulfillmentStatusConfigurationItem>), bool? automaticTransitionsEnabled = default(bool?), string appId = default(string), string configurationUid = default(string), StoreSelectorTypeEnum? storeSelectorType = default(StoreSelectorTypeEnum?), List<int?> storeIds = default(List<int?>), string name = default(string))
         {
             this.States = states;
+            this.AutomaticTransitionsEnabled = automaticTransitionsEnabled;
             this.AppId = appId;
             this.ConfigurationUid = configurationUid;
             this.StoreSelectorType = storeSelectorType;
@@ -89,6 +89,13 @@ public enum StoreSelectorTypeEnum
         [DataMember(Name="States", EmitDefaultValue=false)]
         public List<FulfillmentStatusConfigurationItem> States { get; set; }
 
+        /// <summary>
+        /// Enable automatic transitions
+        /// </summary>
+        /// <value>Enable automatic transitions</value>
+        [DataMember(Name="AutomaticTransitionsEnabled", EmitDefaultValue=false)]
+        public bool? AutomaticTransitionsEnabled { get; set; }
+
         /// <summary>
         /// AppId
         /// </summary>
@@ -127,6 +134,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class FulfillmentStatesConfiguration {\n");
             sb.Append("  States: ").Append(States).Append("\n");
+            sb.Append("  AutomaticTransitionsEnabled: ").Append(AutomaticTransitionsEnabled).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  ConfigurationUid: ").Append(ConfigurationUid).Append("\n");
             sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
@@ -171,6 +179,11 @@ public bool Equals(FulfillmentStatesConfiguration input)
                     this.States != null &&
                     this.States.SequenceEqual(input.States)
                 ) && 
+                (
+                    this.AutomaticTransitionsEnabled == input.AutomaticTransitionsEnabled ||
+                    (this.AutomaticTransitionsEnabled != null &&
+                    this.AutomaticTransitionsEnabled.Equals(input.AutomaticTransitionsEnabled))
+                ) && 
                 (
                     this.AppId == input.AppId ||
                     (this.AppId != null &&
@@ -209,6 +222,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.States != null)
                     hashCode = hashCode * 59 + this.States.GetHashCode();
+                if (this.AutomaticTransitionsEnabled != null)
+                    hashCode = hashCode * 59 + this.AutomaticTransitionsEnabled.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.ConfigurationUid != null)
@@ -222,16 +237,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FulfillmentStatesConfigurationCreateBase.cs b/src/Flipdish/Model/FulfillmentStatesConfigurationCreateBase.cs
deleted file mode 100644
index c5ce62e3..00000000
--- a/src/Flipdish/Model/FulfillmentStatesConfigurationCreateBase.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Fulfillment States Configuration Create Base
-    /// </summary>
-    [DataContract]
-    public partial class FulfillmentStatesConfigurationCreateBase :  IEquatable<FulfillmentStatesConfigurationCreateBase>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FulfillmentStatesConfigurationCreateBase" /> class.
-        /// </summary>
-        /// <param name="name">Name.</param>
-        public FulfillmentStatesConfigurationCreateBase(string name = default(string))
-        {
-            this.Name = name;
-        }
-        
-        /// <summary>
-        /// Name
-        /// </summary>
-        /// <value>Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class FulfillmentStatesConfigurationCreateBase {\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as FulfillmentStatesConfigurationCreateBase);
-        }
-
-        /// <summary>
-        /// Returns true if FulfillmentStatesConfigurationCreateBase instances are equal
-        /// </summary>
-        /// <param name="input">Instance of FulfillmentStatesConfigurationCreateBase to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(FulfillmentStatesConfigurationCreateBase input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/FulfillmentStatesConfigurationSummary.cs b/src/Flipdish/Model/FulfillmentStatesConfigurationSummary.cs
index c402fd2c..b30c2e8c 100644
--- a/src/Flipdish/Model/FulfillmentStatesConfigurationSummary.cs
+++ b/src/Flipdish/Model/FulfillmentStatesConfigurationSummary.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// App store app configuration header information
+    /// Fulfillment configuration header information
     /// </summary>
     [DataContract]
-    public partial class FulfillmentStatesConfigurationSummary :  IEquatable<FulfillmentStatesConfigurationSummary>, IValidatableObject
+    public partial class FulfillmentStatesConfigurationSummary :  IEquatable<FulfillmentStatesConfigurationSummary>
     {
         /// <summary>
         /// Store selector type
@@ -218,16 +216,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FulfillmentStatesConfiguredStore.cs b/src/Flipdish/Model/FulfillmentStatesConfiguredStore.cs
index 709c82bf..e5766708 100644
--- a/src/Flipdish/Model/FulfillmentStatesConfiguredStore.cs
+++ b/src/Flipdish/Model/FulfillmentStatesConfiguredStore.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Configured stores
     /// </summary>
     [DataContract]
-    public partial class FulfillmentStatesConfiguredStore :  IEquatable<FulfillmentStatesConfiguredStore>, IValidatableObject
+    public partial class FulfillmentStatesConfiguredStore :  IEquatable<FulfillmentStatesConfiguredStore>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FulfillmentStatesConfiguredStore" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/FulfillmentStatusConfigurationItem.cs b/src/Flipdish/Model/FulfillmentStatusConfigurationItem.cs
index cfc4cdd7..450798df 100644
--- a/src/Flipdish/Model/FulfillmentStatusConfigurationItem.cs
+++ b/src/Flipdish/Model/FulfillmentStatusConfigurationItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Fulfillment Status Item
     /// </summary>
     [DataContract]
-    public partial class FulfillmentStatusConfigurationItem :  IEquatable<FulfillmentStatusConfigurationItem>, IValidatableObject
+    public partial class FulfillmentStatusConfigurationItem :  IEquatable<FulfillmentStatusConfigurationItem>
     {
         /// <summary>
         /// How will state change (manually or automated, including timed)
@@ -119,8 +117,8 @@ public enum OrderTypesEnum
         /// <param name="isCustom">Is custom state. If not, then it&#39;s a system state.</param>
         /// <param name="orderTypes">If empty then applies to all ordertypes, otherwise a list of order types this state applies to.</param>
         /// <param name="communication">Whether state should fire off a notification to the customer.</param>
-        /// <param name="visualOrder">Integer for ordering results in choices (eg. dropdowns).</param>
-        public FulfillmentStatusConfigurationItem(string statusId = default(string), string statusName = default(string), bool? enabled = default(bool?), string displayName = default(string), string icon = default(string), string publicDescription = default(string), bool? _internal = default(bool?), List<string> nextStatuses = default(List<string>), List<NextStatusWithOrderType> defaultNextStatus = default(List<NextStatusWithOrderType>), ChangeTypeEnum? changeType = default(ChangeTypeEnum?), bool? includeInReports = default(bool?), bool? isCustom = default(bool?), List<OrderTypesEnum> orderTypes = default(List<OrderTypesEnum>), bool? communication = default(bool?), int? visualOrder = default(int?))
+        /// <param name="image">Image (image filename, relative, not absolute URL).</param>
+        public FulfillmentStatusConfigurationItem(string statusId = default(string), string statusName = default(string), bool? enabled = default(bool?), string displayName = default(string), string icon = default(string), string publicDescription = default(string), bool? _internal = default(bool?), List<string> nextStatuses = default(List<string>), List<NextStatusWithOrderType> defaultNextStatus = default(List<NextStatusWithOrderType>), ChangeTypeEnum? changeType = default(ChangeTypeEnum?), bool? includeInReports = default(bool?), bool? isCustom = default(bool?), List<OrderTypesEnum> orderTypes = default(List<OrderTypesEnum>), bool? communication = default(bool?), string image = default(string))
         {
             this.StatusId = statusId;
             this.StatusName = statusName;
@@ -136,7 +134,7 @@ public enum OrderTypesEnum
             this.IsCustom = isCustom;
             this.OrderTypes = orderTypes;
             this.Communication = communication;
-            this.VisualOrder = visualOrder;
+            this.Image = image;
         }
         
         /// <summary>
@@ -226,11 +224,11 @@ public enum OrderTypesEnum
         public bool? Communication { get; set; }
 
         /// <summary>
-        /// Integer for ordering results in choices (eg. dropdowns)
+        /// Image (image filename, relative, not absolute URL)
         /// </summary>
-        /// <value>Integer for ordering results in choices (eg. dropdowns)</value>
-        [DataMember(Name="VisualOrder", EmitDefaultValue=false)]
-        public int? VisualOrder { get; set; }
+        /// <value>Image (image filename, relative, not absolute URL)</value>
+        [DataMember(Name="Image", EmitDefaultValue=false)]
+        public string Image { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -254,7 +252,7 @@ public override string ToString()
             sb.Append("  IsCustom: ").Append(IsCustom).Append("\n");
             sb.Append("  OrderTypes: ").Append(OrderTypes).Append("\n");
             sb.Append("  Communication: ").Append(Communication).Append("\n");
-            sb.Append("  VisualOrder: ").Append(VisualOrder).Append("\n");
+            sb.Append("  Image: ").Append(Image).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -360,9 +358,9 @@ public bool Equals(FulfillmentStatusConfigurationItem input)
                     this.Communication.Equals(input.Communication))
                 ) && 
                 (
-                    this.VisualOrder == input.VisualOrder ||
-                    (this.VisualOrder != null &&
-                    this.VisualOrder.Equals(input.VisualOrder))
+                    this.Image == input.Image ||
+                    (this.Image != null &&
+                    this.Image.Equals(input.Image))
                 );
         }
 
@@ -403,21 +401,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OrderTypes.GetHashCode();
                 if (this.Communication != null)
                     hashCode = hashCode * 59 + this.Communication.GetHashCode();
-                if (this.VisualOrder != null)
-                    hashCode = hashCode * 59 + this.VisualOrder.GetHashCode();
+                if (this.Image != null)
+                    hashCode = hashCode * 59 + this.Image.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GeoPointRequest.cs b/src/Flipdish/Model/GeoPointRequest.cs
index a60804d4..b685861c 100644
--- a/src/Flipdish/Model/GeoPointRequest.cs
+++ b/src/Flipdish/Model/GeoPointRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Terminal location request
     /// </summary>
     [DataContract]
-    public partial class GeoPointRequest :  IEquatable<GeoPointRequest>, IValidatableObject
+    public partial class GeoPointRequest :  IEquatable<GeoPointRequest>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GeoPointRequest" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GetEndUserFeeConfigsResponse.cs b/src/Flipdish/Model/GetEndUserFeeConfigsResponse.cs
new file mode 100644
index 00000000..3edbca5e
--- /dev/null
+++ b/src/Flipdish/Model/GetEndUserFeeConfigsResponse.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// The current end user fee configs for a Store, one per channel and payment method
+    /// </summary>
+    [DataContract]
+    public partial class GetEndUserFeeConfigsResponse :  IEquatable<GetEndUserFeeConfigsResponse>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GetEndUserFeeConfigsResponse" /> class.
+        /// </summary>
+        /// <param name="endUserFees">The current end user fee configs for the Store, one per channel and payment method combination present.</param>
+        /// <param name="isV2FeeCalculationEnabled">Whether the V2 (tiered) fee calculation is enabled for this Store.</param>
+        public GetEndUserFeeConfigsResponse(List<EndUserFeeConfig> endUserFees = default(List<EndUserFeeConfig>), bool? isV2FeeCalculationEnabled = default(bool?))
+        {
+            this.EndUserFees = endUserFees;
+            this.IsV2FeeCalculationEnabled = isV2FeeCalculationEnabled;
+        }
+        
+        /// <summary>
+        /// The current end user fee configs for the Store, one per channel and payment method combination present
+        /// </summary>
+        /// <value>The current end user fee configs for the Store, one per channel and payment method combination present</value>
+        [DataMember(Name="EndUserFees", EmitDefaultValue=false)]
+        public List<EndUserFeeConfig> EndUserFees { get; set; }
+
+        /// <summary>
+        /// Whether the V2 (tiered) fee calculation is enabled for this Store
+        /// </summary>
+        /// <value>Whether the V2 (tiered) fee calculation is enabled for this Store</value>
+        [DataMember(Name="IsV2FeeCalculationEnabled", EmitDefaultValue=false)]
+        public bool? IsV2FeeCalculationEnabled { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class GetEndUserFeeConfigsResponse {\n");
+            sb.Append("  EndUserFees: ").Append(EndUserFees).Append("\n");
+            sb.Append("  IsV2FeeCalculationEnabled: ").Append(IsV2FeeCalculationEnabled).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as GetEndUserFeeConfigsResponse);
+        }
+
+        /// <summary>
+        /// Returns true if GetEndUserFeeConfigsResponse instances are equal
+        /// </summary>
+        /// <param name="input">Instance of GetEndUserFeeConfigsResponse to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(GetEndUserFeeConfigsResponse input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EndUserFees == input.EndUserFees ||
+                    this.EndUserFees != null &&
+                    this.EndUserFees.SequenceEqual(input.EndUserFees)
+                ) && 
+                (
+                    this.IsV2FeeCalculationEnabled == input.IsV2FeeCalculationEnabled ||
+                    (this.IsV2FeeCalculationEnabled != null &&
+                    this.IsV2FeeCalculationEnabled.Equals(input.IsV2FeeCalculationEnabled))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EndUserFees != null)
+                    hashCode = hashCode * 59 + this.EndUserFees.GetHashCode();
+                if (this.IsV2FeeCalculationEnabled != null)
+                    hashCode = hashCode * 59 + this.IsV2FeeCalculationEnabled.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/GetReceiptByOrderIdQueryResponse.cs b/src/Flipdish/Model/GetReceiptByOrderIdQueryResponse.cs
new file mode 100644
index 00000000..195bd69e
--- /dev/null
+++ b/src/Flipdish/Model/GetReceiptByOrderIdQueryResponse.cs
@@ -0,0 +1,256 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// GetReceiptByOrderIdQueryResponse
+    /// </summary>
+    [DataContract]
+    public partial class GetReceiptByOrderIdQueryResponse :  IEquatable<GetReceiptByOrderIdQueryResponse>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GetReceiptByOrderIdQueryResponse" /> class.
+        /// </summary>
+        /// <param name="previousOrder">previousOrder.</param>
+        /// <param name="depositReturnFeesSummary">depositReturnFeesSummary.</param>
+        /// <param name="tsRequestedForLocal">tsRequestedForLocal.</param>
+        /// <param name="tsOrderPlacedLocal">tsOrderPlacedLocal.</param>
+        /// <param name="logoUrl">logoUrl.</param>
+        /// <param name="address">address.</param>
+        /// <param name="vatNumber">vatNumber.</param>
+        /// <param name="paymentMethodDescription">paymentMethodDescription.</param>
+        /// <param name="orgId">orgId.</param>
+        /// <param name="countryCode">countryCode.</param>
+        public GetReceiptByOrderIdQueryResponse(PreviousOrder previousOrder = default(PreviousOrder), List<DepositReturnFeesSummary> depositReturnFeesSummary = default(List<DepositReturnFeesSummary>), DateTime? tsRequestedForLocal = default(DateTime?), DateTime? tsOrderPlacedLocal = default(DateTime?), string logoUrl = default(string), string address = default(string), string vatNumber = default(string), string paymentMethodDescription = default(string), string orgId = default(string), string countryCode = default(string))
+        {
+            this.PreviousOrder = previousOrder;
+            this.DepositReturnFeesSummary = depositReturnFeesSummary;
+            this.TsRequestedForLocal = tsRequestedForLocal;
+            this.TsOrderPlacedLocal = tsOrderPlacedLocal;
+            this.LogoUrl = logoUrl;
+            this.Address = address;
+            this.VatNumber = vatNumber;
+            this.PaymentMethodDescription = paymentMethodDescription;
+            this.OrgId = orgId;
+            this.CountryCode = countryCode;
+        }
+        
+        /// <summary>
+        /// Gets or Sets PreviousOrder
+        /// </summary>
+        [DataMember(Name="PreviousOrder", EmitDefaultValue=false)]
+        public PreviousOrder PreviousOrder { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DepositReturnFeesSummary
+        /// </summary>
+        [DataMember(Name="DepositReturnFeesSummary", EmitDefaultValue=false)]
+        public List<DepositReturnFeesSummary> DepositReturnFeesSummary { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TsRequestedForLocal
+        /// </summary>
+        [DataMember(Name="TsRequestedForLocal", EmitDefaultValue=false)]
+        public DateTime? TsRequestedForLocal { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TsOrderPlacedLocal
+        /// </summary>
+        [DataMember(Name="TsOrderPlacedLocal", EmitDefaultValue=false)]
+        public DateTime? TsOrderPlacedLocal { get; set; }
+
+        /// <summary>
+        /// Gets or Sets LogoUrl
+        /// </summary>
+        [DataMember(Name="LogoUrl", EmitDefaultValue=false)]
+        public string LogoUrl { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Address
+        /// </summary>
+        [DataMember(Name="Address", EmitDefaultValue=false)]
+        public string Address { get; set; }
+
+        /// <summary>
+        /// Gets or Sets VatNumber
+        /// </summary>
+        [DataMember(Name="VatNumber", EmitDefaultValue=false)]
+        public string VatNumber { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PaymentMethodDescription
+        /// </summary>
+        [DataMember(Name="PaymentMethodDescription", EmitDefaultValue=false)]
+        public string PaymentMethodDescription { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OrgId
+        /// </summary>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets CountryCode
+        /// </summary>
+        [DataMember(Name="CountryCode", EmitDefaultValue=false)]
+        public string CountryCode { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class GetReceiptByOrderIdQueryResponse {\n");
+            sb.Append("  PreviousOrder: ").Append(PreviousOrder).Append("\n");
+            sb.Append("  DepositReturnFeesSummary: ").Append(DepositReturnFeesSummary).Append("\n");
+            sb.Append("  TsRequestedForLocal: ").Append(TsRequestedForLocal).Append("\n");
+            sb.Append("  TsOrderPlacedLocal: ").Append(TsOrderPlacedLocal).Append("\n");
+            sb.Append("  LogoUrl: ").Append(LogoUrl).Append("\n");
+            sb.Append("  Address: ").Append(Address).Append("\n");
+            sb.Append("  VatNumber: ").Append(VatNumber).Append("\n");
+            sb.Append("  PaymentMethodDescription: ").Append(PaymentMethodDescription).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  CountryCode: ").Append(CountryCode).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as GetReceiptByOrderIdQueryResponse);
+        }
+
+        /// <summary>
+        /// Returns true if GetReceiptByOrderIdQueryResponse instances are equal
+        /// </summary>
+        /// <param name="input">Instance of GetReceiptByOrderIdQueryResponse to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(GetReceiptByOrderIdQueryResponse input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PreviousOrder == input.PreviousOrder ||
+                    (this.PreviousOrder != null &&
+                    this.PreviousOrder.Equals(input.PreviousOrder))
+                ) && 
+                (
+                    this.DepositReturnFeesSummary == input.DepositReturnFeesSummary ||
+                    this.DepositReturnFeesSummary != null &&
+                    this.DepositReturnFeesSummary.SequenceEqual(input.DepositReturnFeesSummary)
+                ) && 
+                (
+                    this.TsRequestedForLocal == input.TsRequestedForLocal ||
+                    (this.TsRequestedForLocal != null &&
+                    this.TsRequestedForLocal.Equals(input.TsRequestedForLocal))
+                ) && 
+                (
+                    this.TsOrderPlacedLocal == input.TsOrderPlacedLocal ||
+                    (this.TsOrderPlacedLocal != null &&
+                    this.TsOrderPlacedLocal.Equals(input.TsOrderPlacedLocal))
+                ) && 
+                (
+                    this.LogoUrl == input.LogoUrl ||
+                    (this.LogoUrl != null &&
+                    this.LogoUrl.Equals(input.LogoUrl))
+                ) && 
+                (
+                    this.Address == input.Address ||
+                    (this.Address != null &&
+                    this.Address.Equals(input.Address))
+                ) && 
+                (
+                    this.VatNumber == input.VatNumber ||
+                    (this.VatNumber != null &&
+                    this.VatNumber.Equals(input.VatNumber))
+                ) && 
+                (
+                    this.PaymentMethodDescription == input.PaymentMethodDescription ||
+                    (this.PaymentMethodDescription != null &&
+                    this.PaymentMethodDescription.Equals(input.PaymentMethodDescription))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.CountryCode == input.CountryCode ||
+                    (this.CountryCode != null &&
+                    this.CountryCode.Equals(input.CountryCode))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PreviousOrder != null)
+                    hashCode = hashCode * 59 + this.PreviousOrder.GetHashCode();
+                if (this.DepositReturnFeesSummary != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFeesSummary.GetHashCode();
+                if (this.TsRequestedForLocal != null)
+                    hashCode = hashCode * 59 + this.TsRequestedForLocal.GetHashCode();
+                if (this.TsOrderPlacedLocal != null)
+                    hashCode = hashCode * 59 + this.TsOrderPlacedLocal.GetHashCode();
+                if (this.LogoUrl != null)
+                    hashCode = hashCode * 59 + this.LogoUrl.GetHashCode();
+                if (this.Address != null)
+                    hashCode = hashCode * 59 + this.Address.GetHashCode();
+                if (this.VatNumber != null)
+                    hashCode = hashCode * 59 + this.VatNumber.GetHashCode();
+                if (this.PaymentMethodDescription != null)
+                    hashCode = hashCode * 59 + this.PaymentMethodDescription.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.CountryCode != null)
+                    hashCode = hashCode * 59 + this.CountryCode.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/GoogleAddress.cs b/src/Flipdish/Model/GoogleAddress.cs
index 048f6e80..2d6cd554 100644
--- a/src/Flipdish/Model/GoogleAddress.cs
+++ b/src/Flipdish/Model/GoogleAddress.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// GoogleAddress
     /// </summary>
     [DataContract]
-    public partial class GoogleAddress :  IEquatable<GoogleAddress>, IValidatableObject
+    public partial class GoogleAddress :  IEquatable<GoogleAddress>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GoogleAddress" /> class.
@@ -141,16 +139,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GoogleAddressComponent.cs b/src/Flipdish/Model/GoogleAddressComponent.cs
index b8a5c13f..3c11c192 100644
--- a/src/Flipdish/Model/GoogleAddressComponent.cs
+++ b/src/Flipdish/Model/GoogleAddressComponent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// GoogleAddressComponent
     /// </summary>
     [DataContract]
-    public partial class GoogleAddressComponent :  IEquatable<GoogleAddressComponent>, IValidatableObject
+    public partial class GoogleAddressComponent :  IEquatable<GoogleAddressComponent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GoogleAddressComponent" /> class.
@@ -141,16 +139,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GoogleAddressResult.cs b/src/Flipdish/Model/GoogleAddressResult.cs
index df54414d..c0519f78 100644
--- a/src/Flipdish/Model/GoogleAddressResult.cs
+++ b/src/Flipdish/Model/GoogleAddressResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// GoogleAddressResult
     /// </summary>
     [DataContract]
-    public partial class GoogleAddressResult :  IEquatable<GoogleAddressResult>, IValidatableObject
+    public partial class GoogleAddressResult :  IEquatable<GoogleAddressResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GoogleAddressResult" /> class.
@@ -173,16 +171,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GoogleCoordinates.cs b/src/Flipdish/Model/GoogleCoordinates.cs
index f9c044fe..c2924d7d 100644
--- a/src/Flipdish/Model/GoogleCoordinates.cs
+++ b/src/Flipdish/Model/GoogleCoordinates.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// GoogleCoordinates
     /// </summary>
     [DataContract]
-    public partial class GoogleCoordinates :  IEquatable<GoogleCoordinates>, IValidatableObject
+    public partial class GoogleCoordinates :  IEquatable<GoogleCoordinates>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GoogleCoordinates" /> class.
@@ -125,16 +123,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GoogleGeometry.cs b/src/Flipdish/Model/GoogleGeometry.cs
index 1c1c46ef..73077b8f 100644
--- a/src/Flipdish/Model/GoogleGeometry.cs
+++ b/src/Flipdish/Model/GoogleGeometry.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// GoogleGeometry
     /// </summary>
     [DataContract]
-    public partial class GoogleGeometry :  IEquatable<GoogleGeometry>, IValidatableObject
+    public partial class GoogleGeometry :  IEquatable<GoogleGeometry>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GoogleGeometry" /> class.
@@ -141,16 +139,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GoogleLocation.cs b/src/Flipdish/Model/GoogleLocation.cs
index 2b9e9921..fd40f7c0 100644
--- a/src/Flipdish/Model/GoogleLocation.cs
+++ b/src/Flipdish/Model/GoogleLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// GoogleLocation
     /// </summary>
     [DataContract]
-    public partial class GoogleLocation :  IEquatable<GoogleLocation>, IValidatableObject
+    public partial class GoogleLocation :  IEquatable<GoogleLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GoogleLocation" /> class.
@@ -125,16 +123,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GoogleViewport.cs b/src/Flipdish/Model/GoogleViewport.cs
index 6ee4439f..06c0e36b 100644
--- a/src/Flipdish/Model/GoogleViewport.cs
+++ b/src/Flipdish/Model/GoogleViewport.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// GoogleViewport
     /// </summary>
     [DataContract]
-    public partial class GoogleViewport :  IEquatable<GoogleViewport>, IValidatableObject
+    public partial class GoogleViewport :  IEquatable<GoogleViewport>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GoogleViewport" /> class.
@@ -125,16 +123,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Group.cs b/src/Flipdish/Model/Group.cs
index 397ad63a..88e70f65 100644
--- a/src/Flipdish/Model/Group.cs
+++ b/src/Flipdish/Model/Group.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// CatalogGroup
     /// </summary>
     [DataContract]
-    public partial class Group :  IEquatable<Group>, IValidatableObject
+    public partial class Group :  IEquatable<Group>
     {
         /// <summary>
         /// Type of group (ModifierGroup, etc)
@@ -341,76 +339,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogGroupId (string) maxLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be less than 30.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogGroupId (string) minLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be greater than 0.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GroupReference.cs b/src/Flipdish/Model/GroupReference.cs
index d67bad76..9a7d88c2 100644
--- a/src/Flipdish/Model/GroupReference.cs
+++ b/src/Flipdish/Model/GroupReference.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Reference to an existing {Flipdish.PublicModels.V1.Catalog.Groups.Group}
+    /// Reference to an existing {Flipdish.Menus.PublicModels.V1.Catalog.Groups.Group}
     /// </summary>
     [DataContract]
-    public partial class GroupReference :  IEquatable<GroupReference>, IValidatableObject
+    public partial class GroupReference :  IEquatable<GroupReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -59,7 +57,7 @@ protected GroupReference() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="GroupReference" /> class.
         /// </summary>
-        /// <param name="group">Details of the referenced {Flipdish.PublicModels.V1.Catalog.Products.GroupReference.Group}.</param>
+        /// <param name="group">Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Products.GroupReference.Group}.</param>
         /// <param name="catalogItemId">Identifier of the ProductId to use as SubProduct (required).</param>
         /// <param name="groupType">Type of the SupProduct (required).</param>
         public GroupReference(Group group = default(Group), string catalogItemId = default(string), GroupTypeEnum groupType = default(GroupTypeEnum))
@@ -86,9 +84,9 @@ protected GroupReference() { }
         }
         
         /// <summary>
-        /// Details of the referenced {Flipdish.PublicModels.V1.Catalog.Products.GroupReference.Group}
+        /// Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Products.GroupReference.Group}
         /// </summary>
-        /// <value>Details of the referenced {Flipdish.PublicModels.V1.Catalog.Products.GroupReference.Group}</value>
+        /// <value>Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Products.GroupReference.Group}</value>
         [DataMember(Name="Group", EmitDefaultValue=false)]
         public Group Group { get; set; }
 
@@ -180,28 +178,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/GroupedCoordinates.cs b/src/Flipdish/Model/GroupedCoordinates.cs
index ec7e3612..c45b4ee4 100644
--- a/src/Flipdish/Model/GroupedCoordinates.cs
+++ b/src/Flipdish/Model/GroupedCoordinates.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Describes coordinates that have a group
     /// </summary>
     [DataContract]
-    public partial class GroupedCoordinates :  IEquatable<GroupedCoordinates>, IValidatableObject
+    public partial class GroupedCoordinates :  IEquatable<GroupedCoordinates>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GroupedCoordinates" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HasPaymentMethodResponse.cs b/src/Flipdish/Model/HasPaymentMethodResponse.cs
new file mode 100644
index 00000000..98dd9ecd
--- /dev/null
+++ b/src/Flipdish/Model/HasPaymentMethodResponse.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Has Payment Method Response
+    /// </summary>
+    [DataContract]
+    public partial class HasPaymentMethodResponse :  IEquatable<HasPaymentMethodResponse>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HasPaymentMethodResponse" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected HasPaymentMethodResponse() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HasPaymentMethodResponse" /> class.
+        /// </summary>
+        /// <param name="hasPaymentMethod">Has Payment Method (required).</param>
+        public HasPaymentMethodResponse(bool? hasPaymentMethod = default(bool?))
+        {
+            // to ensure "hasPaymentMethod" is required (not null)
+            if (hasPaymentMethod == null)
+            {
+                throw new InvalidDataException("hasPaymentMethod is a required property for HasPaymentMethodResponse and cannot be null");
+            }
+            else
+            {
+                this.HasPaymentMethod = hasPaymentMethod;
+            }
+        }
+        
+        /// <summary>
+        /// Has Payment Method
+        /// </summary>
+        /// <value>Has Payment Method</value>
+        [DataMember(Name="HasPaymentMethod", EmitDefaultValue=false)]
+        public bool? HasPaymentMethod { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class HasPaymentMethodResponse {\n");
+            sb.Append("  HasPaymentMethod: ").Append(HasPaymentMethod).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as HasPaymentMethodResponse);
+        }
+
+        /// <summary>
+        /// Returns true if HasPaymentMethodResponse instances are equal
+        /// </summary>
+        /// <param name="input">Instance of HasPaymentMethodResponse to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(HasPaymentMethodResponse input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.HasPaymentMethod == input.HasPaymentMethod ||
+                    (this.HasPaymentMethod != null &&
+                    this.HasPaymentMethod.Equals(input.HasPaymentMethod))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.HasPaymentMethod != null)
+                    hashCode = hashCode * 59 + this.HasPaymentMethod.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/HomeAction.cs b/src/Flipdish/Model/HomeAction.cs
index ac1ac5a7..fc20bf4a 100644
--- a/src/Flipdish/Model/HomeAction.cs
+++ b/src/Flipdish/Model/HomeAction.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// HomeAction
     /// </summary>
     [DataContract]
-    public partial class HomeAction :  IEquatable<HomeAction>, IValidatableObject
+    public partial class HomeAction :  IEquatable<HomeAction>
     {
         /// <summary>
         /// Type of Action
@@ -243,16 +241,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HomeStatistics.cs b/src/Flipdish/Model/HomeStatistics.cs
index aeaf553a..14534a7c 100644
--- a/src/Flipdish/Model/HomeStatistics.cs
+++ b/src/Flipdish/Model/HomeStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Home statitstics
     /// </summary>
     [DataContract]
-    public partial class HomeStatistics :  IEquatable<HomeStatistics>, IValidatableObject
+    public partial class HomeStatistics :  IEquatable<HomeStatistics>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HomeStatistics" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HttpPostedFileBase.cs b/src/Flipdish/Model/HttpPostedFileBase.cs
new file mode 100644
index 00000000..34ae9193
--- /dev/null
+++ b/src/Flipdish/Model/HttpPostedFileBase.cs
@@ -0,0 +1,153 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// HttpPostedFileBase
+    /// </summary>
+    [DataContract]
+    public partial class HttpPostedFileBase :  IEquatable<HttpPostedFileBase>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpPostedFileBase" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        public HttpPostedFileBase()
+        {
+        }
+        
+        /// <summary>
+        /// Gets or Sets ContentLength
+        /// </summary>
+        [DataMember(Name="ContentLength", EmitDefaultValue=false)]
+        public int? ContentLength { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets ContentType
+        /// </summary>
+        [DataMember(Name="ContentType", EmitDefaultValue=false)]
+        public string ContentType { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets FileName
+        /// </summary>
+        [DataMember(Name="FileName", EmitDefaultValue=false)]
+        public string FileName { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets InputStream
+        /// </summary>
+        [DataMember(Name="InputStream", EmitDefaultValue=false)]
+        public Stream InputStream { get; private set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class HttpPostedFileBase {\n");
+            sb.Append("  ContentLength: ").Append(ContentLength).Append("\n");
+            sb.Append("  ContentType: ").Append(ContentType).Append("\n");
+            sb.Append("  FileName: ").Append(FileName).Append("\n");
+            sb.Append("  InputStream: ").Append(InputStream).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as HttpPostedFileBase);
+        }
+
+        /// <summary>
+        /// Returns true if HttpPostedFileBase instances are equal
+        /// </summary>
+        /// <param name="input">Instance of HttpPostedFileBase to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(HttpPostedFileBase input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.ContentLength == input.ContentLength ||
+                    (this.ContentLength != null &&
+                    this.ContentLength.Equals(input.ContentLength))
+                ) && 
+                (
+                    this.ContentType == input.ContentType ||
+                    (this.ContentType != null &&
+                    this.ContentType.Equals(input.ContentType))
+                ) && 
+                (
+                    this.FileName == input.FileName ||
+                    (this.FileName != null &&
+                    this.FileName.Equals(input.FileName))
+                ) && 
+                (
+                    this.InputStream == input.InputStream ||
+                    (this.InputStream != null &&
+                    this.InputStream.Equals(input.InputStream))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.ContentLength != null)
+                    hashCode = hashCode * 59 + this.ContentLength.GetHashCode();
+                if (this.ContentType != null)
+                    hashCode = hashCode * 59 + this.ContentType.GetHashCode();
+                if (this.FileName != null)
+                    hashCode = hashCode * 59 + this.FileName.GetHashCode();
+                if (this.InputStream != null)
+                    hashCode = hashCode * 59 + this.InputStream.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/HttpRequestAndResponseLog.cs b/src/Flipdish/Model/HttpRequestAndResponseLog.cs
deleted file mode 100644
index 64049f4f..00000000
--- a/src/Flipdish/Model/HttpRequestAndResponseLog.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Http Request and Response Log
-    /// </summary>
-    [DataContract]
-    public partial class HttpRequestAndResponseLog :  IEquatable<HttpRequestAndResponseLog>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpRequestAndResponseLog" /> class.
-        /// </summary>
-        /// <param name="guid">Id of the log.</param>
-        /// <param name="verb">Verb associated with the HTTP call..</param>
-        /// <param name="requestUri">Http request URI..</param>
-        /// <param name="statusCode">Http response status code..</param>
-        /// <param name="reasonPhrase">Http response status line..</param>
-        /// <param name="callDurationInMilliseconds">Call duration representing the duration of the HTTP call in milliseconds..</param>
-        /// <param name="userId">Identity of the caller..</param>
-        /// <param name="ipAddress">Ip address of the caller.</param>
-        /// <param name="createdDateTime">Timestamp at which the HTTP call took place..</param>
-        /// <param name="requestHeaders">Http request headers..</param>
-        /// <param name="requestBody">Http request body, if any..</param>
-        /// <param name="requestLength">Http request content-length.</param>
-        /// <param name="responseHeaders">Http response headers..</param>
-        /// <param name="responseBody">Http response body..</param>
-        /// <param name="responseLength">Http response content-length.</param>
-        public HttpRequestAndResponseLog(Guid? guid = default(Guid?), string verb = default(string), string requestUri = default(string), int? statusCode = default(int?), string reasonPhrase = default(string), long? callDurationInMilliseconds = default(long?), string userId = default(string), string ipAddress = default(string), string createdDateTime = default(string), Dictionary<string, string> requestHeaders = default(Dictionary<string, string>), string requestBody = default(string), long? requestLength = default(long?), Dictionary<string, string> responseHeaders = default(Dictionary<string, string>), string responseBody = default(string), long? responseLength = default(long?))
-        {
-            this.Guid = guid;
-            this.Verb = verb;
-            this.RequestUri = requestUri;
-            this.StatusCode = statusCode;
-            this.ReasonPhrase = reasonPhrase;
-            this.CallDurationInMilliseconds = callDurationInMilliseconds;
-            this.UserId = userId;
-            this.IpAddress = ipAddress;
-            this.CreatedDateTime = createdDateTime;
-            this.RequestHeaders = requestHeaders;
-            this.RequestBody = requestBody;
-            this.RequestLength = requestLength;
-            this.ResponseHeaders = responseHeaders;
-            this.ResponseBody = responseBody;
-            this.ResponseLength = responseLength;
-        }
-        
-        /// <summary>
-        /// Id of the log
-        /// </summary>
-        /// <value>Id of the log</value>
-        [DataMember(Name="Guid", EmitDefaultValue=false)]
-        public Guid? Guid { get; set; }
-
-        /// <summary>
-        /// Verb associated with the HTTP call.
-        /// </summary>
-        /// <value>Verb associated with the HTTP call.</value>
-        [DataMember(Name="Verb", EmitDefaultValue=false)]
-        public string Verb { get; set; }
-
-        /// <summary>
-        /// Http request URI.
-        /// </summary>
-        /// <value>Http request URI.</value>
-        [DataMember(Name="RequestUri", EmitDefaultValue=false)]
-        public string RequestUri { get; set; }
-
-        /// <summary>
-        /// Http response status code.
-        /// </summary>
-        /// <value>Http response status code.</value>
-        [DataMember(Name="StatusCode", EmitDefaultValue=false)]
-        public int? StatusCode { get; set; }
-
-        /// <summary>
-        /// Http response status line.
-        /// </summary>
-        /// <value>Http response status line.</value>
-        [DataMember(Name="ReasonPhrase", EmitDefaultValue=false)]
-        public string ReasonPhrase { get; set; }
-
-        /// <summary>
-        /// Call duration representing the duration of the HTTP call in milliseconds.
-        /// </summary>
-        /// <value>Call duration representing the duration of the HTTP call in milliseconds.</value>
-        [DataMember(Name="CallDurationInMilliseconds", EmitDefaultValue=false)]
-        public long? CallDurationInMilliseconds { get; set; }
-
-        /// <summary>
-        /// Identity of the caller.
-        /// </summary>
-        /// <value>Identity of the caller.</value>
-        [DataMember(Name="UserId", EmitDefaultValue=false)]
-        public string UserId { get; set; }
-
-        /// <summary>
-        /// Ip address of the caller
-        /// </summary>
-        /// <value>Ip address of the caller</value>
-        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
-        public string IpAddress { get; set; }
-
-        /// <summary>
-        /// Timestamp at which the HTTP call took place.
-        /// </summary>
-        /// <value>Timestamp at which the HTTP call took place.</value>
-        [DataMember(Name="CreatedDateTime", EmitDefaultValue=false)]
-        public string CreatedDateTime { get; set; }
-
-        /// <summary>
-        /// Http request headers.
-        /// </summary>
-        /// <value>Http request headers.</value>
-        [DataMember(Name="RequestHeaders", EmitDefaultValue=false)]
-        public Dictionary<string, string> RequestHeaders { get; set; }
-
-        /// <summary>
-        /// Http request body, if any.
-        /// </summary>
-        /// <value>Http request body, if any.</value>
-        [DataMember(Name="RequestBody", EmitDefaultValue=false)]
-        public string RequestBody { get; set; }
-
-        /// <summary>
-        /// Http request content-length
-        /// </summary>
-        /// <value>Http request content-length</value>
-        [DataMember(Name="RequestLength", EmitDefaultValue=false)]
-        public long? RequestLength { get; set; }
-
-        /// <summary>
-        /// Http response headers.
-        /// </summary>
-        /// <value>Http response headers.</value>
-        [DataMember(Name="ResponseHeaders", EmitDefaultValue=false)]
-        public Dictionary<string, string> ResponseHeaders { get; set; }
-
-        /// <summary>
-        /// Http response body.
-        /// </summary>
-        /// <value>Http response body.</value>
-        [DataMember(Name="ResponseBody", EmitDefaultValue=false)]
-        public string ResponseBody { get; set; }
-
-        /// <summary>
-        /// Http response content-length
-        /// </summary>
-        /// <value>Http response content-length</value>
-        [DataMember(Name="ResponseLength", EmitDefaultValue=false)]
-        public long? ResponseLength { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class HttpRequestAndResponseLog {\n");
-            sb.Append("  Guid: ").Append(Guid).Append("\n");
-            sb.Append("  Verb: ").Append(Verb).Append("\n");
-            sb.Append("  RequestUri: ").Append(RequestUri).Append("\n");
-            sb.Append("  StatusCode: ").Append(StatusCode).Append("\n");
-            sb.Append("  ReasonPhrase: ").Append(ReasonPhrase).Append("\n");
-            sb.Append("  CallDurationInMilliseconds: ").Append(CallDurationInMilliseconds).Append("\n");
-            sb.Append("  UserId: ").Append(UserId).Append("\n");
-            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
-            sb.Append("  CreatedDateTime: ").Append(CreatedDateTime).Append("\n");
-            sb.Append("  RequestHeaders: ").Append(RequestHeaders).Append("\n");
-            sb.Append("  RequestBody: ").Append(RequestBody).Append("\n");
-            sb.Append("  RequestLength: ").Append(RequestLength).Append("\n");
-            sb.Append("  ResponseHeaders: ").Append(ResponseHeaders).Append("\n");
-            sb.Append("  ResponseBody: ").Append(ResponseBody).Append("\n");
-            sb.Append("  ResponseLength: ").Append(ResponseLength).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as HttpRequestAndResponseLog);
-        }
-
-        /// <summary>
-        /// Returns true if HttpRequestAndResponseLog instances are equal
-        /// </summary>
-        /// <param name="input">Instance of HttpRequestAndResponseLog to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(HttpRequestAndResponseLog input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Guid == input.Guid ||
-                    (this.Guid != null &&
-                    this.Guid.Equals(input.Guid))
-                ) && 
-                (
-                    this.Verb == input.Verb ||
-                    (this.Verb != null &&
-                    this.Verb.Equals(input.Verb))
-                ) && 
-                (
-                    this.RequestUri == input.RequestUri ||
-                    (this.RequestUri != null &&
-                    this.RequestUri.Equals(input.RequestUri))
-                ) && 
-                (
-                    this.StatusCode == input.StatusCode ||
-                    (this.StatusCode != null &&
-                    this.StatusCode.Equals(input.StatusCode))
-                ) && 
-                (
-                    this.ReasonPhrase == input.ReasonPhrase ||
-                    (this.ReasonPhrase != null &&
-                    this.ReasonPhrase.Equals(input.ReasonPhrase))
-                ) && 
-                (
-                    this.CallDurationInMilliseconds == input.CallDurationInMilliseconds ||
-                    (this.CallDurationInMilliseconds != null &&
-                    this.CallDurationInMilliseconds.Equals(input.CallDurationInMilliseconds))
-                ) && 
-                (
-                    this.UserId == input.UserId ||
-                    (this.UserId != null &&
-                    this.UserId.Equals(input.UserId))
-                ) && 
-                (
-                    this.IpAddress == input.IpAddress ||
-                    (this.IpAddress != null &&
-                    this.IpAddress.Equals(input.IpAddress))
-                ) && 
-                (
-                    this.CreatedDateTime == input.CreatedDateTime ||
-                    (this.CreatedDateTime != null &&
-                    this.CreatedDateTime.Equals(input.CreatedDateTime))
-                ) && 
-                (
-                    this.RequestHeaders == input.RequestHeaders ||
-                    this.RequestHeaders != null &&
-                    this.RequestHeaders.SequenceEqual(input.RequestHeaders)
-                ) && 
-                (
-                    this.RequestBody == input.RequestBody ||
-                    (this.RequestBody != null &&
-                    this.RequestBody.Equals(input.RequestBody))
-                ) && 
-                (
-                    this.RequestLength == input.RequestLength ||
-                    (this.RequestLength != null &&
-                    this.RequestLength.Equals(input.RequestLength))
-                ) && 
-                (
-                    this.ResponseHeaders == input.ResponseHeaders ||
-                    this.ResponseHeaders != null &&
-                    this.ResponseHeaders.SequenceEqual(input.ResponseHeaders)
-                ) && 
-                (
-                    this.ResponseBody == input.ResponseBody ||
-                    (this.ResponseBody != null &&
-                    this.ResponseBody.Equals(input.ResponseBody))
-                ) && 
-                (
-                    this.ResponseLength == input.ResponseLength ||
-                    (this.ResponseLength != null &&
-                    this.ResponseLength.Equals(input.ResponseLength))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Guid != null)
-                    hashCode = hashCode * 59 + this.Guid.GetHashCode();
-                if (this.Verb != null)
-                    hashCode = hashCode * 59 + this.Verb.GetHashCode();
-                if (this.RequestUri != null)
-                    hashCode = hashCode * 59 + this.RequestUri.GetHashCode();
-                if (this.StatusCode != null)
-                    hashCode = hashCode * 59 + this.StatusCode.GetHashCode();
-                if (this.ReasonPhrase != null)
-                    hashCode = hashCode * 59 + this.ReasonPhrase.GetHashCode();
-                if (this.CallDurationInMilliseconds != null)
-                    hashCode = hashCode * 59 + this.CallDurationInMilliseconds.GetHashCode();
-                if (this.UserId != null)
-                    hashCode = hashCode * 59 + this.UserId.GetHashCode();
-                if (this.IpAddress != null)
-                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
-                if (this.CreatedDateTime != null)
-                    hashCode = hashCode * 59 + this.CreatedDateTime.GetHashCode();
-                if (this.RequestHeaders != null)
-                    hashCode = hashCode * 59 + this.RequestHeaders.GetHashCode();
-                if (this.RequestBody != null)
-                    hashCode = hashCode * 59 + this.RequestBody.GetHashCode();
-                if (this.RequestLength != null)
-                    hashCode = hashCode * 59 + this.RequestLength.GetHashCode();
-                if (this.ResponseHeaders != null)
-                    hashCode = hashCode * 59 + this.ResponseHeaders.GetHashCode();
-                if (this.ResponseBody != null)
-                    hashCode = hashCode * 59 + this.ResponseBody.GetHashCode();
-                if (this.ResponseLength != null)
-                    hashCode = hashCode * 59 + this.ResponseLength.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/HydraAssignedEvent.cs b/src/Flipdish/Model/HydraAssignedEvent.cs
index ab6e1cbf..78ec1d0d 100644
--- a/src/Flipdish/Model/HydraAssignedEvent.cs
+++ b/src/Flipdish/Model/HydraAssignedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra assigned event
     /// </summary>
     [DataContract]
-    public partial class HydraAssignedEvent :  IEquatable<HydraAssignedEvent>, IValidatableObject
+    public partial class HydraAssignedEvent :  IEquatable<HydraAssignedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraAssignedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class HydraAssignedEvent :  IEquatable<HydraAssignedEvent>, IVali
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public HydraAssignedEvent(UserEventInfo user = default(UserEventInfo), HydraStatus hydraStatus = default(HydraStatus), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public HydraAssignedEvent(UserEventInfo user = default(UserEventInfo), HydraStatus hydraStatus = default(HydraStatus), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.User = user;
             this.HydraStatus = hydraStatus;
@@ -50,7 +51,10 @@ public partial class HydraAssignedEvent :  IEquatable<HydraAssignedEvent>, IVali
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class HydraAssignedEvent :  IEquatable<HydraAssignedEvent>, IVali
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class HydraAssignedEvent :  IEquatable<HydraAssignedEvent>, IVali
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(HydraAssignedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraConfig.cs b/src/Flipdish/Model/HydraConfig.cs
index 7981e753..104d7868 100644
--- a/src/Flipdish/Model/HydraConfig.cs
+++ b/src/Flipdish/Model/HydraConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra configuration
     /// </summary>
     [DataContract]
-    public partial class HydraConfig :  IEquatable<HydraConfig>, IValidatableObject
+    public partial class HydraConfig :  IEquatable<HydraConfig>
     {
         /// <summary>
         /// Defines PaymentOptions
@@ -268,16 +266,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraConnectionStatusChangedEvent.cs b/src/Flipdish/Model/HydraConnectionStatusChangedEvent.cs
index 895e84bf..be0ae1bc 100644
--- a/src/Flipdish/Model/HydraConnectionStatusChangedEvent.cs
+++ b/src/Flipdish/Model/HydraConnectionStatusChangedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra Connection Status Changed Event
     /// </summary>
     [DataContract]
-    public partial class HydraConnectionStatusChangedEvent :  IEquatable<HydraConnectionStatusChangedEvent>, IValidatableObject
+    public partial class HydraConnectionStatusChangedEvent :  IEquatable<HydraConnectionStatusChangedEvent>
     {
         /// <summary>
         /// Hydra Device Status
@@ -74,8 +72,11 @@ public enum HydraDeviceStatusEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public HydraConnectionStatusChangedEvent(string deviceId = default(string), HydraDeviceStatusEnum? hydraDeviceStatus = default(HydraDeviceStatusEnum?), DateTime? pollTime = default(DateTime?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public HydraConnectionStatusChangedEvent(string deviceId = default(string), HydraDeviceStatusEnum? hydraDeviceStatus = default(HydraDeviceStatusEnum?), DateTime? pollTime = default(DateTime?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.HydraDeviceStatus = hydraDeviceStatus;
@@ -85,7 +86,10 @@ public enum HydraDeviceStatusEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -138,6 +142,13 @@ public enum HydraDeviceStatusEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -145,6 +156,20 @@ public enum HydraDeviceStatusEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -161,7 +186,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -236,10 +264,25 @@ public bool Equals(HydraConnectionStatusChangedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -268,21 +311,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraCreatedEvent.cs b/src/Flipdish/Model/HydraCreatedEvent.cs
new file mode 100644
index 00000000..30c2d781
--- /dev/null
+++ b/src/Flipdish/Model/HydraCreatedEvent.cs
@@ -0,0 +1,388 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Hydra device created event (pin-stage / pre-register).
+    /// </summary>
+    [DataContract]
+    public partial class HydraCreatedEvent :  IEquatable<HydraCreatedEvent>
+    {
+        /// <summary>
+        /// Hydra user type (Kiosk / Terminal) as integer. Prefer {Flipdish.PublicModels.V1.Events.Hydra.HydraCreatedEvent.DeviceType}.
+        /// </summary>
+        /// <value>Hydra user type (Kiosk / Terminal) as integer. Prefer {Flipdish.PublicModels.V1.Events.Hydra.HydraCreatedEvent.DeviceType}.</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum UserTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 1,
+            
+            /// <summary>
+            /// Enum Terminal for value: Terminal
+            /// </summary>
+            [EnumMember(Value = "Terminal")]
+            Terminal = 2,
+            
+            /// <summary>
+            /// Enum LegacyPrinter for value: LegacyPrinter
+            /// </summary>
+            [EnumMember(Value = "LegacyPrinter")]
+            LegacyPrinter = 3
+        }
+
+        /// <summary>
+        /// Hydra user type (Kiosk / Terminal) as integer. Prefer {Flipdish.PublicModels.V1.Events.Hydra.HydraCreatedEvent.DeviceType}.
+        /// </summary>
+        /// <value>Hydra user type (Kiosk / Terminal) as integer. Prefer {Flipdish.PublicModels.V1.Events.Hydra.HydraCreatedEvent.DeviceType}.</value>
+        [DataMember(Name="UserType", EmitDefaultValue=false)]
+        public UserTypeEnum? UserType { get; set; }
+        /// <summary>
+        /// Hydra device type (Kiosk / Terminal), serialized as string.
+        /// </summary>
+        /// <value>Hydra device type (Kiosk / Terminal), serialized as string.</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum DeviceTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 1,
+            
+            /// <summary>
+            /// Enum Terminal for value: Terminal
+            /// </summary>
+            [EnumMember(Value = "Terminal")]
+            Terminal = 2,
+            
+            /// <summary>
+            /// Enum LegacyPrinter for value: LegacyPrinter
+            /// </summary>
+            [EnumMember(Value = "LegacyPrinter")]
+            LegacyPrinter = 3
+        }
+
+        /// <summary>
+        /// Hydra device type (Kiosk / Terminal), serialized as string.
+        /// </summary>
+        /// <value>Hydra device type (Kiosk / Terminal), serialized as string.</value>
+        [DataMember(Name="DeviceType", EmitDefaultValue=false)]
+        public DeviceTypeEnum? DeviceType { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HydraCreatedEvent" /> class.
+        /// </summary>
+        /// <param name="user">Optional user who triggered creation (may be null for device self-create)..</param>
+        /// <param name="deviceId">Device id.</param>
+        /// <param name="hydraUserId">Zeus Hydra user id.</param>
+        /// <param name="userType">Hydra user type (Kiosk / Terminal) as integer. Prefer {Flipdish.PublicModels.V1.Events.Hydra.HydraCreatedEvent.DeviceType}..</param>
+        /// <param name="deviceType">Hydra device type (Kiosk / Terminal), serialized as string..</param>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public HydraCreatedEvent(UserEventInfo user = default(UserEventInfo), string deviceId = default(string), int? hydraUserId = default(int?), UserTypeEnum? userType = default(UserTypeEnum?), DeviceTypeEnum? deviceType = default(DeviceTypeEnum?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.User = user;
+            this.DeviceId = deviceId;
+            this.HydraUserId = hydraUserId;
+            this.UserType = userType;
+            this.DeviceType = deviceType;
+            this.EventName = eventName;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// Optional user who triggered creation (may be null for device self-create).
+        /// </summary>
+        /// <value>Optional user who triggered creation (may be null for device self-create).</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
+        /// <summary>
+        /// Device id
+        /// </summary>
+        /// <value>Device id</value>
+        [DataMember(Name="DeviceId", EmitDefaultValue=false)]
+        public string DeviceId { get; set; }
+
+        /// <summary>
+        /// Zeus Hydra user id
+        /// </summary>
+        /// <value>Zeus Hydra user id</value>
+        [DataMember(Name="HydraUserId", EmitDefaultValue=false)]
+        public int? HydraUserId { get; set; }
+
+
+
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class HydraCreatedEvent {\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  DeviceId: ").Append(DeviceId).Append("\n");
+            sb.Append("  HydraUserId: ").Append(HydraUserId).Append("\n");
+            sb.Append("  UserType: ").Append(UserType).Append("\n");
+            sb.Append("  DeviceType: ").Append(DeviceType).Append("\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as HydraCreatedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if HydraCreatedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of HydraCreatedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(HydraCreatedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
+                (
+                    this.DeviceId == input.DeviceId ||
+                    (this.DeviceId != null &&
+                    this.DeviceId.Equals(input.DeviceId))
+                ) && 
+                (
+                    this.HydraUserId == input.HydraUserId ||
+                    (this.HydraUserId != null &&
+                    this.HydraUserId.Equals(input.HydraUserId))
+                ) && 
+                (
+                    this.UserType == input.UserType ||
+                    (this.UserType != null &&
+                    this.UserType.Equals(input.UserType))
+                ) && 
+                (
+                    this.DeviceType == input.DeviceType ||
+                    (this.DeviceType != null &&
+                    this.DeviceType.Equals(input.DeviceType))
+                ) && 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.DeviceId != null)
+                    hashCode = hashCode * 59 + this.DeviceId.GetHashCode();
+                if (this.HydraUserId != null)
+                    hashCode = hashCode * 59 + this.HydraUserId.GetHashCode();
+                if (this.UserType != null)
+                    hashCode = hashCode * 59 + this.UserType.GetHashCode();
+                if (this.DeviceType != null)
+                    hashCode = hashCode * 59 + this.DeviceType.GetHashCode();
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/HydraDeviceDetails.cs b/src/Flipdish/Model/HydraDeviceDetails.cs
index 9bb13326..7ef95db2 100644
--- a/src/Flipdish/Model/HydraDeviceDetails.cs
+++ b/src/Flipdish/Model/HydraDeviceDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra device details
     /// </summary>
     [DataContract]
-    public partial class HydraDeviceDetails :  IEquatable<HydraDeviceDetails>, IValidatableObject
+    public partial class HydraDeviceDetails :  IEquatable<HydraDeviceDetails>
     {
         /// <summary>
         /// Type of the device
@@ -100,7 +98,8 @@ public enum StatusEnum
         /// Initializes a new instance of the <see cref="HydraDeviceDetails" /> class.
         /// </summary>
         /// <param name="hydraConfigId">Flipdish internal device identifier.</param>
-        /// <param name="deviceId">Device Id or Serial Number.</param>
+        /// <param name="deviceId">Device Id.</param>
+        /// <param name="serialNumber">Serial Number.</param>
         /// <param name="deviceType">Type of the device.</param>
         /// <param name="status">Status of the device.</param>
         /// <param name="deviceName">Device Name.</param>
@@ -110,10 +109,11 @@ public enum StatusEnum
         /// <param name="buildNumber">Build number of the device.</param>
         /// <param name="gitSha">SHA of the commit.</param>
         /// <param name="gitBranch">Build branch.</param>
-        public HydraDeviceDetails(int? hydraConfigId = default(int?), string deviceId = default(string), DeviceTypeEnum? deviceType = default(DeviceTypeEnum?), StatusEnum? status = default(StatusEnum?), string deviceName = default(string), List<HydraStoreData> storeNames = default(List<HydraStoreData>), DateTime? lastPollUtc = default(DateTime?), string version = default(string), string buildNumber = default(string), string gitSha = default(string), string gitBranch = default(string))
+        public HydraDeviceDetails(int? hydraConfigId = default(int?), string deviceId = default(string), string serialNumber = default(string), DeviceTypeEnum? deviceType = default(DeviceTypeEnum?), StatusEnum? status = default(StatusEnum?), string deviceName = default(string), List<HydraStoreData> storeNames = default(List<HydraStoreData>), DateTime? lastPollUtc = default(DateTime?), string version = default(string), string buildNumber = default(string), string gitSha = default(string), string gitBranch = default(string))
         {
             this.HydraConfigId = hydraConfigId;
             this.DeviceId = deviceId;
+            this.SerialNumber = serialNumber;
             this.DeviceType = deviceType;
             this.Status = status;
             this.DeviceName = deviceName;
@@ -133,12 +133,19 @@ public enum StatusEnum
         public int? HydraConfigId { get; set; }
 
         /// <summary>
-        /// Device Id or Serial Number
+        /// Device Id
         /// </summary>
-        /// <value>Device Id or Serial Number</value>
+        /// <value>Device Id</value>
         [DataMember(Name="DeviceId", EmitDefaultValue=false)]
         public string DeviceId { get; set; }
 
+        /// <summary>
+        /// Serial Number
+        /// </summary>
+        /// <value>Serial Number</value>
+        [DataMember(Name="SerialNumber", EmitDefaultValue=false)]
+        public string SerialNumber { get; set; }
+
 
 
         /// <summary>
@@ -200,6 +207,7 @@ public override string ToString()
             sb.Append("class HydraDeviceDetails {\n");
             sb.Append("  HydraConfigId: ").Append(HydraConfigId).Append("\n");
             sb.Append("  DeviceId: ").Append(DeviceId).Append("\n");
+            sb.Append("  SerialNumber: ").Append(SerialNumber).Append("\n");
             sb.Append("  DeviceType: ").Append(DeviceType).Append("\n");
             sb.Append("  Status: ").Append(Status).Append("\n");
             sb.Append("  DeviceName: ").Append(DeviceName).Append("\n");
@@ -253,6 +261,11 @@ public bool Equals(HydraDeviceDetails input)
                     (this.DeviceId != null &&
                     this.DeviceId.Equals(input.DeviceId))
                 ) && 
+                (
+                    this.SerialNumber == input.SerialNumber ||
+                    (this.SerialNumber != null &&
+                    this.SerialNumber.Equals(input.SerialNumber))
+                ) && 
                 (
                     this.DeviceType == input.DeviceType ||
                     (this.DeviceType != null &&
@@ -313,6 +326,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.HydraConfigId.GetHashCode();
                 if (this.DeviceId != null)
                     hashCode = hashCode * 59 + this.DeviceId.GetHashCode();
+                if (this.SerialNumber != null)
+                    hashCode = hashCode * 59 + this.SerialNumber.GetHashCode();
                 if (this.DeviceType != null)
                     hashCode = hashCode * 59 + this.DeviceType.GetHashCode();
                 if (this.Status != null)
@@ -334,16 +349,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraRegistration.cs b/src/Flipdish/Model/HydraRegistration.cs
deleted file mode 100644
index e89796ea..00000000
--- a/src/Flipdish/Model/HydraRegistration.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Hdyra login result
-    /// </summary>
-    [DataContract]
-    public partial class HydraRegistration :  IEquatable<HydraRegistration>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HydraRegistration" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected HydraRegistration() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HydraRegistration" /> class.
-        /// </summary>
-        /// <param name="appId">App (required).</param>
-        /// <param name="storeId">Store to assign the hydra (required).</param>
-        /// <param name="deviceName">Hydra device name (required).</param>
-        /// <param name="pinCode">6 digit PIN code (not starting with zero)..</param>
-        public HydraRegistration(string appId = default(string), int? storeId = default(int?), string deviceName = default(string), int? pinCode = default(int?))
-        {
-            // to ensure "appId" is required (not null)
-            if (appId == null)
-            {
-                throw new InvalidDataException("appId is a required property for HydraRegistration and cannot be null");
-            }
-            else
-            {
-                this.AppId = appId;
-            }
-            // to ensure "storeId" is required (not null)
-            if (storeId == null)
-            {
-                throw new InvalidDataException("storeId is a required property for HydraRegistration and cannot be null");
-            }
-            else
-            {
-                this.StoreId = storeId;
-            }
-            // to ensure "deviceName" is required (not null)
-            if (deviceName == null)
-            {
-                throw new InvalidDataException("deviceName is a required property for HydraRegistration and cannot be null");
-            }
-            else
-            {
-                this.DeviceName = deviceName;
-            }
-            this.PinCode = pinCode;
-        }
-        
-        /// <summary>
-        /// App
-        /// </summary>
-        /// <value>App</value>
-        [DataMember(Name="AppId", EmitDefaultValue=false)]
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// Store to assign the hydra
-        /// </summary>
-        /// <value>Store to assign the hydra</value>
-        [DataMember(Name="StoreId", EmitDefaultValue=false)]
-        public int? StoreId { get; set; }
-
-        /// <summary>
-        /// Hydra device name
-        /// </summary>
-        /// <value>Hydra device name</value>
-        [DataMember(Name="DeviceName", EmitDefaultValue=false)]
-        public string DeviceName { get; set; }
-
-        /// <summary>
-        /// 6 digit PIN code (not starting with zero).
-        /// </summary>
-        /// <value>6 digit PIN code (not starting with zero).</value>
-        [DataMember(Name="PinCode", EmitDefaultValue=false)]
-        public int? PinCode { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class HydraRegistration {\n");
-            sb.Append("  AppId: ").Append(AppId).Append("\n");
-            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
-            sb.Append("  DeviceName: ").Append(DeviceName).Append("\n");
-            sb.Append("  PinCode: ").Append(PinCode).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as HydraRegistration);
-        }
-
-        /// <summary>
-        /// Returns true if HydraRegistration instances are equal
-        /// </summary>
-        /// <param name="input">Instance of HydraRegistration to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(HydraRegistration input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.AppId == input.AppId ||
-                    (this.AppId != null &&
-                    this.AppId.Equals(input.AppId))
-                ) && 
-                (
-                    this.StoreId == input.StoreId ||
-                    (this.StoreId != null &&
-                    this.StoreId.Equals(input.StoreId))
-                ) && 
-                (
-                    this.DeviceName == input.DeviceName ||
-                    (this.DeviceName != null &&
-                    this.DeviceName.Equals(input.DeviceName))
-                ) && 
-                (
-                    this.PinCode == input.PinCode ||
-                    (this.PinCode != null &&
-                    this.PinCode.Equals(input.PinCode))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.AppId != null)
-                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
-                if (this.StoreId != null)
-                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
-                if (this.DeviceName != null)
-                    hashCode = hashCode * 59 + this.DeviceName.GetHashCode();
-                if (this.PinCode != null)
-                    hashCode = hashCode * 59 + this.PinCode.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // PinCode (int?) maximum
-            if(this.PinCode > (int?)999999)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PinCode, must be a value less than or equal to 999999.", new [] { "PinCode" });
-            }
-
-            // PinCode (int?) minimum
-            if(this.PinCode < (int?)100000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PinCode, must be a value greater than or equal to 100000.", new [] { "PinCode" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/HydraRegistrationRequest.cs b/src/Flipdish/Model/HydraRegistrationRequest.cs
index bc022737..3d70a7e8 100644
--- a/src/Flipdish/Model/HydraRegistrationRequest.cs
+++ b/src/Flipdish/Model/HydraRegistrationRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra registration result
     /// </summary>
     [DataContract]
-    public partial class HydraRegistrationRequest :  IEquatable<HydraRegistrationRequest>, IValidatableObject
+    public partial class HydraRegistrationRequest :  IEquatable<HydraRegistrationRequest>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraRegistrationRequest" /> class.
@@ -165,28 +163,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // PinCode (int?) maximum
-            if(this.PinCode > (int?)999999)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PinCode, must be a value less than or equal to 999999.", new [] { "PinCode" });
-            }
-
-            // PinCode (int?) minimum
-            if(this.PinCode < (int?)100000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PinCode, must be a value greater than or equal to 100000.", new [] { "PinCode" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraRequestResetEvent.cs b/src/Flipdish/Model/HydraRequestResetEvent.cs
index 95b02bdd..956e038f 100644
--- a/src/Flipdish/Model/HydraRequestResetEvent.cs
+++ b/src/Flipdish/Model/HydraRequestResetEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra request reset event
     /// </summary>
     [DataContract]
-    public partial class HydraRequestResetEvent :  IEquatable<HydraRequestResetEvent>, IValidatableObject
+    public partial class HydraRequestResetEvent :  IEquatable<HydraRequestResetEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraRequestResetEvent" /> class.
@@ -39,8 +37,11 @@ public partial class HydraRequestResetEvent :  IEquatable<HydraRequestResetEvent
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public HydraRequestResetEvent(UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public HydraRequestResetEvent(UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.User = user;
             this.EventName = eventName;
@@ -48,7 +49,10 @@ public partial class HydraRequestResetEvent :  IEquatable<HydraRequestResetEvent
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -93,6 +97,13 @@ public partial class HydraRequestResetEvent :  IEquatable<HydraRequestResetEvent
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -100,6 +111,20 @@ public partial class HydraRequestResetEvent :  IEquatable<HydraRequestResetEvent
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -114,7 +139,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -179,10 +207,25 @@ public bool Equals(HydraRequestResetEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -207,21 +250,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraSettingChangedEvent.cs b/src/Flipdish/Model/HydraSettingChangedEvent.cs
index 3d25644d..b3b6a97c 100644
--- a/src/Flipdish/Model/HydraSettingChangedEvent.cs
+++ b/src/Flipdish/Model/HydraSettingChangedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra settings changed
     /// </summary>
     [DataContract]
-    public partial class HydraSettingChangedEvent :  IEquatable<HydraSettingChangedEvent>, IValidatableObject
+    public partial class HydraSettingChangedEvent :  IEquatable<HydraSettingChangedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraSettingChangedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class HydraSettingChangedEvent :  IEquatable<HydraSettingChangedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public HydraSettingChangedEvent(UserEventInfo user = default(UserEventInfo), HydraConfig hydraConfig = default(HydraConfig), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public HydraSettingChangedEvent(UserEventInfo user = default(UserEventInfo), HydraConfig hydraConfig = default(HydraConfig), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.User = user;
             this.HydraConfig = hydraConfig;
@@ -50,7 +51,10 @@ public partial class HydraSettingChangedEvent :  IEquatable<HydraSettingChangedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class HydraSettingChangedEvent :  IEquatable<HydraSettingChangedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class HydraSettingChangedEvent :  IEquatable<HydraSettingChangedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(HydraSettingChangedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraStatus.cs b/src/Flipdish/Model/HydraStatus.cs
index 7febf04f..1af7758f 100644
--- a/src/Flipdish/Model/HydraStatus.cs
+++ b/src/Flipdish/Model/HydraStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,12 @@ namespace Flipdish.Model
     /// Hydra status
     /// </summary>
     [DataContract]
-    public partial class HydraStatus :  IEquatable<HydraStatus>, IValidatableObject
+    public partial class HydraStatus :  IEquatable<HydraStatus>
     {
         /// <summary>
-        /// Hydra User Type
+        /// Hydra User Type as integer. Prefer {Flipdish.PublicModels.V1.Hydra.HydraStatus.DeviceType}.
         /// </summary>
-        /// <value>Hydra User Type</value>
+        /// <value>Hydra User Type as integer. Prefer {Flipdish.PublicModels.V1.Hydra.HydraStatus.DeviceType}.</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum UserTypeEnum
         {
@@ -58,12 +56,45 @@ public enum UserTypeEnum
         }
 
         /// <summary>
-        /// Hydra User Type
+        /// Hydra User Type as integer. Prefer {Flipdish.PublicModels.V1.Hydra.HydraStatus.DeviceType}.
         /// </summary>
-        /// <value>Hydra User Type</value>
+        /// <value>Hydra User Type as integer. Prefer {Flipdish.PublicModels.V1.Hydra.HydraStatus.DeviceType}.</value>
         [DataMember(Name="UserType", EmitDefaultValue=false)]
         public UserTypeEnum? UserType { get; set; }
         /// <summary>
+        /// Hydra device type (Kiosk / Terminal), serialized as string.
+        /// </summary>
+        /// <value>Hydra device type (Kiosk / Terminal), serialized as string.</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum DeviceTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 1,
+            
+            /// <summary>
+            /// Enum Terminal for value: Terminal
+            /// </summary>
+            [EnumMember(Value = "Terminal")]
+            Terminal = 2,
+            
+            /// <summary>
+            /// Enum LegacyPrinter for value: LegacyPrinter
+            /// </summary>
+            [EnumMember(Value = "LegacyPrinter")]
+            LegacyPrinter = 3
+        }
+
+        /// <summary>
+        /// Hydra device type (Kiosk / Terminal), serialized as string.
+        /// </summary>
+        /// <value>Hydra device type (Kiosk / Terminal), serialized as string.</value>
+        [DataMember(Name="DeviceType", EmitDefaultValue=false)]
+        public DeviceTypeEnum? DeviceType { get; set; }
+        /// <summary>
         /// Initializes a new instance of the <see cref="HydraStatus" /> class.
         /// </summary>
         [JsonConstructorAttribute]
@@ -73,11 +104,14 @@ protected HydraStatus() { }
         /// </summary>
         /// <param name="appId">appId (required).</param>
         /// <param name="storeIds">Store to assign the hydra.</param>
+        /// <param name="propertyIds">AuthZ Property ids for assigned stores.</param>
         /// <param name="isRegistered">The device has been already registered (required).</param>
         /// <param name="pinCode">6 digit PIN code (not starting with zero)..</param>
         /// <param name="images">Hydra images (covers).</param>
-        /// <param name="userType">Hydra User Type.</param>
-        public HydraStatus(string appId = default(string), List<int?> storeIds = default(List<int?>), bool? isRegistered = default(bool?), int? pinCode = default(int?), List<string> images = default(List<string>), UserTypeEnum? userType = default(UserTypeEnum?))
+        /// <param name="userType">Hydra User Type as integer. Prefer {Flipdish.PublicModels.V1.Hydra.HydraStatus.DeviceType}..</param>
+        /// <param name="deviceType">Hydra device type (Kiosk / Terminal), serialized as string..</param>
+        /// <param name="hydraUserId">Zeus Hydra user id.</param>
+        public HydraStatus(string appId = default(string), List<int?> storeIds = default(List<int?>), List<string> propertyIds = default(List<string>), bool? isRegistered = default(bool?), int? pinCode = default(int?), List<string> images = default(List<string>), UserTypeEnum? userType = default(UserTypeEnum?), DeviceTypeEnum? deviceType = default(DeviceTypeEnum?), int? hydraUserId = default(int?))
         {
             // to ensure "appId" is required (not null)
             if (appId == null)
@@ -98,9 +132,12 @@ protected HydraStatus() { }
                 this.IsRegistered = isRegistered;
             }
             this.StoreIds = storeIds;
+            this.PropertyIds = propertyIds;
             this.PinCode = pinCode;
             this.Images = images;
             this.UserType = userType;
+            this.DeviceType = deviceType;
+            this.HydraUserId = hydraUserId;
         }
         
         /// <summary>
@@ -116,6 +153,13 @@ protected HydraStatus() { }
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
+        /// <summary>
+        /// AuthZ Property ids for assigned stores
+        /// </summary>
+        /// <value>AuthZ Property ids for assigned stores</value>
+        [DataMember(Name="PropertyIds", EmitDefaultValue=false)]
+        public List<string> PropertyIds { get; set; }
+
         /// <summary>
         /// The device has been already registered
         /// </summary>
@@ -138,6 +182,14 @@ protected HydraStatus() { }
         public List<string> Images { get; set; }
 
 
+
+        /// <summary>
+        /// Zeus Hydra user id
+        /// </summary>
+        /// <value>Zeus Hydra user id</value>
+        [DataMember(Name="HydraUserId", EmitDefaultValue=false)]
+        public int? HydraUserId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -148,10 +200,13 @@ public override string ToString()
             sb.Append("class HydraStatus {\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  PropertyIds: ").Append(PropertyIds).Append("\n");
             sb.Append("  IsRegistered: ").Append(IsRegistered).Append("\n");
             sb.Append("  PinCode: ").Append(PinCode).Append("\n");
             sb.Append("  Images: ").Append(Images).Append("\n");
             sb.Append("  UserType: ").Append(UserType).Append("\n");
+            sb.Append("  DeviceType: ").Append(DeviceType).Append("\n");
+            sb.Append("  HydraUserId: ").Append(HydraUserId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -196,6 +251,11 @@ public bool Equals(HydraStatus input)
                     this.StoreIds != null &&
                     this.StoreIds.SequenceEqual(input.StoreIds)
                 ) && 
+                (
+                    this.PropertyIds == input.PropertyIds ||
+                    this.PropertyIds != null &&
+                    this.PropertyIds.SequenceEqual(input.PropertyIds)
+                ) && 
                 (
                     this.IsRegistered == input.IsRegistered ||
                     (this.IsRegistered != null &&
@@ -215,6 +275,16 @@ public bool Equals(HydraStatus input)
                     this.UserType == input.UserType ||
                     (this.UserType != null &&
                     this.UserType.Equals(input.UserType))
+                ) && 
+                (
+                    this.DeviceType == input.DeviceType ||
+                    (this.DeviceType != null &&
+                    this.DeviceType.Equals(input.DeviceType))
+                ) && 
+                (
+                    this.HydraUserId == input.HydraUserId ||
+                    (this.HydraUserId != null &&
+                    this.HydraUserId.Equals(input.HydraUserId))
                 );
         }
 
@@ -231,6 +301,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.PropertyIds != null)
+                    hashCode = hashCode * 59 + this.PropertyIds.GetHashCode();
                 if (this.IsRegistered != null)
                     hashCode = hashCode * 59 + this.IsRegistered.GetHashCode();
                 if (this.PinCode != null)
@@ -239,31 +311,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Images.GetHashCode();
                 if (this.UserType != null)
                     hashCode = hashCode * 59 + this.UserType.GetHashCode();
+                if (this.DeviceType != null)
+                    hashCode = hashCode * 59 + this.DeviceType.GetHashCode();
+                if (this.HydraUserId != null)
+                    hashCode = hashCode * 59 + this.HydraUserId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // PinCode (int?) maximum
-            if(this.PinCode > (int?)999999)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PinCode, must be a value less than or equal to 999999.", new [] { "PinCode" });
-            }
-
-            // PinCode (int?) minimum
-            if(this.PinCode < (int?)100000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PinCode, must be a value greater than or equal to 100000.", new [] { "PinCode" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraStoreAssignedEvent.cs b/src/Flipdish/Model/HydraStoreAssignedEvent.cs
index 8b42e785..ad59740d 100644
--- a/src/Flipdish/Model/HydraStoreAssignedEvent.cs
+++ b/src/Flipdish/Model/HydraStoreAssignedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra store\\s assigned event
     /// </summary>
     [DataContract]
-    public partial class HydraStoreAssignedEvent :  IEquatable<HydraStoreAssignedEvent>, IValidatableObject
+    public partial class HydraStoreAssignedEvent :  IEquatable<HydraStoreAssignedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraStoreAssignedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class HydraStoreAssignedEvent :  IEquatable<HydraStoreAssignedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public HydraStoreAssignedEvent(UserEventInfo user = default(UserEventInfo), List<int?> storeIds = default(List<int?>), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public HydraStoreAssignedEvent(UserEventInfo user = default(UserEventInfo), List<int?> storeIds = default(List<int?>), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.User = user;
             this.StoreIds = storeIds;
@@ -50,7 +51,10 @@ public partial class HydraStoreAssignedEvent :  IEquatable<HydraStoreAssignedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class HydraStoreAssignedEvent :  IEquatable<HydraStoreAssignedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class HydraStoreAssignedEvent :  IEquatable<HydraStoreAssignedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(HydraStoreAssignedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraStoreData.cs b/src/Flipdish/Model/HydraStoreData.cs
index da04e7d3..72405c2e 100644
--- a/src/Flipdish/Model/HydraStoreData.cs
+++ b/src/Flipdish/Model/HydraStoreData.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Data
     /// </summary>
     [DataContract]
-    public partial class HydraStoreData :  IEquatable<HydraStoreData>, IValidatableObject
+    public partial class HydraStoreData :  IEquatable<HydraStoreData>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraStoreData" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraStoreUnassignedEvent.cs b/src/Flipdish/Model/HydraStoreUnassignedEvent.cs
index 9d160a62..fff6e663 100644
--- a/src/Flipdish/Model/HydraStoreUnassignedEvent.cs
+++ b/src/Flipdish/Model/HydraStoreUnassignedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra store\\s unassigned event
     /// </summary>
     [DataContract]
-    public partial class HydraStoreUnassignedEvent :  IEquatable<HydraStoreUnassignedEvent>, IValidatableObject
+    public partial class HydraStoreUnassignedEvent :  IEquatable<HydraStoreUnassignedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraStoreUnassignedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class HydraStoreUnassignedEvent :  IEquatable<HydraStoreUnassigne
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public HydraStoreUnassignedEvent(UserEventInfo user = default(UserEventInfo), List<int?> storeIds = default(List<int?>), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public HydraStoreUnassignedEvent(UserEventInfo user = default(UserEventInfo), List<int?> storeIds = default(List<int?>), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.User = user;
             this.StoreIds = storeIds;
@@ -50,7 +51,10 @@ public partial class HydraStoreUnassignedEvent :  IEquatable<HydraStoreUnassigne
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class HydraStoreUnassignedEvent :  IEquatable<HydraStoreUnassigne
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class HydraStoreUnassignedEvent :  IEquatable<HydraStoreUnassigne
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(HydraStoreUnassignedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/HydraUnAssignedEvent.cs b/src/Flipdish/Model/HydraUnAssignedEvent.cs
index 98328869..b7ab2ffa 100644
--- a/src/Flipdish/Model/HydraUnAssignedEvent.cs
+++ b/src/Flipdish/Model/HydraUnAssignedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Hydra unassigned event
     /// </summary>
     [DataContract]
-    public partial class HydraUnAssignedEvent :  IEquatable<HydraUnAssignedEvent>, IValidatableObject
+    public partial class HydraUnAssignedEvent :  IEquatable<HydraUnAssignedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HydraUnAssignedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class HydraUnAssignedEvent :  IEquatable<HydraUnAssignedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public HydraUnAssignedEvent(UserEventInfo user = default(UserEventInfo), HydraStatus hydraStatus = default(HydraStatus), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public HydraUnAssignedEvent(UserEventInfo user = default(UserEventInfo), HydraStatus hydraStatus = default(HydraStatus), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.User = user;
             this.HydraStatus = hydraStatus;
@@ -50,7 +51,10 @@ public partial class HydraUnAssignedEvent :  IEquatable<HydraUnAssignedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class HydraUnAssignedEvent :  IEquatable<HydraUnAssignedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class HydraUnAssignedEvent :  IEquatable<HydraUnAssignedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(HydraUnAssignedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/IndexPage.cs b/src/Flipdish/Model/IndexPage.cs
index bc694a82..38eb5992 100644
--- a/src/Flipdish/Model/IndexPage.cs
+++ b/src/Flipdish/Model/IndexPage.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Index Page
     /// </summary>
     [DataContract]
-    public partial class IndexPage :  IEquatable<IndexPage>, IValidatableObject
+    public partial class IndexPage :  IEquatable<IndexPage>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="IndexPage" /> class.
@@ -365,16 +363,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/IndexPageBase.cs b/src/Flipdish/Model/IndexPageBase.cs
index 26e81cb6..f3015967 100644
--- a/src/Flipdish/Model/IndexPageBase.cs
+++ b/src/Flipdish/Model/IndexPageBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Base of Index Page
     /// </summary>
     [DataContract]
-    public partial class IndexPageBase :  IEquatable<IndexPageBase>, IValidatableObject
+    public partial class IndexPageBase :  IEquatable<IndexPageBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="IndexPageBase" /> class.
@@ -331,16 +329,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/IntercomUserHash.cs b/src/Flipdish/Model/IntercomUserHash.cs
new file mode 100644
index 00000000..b6e37d18
--- /dev/null
+++ b/src/Flipdish/Model/IntercomUserHash.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Intercom user hash
+    /// </summary>
+    [DataContract]
+    public partial class IntercomUserHash :  IEquatable<IntercomUserHash>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomUserHash" /> class.
+        /// </summary>
+        /// <param name="userHash">User hash.</param>
+        public IntercomUserHash(string userHash = default(string))
+        {
+            this.UserHash = userHash;
+        }
+        
+        /// <summary>
+        /// User hash
+        /// </summary>
+        /// <value>User hash</value>
+        [DataMember(Name="UserHash", EmitDefaultValue=false)]
+        public string UserHash { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class IntercomUserHash {\n");
+            sb.Append("  UserHash: ").Append(UserHash).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as IntercomUserHash);
+        }
+
+        /// <summary>
+        /// Returns true if IntercomUserHash instances are equal
+        /// </summary>
+        /// <param name="input">Instance of IntercomUserHash to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(IntercomUserHash input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.UserHash == input.UserHash ||
+                    (this.UserHash != null &&
+                    this.UserHash.Equals(input.UserHash))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.UserHash != null)
+                    hashCode = hashCode * 59 + this.UserHash.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/Invoice.cs b/src/Flipdish/Model/Invoice.cs
new file mode 100644
index 00000000..ee1e1143
--- /dev/null
+++ b/src/Flipdish/Model/Invoice.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Represents an ordering invoice for a period of time.
+    /// </summary>
+    [DataContract]
+    public partial class Invoice :  IEquatable<Invoice>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Invoice" /> class.
+        /// </summary>
+        /// <param name="invoiceNumber">Invoice Number.</param>
+        /// <param name="startDay">The start day of the invoice period..</param>
+        /// <param name="endDay">The end day of the invoice period..</param>
+        public Invoice(string invoiceNumber = default(string), DateTime? startDay = default(DateTime?), DateTime? endDay = default(DateTime?))
+        {
+            this.InvoiceNumber = invoiceNumber;
+            this.StartDay = startDay;
+            this.EndDay = endDay;
+        }
+        
+        /// <summary>
+        /// Invoice Number
+        /// </summary>
+        /// <value>Invoice Number</value>
+        [DataMember(Name="InvoiceNumber", EmitDefaultValue=false)]
+        public string InvoiceNumber { get; set; }
+
+        /// <summary>
+        /// The start day of the invoice period.
+        /// </summary>
+        /// <value>The start day of the invoice period.</value>
+        [DataMember(Name="StartDay", EmitDefaultValue=false)]
+        public DateTime? StartDay { get; set; }
+
+        /// <summary>
+        /// The end day of the invoice period.
+        /// </summary>
+        /// <value>The end day of the invoice period.</value>
+        [DataMember(Name="EndDay", EmitDefaultValue=false)]
+        public DateTime? EndDay { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Invoice {\n");
+            sb.Append("  InvoiceNumber: ").Append(InvoiceNumber).Append("\n");
+            sb.Append("  StartDay: ").Append(StartDay).Append("\n");
+            sb.Append("  EndDay: ").Append(EndDay).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Invoice);
+        }
+
+        /// <summary>
+        /// Returns true if Invoice instances are equal
+        /// </summary>
+        /// <param name="input">Instance of Invoice to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Invoice input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.InvoiceNumber == input.InvoiceNumber ||
+                    (this.InvoiceNumber != null &&
+                    this.InvoiceNumber.Equals(input.InvoiceNumber))
+                ) && 
+                (
+                    this.StartDay == input.StartDay ||
+                    (this.StartDay != null &&
+                    this.StartDay.Equals(input.StartDay))
+                ) && 
+                (
+                    this.EndDay == input.EndDay ||
+                    (this.EndDay != null &&
+                    this.EndDay.Equals(input.EndDay))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.InvoiceNumber != null)
+                    hashCode = hashCode * 59 + this.InvoiceNumber.GetHashCode();
+                if (this.StartDay != null)
+                    hashCode = hashCode * 59 + this.StartDay.GetHashCode();
+                if (this.EndDay != null)
+                    hashCode = hashCode * 59 + this.EndDay.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/InvoiceDiscount.cs b/src/Flipdish/Model/InvoiceDiscount.cs
new file mode 100644
index 00000000..83cc7e72
--- /dev/null
+++ b/src/Flipdish/Model/InvoiceDiscount.cs
@@ -0,0 +1,151 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Invoice Discount
+    /// </summary>
+    [DataContract]
+    public partial class InvoiceDiscount :  IEquatable<InvoiceDiscount>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvoiceDiscount" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected InvoiceDiscount() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvoiceDiscount" /> class.
+        /// </summary>
+        /// <param name="name">Name (required).</param>
+        /// <param name="amount">Amount (required).</param>
+        public InvoiceDiscount(string name = default(string), double? amount = default(double?))
+        {
+            // to ensure "name" is required (not null)
+            if (name == null)
+            {
+                throw new InvalidDataException("name is a required property for InvoiceDiscount and cannot be null");
+            }
+            else
+            {
+                this.Name = name;
+            }
+            // to ensure "amount" is required (not null)
+            if (amount == null)
+            {
+                throw new InvalidDataException("amount is a required property for InvoiceDiscount and cannot be null");
+            }
+            else
+            {
+                this.Amount = amount;
+            }
+        }
+        
+        /// <summary>
+        /// Name
+        /// </summary>
+        /// <value>Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Amount
+        /// </summary>
+        /// <value>Amount</value>
+        [DataMember(Name="Amount", EmitDefaultValue=false)]
+        public double? Amount { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class InvoiceDiscount {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Amount: ").Append(Amount).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as InvoiceDiscount);
+        }
+
+        /// <summary>
+        /// Returns true if InvoiceDiscount instances are equal
+        /// </summary>
+        /// <param name="input">Instance of InvoiceDiscount to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(InvoiceDiscount input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Amount == input.Amount ||
+                    (this.Amount != null &&
+                    this.Amount.Equals(input.Amount))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Amount != null)
+                    hashCode = hashCode * 59 + this.Amount.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/InvoiceItem.cs b/src/Flipdish/Model/InvoiceItem.cs
new file mode 100644
index 00000000..33bf1e4a
--- /dev/null
+++ b/src/Flipdish/Model/InvoiceItem.cs
@@ -0,0 +1,251 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Invoice Item
+    /// </summary>
+    [DataContract]
+    public partial class InvoiceItem :  IEquatable<InvoiceItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvoiceItem" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected InvoiceItem() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvoiceItem" /> class.
+        /// </summary>
+        /// <param name="description">Description (required).</param>
+        /// <param name="quantity">Quantity (required).</param>
+        /// <param name="unitAmountExcludingTax">Unit Amount Excluding Tax (required).</param>
+        /// <param name="tax">Tax (required).</param>
+        /// <param name="amount">Amount (required).</param>
+        /// <param name="period">Period (required).</param>
+        public InvoiceItem(string description = default(string), long? quantity = default(long?), double? unitAmountExcludingTax = default(double?), double? tax = default(double?), double? amount = default(double?), InvoicePeriod period = default(InvoicePeriod))
+        {
+            // to ensure "description" is required (not null)
+            if (description == null)
+            {
+                throw new InvalidDataException("description is a required property for InvoiceItem and cannot be null");
+            }
+            else
+            {
+                this.Description = description;
+            }
+            // to ensure "quantity" is required (not null)
+            if (quantity == null)
+            {
+                throw new InvalidDataException("quantity is a required property for InvoiceItem and cannot be null");
+            }
+            else
+            {
+                this.Quantity = quantity;
+            }
+            // to ensure "unitAmountExcludingTax" is required (not null)
+            if (unitAmountExcludingTax == null)
+            {
+                throw new InvalidDataException("unitAmountExcludingTax is a required property for InvoiceItem and cannot be null");
+            }
+            else
+            {
+                this.UnitAmountExcludingTax = unitAmountExcludingTax;
+            }
+            // to ensure "tax" is required (not null)
+            if (tax == null)
+            {
+                throw new InvalidDataException("tax is a required property for InvoiceItem and cannot be null");
+            }
+            else
+            {
+                this.Tax = tax;
+            }
+            // to ensure "amount" is required (not null)
+            if (amount == null)
+            {
+                throw new InvalidDataException("amount is a required property for InvoiceItem and cannot be null");
+            }
+            else
+            {
+                this.Amount = amount;
+            }
+            // to ensure "period" is required (not null)
+            if (period == null)
+            {
+                throw new InvalidDataException("period is a required property for InvoiceItem and cannot be null");
+            }
+            else
+            {
+                this.Period = period;
+            }
+        }
+        
+        /// <summary>
+        /// Description
+        /// </summary>
+        /// <value>Description</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Quantity
+        /// </summary>
+        /// <value>Quantity</value>
+        [DataMember(Name="Quantity", EmitDefaultValue=false)]
+        public long? Quantity { get; set; }
+
+        /// <summary>
+        /// Unit Amount Excluding Tax
+        /// </summary>
+        /// <value>Unit Amount Excluding Tax</value>
+        [DataMember(Name="UnitAmountExcludingTax", EmitDefaultValue=false)]
+        public double? UnitAmountExcludingTax { get; set; }
+
+        /// <summary>
+        /// Tax
+        /// </summary>
+        /// <value>Tax</value>
+        [DataMember(Name="Tax", EmitDefaultValue=false)]
+        public double? Tax { get; set; }
+
+        /// <summary>
+        /// Amount
+        /// </summary>
+        /// <value>Amount</value>
+        [DataMember(Name="Amount", EmitDefaultValue=false)]
+        public double? Amount { get; set; }
+
+        /// <summary>
+        /// Period
+        /// </summary>
+        /// <value>Period</value>
+        [DataMember(Name="Period", EmitDefaultValue=false)]
+        public InvoicePeriod Period { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class InvoiceItem {\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  Quantity: ").Append(Quantity).Append("\n");
+            sb.Append("  UnitAmountExcludingTax: ").Append(UnitAmountExcludingTax).Append("\n");
+            sb.Append("  Tax: ").Append(Tax).Append("\n");
+            sb.Append("  Amount: ").Append(Amount).Append("\n");
+            sb.Append("  Period: ").Append(Period).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as InvoiceItem);
+        }
+
+        /// <summary>
+        /// Returns true if InvoiceItem instances are equal
+        /// </summary>
+        /// <param name="input">Instance of InvoiceItem to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(InvoiceItem input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.Quantity == input.Quantity ||
+                    (this.Quantity != null &&
+                    this.Quantity.Equals(input.Quantity))
+                ) && 
+                (
+                    this.UnitAmountExcludingTax == input.UnitAmountExcludingTax ||
+                    (this.UnitAmountExcludingTax != null &&
+                    this.UnitAmountExcludingTax.Equals(input.UnitAmountExcludingTax))
+                ) && 
+                (
+                    this.Tax == input.Tax ||
+                    (this.Tax != null &&
+                    this.Tax.Equals(input.Tax))
+                ) && 
+                (
+                    this.Amount == input.Amount ||
+                    (this.Amount != null &&
+                    this.Amount.Equals(input.Amount))
+                ) && 
+                (
+                    this.Period == input.Period ||
+                    (this.Period != null &&
+                    this.Period.Equals(input.Period))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.Quantity != null)
+                    hashCode = hashCode * 59 + this.Quantity.GetHashCode();
+                if (this.UnitAmountExcludingTax != null)
+                    hashCode = hashCode * 59 + this.UnitAmountExcludingTax.GetHashCode();
+                if (this.Tax != null)
+                    hashCode = hashCode * 59 + this.Tax.GetHashCode();
+                if (this.Amount != null)
+                    hashCode = hashCode * 59 + this.Amount.GetHashCode();
+                if (this.Period != null)
+                    hashCode = hashCode * 59 + this.Period.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/InvoicePeriod.cs b/src/Flipdish/Model/InvoicePeriod.cs
new file mode 100644
index 00000000..dc5d1877
--- /dev/null
+++ b/src/Flipdish/Model/InvoicePeriod.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Invoice Period
+    /// </summary>
+    [DataContract]
+    public partial class InvoicePeriod :  IEquatable<InvoicePeriod>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvoicePeriod" /> class.
+        /// </summary>
+        /// <param name="start">Start.</param>
+        /// <param name="end">End.</param>
+        public InvoicePeriod(DateTime? start = default(DateTime?), DateTime? end = default(DateTime?))
+        {
+            this.Start = start;
+            this.End = end;
+        }
+        
+        /// <summary>
+        /// Start
+        /// </summary>
+        /// <value>Start</value>
+        [DataMember(Name="Start", EmitDefaultValue=false)]
+        public DateTime? Start { get; set; }
+
+        /// <summary>
+        /// End
+        /// </summary>
+        /// <value>End</value>
+        [DataMember(Name="End", EmitDefaultValue=false)]
+        public DateTime? End { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class InvoicePeriod {\n");
+            sb.Append("  Start: ").Append(Start).Append("\n");
+            sb.Append("  End: ").Append(End).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as InvoicePeriod);
+        }
+
+        /// <summary>
+        /// Returns true if InvoicePeriod instances are equal
+        /// </summary>
+        /// <param name="input">Instance of InvoicePeriod to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(InvoicePeriod input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Start == input.Start ||
+                    (this.Start != null &&
+                    this.Start.Equals(input.Start))
+                ) && 
+                (
+                    this.End == input.End ||
+                    (this.End != null &&
+                    this.End.Equals(input.End))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Start != null)
+                    hashCode = hashCode * 59 + this.Start.GetHashCode();
+                if (this.End != null)
+                    hashCode = hashCode * 59 + this.End.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ItemNutritionInfoAddUpdateModel.cs b/src/Flipdish/Model/ItemNutritionInfoAddUpdateModel.cs
new file mode 100644
index 00000000..959bbce1
--- /dev/null
+++ b/src/Flipdish/Model/ItemNutritionInfoAddUpdateModel.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// ItemNutritionInfoAddUpdateModel.
+    /// </summary>
+    [DataContract]
+    public partial class ItemNutritionInfoAddUpdateModel :  IEquatable<ItemNutritionInfoAddUpdateModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemNutritionInfoAddUpdateModel" /> class.
+        /// </summary>
+        /// <param name="labels">Labels..</param>
+        public ItemNutritionInfoAddUpdateModel(List<NutritionInfoItemAddUpdateLabelModel> labels = default(List<NutritionInfoItemAddUpdateLabelModel>))
+        {
+            this.Labels = labels;
+        }
+        
+        /// <summary>
+        /// Labels.
+        /// </summary>
+        /// <value>Labels.</value>
+        [DataMember(Name="Labels", EmitDefaultValue=false)]
+        public List<NutritionInfoItemAddUpdateLabelModel> Labels { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ItemNutritionInfoAddUpdateModel {\n");
+            sb.Append("  Labels: ").Append(Labels).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ItemNutritionInfoAddUpdateModel);
+        }
+
+        /// <summary>
+        /// Returns true if ItemNutritionInfoAddUpdateModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ItemNutritionInfoAddUpdateModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ItemNutritionInfoAddUpdateModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Labels == input.Labels ||
+                    this.Labels != null &&
+                    this.Labels.SequenceEqual(input.Labels)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Labels != null)
+                    hashCode = hashCode * 59 + this.Labels.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ItemNutritionInfoV2AddUpdateModel.cs b/src/Flipdish/Model/ItemNutritionInfoV2AddUpdateModel.cs
new file mode 100644
index 00000000..d50bed8a
--- /dev/null
+++ b/src/Flipdish/Model/ItemNutritionInfoV2AddUpdateModel.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// ItemNutritionInfoV2AddUpdateModel.
+    /// </summary>
+    [DataContract]
+    public partial class ItemNutritionInfoV2AddUpdateModel :  IEquatable<ItemNutritionInfoV2AddUpdateModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemNutritionInfoV2AddUpdateModel" /> class.
+        /// </summary>
+        /// <param name="allergenIds">AllergenIds..</param>
+        public ItemNutritionInfoV2AddUpdateModel(List<string> allergenIds = default(List<string>))
+        {
+            this.AllergenIds = allergenIds;
+        }
+        
+        /// <summary>
+        /// AllergenIds.
+        /// </summary>
+        /// <value>AllergenIds.</value>
+        [DataMember(Name="AllergenIds", EmitDefaultValue=false)]
+        public List<string> AllergenIds { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ItemNutritionInfoV2AddUpdateModel {\n");
+            sb.Append("  AllergenIds: ").Append(AllergenIds).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ItemNutritionInfoV2AddUpdateModel);
+        }
+
+        /// <summary>
+        /// Returns true if ItemNutritionInfoV2AddUpdateModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ItemNutritionInfoV2AddUpdateModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ItemNutritionInfoV2AddUpdateModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.AllergenIds == input.AllergenIds ||
+                    this.AllergenIds != null &&
+                    this.AllergenIds.SequenceEqual(input.AllergenIds)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.AllergenIds != null)
+                    hashCode = hashCode * 59 + this.AllergenIds.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/JobAddress.cs b/src/Flipdish/Model/JobAddress.cs
index ac012c73..576f45e5 100644
--- a/src/Flipdish/Model/JobAddress.cs
+++ b/src/Flipdish/Model/JobAddress.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Address
     /// </summary>
     [DataContract]
-    public partial class JobAddress :  IEquatable<JobAddress>, IValidatableObject
+    public partial class JobAddress :  IEquatable<JobAddress>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobAddress" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobCancellation.cs b/src/Flipdish/Model/JobCancellation.cs
index 2615c126..177cea66 100644
--- a/src/Flipdish/Model/JobCancellation.cs
+++ b/src/Flipdish/Model/JobCancellation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Cancellation
     /// </summary>
     [DataContract]
-    public partial class JobCancellation :  IEquatable<JobCancellation>, IValidatableObject
+    public partial class JobCancellation :  IEquatable<JobCancellation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobCancellation" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobContact.cs b/src/Flipdish/Model/JobContact.cs
index 12412de3..144f9357 100644
--- a/src/Flipdish/Model/JobContact.cs
+++ b/src/Flipdish/Model/JobContact.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Contact
     /// </summary>
     [DataContract]
-    public partial class JobContact :  IEquatable<JobContact>, IValidatableObject
+    public partial class JobContact :  IEquatable<JobContact>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobContact" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobDelivery.cs b/src/Flipdish/Model/JobDelivery.cs
index 7f21e71b..abdb5dec 100644
--- a/src/Flipdish/Model/JobDelivery.cs
+++ b/src/Flipdish/Model/JobDelivery.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Delivery
     /// </summary>
     [DataContract]
-    public partial class JobDelivery :  IEquatable<JobDelivery>, IValidatableObject
+    public partial class JobDelivery :  IEquatable<JobDelivery>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobDelivery" /> class.
@@ -314,16 +312,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobDeliveryDetail.cs b/src/Flipdish/Model/JobDeliveryDetail.cs
index 47f8475b..f721081e 100644
--- a/src/Flipdish/Model/JobDeliveryDetail.cs
+++ b/src/Flipdish/Model/JobDeliveryDetail.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Delivery Detail
     /// </summary>
     [DataContract]
-    public partial class JobDeliveryDetail :  IEquatable<JobDeliveryDetail>, IValidatableObject
+    public partial class JobDeliveryDetail :  IEquatable<JobDeliveryDetail>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobDeliveryDetail" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobDriver.cs b/src/Flipdish/Model/JobDriver.cs
index 449842e7..4d842f97 100644
--- a/src/Flipdish/Model/JobDriver.cs
+++ b/src/Flipdish/Model/JobDriver.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Driver
     /// </summary>
     [DataContract]
-    public partial class JobDriver :  IEquatable<JobDriver>, IValidatableObject
+    public partial class JobDriver :  IEquatable<JobDriver>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobDriver" /> class.
@@ -212,16 +210,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobEta.cs b/src/Flipdish/Model/JobEta.cs
index f34f5d8a..156b05a6 100644
--- a/src/Flipdish/Model/JobEta.cs
+++ b/src/Flipdish/Model/JobEta.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Eta
     /// </summary>
     [DataContract]
-    public partial class JobEta :  IEquatable<JobEta>, IValidatableObject
+    public partial class JobEta :  IEquatable<JobEta>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobEta" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobPricing.cs b/src/Flipdish/Model/JobPricing.cs
index c2dc7456..ffbf6ca6 100644
--- a/src/Flipdish/Model/JobPricing.cs
+++ b/src/Flipdish/Model/JobPricing.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Pricing
     /// </summary>
     [DataContract]
-    public partial class JobPricing :  IEquatable<JobPricing>, IValidatableObject
+    public partial class JobPricing :  IEquatable<JobPricing>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobPricing" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobProof.cs b/src/Flipdish/Model/JobProof.cs
index 1d77de3e..5aa4409c 100644
--- a/src/Flipdish/Model/JobProof.cs
+++ b/src/Flipdish/Model/JobProof.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Proof
     /// </summary>
     [DataContract]
-    public partial class JobProof :  IEquatable<JobProof>, IValidatableObject
+    public partial class JobProof :  IEquatable<JobProof>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobProof" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/JobResponse.cs b/src/Flipdish/Model/JobResponse.cs
index ff2a50c0..c6eb7d53 100644
--- a/src/Flipdish/Model/JobResponse.cs
+++ b/src/Flipdish/Model/JobResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Job Response
     /// </summary>
     [DataContract]
-    public partial class JobResponse :  IEquatable<JobResponse>, IValidatableObject
+    public partial class JobResponse :  IEquatable<JobResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="JobResponse" /> class.
@@ -331,16 +329,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothInstallUpdateInitiateEvent.cs b/src/Flipdish/Model/KioskBluetoothInstallUpdateInitiateEvent.cs
index af84ab57..6dcb99a1 100644
--- a/src/Flipdish/Model/KioskBluetoothInstallUpdateInitiateEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothInstallUpdateInitiateEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk bluetooth Initiate Install Update Event
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothInstallUpdateInitiateEvent :  IEquatable<KioskBluetoothInstallUpdateInitiateEvent>, IValidatableObject
+    public partial class KioskBluetoothInstallUpdateInitiateEvent :  IEquatable<KioskBluetoothInstallUpdateInitiateEvent>
     {
         /// <summary>
         /// Terminal Type
@@ -86,8 +84,11 @@ public enum BluetoothTerminalTypeEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothInstallUpdateInitiateEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothInstallUpdateInitiateEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.BluetoothTerminalType = bluetoothTerminalType;
@@ -97,7 +98,10 @@ public enum BluetoothTerminalTypeEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -150,6 +154,13 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -157,6 +168,20 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -173,7 +198,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -248,10 +276,25 @@ public bool Equals(KioskBluetoothInstallUpdateInitiateEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -280,21 +323,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothPairingModeEvent.cs b/src/Flipdish/Model/KioskBluetoothPairingModeEvent.cs
index b447ca56..56782b59 100644
--- a/src/Flipdish/Model/KioskBluetoothPairingModeEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothPairingModeEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk Bluetooth Pairing mode initiated
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothPairingModeEvent :  IEquatable<KioskBluetoothPairingModeEvent>, IValidatableObject
+    public partial class KioskBluetoothPairingModeEvent :  IEquatable<KioskBluetoothPairingModeEvent>
     {
         /// <summary>
         /// Terminal Type
@@ -86,8 +84,11 @@ public enum BluetoothTerminalTypeEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothPairingModeEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothPairingModeEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.BluetoothTerminalType = bluetoothTerminalType;
@@ -97,7 +98,10 @@ public enum BluetoothTerminalTypeEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -150,6 +154,13 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -157,6 +168,20 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -173,7 +198,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -248,10 +276,25 @@ public bool Equals(KioskBluetoothPairingModeEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -280,21 +323,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothTerminalCancelUpdateEvent.cs b/src/Flipdish/Model/KioskBluetoothTerminalCancelUpdateEvent.cs
index adf38292..998250db 100644
--- a/src/Flipdish/Model/KioskBluetoothTerminalCancelUpdateEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothTerminalCancelUpdateEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk bluetooth Cancel Update Install Event
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothTerminalCancelUpdateEvent :  IEquatable<KioskBluetoothTerminalCancelUpdateEvent>, IValidatableObject
+    public partial class KioskBluetoothTerminalCancelUpdateEvent :  IEquatable<KioskBluetoothTerminalCancelUpdateEvent>
     {
         /// <summary>
         /// Terminal Type
@@ -86,8 +84,11 @@ public enum BluetoothTerminalTypeEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothTerminalCancelUpdateEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothTerminalCancelUpdateEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.BluetoothTerminalType = bluetoothTerminalType;
@@ -97,7 +98,10 @@ public enum BluetoothTerminalTypeEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -150,6 +154,13 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -157,6 +168,20 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -173,7 +198,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -248,10 +276,25 @@ public bool Equals(KioskBluetoothTerminalCancelUpdateEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -280,21 +323,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothTerminalFirmwareVersionStatusEvent.cs b/src/Flipdish/Model/KioskBluetoothTerminalFirmwareVersionStatusEvent.cs
index 09e0e1ff..5cf532cd 100644
--- a/src/Flipdish/Model/KioskBluetoothTerminalFirmwareVersionStatusEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothTerminalFirmwareVersionStatusEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk Stripe Terminal Update info received event
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothTerminalFirmwareVersionStatusEvent :  IEquatable<KioskBluetoothTerminalFirmwareVersionStatusEvent>, IValidatableObject
+    public partial class KioskBluetoothTerminalFirmwareVersionStatusEvent :  IEquatable<KioskBluetoothTerminalFirmwareVersionStatusEvent>
     {
         /// <summary>
         /// ETA to install the update
@@ -84,8 +82,11 @@ public enum UpdateTimeEstimateEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothTerminalFirmwareVersionStatusEvent(string deviceId = default(string), string serialNumber = default(string), bool? hasFirmwareUpdate = default(bool?), bool? hasConfigUpdate = default(bool?), bool? hasKeyUpdate = default(bool?), UpdateTimeEstimateEnum? updateTimeEstimate = default(UpdateTimeEstimateEnum?), UserEventInfo userEventInfo = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothTerminalFirmwareVersionStatusEvent(string deviceId = default(string), string serialNumber = default(string), bool? hasFirmwareUpdate = default(bool?), bool? hasConfigUpdate = default(bool?), bool? hasKeyUpdate = default(bool?), UpdateTimeEstimateEnum? updateTimeEstimate = default(UpdateTimeEstimateEnum?), UserEventInfo userEventInfo = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.SerialNumber = serialNumber;
@@ -99,7 +100,10 @@ public enum UpdateTimeEstimateEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -180,6 +184,13 @@ public enum UpdateTimeEstimateEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -187,6 +198,20 @@ public enum UpdateTimeEstimateEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -207,7 +232,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -302,10 +330,25 @@ public bool Equals(KioskBluetoothTerminalFirmwareVersionStatusEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -342,21 +385,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothTerminalInitiateUpdateCheckEvent.cs b/src/Flipdish/Model/KioskBluetoothTerminalInitiateUpdateCheckEvent.cs
index 62a008bc..a08f6837 100644
--- a/src/Flipdish/Model/KioskBluetoothTerminalInitiateUpdateCheckEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothTerminalInitiateUpdateCheckEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk bluetooth trigger update check event
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothTerminalInitiateUpdateCheckEvent :  IEquatable<KioskBluetoothTerminalInitiateUpdateCheckEvent>, IValidatableObject
+    public partial class KioskBluetoothTerminalInitiateUpdateCheckEvent :  IEquatable<KioskBluetoothTerminalInitiateUpdateCheckEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="KioskBluetoothTerminalInitiateUpdateCheckEvent" /> class.
@@ -40,8 +38,11 @@ public partial class KioskBluetoothTerminalInitiateUpdateCheckEvent :  IEquatabl
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothTerminalInitiateUpdateCheckEvent(string deviceId = default(string), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothTerminalInitiateUpdateCheckEvent(string deviceId = default(string), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.User = user;
@@ -50,7 +51,10 @@ public partial class KioskBluetoothTerminalInitiateUpdateCheckEvent :  IEquatabl
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class KioskBluetoothTerminalInitiateUpdateCheckEvent :  IEquatabl
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class KioskBluetoothTerminalInitiateUpdateCheckEvent :  IEquatabl
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(KioskBluetoothTerminalInitiateUpdateCheckEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothTerminalInstallationStatusEvent.cs b/src/Flipdish/Model/KioskBluetoothTerminalInstallationStatusEvent.cs
index 9768b4b8..bea84e25 100644
--- a/src/Flipdish/Model/KioskBluetoothTerminalInstallationStatusEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothTerminalInstallationStatusEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk bluetooth terminal Installation Status
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothTerminalInstallationStatusEvent :  IEquatable<KioskBluetoothTerminalInstallationStatusEvent>, IValidatableObject
+    public partial class KioskBluetoothTerminalInstallationStatusEvent :  IEquatable<KioskBluetoothTerminalInstallationStatusEvent>
     {
         /// <summary>
         /// Terminal Type
@@ -88,8 +86,11 @@ public enum BluetoothTerminalTypeEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothTerminalInstallationStatusEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), string bluetoothTerminalSerialNumber = default(string), UserEventInfo user = default(UserEventInfo), int? progress = default(int?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothTerminalInstallationStatusEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), string bluetoothTerminalSerialNumber = default(string), UserEventInfo user = default(UserEventInfo), int? progress = default(int?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.BluetoothTerminalType = bluetoothTerminalType;
@@ -101,7 +102,10 @@ public enum BluetoothTerminalTypeEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -168,6 +172,13 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -175,6 +186,20 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -193,7 +218,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -278,10 +306,25 @@ public bool Equals(KioskBluetoothTerminalInstallationStatusEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -314,21 +357,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothTerminalUnpairedEvent.cs b/src/Flipdish/Model/KioskBluetoothTerminalUnpairedEvent.cs
index 84776f24..8b33f9e8 100644
--- a/src/Flipdish/Model/KioskBluetoothTerminalUnpairedEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothTerminalUnpairedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk Bluetooth Unpairing mode initiated
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothTerminalUnpairedEvent :  IEquatable<KioskBluetoothTerminalUnpairedEvent>, IValidatableObject
+    public partial class KioskBluetoothTerminalUnpairedEvent :  IEquatable<KioskBluetoothTerminalUnpairedEvent>
     {
         /// <summary>
         /// Terminal Type
@@ -86,8 +84,11 @@ public enum BluetoothTerminalTypeEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothTerminalUnpairedEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothTerminalUnpairedEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.BluetoothTerminalType = bluetoothTerminalType;
@@ -97,7 +98,10 @@ public enum BluetoothTerminalTypeEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -150,6 +154,13 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -157,6 +168,20 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -173,7 +198,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -248,10 +276,25 @@ public bool Equals(KioskBluetoothTerminalUnpairedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -280,21 +323,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothTerminalUpdatedEvent.cs b/src/Flipdish/Model/KioskBluetoothTerminalUpdatedEvent.cs
index cbfc1fc2..ed00809d 100644
--- a/src/Flipdish/Model/KioskBluetoothTerminalUpdatedEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothTerminalUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk bluetooth terminal unpaired
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothTerminalUpdatedEvent :  IEquatable<KioskBluetoothTerminalUpdatedEvent>, IValidatableObject
+    public partial class KioskBluetoothTerminalUpdatedEvent :  IEquatable<KioskBluetoothTerminalUpdatedEvent>
     {
         /// <summary>
         /// Terminal Type
@@ -88,8 +86,11 @@ public enum BluetoothTerminalTypeEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothTerminalUpdatedEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), string bluetoothTerminalSerialNumber = default(string), BluetoothTerminalStatus bluetoothTerminalStatus = default(BluetoothTerminalStatus), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothTerminalUpdatedEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), string bluetoothTerminalSerialNumber = default(string), BluetoothTerminalStatus bluetoothTerminalStatus = default(BluetoothTerminalStatus), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.BluetoothTerminalType = bluetoothTerminalType;
@@ -101,7 +102,10 @@ public enum BluetoothTerminalTypeEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -168,6 +172,13 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -175,6 +186,20 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -193,7 +218,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -278,10 +306,25 @@ public bool Equals(KioskBluetoothTerminalUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -314,21 +357,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskBluetoothUnpairingModeEvent.cs b/src/Flipdish/Model/KioskBluetoothUnpairingModeEvent.cs
index 91bf7dd3..1e034696 100644
--- a/src/Flipdish/Model/KioskBluetoothUnpairingModeEvent.cs
+++ b/src/Flipdish/Model/KioskBluetoothUnpairingModeEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk Bluetooth Unpairing mode initiated
     /// </summary>
     [DataContract]
-    public partial class KioskBluetoothUnpairingModeEvent :  IEquatable<KioskBluetoothUnpairingModeEvent>, IValidatableObject
+    public partial class KioskBluetoothUnpairingModeEvent :  IEquatable<KioskBluetoothUnpairingModeEvent>
     {
         /// <summary>
         /// Terminal Type
@@ -86,8 +84,11 @@ public enum BluetoothTerminalTypeEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskBluetoothUnpairingModeEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskBluetoothUnpairingModeEvent(string deviceId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.DeviceId = deviceId;
             this.BluetoothTerminalType = bluetoothTerminalType;
@@ -97,7 +98,10 @@ public enum BluetoothTerminalTypeEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -150,6 +154,13 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -157,6 +168,20 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -173,7 +198,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -248,10 +276,25 @@ public bool Equals(KioskBluetoothUnpairingModeEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -280,21 +323,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskCashPaymentSettings.cs b/src/Flipdish/Model/KioskCashPaymentSettings.cs
index 5fe7eed1..813805da 100644
--- a/src/Flipdish/Model/KioskCashPaymentSettings.cs
+++ b/src/Flipdish/Model/KioskCashPaymentSettings.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Get Cash Payment Settings for a UserId
     /// </summary>
     [DataContract]
-    public partial class KioskCashPaymentSettings :  IEquatable<KioskCashPaymentSettings>, IValidatableObject
+    public partial class KioskCashPaymentSettings :  IEquatable<KioskCashPaymentSettings>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="KioskCashPaymentSettings" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskCashSetting.cs b/src/Flipdish/Model/KioskCashSetting.cs
deleted file mode 100644
index d557d33b..00000000
--- a/src/Flipdish/Model/KioskCashSetting.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Model containing result of Kiosk cash setting
-    /// </summary>
-    [DataContract]
-    public partial class KioskCashSetting :  IEquatable<KioskCashSetting>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="KioskCashSetting" /> class.
-        /// </summary>
-        /// <param name="cashPaymentEnabled">Indicated whether cash payment is enabled or not eg: true.</param>
-        public KioskCashSetting(bool? cashPaymentEnabled = default(bool?))
-        {
-            this.CashPaymentEnabled = cashPaymentEnabled;
-        }
-        
-        /// <summary>
-        /// Indicated whether cash payment is enabled or not eg: true
-        /// </summary>
-        /// <value>Indicated whether cash payment is enabled or not eg: true</value>
-        [DataMember(Name="CashPaymentEnabled", EmitDefaultValue=false)]
-        public bool? CashPaymentEnabled { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class KioskCashSetting {\n");
-            sb.Append("  CashPaymentEnabled: ").Append(CashPaymentEnabled).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as KioskCashSetting);
-        }
-
-        /// <summary>
-        /// Returns true if KioskCashSetting instances are equal
-        /// </summary>
-        /// <param name="input">Instance of KioskCashSetting to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(KioskCashSetting input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.CashPaymentEnabled == input.CashPaymentEnabled ||
-                    (this.CashPaymentEnabled != null &&
-                    this.CashPaymentEnabled.Equals(input.CashPaymentEnabled))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.CashPaymentEnabled != null)
-                    hashCode = hashCode * 59 + this.CashPaymentEnabled.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/KioskEntitlementsResult.cs b/src/Flipdish/Model/KioskEntitlementsResult.cs
new file mode 100644
index 00000000..5b696b0d
--- /dev/null
+++ b/src/Flipdish/Model/KioskEntitlementsResult.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Kiosk entitlements and usage
+    /// </summary>
+    [DataContract]
+    public partial class KioskEntitlementsResult :  IEquatable<KioskEntitlementsResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="KioskEntitlementsResult" /> class.
+        /// </summary>
+        /// <param name="entitledQuantity">Number of kiosk devices entitled.</param>
+        /// <param name="usedQuantity">The quantity of entitlements that have been used.</param>
+        public KioskEntitlementsResult(int? entitledQuantity = default(int?), int? usedQuantity = default(int?))
+        {
+            this.EntitledQuantity = entitledQuantity;
+            this.UsedQuantity = usedQuantity;
+        }
+        
+        /// <summary>
+        /// Number of kiosk devices entitled
+        /// </summary>
+        /// <value>Number of kiosk devices entitled</value>
+        [DataMember(Name="EntitledQuantity", EmitDefaultValue=false)]
+        public int? EntitledQuantity { get; set; }
+
+        /// <summary>
+        /// The quantity of entitlements that have been used
+        /// </summary>
+        /// <value>The quantity of entitlements that have been used</value>
+        [DataMember(Name="UsedQuantity", EmitDefaultValue=false)]
+        public int? UsedQuantity { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class KioskEntitlementsResult {\n");
+            sb.Append("  EntitledQuantity: ").Append(EntitledQuantity).Append("\n");
+            sb.Append("  UsedQuantity: ").Append(UsedQuantity).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as KioskEntitlementsResult);
+        }
+
+        /// <summary>
+        /// Returns true if KioskEntitlementsResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of KioskEntitlementsResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(KioskEntitlementsResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EntitledQuantity == input.EntitledQuantity ||
+                    (this.EntitledQuantity != null &&
+                    this.EntitledQuantity.Equals(input.EntitledQuantity))
+                ) && 
+                (
+                    this.UsedQuantity == input.UsedQuantity ||
+                    (this.UsedQuantity != null &&
+                    this.UsedQuantity.Equals(input.UsedQuantity))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EntitledQuantity != null)
+                    hashCode = hashCode * 59 + this.EntitledQuantity.GetHashCode();
+                if (this.UsedQuantity != null)
+                    hashCode = hashCode * 59 + this.UsedQuantity.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/KioskIotConnectionParameters.cs b/src/Flipdish/Model/KioskIotConnectionParameters.cs
index 41168acb..b3e97655 100644
--- a/src/Flipdish/Model/KioskIotConnectionParameters.cs
+++ b/src/Flipdish/Model/KioskIotConnectionParameters.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Connection parameters to IoT
     /// </summary>
     [DataContract]
-    public partial class KioskIotConnectionParameters :  IEquatable<KioskIotConnectionParameters>, IValidatableObject
+    public partial class KioskIotConnectionParameters :  IEquatable<KioskIotConnectionParameters>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="KioskIotConnectionParameters" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/KioskSettings.cs b/src/Flipdish/Model/KioskSettings.cs
new file mode 100644
index 00000000..4d1dad8e
--- /dev/null
+++ b/src/Flipdish/Model/KioskSettings.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Kiosk level settings
+    /// </summary>
+    [DataContract]
+    public partial class KioskSettings :  IEquatable<KioskSettings>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="KioskSettings" /> class.
+        /// </summary>
+        /// <param name="hideLogoFromFrontPage">Hide logo from front page.</param>
+        /// <param name="twoColumnMenuLayout">2 Column Menu Layout.</param>
+        public KioskSettings(bool? hideLogoFromFrontPage = default(bool?), bool? twoColumnMenuLayout = default(bool?))
+        {
+            this.HideLogoFromFrontPage = hideLogoFromFrontPage;
+            this.TwoColumnMenuLayout = twoColumnMenuLayout;
+        }
+        
+        /// <summary>
+        /// Hide logo from front page
+        /// </summary>
+        /// <value>Hide logo from front page</value>
+        [DataMember(Name="HideLogoFromFrontPage", EmitDefaultValue=false)]
+        public bool? HideLogoFromFrontPage { get; set; }
+
+        /// <summary>
+        /// 2 Column Menu Layout
+        /// </summary>
+        /// <value>2 Column Menu Layout</value>
+        [DataMember(Name="TwoColumnMenuLayout", EmitDefaultValue=false)]
+        public bool? TwoColumnMenuLayout { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class KioskSettings {\n");
+            sb.Append("  HideLogoFromFrontPage: ").Append(HideLogoFromFrontPage).Append("\n");
+            sb.Append("  TwoColumnMenuLayout: ").Append(TwoColumnMenuLayout).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as KioskSettings);
+        }
+
+        /// <summary>
+        /// Returns true if KioskSettings instances are equal
+        /// </summary>
+        /// <param name="input">Instance of KioskSettings to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(KioskSettings input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.HideLogoFromFrontPage == input.HideLogoFromFrontPage ||
+                    (this.HideLogoFromFrontPage != null &&
+                    this.HideLogoFromFrontPage.Equals(input.HideLogoFromFrontPage))
+                ) && 
+                (
+                    this.TwoColumnMenuLayout == input.TwoColumnMenuLayout ||
+                    (this.TwoColumnMenuLayout != null &&
+                    this.TwoColumnMenuLayout.Equals(input.TwoColumnMenuLayout))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.HideLogoFromFrontPage != null)
+                    hashCode = hashCode * 59 + this.HideLogoFromFrontPage.GetHashCode();
+                if (this.TwoColumnMenuLayout != null)
+                    hashCode = hashCode * 59 + this.TwoColumnMenuLayout.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/KioskStoreSettings.cs b/src/Flipdish/Model/KioskStoreSettings.cs
deleted file mode 100644
index 274692e0..00000000
--- a/src/Flipdish/Model/KioskStoreSettings.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Details of a kiosks store settings
-    /// </summary>
-    [DataContract]
-    public partial class KioskStoreSettings :  IEquatable<KioskStoreSettings>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="KioskStoreSettings" /> class.
-        /// </summary>
-        /// <param name="storeKioskSettings">Kiosks store settings.</param>
-        /// <param name="timezone">Kiosks timezone.</param>
-        /// <param name="currentUtcTime">Servers current Utc time.</param>
-        public KioskStoreSettings(List<StoreKioskSetting> storeKioskSettings = default(List<StoreKioskSetting>), string timezone = default(string), DateTime? currentUtcTime = default(DateTime?))
-        {
-            this.StoreKioskSettings = storeKioskSettings;
-            this.Timezone = timezone;
-            this.CurrentUtcTime = currentUtcTime;
-        }
-        
-        /// <summary>
-        /// Kiosks store settings
-        /// </summary>
-        /// <value>Kiosks store settings</value>
-        [DataMember(Name="StoreKioskSettings", EmitDefaultValue=false)]
-        public List<StoreKioskSetting> StoreKioskSettings { get; set; }
-
-        /// <summary>
-        /// Kiosks timezone
-        /// </summary>
-        /// <value>Kiosks timezone</value>
-        [DataMember(Name="Timezone", EmitDefaultValue=false)]
-        public string Timezone { get; set; }
-
-        /// <summary>
-        /// Servers current Utc time
-        /// </summary>
-        /// <value>Servers current Utc time</value>
-        [DataMember(Name="CurrentUtcTime", EmitDefaultValue=false)]
-        public DateTime? CurrentUtcTime { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class KioskStoreSettings {\n");
-            sb.Append("  StoreKioskSettings: ").Append(StoreKioskSettings).Append("\n");
-            sb.Append("  Timezone: ").Append(Timezone).Append("\n");
-            sb.Append("  CurrentUtcTime: ").Append(CurrentUtcTime).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as KioskStoreSettings);
-        }
-
-        /// <summary>
-        /// Returns true if KioskStoreSettings instances are equal
-        /// </summary>
-        /// <param name="input">Instance of KioskStoreSettings to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(KioskStoreSettings input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.StoreKioskSettings == input.StoreKioskSettings ||
-                    this.StoreKioskSettings != null &&
-                    this.StoreKioskSettings.SequenceEqual(input.StoreKioskSettings)
-                ) && 
-                (
-                    this.Timezone == input.Timezone ||
-                    (this.Timezone != null &&
-                    this.Timezone.Equals(input.Timezone))
-                ) && 
-                (
-                    this.CurrentUtcTime == input.CurrentUtcTime ||
-                    (this.CurrentUtcTime != null &&
-                    this.CurrentUtcTime.Equals(input.CurrentUtcTime))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.StoreKioskSettings != null)
-                    hashCode = hashCode * 59 + this.StoreKioskSettings.GetHashCode();
-                if (this.Timezone != null)
-                    hashCode = hashCode * 59 + this.Timezone.GetHashCode();
-                if (this.CurrentUtcTime != null)
-                    hashCode = hashCode * 59 + this.CurrentUtcTime.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/KioskStripeLocation.cs b/src/Flipdish/Model/KioskStripeLocation.cs
new file mode 100644
index 00000000..60e0acf8
--- /dev/null
+++ b/src/Flipdish/Model/KioskStripeLocation.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Stripe Terminal location used by a kiosk&#39;s card readers
+    /// </summary>
+    [DataContract]
+    public partial class KioskStripeLocation :  IEquatable<KioskStripeLocation>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="KioskStripeLocation" /> class.
+        /// </summary>
+        /// <param name="deviceId">Kiosk device ID.</param>
+        /// <param name="stripeLocationId">Stripe Terminal location ID. Null when card payments have not been set up on the kiosk..</param>
+        public KioskStripeLocation(string deviceId = default(string), string stripeLocationId = default(string))
+        {
+            this.DeviceId = deviceId;
+            this.StripeLocationId = stripeLocationId;
+        }
+        
+        /// <summary>
+        /// Kiosk device ID
+        /// </summary>
+        /// <value>Kiosk device ID</value>
+        [DataMember(Name="DeviceId", EmitDefaultValue=false)]
+        public string DeviceId { get; set; }
+
+        /// <summary>
+        /// Stripe Terminal location ID. Null when card payments have not been set up on the kiosk.
+        /// </summary>
+        /// <value>Stripe Terminal location ID. Null when card payments have not been set up on the kiosk.</value>
+        [DataMember(Name="StripeLocationId", EmitDefaultValue=false)]
+        public string StripeLocationId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class KioskStripeLocation {\n");
+            sb.Append("  DeviceId: ").Append(DeviceId).Append("\n");
+            sb.Append("  StripeLocationId: ").Append(StripeLocationId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as KioskStripeLocation);
+        }
+
+        /// <summary>
+        /// Returns true if KioskStripeLocation instances are equal
+        /// </summary>
+        /// <param name="input">Instance of KioskStripeLocation to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(KioskStripeLocation input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeviceId == input.DeviceId ||
+                    (this.DeviceId != null &&
+                    this.DeviceId.Equals(input.DeviceId))
+                ) && 
+                (
+                    this.StripeLocationId == input.StripeLocationId ||
+                    (this.StripeLocationId != null &&
+                    this.StripeLocationId.Equals(input.StripeLocationId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeviceId != null)
+                    hashCode = hashCode * 59 + this.DeviceId.GetHashCode();
+                if (this.StripeLocationId != null)
+                    hashCode = hashCode * 59 + this.StripeLocationId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/KioskTerminalActionStateChangedEvent.cs b/src/Flipdish/Model/KioskTerminalActionStateChangedEvent.cs
index fdfbb636..f311a024 100644
--- a/src/Flipdish/Model/KioskTerminalActionStateChangedEvent.cs
+++ b/src/Flipdish/Model/KioskTerminalActionStateChangedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Kiosk Terminal action state changed
     /// </summary>
     [DataContract]
-    public partial class KioskTerminalActionStateChangedEvent :  IEquatable<KioskTerminalActionStateChangedEvent>, IValidatableObject
+    public partial class KioskTerminalActionStateChangedEvent :  IEquatable<KioskTerminalActionStateChangedEvent>
     {
         /// <summary>
         /// Terminal type
@@ -87,8 +85,11 @@ public enum BluetoothTerminalTypeEnum
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public KioskTerminalActionStateChangedEvent(string readerId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), string actionState = default(string), string failureCode = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public KioskTerminalActionStateChangedEvent(string readerId = default(string), BluetoothTerminalTypeEnum? bluetoothTerminalType = default(BluetoothTerminalTypeEnum?), string actionState = default(string), string failureCode = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.ReaderId = readerId;
             this.BluetoothTerminalType = bluetoothTerminalType;
@@ -99,7 +100,10 @@ public enum BluetoothTerminalTypeEnum
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -159,6 +163,13 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -166,6 +177,20 @@ public enum BluetoothTerminalTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -183,7 +208,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -263,10 +291,25 @@ public bool Equals(KioskTerminalActionStateChangedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -297,21 +340,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Language.cs b/src/Flipdish/Model/Language.cs
index ce9de474..7a6c3a89 100644
--- a/src/Flipdish/Model/Language.cs
+++ b/src/Flipdish/Model/Language.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Sorted Language
     /// </summary>
     [DataContract]
-    public partial class Language :  IEquatable<Language>, IValidatableObject
+    public partial class Language :  IEquatable<Language>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Language" /> class.
@@ -36,11 +34,13 @@ public partial class Language :  IEquatable<Language>, IValidatableObject
         /// <param name="languageId">ISO 639-1 Language Code.</param>
         /// <param name="displayOrder">Display Order.</param>
         /// <param name="name">Language Name.</param>
-        public Language(string languageId = default(string), int? displayOrder = default(int?), string name = default(string))
+        /// <param name="enabled">Is the language enabled for use..</param>
+        public Language(string languageId = default(string), int? displayOrder = default(int?), string name = default(string), bool? enabled = default(bool?))
         {
             this.LanguageId = languageId;
             this.DisplayOrder = displayOrder;
             this.Name = name;
+            this.Enabled = enabled;
         }
         
         /// <summary>
@@ -64,6 +64,13 @@ public partial class Language :  IEquatable<Language>, IValidatableObject
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
+        /// <summary>
+        /// Is the language enabled for use.
+        /// </summary>
+        /// <value>Is the language enabled for use.</value>
+        [DataMember(Name="Enabled", EmitDefaultValue=false)]
+        public bool? Enabled { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -75,6 +82,7 @@ public override string ToString()
             sb.Append("  LanguageId: ").Append(LanguageId).Append("\n");
             sb.Append("  DisplayOrder: ").Append(DisplayOrder).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Enabled: ").Append(Enabled).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -123,6 +131,11 @@ public bool Equals(Language input)
                     this.Name == input.Name ||
                     (this.Name != null &&
                     this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Enabled == input.Enabled ||
+                    (this.Enabled != null &&
+                    this.Enabled.Equals(input.Enabled))
                 );
         }
 
@@ -141,19 +154,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.DisplayOrder.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Enabled != null)
+                    hashCode = hashCode * 59 + this.Enabled.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LastPaymentError.cs b/src/Flipdish/Model/LastPaymentError.cs
index 7495ee97..13595a74 100644
--- a/src/Flipdish/Model/LastPaymentError.cs
+++ b/src/Flipdish/Model/LastPaymentError.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// List&#39;s the issues with the last failed payment intent
     /// </summary>
     [DataContract]
-    public partial class LastPaymentError :  IEquatable<LastPaymentError>, IValidatableObject
+    public partial class LastPaymentError :  IEquatable<LastPaymentError>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LastPaymentError" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LeadTime.cs b/src/Flipdish/Model/LeadTime.cs
new file mode 100644
index 00000000..3675f4a5
--- /dev/null
+++ b/src/Flipdish/Model/LeadTime.cs
@@ -0,0 +1,151 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// LeadTime
+    /// </summary>
+    [DataContract]
+    public partial class LeadTime :  IEquatable<LeadTime>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LeadTime" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected LeadTime() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LeadTime" /> class.
+        /// </summary>
+        /// <param name="dispatchType">There are two valid values for this field - &#x60;collection&#x60; and &#x60;delivery&#x60;. (required).</param>
+        /// <param name="leadTimeMinutes">This must be a positive integer. (required).</param>
+        public LeadTime(string dispatchType = default(string), int? leadTimeMinutes = default(int?))
+        {
+            // to ensure "dispatchType" is required (not null)
+            if (dispatchType == null)
+            {
+                throw new InvalidDataException("dispatchType is a required property for LeadTime and cannot be null");
+            }
+            else
+            {
+                this.DispatchType = dispatchType;
+            }
+            // to ensure "leadTimeMinutes" is required (not null)
+            if (leadTimeMinutes == null)
+            {
+                throw new InvalidDataException("leadTimeMinutes is a required property for LeadTime and cannot be null");
+            }
+            else
+            {
+                this.LeadTimeMinutes = leadTimeMinutes;
+            }
+        }
+        
+        /// <summary>
+        /// There are two valid values for this field - &#x60;collection&#x60; and &#x60;delivery&#x60;.
+        /// </summary>
+        /// <value>There are two valid values for this field - &#x60;collection&#x60; and &#x60;delivery&#x60;.</value>
+        [DataMember(Name="DispatchType", EmitDefaultValue=false)]
+        public string DispatchType { get; set; }
+
+        /// <summary>
+        /// This must be a positive integer.
+        /// </summary>
+        /// <value>This must be a positive integer.</value>
+        [DataMember(Name="LeadTimeMinutes", EmitDefaultValue=false)]
+        public int? LeadTimeMinutes { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class LeadTime {\n");
+            sb.Append("  DispatchType: ").Append(DispatchType).Append("\n");
+            sb.Append("  LeadTimeMinutes: ").Append(LeadTimeMinutes).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as LeadTime);
+        }
+
+        /// <summary>
+        /// Returns true if LeadTime instances are equal
+        /// </summary>
+        /// <param name="input">Instance of LeadTime to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(LeadTime input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DispatchType == input.DispatchType ||
+                    (this.DispatchType != null &&
+                    this.DispatchType.Equals(input.DispatchType))
+                ) && 
+                (
+                    this.LeadTimeMinutes == input.LeadTimeMinutes ||
+                    (this.LeadTimeMinutes != null &&
+                    this.LeadTimeMinutes.Equals(input.LeadTimeMinutes))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DispatchType != null)
+                    hashCode = hashCode * 59 + this.DispatchType.GetHashCode();
+                if (this.LeadTimeMinutes != null)
+                    hashCode = hashCode * 59 + this.LeadTimeMinutes.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/LightspeedSettings.cs b/src/Flipdish/Model/LightspeedSettings.cs
index 2b208e87..04902174 100644
--- a/src/Flipdish/Model/LightspeedSettings.cs
+++ b/src/Flipdish/Model/LightspeedSettings.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Ligthspeed store settings
     /// </summary>
     [DataContract]
-    public partial class LightspeedSettings :  IEquatable<LightspeedSettings>, IValidatableObject
+    public partial class LightspeedSettings :  IEquatable<LightspeedSettings>
     {
         /// <summary>
         /// Which price to choose from Lightspeed menu
@@ -511,16 +509,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LineItem.cs b/src/Flipdish/Model/LineItem.cs
deleted file mode 100644
index 0b0d9f15..00000000
--- a/src/Flipdish/Model/LineItem.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Defines a single line item
-    /// </summary>
-    [DataContract]
-    public partial class LineItem :  IEquatable<LineItem>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LineItem" /> class.
-        /// </summary>
-        /// <param name="id">Flipdish Item Id, if unknown leave &#39;null&#39;.</param>
-        /// <param name="name">Item Name.</param>
-        /// <param name="sectionName">Menu section name.</param>
-        /// <param name="externalId">External Item Id.</param>
-        /// <param name="quantity">Item Quantity.</param>
-        /// <param name="price">Item Price.</param>
-        /// <param name="notes">Item Notes.</param>
-        /// <param name="options">Item Option.</param>
-        /// <param name="metadata">Other Item Metadata.</param>
-        public LineItem(int? id = default(int?), string name = default(string), string sectionName = default(string), string externalId = default(string), int? quantity = default(int?), Price price = default(Price), string notes = default(string), List<LineItemOption> options = default(List<LineItemOption>), Dictionary<string, string> metadata = default(Dictionary<string, string>))
-        {
-            this.Id = id;
-            this.Name = name;
-            this.SectionName = sectionName;
-            this.ExternalId = externalId;
-            this.Quantity = quantity;
-            this.Price = price;
-            this.Notes = notes;
-            this.Options = options;
-            this.Metadata = metadata;
-        }
-        
-        /// <summary>
-        /// Flipdish Item Id, if unknown leave &#39;null&#39;
-        /// </summary>
-        /// <value>Flipdish Item Id, if unknown leave &#39;null&#39;</value>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public int? Id { get; set; }
-
-        /// <summary>
-        /// Item Name
-        /// </summary>
-        /// <value>Item Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Menu section name
-        /// </summary>
-        /// <value>Menu section name</value>
-        [DataMember(Name="SectionName", EmitDefaultValue=false)]
-        public string SectionName { get; set; }
-
-        /// <summary>
-        /// External Item Id
-        /// </summary>
-        /// <value>External Item Id</value>
-        [DataMember(Name="ExternalId", EmitDefaultValue=false)]
-        public string ExternalId { get; set; }
-
-        /// <summary>
-        /// Item Quantity
-        /// </summary>
-        /// <value>Item Quantity</value>
-        [DataMember(Name="Quantity", EmitDefaultValue=false)]
-        public int? Quantity { get; set; }
-
-        /// <summary>
-        /// Item Price
-        /// </summary>
-        /// <value>Item Price</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public Price Price { get; set; }
-
-        /// <summary>
-        /// Item Notes
-        /// </summary>
-        /// <value>Item Notes</value>
-        [DataMember(Name="Notes", EmitDefaultValue=false)]
-        public string Notes { get; set; }
-
-        /// <summary>
-        /// Item Option
-        /// </summary>
-        /// <value>Item Option</value>
-        [DataMember(Name="Options", EmitDefaultValue=false)]
-        public List<LineItemOption> Options { get; set; }
-
-        /// <summary>
-        /// Other Item Metadata
-        /// </summary>
-        /// <value>Other Item Metadata</value>
-        [DataMember(Name="Metadata", EmitDefaultValue=false)]
-        public Dictionary<string, string> Metadata { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class LineItem {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  SectionName: ").Append(SectionName).Append("\n");
-            sb.Append("  ExternalId: ").Append(ExternalId).Append("\n");
-            sb.Append("  Quantity: ").Append(Quantity).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  Notes: ").Append(Notes).Append("\n");
-            sb.Append("  Options: ").Append(Options).Append("\n");
-            sb.Append("  Metadata: ").Append(Metadata).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as LineItem);
-        }
-
-        /// <summary>
-        /// Returns true if LineItem instances are equal
-        /// </summary>
-        /// <param name="input">Instance of LineItem to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(LineItem input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.SectionName == input.SectionName ||
-                    (this.SectionName != null &&
-                    this.SectionName.Equals(input.SectionName))
-                ) && 
-                (
-                    this.ExternalId == input.ExternalId ||
-                    (this.ExternalId != null &&
-                    this.ExternalId.Equals(input.ExternalId))
-                ) && 
-                (
-                    this.Quantity == input.Quantity ||
-                    (this.Quantity != null &&
-                    this.Quantity.Equals(input.Quantity))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.Notes == input.Notes ||
-                    (this.Notes != null &&
-                    this.Notes.Equals(input.Notes))
-                ) && 
-                (
-                    this.Options == input.Options ||
-                    this.Options != null &&
-                    this.Options.SequenceEqual(input.Options)
-                ) && 
-                (
-                    this.Metadata == input.Metadata ||
-                    this.Metadata != null &&
-                    this.Metadata.SequenceEqual(input.Metadata)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.SectionName != null)
-                    hashCode = hashCode * 59 + this.SectionName.GetHashCode();
-                if (this.ExternalId != null)
-                    hashCode = hashCode * 59 + this.ExternalId.GetHashCode();
-                if (this.Quantity != null)
-                    hashCode = hashCode * 59 + this.Quantity.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.Notes != null)
-                    hashCode = hashCode * 59 + this.Notes.GetHashCode();
-                if (this.Options != null)
-                    hashCode = hashCode * 59 + this.Options.GetHashCode();
-                if (this.Metadata != null)
-                    hashCode = hashCode * 59 + this.Metadata.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/LineItemOption.cs b/src/Flipdish/Model/LineItemOption.cs
deleted file mode 100644
index 9406cdde..00000000
--- a/src/Flipdish/Model/LineItemOption.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Defines a single line item option
-    /// </summary>
-    [DataContract]
-    public partial class LineItemOption :  IEquatable<LineItemOption>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LineItemOption" /> class.
-        /// </summary>
-        /// <param name="id">Flipdish Item Option Id, if unknown leave &#39;null&#39;.</param>
-        /// <param name="externalId">External Item Option Id.</param>
-        /// <param name="name">External Item Option Name.</param>
-        /// <param name="price">External Item Option Price.</param>
-        /// <param name="metadata">Other Item Metadata.</param>
-        public LineItemOption(int? id = default(int?), string externalId = default(string), string name = default(string), Price price = default(Price), Dictionary<string, string> metadata = default(Dictionary<string, string>))
-        {
-            this.Id = id;
-            this.ExternalId = externalId;
-            this.Name = name;
-            this.Price = price;
-            this.Metadata = metadata;
-        }
-        
-        /// <summary>
-        /// Flipdish Item Option Id, if unknown leave &#39;null&#39;
-        /// </summary>
-        /// <value>Flipdish Item Option Id, if unknown leave &#39;null&#39;</value>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public int? Id { get; set; }
-
-        /// <summary>
-        /// External Item Option Id
-        /// </summary>
-        /// <value>External Item Option Id</value>
-        [DataMember(Name="ExternalId", EmitDefaultValue=false)]
-        public string ExternalId { get; set; }
-
-        /// <summary>
-        /// External Item Option Name
-        /// </summary>
-        /// <value>External Item Option Name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// External Item Option Price
-        /// </summary>
-        /// <value>External Item Option Price</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public Price Price { get; set; }
-
-        /// <summary>
-        /// Other Item Metadata
-        /// </summary>
-        /// <value>Other Item Metadata</value>
-        [DataMember(Name="Metadata", EmitDefaultValue=false)]
-        public Dictionary<string, string> Metadata { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class LineItemOption {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  ExternalId: ").Append(ExternalId).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  Metadata: ").Append(Metadata).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as LineItemOption);
-        }
-
-        /// <summary>
-        /// Returns true if LineItemOption instances are equal
-        /// </summary>
-        /// <param name="input">Instance of LineItemOption to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(LineItemOption input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.ExternalId == input.ExternalId ||
-                    (this.ExternalId != null &&
-                    this.ExternalId.Equals(input.ExternalId))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.Metadata == input.Metadata ||
-                    this.Metadata != null &&
-                    this.Metadata.SequenceEqual(input.Metadata)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.ExternalId != null)
-                    hashCode = hashCode * 59 + this.ExternalId.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.Metadata != null)
-                    hashCode = hashCode * 59 + this.Metadata.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/LocalisedTimeZone.cs b/src/Flipdish/Model/LocalisedTimeZone.cs
index 97649503..b3ad9c39 100644
--- a/src/Flipdish/Model/LocalisedTimeZone.cs
+++ b/src/Flipdish/Model/LocalisedTimeZone.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a localised time zone
     /// </summary>
     [DataContract]
-    public partial class LocalisedTimeZone :  IEquatable<LocalisedTimeZone>, IValidatableObject
+    public partial class LocalisedTimeZone :  IEquatable<LocalisedTimeZone>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LocalisedTimeZone" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Location.cs b/src/Flipdish/Model/Location.cs
deleted file mode 100644
index 3e33a3ce..00000000
--- a/src/Flipdish/Model/Location.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Location to deliver to
-    /// </summary>
-    [DataContract]
-    public partial class Location :  IEquatable<Location>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Location" /> class.
-        /// </summary>
-        /// <param name="addressLine1">Line 1 of the address.</param>
-        /// <param name="addressLine2">Line 2 of the address.</param>
-        /// <param name="formattedAddress">Formatted Address.</param>
-        /// <param name="postalCode">Postal / Zip Code.</param>
-        /// <param name="city">City to deliver to.</param>
-        /// <param name="coordinates">Coordinates to deliver to.</param>
-        /// <param name="notes">Notes for delivery.</param>
-        public Location(string addressLine1 = default(string), string addressLine2 = default(string), string formattedAddress = default(string), string postalCode = default(string), string city = default(string), Coordinates coordinates = default(Coordinates), string notes = default(string))
-        {
-            this.AddressLine1 = addressLine1;
-            this.AddressLine2 = addressLine2;
-            this.FormattedAddress = formattedAddress;
-            this.PostalCode = postalCode;
-            this.City = city;
-            this.Coordinates = coordinates;
-            this.Notes = notes;
-        }
-        
-        /// <summary>
-        /// Line 1 of the address
-        /// </summary>
-        /// <value>Line 1 of the address</value>
-        [DataMember(Name="AddressLine1", EmitDefaultValue=false)]
-        public string AddressLine1 { get; set; }
-
-        /// <summary>
-        /// Line 2 of the address
-        /// </summary>
-        /// <value>Line 2 of the address</value>
-        [DataMember(Name="AddressLine2", EmitDefaultValue=false)]
-        public string AddressLine2 { get; set; }
-
-        /// <summary>
-        /// Formatted Address
-        /// </summary>
-        /// <value>Formatted Address</value>
-        [DataMember(Name="FormattedAddress", EmitDefaultValue=false)]
-        public string FormattedAddress { get; set; }
-
-        /// <summary>
-        /// Postal / Zip Code
-        /// </summary>
-        /// <value>Postal / Zip Code</value>
-        [DataMember(Name="PostalCode", EmitDefaultValue=false)]
-        public string PostalCode { get; set; }
-
-        /// <summary>
-        /// City to deliver to
-        /// </summary>
-        /// <value>City to deliver to</value>
-        [DataMember(Name="City", EmitDefaultValue=false)]
-        public string City { get; set; }
-
-        /// <summary>
-        /// Coordinates to deliver to
-        /// </summary>
-        /// <value>Coordinates to deliver to</value>
-        [DataMember(Name="Coordinates", EmitDefaultValue=false)]
-        public Coordinates Coordinates { get; set; }
-
-        /// <summary>
-        /// Notes for delivery
-        /// </summary>
-        /// <value>Notes for delivery</value>
-        [DataMember(Name="Notes", EmitDefaultValue=false)]
-        public string Notes { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class Location {\n");
-            sb.Append("  AddressLine1: ").Append(AddressLine1).Append("\n");
-            sb.Append("  AddressLine2: ").Append(AddressLine2).Append("\n");
-            sb.Append("  FormattedAddress: ").Append(FormattedAddress).Append("\n");
-            sb.Append("  PostalCode: ").Append(PostalCode).Append("\n");
-            sb.Append("  City: ").Append(City).Append("\n");
-            sb.Append("  Coordinates: ").Append(Coordinates).Append("\n");
-            sb.Append("  Notes: ").Append(Notes).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Location);
-        }
-
-        /// <summary>
-        /// Returns true if Location instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Location to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Location input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.AddressLine1 == input.AddressLine1 ||
-                    (this.AddressLine1 != null &&
-                    this.AddressLine1.Equals(input.AddressLine1))
-                ) && 
-                (
-                    this.AddressLine2 == input.AddressLine2 ||
-                    (this.AddressLine2 != null &&
-                    this.AddressLine2.Equals(input.AddressLine2))
-                ) && 
-                (
-                    this.FormattedAddress == input.FormattedAddress ||
-                    (this.FormattedAddress != null &&
-                    this.FormattedAddress.Equals(input.FormattedAddress))
-                ) && 
-                (
-                    this.PostalCode == input.PostalCode ||
-                    (this.PostalCode != null &&
-                    this.PostalCode.Equals(input.PostalCode))
-                ) && 
-                (
-                    this.City == input.City ||
-                    (this.City != null &&
-                    this.City.Equals(input.City))
-                ) && 
-                (
-                    this.Coordinates == input.Coordinates ||
-                    (this.Coordinates != null &&
-                    this.Coordinates.Equals(input.Coordinates))
-                ) && 
-                (
-                    this.Notes == input.Notes ||
-                    (this.Notes != null &&
-                    this.Notes.Equals(input.Notes))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.AddressLine1 != null)
-                    hashCode = hashCode * 59 + this.AddressLine1.GetHashCode();
-                if (this.AddressLine2 != null)
-                    hashCode = hashCode * 59 + this.AddressLine2.GetHashCode();
-                if (this.FormattedAddress != null)
-                    hashCode = hashCode * 59 + this.FormattedAddress.GetHashCode();
-                if (this.PostalCode != null)
-                    hashCode = hashCode * 59 + this.PostalCode.GetHashCode();
-                if (this.City != null)
-                    hashCode = hashCode * 59 + this.City.GetHashCode();
-                if (this.Coordinates != null)
-                    hashCode = hashCode * 59 + this.Coordinates.GetHashCode();
-                if (this.Notes != null)
-                    hashCode = hashCode * 59 + this.Notes.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/LocationArea.cs b/src/Flipdish/Model/LocationArea.cs
index f5958f5e..91854a3d 100644
--- a/src/Flipdish/Model/LocationArea.cs
+++ b/src/Flipdish/Model/LocationArea.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a LocationArea
     /// </summary>
     [DataContract]
-    public partial class LocationArea :  IEquatable<LocationArea>, IValidatableObject
+    public partial class LocationArea :  IEquatable<LocationArea>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LocationArea" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LocationAreaCreatedEvent.cs b/src/Flipdish/Model/LocationAreaCreatedEvent.cs
index daab4424..9683a641 100644
--- a/src/Flipdish/Model/LocationAreaCreatedEvent.cs
+++ b/src/Flipdish/Model/LocationAreaCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Event for logging creating of LocationAreas
     /// </summary>
     [DataContract]
-    public partial class LocationAreaCreatedEvent :  IEquatable<LocationAreaCreatedEvent>, IValidatableObject
+    public partial class LocationAreaCreatedEvent :  IEquatable<LocationAreaCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LocationAreaCreatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class LocationAreaCreatedEvent :  IEquatable<LocationAreaCreatedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public LocationAreaCreatedEvent(string locationAreaId = default(string), string locationAreaName = default(string), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public LocationAreaCreatedEvent(string locationAreaId = default(string), string locationAreaName = default(string), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.LocationAreaId = locationAreaId;
             this.LocationAreaName = locationAreaName;
@@ -52,7 +53,10 @@ public partial class LocationAreaCreatedEvent :  IEquatable<LocationAreaCreatedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class LocationAreaCreatedEvent :  IEquatable<LocationAreaCreatedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class LocationAreaCreatedEvent :  IEquatable<LocationAreaCreatedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(LocationAreaCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LocationAreaLocation.cs b/src/Flipdish/Model/LocationAreaLocation.cs
index e279046d..61e09268 100644
--- a/src/Flipdish/Model/LocationAreaLocation.cs
+++ b/src/Flipdish/Model/LocationAreaLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Representation of a Location i.e: (Table, Hotel Room, Car Park, etc )
     /// </summary>
     [DataContract]
-    public partial class LocationAreaLocation :  IEquatable<LocationAreaLocation>, IValidatableObject
+    public partial class LocationAreaLocation :  IEquatable<LocationAreaLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LocationAreaLocation" /> class.
@@ -207,16 +205,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LocationAreaUpdatedEvent.cs b/src/Flipdish/Model/LocationAreaUpdatedEvent.cs
index a163f91a..8d0f56b2 100644
--- a/src/Flipdish/Model/LocationAreaUpdatedEvent.cs
+++ b/src/Flipdish/Model/LocationAreaUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Event for logging updates of LocationAreas
     /// </summary>
     [DataContract]
-    public partial class LocationAreaUpdatedEvent :  IEquatable<LocationAreaUpdatedEvent>, IValidatableObject
+    public partial class LocationAreaUpdatedEvent :  IEquatable<LocationAreaUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LocationAreaUpdatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class LocationAreaUpdatedEvent :  IEquatable<LocationAreaUpdatedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public LocationAreaUpdatedEvent(string locationAreaId = default(string), string locationAreaName = default(string), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public LocationAreaUpdatedEvent(string locationAreaId = default(string), string locationAreaName = default(string), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.LocationAreaId = locationAreaId;
             this.LocationAreaName = locationAreaName;
@@ -52,7 +53,10 @@ public partial class LocationAreaUpdatedEvent :  IEquatable<LocationAreaUpdatedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class LocationAreaUpdatedEvent :  IEquatable<LocationAreaUpdatedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class LocationAreaUpdatedEvent :  IEquatable<LocationAreaUpdatedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(LocationAreaUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LocationAreaWithLocations.cs b/src/Flipdish/Model/LocationAreaWithLocations.cs
index 0133a586..ad0b1989 100644
--- a/src/Flipdish/Model/LocationAreaWithLocations.cs
+++ b/src/Flipdish/Model/LocationAreaWithLocations.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a LocationArea and its Location list
     /// </summary>
     [DataContract]
-    public partial class LocationAreaWithLocations :  IEquatable<LocationAreaWithLocations>, IValidatableObject
+    public partial class LocationAreaWithLocations :  IEquatable<LocationAreaWithLocations>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LocationAreaWithLocations" /> class.
@@ -207,16 +205,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LocationCreatedEvent.cs b/src/Flipdish/Model/LocationCreatedEvent.cs
index d9668c98..84ab5050 100644
--- a/src/Flipdish/Model/LocationCreatedEvent.cs
+++ b/src/Flipdish/Model/LocationCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Event for logging the creating of Locations
     /// </summary>
     [DataContract]
-    public partial class LocationCreatedEvent :  IEquatable<LocationCreatedEvent>, IValidatableObject
+    public partial class LocationCreatedEvent :  IEquatable<LocationCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LocationCreatedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class LocationCreatedEvent :  IEquatable<LocationCreatedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public LocationCreatedEvent(int? locationId = default(int?), string locationName = default(string), int? displayOrder = default(int?), string externalLocationId = default(string), int? locationAreaId = default(int?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public LocationCreatedEvent(int? locationId = default(int?), string locationName = default(string), int? displayOrder = default(int?), string externalLocationId = default(string), int? locationAreaId = default(int?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.LocationId = locationId;
             this.LocationName = locationName;
@@ -56,7 +57,10 @@ public partial class LocationCreatedEvent :  IEquatable<LocationCreatedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class LocationCreatedEvent :  IEquatable<LocationCreatedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class LocationCreatedEvent :  IEquatable<LocationCreatedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(LocationCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LocationDeletedEvent.cs b/src/Flipdish/Model/LocationDeletedEvent.cs
index a6a94dd4..ea55fa9a 100644
--- a/src/Flipdish/Model/LocationDeletedEvent.cs
+++ b/src/Flipdish/Model/LocationDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Event for logging the deleting of Locations
     /// </summary>
     [DataContract]
-    public partial class LocationDeletedEvent :  IEquatable<LocationDeletedEvent>, IValidatableObject
+    public partial class LocationDeletedEvent :  IEquatable<LocationDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LocationDeletedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class LocationDeletedEvent :  IEquatable<LocationDeletedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public LocationDeletedEvent(int? locationId = default(int?), string locationName = default(string), int? displayOrder = default(int?), string externalLocationId = default(string), int? locationAreaId = default(int?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public LocationDeletedEvent(int? locationId = default(int?), string locationName = default(string), int? displayOrder = default(int?), string externalLocationId = default(string), int? locationAreaId = default(int?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.LocationId = locationId;
             this.LocationName = locationName;
@@ -56,7 +57,10 @@ public partial class LocationDeletedEvent :  IEquatable<LocationDeletedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class LocationDeletedEvent :  IEquatable<LocationDeletedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class LocationDeletedEvent :  IEquatable<LocationDeletedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(LocationDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LoginModel.cs b/src/Flipdish/Model/LoginModel.cs
index b4739cb8..2f0bbdef 100644
--- a/src/Flipdish/Model/LoginModel.cs
+++ b/src/Flipdish/Model/LoginModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Login model
     /// </summary>
     [DataContract]
-    public partial class LoginModel :  IEquatable<LoginModel>, IValidatableObject
+    public partial class LoginModel :  IEquatable<LoginModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LoginModel" /> class.
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LoginWithPinModel.cs b/src/Flipdish/Model/LoginWithPinModel.cs
deleted file mode 100644
index ea66786a..00000000
--- a/src/Flipdish/Model/LoginWithPinModel.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Login with PIN model
-    /// </summary>
-    [DataContract]
-    public partial class LoginWithPinModel :  IEquatable<LoginWithPinModel>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LoginWithPinModel" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected LoginWithPinModel() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LoginWithPinModel" /> class.
-        /// </summary>
-        /// <param name="email">Email addres (required).</param>
-        /// <param name="pin">PIN code (received via email) (required).</param>
-        public LoginWithPinModel(string email = default(string), int? pin = default(int?))
-        {
-            // to ensure "email" is required (not null)
-            if (email == null)
-            {
-                throw new InvalidDataException("email is a required property for LoginWithPinModel and cannot be null");
-            }
-            else
-            {
-                this.Email = email;
-            }
-            // to ensure "pin" is required (not null)
-            if (pin == null)
-            {
-                throw new InvalidDataException("pin is a required property for LoginWithPinModel and cannot be null");
-            }
-            else
-            {
-                this.Pin = pin;
-            }
-        }
-        
-        /// <summary>
-        /// Email addres
-        /// </summary>
-        /// <value>Email addres</value>
-        [DataMember(Name="Email", EmitDefaultValue=false)]
-        public string Email { get; set; }
-
-        /// <summary>
-        /// PIN code (received via email)
-        /// </summary>
-        /// <value>PIN code (received via email)</value>
-        [DataMember(Name="Pin", EmitDefaultValue=false)]
-        public int? Pin { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class LoginWithPinModel {\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
-            sb.Append("  Pin: ").Append(Pin).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as LoginWithPinModel);
-        }
-
-        /// <summary>
-        /// Returns true if LoginWithPinModel instances are equal
-        /// </summary>
-        /// <param name="input">Instance of LoginWithPinModel to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(LoginWithPinModel input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Email == input.Email ||
-                    (this.Email != null &&
-                    this.Email.Equals(input.Email))
-                ) && 
-                (
-                    this.Pin == input.Pin ||
-                    (this.Pin != null &&
-                    this.Pin.Equals(input.Pin))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Email != null)
-                    hashCode = hashCode * 59 + this.Email.GetHashCode();
-                if (this.Pin != null)
-                    hashCode = hashCode * 59 + this.Pin.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/LoyaltyCampaign.cs b/src/Flipdish/Model/LoyaltyCampaign.cs
index 32a5e91c..2655a0b0 100644
--- a/src/Flipdish/Model/LoyaltyCampaign.cs
+++ b/src/Flipdish/Model/LoyaltyCampaign.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Loyalty campaign
     /// </summary>
     [DataContract]
-    public partial class LoyaltyCampaign :  IEquatable<LoyaltyCampaign>, IValidatableObject
+    public partial class LoyaltyCampaign :  IEquatable<LoyaltyCampaign>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LoyaltyCampaign" /> class.
@@ -36,8 +34,10 @@ public partial class LoyaltyCampaign :  IEquatable<LoyaltyCampaign>, IValidatabl
         /// <param name="campaignId">Id of campaign.</param>
         /// <param name="statistics">Statistics of campaign.</param>
         /// <param name="stores">Stores this campaign applies to with campaign start time in Utc.</param>
+        /// <param name="publicId">Permanent reference to the item..</param>
         /// <param name="ordersBeforeReceivingVoucher">Number of orders customer needs to make, before receiving voucher.</param>
         /// <param name="percentDiscountAmount">Discount amount in percents.</param>
+        /// <param name="maxDiscount">Maximum discount for percentage discounts.</param>
         /// <param name="roundingStrategy">Controls how the loyalty voucher&#39;s amount is rounded.</param>
         /// <param name="shouldIncludeOrdersWithLoyaltyVoucher">Controls whether we should include orders with loyalty vouchers in the campaign calculation.</param>
         /// <param name="voucherValidPeriodDays">Number of days for which the voucher will be valid..</param>
@@ -46,13 +46,17 @@ public partial class LoyaltyCampaign :  IEquatable<LoyaltyCampaign>, IValidatabl
         /// <param name="includeExistingOrders">Campaign will apply to existing orders.</param>
         /// <param name="isEnabled">Is campaign enabled.</param>
         /// <param name="storeIds">Ids of stores this campaign applies to.</param>
-        public LoyaltyCampaign(int? campaignId = default(int?), CampaignStatistics statistics = default(CampaignStatistics), List<StoreCampaignStartTime> stores = default(List<StoreCampaignStartTime>), int? ordersBeforeReceivingVoucher = default(int?), int? percentDiscountAmount = default(int?), int? roundingStrategy = default(int?), bool? shouldIncludeOrdersWithLoyaltyVoucher = default(bool?), int? voucherValidPeriodDays = default(int?), bool? includeDeliveryFee = default(bool?), bool? autoApplyResultingVouchers = default(bool?), bool? includeExistingOrders = default(bool?), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>))
+        /// <param name="appId">The app that this campaign belongs to..</param>
+        /// <param name="forceDiscount">Controls whether the voucher generated from this campaign will override discount exclusions.</param>
+        public LoyaltyCampaign(int? campaignId = default(int?), CampaignStatistics statistics = default(CampaignStatistics), List<StoreCampaignStartTime> stores = default(List<StoreCampaignStartTime>), Guid? publicId = default(Guid?), int? ordersBeforeReceivingVoucher = default(int?), int? percentDiscountAmount = default(int?), double? maxDiscount = default(double?), int? roundingStrategy = default(int?), bool? shouldIncludeOrdersWithLoyaltyVoucher = default(bool?), int? voucherValidPeriodDays = default(int?), bool? includeDeliveryFee = default(bool?), bool? autoApplyResultingVouchers = default(bool?), bool? includeExistingOrders = default(bool?), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>), string appId = default(string), bool? forceDiscount = default(bool?))
         {
             this.CampaignId = campaignId;
             this.Statistics = statistics;
             this.Stores = stores;
+            this.PublicId = publicId;
             this.OrdersBeforeReceivingVoucher = ordersBeforeReceivingVoucher;
             this.PercentDiscountAmount = percentDiscountAmount;
+            this.MaxDiscount = maxDiscount;
             this.RoundingStrategy = roundingStrategy;
             this.ShouldIncludeOrdersWithLoyaltyVoucher = shouldIncludeOrdersWithLoyaltyVoucher;
             this.VoucherValidPeriodDays = voucherValidPeriodDays;
@@ -61,6 +65,8 @@ public partial class LoyaltyCampaign :  IEquatable<LoyaltyCampaign>, IValidatabl
             this.IncludeExistingOrders = includeExistingOrders;
             this.IsEnabled = isEnabled;
             this.StoreIds = storeIds;
+            this.AppId = appId;
+            this.ForceDiscount = forceDiscount;
         }
         
         /// <summary>
@@ -84,6 +90,13 @@ public partial class LoyaltyCampaign :  IEquatable<LoyaltyCampaign>, IValidatabl
         [DataMember(Name="Stores", EmitDefaultValue=false)]
         public List<StoreCampaignStartTime> Stores { get; set; }
 
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Number of orders customer needs to make, before receiving voucher
         /// </summary>
@@ -98,6 +111,13 @@ public partial class LoyaltyCampaign :  IEquatable<LoyaltyCampaign>, IValidatabl
         [DataMember(Name="PercentDiscountAmount", EmitDefaultValue=false)]
         public int? PercentDiscountAmount { get; set; }
 
+        /// <summary>
+        /// Maximum discount for percentage discounts
+        /// </summary>
+        /// <value>Maximum discount for percentage discounts</value>
+        [DataMember(Name="MaxDiscount", EmitDefaultValue=false)]
+        public double? MaxDiscount { get; set; }
+
         /// <summary>
         /// Controls how the loyalty voucher&#39;s amount is rounded
         /// </summary>
@@ -154,6 +174,20 @@ public partial class LoyaltyCampaign :  IEquatable<LoyaltyCampaign>, IValidatabl
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
+        /// <summary>
+        /// The app that this campaign belongs to.
+        /// </summary>
+        /// <value>The app that this campaign belongs to.</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Controls whether the voucher generated from this campaign will override discount exclusions
+        /// </summary>
+        /// <value>Controls whether the voucher generated from this campaign will override discount exclusions</value>
+        [DataMember(Name="ForceDiscount", EmitDefaultValue=false)]
+        public bool? ForceDiscount { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -165,8 +199,10 @@ public override string ToString()
             sb.Append("  CampaignId: ").Append(CampaignId).Append("\n");
             sb.Append("  Statistics: ").Append(Statistics).Append("\n");
             sb.Append("  Stores: ").Append(Stores).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("  OrdersBeforeReceivingVoucher: ").Append(OrdersBeforeReceivingVoucher).Append("\n");
             sb.Append("  PercentDiscountAmount: ").Append(PercentDiscountAmount).Append("\n");
+            sb.Append("  MaxDiscount: ").Append(MaxDiscount).Append("\n");
             sb.Append("  RoundingStrategy: ").Append(RoundingStrategy).Append("\n");
             sb.Append("  ShouldIncludeOrdersWithLoyaltyVoucher: ").Append(ShouldIncludeOrdersWithLoyaltyVoucher).Append("\n");
             sb.Append("  VoucherValidPeriodDays: ").Append(VoucherValidPeriodDays).Append("\n");
@@ -175,6 +211,8 @@ public override string ToString()
             sb.Append("  IncludeExistingOrders: ").Append(IncludeExistingOrders).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  ForceDiscount: ").Append(ForceDiscount).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,6 +262,11 @@ public bool Equals(LoyaltyCampaign input)
                     this.Stores != null &&
                     this.Stores.SequenceEqual(input.Stores)
                 ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
+                ) && 
                 (
                     this.OrdersBeforeReceivingVoucher == input.OrdersBeforeReceivingVoucher ||
                     (this.OrdersBeforeReceivingVoucher != null &&
@@ -234,6 +277,11 @@ public bool Equals(LoyaltyCampaign input)
                     (this.PercentDiscountAmount != null &&
                     this.PercentDiscountAmount.Equals(input.PercentDiscountAmount))
                 ) && 
+                (
+                    this.MaxDiscount == input.MaxDiscount ||
+                    (this.MaxDiscount != null &&
+                    this.MaxDiscount.Equals(input.MaxDiscount))
+                ) && 
                 (
                     this.RoundingStrategy == input.RoundingStrategy ||
                     (this.RoundingStrategy != null &&
@@ -273,6 +321,16 @@ public bool Equals(LoyaltyCampaign input)
                     this.StoreIds == input.StoreIds ||
                     this.StoreIds != null &&
                     this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.ForceDiscount == input.ForceDiscount ||
+                    (this.ForceDiscount != null &&
+                    this.ForceDiscount.Equals(input.ForceDiscount))
                 );
         }
 
@@ -291,10 +349,14 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Statistics.GetHashCode();
                 if (this.Stores != null)
                     hashCode = hashCode * 59 + this.Stores.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 if (this.OrdersBeforeReceivingVoucher != null)
                     hashCode = hashCode * 59 + this.OrdersBeforeReceivingVoucher.GetHashCode();
                 if (this.PercentDiscountAmount != null)
                     hashCode = hashCode * 59 + this.PercentDiscountAmount.GetHashCode();
+                if (this.MaxDiscount != null)
+                    hashCode = hashCode * 59 + this.MaxDiscount.GetHashCode();
                 if (this.RoundingStrategy != null)
                     hashCode = hashCode * 59 + this.RoundingStrategy.GetHashCode();
                 if (this.ShouldIncludeOrdersWithLoyaltyVoucher != null)
@@ -311,55 +373,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.ForceDiscount != null)
+                    hashCode = hashCode * 59 + this.ForceDiscount.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // PercentDiscountAmount (int?) maximum
-            if(this.PercentDiscountAmount > (int?)100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PercentDiscountAmount, must be a value less than or equal to 100.", new [] { "PercentDiscountAmount" });
-            }
-
-            // PercentDiscountAmount (int?) minimum
-            if(this.PercentDiscountAmount < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PercentDiscountAmount, must be a value greater than or equal to 1.", new [] { "PercentDiscountAmount" });
-            }
-
-            // RoundingStrategy (int?) maximum
-            if(this.RoundingStrategy > (int?)2)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for RoundingStrategy, must be a value less than or equal to 2.", new [] { "RoundingStrategy" });
-            }
-
-            // RoundingStrategy (int?) minimum
-            if(this.RoundingStrategy < (int?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for RoundingStrategy, must be a value greater than or equal to 0.", new [] { "RoundingStrategy" });
-            }
-
-            // VoucherValidPeriodDays (int?) maximum
-            if(this.VoucherValidPeriodDays > (int?)300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VoucherValidPeriodDays, must be a value less than or equal to 300.", new [] { "VoucherValidPeriodDays" });
-            }
-
-            // VoucherValidPeriodDays (int?) minimum
-            if(this.VoucherValidPeriodDays < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VoucherValidPeriodDays, must be a value greater than or equal to 1.", new [] { "VoucherValidPeriodDays" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LoyaltyCampaignBase.cs b/src/Flipdish/Model/LoyaltyCampaignBase.cs
index cbf47949..4aadb768 100644
--- a/src/Flipdish/Model/LoyaltyCampaignBase.cs
+++ b/src/Flipdish/Model/LoyaltyCampaignBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,13 +26,14 @@ namespace Flipdish.Model
     /// Loyalty campaign base
     /// </summary>
     [DataContract]
-    public partial class LoyaltyCampaignBase :  IEquatable<LoyaltyCampaignBase>, IValidatableObject
+    public partial class LoyaltyCampaignBase :  IEquatable<LoyaltyCampaignBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LoyaltyCampaignBase" /> class.
         /// </summary>
         /// <param name="ordersBeforeReceivingVoucher">Number of orders customer needs to make, before receiving voucher.</param>
         /// <param name="percentDiscountAmount">Discount amount in percents.</param>
+        /// <param name="maxDiscount">Maximum discount for percentage discounts.</param>
         /// <param name="roundingStrategy">Controls how the loyalty voucher&#39;s amount is rounded.</param>
         /// <param name="shouldIncludeOrdersWithLoyaltyVoucher">Controls whether we should include orders with loyalty vouchers in the campaign calculation.</param>
         /// <param name="voucherValidPeriodDays">Number of days for which the voucher will be valid..</param>
@@ -43,10 +42,13 @@ public partial class LoyaltyCampaignBase :  IEquatable<LoyaltyCampaignBase>, IVa
         /// <param name="includeExistingOrders">Campaign will apply to existing orders.</param>
         /// <param name="isEnabled">Is campaign enabled.</param>
         /// <param name="storeIds">Ids of stores this campaign applies to.</param>
-        public LoyaltyCampaignBase(int? ordersBeforeReceivingVoucher = default(int?), int? percentDiscountAmount = default(int?), int? roundingStrategy = default(int?), bool? shouldIncludeOrdersWithLoyaltyVoucher = default(bool?), int? voucherValidPeriodDays = default(int?), bool? includeDeliveryFee = default(bool?), bool? autoApplyResultingVouchers = default(bool?), bool? includeExistingOrders = default(bool?), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>))
+        /// <param name="appId">The app that this campaign belongs to..</param>
+        /// <param name="forceDiscount">Controls whether the voucher generated from this campaign will override discount exclusions.</param>
+        public LoyaltyCampaignBase(int? ordersBeforeReceivingVoucher = default(int?), int? percentDiscountAmount = default(int?), double? maxDiscount = default(double?), int? roundingStrategy = default(int?), bool? shouldIncludeOrdersWithLoyaltyVoucher = default(bool?), int? voucherValidPeriodDays = default(int?), bool? includeDeliveryFee = default(bool?), bool? autoApplyResultingVouchers = default(bool?), bool? includeExistingOrders = default(bool?), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>), string appId = default(string), bool? forceDiscount = default(bool?))
         {
             this.OrdersBeforeReceivingVoucher = ordersBeforeReceivingVoucher;
             this.PercentDiscountAmount = percentDiscountAmount;
+            this.MaxDiscount = maxDiscount;
             this.RoundingStrategy = roundingStrategy;
             this.ShouldIncludeOrdersWithLoyaltyVoucher = shouldIncludeOrdersWithLoyaltyVoucher;
             this.VoucherValidPeriodDays = voucherValidPeriodDays;
@@ -55,6 +57,8 @@ public partial class LoyaltyCampaignBase :  IEquatable<LoyaltyCampaignBase>, IVa
             this.IncludeExistingOrders = includeExistingOrders;
             this.IsEnabled = isEnabled;
             this.StoreIds = storeIds;
+            this.AppId = appId;
+            this.ForceDiscount = forceDiscount;
         }
         
         /// <summary>
@@ -71,6 +75,13 @@ public partial class LoyaltyCampaignBase :  IEquatable<LoyaltyCampaignBase>, IVa
         [DataMember(Name="PercentDiscountAmount", EmitDefaultValue=false)]
         public int? PercentDiscountAmount { get; set; }
 
+        /// <summary>
+        /// Maximum discount for percentage discounts
+        /// </summary>
+        /// <value>Maximum discount for percentage discounts</value>
+        [DataMember(Name="MaxDiscount", EmitDefaultValue=false)]
+        public double? MaxDiscount { get; set; }
+
         /// <summary>
         /// Controls how the loyalty voucher&#39;s amount is rounded
         /// </summary>
@@ -127,6 +138,20 @@ public partial class LoyaltyCampaignBase :  IEquatable<LoyaltyCampaignBase>, IVa
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
+        /// <summary>
+        /// The app that this campaign belongs to.
+        /// </summary>
+        /// <value>The app that this campaign belongs to.</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Controls whether the voucher generated from this campaign will override discount exclusions
+        /// </summary>
+        /// <value>Controls whether the voucher generated from this campaign will override discount exclusions</value>
+        [DataMember(Name="ForceDiscount", EmitDefaultValue=false)]
+        public bool? ForceDiscount { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -137,6 +162,7 @@ public override string ToString()
             sb.Append("class LoyaltyCampaignBase {\n");
             sb.Append("  OrdersBeforeReceivingVoucher: ").Append(OrdersBeforeReceivingVoucher).Append("\n");
             sb.Append("  PercentDiscountAmount: ").Append(PercentDiscountAmount).Append("\n");
+            sb.Append("  MaxDiscount: ").Append(MaxDiscount).Append("\n");
             sb.Append("  RoundingStrategy: ").Append(RoundingStrategy).Append("\n");
             sb.Append("  ShouldIncludeOrdersWithLoyaltyVoucher: ").Append(ShouldIncludeOrdersWithLoyaltyVoucher).Append("\n");
             sb.Append("  VoucherValidPeriodDays: ").Append(VoucherValidPeriodDays).Append("\n");
@@ -145,6 +171,8 @@ public override string ToString()
             sb.Append("  IncludeExistingOrders: ").Append(IncludeExistingOrders).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  ForceDiscount: ").Append(ForceDiscount).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -189,6 +217,11 @@ public bool Equals(LoyaltyCampaignBase input)
                     (this.PercentDiscountAmount != null &&
                     this.PercentDiscountAmount.Equals(input.PercentDiscountAmount))
                 ) && 
+                (
+                    this.MaxDiscount == input.MaxDiscount ||
+                    (this.MaxDiscount != null &&
+                    this.MaxDiscount.Equals(input.MaxDiscount))
+                ) && 
                 (
                     this.RoundingStrategy == input.RoundingStrategy ||
                     (this.RoundingStrategy != null &&
@@ -228,6 +261,16 @@ public bool Equals(LoyaltyCampaignBase input)
                     this.StoreIds == input.StoreIds ||
                     this.StoreIds != null &&
                     this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.ForceDiscount == input.ForceDiscount ||
+                    (this.ForceDiscount != null &&
+                    this.ForceDiscount.Equals(input.ForceDiscount))
                 );
         }
 
@@ -244,6 +287,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OrdersBeforeReceivingVoucher.GetHashCode();
                 if (this.PercentDiscountAmount != null)
                     hashCode = hashCode * 59 + this.PercentDiscountAmount.GetHashCode();
+                if (this.MaxDiscount != null)
+                    hashCode = hashCode * 59 + this.MaxDiscount.GetHashCode();
                 if (this.RoundingStrategy != null)
                     hashCode = hashCode * 59 + this.RoundingStrategy.GetHashCode();
                 if (this.ShouldIncludeOrdersWithLoyaltyVoucher != null)
@@ -260,55 +305,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.ForceDiscount != null)
+                    hashCode = hashCode * 59 + this.ForceDiscount.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // PercentDiscountAmount (int?) maximum
-            if(this.PercentDiscountAmount > (int?)100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PercentDiscountAmount, must be a value less than or equal to 100.", new [] { "PercentDiscountAmount" });
-            }
-
-            // PercentDiscountAmount (int?) minimum
-            if(this.PercentDiscountAmount < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PercentDiscountAmount, must be a value greater than or equal to 1.", new [] { "PercentDiscountAmount" });
-            }
-
-            // RoundingStrategy (int?) maximum
-            if(this.RoundingStrategy > (int?)2)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for RoundingStrategy, must be a value less than or equal to 2.", new [] { "RoundingStrategy" });
-            }
-
-            // RoundingStrategy (int?) minimum
-            if(this.RoundingStrategy < (int?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for RoundingStrategy, must be a value greater than or equal to 0.", new [] { "RoundingStrategy" });
-            }
-
-            // VoucherValidPeriodDays (int?) maximum
-            if(this.VoucherValidPeriodDays > (int?)300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VoucherValidPeriodDays, must be a value less than or equal to 300.", new [] { "VoucherValidPeriodDays" });
-            }
-
-            // VoucherValidPeriodDays (int?) minimum
-            if(this.VoucherValidPeriodDays < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VoucherValidPeriodDays, must be a value greater than or equal to 1.", new [] { "VoucherValidPeriodDays" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LoyaltyCampaignCreatedEvent.cs b/src/Flipdish/Model/LoyaltyCampaignCreatedEvent.cs
index 9525536f..5d856ca8 100644
--- a/src/Flipdish/Model/LoyaltyCampaignCreatedEvent.cs
+++ b/src/Flipdish/Model/LoyaltyCampaignCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Loyalty campaign created event
     /// </summary>
     [DataContract]
-    public partial class LoyaltyCampaignCreatedEvent :  IEquatable<LoyaltyCampaignCreatedEvent>, IValidatableObject
+    public partial class LoyaltyCampaignCreatedEvent :  IEquatable<LoyaltyCampaignCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LoyaltyCampaignCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class LoyaltyCampaignCreatedEvent :  IEquatable<LoyaltyCampaignCr
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public LoyaltyCampaignCreatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), LoyaltyCampaign loyaltyCampaign = default(LoyaltyCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public LoyaltyCampaignCreatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), LoyaltyCampaign loyaltyCampaign = default(LoyaltyCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class LoyaltyCampaignCreatedEvent :  IEquatable<LoyaltyCampaignCr
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class LoyaltyCampaignCreatedEvent :  IEquatable<LoyaltyCampaignCr
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class LoyaltyCampaignCreatedEvent :  IEquatable<LoyaltyCampaignCr
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(LoyaltyCampaignCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LoyaltyCampaignDeletedEvent.cs b/src/Flipdish/Model/LoyaltyCampaignDeletedEvent.cs
index bf61923c..8c089df1 100644
--- a/src/Flipdish/Model/LoyaltyCampaignDeletedEvent.cs
+++ b/src/Flipdish/Model/LoyaltyCampaignDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Loyalty campaign deleted event
     /// </summary>
     [DataContract]
-    public partial class LoyaltyCampaignDeletedEvent :  IEquatable<LoyaltyCampaignDeletedEvent>, IValidatableObject
+    public partial class LoyaltyCampaignDeletedEvent :  IEquatable<LoyaltyCampaignDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LoyaltyCampaignDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class LoyaltyCampaignDeletedEvent :  IEquatable<LoyaltyCampaignDe
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public LoyaltyCampaignDeletedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), LoyaltyCampaign loyaltyCampaign = default(LoyaltyCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public LoyaltyCampaignDeletedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), LoyaltyCampaign loyaltyCampaign = default(LoyaltyCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class LoyaltyCampaignDeletedEvent :  IEquatable<LoyaltyCampaignDe
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class LoyaltyCampaignDeletedEvent :  IEquatable<LoyaltyCampaignDe
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class LoyaltyCampaignDeletedEvent :  IEquatable<LoyaltyCampaignDe
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(LoyaltyCampaignDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LoyaltyCampaignUpdatedEvent.cs b/src/Flipdish/Model/LoyaltyCampaignUpdatedEvent.cs
index 47d6b7e7..f2c029c1 100644
--- a/src/Flipdish/Model/LoyaltyCampaignUpdatedEvent.cs
+++ b/src/Flipdish/Model/LoyaltyCampaignUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Loyalty campaign updated event
     /// </summary>
     [DataContract]
-    public partial class LoyaltyCampaignUpdatedEvent :  IEquatable<LoyaltyCampaignUpdatedEvent>, IValidatableObject
+    public partial class LoyaltyCampaignUpdatedEvent :  IEquatable<LoyaltyCampaignUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LoyaltyCampaignUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class LoyaltyCampaignUpdatedEvent :  IEquatable<LoyaltyCampaignUp
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public LoyaltyCampaignUpdatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), LoyaltyCampaign loyaltyCampaign = default(LoyaltyCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public LoyaltyCampaignUpdatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), LoyaltyCampaign loyaltyCampaign = default(LoyaltyCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class LoyaltyCampaignUpdatedEvent :  IEquatable<LoyaltyCampaignUp
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class LoyaltyCampaignUpdatedEvent :  IEquatable<LoyaltyCampaignUp
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class LoyaltyCampaignUpdatedEvent :  IEquatable<LoyaltyCampaignUp
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(LoyaltyCampaignUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/LumpDiscountDetails.cs b/src/Flipdish/Model/LumpDiscountDetails.cs
index d3d482e4..0460b096 100644
--- a/src/Flipdish/Model/LumpDiscountDetails.cs
+++ b/src/Flipdish/Model/LumpDiscountDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Lump discount details
     /// </summary>
     [DataContract]
-    public partial class LumpDiscountDetails :  IEquatable<LumpDiscountDetails>, IValidatableObject
+    public partial class LumpDiscountDetails :  IEquatable<LumpDiscountDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LumpDiscountDetails" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MappedLocation.cs b/src/Flipdish/Model/MappedLocation.cs
index ac40fbd4..52d1c8cf 100644
--- a/src/Flipdish/Model/MappedLocation.cs
+++ b/src/Flipdish/Model/MappedLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Representation of a Location and its External Mapping
     /// </summary>
     [DataContract]
-    public partial class MappedLocation :  IEquatable<MappedLocation>, IValidatableObject
+    public partial class MappedLocation :  IEquatable<MappedLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MappedLocation" /> class.
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MaskedPhoneNumber.cs b/src/Flipdish/Model/MaskedPhoneNumber.cs
index 30efa9f4..80b10ca1 100644
--- a/src/Flipdish/Model/MaskedPhoneNumber.cs
+++ b/src/Flipdish/Model/MaskedPhoneNumber.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a masked phone number
     /// </summary>
     [DataContract]
-    public partial class MaskedPhoneNumber :  IEquatable<MaskedPhoneNumber>, IValidatableObject
+    public partial class MaskedPhoneNumber :  IEquatable<MaskedPhoneNumber>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MaskedPhoneNumber" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Menu.cs b/src/Flipdish/Model/Menu.cs
index 6d7edfa2..a423dd40 100644
--- a/src/Flipdish/Model/Menu.cs
+++ b/src/Flipdish/Model/Menu.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu
     /// </summary>
     [DataContract]
-    public partial class Menu :  IEquatable<Menu>, IValidatableObject
+    public partial class Menu :  IEquatable<Menu>
     {
         /// <summary>
         /// Menu section behaviour
@@ -96,10 +94,12 @@ public enum TaxTypeEnum
         /// <param name="locked">Locked: is menu locked against modifcation.</param>
         /// <param name="menuSections">Menu sections (startes, main etc).</param>
         /// <param name="taxRates">Menu tax rates.</param>
+        /// <param name="appId">Identifier of App the menu is attached to.</param>
         /// <param name="displaySectionLinks">Display menu section link on UI.</param>
         /// <param name="menuSectionBehaviour">Menu section behaviour.</param>
         /// <param name="taxType">Tax type.</param>
-        public Menu(int? menuId = default(int?), DateTime? modifiedTime = default(DateTime?), int? versionNumber = default(int?), string imageName = default(string), string imageUrl = default(string), string name = default(string), bool? locked = default(bool?), List<MenuSection> menuSections = default(List<MenuSection>), List<MenuTaxRate> taxRates = default(List<MenuTaxRate>), bool? displaySectionLinks = default(bool?), MenuSectionBehaviourEnum? menuSectionBehaviour = default(MenuSectionBehaviourEnum?), TaxTypeEnum? taxType = default(TaxTypeEnum?))
+        /// <param name="isIntegrated">Flag to indicate if the menu is integrated (contains metadata).</param>
+        public Menu(int? menuId = default(int?), DateTime? modifiedTime = default(DateTime?), int? versionNumber = default(int?), string imageName = default(string), string imageUrl = default(string), string name = default(string), bool? locked = default(bool?), List<MenuSection> menuSections = default(List<MenuSection>), List<MenuTaxRate> taxRates = default(List<MenuTaxRate>), string appId = default(string), bool? displaySectionLinks = default(bool?), MenuSectionBehaviourEnum? menuSectionBehaviour = default(MenuSectionBehaviourEnum?), TaxTypeEnum? taxType = default(TaxTypeEnum?), bool? isIntegrated = default(bool?))
         {
             this.MenuId = menuId;
             this.ModifiedTime = modifiedTime;
@@ -110,9 +110,11 @@ public enum TaxTypeEnum
             this.Locked = locked;
             this.MenuSections = menuSections;
             this.TaxRates = taxRates;
+            this.AppId = appId;
             this.DisplaySectionLinks = displaySectionLinks;
             this.MenuSectionBehaviour = menuSectionBehaviour;
             this.TaxType = taxType;
+            this.IsIntegrated = isIntegrated;
         }
         
         /// <summary>
@@ -178,6 +180,13 @@ public enum TaxTypeEnum
         [DataMember(Name="TaxRates", EmitDefaultValue=false)]
         public List<MenuTaxRate> TaxRates { get; set; }
 
+        /// <summary>
+        /// Identifier of App the menu is attached to
+        /// </summary>
+        /// <value>Identifier of App the menu is attached to</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
         /// <summary>
         /// Display menu section link on UI
         /// </summary>
@@ -187,6 +196,13 @@ public enum TaxTypeEnum
 
 
 
+        /// <summary>
+        /// Flag to indicate if the menu is integrated (contains metadata)
+        /// </summary>
+        /// <value>Flag to indicate if the menu is integrated (contains metadata)</value>
+        [DataMember(Name="IsIntegrated", EmitDefaultValue=false)]
+        public bool? IsIntegrated { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -204,9 +220,11 @@ public override string ToString()
             sb.Append("  Locked: ").Append(Locked).Append("\n");
             sb.Append("  MenuSections: ").Append(MenuSections).Append("\n");
             sb.Append("  TaxRates: ").Append(TaxRates).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  DisplaySectionLinks: ").Append(DisplaySectionLinks).Append("\n");
             sb.Append("  MenuSectionBehaviour: ").Append(MenuSectionBehaviour).Append("\n");
             sb.Append("  TaxType: ").Append(TaxType).Append("\n");
+            sb.Append("  IsIntegrated: ").Append(IsIntegrated).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -286,6 +304,11 @@ public bool Equals(Menu input)
                     this.TaxRates != null &&
                     this.TaxRates.SequenceEqual(input.TaxRates)
                 ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
                 (
                     this.DisplaySectionLinks == input.DisplaySectionLinks ||
                     (this.DisplaySectionLinks != null &&
@@ -300,6 +323,11 @@ public bool Equals(Menu input)
                     this.TaxType == input.TaxType ||
                     (this.TaxType != null &&
                     this.TaxType.Equals(input.TaxType))
+                ) && 
+                (
+                    this.IsIntegrated == input.IsIntegrated ||
+                    (this.IsIntegrated != null &&
+                    this.IsIntegrated.Equals(input.IsIntegrated))
                 );
         }
 
@@ -330,25 +358,19 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.MenuSections.GetHashCode();
                 if (this.TaxRates != null)
                     hashCode = hashCode * 59 + this.TaxRates.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.DisplaySectionLinks != null)
                     hashCode = hashCode * 59 + this.DisplaySectionLinks.GetHashCode();
                 if (this.MenuSectionBehaviour != null)
                     hashCode = hashCode * 59 + this.MenuSectionBehaviour.GetHashCode();
                 if (this.TaxType != null)
                     hashCode = hashCode * 59 + this.TaxType.GetHashCode();
+                if (this.IsIntegrated != null)
+                    hashCode = hashCode * 59 + this.IsIntegrated.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuAsyncCreationCompletedEvent.cs b/src/Flipdish/Model/MenuAsyncCreationCompletedEvent.cs
new file mode 100644
index 00000000..dd719deb
--- /dev/null
+++ b/src/Flipdish/Model/MenuAsyncCreationCompletedEvent.cs
@@ -0,0 +1,317 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Menu async creation completed event
+    /// </summary>
+    [DataContract]
+    public partial class MenuAsyncCreationCompletedEvent :  IEquatable<MenuAsyncCreationCompletedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenuAsyncCreationCompletedEvent" /> class.
+        /// </summary>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="description">Description.</param>
+        /// <param name="user">User who has created the menu.</param>
+        /// <param name="menu">The menu.</param>
+        /// <param name="success">Flag indicating if the menu creation was successful.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuAsyncCreationCompletedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), bool? success = default(bool?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.EventName = eventName;
+            this.Description = description;
+            this.User = user;
+            this.Menu = menu;
+            this.Success = success;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// Description
+        /// </summary>
+        /// <value>Description</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// User who has created the menu
+        /// </summary>
+        /// <value>User who has created the menu</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
+        /// <summary>
+        /// The menu
+        /// </summary>
+        /// <value>The menu</value>
+        [DataMember(Name="Menu", EmitDefaultValue=false)]
+        public Menu Menu { get; set; }
+
+        /// <summary>
+        /// Flag indicating if the menu creation was successful
+        /// </summary>
+        /// <value>Flag indicating if the menu creation was successful</value>
+        [DataMember(Name="Success", EmitDefaultValue=false)]
+        public bool? Success { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class MenuAsyncCreationCompletedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  Menu: ").Append(Menu).Append("\n");
+            sb.Append("  Success: ").Append(Success).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as MenuAsyncCreationCompletedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if MenuAsyncCreationCompletedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MenuAsyncCreationCompletedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MenuAsyncCreationCompletedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
+                (
+                    this.Menu == input.Menu ||
+                    (this.Menu != null &&
+                    this.Menu.Equals(input.Menu))
+                ) && 
+                (
+                    this.Success == input.Success ||
+                    (this.Success != null &&
+                    this.Success.Equals(input.Success))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.Menu != null)
+                    hashCode = hashCode * 59 + this.Menu.GetHashCode();
+                if (this.Success != null)
+                    hashCode = hashCode * 59 + this.Success.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/MenuBase.cs b/src/Flipdish/Model/MenuBase.cs
index 3b10f3ed..e0b52b8d 100644
--- a/src/Flipdish/Model/MenuBase.cs
+++ b/src/Flipdish/Model/MenuBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu base
     /// </summary>
     [DataContract]
-    public partial class MenuBase :  IEquatable<MenuBase>, IValidatableObject
+    public partial class MenuBase :  IEquatable<MenuBase>
     {
         /// <summary>
         /// Menu section behaviour
@@ -90,11 +88,13 @@ public enum TaxTypeEnum
         /// <param name="displaySectionLinks">Display menu section link on UI.</param>
         /// <param name="menuSectionBehaviour">Menu section behaviour.</param>
         /// <param name="taxType">Tax type.</param>
-        public MenuBase(bool? displaySectionLinks = default(bool?), MenuSectionBehaviourEnum? menuSectionBehaviour = default(MenuSectionBehaviourEnum?), TaxTypeEnum? taxType = default(TaxTypeEnum?))
+        /// <param name="isIntegrated">Flag to indicate if the menu is integrated (contains metadata).</param>
+        public MenuBase(bool? displaySectionLinks = default(bool?), MenuSectionBehaviourEnum? menuSectionBehaviour = default(MenuSectionBehaviourEnum?), TaxTypeEnum? taxType = default(TaxTypeEnum?), bool? isIntegrated = default(bool?))
         {
             this.DisplaySectionLinks = displaySectionLinks;
             this.MenuSectionBehaviour = menuSectionBehaviour;
             this.TaxType = taxType;
+            this.IsIntegrated = isIntegrated;
         }
         
         /// <summary>
@@ -106,6 +106,13 @@ public enum TaxTypeEnum
 
 
 
+        /// <summary>
+        /// Flag to indicate if the menu is integrated (contains metadata)
+        /// </summary>
+        /// <value>Flag to indicate if the menu is integrated (contains metadata)</value>
+        [DataMember(Name="IsIntegrated", EmitDefaultValue=false)]
+        public bool? IsIntegrated { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -117,6 +124,7 @@ public override string ToString()
             sb.Append("  DisplaySectionLinks: ").Append(DisplaySectionLinks).Append("\n");
             sb.Append("  MenuSectionBehaviour: ").Append(MenuSectionBehaviour).Append("\n");
             sb.Append("  TaxType: ").Append(TaxType).Append("\n");
+            sb.Append("  IsIntegrated: ").Append(IsIntegrated).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -165,6 +173,11 @@ public bool Equals(MenuBase input)
                     this.TaxType == input.TaxType ||
                     (this.TaxType != null &&
                     this.TaxType.Equals(input.TaxType))
+                ) && 
+                (
+                    this.IsIntegrated == input.IsIntegrated ||
+                    (this.IsIntegrated != null &&
+                    this.IsIntegrated.Equals(input.IsIntegrated))
                 );
         }
 
@@ -183,19 +196,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.MenuSectionBehaviour.GetHashCode();
                 if (this.TaxType != null)
                     hashCode = hashCode * 59 + this.TaxType.GetHashCode();
+                if (this.IsIntegrated != null)
+                    hashCode = hashCode * 59 + this.IsIntegrated.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuBulkEditEvent.cs b/src/Flipdish/Model/MenuBulkEditEvent.cs
index 8c624adf..72133908 100644
--- a/src/Flipdish/Model/MenuBulkEditEvent.cs
+++ b/src/Flipdish/Model/MenuBulkEditEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu bulk event
     /// </summary>
     [DataContract]
-    public partial class MenuBulkEditEvent :  IEquatable<MenuBulkEditEvent>, IValidatableObject
+    public partial class MenuBulkEditEvent :  IEquatable<MenuBulkEditEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuBulkEditEvent" /> class.
@@ -45,8 +43,11 @@ public partial class MenuBulkEditEvent :  IEquatable<MenuBulkEditEvent>, IValida
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuBulkEditEvent(string eventName = default(string), string menuName = default(string), string description = default(string), string item = default(string), int? instanceCount = default(int?), bool? isAvailable = default(bool?), UserEventInfo user = default(UserEventInfo), int? menuId = default(int?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuBulkEditEvent(string eventName = default(string), string menuName = default(string), string description = default(string), string item = default(string), int? instanceCount = default(int?), bool? isAvailable = default(bool?), UserEventInfo user = default(UserEventInfo), int? menuId = default(int?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.MenuName = menuName;
@@ -60,7 +61,10 @@ public partial class MenuBulkEditEvent :  IEquatable<MenuBulkEditEvent>, IValida
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -147,6 +151,13 @@ public partial class MenuBulkEditEvent :  IEquatable<MenuBulkEditEvent>, IValida
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -154,6 +165,20 @@ public partial class MenuBulkEditEvent :  IEquatable<MenuBulkEditEvent>, IValida
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -174,7 +199,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -269,10 +297,25 @@ public bool Equals(MenuBulkEditEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -309,21 +352,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuCatalogItem.cs b/src/Flipdish/Model/MenuCatalogItem.cs
index f31943d9..6af29b21 100644
--- a/src/Flipdish/Model/MenuCatalogItem.cs
+++ b/src/Flipdish/Model/MenuCatalogItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Information to add a CatalogItem to a Menu
     /// </summary>
     [DataContract]
-    public partial class MenuCatalogItem :  IEquatable<MenuCatalogItem>, IValidatableObject
+    public partial class MenuCatalogItem :  IEquatable<MenuCatalogItem>
     {
         /// <summary>
         /// Small | Medium | Large | HiddenImage  Affects the layout of the menu.
@@ -173,28 +171,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuCheckpoint.cs b/src/Flipdish/Model/MenuCheckpoint.cs
index e54ef4c9..e6e6d02d 100644
--- a/src/Flipdish/Model/MenuCheckpoint.cs
+++ b/src/Flipdish/Model/MenuCheckpoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu Checkpoint
     /// </summary>
     [DataContract]
-    public partial class MenuCheckpoint :  IEquatable<MenuCheckpoint>, IValidatableObject
+    public partial class MenuCheckpoint :  IEquatable<MenuCheckpoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuCheckpoint" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuCheckpointCreatedEvent.cs b/src/Flipdish/Model/MenuCheckpointCreatedEvent.cs
index 17ff97c5..df7d2e38 100644
--- a/src/Flipdish/Model/MenuCheckpointCreatedEvent.cs
+++ b/src/Flipdish/Model/MenuCheckpointCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuCheckpointCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuCheckpointCreatedEvent :  IEquatable<MenuCheckpointCreatedEvent>, IValidatableObject
+    public partial class MenuCheckpointCreatedEvent :  IEquatable<MenuCheckpointCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuCheckpointCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuCheckpointCreatedEvent :  IEquatable<MenuCheckpointCrea
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuCheckpointCreatedEvent(string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), int? menuId = default(int?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuCheckpointCreatedEvent(string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), int? menuId = default(int?), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.Description = description;
             this.User = user;
@@ -54,7 +55,10 @@ public partial class MenuCheckpointCreatedEvent :  IEquatable<MenuCheckpointCrea
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuCheckpointCreatedEvent :  IEquatable<MenuCheckpointCrea
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuCheckpointCreatedEvent :  IEquatable<MenuCheckpointCrea
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuCheckpointCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuCreatedEvent.cs b/src/Flipdish/Model/MenuCreatedEvent.cs
index ae900bc2..b5731cf3 100644
--- a/src/Flipdish/Model/MenuCreatedEvent.cs
+++ b/src/Flipdish/Model/MenuCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu created event
     /// </summary>
     [DataContract]
-    public partial class MenuCreatedEvent :  IEquatable<MenuCreatedEvent>, IValidatableObject
+    public partial class MenuCreatedEvent :  IEquatable<MenuCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuCreatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class MenuCreatedEvent :  IEquatable<MenuCreatedEvent>, IValidata
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class MenuCreatedEvent :  IEquatable<MenuCreatedEvent>, IValidata
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class MenuCreatedEvent :  IEquatable<MenuCreatedEvent>, IValidata
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class MenuCreatedEvent :  IEquatable<MenuCreatedEvent>, IValidata
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(MenuCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuElementEditResponse.cs b/src/Flipdish/Model/MenuElementEditResponse.cs
index 45fcdc9b..77178658 100644
--- a/src/Flipdish/Model/MenuElementEditResponse.cs
+++ b/src/Flipdish/Model/MenuElementEditResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Response with any menu elements that had issues being hidden/shown
     /// </summary>
     [DataContract]
-    public partial class MenuElementEditResponse :  IEquatable<MenuElementEditResponse>, IValidatableObject
+    public partial class MenuElementEditResponse :  IEquatable<MenuElementEditResponse>
     {
         /// <summary>
         /// Type of menu element
@@ -272,16 +270,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuElementHide.cs b/src/Flipdish/Model/MenuElementHide.cs
index 30a904b2..3151f2d7 100644
--- a/src/Flipdish/Model/MenuElementHide.cs
+++ b/src/Flipdish/Model/MenuElementHide.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu element hide
     /// </summary>
     [DataContract]
-    public partial class MenuElementHide :  IEquatable<MenuElementHide>, IValidatableObject
+    public partial class MenuElementHide :  IEquatable<MenuElementHide>
     {
         /// <summary>
         /// Type of menu element
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuElementListItemResponse.cs b/src/Flipdish/Model/MenuElementListItemResponse.cs
index 4ccaac58..ee0974f2 100644
--- a/src/Flipdish/Model/MenuElementListItemResponse.cs
+++ b/src/Flipdish/Model/MenuElementListItemResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Response with any menu elements that had issues being hidden/shown
     /// </summary>
     [DataContract]
-    public partial class MenuElementListItemResponse :  IEquatable<MenuElementListItemResponse>, IValidatableObject
+    public partial class MenuElementListItemResponse :  IEquatable<MenuElementListItemResponse>
     {
         /// <summary>
         /// Type of menu element
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuElementListResponse.cs b/src/Flipdish/Model/MenuElementListResponse.cs
index 50d4f7f8..1761b199 100644
--- a/src/Flipdish/Model/MenuElementListResponse.cs
+++ b/src/Flipdish/Model/MenuElementListResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Response with any menu elements that had issues being hidden/shown
     /// </summary>
     [DataContract]
-    public partial class MenuElementListResponse :  IEquatable<MenuElementListResponse>, IValidatableObject
+    public partial class MenuElementListResponse :  IEquatable<MenuElementListResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuElementListResponse" /> class.
@@ -178,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSet.cs b/src/Flipdish/Model/MenuItemOptionSet.cs
index 540c05a4..67edb009 100644
--- a/src/Flipdish/Model/MenuItemOptionSet.cs
+++ b/src/Flipdish/Model/MenuItemOptionSet.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu item option set
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSet :  IEquatable<MenuItemOptionSet>, IValidatableObject
+    public partial class MenuItemOptionSet :  IEquatable<MenuItemOptionSet>
     {
         /// <summary>
         /// Small | Medium | Large  Affects the layout of the menu.
@@ -330,28 +328,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetBase.cs b/src/Flipdish/Model/MenuItemOptionSetBase.cs
index c8a7d3e1..05850ab0 100644
--- a/src/Flipdish/Model/MenuItemOptionSetBase.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu item option set
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetBase :  IEquatable<MenuItemOptionSetBase>, IValidatableObject
+    public partial class MenuItemOptionSetBase :  IEquatable<MenuItemOptionSetBase>
     {
         /// <summary>
         /// Small | Medium | Large  Affects the layout of the menu.
@@ -78,7 +76,8 @@ public enum CellLayoutTypeEnum
         /// <param name="minSelectCount">Minimum items must be selected.</param>
         /// <param name="maxSelectCount">Maximum number of items can be selected.</param>
         /// <param name="cellLayoutType">Small | Medium | Large  Affects the layout of the menu..</param>
-        public MenuItemOptionSetBase(string name = default(string), bool? isMasterOptionSet = default(bool?), int? displayOrder = default(int?), int? minSelectCount = default(int?), int? maxSelectCount = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?))
+        /// <param name="publicId">Permanent reference to the item..</param>
+        public MenuItemOptionSetBase(string name = default(string), bool? isMasterOptionSet = default(bool?), int? displayOrder = default(int?), int? minSelectCount = default(int?), int? maxSelectCount = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), Guid? publicId = default(Guid?))
         {
             this.Name = name;
             this.IsMasterOptionSet = isMasterOptionSet;
@@ -86,6 +85,7 @@ public enum CellLayoutTypeEnum
             this.MinSelectCount = minSelectCount;
             this.MaxSelectCount = maxSelectCount;
             this.CellLayoutType = cellLayoutType;
+            this.PublicId = publicId;
         }
         
         /// <summary>
@@ -124,6 +124,13 @@ public enum CellLayoutTypeEnum
         public int? MaxSelectCount { get; set; }
 
 
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -138,6 +145,7 @@ public override string ToString()
             sb.Append("  MinSelectCount: ").Append(MinSelectCount).Append("\n");
             sb.Append("  MaxSelectCount: ").Append(MaxSelectCount).Append("\n");
             sb.Append("  CellLayoutType: ").Append(CellLayoutType).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -201,6 +209,11 @@ public bool Equals(MenuItemOptionSetBase input)
                     this.CellLayoutType == input.CellLayoutType ||
                     (this.CellLayoutType != null &&
                     this.CellLayoutType.Equals(input.CellLayoutType))
+                ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
                 );
         }
 
@@ -225,31 +238,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.MaxSelectCount.GetHashCode();
                 if (this.CellLayoutType != null)
                     hashCode = hashCode * 59 + this.CellLayoutType.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetCreatedEvent.cs b/src/Flipdish/Model/MenuItemOptionSetCreatedEvent.cs
index 791992b2..2a94f577 100644
--- a/src/Flipdish/Model/MenuItemOptionSetCreatedEvent.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuItemOptionSetCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetCreatedEvent :  IEquatable<MenuItemOptionSetCreatedEvent>, IValidatableObject
+    public partial class MenuItemOptionSetCreatedEvent :  IEquatable<MenuItemOptionSetCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuItemOptionSetCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuItemOptionSetCreatedEvent :  IEquatable<MenuItemOptionS
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuItemOptionSetCreatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSet menuItemOptionSet = default(MenuItemOptionSet), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuItemOptionSetCreatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSet menuItemOptionSet = default(MenuItemOptionSet), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuItemOptionSetCreatedEvent :  IEquatable<MenuItemOptionS
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuItemOptionSetCreatedEvent :  IEquatable<MenuItemOptionS
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuItemOptionSetCreatedEvent :  IEquatable<MenuItemOptionS
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuItemOptionSetCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetDeletedEvent.cs b/src/Flipdish/Model/MenuItemOptionSetDeletedEvent.cs
index 9aedb454..91d78ee1 100644
--- a/src/Flipdish/Model/MenuItemOptionSetDeletedEvent.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuItemOptionSetDeletedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetDeletedEvent :  IEquatable<MenuItemOptionSetDeletedEvent>, IValidatableObject
+    public partial class MenuItemOptionSetDeletedEvent :  IEquatable<MenuItemOptionSetDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuItemOptionSetDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuItemOptionSetDeletedEvent :  IEquatable<MenuItemOptionS
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuItemOptionSetDeletedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSet menuItemOptionSet = default(MenuItemOptionSet), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuItemOptionSetDeletedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSet menuItemOptionSet = default(MenuItemOptionSet), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuItemOptionSetDeletedEvent :  IEquatable<MenuItemOptionS
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuItemOptionSetDeletedEvent :  IEquatable<MenuItemOptionS
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuItemOptionSetDeletedEvent :  IEquatable<MenuItemOptionS
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuItemOptionSetDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetItem.cs b/src/Flipdish/Model/MenuItemOptionSetItem.cs
index 72a8676b..acf15fcb 100644
--- a/src/Flipdish/Model/MenuItemOptionSetItem.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu item option set item
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetItem :  IEquatable<MenuItemOptionSetItem>, IValidatableObject
+    public partial class MenuItemOptionSetItem :  IEquatable<MenuItemOptionSetItem>
     {
         /// <summary>
         /// Small | Medium | Large  Affects the layout of the menu.
@@ -78,15 +76,16 @@ public enum CellLayoutTypeEnum
         /// <param name="nextMenuItemOptionSetId">if null, next option set is next. if -1, this is the final option set.</param>
         /// <param name="catalogItemId">Catalog item Id when the OptionSet is associated to a Product.</param>
         /// <param name="taxRateName">Tax rate name.</param>
-        /// <param name="taxRateId">taxRateId.</param>
-        /// <param name="taxValue">taxValue.</param>
+        /// <param name="taxRateId">TaxRateId..</param>
+        /// <param name="taxValue">TaxValue..</param>
         /// <param name="name">Name.</param>
         /// <param name="price">Price.</param>
+        /// <param name="depositReturnFee">An optional fee that can be added to the price of the item..</param>
         /// <param name="isAvailable">Is available.</param>
         /// <param name="displayOrder">Display order. Displayed in ascending order..</param>
         /// <param name="cellLayoutType">Small | Medium | Large  Affects the layout of the menu..</param>
         /// <param name="imageUrl">Image url.</param>
-        public MenuItemOptionSetItem(int? menuItemOptionSetItemId = default(int?), Guid? publicId = default(Guid?), List<CreateMetadata> metadata = default(List<CreateMetadata>), int? nextMenuItemOptionSetId = default(int?), string catalogItemId = default(string), string taxRateName = default(string), int? taxRateId = default(int?), double? taxValue = default(double?), string name = default(string), double? price = default(double?), bool? isAvailable = default(bool?), int? displayOrder = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), string imageUrl = default(string))
+        public MenuItemOptionSetItem(int? menuItemOptionSetItemId = default(int?), Guid? publicId = default(Guid?), List<CreateMetadata> metadata = default(List<CreateMetadata>), int? nextMenuItemOptionSetId = default(int?), string catalogItemId = default(string), string taxRateName = default(string), int? taxRateId = default(int?), double? taxValue = default(double?), string name = default(string), double? price = default(double?), double? depositReturnFee = default(double?), bool? isAvailable = default(bool?), int? displayOrder = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), string imageUrl = default(string))
         {
             this.MenuItemOptionSetItemId = menuItemOptionSetItemId;
             this.PublicId = publicId;
@@ -98,6 +97,7 @@ public enum CellLayoutTypeEnum
             this.TaxValue = taxValue;
             this.Name = name;
             this.Price = price;
+            this.DepositReturnFee = depositReturnFee;
             this.IsAvailable = isAvailable;
             this.DisplayOrder = displayOrder;
             this.CellLayoutType = cellLayoutType;
@@ -147,14 +147,16 @@ public enum CellLayoutTypeEnum
         public string TaxRateName { get; set; }
 
         /// <summary>
-        /// Gets or Sets TaxRateId
+        /// TaxRateId.
         /// </summary>
+        /// <value>TaxRateId.</value>
         [DataMember(Name="TaxRateId", EmitDefaultValue=false)]
         public int? TaxRateId { get; set; }
 
         /// <summary>
-        /// Gets or Sets TaxValue
+        /// TaxValue.
         /// </summary>
+        /// <value>TaxValue.</value>
         [DataMember(Name="TaxValue", EmitDefaultValue=false)]
         public double? TaxValue { get; set; }
 
@@ -172,6 +174,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="Price", EmitDefaultValue=false)]
         public double? Price { get; set; }
 
+        /// <summary>
+        /// An optional fee that can be added to the price of the item.
+        /// </summary>
+        /// <value>An optional fee that can be added to the price of the item.</value>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
         /// <summary>
         /// Is available
         /// </summary>
@@ -212,6 +221,7 @@ public override string ToString()
             sb.Append("  TaxValue: ").Append(TaxValue).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Price: ").Append(Price).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
             sb.Append("  IsAvailable: ").Append(IsAvailable).Append("\n");
             sb.Append("  DisplayOrder: ").Append(DisplayOrder).Append("\n");
             sb.Append("  CellLayoutType: ").Append(CellLayoutType).Append("\n");
@@ -300,6 +310,11 @@ public bool Equals(MenuItemOptionSetItem input)
                     (this.Price != null &&
                     this.Price.Equals(input.Price))
                 ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
+                ) && 
                 (
                     this.IsAvailable == input.IsAvailable ||
                     (this.IsAvailable != null &&
@@ -351,6 +366,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Price != null)
                     hashCode = hashCode * 59 + this.Price.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
                 if (this.IsAvailable != null)
                     hashCode = hashCode * 59 + this.IsAvailable.GetHashCode();
                 if (this.DisplayOrder != null)
@@ -362,16 +379,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetItemBase.cs b/src/Flipdish/Model/MenuItemOptionSetItemBase.cs
index bed0e83b..9fbc286c 100644
--- a/src/Flipdish/Model/MenuItemOptionSetItemBase.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetItemBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu item option set item
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetItemBase :  IEquatable<MenuItemOptionSetItemBase>, IValidatableObject
+    public partial class MenuItemOptionSetItemBase :  IEquatable<MenuItemOptionSetItemBase>
     {
         /// <summary>
         /// Small | Medium | Large  Affects the layout of the menu.
@@ -74,18 +72,22 @@ public enum CellLayoutTypeEnum
         /// </summary>
         /// <param name="name">Name.</param>
         /// <param name="price">Price.</param>
+        /// <param name="depositReturnFee">An optional fee that can be added to the price of the item..</param>
         /// <param name="isAvailable">Is available.</param>
         /// <param name="displayOrder">Display order. Displayed in ascending order..</param>
         /// <param name="cellLayoutType">Small | Medium | Large  Affects the layout of the menu..</param>
         /// <param name="imageUrl">Image url.</param>
-        public MenuItemOptionSetItemBase(string name = default(string), double? price = default(double?), bool? isAvailable = default(bool?), int? displayOrder = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), string imageUrl = default(string))
+        /// <param name="publicId">Permanent reference to the item..</param>
+        public MenuItemOptionSetItemBase(string name = default(string), double? price = default(double?), double? depositReturnFee = default(double?), bool? isAvailable = default(bool?), int? displayOrder = default(int?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), string imageUrl = default(string), Guid? publicId = default(Guid?))
         {
             this.Name = name;
             this.Price = price;
+            this.DepositReturnFee = depositReturnFee;
             this.IsAvailable = isAvailable;
             this.DisplayOrder = displayOrder;
             this.CellLayoutType = cellLayoutType;
             this.ImageUrl = imageUrl;
+            this.PublicId = publicId;
         }
         
         /// <summary>
@@ -102,6 +104,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="Price", EmitDefaultValue=false)]
         public double? Price { get; set; }
 
+        /// <summary>
+        /// An optional fee that can be added to the price of the item.
+        /// </summary>
+        /// <value>An optional fee that can be added to the price of the item.</value>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
         /// <summary>
         /// Is available
         /// </summary>
@@ -124,6 +133,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="ImageUrl", EmitDefaultValue=false)]
         public string ImageUrl { get; set; }
 
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,10 +150,12 @@ public override string ToString()
             sb.Append("class MenuItemOptionSetItemBase {\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Price: ").Append(Price).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
             sb.Append("  IsAvailable: ").Append(IsAvailable).Append("\n");
             sb.Append("  DisplayOrder: ").Append(DisplayOrder).Append("\n");
             sb.Append("  CellLayoutType: ").Append(CellLayoutType).Append("\n");
             sb.Append("  ImageUrl: ").Append(ImageUrl).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -182,6 +200,11 @@ public bool Equals(MenuItemOptionSetItemBase input)
                     (this.Price != null &&
                     this.Price.Equals(input.Price))
                 ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
+                ) && 
                 (
                     this.IsAvailable == input.IsAvailable ||
                     (this.IsAvailable != null &&
@@ -201,6 +224,11 @@ public bool Equals(MenuItemOptionSetItemBase input)
                     this.ImageUrl == input.ImageUrl ||
                     (this.ImageUrl != null &&
                     this.ImageUrl.Equals(input.ImageUrl))
+                ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
                 );
         }
 
@@ -217,6 +245,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Price != null)
                     hashCode = hashCode * 59 + this.Price.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
                 if (this.IsAvailable != null)
                     hashCode = hashCode * 59 + this.IsAvailable.GetHashCode();
                 if (this.DisplayOrder != null)
@@ -225,19 +255,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.CellLayoutType.GetHashCode();
                 if (this.ImageUrl != null)
                     hashCode = hashCode * 59 + this.ImageUrl.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetItemCreatedEvent.cs b/src/Flipdish/Model/MenuItemOptionSetItemCreatedEvent.cs
index 1705877d..1fe0ba5b 100644
--- a/src/Flipdish/Model/MenuItemOptionSetItemCreatedEvent.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetItemCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuItemOptionSetItemCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetItemCreatedEvent :  IEquatable<MenuItemOptionSetItemCreatedEvent>, IValidatableObject
+    public partial class MenuItemOptionSetItemCreatedEvent :  IEquatable<MenuItemOptionSetItemCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuItemOptionSetItemCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuItemOptionSetItemCreatedEvent :  IEquatable<MenuItemOpt
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuItemOptionSetItemCreatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSetItem menuItemOptionSetItem = default(MenuItemOptionSetItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuItemOptionSetItemCreatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSetItem menuItemOptionSetItem = default(MenuItemOptionSetItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuItemOptionSetItemCreatedEvent :  IEquatable<MenuItemOpt
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuItemOptionSetItemCreatedEvent :  IEquatable<MenuItemOpt
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuItemOptionSetItemCreatedEvent :  IEquatable<MenuItemOpt
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuItemOptionSetItemCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetItemDeletedEvent.cs b/src/Flipdish/Model/MenuItemOptionSetItemDeletedEvent.cs
index 848b0616..de145524 100644
--- a/src/Flipdish/Model/MenuItemOptionSetItemDeletedEvent.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetItemDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuItemOptionSetItemDeletedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetItemDeletedEvent :  IEquatable<MenuItemOptionSetItemDeletedEvent>, IValidatableObject
+    public partial class MenuItemOptionSetItemDeletedEvent :  IEquatable<MenuItemOptionSetItemDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuItemOptionSetItemDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuItemOptionSetItemDeletedEvent :  IEquatable<MenuItemOpt
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuItemOptionSetItemDeletedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSetItem menuItemOptionSetItem = default(MenuItemOptionSetItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuItemOptionSetItemDeletedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSetItem menuItemOptionSetItem = default(MenuItemOptionSetItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuItemOptionSetItemDeletedEvent :  IEquatable<MenuItemOpt
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuItemOptionSetItemDeletedEvent :  IEquatable<MenuItemOpt
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuItemOptionSetItemDeletedEvent :  IEquatable<MenuItemOpt
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuItemOptionSetItemDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetItemUpdatedEvent.cs b/src/Flipdish/Model/MenuItemOptionSetItemUpdatedEvent.cs
index fa627608..408ce3d1 100644
--- a/src/Flipdish/Model/MenuItemOptionSetItemUpdatedEvent.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetItemUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuItemOptionSetItemUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetItemUpdatedEvent :  IEquatable<MenuItemOptionSetItemUpdatedEvent>, IValidatableObject
+    public partial class MenuItemOptionSetItemUpdatedEvent :  IEquatable<MenuItemOptionSetItemUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuItemOptionSetItemUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuItemOptionSetItemUpdatedEvent :  IEquatable<MenuItemOpt
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuItemOptionSetItemUpdatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSetItem menuItemOptionSetItem = default(MenuItemOptionSetItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuItemOptionSetItemUpdatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSetItem menuItemOptionSetItem = default(MenuItemOptionSetItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuItemOptionSetItemUpdatedEvent :  IEquatable<MenuItemOpt
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuItemOptionSetItemUpdatedEvent :  IEquatable<MenuItemOpt
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuItemOptionSetItemUpdatedEvent :  IEquatable<MenuItemOpt
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuItemOptionSetItemUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuItemOptionSetUpdatedEvent.cs b/src/Flipdish/Model/MenuItemOptionSetUpdatedEvent.cs
index 1bd3d8cb..7c355012 100644
--- a/src/Flipdish/Model/MenuItemOptionSetUpdatedEvent.cs
+++ b/src/Flipdish/Model/MenuItemOptionSetUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuItemOptionSetUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuItemOptionSetUpdatedEvent :  IEquatable<MenuItemOptionSetUpdatedEvent>, IValidatableObject
+    public partial class MenuItemOptionSetUpdatedEvent :  IEquatable<MenuItemOptionSetUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuItemOptionSetUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuItemOptionSetUpdatedEvent :  IEquatable<MenuItemOptionS
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuItemOptionSetUpdatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSet menuItemOptionSet = default(MenuItemOptionSet), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuItemOptionSetUpdatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuItemOptionSet menuItemOptionSet = default(MenuItemOptionSet), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuItemOptionSetUpdatedEvent :  IEquatable<MenuItemOptionS
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuItemOptionSetUpdatedEvent :  IEquatable<MenuItemOptionS
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuItemOptionSetUpdatedEvent :  IEquatable<MenuItemOptionS
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuItemOptionSetUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuNutritionInfoHeader.cs b/src/Flipdish/Model/MenuNutritionInfoHeader.cs
new file mode 100644
index 00000000..5f093645
--- /dev/null
+++ b/src/Flipdish/Model/MenuNutritionInfoHeader.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// MenuNutritionInfoHeader.
+    /// </summary>
+    [DataContract]
+    public partial class MenuNutritionInfoHeader :  IEquatable<MenuNutritionInfoHeader>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenuNutritionInfoHeader" /> class.
+        /// </summary>
+        /// <param name="menuId">Menu Id.</param>
+        /// <param name="nutritionInfoVersionGuid">Nutrition information version guid (generated every time the nutrition information is updated).</param>
+        /// <param name="absoluteUrl">Absolute URL of the nutrition information json file.</param>
+        public MenuNutritionInfoHeader(int? menuId = default(int?), Guid? nutritionInfoVersionGuid = default(Guid?), string absoluteUrl = default(string))
+        {
+            this.MenuId = menuId;
+            this.NutritionInfoVersionGuid = nutritionInfoVersionGuid;
+            this.AbsoluteUrl = absoluteUrl;
+        }
+        
+        /// <summary>
+        /// Menu Id
+        /// </summary>
+        /// <value>Menu Id</value>
+        [DataMember(Name="MenuId", EmitDefaultValue=false)]
+        public int? MenuId { get; set; }
+
+        /// <summary>
+        /// Nutrition information version guid (generated every time the nutrition information is updated)
+        /// </summary>
+        /// <value>Nutrition information version guid (generated every time the nutrition information is updated)</value>
+        [DataMember(Name="NutritionInfoVersionGuid", EmitDefaultValue=false)]
+        public Guid? NutritionInfoVersionGuid { get; set; }
+
+        /// <summary>
+        /// Absolute URL of the nutrition information json file
+        /// </summary>
+        /// <value>Absolute URL of the nutrition information json file</value>
+        [DataMember(Name="AbsoluteUrl", EmitDefaultValue=false)]
+        public string AbsoluteUrl { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class MenuNutritionInfoHeader {\n");
+            sb.Append("  MenuId: ").Append(MenuId).Append("\n");
+            sb.Append("  NutritionInfoVersionGuid: ").Append(NutritionInfoVersionGuid).Append("\n");
+            sb.Append("  AbsoluteUrl: ").Append(AbsoluteUrl).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as MenuNutritionInfoHeader);
+        }
+
+        /// <summary>
+        /// Returns true if MenuNutritionInfoHeader instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MenuNutritionInfoHeader to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MenuNutritionInfoHeader input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.MenuId == input.MenuId ||
+                    (this.MenuId != null &&
+                    this.MenuId.Equals(input.MenuId))
+                ) && 
+                (
+                    this.NutritionInfoVersionGuid == input.NutritionInfoVersionGuid ||
+                    (this.NutritionInfoVersionGuid != null &&
+                    this.NutritionInfoVersionGuid.Equals(input.NutritionInfoVersionGuid))
+                ) && 
+                (
+                    this.AbsoluteUrl == input.AbsoluteUrl ||
+                    (this.AbsoluteUrl != null &&
+                    this.AbsoluteUrl.Equals(input.AbsoluteUrl))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.MenuId != null)
+                    hashCode = hashCode * 59 + this.MenuId.GetHashCode();
+                if (this.NutritionInfoVersionGuid != null)
+                    hashCode = hashCode * 59 + this.NutritionInfoVersionGuid.GetHashCode();
+                if (this.AbsoluteUrl != null)
+                    hashCode = hashCode * 59 + this.AbsoluteUrl.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/MenuObjectDisplayOrders.cs b/src/Flipdish/Model/MenuObjectDisplayOrders.cs
index 7f570548..fc4f81fe 100644
--- a/src/Flipdish/Model/MenuObjectDisplayOrders.cs
+++ b/src/Flipdish/Model/MenuObjectDisplayOrders.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Collection of Display Orders for a Menu Object (Menu Section / Menu Items / Option Sets etc)
     /// </summary>
     [DataContract]
-    public partial class MenuObjectDisplayOrders :  IEquatable<MenuObjectDisplayOrders>, IValidatableObject
+    public partial class MenuObjectDisplayOrders :  IEquatable<MenuObjectDisplayOrders>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuObjectDisplayOrders" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSection.cs b/src/Flipdish/Model/MenuSection.cs
index 52c667cc..c9f259c8 100644
--- a/src/Flipdish/Model/MenuSection.cs
+++ b/src/Flipdish/Model/MenuSection.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu section
     /// </summary>
     [DataContract]
-    public partial class MenuSection :  IEquatable<MenuSection>, IValidatableObject
+    public partial class MenuSection :  IEquatable<MenuSection>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSection" /> class.
@@ -280,28 +278,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionAvailability.cs b/src/Flipdish/Model/MenuSectionAvailability.cs
index 376cdd19..2e859f27 100644
--- a/src/Flipdish/Model/MenuSectionAvailability.cs
+++ b/src/Flipdish/Model/MenuSectionAvailability.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu section availability
     /// </summary>
     [DataContract]
-    public partial class MenuSectionAvailability :  IEquatable<MenuSectionAvailability>, IValidatableObject
+    public partial class MenuSectionAvailability :  IEquatable<MenuSectionAvailability>
     {
         /// <summary>
         /// Availability mode
@@ -160,16 +158,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionAvailabilityBase.cs b/src/Flipdish/Model/MenuSectionAvailabilityBase.cs
index f389ec64..ddc20e79 100644
--- a/src/Flipdish/Model/MenuSectionAvailabilityBase.cs
+++ b/src/Flipdish/Model/MenuSectionAvailabilityBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu section availability
     /// </summary>
     [DataContract]
-    public partial class MenuSectionAvailabilityBase :  IEquatable<MenuSectionAvailabilityBase>, IValidatableObject
+    public partial class MenuSectionAvailabilityBase :  IEquatable<MenuSectionAvailabilityBase>
     {
         /// <summary>
         /// Availability mode
@@ -143,16 +141,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionBase.cs b/src/Flipdish/Model/MenuSectionBase.cs
index c84e819a..acd2a6ee 100644
--- a/src/Flipdish/Model/MenuSectionBase.cs
+++ b/src/Flipdish/Model/MenuSectionBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu section
     /// </summary>
     [DataContract]
-    public partial class MenuSectionBase :  IEquatable<MenuSectionBase>, IValidatableObject
+    public partial class MenuSectionBase :  IEquatable<MenuSectionBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSectionBase" /> class.
@@ -40,7 +38,8 @@ public partial class MenuSectionBase :  IEquatable<MenuSectionBase>, IValidatabl
         /// <param name="isHiddenFromCustomers">Is hidden from customer. Perhaps when the item is out of stock..</param>
         /// <param name="imageUrl">Image url.</param>
         /// <param name="menuSectionId">Menu Section Id.</param>
-        public MenuSectionBase(string name = default(string), string description = default(string), int? displayOrder = default(int?), bool? isAvailable = default(bool?), bool? isHiddenFromCustomers = default(bool?), string imageUrl = default(string), int? menuSectionId = default(int?))
+        /// <param name="publicId">Permanent reference to the item..</param>
+        public MenuSectionBase(string name = default(string), string description = default(string), int? displayOrder = default(int?), bool? isAvailable = default(bool?), bool? isHiddenFromCustomers = default(bool?), string imageUrl = default(string), int? menuSectionId = default(int?), Guid? publicId = default(Guid?))
         {
             this.Name = name;
             this.Description = description;
@@ -49,6 +48,7 @@ public partial class MenuSectionBase :  IEquatable<MenuSectionBase>, IValidatabl
             this.IsHiddenFromCustomers = isHiddenFromCustomers;
             this.ImageUrl = imageUrl;
             this.MenuSectionId = menuSectionId;
+            this.PublicId = publicId;
         }
         
         /// <summary>
@@ -100,6 +100,13 @@ public partial class MenuSectionBase :  IEquatable<MenuSectionBase>, IValidatabl
         [DataMember(Name="MenuSectionId", EmitDefaultValue=false)]
         public int? MenuSectionId { get; set; }
 
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -115,6 +122,7 @@ public override string ToString()
             sb.Append("  IsHiddenFromCustomers: ").Append(IsHiddenFromCustomers).Append("\n");
             sb.Append("  ImageUrl: ").Append(ImageUrl).Append("\n");
             sb.Append("  MenuSectionId: ").Append(MenuSectionId).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -183,6 +191,11 @@ public bool Equals(MenuSectionBase input)
                     this.MenuSectionId == input.MenuSectionId ||
                     (this.MenuSectionId != null &&
                     this.MenuSectionId.Equals(input.MenuSectionId))
+                ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
                 );
         }
 
@@ -209,31 +222,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ImageUrl.GetHashCode();
                 if (this.MenuSectionId != null)
                     hashCode = hashCode * 59 + this.MenuSectionId.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionCreatedEvent.cs b/src/Flipdish/Model/MenuSectionCreatedEvent.cs
index ea5cfdbc..39e98482 100644
--- a/src/Flipdish/Model/MenuSectionCreatedEvent.cs
+++ b/src/Flipdish/Model/MenuSectionCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuSectionCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuSectionCreatedEvent :  IEquatable<MenuSectionCreatedEvent>, IValidatableObject
+    public partial class MenuSectionCreatedEvent :  IEquatable<MenuSectionCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSectionCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuSectionCreatedEvent :  IEquatable<MenuSectionCreatedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuSectionCreatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSection menuSection = default(MenuSection), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuSectionCreatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSection menuSection = default(MenuSection), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuSectionCreatedEvent :  IEquatable<MenuSectionCreatedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuSectionCreatedEvent :  IEquatable<MenuSectionCreatedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuSectionCreatedEvent :  IEquatable<MenuSectionCreatedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuSectionCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionDeletedEvent.cs b/src/Flipdish/Model/MenuSectionDeletedEvent.cs
index 9d7d8427..7dbb1a4b 100644
--- a/src/Flipdish/Model/MenuSectionDeletedEvent.cs
+++ b/src/Flipdish/Model/MenuSectionDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuSectionDeletedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuSectionDeletedEvent :  IEquatable<MenuSectionDeletedEvent>, IValidatableObject
+    public partial class MenuSectionDeletedEvent :  IEquatable<MenuSectionDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSectionDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuSectionDeletedEvent :  IEquatable<MenuSectionDeletedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuSectionDeletedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSection menuSection = default(MenuSection), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuSectionDeletedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSection menuSection = default(MenuSection), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuSectionDeletedEvent :  IEquatable<MenuSectionDeletedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuSectionDeletedEvent :  IEquatable<MenuSectionDeletedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuSectionDeletedEvent :  IEquatable<MenuSectionDeletedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuSectionDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionItem.cs b/src/Flipdish/Model/MenuSectionItem.cs
index ed4a7399..07a4af9c 100644
--- a/src/Flipdish/Model/MenuSectionItem.cs
+++ b/src/Flipdish/Model/MenuSectionItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu item
     /// </summary>
     [DataContract]
-    public partial class MenuSectionItem :  IEquatable<MenuSectionItem>, IValidatableObject
+    public partial class MenuSectionItem :  IEquatable<MenuSectionItem>
     {
         /// <summary>
         /// Spiciness rating
@@ -111,7 +109,6 @@ public enum CellLayoutTypeEnum
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSectionItem" /> class.
         /// </summary>
-        /// <param name="menuItemId">Menu item identifier. This ID may change at any time. Use &#x60;PublicId&#x60; if you need a permanent reference to the item..</param>
         /// <param name="actualPrice">Actual price - the minimum price possible when all required option set items prices are included..</param>
         /// <param name="menuItemOptionSets">Menu item option sets.</param>
         /// <param name="dailySpecialHours">Daily special hours.</param>
@@ -119,12 +116,14 @@ public enum CellLayoutTypeEnum
         /// <param name="taxRateName">Tax rate name.</param>
         /// <param name="taxRateId">TaxRate.</param>
         /// <param name="taxValue">TaxValue - the tax associated with this item, based on TaxRate / TaxType and Currency (currency determines decimal point precision).</param>
+        /// <param name="excludeFromVoucherDiscounting">If true, the item is excluded from voucher discount calculations.</param>
         /// <param name="metadata">List of metadata.</param>
         /// <param name="catalogItemId">Catalog item Id when the Item is associated to a Product.</param>
         /// <param name="name">Menu item name (like \&quot;Korma\&quot;).</param>
         /// <param name="description">Description (like \&quot;A lovely dish from the east\&quot;).</param>
         /// <param name="spicinessRating">Spiciness rating.</param>
         /// <param name="price">Price - this is only used when there is no master option set and should be set to 0 if a master option set exists..</param>
+        /// <param name="depositReturnFee">An optional fee that can be added to the price of the item..</param>
         /// <param name="displayOrder">Display order.</param>
         /// <param name="alcohol">To be set true if the item or an option of the item contains an alcoholic drink..</param>
         /// <param name="isAvailable">True if we accept orders for this item still.</param>
@@ -132,9 +131,9 @@ public enum CellLayoutTypeEnum
         /// <param name="disableVouchers">If true, then vouchers won&#39;t be applied for this item.</param>
         /// <param name="imageName">Image url.</param>
         /// <param name="imageUrl">Image url.</param>
-        public MenuSectionItem(int? menuItemId = default(int?), double? actualPrice = default(double?), List<MenuItemOptionSet> menuItemOptionSets = default(List<MenuItemOptionSet>), List<BusinessHoursPeriod> dailySpecialHours = default(List<BusinessHoursPeriod>), Guid? publicId = default(Guid?), string taxRateName = default(string), int? taxRateId = default(int?), double? taxValue = default(double?), List<CreateMetadata> metadata = default(List<CreateMetadata>), string catalogItemId = default(string), string name = default(string), string description = default(string), SpicinessRatingEnum? spicinessRating = default(SpicinessRatingEnum?), double? price = default(double?), int? displayOrder = default(int?), bool? alcohol = default(bool?), bool? isAvailable = default(bool?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), bool? disableVouchers = default(bool?), string imageName = default(string), string imageUrl = default(string))
+        /// <param name="menuItemId">Menu Item Id.</param>
+        public MenuSectionItem(double? actualPrice = default(double?), List<MenuItemOptionSet> menuItemOptionSets = default(List<MenuItemOptionSet>), List<BusinessHoursPeriod> dailySpecialHours = default(List<BusinessHoursPeriod>), Guid? publicId = default(Guid?), string taxRateName = default(string), int? taxRateId = default(int?), double? taxValue = default(double?), bool? excludeFromVoucherDiscounting = default(bool?), List<CreateMetadata> metadata = default(List<CreateMetadata>), string catalogItemId = default(string), string name = default(string), string description = default(string), SpicinessRatingEnum? spicinessRating = default(SpicinessRatingEnum?), double? price = default(double?), double? depositReturnFee = default(double?), int? displayOrder = default(int?), bool? alcohol = default(bool?), bool? isAvailable = default(bool?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), bool? disableVouchers = default(bool?), string imageName = default(string), string imageUrl = default(string), int? menuItemId = default(int?))
         {
-            this.MenuItemId = menuItemId;
             this.ActualPrice = actualPrice;
             this.MenuItemOptionSets = menuItemOptionSets;
             this.DailySpecialHours = dailySpecialHours;
@@ -142,12 +141,14 @@ public enum CellLayoutTypeEnum
             this.TaxRateName = taxRateName;
             this.TaxRateId = taxRateId;
             this.TaxValue = taxValue;
+            this.ExcludeFromVoucherDiscounting = excludeFromVoucherDiscounting;
             this.Metadata = metadata;
             this.CatalogItemId = catalogItemId;
             this.Name = name;
             this.Description = description;
             this.SpicinessRating = spicinessRating;
             this.Price = price;
+            this.DepositReturnFee = depositReturnFee;
             this.DisplayOrder = displayOrder;
             this.Alcohol = alcohol;
             this.IsAvailable = isAvailable;
@@ -155,15 +156,9 @@ public enum CellLayoutTypeEnum
             this.DisableVouchers = disableVouchers;
             this.ImageName = imageName;
             this.ImageUrl = imageUrl;
+            this.MenuItemId = menuItemId;
         }
         
-        /// <summary>
-        /// Menu item identifier. This ID may change at any time. Use &#x60;PublicId&#x60; if you need a permanent reference to the item.
-        /// </summary>
-        /// <value>Menu item identifier. This ID may change at any time. Use &#x60;PublicId&#x60; if you need a permanent reference to the item.</value>
-        [DataMember(Name="MenuItemId", EmitDefaultValue=false)]
-        public int? MenuItemId { get; set; }
-
         /// <summary>
         /// Actual price - the minimum price possible when all required option set items prices are included.
         /// </summary>
@@ -213,6 +208,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="TaxValue", EmitDefaultValue=false)]
         public double? TaxValue { get; set; }
 
+        /// <summary>
+        /// If true, the item is excluded from voucher discount calculations
+        /// </summary>
+        /// <value>If true, the item is excluded from voucher discount calculations</value>
+        [DataMember(Name="ExcludeFromVoucherDiscounting", EmitDefaultValue=false)]
+        public bool? ExcludeFromVoucherDiscounting { get; set; }
+
         /// <summary>
         /// List of metadata
         /// </summary>
@@ -249,6 +251,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="Price", EmitDefaultValue=false)]
         public double? Price { get; set; }
 
+        /// <summary>
+        /// An optional fee that can be added to the price of the item.
+        /// </summary>
+        /// <value>An optional fee that can be added to the price of the item.</value>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
         /// <summary>
         /// Display order
         /// </summary>
@@ -292,6 +301,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="ImageUrl", EmitDefaultValue=false)]
         public string ImageUrl { get; set; }
 
+        /// <summary>
+        /// Menu Item Id
+        /// </summary>
+        /// <value>Menu Item Id</value>
+        [DataMember(Name="MenuItemId", EmitDefaultValue=false)]
+        public int? MenuItemId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -300,7 +316,6 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class MenuSectionItem {\n");
-            sb.Append("  MenuItemId: ").Append(MenuItemId).Append("\n");
             sb.Append("  ActualPrice: ").Append(ActualPrice).Append("\n");
             sb.Append("  MenuItemOptionSets: ").Append(MenuItemOptionSets).Append("\n");
             sb.Append("  DailySpecialHours: ").Append(DailySpecialHours).Append("\n");
@@ -308,12 +323,14 @@ public override string ToString()
             sb.Append("  TaxRateName: ").Append(TaxRateName).Append("\n");
             sb.Append("  TaxRateId: ").Append(TaxRateId).Append("\n");
             sb.Append("  TaxValue: ").Append(TaxValue).Append("\n");
+            sb.Append("  ExcludeFromVoucherDiscounting: ").Append(ExcludeFromVoucherDiscounting).Append("\n");
             sb.Append("  Metadata: ").Append(Metadata).Append("\n");
             sb.Append("  CatalogItemId: ").Append(CatalogItemId).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  SpicinessRating: ").Append(SpicinessRating).Append("\n");
             sb.Append("  Price: ").Append(Price).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
             sb.Append("  DisplayOrder: ").Append(DisplayOrder).Append("\n");
             sb.Append("  Alcohol: ").Append(Alcohol).Append("\n");
             sb.Append("  IsAvailable: ").Append(IsAvailable).Append("\n");
@@ -321,6 +338,7 @@ public override string ToString()
             sb.Append("  DisableVouchers: ").Append(DisableVouchers).Append("\n");
             sb.Append("  ImageName: ").Append(ImageName).Append("\n");
             sb.Append("  ImageUrl: ").Append(ImageUrl).Append("\n");
+            sb.Append("  MenuItemId: ").Append(MenuItemId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -355,11 +373,6 @@ public bool Equals(MenuSectionItem input)
                 return false;
 
             return 
-                (
-                    this.MenuItemId == input.MenuItemId ||
-                    (this.MenuItemId != null &&
-                    this.MenuItemId.Equals(input.MenuItemId))
-                ) && 
                 (
                     this.ActualPrice == input.ActualPrice ||
                     (this.ActualPrice != null &&
@@ -395,6 +408,11 @@ public bool Equals(MenuSectionItem input)
                     (this.TaxValue != null &&
                     this.TaxValue.Equals(input.TaxValue))
                 ) && 
+                (
+                    this.ExcludeFromVoucherDiscounting == input.ExcludeFromVoucherDiscounting ||
+                    (this.ExcludeFromVoucherDiscounting != null &&
+                    this.ExcludeFromVoucherDiscounting.Equals(input.ExcludeFromVoucherDiscounting))
+                ) && 
                 (
                     this.Metadata == input.Metadata ||
                     this.Metadata != null &&
@@ -425,6 +443,11 @@ public bool Equals(MenuSectionItem input)
                     (this.Price != null &&
                     this.Price.Equals(input.Price))
                 ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
+                ) && 
                 (
                     this.DisplayOrder == input.DisplayOrder ||
                     (this.DisplayOrder != null &&
@@ -459,6 +482,11 @@ public bool Equals(MenuSectionItem input)
                     this.ImageUrl == input.ImageUrl ||
                     (this.ImageUrl != null &&
                     this.ImageUrl.Equals(input.ImageUrl))
+                ) && 
+                (
+                    this.MenuItemId == input.MenuItemId ||
+                    (this.MenuItemId != null &&
+                    this.MenuItemId.Equals(input.MenuItemId))
                 );
         }
 
@@ -471,8 +499,6 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
-                if (this.MenuItemId != null)
-                    hashCode = hashCode * 59 + this.MenuItemId.GetHashCode();
                 if (this.ActualPrice != null)
                     hashCode = hashCode * 59 + this.ActualPrice.GetHashCode();
                 if (this.MenuItemOptionSets != null)
@@ -487,6 +513,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.TaxRateId.GetHashCode();
                 if (this.TaxValue != null)
                     hashCode = hashCode * 59 + this.TaxValue.GetHashCode();
+                if (this.ExcludeFromVoucherDiscounting != null)
+                    hashCode = hashCode * 59 + this.ExcludeFromVoucherDiscounting.GetHashCode();
                 if (this.Metadata != null)
                     hashCode = hashCode * 59 + this.Metadata.GetHashCode();
                 if (this.CatalogItemId != null)
@@ -499,6 +527,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.SpicinessRating.GetHashCode();
                 if (this.Price != null)
                     hashCode = hashCode * 59 + this.Price.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
                 if (this.DisplayOrder != null)
                     hashCode = hashCode * 59 + this.DisplayOrder.GetHashCode();
                 if (this.Alcohol != null)
@@ -513,31 +543,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ImageName.GetHashCode();
                 if (this.ImageUrl != null)
                     hashCode = hashCode * 59 + this.ImageUrl.GetHashCode();
+                if (this.MenuItemId != null)
+                    hashCode = hashCode * 59 + this.MenuItemId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionItemBase.cs b/src/Flipdish/Model/MenuSectionItemBase.cs
index be047e9f..52e6cb53 100644
--- a/src/Flipdish/Model/MenuSectionItemBase.cs
+++ b/src/Flipdish/Model/MenuSectionItemBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu item
     /// </summary>
     [DataContract]
-    public partial class MenuSectionItemBase :  IEquatable<MenuSectionItemBase>, IValidatableObject
+    public partial class MenuSectionItemBase :  IEquatable<MenuSectionItemBase>
     {
         /// <summary>
         /// Spiciness rating
@@ -115,6 +113,7 @@ public enum CellLayoutTypeEnum
         /// <param name="description">Description (like \&quot;A lovely dish from the east\&quot;).</param>
         /// <param name="spicinessRating">Spiciness rating.</param>
         /// <param name="price">Price - this is only used when there is no master option set and should be set to 0 if a master option set exists..</param>
+        /// <param name="depositReturnFee">An optional fee that can be added to the price of the item..</param>
         /// <param name="displayOrder">Display order.</param>
         /// <param name="alcohol">To be set true if the item or an option of the item contains an alcoholic drink..</param>
         /// <param name="isAvailable">True if we accept orders for this item still.</param>
@@ -123,12 +122,15 @@ public enum CellLayoutTypeEnum
         /// <param name="imageName">Image url.</param>
         /// <param name="imageUrl">Image url.</param>
         /// <param name="menuItemId">Menu Item Id.</param>
-        public MenuSectionItemBase(string name = default(string), string description = default(string), SpicinessRatingEnum? spicinessRating = default(SpicinessRatingEnum?), double? price = default(double?), int? displayOrder = default(int?), bool? alcohol = default(bool?), bool? isAvailable = default(bool?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), bool? disableVouchers = default(bool?), string imageName = default(string), string imageUrl = default(string), int? menuItemId = default(int?))
+        /// <param name="excludeFromVoucherDiscounting">If true, the item is excluded from voucher discount calculations.</param>
+        /// <param name="publicId">Permanent reference to the item..</param>
+        public MenuSectionItemBase(string name = default(string), string description = default(string), SpicinessRatingEnum? spicinessRating = default(SpicinessRatingEnum?), double? price = default(double?), double? depositReturnFee = default(double?), int? displayOrder = default(int?), bool? alcohol = default(bool?), bool? isAvailable = default(bool?), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?), bool? disableVouchers = default(bool?), string imageName = default(string), string imageUrl = default(string), int? menuItemId = default(int?), bool? excludeFromVoucherDiscounting = default(bool?), Guid? publicId = default(Guid?))
         {
             this.Name = name;
             this.Description = description;
             this.SpicinessRating = spicinessRating;
             this.Price = price;
+            this.DepositReturnFee = depositReturnFee;
             this.DisplayOrder = displayOrder;
             this.Alcohol = alcohol;
             this.IsAvailable = isAvailable;
@@ -137,6 +139,8 @@ public enum CellLayoutTypeEnum
             this.ImageName = imageName;
             this.ImageUrl = imageUrl;
             this.MenuItemId = menuItemId;
+            this.ExcludeFromVoucherDiscounting = excludeFromVoucherDiscounting;
+            this.PublicId = publicId;
         }
         
         /// <summary>
@@ -161,6 +165,13 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="Price", EmitDefaultValue=false)]
         public double? Price { get; set; }
 
+        /// <summary>
+        /// An optional fee that can be added to the price of the item.
+        /// </summary>
+        /// <value>An optional fee that can be added to the price of the item.</value>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
         /// <summary>
         /// Display order
         /// </summary>
@@ -211,6 +222,20 @@ public enum CellLayoutTypeEnum
         [DataMember(Name="MenuItemId", EmitDefaultValue=false)]
         public int? MenuItemId { get; set; }
 
+        /// <summary>
+        /// If true, the item is excluded from voucher discount calculations
+        /// </summary>
+        /// <value>If true, the item is excluded from voucher discount calculations</value>
+        [DataMember(Name="ExcludeFromVoucherDiscounting", EmitDefaultValue=false)]
+        public bool? ExcludeFromVoucherDiscounting { get; set; }
+
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -223,6 +248,7 @@ public override string ToString()
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  SpicinessRating: ").Append(SpicinessRating).Append("\n");
             sb.Append("  Price: ").Append(Price).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
             sb.Append("  DisplayOrder: ").Append(DisplayOrder).Append("\n");
             sb.Append("  Alcohol: ").Append(Alcohol).Append("\n");
             sb.Append("  IsAvailable: ").Append(IsAvailable).Append("\n");
@@ -231,6 +257,8 @@ public override string ToString()
             sb.Append("  ImageName: ").Append(ImageName).Append("\n");
             sb.Append("  ImageUrl: ").Append(ImageUrl).Append("\n");
             sb.Append("  MenuItemId: ").Append(MenuItemId).Append("\n");
+            sb.Append("  ExcludeFromVoucherDiscounting: ").Append(ExcludeFromVoucherDiscounting).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -285,6 +313,11 @@ public bool Equals(MenuSectionItemBase input)
                     (this.Price != null &&
                     this.Price.Equals(input.Price))
                 ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
+                ) && 
                 (
                     this.DisplayOrder == input.DisplayOrder ||
                     (this.DisplayOrder != null &&
@@ -324,6 +357,16 @@ public bool Equals(MenuSectionItemBase input)
                     this.MenuItemId == input.MenuItemId ||
                     (this.MenuItemId != null &&
                     this.MenuItemId.Equals(input.MenuItemId))
+                ) && 
+                (
+                    this.ExcludeFromVoucherDiscounting == input.ExcludeFromVoucherDiscounting ||
+                    (this.ExcludeFromVoucherDiscounting != null &&
+                    this.ExcludeFromVoucherDiscounting.Equals(input.ExcludeFromVoucherDiscounting))
+                ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
                 );
         }
 
@@ -344,6 +387,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.SpicinessRating.GetHashCode();
                 if (this.Price != null)
                     hashCode = hashCode * 59 + this.Price.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
                 if (this.DisplayOrder != null)
                     hashCode = hashCode * 59 + this.DisplayOrder.GetHashCode();
                 if (this.Alcohol != null)
@@ -360,31 +405,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ImageUrl.GetHashCode();
                 if (this.MenuItemId != null)
                     hashCode = hashCode * 59 + this.MenuItemId.GetHashCode();
+                if (this.ExcludeFromVoucherDiscounting != null)
+                    hashCode = hashCode * 59 + this.ExcludeFromVoucherDiscounting.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 4000.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionItemCreatedEvent.cs b/src/Flipdish/Model/MenuSectionItemCreatedEvent.cs
index 38785361..09522014 100644
--- a/src/Flipdish/Model/MenuSectionItemCreatedEvent.cs
+++ b/src/Flipdish/Model/MenuSectionItemCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuSectionItemCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuSectionItemCreatedEvent :  IEquatable<MenuSectionItemCreatedEvent>, IValidatableObject
+    public partial class MenuSectionItemCreatedEvent :  IEquatable<MenuSectionItemCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSectionItemCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuSectionItemCreatedEvent :  IEquatable<MenuSectionItemCr
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuSectionItemCreatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSectionItem menuSectionItem = default(MenuSectionItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuSectionItemCreatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSectionItem menuSectionItem = default(MenuSectionItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuSectionItemCreatedEvent :  IEquatable<MenuSectionItemCr
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuSectionItemCreatedEvent :  IEquatable<MenuSectionItemCr
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuSectionItemCreatedEvent :  IEquatable<MenuSectionItemCr
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuSectionItemCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionItemDeletedEvent.cs b/src/Flipdish/Model/MenuSectionItemDeletedEvent.cs
index ecc95871..d97f6214 100644
--- a/src/Flipdish/Model/MenuSectionItemDeletedEvent.cs
+++ b/src/Flipdish/Model/MenuSectionItemDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuSectionItemDeletedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuSectionItemDeletedEvent :  IEquatable<MenuSectionItemDeletedEvent>, IValidatableObject
+    public partial class MenuSectionItemDeletedEvent :  IEquatable<MenuSectionItemDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSectionItemDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuSectionItemDeletedEvent :  IEquatable<MenuSectionItemDe
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuSectionItemDeletedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSectionItem menuSectionItem = default(MenuSectionItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuSectionItemDeletedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSectionItem menuSectionItem = default(MenuSectionItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuSectionItemDeletedEvent :  IEquatable<MenuSectionItemDe
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuSectionItemDeletedEvent :  IEquatable<MenuSectionItemDe
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuSectionItemDeletedEvent :  IEquatable<MenuSectionItemDe
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuSectionItemDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionItemUpdatedEvent.cs b/src/Flipdish/Model/MenuSectionItemUpdatedEvent.cs
index d465b375..6efa9df4 100644
--- a/src/Flipdish/Model/MenuSectionItemUpdatedEvent.cs
+++ b/src/Flipdish/Model/MenuSectionItemUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuSectionItemUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuSectionItemUpdatedEvent :  IEquatable<MenuSectionItemUpdatedEvent>, IValidatableObject
+    public partial class MenuSectionItemUpdatedEvent :  IEquatable<MenuSectionItemUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSectionItemUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuSectionItemUpdatedEvent :  IEquatable<MenuSectionItemUp
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuSectionItemUpdatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSectionItem menuSectionItem = default(MenuSectionItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuSectionItemUpdatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSectionItem menuSectionItem = default(MenuSectionItem), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuSectionItemUpdatedEvent :  IEquatable<MenuSectionItemUp
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuSectionItemUpdatedEvent :  IEquatable<MenuSectionItemUp
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuSectionItemUpdatedEvent :  IEquatable<MenuSectionItemUp
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuSectionItemUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSectionUpdatedEvent.cs b/src/Flipdish/Model/MenuSectionUpdatedEvent.cs
index af6b5da4..ef49d623 100644
--- a/src/Flipdish/Model/MenuSectionUpdatedEvent.cs
+++ b/src/Flipdish/Model/MenuSectionUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// MenuSectionUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class MenuSectionUpdatedEvent :  IEquatable<MenuSectionUpdatedEvent>, IValidatableObject
+    public partial class MenuSectionUpdatedEvent :  IEquatable<MenuSectionUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSectionUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuSectionUpdatedEvent :  IEquatable<MenuSectionUpdatedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuSectionUpdatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSection menuSection = default(MenuSection), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuSectionUpdatedEvent(int? menuId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), MenuSection menuSection = default(MenuSection), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.MenuId = menuId;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuSectionUpdatedEvent :  IEquatable<MenuSectionUpdatedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuSectionUpdatedEvent :  IEquatable<MenuSectionUpdatedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuSectionUpdatedEvent :  IEquatable<MenuSectionUpdatedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuSectionUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuStoreNames.cs b/src/Flipdish/Model/MenuStoreNames.cs
index cddcd1b2..37453568 100644
--- a/src/Flipdish/Model/MenuStoreNames.cs
+++ b/src/Flipdish/Model/MenuStoreNames.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu Store Names
     /// </summary>
     [DataContract]
-    public partial class MenuStoreNames :  IEquatable<MenuStoreNames>, IValidatableObject
+    public partial class MenuStoreNames :  IEquatable<MenuStoreNames>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuStoreNames" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuSummary.cs b/src/Flipdish/Model/MenuSummary.cs
index b508ebfb..5d7100f1 100644
--- a/src/Flipdish/Model/MenuSummary.cs
+++ b/src/Flipdish/Model/MenuSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu Summary
     /// </summary>
     [DataContract]
-    public partial class MenuSummary :  IEquatable<MenuSummary>, IValidatableObject
+    public partial class MenuSummary :  IEquatable<MenuSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuSummary" /> class.
@@ -36,17 +34,21 @@ public partial class MenuSummary :  IEquatable<MenuSummary>, IValidatableObject
         /// <param name="menuId">Menu identifier.</param>
         /// <param name="modifiedTime">Last modified time.</param>
         /// <param name="versionNumber">Menu version.</param>
+        /// <param name="menuUrl">Menu Url.</param>
         /// <param name="name">Name of Menu, only shown in portal.</param>
         /// <param name="locked">Locked: is menu locked against modifcation.</param>
         /// <param name="storeNames">List of stores names which are associated with this menu.</param>
-        public MenuSummary(int? menuId = default(int?), DateTime? modifiedTime = default(DateTime?), int? versionNumber = default(int?), string name = default(string), bool? locked = default(bool?), List<string> storeNames = default(List<string>))
+        /// <param name="isIntegrated">Flag to indicate if the menu is integrated (contains metadata).</param>
+        public MenuSummary(int? menuId = default(int?), DateTime? modifiedTime = default(DateTime?), int? versionNumber = default(int?), string menuUrl = default(string), string name = default(string), bool? locked = default(bool?), List<string> storeNames = default(List<string>), bool? isIntegrated = default(bool?))
         {
             this.MenuId = menuId;
             this.ModifiedTime = modifiedTime;
             this.VersionNumber = versionNumber;
+            this.MenuUrl = menuUrl;
             this.Name = name;
             this.Locked = locked;
             this.StoreNames = storeNames;
+            this.IsIntegrated = isIntegrated;
         }
         
         /// <summary>
@@ -70,6 +72,13 @@ public partial class MenuSummary :  IEquatable<MenuSummary>, IValidatableObject
         [DataMember(Name="VersionNumber", EmitDefaultValue=false)]
         public int? VersionNumber { get; set; }
 
+        /// <summary>
+        /// Menu Url
+        /// </summary>
+        /// <value>Menu Url</value>
+        [DataMember(Name="MenuUrl", EmitDefaultValue=false)]
+        public string MenuUrl { get; set; }
+
         /// <summary>
         /// Name of Menu, only shown in portal
         /// </summary>
@@ -91,6 +100,13 @@ public partial class MenuSummary :  IEquatable<MenuSummary>, IValidatableObject
         [DataMember(Name="StoreNames", EmitDefaultValue=false)]
         public List<string> StoreNames { get; set; }
 
+        /// <summary>
+        /// Flag to indicate if the menu is integrated (contains metadata)
+        /// </summary>
+        /// <value>Flag to indicate if the menu is integrated (contains metadata)</value>
+        [DataMember(Name="IsIntegrated", EmitDefaultValue=false)]
+        public bool? IsIntegrated { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -102,9 +118,11 @@ public override string ToString()
             sb.Append("  MenuId: ").Append(MenuId).Append("\n");
             sb.Append("  ModifiedTime: ").Append(ModifiedTime).Append("\n");
             sb.Append("  VersionNumber: ").Append(VersionNumber).Append("\n");
+            sb.Append("  MenuUrl: ").Append(MenuUrl).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Locked: ").Append(Locked).Append("\n");
             sb.Append("  StoreNames: ").Append(StoreNames).Append("\n");
+            sb.Append("  IsIntegrated: ").Append(IsIntegrated).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -154,6 +172,11 @@ public bool Equals(MenuSummary input)
                     (this.VersionNumber != null &&
                     this.VersionNumber.Equals(input.VersionNumber))
                 ) && 
+                (
+                    this.MenuUrl == input.MenuUrl ||
+                    (this.MenuUrl != null &&
+                    this.MenuUrl.Equals(input.MenuUrl))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -168,6 +191,11 @@ public bool Equals(MenuSummary input)
                     this.StoreNames == input.StoreNames ||
                     this.StoreNames != null &&
                     this.StoreNames.SequenceEqual(input.StoreNames)
+                ) && 
+                (
+                    this.IsIntegrated == input.IsIntegrated ||
+                    (this.IsIntegrated != null &&
+                    this.IsIntegrated.Equals(input.IsIntegrated))
                 );
         }
 
@@ -186,25 +214,19 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ModifiedTime.GetHashCode();
                 if (this.VersionNumber != null)
                     hashCode = hashCode * 59 + this.VersionNumber.GetHashCode();
+                if (this.MenuUrl != null)
+                    hashCode = hashCode * 59 + this.MenuUrl.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Locked != null)
                     hashCode = hashCode * 59 + this.Locked.GetHashCode();
                 if (this.StoreNames != null)
                     hashCode = hashCode * 59 + this.StoreNames.GetHashCode();
+                if (this.IsIntegrated != null)
+                    hashCode = hashCode * 59 + this.IsIntegrated.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuTaxDetails.cs b/src/Flipdish/Model/MenuTaxDetails.cs
index f4d7688f..8d0ede53 100644
--- a/src/Flipdish/Model/MenuTaxDetails.cs
+++ b/src/Flipdish/Model/MenuTaxDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Tax information for Menu
     /// </summary>
     [DataContract]
-    public partial class MenuTaxDetails :  IEquatable<MenuTaxDetails>, IValidatableObject
+    public partial class MenuTaxDetails :  IEquatable<MenuTaxDetails>
     {
         /// <summary>
         /// TaxType
@@ -199,16 +197,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuTaxRate.cs b/src/Flipdish/Model/MenuTaxRate.cs
index 227e80a9..27993bc4 100644
--- a/src/Flipdish/Model/MenuTaxRate.cs
+++ b/src/Flipdish/Model/MenuTaxRate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Tax Rates Associated with a Menu
     /// </summary>
     [DataContract]
-    public partial class MenuTaxRate :  IEquatable<MenuTaxRate>, IValidatableObject
+    public partial class MenuTaxRate :  IEquatable<MenuTaxRate>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuTaxRate" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuUpdatedEvent.cs b/src/Flipdish/Model/MenuUpdatedEvent.cs
index 397fced8..cdaecec1 100644
--- a/src/Flipdish/Model/MenuUpdatedEvent.cs
+++ b/src/Flipdish/Model/MenuUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu updated event
     /// </summary>
     [DataContract]
-    public partial class MenuUpdatedEvent :  IEquatable<MenuUpdatedEvent>, IValidatableObject
+    public partial class MenuUpdatedEvent :  IEquatable<MenuUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class MenuUpdatedEvent :  IEquatable<MenuUpdatedEvent>, IValidata
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), int? menuId = default(int?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), int? menuId = default(int?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class MenuUpdatedEvent :  IEquatable<MenuUpdatedEvent>, IValidata
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class MenuUpdatedEvent :  IEquatable<MenuUpdatedEvent>, IValidata
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class MenuUpdatedEvent :  IEquatable<MenuUpdatedEvent>, IValidata
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(MenuUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuUploadedEvent.cs b/src/Flipdish/Model/MenuUploadedEvent.cs
index 094cfd65..557e647a 100644
--- a/src/Flipdish/Model/MenuUploadedEvent.cs
+++ b/src/Flipdish/Model/MenuUploadedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu uploaded event
     /// </summary>
     [DataContract]
-    public partial class MenuUploadedEvent :  IEquatable<MenuUploadedEvent>, IValidatableObject
+    public partial class MenuUploadedEvent :  IEquatable<MenuUploadedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MenuUploadedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class MenuUploadedEvent :  IEquatable<MenuUploadedEvent>, IValida
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public MenuUploadedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), string instanceEventCount = default(string), int? menuId = default(int?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MenuUploadedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Menu menu = default(Menu), string instanceEventCount = default(string), int? menuId = default(int?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -56,7 +57,10 @@ public partial class MenuUploadedEvent :  IEquatable<MenuUploadedEvent>, IValida
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class MenuUploadedEvent :  IEquatable<MenuUploadedEvent>, IValida
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class MenuUploadedEvent :  IEquatable<MenuUploadedEvent>, IValida
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(MenuUploadedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MenuZone.cs b/src/Flipdish/Model/MenuZone.cs
new file mode 100644
index 00000000..47c3044a
--- /dev/null
+++ b/src/Flipdish/Model/MenuZone.cs
@@ -0,0 +1,215 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// MenuZone.
+    /// </summary>
+    [DataContract]
+    public partial class MenuZone :  IEquatable<MenuZone>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MenuZone" /> class.
+        /// </summary>
+        /// <param name="menuZoneId">MenuZoneId..</param>
+        /// <param name="menuId">MenuId..</param>
+        /// <param name="name">Name..</param>
+        /// <param name="description">Description..</param>
+        /// <param name="imageName">ImageName..</param>
+        /// <param name="displayOrder">DisplayOrder..</param>
+        /// <param name="imageUrl">ImageUrl..</param>
+        public MenuZone(int? menuZoneId = default(int?), int? menuId = default(int?), string name = default(string), string description = default(string), string imageName = default(string), int? displayOrder = default(int?), string imageUrl = default(string))
+        {
+            this.MenuZoneId = menuZoneId;
+            this.MenuId = menuId;
+            this.Name = name;
+            this.Description = description;
+            this.ImageName = imageName;
+            this.DisplayOrder = displayOrder;
+            this.ImageUrl = imageUrl;
+        }
+        
+        /// <summary>
+        /// MenuZoneId.
+        /// </summary>
+        /// <value>MenuZoneId.</value>
+        [DataMember(Name="MenuZoneId", EmitDefaultValue=false)]
+        public int? MenuZoneId { get; set; }
+
+        /// <summary>
+        /// MenuId.
+        /// </summary>
+        /// <value>MenuId.</value>
+        [DataMember(Name="MenuId", EmitDefaultValue=false)]
+        public int? MenuId { get; set; }
+
+        /// <summary>
+        /// Name.
+        /// </summary>
+        /// <value>Name.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Description.
+        /// </summary>
+        /// <value>Description.</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// ImageName.
+        /// </summary>
+        /// <value>ImageName.</value>
+        [DataMember(Name="ImageName", EmitDefaultValue=false)]
+        public string ImageName { get; set; }
+
+        /// <summary>
+        /// DisplayOrder.
+        /// </summary>
+        /// <value>DisplayOrder.</value>
+        [DataMember(Name="DisplayOrder", EmitDefaultValue=false)]
+        public int? DisplayOrder { get; set; }
+
+        /// <summary>
+        /// ImageUrl.
+        /// </summary>
+        /// <value>ImageUrl.</value>
+        [DataMember(Name="ImageUrl", EmitDefaultValue=false)]
+        public string ImageUrl { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class MenuZone {\n");
+            sb.Append("  MenuZoneId: ").Append(MenuZoneId).Append("\n");
+            sb.Append("  MenuId: ").Append(MenuId).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  ImageName: ").Append(ImageName).Append("\n");
+            sb.Append("  DisplayOrder: ").Append(DisplayOrder).Append("\n");
+            sb.Append("  ImageUrl: ").Append(ImageUrl).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as MenuZone);
+        }
+
+        /// <summary>
+        /// Returns true if MenuZone instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MenuZone to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MenuZone input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.MenuZoneId == input.MenuZoneId ||
+                    (this.MenuZoneId != null &&
+                    this.MenuZoneId.Equals(input.MenuZoneId))
+                ) && 
+                (
+                    this.MenuId == input.MenuId ||
+                    (this.MenuId != null &&
+                    this.MenuId.Equals(input.MenuId))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.ImageName == input.ImageName ||
+                    (this.ImageName != null &&
+                    this.ImageName.Equals(input.ImageName))
+                ) && 
+                (
+                    this.DisplayOrder == input.DisplayOrder ||
+                    (this.DisplayOrder != null &&
+                    this.DisplayOrder.Equals(input.DisplayOrder))
+                ) && 
+                (
+                    this.ImageUrl == input.ImageUrl ||
+                    (this.ImageUrl != null &&
+                    this.ImageUrl.Equals(input.ImageUrl))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.MenuZoneId != null)
+                    hashCode = hashCode * 59 + this.MenuZoneId.GetHashCode();
+                if (this.MenuId != null)
+                    hashCode = hashCode * 59 + this.MenuId.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.ImageName != null)
+                    hashCode = hashCode * 59 + this.ImageName.GetHashCode();
+                if (this.DisplayOrder != null)
+                    hashCode = hashCode * 59 + this.DisplayOrder.GetHashCode();
+                if (this.ImageUrl != null)
+                    hashCode = hashCode * 59 + this.ImageUrl.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/Metadata.cs b/src/Flipdish/Model/Metadata.cs
index b9e75016..f9fa41f3 100644
--- a/src/Flipdish/Model/Metadata.cs
+++ b/src/Flipdish/Model/Metadata.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Metadata
     /// </summary>
     [DataContract]
-    public partial class Metadata :  IEquatable<Metadata>, IValidatableObject
+    public partial class Metadata :  IEquatable<Metadata>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Metadata" /> class.
@@ -144,40 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Key (string) maxLength
-            if(this.Key != null && this.Key.Length > 128)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Key, length must be less than 128.", new [] { "Key" });
-            }
-
-            // Key (string) minLength
-            if(this.Key != null && this.Key.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Key, length must be greater than 0.", new [] { "Key" });
-            }
-
-            // Value (string) maxLength
-            if(this.Value != null && this.Value.Length > 4000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Value, length must be less than 4000.", new [] { "Value" });
-            }
-
-            // Value (string) minLength
-            if(this.Value != null && this.Value.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Value, length must be greater than 0.", new [] { "Value" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Metafield.cs b/src/Flipdish/Model/Metafield.cs
index a46d2fca..c97dd270 100644
--- a/src/Flipdish/Model/Metafield.cs
+++ b/src/Flipdish/Model/Metafield.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Metafield
     /// </summary>
     [DataContract]
-    public partial class Metafield :  IEquatable<Metafield>, IValidatableObject
+    public partial class Metafield :  IEquatable<Metafield>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Metafield" /> class.
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MetafieldDefinition.cs b/src/Flipdish/Model/MetafieldDefinition.cs
index e5da9ed0..b74fb72c 100644
--- a/src/Flipdish/Model/MetafieldDefinition.cs
+++ b/src/Flipdish/Model/MetafieldDefinition.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,12 @@ namespace Flipdish.Model
     /// Metafield Definition
     /// </summary>
     [DataContract]
-    public partial class MetafieldDefinition :  IEquatable<MetafieldDefinition>, IValidatableObject
+    public partial class MetafieldDefinition :  IEquatable<MetafieldDefinition>
     {
         /// <summary>
-        /// The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}
+        /// The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}
         /// </summary>
-        /// <value>The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}</value>
+        /// <value>The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum OwnerEntityEnum
         {
@@ -58,9 +56,9 @@ public enum OwnerEntityEnum
         }
 
         /// <summary>
-        /// The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}
+        /// The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}
         /// </summary>
-        /// <value>The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}</value>
+        /// <value>The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}</value>
         [DataMember(Name="OwnerEntity", EmitDefaultValue=false)]
         public OwnerEntityEnum? OwnerEntity { get; set; }
         /// <summary>
@@ -71,23 +69,29 @@ public enum OwnerEntityEnum
         public enum ValueTypeEnum
         {
             
+            /// <summary>
+            /// Enum Boolean for value: Boolean
+            /// </summary>
+            [EnumMember(Value = "Boolean")]
+            Boolean = 1,
+            
             /// <summary>
             /// Enum Json for value: Json
             /// </summary>
             [EnumMember(Value = "Json")]
-            Json = 1,
+            Json = 2,
             
             /// <summary>
             /// Enum SingleLineString for value: SingleLineString
             /// </summary>
             [EnumMember(Value = "SingleLineString")]
-            SingleLineString = 2,
+            SingleLineString = 3,
             
             /// <summary>
             /// Enum MultiLineString for value: MultiLineString
             /// </summary>
             [EnumMember(Value = "MultiLineString")]
-            MultiLineString = 3
+            MultiLineString = 4
         }
 
         /// <summary>
@@ -132,7 +136,7 @@ protected MetafieldDefinition() { }
         /// Initializes a new instance of the <see cref="MetafieldDefinition" /> class.
         /// </summary>
         /// <param name="isReadOnly">Indicates if a definition can be edited or not.</param>
-        /// <param name="ownerEntity">The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}.</param>
+        /// <param name="ownerEntity">The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}.</param>
         /// <param name="key">Key of the metafield.  The key must have two parts, separated by a dot. The first part acts as a category, for organizational purposes.  The parts can be composed of lowercase letters, numbers, hyphen and underscore (required).</param>
         /// <param name="valueType">The excepted type for the Value field.</param>
         /// <param name="name">Field Name (required).</param>
@@ -325,16 +329,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MetafieldDefinitionRecommendation.cs b/src/Flipdish/Model/MetafieldDefinitionRecommendation.cs
index 53ff9a82..fb737703 100644
--- a/src/Flipdish/Model/MetafieldDefinitionRecommendation.cs
+++ b/src/Flipdish/Model/MetafieldDefinitionRecommendation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,12 @@ namespace Flipdish.Model
     /// OwnerEntity Metafield Definition Recommendation
     /// </summary>
     [DataContract]
-    public partial class MetafieldDefinitionRecommendation :  IEquatable<MetafieldDefinitionRecommendation>, IValidatableObject
+    public partial class MetafieldDefinitionRecommendation :  IEquatable<MetafieldDefinitionRecommendation>
     {
         /// <summary>
-        /// The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}
+        /// The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}
         /// </summary>
-        /// <value>The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}</value>
+        /// <value>The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum OwnerEntityEnum
         {
@@ -58,9 +56,9 @@ public enum OwnerEntityEnum
         }
 
         /// <summary>
-        /// The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}
+        /// The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}
         /// </summary>
-        /// <value>The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}</value>
+        /// <value>The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}</value>
         [DataMember(Name="OwnerEntity", EmitDefaultValue=false)]
         public OwnerEntityEnum? OwnerEntity { get; set; }
         /// <summary>
@@ -71,23 +69,29 @@ public enum OwnerEntityEnum
         public enum ValueTypeEnum
         {
             
+            /// <summary>
+            /// Enum Boolean for value: Boolean
+            /// </summary>
+            [EnumMember(Value = "Boolean")]
+            Boolean = 1,
+            
             /// <summary>
             /// Enum Json for value: Json
             /// </summary>
             [EnumMember(Value = "Json")]
-            Json = 1,
+            Json = 2,
             
             /// <summary>
             /// Enum SingleLineString for value: SingleLineString
             /// </summary>
             [EnumMember(Value = "SingleLineString")]
-            SingleLineString = 2,
+            SingleLineString = 3,
             
             /// <summary>
             /// Enum MultiLineString for value: MultiLineString
             /// </summary>
             [EnumMember(Value = "MultiLineString")]
-            MultiLineString = 3
+            MultiLineString = 4
         }
 
         /// <summary>
@@ -131,7 +135,7 @@ protected MetafieldDefinitionRecommendation() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="MetafieldDefinitionRecommendation" /> class.
         /// </summary>
-        /// <param name="ownerEntity">The Metafield will extend the specified {Flipdish.PublicModels.V1.Metafields.MetafieldDefinitionBase.OwnerEntity}.</param>
+        /// <param name="ownerEntity">The Metafield will extend the specified {Flipdish.Metafields.PublicModels.V1.MetafieldDefinitionBase.OwnerEntity}.</param>
         /// <param name="key">Key of the metafield.  The key must have two parts, separated by a dot. The first part acts as a category, for organizational purposes.  The parts can be composed of lowercase letters, numbers, hyphen and underscore (required).</param>
         /// <param name="valueType">The excepted type for the Value field.</param>
         /// <param name="name">Field Name (required).</param>
@@ -308,16 +312,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MobileAppConfig.cs b/src/Flipdish/Model/MobileAppConfig.cs
deleted file mode 100644
index 3c88560f..00000000
--- a/src/Flipdish/Model/MobileAppConfig.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Mobile Apps form submission
-    /// </summary>
-    [DataContract]
-    public partial class MobileAppConfig :  IEquatable<MobileAppConfig>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MobileAppConfig" /> class.
-        /// </summary>
-        /// <param name="autoPublish">App Name.</param>
-        public MobileAppConfig(bool? autoPublish = default(bool?))
-        {
-            this.AutoPublish = autoPublish;
-        }
-        
-        /// <summary>
-        /// App Name
-        /// </summary>
-        /// <value>App Name</value>
-        [DataMember(Name="AutoPublish", EmitDefaultValue=false)]
-        public bool? AutoPublish { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class MobileAppConfig {\n");
-            sb.Append("  AutoPublish: ").Append(AutoPublish).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as MobileAppConfig);
-        }
-
-        /// <summary>
-        /// Returns true if MobileAppConfig instances are equal
-        /// </summary>
-        /// <param name="input">Instance of MobileAppConfig to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(MobileAppConfig input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.AutoPublish == input.AutoPublish ||
-                    (this.AutoPublish != null &&
-                    this.AutoPublish.Equals(input.AutoPublish))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.AutoPublish != null)
-                    hashCode = hashCode * 59 + this.AutoPublish.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/MobileAppsDetails.cs b/src/Flipdish/Model/MobileAppsDetails.cs
deleted file mode 100644
index 48d224d5..00000000
--- a/src/Flipdish/Model/MobileAppsDetails.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Mobile Apps form submission
-    /// </summary>
-    [DataContract]
-    public partial class MobileAppsDetails :  IEquatable<MobileAppsDetails>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MobileAppsDetails" /> class.
-        /// </summary>
-        /// <param name="appName">App Name.</param>
-        /// <param name="appDescription">App Description.</param>
-        /// <param name="appShortDescription">App Description.</param>
-        /// <param name="keywords">Keywords.</param>
-        /// <param name="appLogoUrl">Logo URL.</param>
-        public MobileAppsDetails(string appName = default(string), string appDescription = default(string), string appShortDescription = default(string), List<string> keywords = default(List<string>), string appLogoUrl = default(string))
-        {
-            this.AppName = appName;
-            this.AppDescription = appDescription;
-            this.AppShortDescription = appShortDescription;
-            this.Keywords = keywords;
-            this.AppLogoUrl = appLogoUrl;
-        }
-        
-        /// <summary>
-        /// App Name
-        /// </summary>
-        /// <value>App Name</value>
-        [DataMember(Name="AppName", EmitDefaultValue=false)]
-        public string AppName { get; set; }
-
-        /// <summary>
-        /// App Description
-        /// </summary>
-        /// <value>App Description</value>
-        [DataMember(Name="AppDescription", EmitDefaultValue=false)]
-        public string AppDescription { get; set; }
-
-        /// <summary>
-        /// App Description
-        /// </summary>
-        /// <value>App Description</value>
-        [DataMember(Name="AppShortDescription", EmitDefaultValue=false)]
-        public string AppShortDescription { get; set; }
-
-        /// <summary>
-        /// Keywords
-        /// </summary>
-        /// <value>Keywords</value>
-        [DataMember(Name="Keywords", EmitDefaultValue=false)]
-        public List<string> Keywords { get; set; }
-
-        /// <summary>
-        /// Logo URL
-        /// </summary>
-        /// <value>Logo URL</value>
-        [DataMember(Name="AppLogoUrl", EmitDefaultValue=false)]
-        public string AppLogoUrl { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class MobileAppsDetails {\n");
-            sb.Append("  AppName: ").Append(AppName).Append("\n");
-            sb.Append("  AppDescription: ").Append(AppDescription).Append("\n");
-            sb.Append("  AppShortDescription: ").Append(AppShortDescription).Append("\n");
-            sb.Append("  Keywords: ").Append(Keywords).Append("\n");
-            sb.Append("  AppLogoUrl: ").Append(AppLogoUrl).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as MobileAppsDetails);
-        }
-
-        /// <summary>
-        /// Returns true if MobileAppsDetails instances are equal
-        /// </summary>
-        /// <param name="input">Instance of MobileAppsDetails to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(MobileAppsDetails input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.AppName == input.AppName ||
-                    (this.AppName != null &&
-                    this.AppName.Equals(input.AppName))
-                ) && 
-                (
-                    this.AppDescription == input.AppDescription ||
-                    (this.AppDescription != null &&
-                    this.AppDescription.Equals(input.AppDescription))
-                ) && 
-                (
-                    this.AppShortDescription == input.AppShortDescription ||
-                    (this.AppShortDescription != null &&
-                    this.AppShortDescription.Equals(input.AppShortDescription))
-                ) && 
-                (
-                    this.Keywords == input.Keywords ||
-                    this.Keywords != null &&
-                    this.Keywords.SequenceEqual(input.Keywords)
-                ) && 
-                (
-                    this.AppLogoUrl == input.AppLogoUrl ||
-                    (this.AppLogoUrl != null &&
-                    this.AppLogoUrl.Equals(input.AppLogoUrl))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.AppName != null)
-                    hashCode = hashCode * 59 + this.AppName.GetHashCode();
-                if (this.AppDescription != null)
-                    hashCode = hashCode * 59 + this.AppDescription.GetHashCode();
-                if (this.AppShortDescription != null)
-                    hashCode = hashCode * 59 + this.AppShortDescription.GetHashCode();
-                if (this.Keywords != null)
-                    hashCode = hashCode * 59 + this.Keywords.GetHashCode();
-                if (this.AppLogoUrl != null)
-                    hashCode = hashCode * 59 + this.AppLogoUrl.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/MobileAppsImage.cs b/src/Flipdish/Model/MobileAppsImage.cs
index faa2ffeb..40247c7f 100644
--- a/src/Flipdish/Model/MobileAppsImage.cs
+++ b/src/Flipdish/Model/MobileAppsImage.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Mobile Apps Image
     /// </summary>
     [DataContract]
-    public partial class MobileAppsImage :  IEquatable<MobileAppsImage>, IValidatableObject
+    public partial class MobileAppsImage :  IEquatable<MobileAppsImage>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MobileAppsImage" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MobileAppsStatistics.cs b/src/Flipdish/Model/MobileAppsStatistics.cs
index 65b7060a..72534e51 100644
--- a/src/Flipdish/Model/MobileAppsStatistics.cs
+++ b/src/Flipdish/Model/MobileAppsStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Mobile Apps Statistics
     /// </summary>
     [DataContract]
-    public partial class MobileAppsStatistics :  IEquatable<MobileAppsStatistics>, IValidatableObject
+    public partial class MobileAppsStatistics :  IEquatable<MobileAppsStatistics>
     {
         /// <summary>
         /// Platform Type
@@ -38,17 +36,23 @@ public partial class MobileAppsStatistics :  IEquatable<MobileAppsStatistics>, I
         public enum PlatformTypeEnum
         {
             
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
             /// <summary>
             /// Enum Android for value: Android
             /// </summary>
             [EnumMember(Value = "Android")]
-            Android = 1,
+            Android = 2,
             
             /// <summary>
             /// Enum IOS for value: IOS
             /// </summary>
             [EnumMember(Value = "IOS")]
-            IOS = 2
+            IOS = 3
         }
 
         /// <summary>
@@ -267,16 +271,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MobileAppsSubmission.cs b/src/Flipdish/Model/MobileAppsSubmission.cs
index 0a78d353..81c4b7e8 100644
--- a/src/Flipdish/Model/MobileAppsSubmission.cs
+++ b/src/Flipdish/Model/MobileAppsSubmission.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Mobile Apps form submission
     /// </summary>
     [DataContract]
-    public partial class MobileAppsSubmission :  IEquatable<MobileAppsSubmission>, IValidatableObject
+    public partial class MobileAppsSubmission :  IEquatable<MobileAppsSubmission>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MobileAppsSubmission" /> class.
@@ -38,12 +36,13 @@ protected MobileAppsSubmission() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="MobileAppsSubmission" /> class.
         /// </summary>
+        /// <param name="submissionId">Mobile Apps Submission Id.</param>
         /// <param name="appName">App Name (required).</param>
         /// <param name="appDescription">App Description (required).</param>
         /// <param name="appShortDescription">App Description (required).</param>
         /// <param name="keywords">Keywords.</param>
         /// <param name="autoPublish">Publish automatically.</param>
-        public MobileAppsSubmission(string appName = default(string), string appDescription = default(string), string appShortDescription = default(string), List<string> keywords = default(List<string>), bool? autoPublish = default(bool?))
+        public MobileAppsSubmission(int? submissionId = default(int?), string appName = default(string), string appDescription = default(string), string appShortDescription = default(string), List<string> keywords = default(List<string>), bool? autoPublish = default(bool?))
         {
             // to ensure "appName" is required (not null)
             if (appName == null)
@@ -72,10 +71,18 @@ protected MobileAppsSubmission() { }
             {
                 this.AppShortDescription = appShortDescription;
             }
+            this.SubmissionId = submissionId;
             this.Keywords = keywords;
             this.AutoPublish = autoPublish;
         }
         
+        /// <summary>
+        /// Mobile Apps Submission Id
+        /// </summary>
+        /// <value>Mobile Apps Submission Id</value>
+        [DataMember(Name="SubmissionId", EmitDefaultValue=false)]
+        public int? SubmissionId { get; set; }
+
         /// <summary>
         /// App Name
         /// </summary>
@@ -119,6 +126,7 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class MobileAppsSubmission {\n");
+            sb.Append("  SubmissionId: ").Append(SubmissionId).Append("\n");
             sb.Append("  AppName: ").Append(AppName).Append("\n");
             sb.Append("  AppDescription: ").Append(AppDescription).Append("\n");
             sb.Append("  AppShortDescription: ").Append(AppShortDescription).Append("\n");
@@ -158,6 +166,11 @@ public bool Equals(MobileAppsSubmission input)
                 return false;
 
             return 
+                (
+                    this.SubmissionId == input.SubmissionId ||
+                    (this.SubmissionId != null &&
+                    this.SubmissionId.Equals(input.SubmissionId))
+                ) && 
                 (
                     this.AppName == input.AppName ||
                     (this.AppName != null &&
@@ -194,6 +207,8 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.SubmissionId != null)
+                    hashCode = hashCode * 59 + this.SubmissionId.GetHashCode();
                 if (this.AppName != null)
                     hashCode = hashCode * 59 + this.AppName.GetHashCode();
                 if (this.AppDescription != null)
@@ -207,16 +222,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MobileAppsSubmissionDetails.cs b/src/Flipdish/Model/MobileAppsSubmissionDetails.cs
index 4c6bceff..baa8da6f 100644
--- a/src/Flipdish/Model/MobileAppsSubmissionDetails.cs
+++ b/src/Flipdish/Model/MobileAppsSubmissionDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Mobile Apps form submission
     /// </summary>
     [DataContract]
-    public partial class MobileAppsSubmissionDetails :  IEquatable<MobileAppsSubmissionDetails>, IValidatableObject
+    public partial class MobileAppsSubmissionDetails :  IEquatable<MobileAppsSubmissionDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="MobileAppsSubmissionDetails" /> class.
@@ -229,16 +227,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MobileAppsSubmissionStatus.cs b/src/Flipdish/Model/MobileAppsSubmissionStatus.cs
index bbde9629..c6eafbfd 100644
--- a/src/Flipdish/Model/MobileAppsSubmissionStatus.cs
+++ b/src/Flipdish/Model/MobileAppsSubmissionStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Mobile Apps Status
     /// </summary>
     [DataContract]
-    public partial class MobileAppsSubmissionStatus :  IEquatable<MobileAppsSubmissionStatus>, IValidatableObject
+    public partial class MobileAppsSubmissionStatus :  IEquatable<MobileAppsSubmissionStatus>
     {
         /// <summary>
         /// Mobile Type
@@ -38,17 +36,23 @@ public partial class MobileAppsSubmissionStatus :  IEquatable<MobileAppsSubmissi
         public enum TypeEnum
         {
             
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
             /// <summary>
             /// Enum Android for value: Android
             /// </summary>
             [EnumMember(Value = "Android")]
-            Android = 1,
+            Android = 2,
             
             /// <summary>
             /// Enum IOS for value: IOS
             /// </summary>
             [EnumMember(Value = "IOS")]
-            IOS = 2
+            IOS = 3
         }
 
         /// <summary>
@@ -339,16 +343,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/MobileAppsSubmissionStatusUpdatedEvent.cs b/src/Flipdish/Model/MobileAppsSubmissionStatusUpdatedEvent.cs
new file mode 100644
index 00000000..b6644ab5
--- /dev/null
+++ b/src/Flipdish/Model/MobileAppsSubmissionStatusUpdatedEvent.cs
@@ -0,0 +1,300 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Mobile Apps event
+    /// </summary>
+    [DataContract]
+    public partial class MobileAppsSubmissionStatusUpdatedEvent :  IEquatable<MobileAppsSubmissionStatusUpdatedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MobileAppsSubmissionStatusUpdatedEvent" /> class.
+        /// </summary>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="description">Description.</param>
+        /// <param name="user">User who has created the item.</param>
+        /// <param name="mobileAppsSubmissionStatus">Mobile Apps Submission Status.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MobileAppsSubmissionStatusUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), MobileAppsSubmissionStatus mobileAppsSubmissionStatus = default(MobileAppsSubmissionStatus), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.EventName = eventName;
+            this.Description = description;
+            this.User = user;
+            this.MobileAppsSubmissionStatus = mobileAppsSubmissionStatus;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// Description
+        /// </summary>
+        /// <value>Description</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// User who has created the item
+        /// </summary>
+        /// <value>User who has created the item</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
+        /// <summary>
+        /// Mobile Apps Submission Status
+        /// </summary>
+        /// <value>Mobile Apps Submission Status</value>
+        [DataMember(Name="MobileAppsSubmissionStatus", EmitDefaultValue=false)]
+        public MobileAppsSubmissionStatus MobileAppsSubmissionStatus { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class MobileAppsSubmissionStatusUpdatedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  MobileAppsSubmissionStatus: ").Append(MobileAppsSubmissionStatus).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as MobileAppsSubmissionStatusUpdatedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if MobileAppsSubmissionStatusUpdatedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MobileAppsSubmissionStatusUpdatedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MobileAppsSubmissionStatusUpdatedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
+                (
+                    this.MobileAppsSubmissionStatus == input.MobileAppsSubmissionStatus ||
+                    (this.MobileAppsSubmissionStatus != null &&
+                    this.MobileAppsSubmissionStatus.Equals(input.MobileAppsSubmissionStatus))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.MobileAppsSubmissionStatus != null)
+                    hashCode = hashCode * 59 + this.MobileAppsSubmissionStatus.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/MobileAppsSubmissionUpdatedEvent.cs b/src/Flipdish/Model/MobileAppsSubmissionUpdatedEvent.cs
new file mode 100644
index 00000000..10a3c6cd
--- /dev/null
+++ b/src/Flipdish/Model/MobileAppsSubmissionUpdatedEvent.cs
@@ -0,0 +1,283 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Mobile Apps event
+    /// </summary>
+    [DataContract]
+    public partial class MobileAppsSubmissionUpdatedEvent :  IEquatable<MobileAppsSubmissionUpdatedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MobileAppsSubmissionUpdatedEvent" /> class.
+        /// </summary>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="description">Description.</param>
+        /// <param name="user">User who has created the item.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public MobileAppsSubmissionUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.EventName = eventName;
+            this.Description = description;
+            this.User = user;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// Description
+        /// </summary>
+        /// <value>Description</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// User who has created the item
+        /// </summary>
+        /// <value>User who has created the item</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class MobileAppsSubmissionUpdatedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as MobileAppsSubmissionUpdatedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if MobileAppsSubmissionUpdatedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MobileAppsSubmissionUpdatedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MobileAppsSubmissionUpdatedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ModelBase.cs b/src/Flipdish/Model/ModelBase.cs
index f91b19cc..70350917 100644
--- a/src/Flipdish/Model/ModelBase.cs
+++ b/src/Flipdish/Model/ModelBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Model base
     /// </summary>
     [DataContract]
-    public partial class ModelBase :  IEquatable<ModelBase>, IValidatableObject
+    public partial class ModelBase :  IEquatable<ModelBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelBase" /> class.
@@ -94,16 +92,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Modifier.cs b/src/Flipdish/Model/Modifier.cs
deleted file mode 100644
index e0a9ed70..00000000
--- a/src/Flipdish/Model/Modifier.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Modifier
-    /// </summary>
-    [DataContract]
-    public partial class Modifier : Product,  IEquatable<Modifier>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Modifier" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected Modifier() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Modifier" /> class.
-        /// </summary>
-        public Modifier(string productId = default(string), string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), ProductTypeEnum? productType = default(ProductTypeEnum?), string imageFileName = default(string), bool? isArchived = default(bool?), bool? alcohol = default(bool?), string discriminator = "Modifier") : base(productId, sku, name, description, price, productType, imageFileName, isArchived, alcohol, discriminator)
-        {
-        }
-        
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class Modifier {\n");
-            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public override string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Modifier);
-        }
-
-        /// <summary>
-        /// Returns true if Modifier instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Modifier to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Modifier input)
-        {
-            if (input == null)
-                return false;
-
-            return base.Equals(input);
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = base.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            foreach(var x in BaseValidate(validationContext)) yield return x;
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/ModifierGroup.cs b/src/Flipdish/Model/ModifierGroup.cs
deleted file mode 100644
index 2f88a9e0..00000000
--- a/src/Flipdish/Model/ModifierGroup.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Modifier Group
-    /// </summary>
-    [DataContract]
-    public partial class ModifierGroup : Product,  IEquatable<ModifierGroup>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModifierGroup" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected ModifierGroup() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModifierGroup" /> class.
-        /// </summary>
-        /// <param name="subProducts">Collection of products associated with this product.</param>
-        public ModifierGroup(List<ModifierGroupSubProduct> subProducts = default(List<ModifierGroupSubProduct>), string productId = default(string), string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), ProductTypeEnum? productType = default(ProductTypeEnum?), string imageFileName = default(string), bool? isArchived = default(bool?), bool? alcohol = default(bool?), string discriminator = "ModifierGroup") : base(productId, sku, name, description, price, productType, imageFileName, isArchived, alcohol, discriminator)
-        {
-            this.subProducts = subProducts;
-        }
-        
-        /// <summary>
-        /// Collection of products associated with this product
-        /// </summary>
-        /// <value>Collection of products associated with this product</value>
-        [DataMember(Name="subProducts", EmitDefaultValue=false)]
-        public List<ModifierGroupSubProduct> subProducts { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class ModifierGroup {\n");
-            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  subProducts: ").Append(subProducts).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public override string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as ModifierGroup);
-        }
-
-        /// <summary>
-        /// Returns true if ModifierGroup instances are equal
-        /// </summary>
-        /// <param name="input">Instance of ModifierGroup to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(ModifierGroup input)
-        {
-            if (input == null)
-                return false;
-
-            return base.Equals(input) && 
-                (
-                    this.subProducts == input.subProducts ||
-                    this.subProducts != null &&
-                    this.subProducts.SequenceEqual(input.subProducts)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = base.GetHashCode();
-                if (this.subProducts != null)
-                    hashCode = hashCode * 59 + this.subProducts.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            foreach(var x in BaseValidate(validationContext)) yield return x;
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/ModifierGroupSubProduct.cs b/src/Flipdish/Model/ModifierGroupSubProduct.cs
deleted file mode 100644
index 5b0c27ce..00000000
--- a/src/Flipdish/Model/ModifierGroupSubProduct.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Product associated to a SimpleProduct
-    /// </summary>
-    [DataContract]
-    public partial class ModifierGroupSubProduct :  IEquatable<ModifierGroupSubProduct>, IValidatableObject
-    {
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ProductTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum SimpleProduct for value: SimpleProduct
-            /// </summary>
-            [EnumMember(Value = "SimpleProduct")]
-            SimpleProduct = 1,
-            
-            /// <summary>
-            /// Enum Modifier for value: Modifier
-            /// </summary>
-            [EnumMember(Value = "Modifier")]
-            Modifier = 2,
-            
-            /// <summary>
-            /// Enum ModifierGroup for value: ModifierGroup
-            /// </summary>
-            [EnumMember(Value = "ModifierGroup")]
-            ModifierGroup = 3
-        }
-
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [DataMember(Name="ProductType", EmitDefaultValue=false)]
-        public ProductTypeEnum ProductType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModifierGroupSubProduct" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected ModifierGroupSubProduct() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModifierGroupSubProduct" /> class.
-        /// </summary>
-        /// <param name="preselectedQuantity">Quantity of the modifier that will be set when the parent product is placed in the basket.</param>
-        /// <param name="productId">Identifier of the ProductId to use as SubProduct (required).</param>
-        /// <param name="productType">Type of the SupProduct (required).</param>
-        /// <param name="product">Details of the sub product.</param>
-        public ModifierGroupSubProduct(int? preselectedQuantity = default(int?), string productId = default(string), ProductTypeEnum productType = default(ProductTypeEnum), Product product = default(Product))
-        {
-            // to ensure "productId" is required (not null)
-            if (productId == null)
-            {
-                throw new InvalidDataException("productId is a required property for ModifierGroupSubProduct and cannot be null");
-            }
-            else
-            {
-                this.ProductId = productId;
-            }
-            // to ensure "productType" is required (not null)
-            if (productType == null)
-            {
-                throw new InvalidDataException("productType is a required property for ModifierGroupSubProduct and cannot be null");
-            }
-            else
-            {
-                this.ProductType = productType;
-            }
-            this.PreselectedQuantity = preselectedQuantity;
-            this.Product = product;
-        }
-        
-        /// <summary>
-        /// Quantity of the modifier that will be set when the parent product is placed in the basket
-        /// </summary>
-        /// <value>Quantity of the modifier that will be set when the parent product is placed in the basket</value>
-        [DataMember(Name="PreselectedQuantity", EmitDefaultValue=false)]
-        public int? PreselectedQuantity { get; set; }
-
-        /// <summary>
-        /// Identifier of the ProductId to use as SubProduct
-        /// </summary>
-        /// <value>Identifier of the ProductId to use as SubProduct</value>
-        [DataMember(Name="ProductId", EmitDefaultValue=false)]
-        public string ProductId { get; set; }
-
-
-        /// <summary>
-        /// Details of the sub product
-        /// </summary>
-        /// <value>Details of the sub product</value>
-        [DataMember(Name="Product", EmitDefaultValue=false)]
-        public Product Product { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class ModifierGroupSubProduct {\n");
-            sb.Append("  PreselectedQuantity: ").Append(PreselectedQuantity).Append("\n");
-            sb.Append("  ProductId: ").Append(ProductId).Append("\n");
-            sb.Append("  ProductType: ").Append(ProductType).Append("\n");
-            sb.Append("  Product: ").Append(Product).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as ModifierGroupSubProduct);
-        }
-
-        /// <summary>
-        /// Returns true if ModifierGroupSubProduct instances are equal
-        /// </summary>
-        /// <param name="input">Instance of ModifierGroupSubProduct to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(ModifierGroupSubProduct input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.PreselectedQuantity == input.PreselectedQuantity ||
-                    (this.PreselectedQuantity != null &&
-                    this.PreselectedQuantity.Equals(input.PreselectedQuantity))
-                ) && 
-                (
-                    this.ProductId == input.ProductId ||
-                    (this.ProductId != null &&
-                    this.ProductId.Equals(input.ProductId))
-                ) && 
-                (
-                    this.ProductType == input.ProductType ||
-                    (this.ProductType != null &&
-                    this.ProductType.Equals(input.ProductType))
-                ) && 
-                (
-                    this.Product == input.Product ||
-                    (this.Product != null &&
-                    this.Product.Equals(input.Product))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.PreselectedQuantity != null)
-                    hashCode = hashCode * 59 + this.PreselectedQuantity.GetHashCode();
-                if (this.ProductId != null)
-                    hashCode = hashCode * 59 + this.ProductId.GetHashCode();
-                if (this.ProductType != null)
-                    hashCode = hashCode * 59 + this.ProductType.GetHashCode();
-                if (this.Product != null)
-                    hashCode = hashCode * 59 + this.Product.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // ProductId (string) maxLength
-            if(this.ProductId != null && this.ProductId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ProductId, length must be less than 30.", new [] { "ProductId" });
-            }
-
-            // ProductId (string) minLength
-            if(this.ProductId != null && this.ProductId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ProductId, length must be greater than 0.", new [] { "ProductId" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/NextStatusWithOrderType.cs b/src/Flipdish/Model/NextStatusWithOrderType.cs
index 4f8ce37a..489f68f9 100644
--- a/src/Flipdish/Model/NextStatusWithOrderType.cs
+++ b/src/Flipdish/Model/NextStatusWithOrderType.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Next status by order type
     /// </summary>
     [DataContract]
-    public partial class NextStatusWithOrderType :  IEquatable<NextStatusWithOrderType>, IValidatableObject
+    public partial class NextStatusWithOrderType :  IEquatable<NextStatusWithOrderType>
     {
         /// <summary>
         /// Order type
@@ -160,16 +158,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/NutritionInfo.cs b/src/Flipdish/Model/NutritionInfo.cs
new file mode 100644
index 00000000..a67c5a48
--- /dev/null
+++ b/src/Flipdish/Model/NutritionInfo.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Menu Nutrition Information
+    /// </summary>
+    [DataContract]
+    public partial class NutritionInfo :  IEquatable<NutritionInfo>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NutritionInfo" /> class.
+        /// </summary>
+        /// <param name="version">Version of the nutrition information model.</param>
+        /// <param name="menuItems">List of menu item nutrition infos.</param>
+        /// <param name="menuItemOptionSetItems">List of menu item option set nutrition infos.</param>
+        public NutritionInfo(string version = default(string), List<NutritionInfoMenuItem> menuItems = default(List<NutritionInfoMenuItem>), List<NutritionInfoMenuOptionSetItem> menuItemOptionSetItems = default(List<NutritionInfoMenuOptionSetItem>))
+        {
+            this.Version = version;
+            this.MenuItems = menuItems;
+            this.MenuItemOptionSetItems = menuItemOptionSetItems;
+        }
+        
+        /// <summary>
+        /// Version of the nutrition information model
+        /// </summary>
+        /// <value>Version of the nutrition information model</value>
+        [DataMember(Name="Version", EmitDefaultValue=false)]
+        public string Version { get; set; }
+
+        /// <summary>
+        /// List of menu item nutrition infos
+        /// </summary>
+        /// <value>List of menu item nutrition infos</value>
+        [DataMember(Name="MenuItems", EmitDefaultValue=false)]
+        public List<NutritionInfoMenuItem> MenuItems { get; set; }
+
+        /// <summary>
+        /// List of menu item option set nutrition infos
+        /// </summary>
+        /// <value>List of menu item option set nutrition infos</value>
+        [DataMember(Name="MenuItemOptionSetItems", EmitDefaultValue=false)]
+        public List<NutritionInfoMenuOptionSetItem> MenuItemOptionSetItems { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NutritionInfo {\n");
+            sb.Append("  Version: ").Append(Version).Append("\n");
+            sb.Append("  MenuItems: ").Append(MenuItems).Append("\n");
+            sb.Append("  MenuItemOptionSetItems: ").Append(MenuItemOptionSetItems).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NutritionInfo);
+        }
+
+        /// <summary>
+        /// Returns true if NutritionInfo instances are equal
+        /// </summary>
+        /// <param name="input">Instance of NutritionInfo to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(NutritionInfo input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Version == input.Version ||
+                    (this.Version != null &&
+                    this.Version.Equals(input.Version))
+                ) && 
+                (
+                    this.MenuItems == input.MenuItems ||
+                    this.MenuItems != null &&
+                    this.MenuItems.SequenceEqual(input.MenuItems)
+                ) && 
+                (
+                    this.MenuItemOptionSetItems == input.MenuItemOptionSetItems ||
+                    this.MenuItemOptionSetItems != null &&
+                    this.MenuItemOptionSetItems.SequenceEqual(input.MenuItemOptionSetItems)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Version != null)
+                    hashCode = hashCode * 59 + this.Version.GetHashCode();
+                if (this.MenuItems != null)
+                    hashCode = hashCode * 59 + this.MenuItems.GetHashCode();
+                if (this.MenuItemOptionSetItems != null)
+                    hashCode = hashCode * 59 + this.MenuItemOptionSetItems.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/NutritionInfoItemAddUpdateLabelModel.cs b/src/Flipdish/Model/NutritionInfoItemAddUpdateLabelModel.cs
new file mode 100644
index 00000000..8b5157b5
--- /dev/null
+++ b/src/Flipdish/Model/NutritionInfoItemAddUpdateLabelModel.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// NutritionInfoItemAddUpdateLabelModel.
+    /// </summary>
+    [DataContract]
+    public partial class NutritionInfoItemAddUpdateLabelModel :  IEquatable<NutritionInfoItemAddUpdateLabelModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NutritionInfoItemAddUpdateLabelModel" /> class.
+        /// </summary>
+        /// <param name="name">Name..</param>
+        /// <param name="values">Values..</param>
+        /// <param name="iconUrl">IconUrl..</param>
+        public NutritionInfoItemAddUpdateLabelModel(string name = default(string), List<string> values = default(List<string>), string iconUrl = default(string))
+        {
+            this.Name = name;
+            this.Values = values;
+            this.IconUrl = iconUrl;
+        }
+        
+        /// <summary>
+        /// Name.
+        /// </summary>
+        /// <value>Name.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Values.
+        /// </summary>
+        /// <value>Values.</value>
+        [DataMember(Name="Values", EmitDefaultValue=false)]
+        public List<string> Values { get; set; }
+
+        /// <summary>
+        /// IconUrl.
+        /// </summary>
+        /// <value>IconUrl.</value>
+        [DataMember(Name="IconUrl", EmitDefaultValue=false)]
+        public string IconUrl { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NutritionInfoItemAddUpdateLabelModel {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Values: ").Append(Values).Append("\n");
+            sb.Append("  IconUrl: ").Append(IconUrl).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NutritionInfoItemAddUpdateLabelModel);
+        }
+
+        /// <summary>
+        /// Returns true if NutritionInfoItemAddUpdateLabelModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of NutritionInfoItemAddUpdateLabelModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(NutritionInfoItemAddUpdateLabelModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Values == input.Values ||
+                    this.Values != null &&
+                    this.Values.SequenceEqual(input.Values)
+                ) && 
+                (
+                    this.IconUrl == input.IconUrl ||
+                    (this.IconUrl != null &&
+                    this.IconUrl.Equals(input.IconUrl))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Values != null)
+                    hashCode = hashCode * 59 + this.Values.GetHashCode();
+                if (this.IconUrl != null)
+                    hashCode = hashCode * 59 + this.IconUrl.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/NutritionInfoLabel.cs b/src/Flipdish/Model/NutritionInfoLabel.cs
new file mode 100644
index 00000000..7be09e73
--- /dev/null
+++ b/src/Flipdish/Model/NutritionInfoLabel.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// NutritionInfoLabel.
+    /// </summary>
+    [DataContract]
+    public partial class NutritionInfoLabel :  IEquatable<NutritionInfoLabel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NutritionInfoLabel" /> class.
+        /// </summary>
+        /// <param name="name">Name of the allergen / ingredient.</param>
+        /// <param name="values">Optional list of values for the allergen / ingredient.</param>
+        /// <param name="iconUrl">Url to the icon for the allergen / ingredient.</param>
+        public NutritionInfoLabel(string name = default(string), List<string> values = default(List<string>), string iconUrl = default(string))
+        {
+            this.Name = name;
+            this.Values = values;
+            this.IconUrl = iconUrl;
+        }
+        
+        /// <summary>
+        /// Name of the allergen / ingredient
+        /// </summary>
+        /// <value>Name of the allergen / ingredient</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Optional list of values for the allergen / ingredient
+        /// </summary>
+        /// <value>Optional list of values for the allergen / ingredient</value>
+        [DataMember(Name="Values", EmitDefaultValue=false)]
+        public List<string> Values { get; set; }
+
+        /// <summary>
+        /// Url to the icon for the allergen / ingredient
+        /// </summary>
+        /// <value>Url to the icon for the allergen / ingredient</value>
+        [DataMember(Name="IconUrl", EmitDefaultValue=false)]
+        public string IconUrl { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NutritionInfoLabel {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Values: ").Append(Values).Append("\n");
+            sb.Append("  IconUrl: ").Append(IconUrl).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NutritionInfoLabel);
+        }
+
+        /// <summary>
+        /// Returns true if NutritionInfoLabel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of NutritionInfoLabel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(NutritionInfoLabel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Values == input.Values ||
+                    this.Values != null &&
+                    this.Values.SequenceEqual(input.Values)
+                ) && 
+                (
+                    this.IconUrl == input.IconUrl ||
+                    (this.IconUrl != null &&
+                    this.IconUrl.Equals(input.IconUrl))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Values != null)
+                    hashCode = hashCode * 59 + this.Values.GetHashCode();
+                if (this.IconUrl != null)
+                    hashCode = hashCode * 59 + this.IconUrl.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/NutritionInfoMenuItem.cs b/src/Flipdish/Model/NutritionInfoMenuItem.cs
new file mode 100644
index 00000000..742c444f
--- /dev/null
+++ b/src/Flipdish/Model/NutritionInfoMenuItem.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// NutritionInfoMenuItem.
+    /// </summary>
+    [DataContract]
+    public partial class NutritionInfoMenuItem :  IEquatable<NutritionInfoMenuItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NutritionInfoMenuItem" /> class.
+        /// </summary>
+        /// <param name="publicId">Menu item public id.</param>
+        /// <param name="labels">List of Nutrition Info Labels for this menu item.</param>
+        public NutritionInfoMenuItem(Guid? publicId = default(Guid?), List<NutritionInfoLabel> labels = default(List<NutritionInfoLabel>))
+        {
+            this.PublicId = publicId;
+            this.Labels = labels;
+        }
+        
+        /// <summary>
+        /// Menu item public id
+        /// </summary>
+        /// <value>Menu item public id</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
+        /// <summary>
+        /// List of Nutrition Info Labels for this menu item
+        /// </summary>
+        /// <value>List of Nutrition Info Labels for this menu item</value>
+        [DataMember(Name="Labels", EmitDefaultValue=false)]
+        public List<NutritionInfoLabel> Labels { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NutritionInfoMenuItem {\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
+            sb.Append("  Labels: ").Append(Labels).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NutritionInfoMenuItem);
+        }
+
+        /// <summary>
+        /// Returns true if NutritionInfoMenuItem instances are equal
+        /// </summary>
+        /// <param name="input">Instance of NutritionInfoMenuItem to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(NutritionInfoMenuItem input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
+                ) && 
+                (
+                    this.Labels == input.Labels ||
+                    this.Labels != null &&
+                    this.Labels.SequenceEqual(input.Labels)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
+                if (this.Labels != null)
+                    hashCode = hashCode * 59 + this.Labels.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/NutritionInfoMenuOptionSetItem.cs b/src/Flipdish/Model/NutritionInfoMenuOptionSetItem.cs
new file mode 100644
index 00000000..26f5e2b2
--- /dev/null
+++ b/src/Flipdish/Model/NutritionInfoMenuOptionSetItem.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// NutritionInfoMenuOptionSetItem.
+    /// </summary>
+    [DataContract]
+    public partial class NutritionInfoMenuOptionSetItem :  IEquatable<NutritionInfoMenuOptionSetItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NutritionInfoMenuOptionSetItem" /> class.
+        /// </summary>
+        /// <param name="publicId">Menu item option set item public id.</param>
+        /// <param name="labels">List of Nutrition Info Labels for this menu item option set item.</param>
+        public NutritionInfoMenuOptionSetItem(Guid? publicId = default(Guid?), List<NutritionInfoLabel> labels = default(List<NutritionInfoLabel>))
+        {
+            this.PublicId = publicId;
+            this.Labels = labels;
+        }
+        
+        /// <summary>
+        /// Menu item option set item public id
+        /// </summary>
+        /// <value>Menu item option set item public id</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
+        /// <summary>
+        /// List of Nutrition Info Labels for this menu item option set item
+        /// </summary>
+        /// <value>List of Nutrition Info Labels for this menu item option set item</value>
+        [DataMember(Name="Labels", EmitDefaultValue=false)]
+        public List<NutritionInfoLabel> Labels { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NutritionInfoMenuOptionSetItem {\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
+            sb.Append("  Labels: ").Append(Labels).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NutritionInfoMenuOptionSetItem);
+        }
+
+        /// <summary>
+        /// Returns true if NutritionInfoMenuOptionSetItem instances are equal
+        /// </summary>
+        /// <param name="input">Instance of NutritionInfoMenuOptionSetItem to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(NutritionInfoMenuOptionSetItem input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
+                ) && 
+                (
+                    this.Labels == input.Labels ||
+                    this.Labels != null &&
+                    this.Labels.SequenceEqual(input.Labels)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
+                if (this.Labels != null)
+                    hashCode = hashCode * 59 + this.Labels.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/NutritionInfoV2.cs b/src/Flipdish/Model/NutritionInfoV2.cs
new file mode 100644
index 00000000..012dd2bc
--- /dev/null
+++ b/src/Flipdish/Model/NutritionInfoV2.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Menu Nutrition Information. Version 2 (localized).
+    /// </summary>
+    [DataContract]
+    public partial class NutritionInfoV2 :  IEquatable<NutritionInfoV2>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NutritionInfoV2" /> class.
+        /// </summary>
+        /// <param name="menuItems">List of menu item nutrition infos.</param>
+        /// <param name="menuItemOptionSetItems">List of menu item option set nutrition infos.</param>
+        /// <param name="imageBaseUrl">Base url for allergen images.</param>
+        public NutritionInfoV2(List<NutritionInfoV2Item> menuItems = default(List<NutritionInfoV2Item>), List<NutritionInfoV2Item> menuItemOptionSetItems = default(List<NutritionInfoV2Item>), string imageBaseUrl = default(string))
+        {
+            this.MenuItems = menuItems;
+            this.MenuItemOptionSetItems = menuItemOptionSetItems;
+            this.ImageBaseUrl = imageBaseUrl;
+        }
+        
+        /// <summary>
+        /// List of menu item nutrition infos
+        /// </summary>
+        /// <value>List of menu item nutrition infos</value>
+        [DataMember(Name="MenuItems", EmitDefaultValue=false)]
+        public List<NutritionInfoV2Item> MenuItems { get; set; }
+
+        /// <summary>
+        /// List of menu item option set nutrition infos
+        /// </summary>
+        /// <value>List of menu item option set nutrition infos</value>
+        [DataMember(Name="MenuItemOptionSetItems", EmitDefaultValue=false)]
+        public List<NutritionInfoV2Item> MenuItemOptionSetItems { get; set; }
+
+        /// <summary>
+        /// Base url for allergen images
+        /// </summary>
+        /// <value>Base url for allergen images</value>
+        [DataMember(Name="ImageBaseUrl", EmitDefaultValue=false)]
+        public string ImageBaseUrl { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NutritionInfoV2 {\n");
+            sb.Append("  MenuItems: ").Append(MenuItems).Append("\n");
+            sb.Append("  MenuItemOptionSetItems: ").Append(MenuItemOptionSetItems).Append("\n");
+            sb.Append("  ImageBaseUrl: ").Append(ImageBaseUrl).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NutritionInfoV2);
+        }
+
+        /// <summary>
+        /// Returns true if NutritionInfoV2 instances are equal
+        /// </summary>
+        /// <param name="input">Instance of NutritionInfoV2 to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(NutritionInfoV2 input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.MenuItems == input.MenuItems ||
+                    this.MenuItems != null &&
+                    this.MenuItems.SequenceEqual(input.MenuItems)
+                ) && 
+                (
+                    this.MenuItemOptionSetItems == input.MenuItemOptionSetItems ||
+                    this.MenuItemOptionSetItems != null &&
+                    this.MenuItemOptionSetItems.SequenceEqual(input.MenuItemOptionSetItems)
+                ) && 
+                (
+                    this.ImageBaseUrl == input.ImageBaseUrl ||
+                    (this.ImageBaseUrl != null &&
+                    this.ImageBaseUrl.Equals(input.ImageBaseUrl))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.MenuItems != null)
+                    hashCode = hashCode * 59 + this.MenuItems.GetHashCode();
+                if (this.MenuItemOptionSetItems != null)
+                    hashCode = hashCode * 59 + this.MenuItemOptionSetItems.GetHashCode();
+                if (this.ImageBaseUrl != null)
+                    hashCode = hashCode * 59 + this.ImageBaseUrl.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/NutritionInfoV2Allergen.cs b/src/Flipdish/Model/NutritionInfoV2Allergen.cs
new file mode 100644
index 00000000..52585510
--- /dev/null
+++ b/src/Flipdish/Model/NutritionInfoV2Allergen.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// NutritionInfoV2Allergen.
+    /// </summary>
+    [DataContract]
+    public partial class NutritionInfoV2Allergen :  IEquatable<NutritionInfoV2Allergen>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NutritionInfoV2Allergen" /> class.
+        /// </summary>
+        /// <param name="allergenId">AllergenId (unique string identifier).</param>
+        /// <param name="localizedName">Localized allergen name.</param>
+        /// <param name="imageName">Name of the image file. Append it to ImageBaseUrl to get the full URL.</param>
+        public NutritionInfoV2Allergen(string allergenId = default(string), string localizedName = default(string), string imageName = default(string))
+        {
+            this.AllergenId = allergenId;
+            this.LocalizedName = localizedName;
+            this.ImageName = imageName;
+        }
+        
+        /// <summary>
+        /// AllergenId (unique string identifier)
+        /// </summary>
+        /// <value>AllergenId (unique string identifier)</value>
+        [DataMember(Name="AllergenId", EmitDefaultValue=false)]
+        public string AllergenId { get; set; }
+
+        /// <summary>
+        /// Localized allergen name
+        /// </summary>
+        /// <value>Localized allergen name</value>
+        [DataMember(Name="LocalizedName", EmitDefaultValue=false)]
+        public string LocalizedName { get; set; }
+
+        /// <summary>
+        /// Name of the image file. Append it to ImageBaseUrl to get the full URL
+        /// </summary>
+        /// <value>Name of the image file. Append it to ImageBaseUrl to get the full URL</value>
+        [DataMember(Name="ImageName", EmitDefaultValue=false)]
+        public string ImageName { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NutritionInfoV2Allergen {\n");
+            sb.Append("  AllergenId: ").Append(AllergenId).Append("\n");
+            sb.Append("  LocalizedName: ").Append(LocalizedName).Append("\n");
+            sb.Append("  ImageName: ").Append(ImageName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NutritionInfoV2Allergen);
+        }
+
+        /// <summary>
+        /// Returns true if NutritionInfoV2Allergen instances are equal
+        /// </summary>
+        /// <param name="input">Instance of NutritionInfoV2Allergen to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(NutritionInfoV2Allergen input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.AllergenId == input.AllergenId ||
+                    (this.AllergenId != null &&
+                    this.AllergenId.Equals(input.AllergenId))
+                ) && 
+                (
+                    this.LocalizedName == input.LocalizedName ||
+                    (this.LocalizedName != null &&
+                    this.LocalizedName.Equals(input.LocalizedName))
+                ) && 
+                (
+                    this.ImageName == input.ImageName ||
+                    (this.ImageName != null &&
+                    this.ImageName.Equals(input.ImageName))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.AllergenId != null)
+                    hashCode = hashCode * 59 + this.AllergenId.GetHashCode();
+                if (this.LocalizedName != null)
+                    hashCode = hashCode * 59 + this.LocalizedName.GetHashCode();
+                if (this.ImageName != null)
+                    hashCode = hashCode * 59 + this.ImageName.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/NutritionInfoV2Item.cs b/src/Flipdish/Model/NutritionInfoV2Item.cs
new file mode 100644
index 00000000..eb0536af
--- /dev/null
+++ b/src/Flipdish/Model/NutritionInfoV2Item.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// NutritionInfoV2Item.
+    /// </summary>
+    [DataContract]
+    public partial class NutritionInfoV2Item :  IEquatable<NutritionInfoV2Item>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NutritionInfoV2Item" /> class.
+        /// </summary>
+        /// <param name="publicId">Menu item or menu item option set item public id.</param>
+        /// <param name="allergens">List of allergens for this item.</param>
+        public NutritionInfoV2Item(Guid? publicId = default(Guid?), List<NutritionInfoV2Allergen> allergens = default(List<NutritionInfoV2Allergen>))
+        {
+            this.PublicId = publicId;
+            this.Allergens = allergens;
+        }
+        
+        /// <summary>
+        /// Menu item or menu item option set item public id
+        /// </summary>
+        /// <value>Menu item or menu item option set item public id</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
+        /// <summary>
+        /// List of allergens for this item
+        /// </summary>
+        /// <value>List of allergens for this item</value>
+        [DataMember(Name="Allergens", EmitDefaultValue=false)]
+        public List<NutritionInfoV2Allergen> Allergens { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class NutritionInfoV2Item {\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
+            sb.Append("  Allergens: ").Append(Allergens).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as NutritionInfoV2Item);
+        }
+
+        /// <summary>
+        /// Returns true if NutritionInfoV2Item instances are equal
+        /// </summary>
+        /// <param name="input">Instance of NutritionInfoV2Item to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(NutritionInfoV2Item input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
+                ) && 
+                (
+                    this.Allergens == input.Allergens ||
+                    this.Allergens != null &&
+                    this.Allergens.SequenceEqual(input.Allergens)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
+                if (this.Allergens != null)
+                    hashCode = hashCode * 59 + this.Allergens.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/OAuthApp.cs b/src/Flipdish/Model/OAuthApp.cs
index 6cdcc8d4..058bdb33 100644
--- a/src/Flipdish/Model/OAuthApp.cs
+++ b/src/Flipdish/Model/OAuthApp.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Oauth client (also knowns as &#39;app&#39;)
     /// </summary>
     [DataContract]
-    public partial class OAuthApp :  IEquatable<OAuthApp>, IValidatableObject
+    public partial class OAuthApp :  IEquatable<OAuthApp>
     {
         /// <summary>
         /// Supported OpenID Connect flows
@@ -283,16 +281,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OAuthTokenModel.cs b/src/Flipdish/Model/OAuthTokenModel.cs
index 70c2d1c8..32b61be9 100644
--- a/src/Flipdish/Model/OAuthTokenModel.cs
+++ b/src/Flipdish/Model/OAuthTokenModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// OAuth token model
     /// </summary>
     [DataContract]
-    public partial class OAuthTokenModel :  IEquatable<OAuthTokenModel>, IValidatableObject
+    public partial class OAuthTokenModel :  IEquatable<OAuthTokenModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OAuthTokenModel" /> class.
@@ -178,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OauthClientRedirectUri.cs b/src/Flipdish/Model/OauthClientRedirectUri.cs
index a4db284a..454e0724 100644
--- a/src/Flipdish/Model/OauthClientRedirectUri.cs
+++ b/src/Flipdish/Model/OauthClientRedirectUri.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// OAuth client redirect uri
     /// </summary>
     [DataContract]
-    public partial class OauthClientRedirectUri :  IEquatable<OauthClientRedirectUri>, IValidatableObject
+    public partial class OauthClientRedirectUri :  IEquatable<OauthClientRedirectUri>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OauthClientRedirectUri" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ObjectDisplayOrder.cs b/src/Flipdish/Model/ObjectDisplayOrder.cs
index a5d0787e..c691ad90 100644
--- a/src/Flipdish/Model/ObjectDisplayOrder.cs
+++ b/src/Flipdish/Model/ObjectDisplayOrder.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// ObjectDisplayOrder
     /// </summary>
     [DataContract]
-    public partial class ObjectDisplayOrder :  IEquatable<ObjectDisplayOrder>, IValidatableObject
+    public partial class ObjectDisplayOrder :  IEquatable<ObjectDisplayOrder>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectDisplayOrder" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OktaPortalFeatureFlag.cs b/src/Flipdish/Model/OktaPortalFeatureFlag.cs
new file mode 100644
index 00000000..fb1b24b6
--- /dev/null
+++ b/src/Flipdish/Model/OktaPortalFeatureFlag.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Okta Portal Feature Flag Value
+    /// </summary>
+    [DataContract]
+    public partial class OktaPortalFeatureFlag :  IEquatable<OktaPortalFeatureFlag>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OktaPortalFeatureFlag" /> class.
+        /// </summary>
+        /// <param name="oktaPortalEnabled">Feature flag backend_portal_enableOktaWebApi value.</param>
+        public OktaPortalFeatureFlag(bool? oktaPortalEnabled = default(bool?))
+        {
+            this.OktaPortalEnabled = oktaPortalEnabled;
+        }
+        
+        /// <summary>
+        /// Feature flag backend_portal_enableOktaWebApi value
+        /// </summary>
+        /// <value>Feature flag backend_portal_enableOktaWebApi value</value>
+        [DataMember(Name="OktaPortalEnabled", EmitDefaultValue=false)]
+        public bool? OktaPortalEnabled { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class OktaPortalFeatureFlag {\n");
+            sb.Append("  OktaPortalEnabled: ").Append(OktaPortalEnabled).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as OktaPortalFeatureFlag);
+        }
+
+        /// <summary>
+        /// Returns true if OktaPortalFeatureFlag instances are equal
+        /// </summary>
+        /// <param name="input">Instance of OktaPortalFeatureFlag to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(OktaPortalFeatureFlag input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.OktaPortalEnabled == input.OktaPortalEnabled ||
+                    (this.OktaPortalEnabled != null &&
+                    this.OktaPortalEnabled.Equals(input.OktaPortalEnabled))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.OktaPortalEnabled != null)
+                    hashCode = hashCode * 59 + this.OktaPortalEnabled.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/OnboardingConfigUpdate.cs b/src/Flipdish/Model/OnboardingConfigUpdate.cs
index 62ac9094..eeca13ee 100644
--- a/src/Flipdish/Model/OnboardingConfigUpdate.cs
+++ b/src/Flipdish/Model/OnboardingConfigUpdate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,17 +26,46 @@ namespace Flipdish.Model
     /// Model for updating the onboarding config
     /// </summary>
     [DataContract]
-    public partial class OnboardingConfigUpdate :  IEquatable<OnboardingConfigUpdate>, IValidatableObject
+    public partial class OnboardingConfigUpdate :  IEquatable<OnboardingConfigUpdate>
     {
+        /// <summary>
+        /// Onboarding config type
+        /// </summary>
+        /// <value>Onboarding config type</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ConfigTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Tutorial for value: Tutorial
+            /// </summary>
+            [EnumMember(Value = "Tutorial")]
+            Tutorial = 1,
+            
+            /// <summary>
+            /// Enum OnboardingWizard for value: OnboardingWizard
+            /// </summary>
+            [EnumMember(Value = "OnboardingWizard")]
+            OnboardingWizard = 2
+        }
+
+        /// <summary>
+        /// Onboarding config type
+        /// </summary>
+        /// <value>Onboarding config type</value>
+        [DataMember(Name="ConfigType", EmitDefaultValue=false)]
+        public ConfigTypeEnum? ConfigType { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="OnboardingConfigUpdate" /> class.
         /// </summary>
         /// <param name="isEnabled">Gets or sets whether onboarding is enabled.</param>
-        /// <param name="isWelcomeScreenEnabled">isWelcomeScreenEnabled.</param>
-        public OnboardingConfigUpdate(bool? isEnabled = default(bool?), bool? isWelcomeScreenEnabled = default(bool?))
+        /// <param name="isWelcomeScreenEnabled">Gets or sets whether welcome screen is enabled.</param>
+        /// <param name="configType">Onboarding config type.</param>
+        public OnboardingConfigUpdate(bool? isEnabled = default(bool?), bool? isWelcomeScreenEnabled = default(bool?), ConfigTypeEnum? configType = default(ConfigTypeEnum?))
         {
             this.IsEnabled = isEnabled;
             this.IsWelcomeScreenEnabled = isWelcomeScreenEnabled;
+            this.ConfigType = configType;
         }
         
         /// <summary>
@@ -49,11 +76,13 @@ public partial class OnboardingConfigUpdate :  IEquatable<OnboardingConfigUpdate
         public bool? IsEnabled { get; set; }
 
         /// <summary>
-        /// Gets or Sets IsWelcomeScreenEnabled
+        /// Gets or sets whether welcome screen is enabled
         /// </summary>
+        /// <value>Gets or sets whether welcome screen is enabled</value>
         [DataMember(Name="IsWelcomeScreenEnabled", EmitDefaultValue=false)]
         public bool? IsWelcomeScreenEnabled { get; set; }
 
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -64,6 +93,7 @@ public override string ToString()
             sb.Append("class OnboardingConfigUpdate {\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
             sb.Append("  IsWelcomeScreenEnabled: ").Append(IsWelcomeScreenEnabled).Append("\n");
+            sb.Append("  ConfigType: ").Append(ConfigType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -107,6 +137,11 @@ public bool Equals(OnboardingConfigUpdate input)
                     this.IsWelcomeScreenEnabled == input.IsWelcomeScreenEnabled ||
                     (this.IsWelcomeScreenEnabled != null &&
                     this.IsWelcomeScreenEnabled.Equals(input.IsWelcomeScreenEnabled))
+                ) && 
+                (
+                    this.ConfigType == input.ConfigType ||
+                    (this.ConfigType != null &&
+                    this.ConfigType.Equals(input.ConfigType))
                 );
         }
 
@@ -123,19 +158,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
                 if (this.IsWelcomeScreenEnabled != null)
                     hashCode = hashCode * 59 + this.IsWelcomeScreenEnabled.GetHashCode();
+                if (this.ConfigType != null)
+                    hashCode = hashCode * 59 + this.ConfigType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OnboardingItemUpdate.cs b/src/Flipdish/Model/OnboardingItemUpdate.cs
index 56f92333..b8f78904 100644
--- a/src/Flipdish/Model/OnboardingItemUpdate.cs
+++ b/src/Flipdish/Model/OnboardingItemUpdate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// OnboardingItemUpdate
     /// </summary>
     [DataContract]
-    public partial class OnboardingItemUpdate :  IEquatable<OnboardingItemUpdate>, IValidatableObject
+    public partial class OnboardingItemUpdate :  IEquatable<OnboardingItemUpdate>
     {
         /// <summary>
         /// Completion Status for Onboarding Item
@@ -137,16 +135,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Order.cs b/src/Flipdish/Model/Order.cs
index 28f2ba83..2781b5d8 100644
--- a/src/Flipdish/Model/Order.cs
+++ b/src/Flipdish/Model/Order.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order
     /// </summary>
     [DataContract]
-    public partial class Order :  IEquatable<Order>, IValidatableObject
+    public partial class Order :  IEquatable<Order>
     {
         /// <summary>
         /// Delivery type
@@ -225,7 +223,13 @@ public enum PaymentAccountTypeEnum
             /// Enum PayGreen for value: PayGreen
             /// </summary>
             [EnumMember(Value = "PayGreen")]
-            PayGreen = 9
+            PayGreen = 9,
+            
+            /// <summary>
+            /// Enum GoogleWalletToken for value: GoogleWalletToken
+            /// </summary>
+            [EnumMember(Value = "GoogleWalletToken")]
+            GoogleWalletToken = 10
         }
 
         /// <summary>
@@ -318,7 +322,13 @@ public enum OrderStateEnum
             /// Enum AcceptedAndRefunded for value: AcceptedAndRefunded
             /// </summary>
             [EnumMember(Value = "AcceptedAndRefunded")]
-            AcceptedAndRefunded = 13
+            AcceptedAndRefunded = 13,
+            
+            /// <summary>
+            /// Enum PendingPayment for value: PendingPayment
+            /// </summary>
+            [EnumMember(Value = "PendingPayment")]
+            PendingPayment = 14
         }
 
         /// <summary>
@@ -605,9 +615,11 @@ public enum DeliveryTrackingStatusEnum
         /// <param name="channelOrderId">ChannelOrderId from external channel.</param>
         /// <param name="channelOrderDisplayId">ChannelOrderDisplayId from external channel.</param>
         /// <param name="channel">Channel where the Order comes from.</param>
-        /// <param name="receiptCode">Generated receipt code for an order.</param>
         /// <param name="orderDropOffLocation">DropOffLocation selected for this order.</param>
         /// <param name="fulfillmentStatus">[BETA - this is a new field in development] Fulfillment status for this order.</param>
+        /// <param name="orderBatchInfo">OrderBatch information.</param>
+        /// <param name="taxItems">A collection of tax items on the order..</param>
+        /// <param name="createdCampaignVoucherId">The id of the campaign voucher that was created from this order.</param>
         /// <param name="orderId">Order identifier.</param>
         /// <param name="localOrderId">Local order Id. This is used for displaying a \&quot;shorter\&quot; order ID for customers (eg. Kiosk orders).</param>
         /// <param name="deliveryType">Delivery type.</param>
@@ -636,7 +648,10 @@ public enum DeliveryTrackingStatusEnum
         /// <param name="driverId">Assigned driver identifier.</param>
         /// <param name="totalTax">Total tax applied to order.</param>
         /// <param name="orderTrackingCode">Unique, 6 character long alpha numeric code for tracking..</param>
-        public Order(StoreSummary store = default(StoreSummary), CustomerSummary customer = default(CustomerSummary), OrderVoucherSummary voucher = default(OrderVoucherSummary), FeeSummary fees = default(FeeSummary), List<OrderItem> orderItems = default(List<OrderItem>), DeliveryLocation deliveryLocation = default(DeliveryLocation), Coordinates customerLocation = default(Coordinates), MaskedPhoneNumber maskedPhoneNumber = default(MaskedPhoneNumber), int? dropOffLocationId = default(int?), string dropOffLocation = default(string), DateTime? acceptedFor = default(DateTime?), bool? inFraudZone = default(bool?), bool? unusualHighValueOrder = default(bool?), int? rejectedByUserId = default(int?), string channelOrderId = default(string), string channelOrderDisplayId = default(string), Channel channel = default(Channel), string receiptCode = default(string), OrderDropOffLocation orderDropOffLocation = default(OrderDropOffLocation), OrderFulfillmentStatusBase fulfillmentStatus = default(OrderFulfillmentStatusBase), int? orderId = default(int?), string localOrderId = default(string), DeliveryTypeEnum? deliveryType = default(DeliveryTypeEnum?), PickupLocationTypeEnum? pickupLocationType = default(PickupLocationTypeEnum?), TableServiceCatagoryEnum? tableServiceCatagory = default(TableServiceCatagoryEnum?), double? tipAmount = default(double?), double? deliveryAmount = default(double?), double? orderItemsAmount = default(double?), double? serviceChargeAmount = default(double?), double? serviceChargePercentage = default(double?), double? amount = default(double?), double? processingFee = default(double?), PaymentAccountTypeEnum? paymentAccountType = default(PaymentAccountTypeEnum?), string paymentAccountDescription = default(string), OrderStateEnum? orderState = default(OrderStateEnum?), bool? isPreOrder = default(bool?), DateTime? placedTime = default(DateTime?), DateTime? requestedForTime = default(DateTime?), string chefNote = default(string), AppTypeEnum? appType = default(AppTypeEnum?), int? userRating = default(int?), PaymentStatusEnum? paymentStatus = default(PaymentStatusEnum?), RejectionReasonEnum? rejectionReason = default(RejectionReasonEnum?), double? refundedAmount = default(double?), DeliveryTrackingStatusEnum? deliveryTrackingStatus = default(DeliveryTrackingStatusEnum?), int? driverId = default(int?), double? totalTax = default(double?), string orderTrackingCode = default(string))
+        /// <param name="deliveryFeeAreaId">Delivery area identifier.</param>
+        /// <param name="receiptCode">Code used to view the order&#39;s receipt.</param>
+        /// <param name="totalDepositReturnFeeAmount">This contains the total deposit return fee amount for the order..</param>
+        public Order(StoreSummary store = default(StoreSummary), CustomerSummary customer = default(CustomerSummary), OrderVoucherSummary voucher = default(OrderVoucherSummary), FeeSummary fees = default(FeeSummary), List<OrderItem> orderItems = default(List<OrderItem>), DeliveryLocation deliveryLocation = default(DeliveryLocation), Coordinates customerLocation = default(Coordinates), MaskedPhoneNumber maskedPhoneNumber = default(MaskedPhoneNumber), int? dropOffLocationId = default(int?), string dropOffLocation = default(string), DateTime? acceptedFor = default(DateTime?), bool? inFraudZone = default(bool?), bool? unusualHighValueOrder = default(bool?), int? rejectedByUserId = default(int?), string channelOrderId = default(string), string channelOrderDisplayId = default(string), Channel channel = default(Channel), OrderDropOffLocation orderDropOffLocation = default(OrderDropOffLocation), OrderFulfillmentStatusBase fulfillmentStatus = default(OrderFulfillmentStatusBase), OrderBatchSummary orderBatchInfo = default(OrderBatchSummary), List<TaxItem> taxItems = default(List<TaxItem>), int? createdCampaignVoucherId = default(int?), int? orderId = default(int?), string localOrderId = default(string), DeliveryTypeEnum? deliveryType = default(DeliveryTypeEnum?), PickupLocationTypeEnum? pickupLocationType = default(PickupLocationTypeEnum?), TableServiceCatagoryEnum? tableServiceCatagory = default(TableServiceCatagoryEnum?), double? tipAmount = default(double?), double? deliveryAmount = default(double?), double? orderItemsAmount = default(double?), double? serviceChargeAmount = default(double?), double? serviceChargePercentage = default(double?), double? amount = default(double?), double? processingFee = default(double?), PaymentAccountTypeEnum? paymentAccountType = default(PaymentAccountTypeEnum?), string paymentAccountDescription = default(string), OrderStateEnum? orderState = default(OrderStateEnum?), bool? isPreOrder = default(bool?), DateTime? placedTime = default(DateTime?), DateTime? requestedForTime = default(DateTime?), string chefNote = default(string), AppTypeEnum? appType = default(AppTypeEnum?), int? userRating = default(int?), PaymentStatusEnum? paymentStatus = default(PaymentStatusEnum?), RejectionReasonEnum? rejectionReason = default(RejectionReasonEnum?), double? refundedAmount = default(double?), DeliveryTrackingStatusEnum? deliveryTrackingStatus = default(DeliveryTrackingStatusEnum?), int? driverId = default(int?), double? totalTax = default(double?), string orderTrackingCode = default(string), int? deliveryFeeAreaId = default(int?), string receiptCode = default(string), double? totalDepositReturnFeeAmount = default(double?))
         {
             this.Store = store;
             this.Customer = customer;
@@ -655,9 +670,11 @@ public enum DeliveryTrackingStatusEnum
             this.ChannelOrderId = channelOrderId;
             this.ChannelOrderDisplayId = channelOrderDisplayId;
             this.Channel = channel;
-            this.ReceiptCode = receiptCode;
             this.OrderDropOffLocation = orderDropOffLocation;
             this.FulfillmentStatus = fulfillmentStatus;
+            this.OrderBatchInfo = orderBatchInfo;
+            this.TaxItems = taxItems;
+            this.CreatedCampaignVoucherId = createdCampaignVoucherId;
             this.OrderId = orderId;
             this.LocalOrderId = localOrderId;
             this.DeliveryType = deliveryType;
@@ -686,6 +703,9 @@ public enum DeliveryTrackingStatusEnum
             this.DriverId = driverId;
             this.TotalTax = totalTax;
             this.OrderTrackingCode = orderTrackingCode;
+            this.DeliveryFeeAreaId = deliveryFeeAreaId;
+            this.ReceiptCode = receiptCode;
+            this.TotalDepositReturnFeeAmount = totalDepositReturnFeeAmount;
         }
         
         /// <summary>
@@ -807,13 +827,6 @@ public enum DeliveryTrackingStatusEnum
         [DataMember(Name="Channel", EmitDefaultValue=false)]
         public Channel Channel { get; set; }
 
-        /// <summary>
-        /// Generated receipt code for an order
-        /// </summary>
-        /// <value>Generated receipt code for an order</value>
-        [DataMember(Name="ReceiptCode", EmitDefaultValue=false)]
-        public string ReceiptCode { get; set; }
-
         /// <summary>
         /// DropOffLocation selected for this order
         /// </summary>
@@ -828,6 +841,27 @@ public enum DeliveryTrackingStatusEnum
         [DataMember(Name="FulfillmentStatus", EmitDefaultValue=false)]
         public OrderFulfillmentStatusBase FulfillmentStatus { get; set; }
 
+        /// <summary>
+        /// OrderBatch information
+        /// </summary>
+        /// <value>OrderBatch information</value>
+        [DataMember(Name="OrderBatchInfo", EmitDefaultValue=false)]
+        public OrderBatchSummary OrderBatchInfo { get; set; }
+
+        /// <summary>
+        /// A collection of tax items on the order.
+        /// </summary>
+        /// <value>A collection of tax items on the order.</value>
+        [DataMember(Name="TaxItems", EmitDefaultValue=false)]
+        public List<TaxItem> TaxItems { get; set; }
+
+        /// <summary>
+        /// The id of the campaign voucher that was created from this order
+        /// </summary>
+        /// <value>The id of the campaign voucher that was created from this order</value>
+        [DataMember(Name="CreatedCampaignVoucherId", EmitDefaultValue=false)]
+        public int? CreatedCampaignVoucherId { get; set; }
+
         /// <summary>
         /// Order identifier
         /// </summary>
@@ -970,6 +1004,27 @@ public enum DeliveryTrackingStatusEnum
         [DataMember(Name="OrderTrackingCode", EmitDefaultValue=false)]
         public string OrderTrackingCode { get; set; }
 
+        /// <summary>
+        /// Delivery area identifier
+        /// </summary>
+        /// <value>Delivery area identifier</value>
+        [DataMember(Name="DeliveryFeeAreaId", EmitDefaultValue=false)]
+        public int? DeliveryFeeAreaId { get; set; }
+
+        /// <summary>
+        /// Code used to view the order&#39;s receipt
+        /// </summary>
+        /// <value>Code used to view the order&#39;s receipt</value>
+        [DataMember(Name="ReceiptCode", EmitDefaultValue=false)]
+        public string ReceiptCode { get; set; }
+
+        /// <summary>
+        /// This contains the total deposit return fee amount for the order.
+        /// </summary>
+        /// <value>This contains the total deposit return fee amount for the order.</value>
+        [DataMember(Name="TotalDepositReturnFeeAmount", EmitDefaultValue=false)]
+        public double? TotalDepositReturnFeeAmount { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -995,9 +1050,11 @@ public override string ToString()
             sb.Append("  ChannelOrderId: ").Append(ChannelOrderId).Append("\n");
             sb.Append("  ChannelOrderDisplayId: ").Append(ChannelOrderDisplayId).Append("\n");
             sb.Append("  Channel: ").Append(Channel).Append("\n");
-            sb.Append("  ReceiptCode: ").Append(ReceiptCode).Append("\n");
             sb.Append("  OrderDropOffLocation: ").Append(OrderDropOffLocation).Append("\n");
             sb.Append("  FulfillmentStatus: ").Append(FulfillmentStatus).Append("\n");
+            sb.Append("  OrderBatchInfo: ").Append(OrderBatchInfo).Append("\n");
+            sb.Append("  TaxItems: ").Append(TaxItems).Append("\n");
+            sb.Append("  CreatedCampaignVoucherId: ").Append(CreatedCampaignVoucherId).Append("\n");
             sb.Append("  OrderId: ").Append(OrderId).Append("\n");
             sb.Append("  LocalOrderId: ").Append(LocalOrderId).Append("\n");
             sb.Append("  DeliveryType: ").Append(DeliveryType).Append("\n");
@@ -1026,6 +1083,9 @@ public override string ToString()
             sb.Append("  DriverId: ").Append(DriverId).Append("\n");
             sb.Append("  TotalTax: ").Append(TotalTax).Append("\n");
             sb.Append("  OrderTrackingCode: ").Append(OrderTrackingCode).Append("\n");
+            sb.Append("  DeliveryFeeAreaId: ").Append(DeliveryFeeAreaId).Append("\n");
+            sb.Append("  ReceiptCode: ").Append(ReceiptCode).Append("\n");
+            sb.Append("  TotalDepositReturnFeeAmount: ").Append(TotalDepositReturnFeeAmount).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -1145,11 +1205,6 @@ public bool Equals(Order input)
                     (this.Channel != null &&
                     this.Channel.Equals(input.Channel))
                 ) && 
-                (
-                    this.ReceiptCode == input.ReceiptCode ||
-                    (this.ReceiptCode != null &&
-                    this.ReceiptCode.Equals(input.ReceiptCode))
-                ) && 
                 (
                     this.OrderDropOffLocation == input.OrderDropOffLocation ||
                     (this.OrderDropOffLocation != null &&
@@ -1160,6 +1215,21 @@ public bool Equals(Order input)
                     (this.FulfillmentStatus != null &&
                     this.FulfillmentStatus.Equals(input.FulfillmentStatus))
                 ) && 
+                (
+                    this.OrderBatchInfo == input.OrderBatchInfo ||
+                    (this.OrderBatchInfo != null &&
+                    this.OrderBatchInfo.Equals(input.OrderBatchInfo))
+                ) && 
+                (
+                    this.TaxItems == input.TaxItems ||
+                    this.TaxItems != null &&
+                    this.TaxItems.SequenceEqual(input.TaxItems)
+                ) && 
+                (
+                    this.CreatedCampaignVoucherId == input.CreatedCampaignVoucherId ||
+                    (this.CreatedCampaignVoucherId != null &&
+                    this.CreatedCampaignVoucherId.Equals(input.CreatedCampaignVoucherId))
+                ) && 
                 (
                     this.OrderId == input.OrderId ||
                     (this.OrderId != null &&
@@ -1299,6 +1369,21 @@ public bool Equals(Order input)
                     this.OrderTrackingCode == input.OrderTrackingCode ||
                     (this.OrderTrackingCode != null &&
                     this.OrderTrackingCode.Equals(input.OrderTrackingCode))
+                ) && 
+                (
+                    this.DeliveryFeeAreaId == input.DeliveryFeeAreaId ||
+                    (this.DeliveryFeeAreaId != null &&
+                    this.DeliveryFeeAreaId.Equals(input.DeliveryFeeAreaId))
+                ) && 
+                (
+                    this.ReceiptCode == input.ReceiptCode ||
+                    (this.ReceiptCode != null &&
+                    this.ReceiptCode.Equals(input.ReceiptCode))
+                ) && 
+                (
+                    this.TotalDepositReturnFeeAmount == input.TotalDepositReturnFeeAmount ||
+                    (this.TotalDepositReturnFeeAmount != null &&
+                    this.TotalDepositReturnFeeAmount.Equals(input.TotalDepositReturnFeeAmount))
                 );
         }
 
@@ -1345,12 +1430,16 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ChannelOrderDisplayId.GetHashCode();
                 if (this.Channel != null)
                     hashCode = hashCode * 59 + this.Channel.GetHashCode();
-                if (this.ReceiptCode != null)
-                    hashCode = hashCode * 59 + this.ReceiptCode.GetHashCode();
                 if (this.OrderDropOffLocation != null)
                     hashCode = hashCode * 59 + this.OrderDropOffLocation.GetHashCode();
                 if (this.FulfillmentStatus != null)
                     hashCode = hashCode * 59 + this.FulfillmentStatus.GetHashCode();
+                if (this.OrderBatchInfo != null)
+                    hashCode = hashCode * 59 + this.OrderBatchInfo.GetHashCode();
+                if (this.TaxItems != null)
+                    hashCode = hashCode * 59 + this.TaxItems.GetHashCode();
+                if (this.CreatedCampaignVoucherId != null)
+                    hashCode = hashCode * 59 + this.CreatedCampaignVoucherId.GetHashCode();
                 if (this.OrderId != null)
                     hashCode = hashCode * 59 + this.OrderId.GetHashCode();
                 if (this.LocalOrderId != null)
@@ -1407,19 +1496,15 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.TotalTax.GetHashCode();
                 if (this.OrderTrackingCode != null)
                     hashCode = hashCode * 59 + this.OrderTrackingCode.GetHashCode();
+                if (this.DeliveryFeeAreaId != null)
+                    hashCode = hashCode * 59 + this.DeliveryFeeAreaId.GetHashCode();
+                if (this.ReceiptCode != null)
+                    hashCode = hashCode * 59 + this.ReceiptCode.GetHashCode();
+                if (this.TotalDepositReturnFeeAmount != null)
+                    hashCode = hashCode * 59 + this.TotalDepositReturnFeeAmount.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderAcceptedEvent.cs b/src/Flipdish/Model/OrderAcceptedEvent.cs
index fc2baa69..16c8cea1 100644
--- a/src/Flipdish/Model/OrderAcceptedEvent.cs
+++ b/src/Flipdish/Model/OrderAcceptedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,31 +26,39 @@ namespace Flipdish.Model
     /// Order Accepted Event
     /// </summary>
     [DataContract]
-    public partial class OrderAcceptedEvent :  IEquatable<OrderAcceptedEvent>, IValidatableObject
+    public partial class OrderAcceptedEvent :  IEquatable<OrderAcceptedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderAcceptedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="description">Description.</param>
         /// <param name="orderAcceptedTime">Order Accepted Time.</param>
+        /// <param name="user">User who has accepted the order.</param>
         /// <param name="order">Order.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderAcceptedEvent(string eventName = default(string), string description = default(string), DateTime? orderAcceptedTime = default(DateTime?), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderAcceptedEvent(string eventName = default(string), string orgId = default(string), string description = default(string), DateTime? orderAcceptedTime = default(DateTime?), UserEventInfo user = default(UserEventInfo), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.Description = description;
             this.OrderAcceptedTime = orderAcceptedTime;
+            this.User = user;
             this.Order = order;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -62,6 +68,13 @@ public partial class OrderAcceptedEvent :  IEquatable<OrderAcceptedEvent>, IVali
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Description
         /// </summary>
@@ -76,6 +89,13 @@ public partial class OrderAcceptedEvent :  IEquatable<OrderAcceptedEvent>, IVali
         [DataMember(Name="OrderAcceptedTime", EmitDefaultValue=false)]
         public DateTime? OrderAcceptedTime { get; set; }
 
+        /// <summary>
+        /// User who has accepted the order
+        /// </summary>
+        /// <value>User who has accepted the order</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// Order
         /// </summary>
@@ -118,6 +138,20 @@ public partial class OrderAcceptedEvent :  IEquatable<OrderAcceptedEvent>, IVali
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -127,14 +161,18 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class OrderAcceptedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  OrderAcceptedTime: ").Append(OrderAcceptedTime).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  Order: ").Append(Order).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,6 +212,11 @@ public bool Equals(OrderAcceptedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.Description == input.Description ||
                     (this.Description != null &&
@@ -184,6 +227,11 @@ public bool Equals(OrderAcceptedEvent input)
                     (this.OrderAcceptedTime != null &&
                     this.OrderAcceptedTime.Equals(input.OrderAcceptedTime))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.Order == input.Order ||
                     (this.Order != null &&
@@ -213,6 +261,16 @@ public bool Equals(OrderAcceptedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -227,10 +285,14 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.Description != null)
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
                 if (this.OrderAcceptedTime != null)
                     hashCode = hashCode * 59 + this.OrderAcceptedTime.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.Order != null)
                     hashCode = hashCode * 59 + this.Order.GetHashCode();
                 if (this.FlipdishEventId != null)
@@ -243,19 +305,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderBatch.cs b/src/Flipdish/Model/OrderBatch.cs
index c391d535..80bc9e8f 100644
--- a/src/Flipdish/Model/OrderBatch.cs
+++ b/src/Flipdish/Model/OrderBatch.cs
@@ -12,41 +12,46 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Order batch
+    /// Order batch detailed information
     /// </summary>
     [DataContract]
-    public partial class OrderBatch :  IEquatable<OrderBatch>, IValidatableObject
+    public partial class OrderBatch :  IEquatable<OrderBatch>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderBatch" /> class.
         /// </summary>
+        /// <param name="orderIds">Orders&#39; ids on the batch.</param>
         /// <param name="id">Order batch id.</param>
         /// <param name="displayCode">Order batch 6-sign human readable code.</param>
         /// <param name="createTime">Batch creation date and time.</param>
         /// <param name="isPublished">If the batch is already published.</param>
-        /// <param name="orderIds">Orders&#39; ids on the batch.</param>
-        public OrderBatch(int? id = default(int?), string displayCode = default(string), DateTime? createTime = default(DateTime?), bool? isPublished = default(bool?), List<int?> orderIds = default(List<int?>))
+        public OrderBatch(List<int?> orderIds = default(List<int?>), int? id = default(int?), string displayCode = default(string), DateTime? createTime = default(DateTime?), bool? isPublished = default(bool?))
         {
+            this.OrderIds = orderIds;
             this.Id = id;
             this.DisplayCode = displayCode;
             this.CreateTime = createTime;
             this.IsPublished = isPublished;
-            this.OrderIds = orderIds;
         }
         
+        /// <summary>
+        /// Orders&#39; ids on the batch
+        /// </summary>
+        /// <value>Orders&#39; ids on the batch</value>
+        [DataMember(Name="OrderIds", EmitDefaultValue=false)]
+        public List<int?> OrderIds { get; set; }
+
         /// <summary>
         /// Order batch id
         /// </summary>
@@ -75,13 +80,6 @@ public partial class OrderBatch :  IEquatable<OrderBatch>, IValidatableObject
         [DataMember(Name="IsPublished", EmitDefaultValue=false)]
         public bool? IsPublished { get; set; }
 
-        /// <summary>
-        /// Orders&#39; ids on the batch
-        /// </summary>
-        /// <value>Orders&#39; ids on the batch</value>
-        [DataMember(Name="OrderIds", EmitDefaultValue=false)]
-        public List<int?> OrderIds { get; set; }
-
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -90,11 +88,11 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class OrderBatch {\n");
+            sb.Append("  OrderIds: ").Append(OrderIds).Append("\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  DisplayCode: ").Append(DisplayCode).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  IsPublished: ").Append(IsPublished).Append("\n");
-            sb.Append("  OrderIds: ").Append(OrderIds).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -129,6 +127,11 @@ public bool Equals(OrderBatch input)
                 return false;
 
             return 
+                (
+                    this.OrderIds == input.OrderIds ||
+                    this.OrderIds != null &&
+                    this.OrderIds.SequenceEqual(input.OrderIds)
+                ) && 
                 (
                     this.Id == input.Id ||
                     (this.Id != null &&
@@ -148,11 +151,6 @@ public bool Equals(OrderBatch input)
                     this.IsPublished == input.IsPublished ||
                     (this.IsPublished != null &&
                     this.IsPublished.Equals(input.IsPublished))
-                ) && 
-                (
-                    this.OrderIds == input.OrderIds ||
-                    this.OrderIds != null &&
-                    this.OrderIds.SequenceEqual(input.OrderIds)
                 );
         }
 
@@ -165,6 +163,8 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.OrderIds != null)
+                    hashCode = hashCode * 59 + this.OrderIds.GetHashCode();
                 if (this.Id != null)
                     hashCode = hashCode * 59 + this.Id.GetHashCode();
                 if (this.DisplayCode != null)
@@ -173,21 +173,9 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
                 if (this.IsPublished != null)
                     hashCode = hashCode * 59 + this.IsPublished.GetHashCode();
-                if (this.OrderIds != null)
-                    hashCode = hashCode * 59 + this.OrderIds.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderBatchItem.cs b/src/Flipdish/Model/OrderBatchItem.cs
deleted file mode 100644
index 93a8e27c..00000000
--- a/src/Flipdish/Model/OrderBatchItem.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Represents order batches
-    /// </summary>
-    [DataContract]
-    public partial class OrderBatchItem :  IEquatable<OrderBatchItem>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderBatchItem" /> class.
-        /// </summary>
-        /// <param name="batchId">Unique identifier.</param>
-        /// <param name="createdAt">Creation date.</param>
-        /// <param name="isPublished">Is dispatched.</param>
-        public OrderBatchItem(int? batchId = default(int?), DateTime? createdAt = default(DateTime?), bool? isPublished = default(bool?))
-        {
-            this.BatchId = batchId;
-            this.CreatedAt = createdAt;
-            this.IsPublished = isPublished;
-        }
-        
-        /// <summary>
-        /// Unique identifier
-        /// </summary>
-        /// <value>Unique identifier</value>
-        [DataMember(Name="BatchId", EmitDefaultValue=false)]
-        public int? BatchId { get; set; }
-
-        /// <summary>
-        /// Creation date
-        /// </summary>
-        /// <value>Creation date</value>
-        [DataMember(Name="CreatedAt", EmitDefaultValue=false)]
-        public DateTime? CreatedAt { get; set; }
-
-        /// <summary>
-        /// Is dispatched
-        /// </summary>
-        /// <value>Is dispatched</value>
-        [DataMember(Name="IsPublished", EmitDefaultValue=false)]
-        public bool? IsPublished { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class OrderBatchItem {\n");
-            sb.Append("  BatchId: ").Append(BatchId).Append("\n");
-            sb.Append("  CreatedAt: ").Append(CreatedAt).Append("\n");
-            sb.Append("  IsPublished: ").Append(IsPublished).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as OrderBatchItem);
-        }
-
-        /// <summary>
-        /// Returns true if OrderBatchItem instances are equal
-        /// </summary>
-        /// <param name="input">Instance of OrderBatchItem to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(OrderBatchItem input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.BatchId == input.BatchId ||
-                    (this.BatchId != null &&
-                    this.BatchId.Equals(input.BatchId))
-                ) && 
-                (
-                    this.CreatedAt == input.CreatedAt ||
-                    (this.CreatedAt != null &&
-                    this.CreatedAt.Equals(input.CreatedAt))
-                ) && 
-                (
-                    this.IsPublished == input.IsPublished ||
-                    (this.IsPublished != null &&
-                    this.IsPublished.Equals(input.IsPublished))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.BatchId != null)
-                    hashCode = hashCode * 59 + this.BatchId.GetHashCode();
-                if (this.CreatedAt != null)
-                    hashCode = hashCode * 59 + this.CreatedAt.GetHashCode();
-                if (this.IsPublished != null)
-                    hashCode = hashCode * 59 + this.IsPublished.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/OrderBatchPublishedEvent.cs b/src/Flipdish/Model/OrderBatchPublishedEvent.cs
new file mode 100644
index 00000000..7c350915
--- /dev/null
+++ b/src/Flipdish/Model/OrderBatchPublishedEvent.cs
@@ -0,0 +1,300 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Order Batch Published Event
+    /// </summary>
+    [DataContract]
+    public partial class OrderBatchPublishedEvent :  IEquatable<OrderBatchPublishedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderBatchPublishedEvent" /> class.
+        /// </summary>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="orderBatchId">Order Batch Id.</param>
+        /// <param name="storeId">Store id the order batch belogs to.</param>
+        /// <param name="orderIds">Orders&#39; ids on the batch.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderBatchPublishedEvent(string eventName = default(string), int? orderBatchId = default(int?), int? storeId = default(int?), List<int?> orderIds = default(List<int?>), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.EventName = eventName;
+            this.OrderBatchId = orderBatchId;
+            this.StoreId = storeId;
+            this.OrderIds = orderIds;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// Order Batch Id
+        /// </summary>
+        /// <value>Order Batch Id</value>
+        [DataMember(Name="OrderBatchId", EmitDefaultValue=false)]
+        public int? OrderBatchId { get; set; }
+
+        /// <summary>
+        /// Store id the order batch belogs to
+        /// </summary>
+        /// <value>Store id the order batch belogs to</value>
+        [DataMember(Name="StoreId", EmitDefaultValue=false)]
+        public int? StoreId { get; set; }
+
+        /// <summary>
+        /// Orders&#39; ids on the batch
+        /// </summary>
+        /// <value>Orders&#39; ids on the batch</value>
+        [DataMember(Name="OrderIds", EmitDefaultValue=false)]
+        public List<int?> OrderIds { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class OrderBatchPublishedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrderBatchId: ").Append(OrderBatchId).Append("\n");
+            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  OrderIds: ").Append(OrderIds).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as OrderBatchPublishedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if OrderBatchPublishedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of OrderBatchPublishedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(OrderBatchPublishedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.OrderBatchId == input.OrderBatchId ||
+                    (this.OrderBatchId != null &&
+                    this.OrderBatchId.Equals(input.OrderBatchId))
+                ) && 
+                (
+                    this.StoreId == input.StoreId ||
+                    (this.StoreId != null &&
+                    this.StoreId.Equals(input.StoreId))
+                ) && 
+                (
+                    this.OrderIds == input.OrderIds ||
+                    this.OrderIds != null &&
+                    this.OrderIds.SequenceEqual(input.OrderIds)
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrderBatchId != null)
+                    hashCode = hashCode * 59 + this.OrderBatchId.GetHashCode();
+                if (this.StoreId != null)
+                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.OrderIds != null)
+                    hashCode = hashCode * 59 + this.OrderIds.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/OrderBatchSummary.cs b/src/Flipdish/Model/OrderBatchSummary.cs
new file mode 100644
index 00000000..a52112b6
--- /dev/null
+++ b/src/Flipdish/Model/OrderBatchSummary.cs
@@ -0,0 +1,164 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Order batch info
+    /// </summary>
+    [DataContract]
+    public partial class OrderBatchSummary :  IEquatable<OrderBatchSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderBatchSummary" /> class.
+        /// </summary>
+        /// <param name="id">Order batch id.</param>
+        /// <param name="displayCode">Order batch 6-sign human readable code.</param>
+        /// <param name="createTime">Batch creation date and time.</param>
+        /// <param name="isPublished">If the batch is already published.</param>
+        public OrderBatchSummary(int? id = default(int?), string displayCode = default(string), DateTime? createTime = default(DateTime?), bool? isPublished = default(bool?))
+        {
+            this.Id = id;
+            this.DisplayCode = displayCode;
+            this.CreateTime = createTime;
+            this.IsPublished = isPublished;
+        }
+        
+        /// <summary>
+        /// Order batch id
+        /// </summary>
+        /// <value>Order batch id</value>
+        [DataMember(Name="Id", EmitDefaultValue=false)]
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// Order batch 6-sign human readable code
+        /// </summary>
+        /// <value>Order batch 6-sign human readable code</value>
+        [DataMember(Name="DisplayCode", EmitDefaultValue=false)]
+        public string DisplayCode { get; set; }
+
+        /// <summary>
+        /// Batch creation date and time
+        /// </summary>
+        /// <value>Batch creation date and time</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// If the batch is already published
+        /// </summary>
+        /// <value>If the batch is already published</value>
+        [DataMember(Name="IsPublished", EmitDefaultValue=false)]
+        public bool? IsPublished { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class OrderBatchSummary {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  DisplayCode: ").Append(DisplayCode).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  IsPublished: ").Append(IsPublished).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as OrderBatchSummary);
+        }
+
+        /// <summary>
+        /// Returns true if OrderBatchSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of OrderBatchSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(OrderBatchSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.DisplayCode == input.DisplayCode ||
+                    (this.DisplayCode != null &&
+                    this.DisplayCode.Equals(input.DisplayCode))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.IsPublished == input.IsPublished ||
+                    (this.IsPublished != null &&
+                    this.IsPublished.Equals(input.IsPublished))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.DisplayCode != null)
+                    hashCode = hashCode * 59 + this.DisplayCode.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.IsPublished != null)
+                    hashCode = hashCode * 59 + this.IsPublished.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/OrderBatchingConfiguration.cs b/src/Flipdish/Model/OrderBatchingConfiguration.cs
index f5e8cd8e..f7a792c8 100644
--- a/src/Flipdish/Model/OrderBatchingConfiguration.cs
+++ b/src/Flipdish/Model/OrderBatchingConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,25 +26,25 @@ namespace Flipdish.Model
     /// Describes the configuration of OrderBatching
     /// </summary>
     [DataContract]
-    public partial class OrderBatchingConfiguration :  IEquatable<OrderBatchingConfiguration>, IValidatableObject
+    public partial class OrderBatchingConfiguration :  IEquatable<OrderBatchingConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderBatchingConfiguration" /> class.
         /// </summary>
-        /// <param name="batchIntervalInMinutes">Batch sending interval in minutes.</param>
+        /// <param name="batchIntervalInSeconds">Batch sending interval in seconds.</param>
         /// <param name="isEnabled">OrderBatching is enabled or not.</param>
-        public OrderBatchingConfiguration(int? batchIntervalInMinutes = default(int?), bool? isEnabled = default(bool?))
+        public OrderBatchingConfiguration(int? batchIntervalInSeconds = default(int?), bool? isEnabled = default(bool?))
         {
-            this.BatchIntervalInMinutes = batchIntervalInMinutes;
+            this.BatchIntervalInSeconds = batchIntervalInSeconds;
             this.IsEnabled = isEnabled;
         }
         
         /// <summary>
-        /// Batch sending interval in minutes
+        /// Batch sending interval in seconds
         /// </summary>
-        /// <value>Batch sending interval in minutes</value>
-        [DataMember(Name="BatchIntervalInMinutes", EmitDefaultValue=false)]
-        public int? BatchIntervalInMinutes { get; set; }
+        /// <value>Batch sending interval in seconds</value>
+        [DataMember(Name="BatchIntervalInSeconds", EmitDefaultValue=false)]
+        public int? BatchIntervalInSeconds { get; set; }
 
         /// <summary>
         /// OrderBatching is enabled or not
@@ -63,7 +61,7 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class OrderBatchingConfiguration {\n");
-            sb.Append("  BatchIntervalInMinutes: ").Append(BatchIntervalInMinutes).Append("\n");
+            sb.Append("  BatchIntervalInSeconds: ").Append(BatchIntervalInSeconds).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -100,9 +98,9 @@ public bool Equals(OrderBatchingConfiguration input)
 
             return 
                 (
-                    this.BatchIntervalInMinutes == input.BatchIntervalInMinutes ||
-                    (this.BatchIntervalInMinutes != null &&
-                    this.BatchIntervalInMinutes.Equals(input.BatchIntervalInMinutes))
+                    this.BatchIntervalInSeconds == input.BatchIntervalInSeconds ||
+                    (this.BatchIntervalInSeconds != null &&
+                    this.BatchIntervalInSeconds.Equals(input.BatchIntervalInSeconds))
                 ) && 
                 (
                     this.IsEnabled == input.IsEnabled ||
@@ -120,23 +118,13 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
-                if (this.BatchIntervalInMinutes != null)
-                    hashCode = hashCode * 59 + this.BatchIntervalInMinutes.GetHashCode();
+                if (this.BatchIntervalInSeconds != null)
+                    hashCode = hashCode * 59 + this.BatchIntervalInSeconds.GetHashCode();
                 if (this.IsEnabled != null)
                     hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderCapacityConfigUpdatedEvent.cs b/src/Flipdish/Model/OrderCapacityConfigUpdatedEvent.cs
index 148846d0..7168df44 100644
--- a/src/Flipdish/Model/OrderCapacityConfigUpdatedEvent.cs
+++ b/src/Flipdish/Model/OrderCapacityConfigUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store&#39;s Order Capacity Configuration Updated
     /// </summary>
     [DataContract]
-    public partial class OrderCapacityConfigUpdatedEvent :  IEquatable<OrderCapacityConfigUpdatedEvent>, IValidatableObject
+    public partial class OrderCapacityConfigUpdatedEvent :  IEquatable<OrderCapacityConfigUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderCapacityConfigUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class OrderCapacityConfigUpdatedEvent :  IEquatable<OrderCapacity
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderCapacityConfigUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreOrderCapacityConfigEditModel orderCapacityConfig = default(StoreOrderCapacityConfigEditModel), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderCapacityConfigUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreOrderCapacityConfigEditModel orderCapacityConfig = default(StoreOrderCapacityConfigEditModel), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class OrderCapacityConfigUpdatedEvent :  IEquatable<OrderCapacity
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class OrderCapacityConfigUpdatedEvent :  IEquatable<OrderCapacity
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class OrderCapacityConfigUpdatedEvent :  IEquatable<OrderCapacity
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(OrderCapacityConfigUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderCreatedEvent.cs b/src/Flipdish/Model/OrderCreatedEvent.cs
index ab401ff9..c8144c32 100644
--- a/src/Flipdish/Model/OrderCreatedEvent.cs
+++ b/src/Flipdish/Model/OrderCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Created Event
     /// </summary>
     [DataContract]
-    public partial class OrderCreatedEvent :  IEquatable<OrderCreatedEvent>, IValidatableObject
+    public partial class OrderCreatedEvent :  IEquatable<OrderCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderCreatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class OrderCreatedEvent :  IEquatable<OrderCreatedEvent>, IValida
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderCreatedEvent(string eventName = default(string), string description = default(string), DateTime? orderCreatedTime = default(DateTime?), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderCreatedEvent(string eventName = default(string), string description = default(string), DateTime? orderCreatedTime = default(DateTime?), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class OrderCreatedEvent :  IEquatable<OrderCreatedEvent>, IValida
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class OrderCreatedEvent :  IEquatable<OrderCreatedEvent>, IValida
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class OrderCreatedEvent :  IEquatable<OrderCreatedEvent>, IValida
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(OrderCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderCustomerTrackingCreatedEvent.cs b/src/Flipdish/Model/OrderCustomerTrackingCreatedEvent.cs
index 3a04c402..a361872b 100644
--- a/src/Flipdish/Model/OrderCustomerTrackingCreatedEvent.cs
+++ b/src/Flipdish/Model/OrderCustomerTrackingCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// OrderCustomerTrackingCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class OrderCustomerTrackingCreatedEvent :  IEquatable<OrderCustomerTrackingCreatedEvent>, IValidatableObject
+    public partial class OrderCustomerTrackingCreatedEvent :  IEquatable<OrderCustomerTrackingCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderCustomerTrackingCreatedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class OrderCustomerTrackingCreatedEvent :  IEquatable<OrderCustom
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderCustomerTrackingCreatedEvent(string eventName = default(string), string description = default(string), CustomerDeliveryTrackingOrder order = default(CustomerDeliveryTrackingOrder), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderCustomerTrackingCreatedEvent(string eventName = default(string), string description = default(string), CustomerDeliveryTrackingOrder order = default(CustomerDeliveryTrackingOrder), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class OrderCustomerTrackingCreatedEvent :  IEquatable<OrderCustom
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class OrderCustomerTrackingCreatedEvent :  IEquatable<OrderCustom
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class OrderCustomerTrackingCreatedEvent :  IEquatable<OrderCustom
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(OrderCustomerTrackingCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderDeliveryInformation.cs b/src/Flipdish/Model/OrderDeliveryInformation.cs
index 011b7424..0b570717 100644
--- a/src/Flipdish/Model/OrderDeliveryInformation.cs
+++ b/src/Flipdish/Model/OrderDeliveryInformation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Delivery Status Information
     /// </summary>
     [DataContract]
-    public partial class OrderDeliveryInformation :  IEquatable<OrderDeliveryInformation>, IValidatableObject
+    public partial class OrderDeliveryInformation :  IEquatable<OrderDeliveryInformation>
     {
         /// <summary>
         /// Delivery Status
@@ -292,16 +290,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderDeliveryInformationBase.cs b/src/Flipdish/Model/OrderDeliveryInformationBase.cs
index f8858b8e..927fdd1b 100644
--- a/src/Flipdish/Model/OrderDeliveryInformationBase.cs
+++ b/src/Flipdish/Model/OrderDeliveryInformationBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Delivery Status Information
     /// </summary>
     [DataContract]
-    public partial class OrderDeliveryInformationBase :  IEquatable<OrderDeliveryInformationBase>, IValidatableObject
+    public partial class OrderDeliveryInformationBase :  IEquatable<OrderDeliveryInformationBase>
     {
         /// <summary>
         /// Delivery Status
@@ -275,16 +273,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderDeliveryTrackingStatusUpdatedEvent.cs b/src/Flipdish/Model/OrderDeliveryTrackingStatusUpdatedEvent.cs
index 3aa3c78e..f7925968 100644
--- a/src/Flipdish/Model/OrderDeliveryTrackingStatusUpdatedEvent.cs
+++ b/src/Flipdish/Model/OrderDeliveryTrackingStatusUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// OrderDeliveryTrackingStatusUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class OrderDeliveryTrackingStatusUpdatedEvent :  IEquatable<OrderDeliveryTrackingStatusUpdatedEvent>, IValidatableObject
+    public partial class OrderDeliveryTrackingStatusUpdatedEvent :  IEquatable<OrderDeliveryTrackingStatusUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderDeliveryTrackingStatusUpdatedEvent" /> class.
@@ -36,21 +34,31 @@ public partial class OrderDeliveryTrackingStatusUpdatedEvent :  IEquatable<Order
         /// <param name="eventName">The event name.</param>
         /// <param name="description">Description.</param>
         /// <param name="order">Order.</param>
+        /// <param name="deliveryIntegrationName">Delivery integration name.</param>
+        /// <param name="deliveryErrorMessage">Delivery error message (optional).</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderDeliveryTrackingStatusUpdatedEvent(string eventName = default(string), string description = default(string), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderDeliveryTrackingStatusUpdatedEvent(string eventName = default(string), string description = default(string), Order order = default(Order), string deliveryIntegrationName = default(string), string deliveryErrorMessage = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
             this.Order = order;
+            this.DeliveryIntegrationName = deliveryIntegrationName;
+            this.DeliveryErrorMessage = deliveryErrorMessage;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -74,6 +82,20 @@ public partial class OrderDeliveryTrackingStatusUpdatedEvent :  IEquatable<Order
         [DataMember(Name="Order", EmitDefaultValue=false)]
         public Order Order { get; set; }
 
+        /// <summary>
+        /// Delivery integration name
+        /// </summary>
+        /// <value>Delivery integration name</value>
+        [DataMember(Name="DeliveryIntegrationName", EmitDefaultValue=false)]
+        public string DeliveryIntegrationName { get; set; }
+
+        /// <summary>
+        /// Delivery error message (optional)
+        /// </summary>
+        /// <value>Delivery error message (optional)</value>
+        [DataMember(Name="DeliveryErrorMessage", EmitDefaultValue=false)]
+        public string DeliveryErrorMessage { get; set; }
+
         /// <summary>
         /// The identitfier of the event
         /// </summary>
@@ -102,6 +124,13 @@ public partial class OrderDeliveryTrackingStatusUpdatedEvent :  IEquatable<Order
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +138,20 @@ public partial class OrderDeliveryTrackingStatusUpdatedEvent :  IEquatable<Order
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -120,11 +163,16 @@ public override string ToString()
             sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  Order: ").Append(Order).Append("\n");
+            sb.Append("  DeliveryIntegrationName: ").Append(DeliveryIntegrationName).Append("\n");
+            sb.Append("  DeliveryErrorMessage: ").Append(DeliveryErrorMessage).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,6 +222,16 @@ public bool Equals(OrderDeliveryTrackingStatusUpdatedEvent input)
                     (this.Order != null &&
                     this.Order.Equals(input.Order))
                 ) && 
+                (
+                    this.DeliveryIntegrationName == input.DeliveryIntegrationName ||
+                    (this.DeliveryIntegrationName != null &&
+                    this.DeliveryIntegrationName.Equals(input.DeliveryIntegrationName))
+                ) && 
+                (
+                    this.DeliveryErrorMessage == input.DeliveryErrorMessage ||
+                    (this.DeliveryErrorMessage != null &&
+                    this.DeliveryErrorMessage.Equals(input.DeliveryErrorMessage))
+                ) && 
                 (
                     this.FlipdishEventId == input.FlipdishEventId ||
                     (this.FlipdishEventId != null &&
@@ -194,10 +252,25 @@ public bool Equals(OrderDeliveryTrackingStatusUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -216,6 +289,10 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
                 if (this.Order != null)
                     hashCode = hashCode * 59 + this.Order.GetHashCode();
+                if (this.DeliveryIntegrationName != null)
+                    hashCode = hashCode * 59 + this.DeliveryIntegrationName.GetHashCode();
+                if (this.DeliveryErrorMessage != null)
+                    hashCode = hashCode * 59 + this.DeliveryErrorMessage.GetHashCode();
                 if (this.FlipdishEventId != null)
                     hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
                 if (this.CreateTime != null)
@@ -224,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderDispatchedEvent.cs b/src/Flipdish/Model/OrderDispatchedEvent.cs
index 277100e4..6b55f715 100644
--- a/src/Flipdish/Model/OrderDispatchedEvent.cs
+++ b/src/Flipdish/Model/OrderDispatchedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Dispatched Event
     /// </summary>
     [DataContract]
-    public partial class OrderDispatchedEvent :  IEquatable<OrderDispatchedEvent>, IValidatableObject
+    public partial class OrderDispatchedEvent :  IEquatable<OrderDispatchedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderDispatchedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class OrderDispatchedEvent :  IEquatable<OrderDispatchedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderDispatchedEvent(string eventName = default(string), string description = default(string), DateTime? orderDispatchedTime = default(DateTime?), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderDispatchedEvent(string eventName = default(string), string description = default(string), DateTime? orderDispatchedTime = default(DateTime?), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class OrderDispatchedEvent :  IEquatable<OrderDispatchedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class OrderDispatchedEvent :  IEquatable<OrderDispatchedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class OrderDispatchedEvent :  IEquatable<OrderDispatchedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(OrderDispatchedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderDropOffLocation.cs b/src/Flipdish/Model/OrderDropOffLocation.cs
index 56549492..4e273db6 100644
--- a/src/Flipdish/Model/OrderDropOffLocation.cs
+++ b/src/Flipdish/Model/OrderDropOffLocation.cs
@@ -12,33 +12,31 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// OrderDropOffLocation
+    /// OrderDropOffLocation.
     /// </summary>
     [DataContract]
-    public partial class OrderDropOffLocation :  IEquatable<OrderDropOffLocation>, IValidatableObject
+    public partial class OrderDropOffLocation :  IEquatable<OrderDropOffLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderDropOffLocation" /> class.
         /// </summary>
-        /// <param name="orderId">orderId.</param>
-        /// <param name="locationName">locationName.</param>
-        /// <param name="locationAreaName">locationAreaName.</param>
-        /// <param name="locationId">locationId.</param>
-        /// <param name="locationAreaId">locationAreaId.</param>
-        /// <param name="externalLocationId">externalLocationId.</param>
+        /// <param name="orderId">OrderId..</param>
+        /// <param name="locationName">LocationName..</param>
+        /// <param name="locationAreaName">LocationAreaName..</param>
+        /// <param name="locationId">LocationId..</param>
+        /// <param name="locationAreaId">LocationAreaId..</param>
+        /// <param name="externalLocationId">ExternalLocationId..</param>
         public OrderDropOffLocation(int? orderId = default(int?), string locationName = default(string), string locationAreaName = default(string), int? locationId = default(int?), int? locationAreaId = default(int?), string externalLocationId = default(string))
         {
             this.OrderId = orderId;
@@ -50,38 +48,44 @@ public partial class OrderDropOffLocation :  IEquatable<OrderDropOffLocation>, I
         }
         
         /// <summary>
-        /// Gets or Sets OrderId
+        /// OrderId.
         /// </summary>
+        /// <value>OrderId.</value>
         [DataMember(Name="OrderId", EmitDefaultValue=false)]
         public int? OrderId { get; set; }
 
         /// <summary>
-        /// Gets or Sets LocationName
+        /// LocationName.
         /// </summary>
+        /// <value>LocationName.</value>
         [DataMember(Name="LocationName", EmitDefaultValue=false)]
         public string LocationName { get; set; }
 
         /// <summary>
-        /// Gets or Sets LocationAreaName
+        /// LocationAreaName.
         /// </summary>
+        /// <value>LocationAreaName.</value>
         [DataMember(Name="LocationAreaName", EmitDefaultValue=false)]
         public string LocationAreaName { get; set; }
 
         /// <summary>
-        /// Gets or Sets LocationId
+        /// LocationId.
         /// </summary>
+        /// <value>LocationId.</value>
         [DataMember(Name="LocationId", EmitDefaultValue=false)]
         public int? LocationId { get; set; }
 
         /// <summary>
-        /// Gets or Sets LocationAreaId
+        /// LocationAreaId.
         /// </summary>
+        /// <value>LocationAreaId.</value>
         [DataMember(Name="LocationAreaId", EmitDefaultValue=false)]
         public int? LocationAreaId { get; set; }
 
         /// <summary>
-        /// Gets or Sets ExternalLocationId
+        /// ExternalLocationId.
         /// </summary>
+        /// <value>ExternalLocationId.</value>
         [DataMember(Name="ExternalLocationId", EmitDefaultValue=false)]
         public string ExternalLocationId { get; set; }
 
@@ -189,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderFulfillmentStatus.cs b/src/Flipdish/Model/OrderFulfillmentStatus.cs
index 665d1895..be85d4f6 100644
--- a/src/Flipdish/Model/OrderFulfillmentStatus.cs
+++ b/src/Flipdish/Model/OrderFulfillmentStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Fulfillment Status Information
     /// </summary>
     [DataContract]
-    public partial class OrderFulfillmentStatus :  IEquatable<OrderFulfillmentStatus>, IValidatableObject
+    public partial class OrderFulfillmentStatus :  IEquatable<OrderFulfillmentStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderFulfillmentStatus" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderFulfillmentStatusBase.cs b/src/Flipdish/Model/OrderFulfillmentStatusBase.cs
index b75668fe..d4dc640d 100644
--- a/src/Flipdish/Model/OrderFulfillmentStatusBase.cs
+++ b/src/Flipdish/Model/OrderFulfillmentStatusBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Fulfillment Status Information
     /// </summary>
     [DataContract]
-    public partial class OrderFulfillmentStatusBase :  IEquatable<OrderFulfillmentStatusBase>, IValidatableObject
+    public partial class OrderFulfillmentStatusBase :  IEquatable<OrderFulfillmentStatusBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderFulfillmentStatusBase" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderFulfillmentStatusUpdate.cs b/src/Flipdish/Model/OrderFulfillmentStatusUpdate.cs
index 3ae45a36..9244043f 100644
--- a/src/Flipdish/Model/OrderFulfillmentStatusUpdate.cs
+++ b/src/Flipdish/Model/OrderFulfillmentStatusUpdate.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// OrderFulfillmentStatusUpdate
+    /// OrderFulfillmentStatusUpdate.
     /// </summary>
     [DataContract]
-    public partial class OrderFulfillmentStatusUpdate :  IEquatable<OrderFulfillmentStatusUpdate>, IValidatableObject
+    public partial class OrderFulfillmentStatusUpdate :  IEquatable<OrderFulfillmentStatusUpdate>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderFulfillmentStatusUpdate" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderFulfillmentStatusUpdatedEvent.cs b/src/Flipdish/Model/OrderFulfillmentStatusUpdatedEvent.cs
index e78d6e14..2eb81d4b 100644
--- a/src/Flipdish/Model/OrderFulfillmentStatusUpdatedEvent.cs
+++ b/src/Flipdish/Model/OrderFulfillmentStatusUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Fulfillment status updated event
     /// </summary>
     [DataContract]
-    public partial class OrderFulfillmentStatusUpdatedEvent :  IEquatable<OrderFulfillmentStatusUpdatedEvent>, IValidatableObject
+    public partial class OrderFulfillmentStatusUpdatedEvent :  IEquatable<OrderFulfillmentStatusUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderFulfillmentStatusUpdatedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class OrderFulfillmentStatusUpdatedEvent :  IEquatable<OrderFulfi
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderFulfillmentStatusUpdatedEvent(string eventName = default(string), int? storeId = default(int?), string description = default(string), int? orderId = default(int?), string statusName = default(string), string statusId = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderFulfillmentStatusUpdatedEvent(string eventName = default(string), int? storeId = default(int?), string description = default(string), int? orderId = default(int?), string statusName = default(string), string statusId = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -56,7 +57,10 @@ public partial class OrderFulfillmentStatusUpdatedEvent :  IEquatable<OrderFulfi
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class OrderFulfillmentStatusUpdatedEvent :  IEquatable<OrderFulfi
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class OrderFulfillmentStatusUpdatedEvent :  IEquatable<OrderFulfi
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(OrderFulfillmentStatusUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderFulfillmentStatusWithConfigurationActions.cs b/src/Flipdish/Model/OrderFulfillmentStatusWithConfigurationActions.cs
index 93573fe7..9c5d2ae2 100644
--- a/src/Flipdish/Model/OrderFulfillmentStatusWithConfigurationActions.cs
+++ b/src/Flipdish/Model/OrderFulfillmentStatusWithConfigurationActions.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Fulfillment status with configured next actions
     /// </summary>
     [DataContract]
-    public partial class OrderFulfillmentStatusWithConfigurationActions :  IEquatable<OrderFulfillmentStatusWithConfigurationActions>, IValidatableObject
+    public partial class OrderFulfillmentStatusWithConfigurationActions :  IEquatable<OrderFulfillmentStatusWithConfigurationActions>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderFulfillmentStatusWithConfigurationActions" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderIdAndSequenceNumber.cs b/src/Flipdish/Model/OrderIdAndSequenceNumber.cs
deleted file mode 100644
index 5d1cd0cf..00000000
--- a/src/Flipdish/Model/OrderIdAndSequenceNumber.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// OrderIdAndSequenceNumber
-    /// </summary>
-    [DataContract]
-    public partial class OrderIdAndSequenceNumber :  IEquatable<OrderIdAndSequenceNumber>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderIdAndSequenceNumber" /> class.
-        /// </summary>
-        /// <param name="orderId">Order identifier.</param>
-        /// <param name="sequence">Sequence for delivery.</param>
-        public OrderIdAndSequenceNumber(int? orderId = default(int?), int? sequence = default(int?))
-        {
-            this.OrderId = orderId;
-            this.Sequence = sequence;
-        }
-        
-        /// <summary>
-        /// Order identifier
-        /// </summary>
-        /// <value>Order identifier</value>
-        [DataMember(Name="OrderId", EmitDefaultValue=false)]
-        public int? OrderId { get; set; }
-
-        /// <summary>
-        /// Sequence for delivery
-        /// </summary>
-        /// <value>Sequence for delivery</value>
-        [DataMember(Name="Sequence", EmitDefaultValue=false)]
-        public int? Sequence { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class OrderIdAndSequenceNumber {\n");
-            sb.Append("  OrderId: ").Append(OrderId).Append("\n");
-            sb.Append("  Sequence: ").Append(Sequence).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as OrderIdAndSequenceNumber);
-        }
-
-        /// <summary>
-        /// Returns true if OrderIdAndSequenceNumber instances are equal
-        /// </summary>
-        /// <param name="input">Instance of OrderIdAndSequenceNumber to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(OrderIdAndSequenceNumber input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.OrderId == input.OrderId ||
-                    (this.OrderId != null &&
-                    this.OrderId.Equals(input.OrderId))
-                ) && 
-                (
-                    this.Sequence == input.Sequence ||
-                    (this.Sequence != null &&
-                    this.Sequence.Equals(input.Sequence))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.OrderId != null)
-                    hashCode = hashCode * 59 + this.OrderId.GetHashCode();
-                if (this.Sequence != null)
-                    hashCode = hashCode * 59 + this.Sequence.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/OrderIngestSubmitOrderRequest.cs b/src/Flipdish/Model/OrderIngestSubmitOrderRequest.cs
deleted file mode 100644
index fd009cde..00000000
--- a/src/Flipdish/Model/OrderIngestSubmitOrderRequest.cs
+++ /dev/null
@@ -1,1057 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Generic model for ingesting external orders from   3rd parties into the system
-    /// </summary>
-    [DataContract]
-    public partial class OrderIngestSubmitOrderRequest :  IEquatable<OrderIngestSubmitOrderRequest>, IValidatableObject
-    {
-        /// <summary>
-        /// [Required] Indicated the name from where the request is coming from
-        /// </summary>
-        /// <value>[Required] Indicated the name from where the request is coming from</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum AppTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Unknown for value: Unknown
-            /// </summary>
-            [EnumMember(Value = "Unknown")]
-            Unknown = 1,
-            
-            /// <summary>
-            /// Enum Ios for value: Ios
-            /// </summary>
-            [EnumMember(Value = "Ios")]
-            Ios = 2,
-            
-            /// <summary>
-            /// Enum Android for value: Android
-            /// </summary>
-            [EnumMember(Value = "Android")]
-            Android = 3,
-            
-            /// <summary>
-            /// Enum Web for value: Web
-            /// </summary>
-            [EnumMember(Value = "Web")]
-            Web = 4,
-            
-            /// <summary>
-            /// Enum Kiosk for value: Kiosk
-            /// </summary>
-            [EnumMember(Value = "Kiosk")]
-            Kiosk = 5,
-            
-            /// <summary>
-            /// Enum Pos for value: Pos
-            /// </summary>
-            [EnumMember(Value = "Pos")]
-            Pos = 6,
-            
-            /// <summary>
-            /// Enum TelephoneCall for value: TelephoneCall
-            /// </summary>
-            [EnumMember(Value = "TelephoneCall")]
-            TelephoneCall = 7,
-            
-            /// <summary>
-            /// Enum Sms for value: Sms
-            /// </summary>
-            [EnumMember(Value = "Sms")]
-            Sms = 8,
-            
-            /// <summary>
-            /// Enum PwaAndroid for value: PwaAndroid
-            /// </summary>
-            [EnumMember(Value = "PwaAndroid")]
-            PwaAndroid = 9,
-            
-            /// <summary>
-            /// Enum PwaIos for value: PwaIos
-            /// </summary>
-            [EnumMember(Value = "PwaIos")]
-            PwaIos = 10,
-            
-            /// <summary>
-            /// Enum Google for value: Google
-            /// </summary>
-            [EnumMember(Value = "Google")]
-            Google = 11
-        }
-
-        /// <summary>
-        /// [Required] Indicated the name from where the request is coming from
-        /// </summary>
-        /// <value>[Required] Indicated the name from where the request is coming from</value>
-        [DataMember(Name="AppType", EmitDefaultValue=false)]
-        public AppTypeEnum? AppType { get; set; }
-        /// <summary>
-        /// [Required] Currency Code  These must match three letter codes ISO 4127 http://en.wikipedia.org/wiki/ISO_4217
-        /// </summary>
-        /// <value>[Required] Currency Code  These must match three letter codes ISO 4127 http://en.wikipedia.org/wiki/ISO_4217</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum CurrencyCodeEnum
-        {
-            
-            /// <summary>
-            /// Enum EUR for value: EUR
-            /// </summary>
-            [EnumMember(Value = "EUR")]
-            EUR = 1,
-            
-            /// <summary>
-            /// Enum USD for value: USD
-            /// </summary>
-            [EnumMember(Value = "USD")]
-            USD = 2,
-            
-            /// <summary>
-            /// Enum GBP for value: GBP
-            /// </summary>
-            [EnumMember(Value = "GBP")]
-            GBP = 3,
-            
-            /// <summary>
-            /// Enum CAD for value: CAD
-            /// </summary>
-            [EnumMember(Value = "CAD")]
-            CAD = 4,
-            
-            /// <summary>
-            /// Enum AUD for value: AUD
-            /// </summary>
-            [EnumMember(Value = "AUD")]
-            AUD = 5,
-            
-            /// <summary>
-            /// Enum DJF for value: DJF
-            /// </summary>
-            [EnumMember(Value = "DJF")]
-            DJF = 6,
-            
-            /// <summary>
-            /// Enum ZAR for value: ZAR
-            /// </summary>
-            [EnumMember(Value = "ZAR")]
-            ZAR = 7,
-            
-            /// <summary>
-            /// Enum ETB for value: ETB
-            /// </summary>
-            [EnumMember(Value = "ETB")]
-            ETB = 8,
-            
-            /// <summary>
-            /// Enum AED for value: AED
-            /// </summary>
-            [EnumMember(Value = "AED")]
-            AED = 9,
-            
-            /// <summary>
-            /// Enum BHD for value: BHD
-            /// </summary>
-            [EnumMember(Value = "BHD")]
-            BHD = 10,
-            
-            /// <summary>
-            /// Enum DZD for value: DZD
-            /// </summary>
-            [EnumMember(Value = "DZD")]
-            DZD = 11,
-            
-            /// <summary>
-            /// Enum EGP for value: EGP
-            /// </summary>
-            [EnumMember(Value = "EGP")]
-            EGP = 12,
-            
-            /// <summary>
-            /// Enum IQD for value: IQD
-            /// </summary>
-            [EnumMember(Value = "IQD")]
-            IQD = 13,
-            
-            /// <summary>
-            /// Enum JOD for value: JOD
-            /// </summary>
-            [EnumMember(Value = "JOD")]
-            JOD = 14,
-            
-            /// <summary>
-            /// Enum KWD for value: KWD
-            /// </summary>
-            [EnumMember(Value = "KWD")]
-            KWD = 15,
-            
-            /// <summary>
-            /// Enum LBP for value: LBP
-            /// </summary>
-            [EnumMember(Value = "LBP")]
-            LBP = 16,
-            
-            /// <summary>
-            /// Enum LYD for value: LYD
-            /// </summary>
-            [EnumMember(Value = "LYD")]
-            LYD = 17,
-            
-            /// <summary>
-            /// Enum MAD for value: MAD
-            /// </summary>
-            [EnumMember(Value = "MAD")]
-            MAD = 18,
-            
-            /// <summary>
-            /// Enum OMR for value: OMR
-            /// </summary>
-            [EnumMember(Value = "OMR")]
-            OMR = 19,
-            
-            /// <summary>
-            /// Enum QAR for value: QAR
-            /// </summary>
-            [EnumMember(Value = "QAR")]
-            QAR = 20,
-            
-            /// <summary>
-            /// Enum SAR for value: SAR
-            /// </summary>
-            [EnumMember(Value = "SAR")]
-            SAR = 21,
-            
-            /// <summary>
-            /// Enum SYP for value: SYP
-            /// </summary>
-            [EnumMember(Value = "SYP")]
-            SYP = 22,
-            
-            /// <summary>
-            /// Enum TND for value: TND
-            /// </summary>
-            [EnumMember(Value = "TND")]
-            TND = 23,
-            
-            /// <summary>
-            /// Enum YER for value: YER
-            /// </summary>
-            [EnumMember(Value = "YER")]
-            YER = 24,
-            
-            /// <summary>
-            /// Enum CLP for value: CLP
-            /// </summary>
-            [EnumMember(Value = "CLP")]
-            CLP = 25,
-            
-            /// <summary>
-            /// Enum INR for value: INR
-            /// </summary>
-            [EnumMember(Value = "INR")]
-            INR = 26,
-            
-            /// <summary>
-            /// Enum AZN for value: AZN
-            /// </summary>
-            [EnumMember(Value = "AZN")]
-            AZN = 27,
-            
-            /// <summary>
-            /// Enum RUB for value: RUB
-            /// </summary>
-            [EnumMember(Value = "RUB")]
-            RUB = 28,
-            
-            /// <summary>
-            /// Enum BYN for value: BYN
-            /// </summary>
-            [EnumMember(Value = "BYN")]
-            BYN = 29,
-            
-            /// <summary>
-            /// Enum BGN for value: BGN
-            /// </summary>
-            [EnumMember(Value = "BGN")]
-            BGN = 30,
-            
-            /// <summary>
-            /// Enum NGN for value: NGN
-            /// </summary>
-            [EnumMember(Value = "NGN")]
-            NGN = 31,
-            
-            /// <summary>
-            /// Enum BDT for value: BDT
-            /// </summary>
-            [EnumMember(Value = "BDT")]
-            BDT = 32,
-            
-            /// <summary>
-            /// Enum CNY for value: CNY
-            /// </summary>
-            [EnumMember(Value = "CNY")]
-            CNY = 33,
-            
-            /// <summary>
-            /// Enum BAM for value: BAM
-            /// </summary>
-            [EnumMember(Value = "BAM")]
-            BAM = 34,
-            
-            /// <summary>
-            /// Enum CZK for value: CZK
-            /// </summary>
-            [EnumMember(Value = "CZK")]
-            CZK = 35,
-            
-            /// <summary>
-            /// Enum DKK for value: DKK
-            /// </summary>
-            [EnumMember(Value = "DKK")]
-            DKK = 36,
-            
-            /// <summary>
-            /// Enum CHF for value: CHF
-            /// </summary>
-            [EnumMember(Value = "CHF")]
-            CHF = 37,
-            
-            /// <summary>
-            /// Enum MVR for value: MVR
-            /// </summary>
-            [EnumMember(Value = "MVR")]
-            MVR = 38,
-            
-            /// <summary>
-            /// Enum BTN for value: BTN
-            /// </summary>
-            [EnumMember(Value = "BTN")]
-            BTN = 39,
-            
-            /// <summary>
-            /// Enum XCD for value: XCD
-            /// </summary>
-            [EnumMember(Value = "XCD")]
-            XCD = 40,
-            
-            /// <summary>
-            /// Enum BZD for value: BZD
-            /// </summary>
-            [EnumMember(Value = "BZD")]
-            BZD = 41,
-            
-            /// <summary>
-            /// Enum HKD for value: HKD
-            /// </summary>
-            [EnumMember(Value = "HKD")]
-            HKD = 42,
-            
-            /// <summary>
-            /// Enum IDR for value: IDR
-            /// </summary>
-            [EnumMember(Value = "IDR")]
-            IDR = 43,
-            
-            /// <summary>
-            /// Enum JMD for value: JMD
-            /// </summary>
-            [EnumMember(Value = "JMD")]
-            JMD = 44,
-            
-            /// <summary>
-            /// Enum MYR for value: MYR
-            /// </summary>
-            [EnumMember(Value = "MYR")]
-            MYR = 45,
-            
-            /// <summary>
-            /// Enum NZD for value: NZD
-            /// </summary>
-            [EnumMember(Value = "NZD")]
-            NZD = 46,
-            
-            /// <summary>
-            /// Enum PHP for value: PHP
-            /// </summary>
-            [EnumMember(Value = "PHP")]
-            PHP = 47,
-            
-            /// <summary>
-            /// Enum SGD for value: SGD
-            /// </summary>
-            [EnumMember(Value = "SGD")]
-            SGD = 48,
-            
-            /// <summary>
-            /// Enum TTD for value: TTD
-            /// </summary>
-            [EnumMember(Value = "TTD")]
-            TTD = 49,
-            
-            /// <summary>
-            /// Enum XDR for value: XDR
-            /// </summary>
-            [EnumMember(Value = "XDR")]
-            XDR = 50,
-            
-            /// <summary>
-            /// Enum ARS for value: ARS
-            /// </summary>
-            [EnumMember(Value = "ARS")]
-            ARS = 51,
-            
-            /// <summary>
-            /// Enum BOB for value: BOB
-            /// </summary>
-            [EnumMember(Value = "BOB")]
-            BOB = 52,
-            
-            /// <summary>
-            /// Enum COP for value: COP
-            /// </summary>
-            [EnumMember(Value = "COP")]
-            COP = 53,
-            
-            /// <summary>
-            /// Enum CRC for value: CRC
-            /// </summary>
-            [EnumMember(Value = "CRC")]
-            CRC = 54,
-            
-            /// <summary>
-            /// Enum CUP for value: CUP
-            /// </summary>
-            [EnumMember(Value = "CUP")]
-            CUP = 55,
-            
-            /// <summary>
-            /// Enum DOP for value: DOP
-            /// </summary>
-            [EnumMember(Value = "DOP")]
-            DOP = 56,
-            
-            /// <summary>
-            /// Enum GTQ for value: GTQ
-            /// </summary>
-            [EnumMember(Value = "GTQ")]
-            GTQ = 57,
-            
-            /// <summary>
-            /// Enum HNL for value: HNL
-            /// </summary>
-            [EnumMember(Value = "HNL")]
-            HNL = 58,
-            
-            /// <summary>
-            /// Enum MXN for value: MXN
-            /// </summary>
-            [EnumMember(Value = "MXN")]
-            MXN = 59,
-            
-            /// <summary>
-            /// Enum NIO for value: NIO
-            /// </summary>
-            [EnumMember(Value = "NIO")]
-            NIO = 60,
-            
-            /// <summary>
-            /// Enum PAB for value: PAB
-            /// </summary>
-            [EnumMember(Value = "PAB")]
-            PAB = 61,
-            
-            /// <summary>
-            /// Enum PEN for value: PEN
-            /// </summary>
-            [EnumMember(Value = "PEN")]
-            PEN = 62,
-            
-            /// <summary>
-            /// Enum PYG for value: PYG
-            /// </summary>
-            [EnumMember(Value = "PYG")]
-            PYG = 63,
-            
-            /// <summary>
-            /// Enum UYU for value: UYU
-            /// </summary>
-            [EnumMember(Value = "UYU")]
-            UYU = 64,
-            
-            /// <summary>
-            /// Enum VEF for value: VEF
-            /// </summary>
-            [EnumMember(Value = "VEF")]
-            VEF = 65,
-            
-            /// <summary>
-            /// Enum IRR for value: IRR
-            /// </summary>
-            [EnumMember(Value = "IRR")]
-            IRR = 66,
-            
-            /// <summary>
-            /// Enum XOF for value: XOF
-            /// </summary>
-            [EnumMember(Value = "XOF")]
-            XOF = 67,
-            
-            /// <summary>
-            /// Enum CDF for value: CDF
-            /// </summary>
-            [EnumMember(Value = "CDF")]
-            CDF = 68,
-            
-            /// <summary>
-            /// Enum XAF for value: XAF
-            /// </summary>
-            [EnumMember(Value = "XAF")]
-            XAF = 69,
-            
-            /// <summary>
-            /// Enum HTG for value: HTG
-            /// </summary>
-            [EnumMember(Value = "HTG")]
-            HTG = 70,
-            
-            /// <summary>
-            /// Enum ILS for value: ILS
-            /// </summary>
-            [EnumMember(Value = "ILS")]
-            ILS = 71,
-            
-            /// <summary>
-            /// Enum HRK for value: HRK
-            /// </summary>
-            [EnumMember(Value = "HRK")]
-            HRK = 72,
-            
-            /// <summary>
-            /// Enum HUF for value: HUF
-            /// </summary>
-            [EnumMember(Value = "HUF")]
-            HUF = 73,
-            
-            /// <summary>
-            /// Enum AMD for value: AMD
-            /// </summary>
-            [EnumMember(Value = "AMD")]
-            AMD = 74,
-            
-            /// <summary>
-            /// Enum ISK for value: ISK
-            /// </summary>
-            [EnumMember(Value = "ISK")]
-            ISK = 75,
-            
-            /// <summary>
-            /// Enum JPY for value: JPY
-            /// </summary>
-            [EnumMember(Value = "JPY")]
-            JPY = 76,
-            
-            /// <summary>
-            /// Enum GEL for value: GEL
-            /// </summary>
-            [EnumMember(Value = "GEL")]
-            GEL = 77,
-            
-            /// <summary>
-            /// Enum KZT for value: KZT
-            /// </summary>
-            [EnumMember(Value = "KZT")]
-            KZT = 78,
-            
-            /// <summary>
-            /// Enum KHR for value: KHR
-            /// </summary>
-            [EnumMember(Value = "KHR")]
-            KHR = 79,
-            
-            /// <summary>
-            /// Enum KRW for value: KRW
-            /// </summary>
-            [EnumMember(Value = "KRW")]
-            KRW = 80,
-            
-            /// <summary>
-            /// Enum KGS for value: KGS
-            /// </summary>
-            [EnumMember(Value = "KGS")]
-            KGS = 81,
-            
-            /// <summary>
-            /// Enum LAK for value: LAK
-            /// </summary>
-            [EnumMember(Value = "LAK")]
-            LAK = 82,
-            
-            /// <summary>
-            /// Enum MKD for value: MKD
-            /// </summary>
-            [EnumMember(Value = "MKD")]
-            MKD = 83,
-            
-            /// <summary>
-            /// Enum MNT for value: MNT
-            /// </summary>
-            [EnumMember(Value = "MNT")]
-            MNT = 84,
-            
-            /// <summary>
-            /// Enum BND for value: BND
-            /// </summary>
-            [EnumMember(Value = "BND")]
-            BND = 85,
-            
-            /// <summary>
-            /// Enum MMK for value: MMK
-            /// </summary>
-            [EnumMember(Value = "MMK")]
-            MMK = 86,
-            
-            /// <summary>
-            /// Enum NOK for value: NOK
-            /// </summary>
-            [EnumMember(Value = "NOK")]
-            NOK = 87,
-            
-            /// <summary>
-            /// Enum NPR for value: NPR
-            /// </summary>
-            [EnumMember(Value = "NPR")]
-            NPR = 88,
-            
-            /// <summary>
-            /// Enum PKR for value: PKR
-            /// </summary>
-            [EnumMember(Value = "PKR")]
-            PKR = 89,
-            
-            /// <summary>
-            /// Enum PLN for value: PLN
-            /// </summary>
-            [EnumMember(Value = "PLN")]
-            PLN = 90,
-            
-            /// <summary>
-            /// Enum AFN for value: AFN
-            /// </summary>
-            [EnumMember(Value = "AFN")]
-            AFN = 91,
-            
-            /// <summary>
-            /// Enum BRL for value: BRL
-            /// </summary>
-            [EnumMember(Value = "BRL")]
-            BRL = 92,
-            
-            /// <summary>
-            /// Enum MDL for value: MDL
-            /// </summary>
-            [EnumMember(Value = "MDL")]
-            MDL = 93,
-            
-            /// <summary>
-            /// Enum RON for value: RON
-            /// </summary>
-            [EnumMember(Value = "RON")]
-            RON = 94,
-            
-            /// <summary>
-            /// Enum RWF for value: RWF
-            /// </summary>
-            [EnumMember(Value = "RWF")]
-            RWF = 95,
-            
-            /// <summary>
-            /// Enum SEK for value: SEK
-            /// </summary>
-            [EnumMember(Value = "SEK")]
-            SEK = 96,
-            
-            /// <summary>
-            /// Enum LKR for value: LKR
-            /// </summary>
-            [EnumMember(Value = "LKR")]
-            LKR = 97,
-            
-            /// <summary>
-            /// Enum SOS for value: SOS
-            /// </summary>
-            [EnumMember(Value = "SOS")]
-            SOS = 98,
-            
-            /// <summary>
-            /// Enum ALL for value: ALL
-            /// </summary>
-            [EnumMember(Value = "ALL")]
-            ALL = 99,
-            
-            /// <summary>
-            /// Enum RSD for value: RSD
-            /// </summary>
-            [EnumMember(Value = "RSD")]
-            RSD = 100,
-            
-            /// <summary>
-            /// Enum KES for value: KES
-            /// </summary>
-            [EnumMember(Value = "KES")]
-            KES = 101,
-            
-            /// <summary>
-            /// Enum TJS for value: TJS
-            /// </summary>
-            [EnumMember(Value = "TJS")]
-            TJS = 102,
-            
-            /// <summary>
-            /// Enum THB for value: THB
-            /// </summary>
-            [EnumMember(Value = "THB")]
-            THB = 103,
-            
-            /// <summary>
-            /// Enum ERN for value: ERN
-            /// </summary>
-            [EnumMember(Value = "ERN")]
-            ERN = 104,
-            
-            /// <summary>
-            /// Enum TMT for value: TMT
-            /// </summary>
-            [EnumMember(Value = "TMT")]
-            TMT = 105,
-            
-            /// <summary>
-            /// Enum BWP for value: BWP
-            /// </summary>
-            [EnumMember(Value = "BWP")]
-            BWP = 106,
-            
-            /// <summary>
-            /// Enum TRY for value: TRY
-            /// </summary>
-            [EnumMember(Value = "TRY")]
-            TRY = 107,
-            
-            /// <summary>
-            /// Enum UAH for value: UAH
-            /// </summary>
-            [EnumMember(Value = "UAH")]
-            UAH = 108,
-            
-            /// <summary>
-            /// Enum UZS for value: UZS
-            /// </summary>
-            [EnumMember(Value = "UZS")]
-            UZS = 109,
-            
-            /// <summary>
-            /// Enum VND for value: VND
-            /// </summary>
-            [EnumMember(Value = "VND")]
-            VND = 110,
-            
-            /// <summary>
-            /// Enum MOP for value: MOP
-            /// </summary>
-            [EnumMember(Value = "MOP")]
-            MOP = 111,
-            
-            /// <summary>
-            /// Enum TWD for value: TWD
-            /// </summary>
-            [EnumMember(Value = "TWD")]
-            TWD = 112,
-            
-            /// <summary>
-            /// Enum BMD for value: BMD
-            /// </summary>
-            [EnumMember(Value = "BMD")]
-            BMD = 113
-        }
-
-        /// <summary>
-        /// [Required] Currency Code  These must match three letter codes ISO 4127 http://en.wikipedia.org/wiki/ISO_4217
-        /// </summary>
-        /// <value>[Required] Currency Code  These must match three letter codes ISO 4127 http://en.wikipedia.org/wiki/ISO_4217</value>
-        [DataMember(Name="CurrencyCode", EmitDefaultValue=false)]
-        public CurrencyCodeEnum? CurrencyCode { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderIngestSubmitOrderRequest" /> class.
-        /// </summary>
-        /// <param name="appType">[Required] Indicated the name from where the request is coming from.</param>
-        /// <param name="storeId">[Required] Store Id.</param>
-        /// <param name="currencyCode">[Required] Currency Code  These must match three letter codes ISO 4127 http://en.wikipedia.org/wiki/ISO_4217.</param>
-        /// <param name="cart">[Required] Cart of the user.</param>
-        /// <param name="fulfillmentInfo">[Required] Relevant fulfillment Information.</param>
-        /// <param name="channelOrderId">[Required] Order ID in the external System.</param>
-        /// <param name="channelPublicOrderId">[Optional] Public Order ID in the external System.</param>
-        /// <param name="orderDateUtc">Date the order was placed at in UTC  [Required].</param>
-        /// <param name="paymentInfo">Payment Information  [Required].</param>
-        /// <param name="contact">Contact Information  [Required].</param>
-        /// <param name="tipAmount">Tip amount.</param>
-        public OrderIngestSubmitOrderRequest(AppTypeEnum? appType = default(AppTypeEnum?), int? storeId = default(int?), CurrencyCodeEnum? currencyCode = default(CurrencyCodeEnum?), Cart cart = default(Cart), FulfillmentInfo fulfillmentInfo = default(FulfillmentInfo), string channelOrderId = default(string), string channelPublicOrderId = default(string), DateTime? orderDateUtc = default(DateTime?), PaymentInfo paymentInfo = default(PaymentInfo), Contact contact = default(Contact), double? tipAmount = default(double?))
-        {
-            this.AppType = appType;
-            this.StoreId = storeId;
-            this.CurrencyCode = currencyCode;
-            this.Cart = cart;
-            this.FulfillmentInfo = fulfillmentInfo;
-            this.ChannelOrderId = channelOrderId;
-            this.ChannelPublicOrderId = channelPublicOrderId;
-            this.OrderDateUtc = orderDateUtc;
-            this.PaymentInfo = paymentInfo;
-            this.Contact = contact;
-            this.TipAmount = tipAmount;
-        }
-        
-
-        /// <summary>
-        /// [Required] Store Id
-        /// </summary>
-        /// <value>[Required] Store Id</value>
-        [DataMember(Name="StoreId", EmitDefaultValue=false)]
-        public int? StoreId { get; set; }
-
-
-        /// <summary>
-        /// [Required] Cart of the user
-        /// </summary>
-        /// <value>[Required] Cart of the user</value>
-        [DataMember(Name="Cart", EmitDefaultValue=false)]
-        public Cart Cart { get; set; }
-
-        /// <summary>
-        /// [Required] Relevant fulfillment Information
-        /// </summary>
-        /// <value>[Required] Relevant fulfillment Information</value>
-        [DataMember(Name="FulfillmentInfo", EmitDefaultValue=false)]
-        public FulfillmentInfo FulfillmentInfo { get; set; }
-
-        /// <summary>
-        /// [Required] Order ID in the external System
-        /// </summary>
-        /// <value>[Required] Order ID in the external System</value>
-        [DataMember(Name="ChannelOrderId", EmitDefaultValue=false)]
-        public string ChannelOrderId { get; set; }
-
-        /// <summary>
-        /// [Optional] Public Order ID in the external System
-        /// </summary>
-        /// <value>[Optional] Public Order ID in the external System</value>
-        [DataMember(Name="ChannelPublicOrderId", EmitDefaultValue=false)]
-        public string ChannelPublicOrderId { get; set; }
-
-        /// <summary>
-        /// Date the order was placed at in UTC  [Required]
-        /// </summary>
-        /// <value>Date the order was placed at in UTC  [Required]</value>
-        [DataMember(Name="OrderDateUtc", EmitDefaultValue=false)]
-        public DateTime? OrderDateUtc { get; set; }
-
-        /// <summary>
-        /// Payment Information  [Required]
-        /// </summary>
-        /// <value>Payment Information  [Required]</value>
-        [DataMember(Name="PaymentInfo", EmitDefaultValue=false)]
-        public PaymentInfo PaymentInfo { get; set; }
-
-        /// <summary>
-        /// Contact Information  [Required]
-        /// </summary>
-        /// <value>Contact Information  [Required]</value>
-        [DataMember(Name="Contact", EmitDefaultValue=false)]
-        public Contact Contact { get; set; }
-
-        /// <summary>
-        /// Tip amount
-        /// </summary>
-        /// <value>Tip amount</value>
-        [DataMember(Name="TipAmount", EmitDefaultValue=false)]
-        public double? TipAmount { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class OrderIngestSubmitOrderRequest {\n");
-            sb.Append("  AppType: ").Append(AppType).Append("\n");
-            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
-            sb.Append("  CurrencyCode: ").Append(CurrencyCode).Append("\n");
-            sb.Append("  Cart: ").Append(Cart).Append("\n");
-            sb.Append("  FulfillmentInfo: ").Append(FulfillmentInfo).Append("\n");
-            sb.Append("  ChannelOrderId: ").Append(ChannelOrderId).Append("\n");
-            sb.Append("  ChannelPublicOrderId: ").Append(ChannelPublicOrderId).Append("\n");
-            sb.Append("  OrderDateUtc: ").Append(OrderDateUtc).Append("\n");
-            sb.Append("  PaymentInfo: ").Append(PaymentInfo).Append("\n");
-            sb.Append("  Contact: ").Append(Contact).Append("\n");
-            sb.Append("  TipAmount: ").Append(TipAmount).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as OrderIngestSubmitOrderRequest);
-        }
-
-        /// <summary>
-        /// Returns true if OrderIngestSubmitOrderRequest instances are equal
-        /// </summary>
-        /// <param name="input">Instance of OrderIngestSubmitOrderRequest to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(OrderIngestSubmitOrderRequest input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.AppType == input.AppType ||
-                    (this.AppType != null &&
-                    this.AppType.Equals(input.AppType))
-                ) && 
-                (
-                    this.StoreId == input.StoreId ||
-                    (this.StoreId != null &&
-                    this.StoreId.Equals(input.StoreId))
-                ) && 
-                (
-                    this.CurrencyCode == input.CurrencyCode ||
-                    (this.CurrencyCode != null &&
-                    this.CurrencyCode.Equals(input.CurrencyCode))
-                ) && 
-                (
-                    this.Cart == input.Cart ||
-                    (this.Cart != null &&
-                    this.Cart.Equals(input.Cart))
-                ) && 
-                (
-                    this.FulfillmentInfo == input.FulfillmentInfo ||
-                    (this.FulfillmentInfo != null &&
-                    this.FulfillmentInfo.Equals(input.FulfillmentInfo))
-                ) && 
-                (
-                    this.ChannelOrderId == input.ChannelOrderId ||
-                    (this.ChannelOrderId != null &&
-                    this.ChannelOrderId.Equals(input.ChannelOrderId))
-                ) && 
-                (
-                    this.ChannelPublicOrderId == input.ChannelPublicOrderId ||
-                    (this.ChannelPublicOrderId != null &&
-                    this.ChannelPublicOrderId.Equals(input.ChannelPublicOrderId))
-                ) && 
-                (
-                    this.OrderDateUtc == input.OrderDateUtc ||
-                    (this.OrderDateUtc != null &&
-                    this.OrderDateUtc.Equals(input.OrderDateUtc))
-                ) && 
-                (
-                    this.PaymentInfo == input.PaymentInfo ||
-                    (this.PaymentInfo != null &&
-                    this.PaymentInfo.Equals(input.PaymentInfo))
-                ) && 
-                (
-                    this.Contact == input.Contact ||
-                    (this.Contact != null &&
-                    this.Contact.Equals(input.Contact))
-                ) && 
-                (
-                    this.TipAmount == input.TipAmount ||
-                    (this.TipAmount != null &&
-                    this.TipAmount.Equals(input.TipAmount))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.AppType != null)
-                    hashCode = hashCode * 59 + this.AppType.GetHashCode();
-                if (this.StoreId != null)
-                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
-                if (this.CurrencyCode != null)
-                    hashCode = hashCode * 59 + this.CurrencyCode.GetHashCode();
-                if (this.Cart != null)
-                    hashCode = hashCode * 59 + this.Cart.GetHashCode();
-                if (this.FulfillmentInfo != null)
-                    hashCode = hashCode * 59 + this.FulfillmentInfo.GetHashCode();
-                if (this.ChannelOrderId != null)
-                    hashCode = hashCode * 59 + this.ChannelOrderId.GetHashCode();
-                if (this.ChannelPublicOrderId != null)
-                    hashCode = hashCode * 59 + this.ChannelPublicOrderId.GetHashCode();
-                if (this.OrderDateUtc != null)
-                    hashCode = hashCode * 59 + this.OrderDateUtc.GetHashCode();
-                if (this.PaymentInfo != null)
-                    hashCode = hashCode * 59 + this.PaymentInfo.GetHashCode();
-                if (this.Contact != null)
-                    hashCode = hashCode * 59 + this.Contact.GetHashCode();
-                if (this.TipAmount != null)
-                    hashCode = hashCode * 59 + this.TipAmount.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/OrderIngestSubmitOrderResponse.cs b/src/Flipdish/Model/OrderIngestSubmitOrderResponse.cs
deleted file mode 100644
index aa6b2368..00000000
--- a/src/Flipdish/Model/OrderIngestSubmitOrderResponse.cs
+++ /dev/null
@@ -1,906 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// OrderIngestSubmitOrderResponse
-    /// </summary>
-    [DataContract]
-    public partial class OrderIngestSubmitOrderResponse :  IEquatable<OrderIngestSubmitOrderResponse>, IValidatableObject
-    {
-        /// <summary>
-        /// Defines CurrencyCode
-        /// </summary>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum CurrencyCodeEnum
-        {
-            
-            /// <summary>
-            /// Enum EUR for value: EUR
-            /// </summary>
-            [EnumMember(Value = "EUR")]
-            EUR = 1,
-            
-            /// <summary>
-            /// Enum USD for value: USD
-            /// </summary>
-            [EnumMember(Value = "USD")]
-            USD = 2,
-            
-            /// <summary>
-            /// Enum GBP for value: GBP
-            /// </summary>
-            [EnumMember(Value = "GBP")]
-            GBP = 3,
-            
-            /// <summary>
-            /// Enum CAD for value: CAD
-            /// </summary>
-            [EnumMember(Value = "CAD")]
-            CAD = 4,
-            
-            /// <summary>
-            /// Enum AUD for value: AUD
-            /// </summary>
-            [EnumMember(Value = "AUD")]
-            AUD = 5,
-            
-            /// <summary>
-            /// Enum DJF for value: DJF
-            /// </summary>
-            [EnumMember(Value = "DJF")]
-            DJF = 6,
-            
-            /// <summary>
-            /// Enum ZAR for value: ZAR
-            /// </summary>
-            [EnumMember(Value = "ZAR")]
-            ZAR = 7,
-            
-            /// <summary>
-            /// Enum ETB for value: ETB
-            /// </summary>
-            [EnumMember(Value = "ETB")]
-            ETB = 8,
-            
-            /// <summary>
-            /// Enum AED for value: AED
-            /// </summary>
-            [EnumMember(Value = "AED")]
-            AED = 9,
-            
-            /// <summary>
-            /// Enum BHD for value: BHD
-            /// </summary>
-            [EnumMember(Value = "BHD")]
-            BHD = 10,
-            
-            /// <summary>
-            /// Enum DZD for value: DZD
-            /// </summary>
-            [EnumMember(Value = "DZD")]
-            DZD = 11,
-            
-            /// <summary>
-            /// Enum EGP for value: EGP
-            /// </summary>
-            [EnumMember(Value = "EGP")]
-            EGP = 12,
-            
-            /// <summary>
-            /// Enum IQD for value: IQD
-            /// </summary>
-            [EnumMember(Value = "IQD")]
-            IQD = 13,
-            
-            /// <summary>
-            /// Enum JOD for value: JOD
-            /// </summary>
-            [EnumMember(Value = "JOD")]
-            JOD = 14,
-            
-            /// <summary>
-            /// Enum KWD for value: KWD
-            /// </summary>
-            [EnumMember(Value = "KWD")]
-            KWD = 15,
-            
-            /// <summary>
-            /// Enum LBP for value: LBP
-            /// </summary>
-            [EnumMember(Value = "LBP")]
-            LBP = 16,
-            
-            /// <summary>
-            /// Enum LYD for value: LYD
-            /// </summary>
-            [EnumMember(Value = "LYD")]
-            LYD = 17,
-            
-            /// <summary>
-            /// Enum MAD for value: MAD
-            /// </summary>
-            [EnumMember(Value = "MAD")]
-            MAD = 18,
-            
-            /// <summary>
-            /// Enum OMR for value: OMR
-            /// </summary>
-            [EnumMember(Value = "OMR")]
-            OMR = 19,
-            
-            /// <summary>
-            /// Enum QAR for value: QAR
-            /// </summary>
-            [EnumMember(Value = "QAR")]
-            QAR = 20,
-            
-            /// <summary>
-            /// Enum SAR for value: SAR
-            /// </summary>
-            [EnumMember(Value = "SAR")]
-            SAR = 21,
-            
-            /// <summary>
-            /// Enum SYP for value: SYP
-            /// </summary>
-            [EnumMember(Value = "SYP")]
-            SYP = 22,
-            
-            /// <summary>
-            /// Enum TND for value: TND
-            /// </summary>
-            [EnumMember(Value = "TND")]
-            TND = 23,
-            
-            /// <summary>
-            /// Enum YER for value: YER
-            /// </summary>
-            [EnumMember(Value = "YER")]
-            YER = 24,
-            
-            /// <summary>
-            /// Enum CLP for value: CLP
-            /// </summary>
-            [EnumMember(Value = "CLP")]
-            CLP = 25,
-            
-            /// <summary>
-            /// Enum INR for value: INR
-            /// </summary>
-            [EnumMember(Value = "INR")]
-            INR = 26,
-            
-            /// <summary>
-            /// Enum AZN for value: AZN
-            /// </summary>
-            [EnumMember(Value = "AZN")]
-            AZN = 27,
-            
-            /// <summary>
-            /// Enum RUB for value: RUB
-            /// </summary>
-            [EnumMember(Value = "RUB")]
-            RUB = 28,
-            
-            /// <summary>
-            /// Enum BYN for value: BYN
-            /// </summary>
-            [EnumMember(Value = "BYN")]
-            BYN = 29,
-            
-            /// <summary>
-            /// Enum BGN for value: BGN
-            /// </summary>
-            [EnumMember(Value = "BGN")]
-            BGN = 30,
-            
-            /// <summary>
-            /// Enum NGN for value: NGN
-            /// </summary>
-            [EnumMember(Value = "NGN")]
-            NGN = 31,
-            
-            /// <summary>
-            /// Enum BDT for value: BDT
-            /// </summary>
-            [EnumMember(Value = "BDT")]
-            BDT = 32,
-            
-            /// <summary>
-            /// Enum CNY for value: CNY
-            /// </summary>
-            [EnumMember(Value = "CNY")]
-            CNY = 33,
-            
-            /// <summary>
-            /// Enum BAM for value: BAM
-            /// </summary>
-            [EnumMember(Value = "BAM")]
-            BAM = 34,
-            
-            /// <summary>
-            /// Enum CZK for value: CZK
-            /// </summary>
-            [EnumMember(Value = "CZK")]
-            CZK = 35,
-            
-            /// <summary>
-            /// Enum DKK for value: DKK
-            /// </summary>
-            [EnumMember(Value = "DKK")]
-            DKK = 36,
-            
-            /// <summary>
-            /// Enum CHF for value: CHF
-            /// </summary>
-            [EnumMember(Value = "CHF")]
-            CHF = 37,
-            
-            /// <summary>
-            /// Enum MVR for value: MVR
-            /// </summary>
-            [EnumMember(Value = "MVR")]
-            MVR = 38,
-            
-            /// <summary>
-            /// Enum BTN for value: BTN
-            /// </summary>
-            [EnumMember(Value = "BTN")]
-            BTN = 39,
-            
-            /// <summary>
-            /// Enum XCD for value: XCD
-            /// </summary>
-            [EnumMember(Value = "XCD")]
-            XCD = 40,
-            
-            /// <summary>
-            /// Enum BZD for value: BZD
-            /// </summary>
-            [EnumMember(Value = "BZD")]
-            BZD = 41,
-            
-            /// <summary>
-            /// Enum HKD for value: HKD
-            /// </summary>
-            [EnumMember(Value = "HKD")]
-            HKD = 42,
-            
-            /// <summary>
-            /// Enum IDR for value: IDR
-            /// </summary>
-            [EnumMember(Value = "IDR")]
-            IDR = 43,
-            
-            /// <summary>
-            /// Enum JMD for value: JMD
-            /// </summary>
-            [EnumMember(Value = "JMD")]
-            JMD = 44,
-            
-            /// <summary>
-            /// Enum MYR for value: MYR
-            /// </summary>
-            [EnumMember(Value = "MYR")]
-            MYR = 45,
-            
-            /// <summary>
-            /// Enum NZD for value: NZD
-            /// </summary>
-            [EnumMember(Value = "NZD")]
-            NZD = 46,
-            
-            /// <summary>
-            /// Enum PHP for value: PHP
-            /// </summary>
-            [EnumMember(Value = "PHP")]
-            PHP = 47,
-            
-            /// <summary>
-            /// Enum SGD for value: SGD
-            /// </summary>
-            [EnumMember(Value = "SGD")]
-            SGD = 48,
-            
-            /// <summary>
-            /// Enum TTD for value: TTD
-            /// </summary>
-            [EnumMember(Value = "TTD")]
-            TTD = 49,
-            
-            /// <summary>
-            /// Enum XDR for value: XDR
-            /// </summary>
-            [EnumMember(Value = "XDR")]
-            XDR = 50,
-            
-            /// <summary>
-            /// Enum ARS for value: ARS
-            /// </summary>
-            [EnumMember(Value = "ARS")]
-            ARS = 51,
-            
-            /// <summary>
-            /// Enum BOB for value: BOB
-            /// </summary>
-            [EnumMember(Value = "BOB")]
-            BOB = 52,
-            
-            /// <summary>
-            /// Enum COP for value: COP
-            /// </summary>
-            [EnumMember(Value = "COP")]
-            COP = 53,
-            
-            /// <summary>
-            /// Enum CRC for value: CRC
-            /// </summary>
-            [EnumMember(Value = "CRC")]
-            CRC = 54,
-            
-            /// <summary>
-            /// Enum CUP for value: CUP
-            /// </summary>
-            [EnumMember(Value = "CUP")]
-            CUP = 55,
-            
-            /// <summary>
-            /// Enum DOP for value: DOP
-            /// </summary>
-            [EnumMember(Value = "DOP")]
-            DOP = 56,
-            
-            /// <summary>
-            /// Enum GTQ for value: GTQ
-            /// </summary>
-            [EnumMember(Value = "GTQ")]
-            GTQ = 57,
-            
-            /// <summary>
-            /// Enum HNL for value: HNL
-            /// </summary>
-            [EnumMember(Value = "HNL")]
-            HNL = 58,
-            
-            /// <summary>
-            /// Enum MXN for value: MXN
-            /// </summary>
-            [EnumMember(Value = "MXN")]
-            MXN = 59,
-            
-            /// <summary>
-            /// Enum NIO for value: NIO
-            /// </summary>
-            [EnumMember(Value = "NIO")]
-            NIO = 60,
-            
-            /// <summary>
-            /// Enum PAB for value: PAB
-            /// </summary>
-            [EnumMember(Value = "PAB")]
-            PAB = 61,
-            
-            /// <summary>
-            /// Enum PEN for value: PEN
-            /// </summary>
-            [EnumMember(Value = "PEN")]
-            PEN = 62,
-            
-            /// <summary>
-            /// Enum PYG for value: PYG
-            /// </summary>
-            [EnumMember(Value = "PYG")]
-            PYG = 63,
-            
-            /// <summary>
-            /// Enum UYU for value: UYU
-            /// </summary>
-            [EnumMember(Value = "UYU")]
-            UYU = 64,
-            
-            /// <summary>
-            /// Enum VEF for value: VEF
-            /// </summary>
-            [EnumMember(Value = "VEF")]
-            VEF = 65,
-            
-            /// <summary>
-            /// Enum IRR for value: IRR
-            /// </summary>
-            [EnumMember(Value = "IRR")]
-            IRR = 66,
-            
-            /// <summary>
-            /// Enum XOF for value: XOF
-            /// </summary>
-            [EnumMember(Value = "XOF")]
-            XOF = 67,
-            
-            /// <summary>
-            /// Enum CDF for value: CDF
-            /// </summary>
-            [EnumMember(Value = "CDF")]
-            CDF = 68,
-            
-            /// <summary>
-            /// Enum XAF for value: XAF
-            /// </summary>
-            [EnumMember(Value = "XAF")]
-            XAF = 69,
-            
-            /// <summary>
-            /// Enum HTG for value: HTG
-            /// </summary>
-            [EnumMember(Value = "HTG")]
-            HTG = 70,
-            
-            /// <summary>
-            /// Enum ILS for value: ILS
-            /// </summary>
-            [EnumMember(Value = "ILS")]
-            ILS = 71,
-            
-            /// <summary>
-            /// Enum HRK for value: HRK
-            /// </summary>
-            [EnumMember(Value = "HRK")]
-            HRK = 72,
-            
-            /// <summary>
-            /// Enum HUF for value: HUF
-            /// </summary>
-            [EnumMember(Value = "HUF")]
-            HUF = 73,
-            
-            /// <summary>
-            /// Enum AMD for value: AMD
-            /// </summary>
-            [EnumMember(Value = "AMD")]
-            AMD = 74,
-            
-            /// <summary>
-            /// Enum ISK for value: ISK
-            /// </summary>
-            [EnumMember(Value = "ISK")]
-            ISK = 75,
-            
-            /// <summary>
-            /// Enum JPY for value: JPY
-            /// </summary>
-            [EnumMember(Value = "JPY")]
-            JPY = 76,
-            
-            /// <summary>
-            /// Enum GEL for value: GEL
-            /// </summary>
-            [EnumMember(Value = "GEL")]
-            GEL = 77,
-            
-            /// <summary>
-            /// Enum KZT for value: KZT
-            /// </summary>
-            [EnumMember(Value = "KZT")]
-            KZT = 78,
-            
-            /// <summary>
-            /// Enum KHR for value: KHR
-            /// </summary>
-            [EnumMember(Value = "KHR")]
-            KHR = 79,
-            
-            /// <summary>
-            /// Enum KRW for value: KRW
-            /// </summary>
-            [EnumMember(Value = "KRW")]
-            KRW = 80,
-            
-            /// <summary>
-            /// Enum KGS for value: KGS
-            /// </summary>
-            [EnumMember(Value = "KGS")]
-            KGS = 81,
-            
-            /// <summary>
-            /// Enum LAK for value: LAK
-            /// </summary>
-            [EnumMember(Value = "LAK")]
-            LAK = 82,
-            
-            /// <summary>
-            /// Enum MKD for value: MKD
-            /// </summary>
-            [EnumMember(Value = "MKD")]
-            MKD = 83,
-            
-            /// <summary>
-            /// Enum MNT for value: MNT
-            /// </summary>
-            [EnumMember(Value = "MNT")]
-            MNT = 84,
-            
-            /// <summary>
-            /// Enum BND for value: BND
-            /// </summary>
-            [EnumMember(Value = "BND")]
-            BND = 85,
-            
-            /// <summary>
-            /// Enum MMK for value: MMK
-            /// </summary>
-            [EnumMember(Value = "MMK")]
-            MMK = 86,
-            
-            /// <summary>
-            /// Enum NOK for value: NOK
-            /// </summary>
-            [EnumMember(Value = "NOK")]
-            NOK = 87,
-            
-            /// <summary>
-            /// Enum NPR for value: NPR
-            /// </summary>
-            [EnumMember(Value = "NPR")]
-            NPR = 88,
-            
-            /// <summary>
-            /// Enum PKR for value: PKR
-            /// </summary>
-            [EnumMember(Value = "PKR")]
-            PKR = 89,
-            
-            /// <summary>
-            /// Enum PLN for value: PLN
-            /// </summary>
-            [EnumMember(Value = "PLN")]
-            PLN = 90,
-            
-            /// <summary>
-            /// Enum AFN for value: AFN
-            /// </summary>
-            [EnumMember(Value = "AFN")]
-            AFN = 91,
-            
-            /// <summary>
-            /// Enum BRL for value: BRL
-            /// </summary>
-            [EnumMember(Value = "BRL")]
-            BRL = 92,
-            
-            /// <summary>
-            /// Enum MDL for value: MDL
-            /// </summary>
-            [EnumMember(Value = "MDL")]
-            MDL = 93,
-            
-            /// <summary>
-            /// Enum RON for value: RON
-            /// </summary>
-            [EnumMember(Value = "RON")]
-            RON = 94,
-            
-            /// <summary>
-            /// Enum RWF for value: RWF
-            /// </summary>
-            [EnumMember(Value = "RWF")]
-            RWF = 95,
-            
-            /// <summary>
-            /// Enum SEK for value: SEK
-            /// </summary>
-            [EnumMember(Value = "SEK")]
-            SEK = 96,
-            
-            /// <summary>
-            /// Enum LKR for value: LKR
-            /// </summary>
-            [EnumMember(Value = "LKR")]
-            LKR = 97,
-            
-            /// <summary>
-            /// Enum SOS for value: SOS
-            /// </summary>
-            [EnumMember(Value = "SOS")]
-            SOS = 98,
-            
-            /// <summary>
-            /// Enum ALL for value: ALL
-            /// </summary>
-            [EnumMember(Value = "ALL")]
-            ALL = 99,
-            
-            /// <summary>
-            /// Enum RSD for value: RSD
-            /// </summary>
-            [EnumMember(Value = "RSD")]
-            RSD = 100,
-            
-            /// <summary>
-            /// Enum KES for value: KES
-            /// </summary>
-            [EnumMember(Value = "KES")]
-            KES = 101,
-            
-            /// <summary>
-            /// Enum TJS for value: TJS
-            /// </summary>
-            [EnumMember(Value = "TJS")]
-            TJS = 102,
-            
-            /// <summary>
-            /// Enum THB for value: THB
-            /// </summary>
-            [EnumMember(Value = "THB")]
-            THB = 103,
-            
-            /// <summary>
-            /// Enum ERN for value: ERN
-            /// </summary>
-            [EnumMember(Value = "ERN")]
-            ERN = 104,
-            
-            /// <summary>
-            /// Enum TMT for value: TMT
-            /// </summary>
-            [EnumMember(Value = "TMT")]
-            TMT = 105,
-            
-            /// <summary>
-            /// Enum BWP for value: BWP
-            /// </summary>
-            [EnumMember(Value = "BWP")]
-            BWP = 106,
-            
-            /// <summary>
-            /// Enum TRY for value: TRY
-            /// </summary>
-            [EnumMember(Value = "TRY")]
-            TRY = 107,
-            
-            /// <summary>
-            /// Enum UAH for value: UAH
-            /// </summary>
-            [EnumMember(Value = "UAH")]
-            UAH = 108,
-            
-            /// <summary>
-            /// Enum UZS for value: UZS
-            /// </summary>
-            [EnumMember(Value = "UZS")]
-            UZS = 109,
-            
-            /// <summary>
-            /// Enum VND for value: VND
-            /// </summary>
-            [EnumMember(Value = "VND")]
-            VND = 110,
-            
-            /// <summary>
-            /// Enum MOP for value: MOP
-            /// </summary>
-            [EnumMember(Value = "MOP")]
-            MOP = 111,
-            
-            /// <summary>
-            /// Enum TWD for value: TWD
-            /// </summary>
-            [EnumMember(Value = "TWD")]
-            TWD = 112,
-            
-            /// <summary>
-            /// Enum BMD for value: BMD
-            /// </summary>
-            [EnumMember(Value = "BMD")]
-            BMD = 113
-        }
-
-        /// <summary>
-        /// Gets or Sets CurrencyCode
-        /// </summary>
-        [DataMember(Name="CurrencyCode", EmitDefaultValue=false)]
-        public CurrencyCodeEnum? CurrencyCode { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderIngestSubmitOrderResponse" /> class.
-        /// </summary>
-        /// <param name="orderId">orderId.</param>
-        /// <param name="receiptUrl">receiptUrl.</param>
-        /// <param name="currencyCode">currencyCode.</param>
-        /// <param name="totalPrice">totalPrice.</param>
-        /// <param name="deliveryFee">deliveryFee.</param>
-        /// <param name="estimatedDeliveryTime">estimatedDeliveryTime.</param>
-        /// <param name="channelOrderId">channelOrderId.</param>
-        public OrderIngestSubmitOrderResponse(int? orderId = default(int?), string receiptUrl = default(string), CurrencyCodeEnum? currencyCode = default(CurrencyCodeEnum?), Price totalPrice = default(Price), Price deliveryFee = default(Price), DateTime? estimatedDeliveryTime = default(DateTime?), string channelOrderId = default(string))
-        {
-            this.OrderId = orderId;
-            this.ReceiptUrl = receiptUrl;
-            this.CurrencyCode = currencyCode;
-            this.TotalPrice = totalPrice;
-            this.DeliveryFee = deliveryFee;
-            this.EstimatedDeliveryTime = estimatedDeliveryTime;
-            this.ChannelOrderId = channelOrderId;
-        }
-        
-        /// <summary>
-        /// Gets or Sets OrderId
-        /// </summary>
-        [DataMember(Name="OrderId", EmitDefaultValue=false)]
-        public int? OrderId { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ReceiptUrl
-        /// </summary>
-        [DataMember(Name="ReceiptUrl", EmitDefaultValue=false)]
-        public string ReceiptUrl { get; set; }
-
-
-        /// <summary>
-        /// Gets or Sets TotalPrice
-        /// </summary>
-        [DataMember(Name="TotalPrice", EmitDefaultValue=false)]
-        public Price TotalPrice { get; set; }
-
-        /// <summary>
-        /// Gets or Sets DeliveryFee
-        /// </summary>
-        [DataMember(Name="DeliveryFee", EmitDefaultValue=false)]
-        public Price DeliveryFee { get; set; }
-
-        /// <summary>
-        /// Gets or Sets EstimatedDeliveryTime
-        /// </summary>
-        [DataMember(Name="EstimatedDeliveryTime", EmitDefaultValue=false)]
-        public DateTime? EstimatedDeliveryTime { get; set; }
-
-        /// <summary>
-        /// Gets or Sets ChannelOrderId
-        /// </summary>
-        [DataMember(Name="ChannelOrderId", EmitDefaultValue=false)]
-        public string ChannelOrderId { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class OrderIngestSubmitOrderResponse {\n");
-            sb.Append("  OrderId: ").Append(OrderId).Append("\n");
-            sb.Append("  ReceiptUrl: ").Append(ReceiptUrl).Append("\n");
-            sb.Append("  CurrencyCode: ").Append(CurrencyCode).Append("\n");
-            sb.Append("  TotalPrice: ").Append(TotalPrice).Append("\n");
-            sb.Append("  DeliveryFee: ").Append(DeliveryFee).Append("\n");
-            sb.Append("  EstimatedDeliveryTime: ").Append(EstimatedDeliveryTime).Append("\n");
-            sb.Append("  ChannelOrderId: ").Append(ChannelOrderId).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as OrderIngestSubmitOrderResponse);
-        }
-
-        /// <summary>
-        /// Returns true if OrderIngestSubmitOrderResponse instances are equal
-        /// </summary>
-        /// <param name="input">Instance of OrderIngestSubmitOrderResponse to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(OrderIngestSubmitOrderResponse input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.OrderId == input.OrderId ||
-                    (this.OrderId != null &&
-                    this.OrderId.Equals(input.OrderId))
-                ) && 
-                (
-                    this.ReceiptUrl == input.ReceiptUrl ||
-                    (this.ReceiptUrl != null &&
-                    this.ReceiptUrl.Equals(input.ReceiptUrl))
-                ) && 
-                (
-                    this.CurrencyCode == input.CurrencyCode ||
-                    (this.CurrencyCode != null &&
-                    this.CurrencyCode.Equals(input.CurrencyCode))
-                ) && 
-                (
-                    this.TotalPrice == input.TotalPrice ||
-                    (this.TotalPrice != null &&
-                    this.TotalPrice.Equals(input.TotalPrice))
-                ) && 
-                (
-                    this.DeliveryFee == input.DeliveryFee ||
-                    (this.DeliveryFee != null &&
-                    this.DeliveryFee.Equals(input.DeliveryFee))
-                ) && 
-                (
-                    this.EstimatedDeliveryTime == input.EstimatedDeliveryTime ||
-                    (this.EstimatedDeliveryTime != null &&
-                    this.EstimatedDeliveryTime.Equals(input.EstimatedDeliveryTime))
-                ) && 
-                (
-                    this.ChannelOrderId == input.ChannelOrderId ||
-                    (this.ChannelOrderId != null &&
-                    this.ChannelOrderId.Equals(input.ChannelOrderId))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.OrderId != null)
-                    hashCode = hashCode * 59 + this.OrderId.GetHashCode();
-                if (this.ReceiptUrl != null)
-                    hashCode = hashCode * 59 + this.ReceiptUrl.GetHashCode();
-                if (this.CurrencyCode != null)
-                    hashCode = hashCode * 59 + this.CurrencyCode.GetHashCode();
-                if (this.TotalPrice != null)
-                    hashCode = hashCode * 59 + this.TotalPrice.GetHashCode();
-                if (this.DeliveryFee != null)
-                    hashCode = hashCode * 59 + this.DeliveryFee.GetHashCode();
-                if (this.EstimatedDeliveryTime != null)
-                    hashCode = hashCode * 59 + this.EstimatedDeliveryTime.GetHashCode();
-                if (this.ChannelOrderId != null)
-                    hashCode = hashCode * 59 + this.ChannelOrderId.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/OrderItem.cs b/src/Flipdish/Model/OrderItem.cs
index b04ce247..624d2820 100644
--- a/src/Flipdish/Model/OrderItem.cs
+++ b/src/Flipdish/Model/OrderItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order item
     /// </summary>
     [DataContract]
-    public partial class OrderItem :  IEquatable<OrderItem>, IValidatableObject
+    public partial class OrderItem :  IEquatable<OrderItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderItem" /> class.
@@ -41,11 +39,13 @@ public partial class OrderItem :  IEquatable<OrderItem>, IValidatableObject
         /// <param name="name">Name.</param>
         /// <param name="description">Description.</param>
         /// <param name="price">Price.</param>
+        /// <param name="taxAmount">Tax currency amount.</param>
         /// <param name="priceIncludingOptionSetItems">Price including option set items.</param>
         /// <param name="menuItemId">Menu item identifier.</param>
         /// <param name="menuItemDisplayOrder">Menu item display order.</param>
         /// <param name="isAvailable">Is available.</param>
-        public OrderItem(List<OrderItemOption> orderItemOptions = default(List<OrderItemOption>), Dictionary<string, string> metadata = default(Dictionary<string, string>), Guid? menuItemPublicId = default(Guid?), string menuSectionName = default(string), int? menuSectionDisplayOrder = default(int?), string name = default(string), string description = default(string), double? price = default(double?), double? priceIncludingOptionSetItems = default(double?), int? menuItemId = default(int?), int? menuItemDisplayOrder = default(int?), bool? isAvailable = default(bool?))
+        /// <param name="depositReturnFee">Deposit return fee.</param>
+        public OrderItem(List<OrderItemOption> orderItemOptions = default(List<OrderItemOption>), Dictionary<string, string> metadata = default(Dictionary<string, string>), Guid? menuItemPublicId = default(Guid?), string menuSectionName = default(string), int? menuSectionDisplayOrder = default(int?), string name = default(string), string description = default(string), double? price = default(double?), double? taxAmount = default(double?), double? priceIncludingOptionSetItems = default(double?), int? menuItemId = default(int?), int? menuItemDisplayOrder = default(int?), bool? isAvailable = default(bool?), double? depositReturnFee = default(double?))
         {
             this.OrderItemOptions = orderItemOptions;
             this.Metadata = metadata;
@@ -55,10 +55,12 @@ public partial class OrderItem :  IEquatable<OrderItem>, IValidatableObject
             this.Name = name;
             this.Description = description;
             this.Price = price;
+            this.TaxAmount = taxAmount;
             this.PriceIncludingOptionSetItems = priceIncludingOptionSetItems;
             this.MenuItemId = menuItemId;
             this.MenuItemDisplayOrder = menuItemDisplayOrder;
             this.IsAvailable = isAvailable;
+            this.DepositReturnFee = depositReturnFee;
         }
         
         /// <summary>
@@ -117,6 +119,13 @@ public partial class OrderItem :  IEquatable<OrderItem>, IValidatableObject
         [DataMember(Name="Price", EmitDefaultValue=false)]
         public double? Price { get; set; }
 
+        /// <summary>
+        /// Tax currency amount
+        /// </summary>
+        /// <value>Tax currency amount</value>
+        [DataMember(Name="TaxAmount", EmitDefaultValue=false)]
+        public double? TaxAmount { get; set; }
+
         /// <summary>
         /// Price including option set items
         /// </summary>
@@ -145,6 +154,13 @@ public partial class OrderItem :  IEquatable<OrderItem>, IValidatableObject
         [DataMember(Name="IsAvailable", EmitDefaultValue=false)]
         public bool? IsAvailable { get; set; }
 
+        /// <summary>
+        /// Deposit return fee
+        /// </summary>
+        /// <value>Deposit return fee</value>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -161,10 +177,12 @@ public override string ToString()
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  Price: ").Append(Price).Append("\n");
+            sb.Append("  TaxAmount: ").Append(TaxAmount).Append("\n");
             sb.Append("  PriceIncludingOptionSetItems: ").Append(PriceIncludingOptionSetItems).Append("\n");
             sb.Append("  MenuItemId: ").Append(MenuItemId).Append("\n");
             sb.Append("  MenuItemDisplayOrder: ").Append(MenuItemDisplayOrder).Append("\n");
             sb.Append("  IsAvailable: ").Append(IsAvailable).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,6 +257,11 @@ public bool Equals(OrderItem input)
                     (this.Price != null &&
                     this.Price.Equals(input.Price))
                 ) && 
+                (
+                    this.TaxAmount == input.TaxAmount ||
+                    (this.TaxAmount != null &&
+                    this.TaxAmount.Equals(input.TaxAmount))
+                ) && 
                 (
                     this.PriceIncludingOptionSetItems == input.PriceIncludingOptionSetItems ||
                     (this.PriceIncludingOptionSetItems != null &&
@@ -258,6 +281,11 @@ public bool Equals(OrderItem input)
                     this.IsAvailable == input.IsAvailable ||
                     (this.IsAvailable != null &&
                     this.IsAvailable.Equals(input.IsAvailable))
+                ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
                 );
         }
 
@@ -286,6 +314,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
                 if (this.Price != null)
                     hashCode = hashCode * 59 + this.Price.GetHashCode();
+                if (this.TaxAmount != null)
+                    hashCode = hashCode * 59 + this.TaxAmount.GetHashCode();
                 if (this.PriceIncludingOptionSetItems != null)
                     hashCode = hashCode * 59 + this.PriceIncludingOptionSetItems.GetHashCode();
                 if (this.MenuItemId != null)
@@ -294,19 +324,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.MenuItemDisplayOrder.GetHashCode();
                 if (this.IsAvailable != null)
                     hashCode = hashCode * 59 + this.IsAvailable.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderItemOption.cs b/src/Flipdish/Model/OrderItemOption.cs
index 66aa8fb4..8f163911 100644
--- a/src/Flipdish/Model/OrderItemOption.cs
+++ b/src/Flipdish/Model/OrderItemOption.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order item option
     /// </summary>
     [DataContract]
-    public partial class OrderItemOption :  IEquatable<OrderItemOption>, IValidatableObject
+    public partial class OrderItemOption :  IEquatable<OrderItemOption>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderItemOption" /> class.
@@ -39,9 +37,11 @@ public partial class OrderItemOption :  IEquatable<OrderItemOption>, IValidatabl
         /// <param name="isMasterOptionSetItem">Is master option set item.</param>
         /// <param name="name">Name.</param>
         /// <param name="price">Price.</param>
+        /// <param name="taxAmount">Tax currency amount.</param>
         /// <param name="menuItemOptionDisplayOrder">Menu item option display order.</param>
         /// <param name="menuItemOptionSetDisplayOrder">Menu item option set display order.</param>
-        public OrderItemOption(Dictionary<string, string> metadata = default(Dictionary<string, string>), Guid? menuItemOptionPublicId = default(Guid?), int? menuItemOptionId = default(int?), bool? isMasterOptionSetItem = default(bool?), string name = default(string), double? price = default(double?), int? menuItemOptionDisplayOrder = default(int?), int? menuItemOptionSetDisplayOrder = default(int?))
+        /// <param name="depositReturnFee">Deposit return fee.</param>
+        public OrderItemOption(Dictionary<string, string> metadata = default(Dictionary<string, string>), Guid? menuItemOptionPublicId = default(Guid?), int? menuItemOptionId = default(int?), bool? isMasterOptionSetItem = default(bool?), string name = default(string), double? price = default(double?), double? taxAmount = default(double?), int? menuItemOptionDisplayOrder = default(int?), int? menuItemOptionSetDisplayOrder = default(int?), double? depositReturnFee = default(double?))
         {
             this.Metadata = metadata;
             this.MenuItemOptionPublicId = menuItemOptionPublicId;
@@ -49,8 +49,10 @@ public partial class OrderItemOption :  IEquatable<OrderItemOption>, IValidatabl
             this.IsMasterOptionSetItem = isMasterOptionSetItem;
             this.Name = name;
             this.Price = price;
+            this.TaxAmount = taxAmount;
             this.MenuItemOptionDisplayOrder = menuItemOptionDisplayOrder;
             this.MenuItemOptionSetDisplayOrder = menuItemOptionSetDisplayOrder;
+            this.DepositReturnFee = depositReturnFee;
         }
         
         /// <summary>
@@ -95,6 +97,13 @@ public partial class OrderItemOption :  IEquatable<OrderItemOption>, IValidatabl
         [DataMember(Name="Price", EmitDefaultValue=false)]
         public double? Price { get; set; }
 
+        /// <summary>
+        /// Tax currency amount
+        /// </summary>
+        /// <value>Tax currency amount</value>
+        [DataMember(Name="TaxAmount", EmitDefaultValue=false)]
+        public double? TaxAmount { get; set; }
+
         /// <summary>
         /// Menu item option display order
         /// </summary>
@@ -109,6 +118,13 @@ public partial class OrderItemOption :  IEquatable<OrderItemOption>, IValidatabl
         [DataMember(Name="MenuItemOptionSetDisplayOrder", EmitDefaultValue=false)]
         public int? MenuItemOptionSetDisplayOrder { get; set; }
 
+        /// <summary>
+        /// Deposit return fee
+        /// </summary>
+        /// <value>Deposit return fee</value>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -123,8 +139,10 @@ public override string ToString()
             sb.Append("  IsMasterOptionSetItem: ").Append(IsMasterOptionSetItem).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Price: ").Append(Price).Append("\n");
+            sb.Append("  TaxAmount: ").Append(TaxAmount).Append("\n");
             sb.Append("  MenuItemOptionDisplayOrder: ").Append(MenuItemOptionDisplayOrder).Append("\n");
             sb.Append("  MenuItemOptionSetDisplayOrder: ").Append(MenuItemOptionSetDisplayOrder).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -189,6 +207,11 @@ public bool Equals(OrderItemOption input)
                     (this.Price != null &&
                     this.Price.Equals(input.Price))
                 ) && 
+                (
+                    this.TaxAmount == input.TaxAmount ||
+                    (this.TaxAmount != null &&
+                    this.TaxAmount.Equals(input.TaxAmount))
+                ) && 
                 (
                     this.MenuItemOptionDisplayOrder == input.MenuItemOptionDisplayOrder ||
                     (this.MenuItemOptionDisplayOrder != null &&
@@ -198,6 +221,11 @@ public bool Equals(OrderItemOption input)
                     this.MenuItemOptionSetDisplayOrder == input.MenuItemOptionSetDisplayOrder ||
                     (this.MenuItemOptionSetDisplayOrder != null &&
                     this.MenuItemOptionSetDisplayOrder.Equals(input.MenuItemOptionSetDisplayOrder))
+                ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
                 );
         }
 
@@ -222,23 +250,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Price != null)
                     hashCode = hashCode * 59 + this.Price.GetHashCode();
+                if (this.TaxAmount != null)
+                    hashCode = hashCode * 59 + this.TaxAmount.GetHashCode();
                 if (this.MenuItemOptionDisplayOrder != null)
                     hashCode = hashCode * 59 + this.MenuItemOptionDisplayOrder.GetHashCode();
                 if (this.MenuItemOptionSetDisplayOrder != null)
                     hashCode = hashCode * 59 + this.MenuItemOptionSetDisplayOrder.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderLeadTimes.cs b/src/Flipdish/Model/OrderLeadTimes.cs
new file mode 100644
index 00000000..e3e7e93c
--- /dev/null
+++ b/src/Flipdish/Model/OrderLeadTimes.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// When orders are accepted, and no lead time is specified by the operator, this is the lead time that will be  applied to the order.
+    /// </summary>
+    [DataContract]
+    public partial class OrderLeadTimes :  IEquatable<OrderLeadTimes>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderLeadTimes" /> class.
+        /// </summary>
+        /// <param name="leadTimeMinutes">Mapping from the type of order to, to the default lead time that will be applied to those orders.  The lead time is an integer number of minutes..</param>
+        public OrderLeadTimes(Dictionary<string, int?> leadTimeMinutes = default(Dictionary<string, int?>))
+        {
+            this.LeadTimeMinutes = leadTimeMinutes;
+        }
+        
+        /// <summary>
+        /// Mapping from the type of order to, to the default lead time that will be applied to those orders.  The lead time is an integer number of minutes.
+        /// </summary>
+        /// <value>Mapping from the type of order to, to the default lead time that will be applied to those orders.  The lead time is an integer number of minutes.</value>
+        [DataMember(Name="LeadTimeMinutes", EmitDefaultValue=false)]
+        public Dictionary<string, int?> LeadTimeMinutes { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class OrderLeadTimes {\n");
+            sb.Append("  LeadTimeMinutes: ").Append(LeadTimeMinutes).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as OrderLeadTimes);
+        }
+
+        /// <summary>
+        /// Returns true if OrderLeadTimes instances are equal
+        /// </summary>
+        /// <param name="input">Instance of OrderLeadTimes to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(OrderLeadTimes input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.LeadTimeMinutes == input.LeadTimeMinutes ||
+                    this.LeadTimeMinutes != null &&
+                    this.LeadTimeMinutes.SequenceEqual(input.LeadTimeMinutes)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.LeadTimeMinutes != null)
+                    hashCode = hashCode * 59 + this.LeadTimeMinutes.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/OrderList.cs b/src/Flipdish/Model/OrderList.cs
new file mode 100644
index 00000000..e0f93a97
--- /dev/null
+++ b/src/Flipdish/Model/OrderList.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// A list of orders.
+    /// </summary>
+    [DataContract]
+    public partial class OrderList :  IEquatable<OrderList>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderList" /> class.
+        /// </summary>
+        /// <param name="orders">A list of orders..</param>
+        public OrderList(List<OrderReference> orders = default(List<OrderReference>))
+        {
+            this.Orders = orders;
+        }
+        
+        /// <summary>
+        /// A list of orders.
+        /// </summary>
+        /// <value>A list of orders.</value>
+        [DataMember(Name="Orders", EmitDefaultValue=false)]
+        public List<OrderReference> Orders { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class OrderList {\n");
+            sb.Append("  Orders: ").Append(Orders).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as OrderList);
+        }
+
+        /// <summary>
+        /// Returns true if OrderList instances are equal
+        /// </summary>
+        /// <param name="input">Instance of OrderList to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(OrderList input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Orders == input.Orders ||
+                    this.Orders != null &&
+                    this.Orders.SequenceEqual(input.Orders)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Orders != null)
+                    hashCode = hashCode * 59 + this.Orders.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/OrderPaymentInformation.cs b/src/Flipdish/Model/OrderPaymentInformation.cs
index 14199f03..3f8c123d 100644
--- a/src/Flipdish/Model/OrderPaymentInformation.cs
+++ b/src/Flipdish/Model/OrderPaymentInformation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Payment Information
     /// </summary>
     [DataContract]
-    public partial class OrderPaymentInformation :  IEquatable<OrderPaymentInformation>, IValidatableObject
+    public partial class OrderPaymentInformation :  IEquatable<OrderPaymentInformation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderPaymentInformation" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderRatingUpdatedEvent.cs b/src/Flipdish/Model/OrderRatingUpdatedEvent.cs
index b62d28d0..ca5ee8a7 100644
--- a/src/Flipdish/Model/OrderRatingUpdatedEvent.cs
+++ b/src/Flipdish/Model/OrderRatingUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Rating Update Event
     /// </summary>
     [DataContract]
-    public partial class OrderRatingUpdatedEvent :  IEquatable<OrderRatingUpdatedEvent>, IValidatableObject
+    public partial class OrderRatingUpdatedEvent :  IEquatable<OrderRatingUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderRatingUpdatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class OrderRatingUpdatedEvent :  IEquatable<OrderRatingUpdatedEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderRatingUpdatedEvent(string eventName = default(string), int? rating = default(int?), string description = default(string), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderRatingUpdatedEvent(string eventName = default(string), int? rating = default(int?), string description = default(string), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Rating = rating;
@@ -52,7 +53,10 @@ public partial class OrderRatingUpdatedEvent :  IEquatable<OrderRatingUpdatedEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class OrderRatingUpdatedEvent :  IEquatable<OrderRatingUpdatedEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class OrderRatingUpdatedEvent :  IEquatable<OrderRatingUpdatedEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(OrderRatingUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderReference.cs b/src/Flipdish/Model/OrderReference.cs
new file mode 100644
index 00000000..a9891c8a
--- /dev/null
+++ b/src/Flipdish/Model/OrderReference.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// A reference to an order.
+    /// </summary>
+    [DataContract]
+    public partial class OrderReference :  IEquatable<OrderReference>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderReference" /> class.
+        /// </summary>
+        /// <param name="orderId">The ID of the order..</param>
+        public OrderReference(int? orderId = default(int?))
+        {
+            this.OrderId = orderId;
+        }
+        
+        /// <summary>
+        /// The ID of the order.
+        /// </summary>
+        /// <value>The ID of the order.</value>
+        [DataMember(Name="OrderId", EmitDefaultValue=false)]
+        public int? OrderId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class OrderReference {\n");
+            sb.Append("  OrderId: ").Append(OrderId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as OrderReference);
+        }
+
+        /// <summary>
+        /// Returns true if OrderReference instances are equal
+        /// </summary>
+        /// <param name="input">Instance of OrderReference to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(OrderReference input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.OrderId == input.OrderId ||
+                    (this.OrderId != null &&
+                    this.OrderId.Equals(input.OrderId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.OrderId != null)
+                    hashCode = hashCode * 59 + this.OrderId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/OrderRefundedEvent.cs b/src/Flipdish/Model/OrderRefundedEvent.cs
index 91ff75b7..57f67075 100644
--- a/src/Flipdish/Model/OrderRefundedEvent.cs
+++ b/src/Flipdish/Model/OrderRefundedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Refunded Event
     /// </summary>
     [DataContract]
-    public partial class OrderRefundedEvent :  IEquatable<OrderRefundedEvent>, IValidatableObject
+    public partial class OrderRefundedEvent :  IEquatable<OrderRefundedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderRefundedEvent" /> class.
@@ -36,23 +34,31 @@ public partial class OrderRefundedEvent :  IEquatable<OrderRefundedEvent>, IVali
         /// <param name="eventName">The event name.</param>
         /// <param name="refundedAmount">The amount refunded.</param>
         /// <param name="description">Description.</param>
+        /// <param name="user">User who has refunded the order.</param>
         /// <param name="order">Order.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderRefundedEvent(string eventName = default(string), double? refundedAmount = default(double?), string description = default(string), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderRefundedEvent(string eventName = default(string), double? refundedAmount = default(double?), string description = default(string), UserEventInfo user = default(UserEventInfo), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.RefundedAmount = refundedAmount;
             this.Description = description;
+            this.User = user;
             this.Order = order;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -76,6 +82,13 @@ public partial class OrderRefundedEvent :  IEquatable<OrderRefundedEvent>, IVali
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
+        /// <summary>
+        /// User who has refunded the order
+        /// </summary>
+        /// <value>User who has refunded the order</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// Order
         /// </summary>
@@ -111,6 +124,13 @@ public partial class OrderRefundedEvent :  IEquatable<OrderRefundedEvent>, IVali
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +138,20 @@ public partial class OrderRefundedEvent :  IEquatable<OrderRefundedEvent>, IVali
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -129,12 +163,16 @@ public override string ToString()
             sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  RefundedAmount: ").Append(RefundedAmount).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  Order: ").Append(Order).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -184,6 +222,11 @@ public bool Equals(OrderRefundedEvent input)
                     (this.Description != null &&
                     this.Description.Equals(input.Description))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.Order == input.Order ||
                     (this.Order != null &&
@@ -209,10 +252,25 @@ public bool Equals(OrderRefundedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -231,6 +289,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.RefundedAmount.GetHashCode();
                 if (this.Description != null)
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.Order != null)
                     hashCode = hashCode * 59 + this.Order.GetHashCode();
                 if (this.FlipdishEventId != null)
@@ -241,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderRejectedEvent.cs b/src/Flipdish/Model/OrderRejectedEvent.cs
index f8afaac6..eb3018cc 100644
--- a/src/Flipdish/Model/OrderRejectedEvent.cs
+++ b/src/Flipdish/Model/OrderRejectedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Rejected Event
     /// </summary>
     [DataContract]
-    public partial class OrderRejectedEvent :  IEquatable<OrderRejectedEvent>, IValidatableObject
+    public partial class OrderRejectedEvent :  IEquatable<OrderRejectedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderRejectedEvent" /> class.
@@ -37,24 +35,32 @@ public partial class OrderRejectedEvent :  IEquatable<OrderRejectedEvent>, IVali
         /// <param name="description">Description.</param>
         /// <param name="orderRejectedTime">Order Rejected Time.</param>
         /// <param name="reason">Reason for Rejection.</param>
+        /// <param name="user">User who has rejected the order.</param>
         /// <param name="order">Order.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderRejectedEvent(string eventName = default(string), string description = default(string), DateTime? orderRejectedTime = default(DateTime?), string reason = default(string), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderRejectedEvent(string eventName = default(string), string description = default(string), DateTime? orderRejectedTime = default(DateTime?), string reason = default(string), UserEventInfo user = default(UserEventInfo), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
             this.OrderRejectedTime = orderRejectedTime;
             this.Reason = reason;
+            this.User = user;
             this.Order = order;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -85,6 +91,13 @@ public partial class OrderRejectedEvent :  IEquatable<OrderRejectedEvent>, IVali
         [DataMember(Name="Reason", EmitDefaultValue=false)]
         public string Reason { get; set; }
 
+        /// <summary>
+        /// User who has rejected the order
+        /// </summary>
+        /// <value>User who has rejected the order</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
         /// <summary>
         /// Order
         /// </summary>
@@ -120,6 +133,13 @@ public partial class OrderRejectedEvent :  IEquatable<OrderRejectedEvent>, IVali
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +147,20 @@ public partial class OrderRejectedEvent :  IEquatable<OrderRejectedEvent>, IVali
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -139,12 +173,16 @@ public override string ToString()
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  OrderRejectedTime: ").Append(OrderRejectedTime).Append("\n");
             sb.Append("  Reason: ").Append(Reason).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  Order: ").Append(Order).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -199,6 +237,11 @@ public bool Equals(OrderRejectedEvent input)
                     (this.Reason != null &&
                     this.Reason.Equals(input.Reason))
                 ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
                 (
                     this.Order == input.Order ||
                     (this.Order != null &&
@@ -224,10 +267,25 @@ public bool Equals(OrderRejectedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -248,6 +306,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OrderRejectedTime.GetHashCode();
                 if (this.Reason != null)
                     hashCode = hashCode * 59 + this.Reason.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.Order != null)
                     hashCode = hashCode * 59 + this.Order.GetHashCode();
                 if (this.FlipdishEventId != null)
@@ -258,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderSummary.cs b/src/Flipdish/Model/OrderSummary.cs
index 202f7efc..fda43084 100644
--- a/src/Flipdish/Model/OrderSummary.cs
+++ b/src/Flipdish/Model/OrderSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order summary
     /// </summary>
     [DataContract]
-    public partial class OrderSummary :  IEquatable<OrderSummary>, IValidatableObject
+    public partial class OrderSummary :  IEquatable<OrderSummary>
     {
         /// <summary>
         /// Delivery type
@@ -249,7 +247,13 @@ public enum OrderStateEnum
             /// Enum AcceptedAndRefunded for value: AcceptedAndRefunded
             /// </summary>
             [EnumMember(Value = "AcceptedAndRefunded")]
-            AcceptedAndRefunded = 13
+            AcceptedAndRefunded = 13,
+            
+            /// <summary>
+            /// Enum PendingPayment for value: PendingPayment
+            /// </summary>
+            [EnumMember(Value = "PendingPayment")]
+            PendingPayment = 14
         }
 
         /// <summary>
@@ -318,7 +322,13 @@ public enum PaymentAccountTypeEnum
             /// Enum PayGreen for value: PayGreen
             /// </summary>
             [EnumMember(Value = "PayGreen")]
-            PayGreen = 9
+            PayGreen = 9,
+            
+            /// <summary>
+            /// Enum GoogleWalletToken for value: GoogleWalletToken
+            /// </summary>
+            [EnumMember(Value = "GoogleWalletToken")]
+            GoogleWalletToken = 10
         }
 
         /// <summary>
@@ -1175,7 +1185,9 @@ public enum AppTypeEnum
         /// <param name="channelOrderId">ChannelOrderId from external channel.</param>
         /// <param name="channelOrderDisplayId">ChannelOrderDisplayId from external channel.</param>
         /// <param name="orderDropOffLocation">DropOffLocation selected for this order.</param>
-        public OrderSummary(int? orderId = default(int?), DeliveryTypeEnum? deliveryType = default(DeliveryTypeEnum?), PickupLocationTypeEnum? pickupLocationType = default(PickupLocationTypeEnum?), TableServiceCatagoryEnum? tableServiceCatagory = default(TableServiceCatagoryEnum?), OrderStateEnum? orderState = default(OrderStateEnum?), DateTime? requestedForTime = default(DateTime?), string storeName = default(string), string storeIanaTimeZone = default(string), string customerName = default(string), string customerPhoneNumber = default(string), double? amount = default(double?), double? refundedAmount = default(double?), PaymentAccountTypeEnum? paymentAccountType = default(PaymentAccountTypeEnum?), PaymentStatusEnum? paymentStatus = default(PaymentStatusEnum?), CurrencyEnum? currency = default(CurrencyEnum?), AppTypeEnum? appType = default(AppTypeEnum?), string localOrderId = default(string), int? dropOffLocationId = default(int?), string dropOffLocation = default(string), DateTime? acceptedFor = default(DateTime?), Channel channel = default(Channel), bool? inFraudZone = default(bool?), bool? unusualHighValueOrder = default(bool?), string channelOrderId = default(string), string channelOrderDisplayId = default(string), OrderDropOffLocation orderDropOffLocation = default(OrderDropOffLocation))
+        /// <param name="orderBatchInfo">OrderBatch information.</param>
+        /// <param name="deliveryLocation">Delivery location details.</param>
+        public OrderSummary(int? orderId = default(int?), DeliveryTypeEnum? deliveryType = default(DeliveryTypeEnum?), PickupLocationTypeEnum? pickupLocationType = default(PickupLocationTypeEnum?), TableServiceCatagoryEnum? tableServiceCatagory = default(TableServiceCatagoryEnum?), OrderStateEnum? orderState = default(OrderStateEnum?), DateTime? requestedForTime = default(DateTime?), string storeName = default(string), string storeIanaTimeZone = default(string), string customerName = default(string), string customerPhoneNumber = default(string), double? amount = default(double?), double? refundedAmount = default(double?), PaymentAccountTypeEnum? paymentAccountType = default(PaymentAccountTypeEnum?), PaymentStatusEnum? paymentStatus = default(PaymentStatusEnum?), CurrencyEnum? currency = default(CurrencyEnum?), AppTypeEnum? appType = default(AppTypeEnum?), string localOrderId = default(string), int? dropOffLocationId = default(int?), string dropOffLocation = default(string), DateTime? acceptedFor = default(DateTime?), Channel channel = default(Channel), bool? inFraudZone = default(bool?), bool? unusualHighValueOrder = default(bool?), string channelOrderId = default(string), string channelOrderDisplayId = default(string), OrderDropOffLocation orderDropOffLocation = default(OrderDropOffLocation), OrderBatchSummary orderBatchInfo = default(OrderBatchSummary), DeliveryLocation deliveryLocation = default(DeliveryLocation))
         {
             this.OrderId = orderId;
             this.DeliveryType = deliveryType;
@@ -1203,6 +1215,8 @@ public enum AppTypeEnum
             this.ChannelOrderId = channelOrderId;
             this.ChannelOrderDisplayId = channelOrderDisplayId;
             this.OrderDropOffLocation = orderDropOffLocation;
+            this.OrderBatchInfo = orderBatchInfo;
+            this.DeliveryLocation = deliveryLocation;
         }
         
         /// <summary>
@@ -1339,6 +1353,20 @@ public enum AppTypeEnum
         [DataMember(Name="OrderDropOffLocation", EmitDefaultValue=false)]
         public OrderDropOffLocation OrderDropOffLocation { get; set; }
 
+        /// <summary>
+        /// OrderBatch information
+        /// </summary>
+        /// <value>OrderBatch information</value>
+        [DataMember(Name="OrderBatchInfo", EmitDefaultValue=false)]
+        public OrderBatchSummary OrderBatchInfo { get; set; }
+
+        /// <summary>
+        /// Delivery location details
+        /// </summary>
+        /// <value>Delivery location details</value>
+        [DataMember(Name="DeliveryLocation", EmitDefaultValue=false)]
+        public DeliveryLocation DeliveryLocation { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -1373,6 +1401,8 @@ public override string ToString()
             sb.Append("  ChannelOrderId: ").Append(ChannelOrderId).Append("\n");
             sb.Append("  ChannelOrderDisplayId: ").Append(ChannelOrderDisplayId).Append("\n");
             sb.Append("  OrderDropOffLocation: ").Append(OrderDropOffLocation).Append("\n");
+            sb.Append("  OrderBatchInfo: ").Append(OrderBatchInfo).Append("\n");
+            sb.Append("  DeliveryLocation: ").Append(DeliveryLocation).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -1536,6 +1566,16 @@ public bool Equals(OrderSummary input)
                     this.OrderDropOffLocation == input.OrderDropOffLocation ||
                     (this.OrderDropOffLocation != null &&
                     this.OrderDropOffLocation.Equals(input.OrderDropOffLocation))
+                ) && 
+                (
+                    this.OrderBatchInfo == input.OrderBatchInfo ||
+                    (this.OrderBatchInfo != null &&
+                    this.OrderBatchInfo.Equals(input.OrderBatchInfo))
+                ) && 
+                (
+                    this.DeliveryLocation == input.DeliveryLocation ||
+                    (this.DeliveryLocation != null &&
+                    this.DeliveryLocation.Equals(input.DeliveryLocation))
                 );
         }
 
@@ -1600,19 +1640,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.ChannelOrderDisplayId.GetHashCode();
                 if (this.OrderDropOffLocation != null)
                     hashCode = hashCode * 59 + this.OrderDropOffLocation.GetHashCode();
+                if (this.OrderBatchInfo != null)
+                    hashCode = hashCode * 59 + this.OrderBatchInfo.GetHashCode();
+                if (this.DeliveryLocation != null)
+                    hashCode = hashCode * 59 + this.DeliveryLocation.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderTerminalNotification.cs b/src/Flipdish/Model/OrderTerminalNotification.cs
deleted file mode 100644
index c60a02bc..00000000
--- a/src/Flipdish/Model/OrderTerminalNotification.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Order Terminal Notification
-    /// </summary>
-    [DataContract]
-    public partial class OrderTerminalNotification :  IEquatable<OrderTerminalNotification>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrderTerminalNotification" /> class.
-        /// </summary>
-        /// <param name="eventName">The event name.</param>
-        /// <param name="notification">Notification Sent.</param>
-        /// <param name="order">Order.</param>
-        /// <param name="terminalId">TerminalId.</param>
-        /// <param name="description">Description.</param>
-        /// <param name="flipdishEventId">The identitfier of the event.</param>
-        /// <param name="createTime">The time of creation of the event.</param>
-        /// <param name="position">Position.</param>
-        /// <param name="appId">App id.</param>
-        public OrderTerminalNotification(string eventName = default(string), string notification = default(string), Order order = default(Order), string terminalId = default(string), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string))
-        {
-            this.EventName = eventName;
-            this.Notification = notification;
-            this.Order = order;
-            this.TerminalId = terminalId;
-            this.Description = description;
-            this.FlipdishEventId = flipdishEventId;
-            this.CreateTime = createTime;
-            this.Position = position;
-            this.AppId = appId;
-        }
-        
-        /// <summary>
-        /// The event name
-        /// </summary>
-        /// <value>The event name</value>
-        [DataMember(Name="EventName", EmitDefaultValue=false)]
-        public string EventName { get; set; }
-
-        /// <summary>
-        /// Notification Sent
-        /// </summary>
-        /// <value>Notification Sent</value>
-        [DataMember(Name="Notification", EmitDefaultValue=false)]
-        public string Notification { get; set; }
-
-        /// <summary>
-        /// Order
-        /// </summary>
-        /// <value>Order</value>
-        [DataMember(Name="Order", EmitDefaultValue=false)]
-        public Order Order { get; set; }
-
-        /// <summary>
-        /// TerminalId
-        /// </summary>
-        /// <value>TerminalId</value>
-        [DataMember(Name="TerminalId", EmitDefaultValue=false)]
-        public string TerminalId { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// The identitfier of the event
-        /// </summary>
-        /// <value>The identitfier of the event</value>
-        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
-        public Guid? FlipdishEventId { get; set; }
-
-        /// <summary>
-        /// The time of creation of the event
-        /// </summary>
-        /// <value>The time of creation of the event</value>
-        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
-        public DateTime? CreateTime { get; set; }
-
-        /// <summary>
-        /// Position
-        /// </summary>
-        /// <value>Position</value>
-        [DataMember(Name="Position", EmitDefaultValue=false)]
-        public int? Position { get; set; }
-
-        /// <summary>
-        /// App id
-        /// </summary>
-        /// <value>App id</value>
-        [DataMember(Name="AppId", EmitDefaultValue=false)]
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class OrderTerminalNotification {\n");
-            sb.Append("  EventName: ").Append(EventName).Append("\n");
-            sb.Append("  Notification: ").Append(Notification).Append("\n");
-            sb.Append("  Order: ").Append(Order).Append("\n");
-            sb.Append("  TerminalId: ").Append(TerminalId).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
-            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
-            sb.Append("  Position: ").Append(Position).Append("\n");
-            sb.Append("  AppId: ").Append(AppId).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as OrderTerminalNotification);
-        }
-
-        /// <summary>
-        /// Returns true if OrderTerminalNotification instances are equal
-        /// </summary>
-        /// <param name="input">Instance of OrderTerminalNotification to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(OrderTerminalNotification input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.EventName == input.EventName ||
-                    (this.EventName != null &&
-                    this.EventName.Equals(input.EventName))
-                ) && 
-                (
-                    this.Notification == input.Notification ||
-                    (this.Notification != null &&
-                    this.Notification.Equals(input.Notification))
-                ) && 
-                (
-                    this.Order == input.Order ||
-                    (this.Order != null &&
-                    this.Order.Equals(input.Order))
-                ) && 
-                (
-                    this.TerminalId == input.TerminalId ||
-                    (this.TerminalId != null &&
-                    this.TerminalId.Equals(input.TerminalId))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.FlipdishEventId == input.FlipdishEventId ||
-                    (this.FlipdishEventId != null &&
-                    this.FlipdishEventId.Equals(input.FlipdishEventId))
-                ) && 
-                (
-                    this.CreateTime == input.CreateTime ||
-                    (this.CreateTime != null &&
-                    this.CreateTime.Equals(input.CreateTime))
-                ) && 
-                (
-                    this.Position == input.Position ||
-                    (this.Position != null &&
-                    this.Position.Equals(input.Position))
-                ) && 
-                (
-                    this.AppId == input.AppId ||
-                    (this.AppId != null &&
-                    this.AppId.Equals(input.AppId))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.EventName != null)
-                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
-                if (this.Notification != null)
-                    hashCode = hashCode * 59 + this.Notification.GetHashCode();
-                if (this.Order != null)
-                    hashCode = hashCode * 59 + this.Order.GetHashCode();
-                if (this.TerminalId != null)
-                    hashCode = hashCode * 59 + this.TerminalId.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.FlipdishEventId != null)
-                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
-                if (this.CreateTime != null)
-                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
-                if (this.Position != null)
-                    hashCode = hashCode * 59 + this.Position.GetHashCode();
-                if (this.AppId != null)
-                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/OrderTipUpdatedEvent.cs b/src/Flipdish/Model/OrderTipUpdatedEvent.cs
index 6c90fb9f..e69195b1 100644
--- a/src/Flipdish/Model/OrderTipUpdatedEvent.cs
+++ b/src/Flipdish/Model/OrderTipUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Order Tip Update Event
     /// </summary>
     [DataContract]
-    public partial class OrderTipUpdatedEvent :  IEquatable<OrderTipUpdatedEvent>, IValidatableObject
+    public partial class OrderTipUpdatedEvent :  IEquatable<OrderTipUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderTipUpdatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class OrderTipUpdatedEvent :  IEquatable<OrderTipUpdatedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public OrderTipUpdatedEvent(string eventName = default(string), double? tipAmount = default(double?), string description = default(string), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public OrderTipUpdatedEvent(string eventName = default(string), double? tipAmount = default(double?), string description = default(string), Order order = default(Order), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.TipAmount = tipAmount;
@@ -52,7 +53,10 @@ public partial class OrderTipUpdatedEvent :  IEquatable<OrderTipUpdatedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class OrderTipUpdatedEvent :  IEquatable<OrderTipUpdatedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class OrderTipUpdatedEvent :  IEquatable<OrderTipUpdatedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(OrderTipUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OrderVoucherSummary.cs b/src/Flipdish/Model/OrderVoucherSummary.cs
index b992cb80..2f5b3c7e 100644
--- a/src/Flipdish/Model/OrderVoucherSummary.cs
+++ b/src/Flipdish/Model/OrderVoucherSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Voucher summary
     /// </summary>
     [DataContract]
-    public partial class OrderVoucherSummary :  IEquatable<OrderVoucherSummary>, IValidatableObject
+    public partial class OrderVoucherSummary :  IEquatable<OrderVoucherSummary>
     {
         /// <summary>
         /// Voucher type
@@ -60,7 +58,13 @@ public enum TypeEnum
             /// Enum CreditNote for value: CreditNote
             /// </summary>
             [EnumMember(Value = "CreditNote")]
-            CreditNote = 4
+            CreditNote = 4,
+            
+            /// <summary>
+            /// Enum FreeDelivery for value: FreeDelivery
+            /// </summary>
+            [EnumMember(Value = "FreeDelivery")]
+            FreeDelivery = 5
         }
 
         /// <summary>
@@ -129,14 +133,16 @@ public enum SubTypeEnum
         /// <summary>
         /// Initializes a new instance of the <see cref="OrderVoucherSummary" /> class.
         /// </summary>
+        /// <param name="voucherId">Voucher ID.</param>
         /// <param name="name">Voucher name.</param>
         /// <param name="description">Voucher description.</param>
         /// <param name="code">Voucher code.</param>
         /// <param name="amount">Voucher amount.</param>
         /// <param name="type">Voucher type.</param>
         /// <param name="subType">Voucher sub type.</param>
-        public OrderVoucherSummary(string name = default(string), string description = default(string), string code = default(string), double? amount = default(double?), TypeEnum? type = default(TypeEnum?), SubTypeEnum? subType = default(SubTypeEnum?))
+        public OrderVoucherSummary(int? voucherId = default(int?), string name = default(string), string description = default(string), string code = default(string), double? amount = default(double?), TypeEnum? type = default(TypeEnum?), SubTypeEnum? subType = default(SubTypeEnum?))
         {
+            this.VoucherId = voucherId;
             this.Name = name;
             this.Description = description;
             this.Code = code;
@@ -145,6 +151,13 @@ public enum SubTypeEnum
             this.SubType = subType;
         }
         
+        /// <summary>
+        /// Voucher ID
+        /// </summary>
+        /// <value>Voucher ID</value>
+        [DataMember(Name="VoucherId", EmitDefaultValue=false)]
+        public int? VoucherId { get; set; }
+
         /// <summary>
         /// Voucher name
         /// </summary>
@@ -183,6 +196,7 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class OrderVoucherSummary {\n");
+            sb.Append("  VoucherId: ").Append(VoucherId).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
@@ -223,6 +237,11 @@ public bool Equals(OrderVoucherSummary input)
                 return false;
 
             return 
+                (
+                    this.VoucherId == input.VoucherId ||
+                    (this.VoucherId != null &&
+                    this.VoucherId.Equals(input.VoucherId))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -264,6 +283,8 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.VoucherId != null)
+                    hashCode = hashCode * 59 + this.VoucherId.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Description != null)
@@ -279,16 +300,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OtherChargesDetails.cs b/src/Flipdish/Model/OtherChargesDetails.cs
index a1fb293d..d01e0e5c 100644
--- a/src/Flipdish/Model/OtherChargesDetails.cs
+++ b/src/Flipdish/Model/OtherChargesDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Breakdown of other charges
     /// </summary>
     [DataContract]
-    public partial class OtherChargesDetails :  IEquatable<OtherChargesDetails>, IValidatableObject
+    public partial class OtherChargesDetails :  IEquatable<OtherChargesDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OtherChargesDetails" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OwnerEntityConfiguration.cs b/src/Flipdish/Model/OwnerEntityConfiguration.cs
index 46dfc272..e2c6bfab 100644
--- a/src/Flipdish/Model/OwnerEntityConfiguration.cs
+++ b/src/Flipdish/Model/OwnerEntityConfiguration.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// OwnerEntity information to configure its {Flipdish.PublicModels.V1.Metafields.MetafieldDefinition}s
+    /// OwnerEntity information to configure its {Flipdish.Metafields.PublicModels.V1.MetafieldDefinition}s
     /// </summary>
     [DataContract]
-    public partial class OwnerEntityConfiguration :  IEquatable<OwnerEntityConfiguration>, IValidatableObject
+    public partial class OwnerEntityConfiguration :  IEquatable<OwnerEntityConfiguration>
     {
         /// <summary>
         /// Owner Entity
@@ -174,16 +172,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/OwnerEntityConfigurations.cs b/src/Flipdish/Model/OwnerEntityConfigurations.cs
index 4fe3bd57..31b38ff6 100644
--- a/src/Flipdish/Model/OwnerEntityConfigurations.cs
+++ b/src/Flipdish/Model/OwnerEntityConfigurations.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Owner Entity Configurations
     /// </summary>
     [DataContract]
-    public partial class OwnerEntityConfigurations :  IEquatable<OwnerEntityConfigurations>, IValidatableObject
+    public partial class OwnerEntityConfigurations :  IEquatable<OwnerEntityConfigurations>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="OwnerEntityConfigurations" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PasswordResetModel.cs b/src/Flipdish/Model/PasswordResetModel.cs
index 4fe43094..12b3983b 100644
--- a/src/Flipdish/Model/PasswordResetModel.cs
+++ b/src/Flipdish/Model/PasswordResetModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Password reset model
     /// </summary>
     [DataContract]
-    public partial class PasswordResetModel :  IEquatable<PasswordResetModel>, IValidatableObject
+    public partial class PasswordResetModel :  IEquatable<PasswordResetModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PasswordResetModel" /> class.
@@ -38,11 +36,12 @@ protected PasswordResetModel() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="PasswordResetModel" /> class.
         /// </summary>
+        /// <param name="tokenId">Token Id.</param>
         /// <param name="email">Email address.</param>
         /// <param name="password">Password (required).</param>
         /// <param name="passwordConfirmation">Password confirmation (required).</param>
         /// <param name="token">Password reset token.</param>
-        public PasswordResetModel(string email = default(string), string password = default(string), string passwordConfirmation = default(string), string token = default(string))
+        public PasswordResetModel(string tokenId = default(string), string email = default(string), string password = default(string), string passwordConfirmation = default(string), string token = default(string))
         {
             // to ensure "password" is required (not null)
             if (password == null)
@@ -62,10 +61,18 @@ protected PasswordResetModel() { }
             {
                 this.PasswordConfirmation = passwordConfirmation;
             }
+            this.TokenId = tokenId;
             this.Email = email;
             this.Token = token;
         }
         
+        /// <summary>
+        /// Token Id
+        /// </summary>
+        /// <value>Token Id</value>
+        [DataMember(Name="TokenId", EmitDefaultValue=false)]
+        public string TokenId { get; set; }
+
         /// <summary>
         /// Email address
         /// </summary>
@@ -102,6 +109,7 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class PasswordResetModel {\n");
+            sb.Append("  TokenId: ").Append(TokenId).Append("\n");
             sb.Append("  Email: ").Append(Email).Append("\n");
             sb.Append("  Password: ").Append(Password).Append("\n");
             sb.Append("  PasswordConfirmation: ").Append(PasswordConfirmation).Append("\n");
@@ -140,6 +148,11 @@ public bool Equals(PasswordResetModel input)
                 return false;
 
             return 
+                (
+                    this.TokenId == input.TokenId ||
+                    (this.TokenId != null &&
+                    this.TokenId.Equals(input.TokenId))
+                ) && 
                 (
                     this.Email == input.Email ||
                     (this.Email != null &&
@@ -171,6 +184,8 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.TokenId != null)
+                    hashCode = hashCode * 59 + this.TokenId.GetHashCode();
                 if (this.Email != null)
                     hashCode = hashCode * 59 + this.Email.GetHashCode();
                 if (this.Password != null)
@@ -182,16 +197,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayOrder.cs b/src/Flipdish/Model/PayOrder.cs
deleted file mode 100644
index e04d4402..00000000
--- a/src/Flipdish/Model/PayOrder.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Pay order
-    /// </summary>
-    [DataContract]
-    public partial class PayOrder :  IEquatable<PayOrder>, IValidatableObject
-    {
-        /// <summary>
-        /// 6 digit PIN code (not starting with zero).
-        /// </summary>
-        /// <value>6 digit PIN code (not starting with zero).</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum PaymentOptionEnum
-        {
-            
-            /// <summary>
-            /// Enum Online for value: Online
-            /// </summary>
-            [EnumMember(Value = "Online")]
-            Online = 1,
-            
-            /// <summary>
-            /// Enum Emv for value: Emv
-            /// </summary>
-            [EnumMember(Value = "Emv")]
-            Emv = 2,
-            
-            /// <summary>
-            /// Enum Counter for value: Counter
-            /// </summary>
-            [EnumMember(Value = "Counter")]
-            Counter = 3
-        }
-
-        /// <summary>
-        /// 6 digit PIN code (not starting with zero).
-        /// </summary>
-        /// <value>6 digit PIN code (not starting with zero).</value>
-        [DataMember(Name="PaymentOption", EmitDefaultValue=false)]
-        public PaymentOptionEnum PaymentOption { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PayOrder" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected PayOrder() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PayOrder" /> class.
-        /// </summary>
-        /// <param name="paymentOption">6 digit PIN code (not starting with zero). (required).</param>
-        /// <param name="chefNote">Chef note.</param>
-        public PayOrder(PaymentOptionEnum paymentOption = default(PaymentOptionEnum), string chefNote = default(string))
-        {
-            // to ensure "paymentOption" is required (not null)
-            if (paymentOption == null)
-            {
-                throw new InvalidDataException("paymentOption is a required property for PayOrder and cannot be null");
-            }
-            else
-            {
-                this.PaymentOption = paymentOption;
-            }
-            this.ChefNote = chefNote;
-        }
-        
-
-        /// <summary>
-        /// Chef note
-        /// </summary>
-        /// <value>Chef note</value>
-        [DataMember(Name="ChefNote", EmitDefaultValue=false)]
-        public string ChefNote { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class PayOrder {\n");
-            sb.Append("  PaymentOption: ").Append(PaymentOption).Append("\n");
-            sb.Append("  ChefNote: ").Append(ChefNote).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as PayOrder);
-        }
-
-        /// <summary>
-        /// Returns true if PayOrder instances are equal
-        /// </summary>
-        /// <param name="input">Instance of PayOrder to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(PayOrder input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.PaymentOption == input.PaymentOption ||
-                    (this.PaymentOption != null &&
-                    this.PaymentOption.Equals(input.PaymentOption))
-                ) && 
-                (
-                    this.ChefNote == input.ChefNote ||
-                    (this.ChefNote != null &&
-                    this.ChefNote.Equals(input.ChefNote))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.PaymentOption != null)
-                    hashCode = hashCode * 59 + this.PaymentOption.GetHashCode();
-                if (this.ChefNote != null)
-                    hashCode = hashCode * 59 + this.ChefNote.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/PaymentAccount.cs b/src/Flipdish/Model/PaymentAccount.cs
new file mode 100644
index 00000000..8b52233a
--- /dev/null
+++ b/src/Flipdish/Model/PaymentAccount.cs
@@ -0,0 +1,249 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Payment Account information
+    /// </summary>
+    [DataContract]
+    public partial class PaymentAccount :  IEquatable<PaymentAccount>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PaymentAccount" /> class.
+        /// </summary>
+        /// <param name="userId">The user ID associated with the payment account..</param>
+        /// <param name="paymentAccountId">Unique identifier for the payment account..</param>
+        /// <param name="canRemoveFromCustomerView">Indicates if the payment account can be removed from the customer view..</param>
+        /// <param name="bin">Bank Identification Number (BIN) of the payment method..</param>
+        /// <param name="isDefaultPaymentMethod">Indicates if this is the default payment method..</param>
+        /// <param name="isVisibleToCustomer">Indicates if the payment account is visible to the customer..</param>
+        /// <param name="paymentAccountType">The type of payment account (e.g., card, PayPal)..</param>
+        /// <param name="description">Description of the payment account..</param>
+        /// <param name="customerId">The customer ID associated with the payment account..</param>
+        public PaymentAccount(int? userId = default(int?), int? paymentAccountId = default(int?), bool? canRemoveFromCustomerView = default(bool?), string bin = default(string), bool? isDefaultPaymentMethod = default(bool?), bool? isVisibleToCustomer = default(bool?), string paymentAccountType = default(string), string description = default(string), string customerId = default(string))
+        {
+            this.UserId = userId;
+            this.PaymentAccountId = paymentAccountId;
+            this.CanRemoveFromCustomerView = canRemoveFromCustomerView;
+            this.Bin = bin;
+            this.IsDefaultPaymentMethod = isDefaultPaymentMethod;
+            this.IsVisibleToCustomer = isVisibleToCustomer;
+            this.PaymentAccountType = paymentAccountType;
+            this.Description = description;
+            this.CustomerId = customerId;
+        }
+        
+        /// <summary>
+        /// The user ID associated with the payment account.
+        /// </summary>
+        /// <value>The user ID associated with the payment account.</value>
+        [DataMember(Name="UserId", EmitDefaultValue=false)]
+        public int? UserId { get; set; }
+
+        /// <summary>
+        /// Unique identifier for the payment account.
+        /// </summary>
+        /// <value>Unique identifier for the payment account.</value>
+        [DataMember(Name="PaymentAccountId", EmitDefaultValue=false)]
+        public int? PaymentAccountId { get; set; }
+
+        /// <summary>
+        /// Indicates if the payment account can be removed from the customer view.
+        /// </summary>
+        /// <value>Indicates if the payment account can be removed from the customer view.</value>
+        [DataMember(Name="CanRemoveFromCustomerView", EmitDefaultValue=false)]
+        public bool? CanRemoveFromCustomerView { get; set; }
+
+        /// <summary>
+        /// Bank Identification Number (BIN) of the payment method.
+        /// </summary>
+        /// <value>Bank Identification Number (BIN) of the payment method.</value>
+        [DataMember(Name="Bin", EmitDefaultValue=false)]
+        public string Bin { get; set; }
+
+        /// <summary>
+        /// Indicates if this is the default payment method.
+        /// </summary>
+        /// <value>Indicates if this is the default payment method.</value>
+        [DataMember(Name="IsDefaultPaymentMethod", EmitDefaultValue=false)]
+        public bool? IsDefaultPaymentMethod { get; set; }
+
+        /// <summary>
+        /// Indicates if the payment account is visible to the customer.
+        /// </summary>
+        /// <value>Indicates if the payment account is visible to the customer.</value>
+        [DataMember(Name="IsVisibleToCustomer", EmitDefaultValue=false)]
+        public bool? IsVisibleToCustomer { get; set; }
+
+        /// <summary>
+        /// The type of payment account (e.g., card, PayPal).
+        /// </summary>
+        /// <value>The type of payment account (e.g., card, PayPal).</value>
+        [DataMember(Name="PaymentAccountType", EmitDefaultValue=false)]
+        public string PaymentAccountType { get; set; }
+
+        /// <summary>
+        /// Description of the payment account.
+        /// </summary>
+        /// <value>Description of the payment account.</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// The customer ID associated with the payment account.
+        /// </summary>
+        /// <value>The customer ID associated with the payment account.</value>
+        [DataMember(Name="CustomerId", EmitDefaultValue=false)]
+        public string CustomerId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PaymentAccount {\n");
+            sb.Append("  UserId: ").Append(UserId).Append("\n");
+            sb.Append("  PaymentAccountId: ").Append(PaymentAccountId).Append("\n");
+            sb.Append("  CanRemoveFromCustomerView: ").Append(CanRemoveFromCustomerView).Append("\n");
+            sb.Append("  Bin: ").Append(Bin).Append("\n");
+            sb.Append("  IsDefaultPaymentMethod: ").Append(IsDefaultPaymentMethod).Append("\n");
+            sb.Append("  IsVisibleToCustomer: ").Append(IsVisibleToCustomer).Append("\n");
+            sb.Append("  PaymentAccountType: ").Append(PaymentAccountType).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  CustomerId: ").Append(CustomerId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PaymentAccount);
+        }
+
+        /// <summary>
+        /// Returns true if PaymentAccount instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PaymentAccount to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PaymentAccount input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.UserId == input.UserId ||
+                    (this.UserId != null &&
+                    this.UserId.Equals(input.UserId))
+                ) && 
+                (
+                    this.PaymentAccountId == input.PaymentAccountId ||
+                    (this.PaymentAccountId != null &&
+                    this.PaymentAccountId.Equals(input.PaymentAccountId))
+                ) && 
+                (
+                    this.CanRemoveFromCustomerView == input.CanRemoveFromCustomerView ||
+                    (this.CanRemoveFromCustomerView != null &&
+                    this.CanRemoveFromCustomerView.Equals(input.CanRemoveFromCustomerView))
+                ) && 
+                (
+                    this.Bin == input.Bin ||
+                    (this.Bin != null &&
+                    this.Bin.Equals(input.Bin))
+                ) && 
+                (
+                    this.IsDefaultPaymentMethod == input.IsDefaultPaymentMethod ||
+                    (this.IsDefaultPaymentMethod != null &&
+                    this.IsDefaultPaymentMethod.Equals(input.IsDefaultPaymentMethod))
+                ) && 
+                (
+                    this.IsVisibleToCustomer == input.IsVisibleToCustomer ||
+                    (this.IsVisibleToCustomer != null &&
+                    this.IsVisibleToCustomer.Equals(input.IsVisibleToCustomer))
+                ) && 
+                (
+                    this.PaymentAccountType == input.PaymentAccountType ||
+                    (this.PaymentAccountType != null &&
+                    this.PaymentAccountType.Equals(input.PaymentAccountType))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.CustomerId == input.CustomerId ||
+                    (this.CustomerId != null &&
+                    this.CustomerId.Equals(input.CustomerId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.UserId != null)
+                    hashCode = hashCode * 59 + this.UserId.GetHashCode();
+                if (this.PaymentAccountId != null)
+                    hashCode = hashCode * 59 + this.PaymentAccountId.GetHashCode();
+                if (this.CanRemoveFromCustomerView != null)
+                    hashCode = hashCode * 59 + this.CanRemoveFromCustomerView.GetHashCode();
+                if (this.Bin != null)
+                    hashCode = hashCode * 59 + this.Bin.GetHashCode();
+                if (this.IsDefaultPaymentMethod != null)
+                    hashCode = hashCode * 59 + this.IsDefaultPaymentMethod.GetHashCode();
+                if (this.IsVisibleToCustomer != null)
+                    hashCode = hashCode * 59 + this.IsVisibleToCustomer.GetHashCode();
+                if (this.PaymentAccountType != null)
+                    hashCode = hashCode * 59 + this.PaymentAccountType.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.CustomerId != null)
+                    hashCode = hashCode * 59 + this.CustomerId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PaymentInfo.cs b/src/Flipdish/Model/PaymentInfo.cs
deleted file mode 100644
index 159aa3d7..00000000
--- a/src/Flipdish/Model/PaymentInfo.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Payment information
-    /// </summary>
-    [DataContract]
-    public partial class PaymentInfo :  IEquatable<PaymentInfo>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PaymentInfo" /> class.
-        /// </summary>
-        /// <param name="paid">Defines if the order was paid.</param>
-        /// <param name="paymentType">Payment Description.</param>
-        public PaymentInfo(bool? paid = default(bool?), string paymentType = default(string))
-        {
-            this.Paid = paid;
-            this.PaymentType = paymentType;
-        }
-        
-        /// <summary>
-        /// Defines if the order was paid
-        /// </summary>
-        /// <value>Defines if the order was paid</value>
-        [DataMember(Name="Paid", EmitDefaultValue=false)]
-        public bool? Paid { get; set; }
-
-        /// <summary>
-        /// Payment Description
-        /// </summary>
-        /// <value>Payment Description</value>
-        [DataMember(Name="PaymentType", EmitDefaultValue=false)]
-        public string PaymentType { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class PaymentInfo {\n");
-            sb.Append("  Paid: ").Append(Paid).Append("\n");
-            sb.Append("  PaymentType: ").Append(PaymentType).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as PaymentInfo);
-        }
-
-        /// <summary>
-        /// Returns true if PaymentInfo instances are equal
-        /// </summary>
-        /// <param name="input">Instance of PaymentInfo to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(PaymentInfo input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Paid == input.Paid ||
-                    (this.Paid != null &&
-                    this.Paid.Equals(input.Paid))
-                ) && 
-                (
-                    this.PaymentType == input.PaymentType ||
-                    (this.PaymentType != null &&
-                    this.PaymentType.Equals(input.PaymentType))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Paid != null)
-                    hashCode = hashCode * 59 + this.Paid.GetHashCode();
-                if (this.PaymentType != null)
-                    hashCode = hashCode * 59 + this.PaymentType.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/PaymentIntent.cs b/src/Flipdish/Model/PaymentIntent.cs
index 140da3ca..1887d86b 100644
--- a/src/Flipdish/Model/PaymentIntent.cs
+++ b/src/Flipdish/Model/PaymentIntent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents stripe PaymentIntent
     /// </summary>
     [DataContract]
-    public partial class PaymentIntent :  IEquatable<PaymentIntent>, IValidatableObject
+    public partial class PaymentIntent :  IEquatable<PaymentIntent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PaymentIntent" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PaymentTerminalDetails.cs b/src/Flipdish/Model/PaymentTerminalDetails.cs
index ad2c2a96..be5af0a3 100644
--- a/src/Flipdish/Model/PaymentTerminalDetails.cs
+++ b/src/Flipdish/Model/PaymentTerminalDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Details of Payment Terminal
     /// </summary>
     [DataContract]
-    public partial class PaymentTerminalDetails :  IEquatable<PaymentTerminalDetails>, IValidatableObject
+    public partial class PaymentTerminalDetails :  IEquatable<PaymentTerminalDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PaymentTerminalDetails" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PaymentTerminalTransactionDetails.cs b/src/Flipdish/Model/PaymentTerminalTransactionDetails.cs
index 6210a77a..416d8f65 100644
--- a/src/Flipdish/Model/PaymentTerminalTransactionDetails.cs
+++ b/src/Flipdish/Model/PaymentTerminalTransactionDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Details of Payment Terminal Transaction
     /// </summary>
     [DataContract]
-    public partial class PaymentTerminalTransactionDetails :  IEquatable<PaymentTerminalTransactionDetails>, IValidatableObject
+    public partial class PaymentTerminalTransactionDetails :  IEquatable<PaymentTerminalTransactionDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PaymentTerminalTransactionDetails" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Payout.cs b/src/Flipdish/Model/Payout.cs
index 14eee938..bfc735fe 100644
--- a/src/Flipdish/Model/Payout.cs
+++ b/src/Flipdish/Model/Payout.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Holds the information for a whitelabel payout.
     /// </summary>
     [DataContract]
-    public partial class Payout :  IEquatable<Payout>, IValidatableObject
+    public partial class Payout :  IEquatable<Payout>
     {
         /// <summary>
         /// Status of the payout
@@ -817,7 +815,9 @@ public enum CurrencyEnum
         /// <param name="onlineSalesServiceCharges">Payout online sales service charges.</param>
         /// <param name="onlineSalesRefundedFees">Payout online sales refunded fees.</param>
         /// <param name="onlineSalesFees">Payout online sales fees.</param>
+        /// <param name="posSalesFees">Payout online sales fees.</param>
         /// <param name="onlineSalesRefundedAmount">Payout online sales refunded amount.</param>
+        /// <param name="posSalesRefundedAmount">POS Payout online sales refunded amount.</param>
         /// <param name="onlineSalesTax">Payout online sales tax.</param>
         /// <param name="totalOnlineRevenue">Payout total online revenue.</param>
         /// <param name="cashSalesFees">Payout cash sales fees.</param>
@@ -827,12 +827,21 @@ public enum CurrencyEnum
         /// <param name="totalFees">Payout total fees.</param>
         /// <param name="totalOnlineRevenueAdjustments">Payout total online revenue adjustments.</param>
         /// <param name="chargebackAmount">Payout chargeback amount.</param>
+        /// <param name="posSalesChargebackAmount">POS Payout chargeback amount.</param>
         /// <param name="chargebackRefundedFees">Payout chargeback refunded fees.</param>
         /// <param name="totalChargebackCost">Payout chargebacks total cost.</param>
         /// <param name="totalOtherCharges">Payout other charges total.</param>
         /// <param name="openingBalance">Payout opening balance.</param>
         /// <param name="closingBalance">Payout closing balance.</param>
-        public Payout(int? payoutId = default(int?), int? payeeBankAccountId = default(int?), string accountName = default(string), PayoutStatusEnum? payoutStatus = default(PayoutStatusEnum?), DateTime? createdDate = default(DateTime?), DateTime? periodStartTime = default(DateTime?), DateTime? periodEndTime = default(DateTime?), string destinationBank = default(string), string destinationAccount = default(string), double? amount = default(double?), PayoutTypeEnum? payoutType = default(PayoutTypeEnum?), CurrencyEnum? currency = default(CurrencyEnum?), DateTime? cutoffDate = default(DateTime?), double? onlineSalesAmount = default(double?), double? onlineSalesDeliveryCharges = default(double?), double? onlineSalesTips = default(double?), double? onlineSalesServiceCharges = default(double?), double? onlineSalesRefundedFees = default(double?), double? onlineSalesFees = default(double?), double? onlineSalesRefundedAmount = default(double?), double? onlineSalesTax = default(double?), double? totalOnlineRevenue = default(double?), double? cashSalesFees = default(double?), double? cashSalesRefundedFees = default(double?), double? customerCashFees = default(double?), double? salesFeesVat = default(double?), double? totalFees = default(double?), double? totalOnlineRevenueAdjustments = default(double?), double? chargebackAmount = default(double?), double? chargebackRefundedFees = default(double?), double? totalChargebackCost = default(double?), double? totalOtherCharges = default(double?), double? openingBalance = default(double?), double? closingBalance = default(double?))
+        /// <param name="payGreenSalesAmount">Amount of sales through PayGreen (restaurant vouchers).</param>
+        /// <param name="deliveryIntegrationFee">Third party integration delivery fee.</param>
+        /// <param name="deliveryIntegrationTipFee">Third party integration delivery tip fee.</param>
+        /// <param name="totalThirdPartyFees">Total third party integration fees.</param>
+        /// <param name="posSalesAmount">POS sales amount.</param>
+        /// <param name="posSalesTax">POS sales tax.</param>
+        /// <param name="tipsOnPosSales">Tips on POS sales.</param>
+        /// <param name="bankAccountHasChanged">Indicates whether the bank account has changed since the previous payout.</param>
+        public Payout(int? payoutId = default(int?), int? payeeBankAccountId = default(int?), string accountName = default(string), PayoutStatusEnum? payoutStatus = default(PayoutStatusEnum?), DateTime? createdDate = default(DateTime?), DateTime? periodStartTime = default(DateTime?), DateTime? periodEndTime = default(DateTime?), string destinationBank = default(string), string destinationAccount = default(string), double? amount = default(double?), PayoutTypeEnum? payoutType = default(PayoutTypeEnum?), CurrencyEnum? currency = default(CurrencyEnum?), DateTime? cutoffDate = default(DateTime?), double? onlineSalesAmount = default(double?), double? onlineSalesDeliveryCharges = default(double?), double? onlineSalesTips = default(double?), double? onlineSalesServiceCharges = default(double?), double? onlineSalesRefundedFees = default(double?), double? onlineSalesFees = default(double?), double? posSalesFees = default(double?), double? onlineSalesRefundedAmount = default(double?), double? posSalesRefundedAmount = default(double?), double? onlineSalesTax = default(double?), double? totalOnlineRevenue = default(double?), double? cashSalesFees = default(double?), double? cashSalesRefundedFees = default(double?), double? customerCashFees = default(double?), double? salesFeesVat = default(double?), double? totalFees = default(double?), double? totalOnlineRevenueAdjustments = default(double?), double? chargebackAmount = default(double?), double? posSalesChargebackAmount = default(double?), double? chargebackRefundedFees = default(double?), double? totalChargebackCost = default(double?), double? totalOtherCharges = default(double?), double? openingBalance = default(double?), double? closingBalance = default(double?), double? payGreenSalesAmount = default(double?), double? deliveryIntegrationFee = default(double?), double? deliveryIntegrationTipFee = default(double?), double? totalThirdPartyFees = default(double?), double? posSalesAmount = default(double?), double? posSalesTax = default(double?), double? tipsOnPosSales = default(double?), bool? bankAccountHasChanged = default(bool?))
         {
             this.PayoutId = payoutId;
             this.PayeeBankAccountId = payeeBankAccountId;
@@ -853,7 +862,9 @@ public enum CurrencyEnum
             this.OnlineSalesServiceCharges = onlineSalesServiceCharges;
             this.OnlineSalesRefundedFees = onlineSalesRefundedFees;
             this.OnlineSalesFees = onlineSalesFees;
+            this.PosSalesFees = posSalesFees;
             this.OnlineSalesRefundedAmount = onlineSalesRefundedAmount;
+            this.PosSalesRefundedAmount = posSalesRefundedAmount;
             this.OnlineSalesTax = onlineSalesTax;
             this.TotalOnlineRevenue = totalOnlineRevenue;
             this.CashSalesFees = cashSalesFees;
@@ -863,11 +874,20 @@ public enum CurrencyEnum
             this.TotalFees = totalFees;
             this.TotalOnlineRevenueAdjustments = totalOnlineRevenueAdjustments;
             this.ChargebackAmount = chargebackAmount;
+            this.PosSalesChargebackAmount = posSalesChargebackAmount;
             this.ChargebackRefundedFees = chargebackRefundedFees;
             this.TotalChargebackCost = totalChargebackCost;
             this.TotalOtherCharges = totalOtherCharges;
             this.OpeningBalance = openingBalance;
             this.ClosingBalance = closingBalance;
+            this.PayGreenSalesAmount = payGreenSalesAmount;
+            this.DeliveryIntegrationFee = deliveryIntegrationFee;
+            this.DeliveryIntegrationTipFee = deliveryIntegrationTipFee;
+            this.TotalThirdPartyFees = totalThirdPartyFees;
+            this.PosSalesAmount = posSalesAmount;
+            this.PosSalesTax = posSalesTax;
+            this.TipsOnPosSales = tipsOnPosSales;
+            this.BankAccountHasChanged = bankAccountHasChanged;
         }
         
         /// <summary>
@@ -985,6 +1005,13 @@ public enum CurrencyEnum
         [DataMember(Name="OnlineSalesFees", EmitDefaultValue=false)]
         public double? OnlineSalesFees { get; set; }
 
+        /// <summary>
+        /// Payout online sales fees
+        /// </summary>
+        /// <value>Payout online sales fees</value>
+        [DataMember(Name="PosSalesFees", EmitDefaultValue=false)]
+        public double? PosSalesFees { get; set; }
+
         /// <summary>
         /// Payout online sales refunded amount
         /// </summary>
@@ -992,6 +1019,13 @@ public enum CurrencyEnum
         [DataMember(Name="OnlineSalesRefundedAmount", EmitDefaultValue=false)]
         public double? OnlineSalesRefundedAmount { get; set; }
 
+        /// <summary>
+        /// POS Payout online sales refunded amount
+        /// </summary>
+        /// <value>POS Payout online sales refunded amount</value>
+        [DataMember(Name="PosSalesRefundedAmount", EmitDefaultValue=false)]
+        public double? PosSalesRefundedAmount { get; set; }
+
         /// <summary>
         /// Payout online sales tax
         /// </summary>
@@ -1055,6 +1089,13 @@ public enum CurrencyEnum
         [DataMember(Name="ChargebackAmount", EmitDefaultValue=false)]
         public double? ChargebackAmount { get; set; }
 
+        /// <summary>
+        /// POS Payout chargeback amount
+        /// </summary>
+        /// <value>POS Payout chargeback amount</value>
+        [DataMember(Name="PosSalesChargebackAmount", EmitDefaultValue=false)]
+        public double? PosSalesChargebackAmount { get; set; }
+
         /// <summary>
         /// Payout chargeback refunded fees
         /// </summary>
@@ -1090,6 +1131,62 @@ public enum CurrencyEnum
         [DataMember(Name="ClosingBalance", EmitDefaultValue=false)]
         public double? ClosingBalance { get; set; }
 
+        /// <summary>
+        /// Amount of sales through PayGreen (restaurant vouchers)
+        /// </summary>
+        /// <value>Amount of sales through PayGreen (restaurant vouchers)</value>
+        [DataMember(Name="PayGreenSalesAmount", EmitDefaultValue=false)]
+        public double? PayGreenSalesAmount { get; set; }
+
+        /// <summary>
+        /// Third party integration delivery fee
+        /// </summary>
+        /// <value>Third party integration delivery fee</value>
+        [DataMember(Name="DeliveryIntegrationFee", EmitDefaultValue=false)]
+        public double? DeliveryIntegrationFee { get; set; }
+
+        /// <summary>
+        /// Third party integration delivery tip fee
+        /// </summary>
+        /// <value>Third party integration delivery tip fee</value>
+        [DataMember(Name="DeliveryIntegrationTipFee", EmitDefaultValue=false)]
+        public double? DeliveryIntegrationTipFee { get; set; }
+
+        /// <summary>
+        /// Total third party integration fees
+        /// </summary>
+        /// <value>Total third party integration fees</value>
+        [DataMember(Name="TotalThirdPartyFees", EmitDefaultValue=false)]
+        public double? TotalThirdPartyFees { get; set; }
+
+        /// <summary>
+        /// POS sales amount
+        /// </summary>
+        /// <value>POS sales amount</value>
+        [DataMember(Name="PosSalesAmount", EmitDefaultValue=false)]
+        public double? PosSalesAmount { get; set; }
+
+        /// <summary>
+        /// POS sales tax
+        /// </summary>
+        /// <value>POS sales tax</value>
+        [DataMember(Name="PosSalesTax", EmitDefaultValue=false)]
+        public double? PosSalesTax { get; set; }
+
+        /// <summary>
+        /// Tips on POS sales
+        /// </summary>
+        /// <value>Tips on POS sales</value>
+        [DataMember(Name="TipsOnPosSales", EmitDefaultValue=false)]
+        public double? TipsOnPosSales { get; set; }
+
+        /// <summary>
+        /// Indicates whether the bank account has changed since the previous payout
+        /// </summary>
+        /// <value>Indicates whether the bank account has changed since the previous payout</value>
+        [DataMember(Name="BankAccountHasChanged", EmitDefaultValue=false)]
+        public bool? BankAccountHasChanged { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -1117,7 +1214,9 @@ public override string ToString()
             sb.Append("  OnlineSalesServiceCharges: ").Append(OnlineSalesServiceCharges).Append("\n");
             sb.Append("  OnlineSalesRefundedFees: ").Append(OnlineSalesRefundedFees).Append("\n");
             sb.Append("  OnlineSalesFees: ").Append(OnlineSalesFees).Append("\n");
+            sb.Append("  PosSalesFees: ").Append(PosSalesFees).Append("\n");
             sb.Append("  OnlineSalesRefundedAmount: ").Append(OnlineSalesRefundedAmount).Append("\n");
+            sb.Append("  PosSalesRefundedAmount: ").Append(PosSalesRefundedAmount).Append("\n");
             sb.Append("  OnlineSalesTax: ").Append(OnlineSalesTax).Append("\n");
             sb.Append("  TotalOnlineRevenue: ").Append(TotalOnlineRevenue).Append("\n");
             sb.Append("  CashSalesFees: ").Append(CashSalesFees).Append("\n");
@@ -1127,11 +1226,20 @@ public override string ToString()
             sb.Append("  TotalFees: ").Append(TotalFees).Append("\n");
             sb.Append("  TotalOnlineRevenueAdjustments: ").Append(TotalOnlineRevenueAdjustments).Append("\n");
             sb.Append("  ChargebackAmount: ").Append(ChargebackAmount).Append("\n");
+            sb.Append("  PosSalesChargebackAmount: ").Append(PosSalesChargebackAmount).Append("\n");
             sb.Append("  ChargebackRefundedFees: ").Append(ChargebackRefundedFees).Append("\n");
             sb.Append("  TotalChargebackCost: ").Append(TotalChargebackCost).Append("\n");
             sb.Append("  TotalOtherCharges: ").Append(TotalOtherCharges).Append("\n");
             sb.Append("  OpeningBalance: ").Append(OpeningBalance).Append("\n");
             sb.Append("  ClosingBalance: ").Append(ClosingBalance).Append("\n");
+            sb.Append("  PayGreenSalesAmount: ").Append(PayGreenSalesAmount).Append("\n");
+            sb.Append("  DeliveryIntegrationFee: ").Append(DeliveryIntegrationFee).Append("\n");
+            sb.Append("  DeliveryIntegrationTipFee: ").Append(DeliveryIntegrationTipFee).Append("\n");
+            sb.Append("  TotalThirdPartyFees: ").Append(TotalThirdPartyFees).Append("\n");
+            sb.Append("  PosSalesAmount: ").Append(PosSalesAmount).Append("\n");
+            sb.Append("  PosSalesTax: ").Append(PosSalesTax).Append("\n");
+            sb.Append("  TipsOnPosSales: ").Append(TipsOnPosSales).Append("\n");
+            sb.Append("  BankAccountHasChanged: ").Append(BankAccountHasChanged).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -1261,11 +1369,21 @@ public bool Equals(Payout input)
                     (this.OnlineSalesFees != null &&
                     this.OnlineSalesFees.Equals(input.OnlineSalesFees))
                 ) && 
+                (
+                    this.PosSalesFees == input.PosSalesFees ||
+                    (this.PosSalesFees != null &&
+                    this.PosSalesFees.Equals(input.PosSalesFees))
+                ) && 
                 (
                     this.OnlineSalesRefundedAmount == input.OnlineSalesRefundedAmount ||
                     (this.OnlineSalesRefundedAmount != null &&
                     this.OnlineSalesRefundedAmount.Equals(input.OnlineSalesRefundedAmount))
                 ) && 
+                (
+                    this.PosSalesRefundedAmount == input.PosSalesRefundedAmount ||
+                    (this.PosSalesRefundedAmount != null &&
+                    this.PosSalesRefundedAmount.Equals(input.PosSalesRefundedAmount))
+                ) && 
                 (
                     this.OnlineSalesTax == input.OnlineSalesTax ||
                     (this.OnlineSalesTax != null &&
@@ -1311,6 +1429,11 @@ public bool Equals(Payout input)
                     (this.ChargebackAmount != null &&
                     this.ChargebackAmount.Equals(input.ChargebackAmount))
                 ) && 
+                (
+                    this.PosSalesChargebackAmount == input.PosSalesChargebackAmount ||
+                    (this.PosSalesChargebackAmount != null &&
+                    this.PosSalesChargebackAmount.Equals(input.PosSalesChargebackAmount))
+                ) && 
                 (
                     this.ChargebackRefundedFees == input.ChargebackRefundedFees ||
                     (this.ChargebackRefundedFees != null &&
@@ -1335,6 +1458,46 @@ public bool Equals(Payout input)
                     this.ClosingBalance == input.ClosingBalance ||
                     (this.ClosingBalance != null &&
                     this.ClosingBalance.Equals(input.ClosingBalance))
+                ) && 
+                (
+                    this.PayGreenSalesAmount == input.PayGreenSalesAmount ||
+                    (this.PayGreenSalesAmount != null &&
+                    this.PayGreenSalesAmount.Equals(input.PayGreenSalesAmount))
+                ) && 
+                (
+                    this.DeliveryIntegrationFee == input.DeliveryIntegrationFee ||
+                    (this.DeliveryIntegrationFee != null &&
+                    this.DeliveryIntegrationFee.Equals(input.DeliveryIntegrationFee))
+                ) && 
+                (
+                    this.DeliveryIntegrationTipFee == input.DeliveryIntegrationTipFee ||
+                    (this.DeliveryIntegrationTipFee != null &&
+                    this.DeliveryIntegrationTipFee.Equals(input.DeliveryIntegrationTipFee))
+                ) && 
+                (
+                    this.TotalThirdPartyFees == input.TotalThirdPartyFees ||
+                    (this.TotalThirdPartyFees != null &&
+                    this.TotalThirdPartyFees.Equals(input.TotalThirdPartyFees))
+                ) && 
+                (
+                    this.PosSalesAmount == input.PosSalesAmount ||
+                    (this.PosSalesAmount != null &&
+                    this.PosSalesAmount.Equals(input.PosSalesAmount))
+                ) && 
+                (
+                    this.PosSalesTax == input.PosSalesTax ||
+                    (this.PosSalesTax != null &&
+                    this.PosSalesTax.Equals(input.PosSalesTax))
+                ) && 
+                (
+                    this.TipsOnPosSales == input.TipsOnPosSales ||
+                    (this.TipsOnPosSales != null &&
+                    this.TipsOnPosSales.Equals(input.TipsOnPosSales))
+                ) && 
+                (
+                    this.BankAccountHasChanged == input.BankAccountHasChanged ||
+                    (this.BankAccountHasChanged != null &&
+                    this.BankAccountHasChanged.Equals(input.BankAccountHasChanged))
                 );
         }
 
@@ -1385,8 +1548,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OnlineSalesRefundedFees.GetHashCode();
                 if (this.OnlineSalesFees != null)
                     hashCode = hashCode * 59 + this.OnlineSalesFees.GetHashCode();
+                if (this.PosSalesFees != null)
+                    hashCode = hashCode * 59 + this.PosSalesFees.GetHashCode();
                 if (this.OnlineSalesRefundedAmount != null)
                     hashCode = hashCode * 59 + this.OnlineSalesRefundedAmount.GetHashCode();
+                if (this.PosSalesRefundedAmount != null)
+                    hashCode = hashCode * 59 + this.PosSalesRefundedAmount.GetHashCode();
                 if (this.OnlineSalesTax != null)
                     hashCode = hashCode * 59 + this.OnlineSalesTax.GetHashCode();
                 if (this.TotalOnlineRevenue != null)
@@ -1405,6 +1572,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.TotalOnlineRevenueAdjustments.GetHashCode();
                 if (this.ChargebackAmount != null)
                     hashCode = hashCode * 59 + this.ChargebackAmount.GetHashCode();
+                if (this.PosSalesChargebackAmount != null)
+                    hashCode = hashCode * 59 + this.PosSalesChargebackAmount.GetHashCode();
                 if (this.ChargebackRefundedFees != null)
                     hashCode = hashCode * 59 + this.ChargebackRefundedFees.GetHashCode();
                 if (this.TotalChargebackCost != null)
@@ -1415,19 +1584,25 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OpeningBalance.GetHashCode();
                 if (this.ClosingBalance != null)
                     hashCode = hashCode * 59 + this.ClosingBalance.GetHashCode();
+                if (this.PayGreenSalesAmount != null)
+                    hashCode = hashCode * 59 + this.PayGreenSalesAmount.GetHashCode();
+                if (this.DeliveryIntegrationFee != null)
+                    hashCode = hashCode * 59 + this.DeliveryIntegrationFee.GetHashCode();
+                if (this.DeliveryIntegrationTipFee != null)
+                    hashCode = hashCode * 59 + this.DeliveryIntegrationTipFee.GetHashCode();
+                if (this.TotalThirdPartyFees != null)
+                    hashCode = hashCode * 59 + this.TotalThirdPartyFees.GetHashCode();
+                if (this.PosSalesAmount != null)
+                    hashCode = hashCode * 59 + this.PosSalesAmount.GetHashCode();
+                if (this.PosSalesTax != null)
+                    hashCode = hashCode * 59 + this.PosSalesTax.GetHashCode();
+                if (this.TipsOnPosSales != null)
+                    hashCode = hashCode * 59 + this.TipsOnPosSales.GetHashCode();
+                if (this.BankAccountHasChanged != null)
+                    hashCode = hashCode * 59 + this.BankAccountHasChanged.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayoutChargeback.cs b/src/Flipdish/Model/PayoutChargeback.cs
index 68804019..ce21830e 100644
--- a/src/Flipdish/Model/PayoutChargeback.cs
+++ b/src/Flipdish/Model/PayoutChargeback.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Holds the information for a chargeback related to a payout
     /// </summary>
     [DataContract]
-    public partial class PayoutChargeback :  IEquatable<PayoutChargeback>, IValidatableObject
+    public partial class PayoutChargeback :  IEquatable<PayoutChargeback>
     {
         /// <summary>
         /// Order currency
@@ -954,16 +952,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayoutDetail.cs b/src/Flipdish/Model/PayoutDetail.cs
index 8811d994..767d310c 100644
--- a/src/Flipdish/Model/PayoutDetail.cs
+++ b/src/Flipdish/Model/PayoutDetail.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Holds the information for a whitelabel payout with details broken down by Store
     /// </summary>
     [DataContract]
-    public partial class PayoutDetail :  IEquatable<PayoutDetail>, IValidatableObject
+    public partial class PayoutDetail :  IEquatable<PayoutDetail>
     {
         /// <summary>
         /// Status of the payout
@@ -1078,16 +1076,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayoutOrder.cs b/src/Flipdish/Model/PayoutOrder.cs
index d5a32bd7..0d2dd3a6 100644
--- a/src/Flipdish/Model/PayoutOrder.cs
+++ b/src/Flipdish/Model/PayoutOrder.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Holds the information for an order related to a payout
     /// </summary>
     [DataContract]
-    public partial class PayoutOrder :  IEquatable<PayoutOrder>, IValidatableObject
+    public partial class PayoutOrder :  IEquatable<PayoutOrder>
     {
         /// <summary>
         /// Order type (online or cash)
@@ -764,9 +762,10 @@ public enum OrderCurrencyEnum
         /// <param name="tips">Order tips amount.</param>
         /// <param name="voucher">Order voucher amount.</param>
         /// <param name="flatFeeExcludingVat">Order flat fee amount excluding VAT.</param>
-        /// <param name="flatFeeExcludingVAT">flatFeeExcludingVAT.</param>
+        /// <param name="flatFeeExcludingVAT">Order flat fee amount excluding VAT.</param>
+        /// <param name="flatFeeIncludingVat">Order flat fee amount including VAT.</param>
         /// <param name="percentageFeeExcludingVat">Order percentage fee excluding VAT.</param>
-        /// <param name="percentageFeeExcludingVAT">percentageFeeExcludingVAT.</param>
+        /// <param name="percentageFeeExcludingVAT">Order percentage fee excluding VAT.</param>
         /// <param name="vat">Order VAT amount.</param>
         /// <param name="totalFees">Total order fees amount.</param>
         /// <param name="cashFeeChargedToCustomer">Cash fee charged to customer.</param>
@@ -774,7 +773,7 @@ public enum OrderCurrencyEnum
         /// <param name="storeId">Store id.</param>
         /// <param name="serviceChargeAmount">Order ServiceChargeAmount amount.</param>
         /// <param name="serviceChargePercentage">Order ServiceChargePercentage amount.</param>
-        public PayoutOrder(int? orderId = default(int?), int? payoutId = default(int?), DateTime? orderDate = default(DateTime?), OrderTypeEnum? orderType = default(OrderTypeEnum?), OrderCurrencyEnum? orderCurrency = default(OrderCurrencyEnum?), double? sales = default(double?), double? salesTax = default(double?), double? deliveryCharges = default(double?), double? tips = default(double?), double? voucher = default(double?), double? flatFeeExcludingVat = default(double?), double? flatFeeExcludingVAT = default(double?), double? percentageFeeExcludingVat = default(double?), double? percentageFeeExcludingVAT = default(double?), double? vat = default(double?), double? totalFees = default(double?), double? cashFeeChargedToCustomer = default(double?), double? netSales = default(double?), int? storeId = default(int?), double? serviceChargeAmount = default(double?), double? serviceChargePercentage = default(double?))
+        public PayoutOrder(int? orderId = default(int?), int? payoutId = default(int?), DateTime? orderDate = default(DateTime?), OrderTypeEnum? orderType = default(OrderTypeEnum?), OrderCurrencyEnum? orderCurrency = default(OrderCurrencyEnum?), double? sales = default(double?), double? salesTax = default(double?), double? deliveryCharges = default(double?), double? tips = default(double?), double? voucher = default(double?), double? flatFeeExcludingVat = default(double?), double? flatFeeExcludingVAT = default(double?), double? flatFeeIncludingVat = default(double?), double? percentageFeeExcludingVat = default(double?), double? percentageFeeExcludingVAT = default(double?), double? vat = default(double?), double? totalFees = default(double?), double? cashFeeChargedToCustomer = default(double?), double? netSales = default(double?), int? storeId = default(int?), double? serviceChargeAmount = default(double?), double? serviceChargePercentage = default(double?))
         {
             this.OrderId = orderId;
             this.PayoutId = payoutId;
@@ -788,6 +787,7 @@ public enum OrderCurrencyEnum
             this.Voucher = voucher;
             this.FlatFeeExcludingVat = flatFeeExcludingVat;
             this.FlatFeeExcludingVAT = flatFeeExcludingVAT;
+            this.FlatFeeIncludingVat = flatFeeIncludingVat;
             this.PercentageFeeExcludingVat = percentageFeeExcludingVat;
             this.PercentageFeeExcludingVAT = percentageFeeExcludingVAT;
             this.Vat = vat;
@@ -865,11 +865,19 @@ public enum OrderCurrencyEnum
         public double? FlatFeeExcludingVat { get; set; }
 
         /// <summary>
-        /// Gets or Sets FlatFeeExcludingVAT
+        /// Order flat fee amount excluding VAT
         /// </summary>
+        /// <value>Order flat fee amount excluding VAT</value>
         [DataMember(Name="FlatFeeExcludingVAT", EmitDefaultValue=false)]
         public double? FlatFeeExcludingVAT { get; set; }
 
+        /// <summary>
+        /// Order flat fee amount including VAT
+        /// </summary>
+        /// <value>Order flat fee amount including VAT</value>
+        [DataMember(Name="FlatFeeIncludingVat", EmitDefaultValue=false)]
+        public double? FlatFeeIncludingVat { get; set; }
+
         /// <summary>
         /// Order percentage fee excluding VAT
         /// </summary>
@@ -878,8 +886,9 @@ public enum OrderCurrencyEnum
         public double? PercentageFeeExcludingVat { get; set; }
 
         /// <summary>
-        /// Gets or Sets PercentageFeeExcludingVAT
+        /// Order percentage fee excluding VAT
         /// </summary>
+        /// <value>Order percentage fee excluding VAT</value>
         [DataMember(Name="PercentageFeeExcludingVAT", EmitDefaultValue=false)]
         public double? PercentageFeeExcludingVAT { get; set; }
 
@@ -952,6 +961,7 @@ public override string ToString()
             sb.Append("  Voucher: ").Append(Voucher).Append("\n");
             sb.Append("  FlatFeeExcludingVat: ").Append(FlatFeeExcludingVat).Append("\n");
             sb.Append("  FlatFeeExcludingVAT: ").Append(FlatFeeExcludingVAT).Append("\n");
+            sb.Append("  FlatFeeIncludingVat: ").Append(FlatFeeIncludingVat).Append("\n");
             sb.Append("  PercentageFeeExcludingVat: ").Append(PercentageFeeExcludingVat).Append("\n");
             sb.Append("  PercentageFeeExcludingVAT: ").Append(PercentageFeeExcludingVAT).Append("\n");
             sb.Append("  Vat: ").Append(Vat).Append("\n");
@@ -1055,6 +1065,11 @@ public bool Equals(PayoutOrder input)
                     (this.FlatFeeExcludingVAT != null &&
                     this.FlatFeeExcludingVAT.Equals(input.FlatFeeExcludingVAT))
                 ) && 
+                (
+                    this.FlatFeeIncludingVat == input.FlatFeeIncludingVat ||
+                    (this.FlatFeeIncludingVat != null &&
+                    this.FlatFeeIncludingVat.Equals(input.FlatFeeIncludingVat))
+                ) && 
                 (
                     this.PercentageFeeExcludingVat == input.PercentageFeeExcludingVat ||
                     (this.PercentageFeeExcludingVat != null &&
@@ -1135,6 +1150,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.FlatFeeExcludingVat.GetHashCode();
                 if (this.FlatFeeExcludingVAT != null)
                     hashCode = hashCode * 59 + this.FlatFeeExcludingVAT.GetHashCode();
+                if (this.FlatFeeIncludingVat != null)
+                    hashCode = hashCode * 59 + this.FlatFeeIncludingVat.GetHashCode();
                 if (this.PercentageFeeExcludingVat != null)
                     hashCode = hashCode * 59 + this.PercentageFeeExcludingVat.GetHashCode();
                 if (this.PercentageFeeExcludingVAT != null)
@@ -1156,16 +1173,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayoutOtherCharge.cs b/src/Flipdish/Model/PayoutOtherCharge.cs
index ddd72511..47aff00c 100644
--- a/src/Flipdish/Model/PayoutOtherCharge.cs
+++ b/src/Flipdish/Model/PayoutOtherCharge.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Holds the information for a charge related to a payout
     /// </summary>
     [DataContract]
-    public partial class PayoutOtherCharge :  IEquatable<PayoutOtherCharge>, IValidatableObject
+    public partial class PayoutOtherCharge :  IEquatable<PayoutOtherCharge>
     {
         /// <summary>
         /// Currency of the charge
@@ -973,16 +971,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayoutRefund.cs b/src/Flipdish/Model/PayoutRefund.cs
index 9ff975e6..7d55ccd0 100644
--- a/src/Flipdish/Model/PayoutRefund.cs
+++ b/src/Flipdish/Model/PayoutRefund.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Holds the information for a refund related to a payout
     /// </summary>
     [DataContract]
-    public partial class PayoutRefund :  IEquatable<PayoutRefund>, IValidatableObject
+    public partial class PayoutRefund :  IEquatable<PayoutRefund>
     {
         /// <summary>
         /// Order currency
@@ -988,16 +986,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayoutReport3Details.cs b/src/Flipdish/Model/PayoutReport3Details.cs
new file mode 100644
index 00000000..09c2a2a9
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3Details.cs
@@ -0,0 +1,192 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3Details
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3Details :  IEquatable<PayoutReport3Details>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3Details" /> class.
+        /// </summary>
+        /// <param name="amount">amount.</param>
+        /// <param name="currency">currency.</param>
+        /// <param name="summary">summary.</param>
+        /// <param name="revenue">revenue.</param>
+        /// <param name="flipdishFees">flipdishFees.</param>
+        /// <param name="adjustments">adjustments.</param>
+        public PayoutReport3Details(double? amount = default(double?), string currency = default(string), PayoutReport3DetailsSummary summary = default(PayoutReport3DetailsSummary), PayoutReport3DetailsRevenue revenue = default(PayoutReport3DetailsRevenue), PayoutReport3DetailsFlipdishFees flipdishFees = default(PayoutReport3DetailsFlipdishFees), PayoutReport3DetailsAdjustments adjustments = default(PayoutReport3DetailsAdjustments))
+        {
+            this.Amount = amount;
+            this.Currency = currency;
+            this.Summary = summary;
+            this.Revenue = revenue;
+            this.FlipdishFees = flipdishFees;
+            this.Adjustments = adjustments;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Amount
+        /// </summary>
+        [DataMember(Name="Amount", EmitDefaultValue=false)]
+        public double? Amount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Currency
+        /// </summary>
+        [DataMember(Name="Currency", EmitDefaultValue=false)]
+        public string Currency { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Summary
+        /// </summary>
+        [DataMember(Name="Summary", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSummary Summary { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Revenue
+        /// </summary>
+        [DataMember(Name="Revenue", EmitDefaultValue=false)]
+        public PayoutReport3DetailsRevenue Revenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets FlipdishFees
+        /// </summary>
+        [DataMember(Name="FlipdishFees", EmitDefaultValue=false)]
+        public PayoutReport3DetailsFlipdishFees FlipdishFees { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Adjustments
+        /// </summary>
+        [DataMember(Name="Adjustments", EmitDefaultValue=false)]
+        public PayoutReport3DetailsAdjustments Adjustments { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3Details {\n");
+            sb.Append("  Amount: ").Append(Amount).Append("\n");
+            sb.Append("  Currency: ").Append(Currency).Append("\n");
+            sb.Append("  Summary: ").Append(Summary).Append("\n");
+            sb.Append("  Revenue: ").Append(Revenue).Append("\n");
+            sb.Append("  FlipdishFees: ").Append(FlipdishFees).Append("\n");
+            sb.Append("  Adjustments: ").Append(Adjustments).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3Details);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3Details instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3Details to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3Details input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Amount == input.Amount ||
+                    (this.Amount != null &&
+                    this.Amount.Equals(input.Amount))
+                ) && 
+                (
+                    this.Currency == input.Currency ||
+                    (this.Currency != null &&
+                    this.Currency.Equals(input.Currency))
+                ) && 
+                (
+                    this.Summary == input.Summary ||
+                    (this.Summary != null &&
+                    this.Summary.Equals(input.Summary))
+                ) && 
+                (
+                    this.Revenue == input.Revenue ||
+                    (this.Revenue != null &&
+                    this.Revenue.Equals(input.Revenue))
+                ) && 
+                (
+                    this.FlipdishFees == input.FlipdishFees ||
+                    (this.FlipdishFees != null &&
+                    this.FlipdishFees.Equals(input.FlipdishFees))
+                ) && 
+                (
+                    this.Adjustments == input.Adjustments ||
+                    (this.Adjustments != null &&
+                    this.Adjustments.Equals(input.Adjustments))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Amount != null)
+                    hashCode = hashCode * 59 + this.Amount.GetHashCode();
+                if (this.Currency != null)
+                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
+                if (this.Summary != null)
+                    hashCode = hashCode * 59 + this.Summary.GetHashCode();
+                if (this.Revenue != null)
+                    hashCode = hashCode * 59 + this.Revenue.GetHashCode();
+                if (this.FlipdishFees != null)
+                    hashCode = hashCode * 59 + this.FlipdishFees.GetHashCode();
+                if (this.Adjustments != null)
+                    hashCode = hashCode * 59 + this.Adjustments.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3DetailsAdjustments.cs b/src/Flipdish/Model/PayoutReport3DetailsAdjustments.cs
new file mode 100644
index 00000000..bc4a77be
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3DetailsAdjustments.cs
@@ -0,0 +1,432 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3DetailsAdjustments
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3DetailsAdjustments :  IEquatable<PayoutReport3DetailsAdjustments>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3DetailsAdjustments" /> class.
+        /// </summary>
+        /// <param name="openingBalanceDate">openingBalanceDate.</param>
+        /// <param name="closingBalanceDate">closingBalanceDate.</param>
+        /// <param name="openingBalance">openingBalance.</param>
+        /// <param name="refundsOnCardOrders">refundsOnCardOrders.</param>
+        /// <param name="refundsOnCashOrders">refundsOnCashOrders.</param>
+        /// <param name="cashCustomerFees">cashCustomerFees.</param>
+        /// <param name="chargebacks">chargebacks.</param>
+        /// <param name="otherTransactions">otherTransactions.</param>
+        /// <param name="closingBalance">closingBalance.</param>
+        /// <param name="balanceRepaid">balanceRepaid.</param>
+        /// <param name="refundsOnCardOrdersBracketsAmount">refundsOnCardOrdersBracketsAmount.</param>
+        /// <param name="refundsOnCardOrdersBracketsOutOfAmount">refundsOnCardOrdersBracketsOutOfAmount.</param>
+        /// <param name="refundsOnCashOrdersBracketsAmount">refundsOnCashOrdersBracketsAmount.</param>
+        /// <param name="refundsOnCashOrdersBracketsOutOfAmount">refundsOnCashOrdersBracketsOutOfAmount.</param>
+        /// <param name="cashCustomerFeesBracketsAmount">cashCustomerFeesBracketsAmount.</param>
+        /// <param name="cashCustomerFeesBracketsOutOfAmount">cashCustomerFeesBracketsOutOfAmount.</param>
+        /// <param name="balanceChange">balanceChange.</param>
+        /// <param name="previousPayoutId">previousPayoutId.</param>
+        /// <param name="nextPayoutId">nextPayoutId.</param>
+        /// <param name="refundedFeesOnChargebacks">refundedFeesOnChargebacks.</param>
+        /// <param name="totalChargebackCost">totalChargebackCost.</param>
+        public PayoutReport3DetailsAdjustments(DateTime? openingBalanceDate = default(DateTime?), DateTime? closingBalanceDate = default(DateTime?), double? openingBalance = default(double?), double? refundsOnCardOrders = default(double?), double? refundsOnCashOrders = default(double?), double? cashCustomerFees = default(double?), double? chargebacks = default(double?), double? otherTransactions = default(double?), double? closingBalance = default(double?), double? balanceRepaid = default(double?), double? refundsOnCardOrdersBracketsAmount = default(double?), double? refundsOnCardOrdersBracketsOutOfAmount = default(double?), double? refundsOnCashOrdersBracketsAmount = default(double?), double? refundsOnCashOrdersBracketsOutOfAmount = default(double?), double? cashCustomerFeesBracketsAmount = default(double?), double? cashCustomerFeesBracketsOutOfAmount = default(double?), double? balanceChange = default(double?), int? previousPayoutId = default(int?), int? nextPayoutId = default(int?), double? refundedFeesOnChargebacks = default(double?), double? totalChargebackCost = default(double?))
+        {
+            this.OpeningBalanceDate = openingBalanceDate;
+            this.ClosingBalanceDate = closingBalanceDate;
+            this.OpeningBalance = openingBalance;
+            this.RefundsOnCardOrders = refundsOnCardOrders;
+            this.RefundsOnCashOrders = refundsOnCashOrders;
+            this.CashCustomerFees = cashCustomerFees;
+            this.Chargebacks = chargebacks;
+            this.OtherTransactions = otherTransactions;
+            this.ClosingBalance = closingBalance;
+            this.BalanceRepaid = balanceRepaid;
+            this.RefundsOnCardOrdersBracketsAmount = refundsOnCardOrdersBracketsAmount;
+            this.RefundsOnCardOrdersBracketsOutOfAmount = refundsOnCardOrdersBracketsOutOfAmount;
+            this.RefundsOnCashOrdersBracketsAmount = refundsOnCashOrdersBracketsAmount;
+            this.RefundsOnCashOrdersBracketsOutOfAmount = refundsOnCashOrdersBracketsOutOfAmount;
+            this.CashCustomerFeesBracketsAmount = cashCustomerFeesBracketsAmount;
+            this.CashCustomerFeesBracketsOutOfAmount = cashCustomerFeesBracketsOutOfAmount;
+            this.BalanceChange = balanceChange;
+            this.PreviousPayoutId = previousPayoutId;
+            this.NextPayoutId = nextPayoutId;
+            this.RefundedFeesOnChargebacks = refundedFeesOnChargebacks;
+            this.TotalChargebackCost = totalChargebackCost;
+        }
+        
+        /// <summary>
+        /// Gets or Sets OpeningBalanceDate
+        /// </summary>
+        [DataMember(Name="OpeningBalanceDate", EmitDefaultValue=false)]
+        public DateTime? OpeningBalanceDate { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ClosingBalanceDate
+        /// </summary>
+        [DataMember(Name="ClosingBalanceDate", EmitDefaultValue=false)]
+        public DateTime? ClosingBalanceDate { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OpeningBalance
+        /// </summary>
+        [DataMember(Name="OpeningBalance", EmitDefaultValue=false)]
+        public double? OpeningBalance { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundsOnCardOrders
+        /// </summary>
+        [DataMember(Name="RefundsOnCardOrders", EmitDefaultValue=false)]
+        public double? RefundsOnCardOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundsOnCashOrders
+        /// </summary>
+        [DataMember(Name="RefundsOnCashOrders", EmitDefaultValue=false)]
+        public double? RefundsOnCashOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets CashCustomerFees
+        /// </summary>
+        [DataMember(Name="CashCustomerFees", EmitDefaultValue=false)]
+        public double? CashCustomerFees { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Chargebacks
+        /// </summary>
+        [DataMember(Name="Chargebacks", EmitDefaultValue=false)]
+        public double? Chargebacks { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OtherTransactions
+        /// </summary>
+        [DataMember(Name="OtherTransactions", EmitDefaultValue=false)]
+        public double? OtherTransactions { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ClosingBalance
+        /// </summary>
+        [DataMember(Name="ClosingBalance", EmitDefaultValue=false)]
+        public double? ClosingBalance { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BalanceRepaid
+        /// </summary>
+        [DataMember(Name="BalanceRepaid", EmitDefaultValue=false)]
+        public double? BalanceRepaid { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundsOnCardOrdersBracketsAmount
+        /// </summary>
+        [DataMember(Name="RefundsOnCardOrdersBracketsAmount", EmitDefaultValue=false)]
+        public double? RefundsOnCardOrdersBracketsAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundsOnCardOrdersBracketsOutOfAmount
+        /// </summary>
+        [DataMember(Name="RefundsOnCardOrdersBracketsOutOfAmount", EmitDefaultValue=false)]
+        public double? RefundsOnCardOrdersBracketsOutOfAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundsOnCashOrdersBracketsAmount
+        /// </summary>
+        [DataMember(Name="RefundsOnCashOrdersBracketsAmount", EmitDefaultValue=false)]
+        public double? RefundsOnCashOrdersBracketsAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundsOnCashOrdersBracketsOutOfAmount
+        /// </summary>
+        [DataMember(Name="RefundsOnCashOrdersBracketsOutOfAmount", EmitDefaultValue=false)]
+        public double? RefundsOnCashOrdersBracketsOutOfAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets CashCustomerFeesBracketsAmount
+        /// </summary>
+        [DataMember(Name="CashCustomerFeesBracketsAmount", EmitDefaultValue=false)]
+        public double? CashCustomerFeesBracketsAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets CashCustomerFeesBracketsOutOfAmount
+        /// </summary>
+        [DataMember(Name="CashCustomerFeesBracketsOutOfAmount", EmitDefaultValue=false)]
+        public double? CashCustomerFeesBracketsOutOfAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BalanceChange
+        /// </summary>
+        [DataMember(Name="BalanceChange", EmitDefaultValue=false)]
+        public double? BalanceChange { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PreviousPayoutId
+        /// </summary>
+        [DataMember(Name="PreviousPayoutId", EmitDefaultValue=false)]
+        public int? PreviousPayoutId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets NextPayoutId
+        /// </summary>
+        [DataMember(Name="NextPayoutId", EmitDefaultValue=false)]
+        public int? NextPayoutId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundedFeesOnChargebacks
+        /// </summary>
+        [DataMember(Name="RefundedFeesOnChargebacks", EmitDefaultValue=false)]
+        public double? RefundedFeesOnChargebacks { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TotalChargebackCost
+        /// </summary>
+        [DataMember(Name="TotalChargebackCost", EmitDefaultValue=false)]
+        public double? TotalChargebackCost { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3DetailsAdjustments {\n");
+            sb.Append("  OpeningBalanceDate: ").Append(OpeningBalanceDate).Append("\n");
+            sb.Append("  ClosingBalanceDate: ").Append(ClosingBalanceDate).Append("\n");
+            sb.Append("  OpeningBalance: ").Append(OpeningBalance).Append("\n");
+            sb.Append("  RefundsOnCardOrders: ").Append(RefundsOnCardOrders).Append("\n");
+            sb.Append("  RefundsOnCashOrders: ").Append(RefundsOnCashOrders).Append("\n");
+            sb.Append("  CashCustomerFees: ").Append(CashCustomerFees).Append("\n");
+            sb.Append("  Chargebacks: ").Append(Chargebacks).Append("\n");
+            sb.Append("  OtherTransactions: ").Append(OtherTransactions).Append("\n");
+            sb.Append("  ClosingBalance: ").Append(ClosingBalance).Append("\n");
+            sb.Append("  BalanceRepaid: ").Append(BalanceRepaid).Append("\n");
+            sb.Append("  RefundsOnCardOrdersBracketsAmount: ").Append(RefundsOnCardOrdersBracketsAmount).Append("\n");
+            sb.Append("  RefundsOnCardOrdersBracketsOutOfAmount: ").Append(RefundsOnCardOrdersBracketsOutOfAmount).Append("\n");
+            sb.Append("  RefundsOnCashOrdersBracketsAmount: ").Append(RefundsOnCashOrdersBracketsAmount).Append("\n");
+            sb.Append("  RefundsOnCashOrdersBracketsOutOfAmount: ").Append(RefundsOnCashOrdersBracketsOutOfAmount).Append("\n");
+            sb.Append("  CashCustomerFeesBracketsAmount: ").Append(CashCustomerFeesBracketsAmount).Append("\n");
+            sb.Append("  CashCustomerFeesBracketsOutOfAmount: ").Append(CashCustomerFeesBracketsOutOfAmount).Append("\n");
+            sb.Append("  BalanceChange: ").Append(BalanceChange).Append("\n");
+            sb.Append("  PreviousPayoutId: ").Append(PreviousPayoutId).Append("\n");
+            sb.Append("  NextPayoutId: ").Append(NextPayoutId).Append("\n");
+            sb.Append("  RefundedFeesOnChargebacks: ").Append(RefundedFeesOnChargebacks).Append("\n");
+            sb.Append("  TotalChargebackCost: ").Append(TotalChargebackCost).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3DetailsAdjustments);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3DetailsAdjustments instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3DetailsAdjustments to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3DetailsAdjustments input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.OpeningBalanceDate == input.OpeningBalanceDate ||
+                    (this.OpeningBalanceDate != null &&
+                    this.OpeningBalanceDate.Equals(input.OpeningBalanceDate))
+                ) && 
+                (
+                    this.ClosingBalanceDate == input.ClosingBalanceDate ||
+                    (this.ClosingBalanceDate != null &&
+                    this.ClosingBalanceDate.Equals(input.ClosingBalanceDate))
+                ) && 
+                (
+                    this.OpeningBalance == input.OpeningBalance ||
+                    (this.OpeningBalance != null &&
+                    this.OpeningBalance.Equals(input.OpeningBalance))
+                ) && 
+                (
+                    this.RefundsOnCardOrders == input.RefundsOnCardOrders ||
+                    (this.RefundsOnCardOrders != null &&
+                    this.RefundsOnCardOrders.Equals(input.RefundsOnCardOrders))
+                ) && 
+                (
+                    this.RefundsOnCashOrders == input.RefundsOnCashOrders ||
+                    (this.RefundsOnCashOrders != null &&
+                    this.RefundsOnCashOrders.Equals(input.RefundsOnCashOrders))
+                ) && 
+                (
+                    this.CashCustomerFees == input.CashCustomerFees ||
+                    (this.CashCustomerFees != null &&
+                    this.CashCustomerFees.Equals(input.CashCustomerFees))
+                ) && 
+                (
+                    this.Chargebacks == input.Chargebacks ||
+                    (this.Chargebacks != null &&
+                    this.Chargebacks.Equals(input.Chargebacks))
+                ) && 
+                (
+                    this.OtherTransactions == input.OtherTransactions ||
+                    (this.OtherTransactions != null &&
+                    this.OtherTransactions.Equals(input.OtherTransactions))
+                ) && 
+                (
+                    this.ClosingBalance == input.ClosingBalance ||
+                    (this.ClosingBalance != null &&
+                    this.ClosingBalance.Equals(input.ClosingBalance))
+                ) && 
+                (
+                    this.BalanceRepaid == input.BalanceRepaid ||
+                    (this.BalanceRepaid != null &&
+                    this.BalanceRepaid.Equals(input.BalanceRepaid))
+                ) && 
+                (
+                    this.RefundsOnCardOrdersBracketsAmount == input.RefundsOnCardOrdersBracketsAmount ||
+                    (this.RefundsOnCardOrdersBracketsAmount != null &&
+                    this.RefundsOnCardOrdersBracketsAmount.Equals(input.RefundsOnCardOrdersBracketsAmount))
+                ) && 
+                (
+                    this.RefundsOnCardOrdersBracketsOutOfAmount == input.RefundsOnCardOrdersBracketsOutOfAmount ||
+                    (this.RefundsOnCardOrdersBracketsOutOfAmount != null &&
+                    this.RefundsOnCardOrdersBracketsOutOfAmount.Equals(input.RefundsOnCardOrdersBracketsOutOfAmount))
+                ) && 
+                (
+                    this.RefundsOnCashOrdersBracketsAmount == input.RefundsOnCashOrdersBracketsAmount ||
+                    (this.RefundsOnCashOrdersBracketsAmount != null &&
+                    this.RefundsOnCashOrdersBracketsAmount.Equals(input.RefundsOnCashOrdersBracketsAmount))
+                ) && 
+                (
+                    this.RefundsOnCashOrdersBracketsOutOfAmount == input.RefundsOnCashOrdersBracketsOutOfAmount ||
+                    (this.RefundsOnCashOrdersBracketsOutOfAmount != null &&
+                    this.RefundsOnCashOrdersBracketsOutOfAmount.Equals(input.RefundsOnCashOrdersBracketsOutOfAmount))
+                ) && 
+                (
+                    this.CashCustomerFeesBracketsAmount == input.CashCustomerFeesBracketsAmount ||
+                    (this.CashCustomerFeesBracketsAmount != null &&
+                    this.CashCustomerFeesBracketsAmount.Equals(input.CashCustomerFeesBracketsAmount))
+                ) && 
+                (
+                    this.CashCustomerFeesBracketsOutOfAmount == input.CashCustomerFeesBracketsOutOfAmount ||
+                    (this.CashCustomerFeesBracketsOutOfAmount != null &&
+                    this.CashCustomerFeesBracketsOutOfAmount.Equals(input.CashCustomerFeesBracketsOutOfAmount))
+                ) && 
+                (
+                    this.BalanceChange == input.BalanceChange ||
+                    (this.BalanceChange != null &&
+                    this.BalanceChange.Equals(input.BalanceChange))
+                ) && 
+                (
+                    this.PreviousPayoutId == input.PreviousPayoutId ||
+                    (this.PreviousPayoutId != null &&
+                    this.PreviousPayoutId.Equals(input.PreviousPayoutId))
+                ) && 
+                (
+                    this.NextPayoutId == input.NextPayoutId ||
+                    (this.NextPayoutId != null &&
+                    this.NextPayoutId.Equals(input.NextPayoutId))
+                ) && 
+                (
+                    this.RefundedFeesOnChargebacks == input.RefundedFeesOnChargebacks ||
+                    (this.RefundedFeesOnChargebacks != null &&
+                    this.RefundedFeesOnChargebacks.Equals(input.RefundedFeesOnChargebacks))
+                ) && 
+                (
+                    this.TotalChargebackCost == input.TotalChargebackCost ||
+                    (this.TotalChargebackCost != null &&
+                    this.TotalChargebackCost.Equals(input.TotalChargebackCost))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.OpeningBalanceDate != null)
+                    hashCode = hashCode * 59 + this.OpeningBalanceDate.GetHashCode();
+                if (this.ClosingBalanceDate != null)
+                    hashCode = hashCode * 59 + this.ClosingBalanceDate.GetHashCode();
+                if (this.OpeningBalance != null)
+                    hashCode = hashCode * 59 + this.OpeningBalance.GetHashCode();
+                if (this.RefundsOnCardOrders != null)
+                    hashCode = hashCode * 59 + this.RefundsOnCardOrders.GetHashCode();
+                if (this.RefundsOnCashOrders != null)
+                    hashCode = hashCode * 59 + this.RefundsOnCashOrders.GetHashCode();
+                if (this.CashCustomerFees != null)
+                    hashCode = hashCode * 59 + this.CashCustomerFees.GetHashCode();
+                if (this.Chargebacks != null)
+                    hashCode = hashCode * 59 + this.Chargebacks.GetHashCode();
+                if (this.OtherTransactions != null)
+                    hashCode = hashCode * 59 + this.OtherTransactions.GetHashCode();
+                if (this.ClosingBalance != null)
+                    hashCode = hashCode * 59 + this.ClosingBalance.GetHashCode();
+                if (this.BalanceRepaid != null)
+                    hashCode = hashCode * 59 + this.BalanceRepaid.GetHashCode();
+                if (this.RefundsOnCardOrdersBracketsAmount != null)
+                    hashCode = hashCode * 59 + this.RefundsOnCardOrdersBracketsAmount.GetHashCode();
+                if (this.RefundsOnCardOrdersBracketsOutOfAmount != null)
+                    hashCode = hashCode * 59 + this.RefundsOnCardOrdersBracketsOutOfAmount.GetHashCode();
+                if (this.RefundsOnCashOrdersBracketsAmount != null)
+                    hashCode = hashCode * 59 + this.RefundsOnCashOrdersBracketsAmount.GetHashCode();
+                if (this.RefundsOnCashOrdersBracketsOutOfAmount != null)
+                    hashCode = hashCode * 59 + this.RefundsOnCashOrdersBracketsOutOfAmount.GetHashCode();
+                if (this.CashCustomerFeesBracketsAmount != null)
+                    hashCode = hashCode * 59 + this.CashCustomerFeesBracketsAmount.GetHashCode();
+                if (this.CashCustomerFeesBracketsOutOfAmount != null)
+                    hashCode = hashCode * 59 + this.CashCustomerFeesBracketsOutOfAmount.GetHashCode();
+                if (this.BalanceChange != null)
+                    hashCode = hashCode * 59 + this.BalanceChange.GetHashCode();
+                if (this.PreviousPayoutId != null)
+                    hashCode = hashCode * 59 + this.PreviousPayoutId.GetHashCode();
+                if (this.NextPayoutId != null)
+                    hashCode = hashCode * 59 + this.NextPayoutId.GetHashCode();
+                if (this.RefundedFeesOnChargebacks != null)
+                    hashCode = hashCode * 59 + this.RefundedFeesOnChargebacks.GetHashCode();
+                if (this.TotalChargebackCost != null)
+                    hashCode = hashCode * 59 + this.TotalChargebackCost.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3DetailsFlipdishFees.cs b/src/Flipdish/Model/PayoutReport3DetailsFlipdishFees.cs
new file mode 100644
index 00000000..a55e957a
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3DetailsFlipdishFees.cs
@@ -0,0 +1,592 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3DetailsFlipdishFees
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3DetailsFlipdishFees :  IEquatable<PayoutReport3DetailsFlipdishFees>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3DetailsFlipdishFees" /> class.
+        /// </summary>
+        /// <param name="webAndAppCash">webAndAppCash.</param>
+        /// <param name="webAndAppCashRevenueIncludingTips">webAndAppCashRevenueIncludingTips.</param>
+        /// <param name="webAndAppCard">webAndAppCard.</param>
+        /// <param name="webAndAppCardRevenueIncludingTips">webAndAppCardRevenueIncludingTips.</param>
+        /// <param name="kioskCash">kioskCash.</param>
+        /// <param name="kioskCashRevenue">kioskCashRevenue.</param>
+        /// <param name="kioskCard">kioskCard.</param>
+        /// <param name="kioskCardRevenue">kioskCardRevenue.</param>
+        /// <param name="qropCash">qropCash.</param>
+        /// <param name="qropCashRevenue">qropCashRevenue.</param>
+        /// <param name="qropCard">qropCard.</param>
+        /// <param name="qropCardRevenue">qropCardRevenue.</param>
+        /// <param name="posCard">posCard.</param>
+        /// <param name="posCardRevenue">posCardRevenue.</param>
+        /// <param name="posCardOnFlipdishOrders">posCardOnFlipdishOrders.</param>
+        /// <param name="otherIntegrationFees">otherIntegrationFees.</param>
+        /// <param name="otherIntegrationFeesExcludingVat">otherIntegrationFeesExcludingVat.</param>
+        /// <param name="otherIntegrationFeesVatAmount">otherIntegrationFeesVatAmount.</param>
+        /// <param name="otherIntegrationTips">otherIntegrationTips.</param>
+        /// <param name="refundedFeesOnRefundedSales">refundedFeesOnRefundedSales.</param>
+        /// <param name="vat">vat.</param>
+        /// <param name="refundedFeesOnPosSales">refundedFeesOnPosSales.</param>
+        /// <param name="total">total.</param>
+        /// <param name="thirdPartyIntegrationFeesAndTips">thirdPartyIntegrationFeesAndTips.</param>
+        /// <param name="webAndAppCardOnXOrders">webAndAppCardOnXOrders.</param>
+        /// <param name="webAndAppCashOnXOrders">webAndAppCashOnXOrders.</param>
+        /// <param name="kioskCardOnXOrders">kioskCardOnXOrders.</param>
+        /// <param name="kioskCashOnXOrders">kioskCashOnXOrders.</param>
+        /// <param name="qropCardOnXOrders">qropCardOnXOrders.</param>
+        /// <param name="qropCashOnXOrders">qropCashOnXOrders.</param>
+        /// <param name="posCardOnXOrders">posCardOnXOrders.</param>
+        public PayoutReport3DetailsFlipdishFees(double? webAndAppCash = default(double?), double? webAndAppCashRevenueIncludingTips = default(double?), double? webAndAppCard = default(double?), double? webAndAppCardRevenueIncludingTips = default(double?), double? kioskCash = default(double?), double? kioskCashRevenue = default(double?), double? kioskCard = default(double?), double? kioskCardRevenue = default(double?), double? qropCash = default(double?), double? qropCashRevenue = default(double?), double? qropCard = default(double?), double? qropCardRevenue = default(double?), double? posCard = default(double?), double? posCardRevenue = default(double?), double? posCardOnFlipdishOrders = default(double?), double? otherIntegrationFees = default(double?), double? otherIntegrationFeesExcludingVat = default(double?), double? otherIntegrationFeesVatAmount = default(double?), double? otherIntegrationTips = default(double?), double? refundedFeesOnRefundedSales = default(double?), double? vat = default(double?), double? refundedFeesOnPosSales = default(double?), double? total = default(double?), double? thirdPartyIntegrationFeesAndTips = default(double?), int? webAndAppCardOnXOrders = default(int?), int? webAndAppCashOnXOrders = default(int?), int? kioskCardOnXOrders = default(int?), int? kioskCashOnXOrders = default(int?), int? qropCardOnXOrders = default(int?), int? qropCashOnXOrders = default(int?), int? posCardOnXOrders = default(int?))
+        {
+            this.WebAndAppCash = webAndAppCash;
+            this.WebAndAppCashRevenueIncludingTips = webAndAppCashRevenueIncludingTips;
+            this.WebAndAppCard = webAndAppCard;
+            this.WebAndAppCardRevenueIncludingTips = webAndAppCardRevenueIncludingTips;
+            this.KioskCash = kioskCash;
+            this.KioskCashRevenue = kioskCashRevenue;
+            this.KioskCard = kioskCard;
+            this.KioskCardRevenue = kioskCardRevenue;
+            this.QropCash = qropCash;
+            this.QropCashRevenue = qropCashRevenue;
+            this.QropCard = qropCard;
+            this.QropCardRevenue = qropCardRevenue;
+            this.PosCard = posCard;
+            this.PosCardRevenue = posCardRevenue;
+            this.PosCardOnFlipdishOrders = posCardOnFlipdishOrders;
+            this.OtherIntegrationFees = otherIntegrationFees;
+            this.OtherIntegrationFeesExcludingVat = otherIntegrationFeesExcludingVat;
+            this.OtherIntegrationFeesVatAmount = otherIntegrationFeesVatAmount;
+            this.OtherIntegrationTips = otherIntegrationTips;
+            this.RefundedFeesOnRefundedSales = refundedFeesOnRefundedSales;
+            this.Vat = vat;
+            this.RefundedFeesOnPosSales = refundedFeesOnPosSales;
+            this.Total = total;
+            this.ThirdPartyIntegrationFeesAndTips = thirdPartyIntegrationFeesAndTips;
+            this.WebAndAppCardOnXOrders = webAndAppCardOnXOrders;
+            this.WebAndAppCashOnXOrders = webAndAppCashOnXOrders;
+            this.KioskCardOnXOrders = kioskCardOnXOrders;
+            this.KioskCashOnXOrders = kioskCashOnXOrders;
+            this.QropCardOnXOrders = qropCardOnXOrders;
+            this.QropCashOnXOrders = qropCashOnXOrders;
+            this.PosCardOnXOrders = posCardOnXOrders;
+        }
+        
+        /// <summary>
+        /// Gets or Sets WebAndAppCash
+        /// </summary>
+        [DataMember(Name="WebAndAppCash", EmitDefaultValue=false)]
+        public double? WebAndAppCash { get; set; }
+
+        /// <summary>
+        /// Gets or Sets WebAndAppCashRevenueIncludingTips
+        /// </summary>
+        [DataMember(Name="WebAndAppCashRevenueIncludingTips", EmitDefaultValue=false)]
+        public double? WebAndAppCashRevenueIncludingTips { get; set; }
+
+        /// <summary>
+        /// Gets or Sets WebAndAppCard
+        /// </summary>
+        [DataMember(Name="WebAndAppCard", EmitDefaultValue=false)]
+        public double? WebAndAppCard { get; set; }
+
+        /// <summary>
+        /// Gets or Sets WebAndAppCardRevenueIncludingTips
+        /// </summary>
+        [DataMember(Name="WebAndAppCardRevenueIncludingTips", EmitDefaultValue=false)]
+        public double? WebAndAppCardRevenueIncludingTips { get; set; }
+
+        /// <summary>
+        /// Gets or Sets KioskCash
+        /// </summary>
+        [DataMember(Name="KioskCash", EmitDefaultValue=false)]
+        public double? KioskCash { get; set; }
+
+        /// <summary>
+        /// Gets or Sets KioskCashRevenue
+        /// </summary>
+        [DataMember(Name="KioskCashRevenue", EmitDefaultValue=false)]
+        public double? KioskCashRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets KioskCard
+        /// </summary>
+        [DataMember(Name="KioskCard", EmitDefaultValue=false)]
+        public double? KioskCard { get; set; }
+
+        /// <summary>
+        /// Gets or Sets KioskCardRevenue
+        /// </summary>
+        [DataMember(Name="KioskCardRevenue", EmitDefaultValue=false)]
+        public double? KioskCardRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets QropCash
+        /// </summary>
+        [DataMember(Name="QropCash", EmitDefaultValue=false)]
+        public double? QropCash { get; set; }
+
+        /// <summary>
+        /// Gets or Sets QropCashRevenue
+        /// </summary>
+        [DataMember(Name="QropCashRevenue", EmitDefaultValue=false)]
+        public double? QropCashRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets QropCard
+        /// </summary>
+        [DataMember(Name="QropCard", EmitDefaultValue=false)]
+        public double? QropCard { get; set; }
+
+        /// <summary>
+        /// Gets or Sets QropCardRevenue
+        /// </summary>
+        [DataMember(Name="QropCardRevenue", EmitDefaultValue=false)]
+        public double? QropCardRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PosCard
+        /// </summary>
+        [DataMember(Name="PosCard", EmitDefaultValue=false)]
+        public double? PosCard { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PosCardRevenue
+        /// </summary>
+        [DataMember(Name="PosCardRevenue", EmitDefaultValue=false)]
+        public double? PosCardRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PosCardOnFlipdishOrders
+        /// </summary>
+        [DataMember(Name="PosCardOnFlipdishOrders", EmitDefaultValue=false)]
+        public double? PosCardOnFlipdishOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OtherIntegrationFees
+        /// </summary>
+        [DataMember(Name="OtherIntegrationFees", EmitDefaultValue=false)]
+        public double? OtherIntegrationFees { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OtherIntegrationFeesExcludingVat
+        /// </summary>
+        [DataMember(Name="OtherIntegrationFeesExcludingVat", EmitDefaultValue=false)]
+        public double? OtherIntegrationFeesExcludingVat { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OtherIntegrationFeesVatAmount
+        /// </summary>
+        [DataMember(Name="OtherIntegrationFeesVatAmount", EmitDefaultValue=false)]
+        public double? OtherIntegrationFeesVatAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OtherIntegrationTips
+        /// </summary>
+        [DataMember(Name="OtherIntegrationTips", EmitDefaultValue=false)]
+        public double? OtherIntegrationTips { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundedFeesOnRefundedSales
+        /// </summary>
+        [DataMember(Name="RefundedFeesOnRefundedSales", EmitDefaultValue=false)]
+        public double? RefundedFeesOnRefundedSales { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Vat
+        /// </summary>
+        [DataMember(Name="Vat", EmitDefaultValue=false)]
+        public double? Vat { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundedFeesOnPosSales
+        /// </summary>
+        [DataMember(Name="RefundedFeesOnPosSales", EmitDefaultValue=false)]
+        public double? RefundedFeesOnPosSales { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Total
+        /// </summary>
+        [DataMember(Name="Total", EmitDefaultValue=false)]
+        public double? Total { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ThirdPartyIntegrationFeesAndTips
+        /// </summary>
+        [DataMember(Name="ThirdPartyIntegrationFeesAndTips", EmitDefaultValue=false)]
+        public double? ThirdPartyIntegrationFeesAndTips { get; set; }
+
+        /// <summary>
+        /// Gets or Sets WebAndAppCardOnXOrders
+        /// </summary>
+        [DataMember(Name="WebAndAppCardOnXOrders", EmitDefaultValue=false)]
+        public int? WebAndAppCardOnXOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets WebAndAppCashOnXOrders
+        /// </summary>
+        [DataMember(Name="WebAndAppCashOnXOrders", EmitDefaultValue=false)]
+        public int? WebAndAppCashOnXOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets KioskCardOnXOrders
+        /// </summary>
+        [DataMember(Name="KioskCardOnXOrders", EmitDefaultValue=false)]
+        public int? KioskCardOnXOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets KioskCashOnXOrders
+        /// </summary>
+        [DataMember(Name="KioskCashOnXOrders", EmitDefaultValue=false)]
+        public int? KioskCashOnXOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets QropCardOnXOrders
+        /// </summary>
+        [DataMember(Name="QropCardOnXOrders", EmitDefaultValue=false)]
+        public int? QropCardOnXOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets QropCashOnXOrders
+        /// </summary>
+        [DataMember(Name="QropCashOnXOrders", EmitDefaultValue=false)]
+        public int? QropCashOnXOrders { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PosCardOnXOrders
+        /// </summary>
+        [DataMember(Name="PosCardOnXOrders", EmitDefaultValue=false)]
+        public int? PosCardOnXOrders { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3DetailsFlipdishFees {\n");
+            sb.Append("  WebAndAppCash: ").Append(WebAndAppCash).Append("\n");
+            sb.Append("  WebAndAppCashRevenueIncludingTips: ").Append(WebAndAppCashRevenueIncludingTips).Append("\n");
+            sb.Append("  WebAndAppCard: ").Append(WebAndAppCard).Append("\n");
+            sb.Append("  WebAndAppCardRevenueIncludingTips: ").Append(WebAndAppCardRevenueIncludingTips).Append("\n");
+            sb.Append("  KioskCash: ").Append(KioskCash).Append("\n");
+            sb.Append("  KioskCashRevenue: ").Append(KioskCashRevenue).Append("\n");
+            sb.Append("  KioskCard: ").Append(KioskCard).Append("\n");
+            sb.Append("  KioskCardRevenue: ").Append(KioskCardRevenue).Append("\n");
+            sb.Append("  QropCash: ").Append(QropCash).Append("\n");
+            sb.Append("  QropCashRevenue: ").Append(QropCashRevenue).Append("\n");
+            sb.Append("  QropCard: ").Append(QropCard).Append("\n");
+            sb.Append("  QropCardRevenue: ").Append(QropCardRevenue).Append("\n");
+            sb.Append("  PosCard: ").Append(PosCard).Append("\n");
+            sb.Append("  PosCardRevenue: ").Append(PosCardRevenue).Append("\n");
+            sb.Append("  PosCardOnFlipdishOrders: ").Append(PosCardOnFlipdishOrders).Append("\n");
+            sb.Append("  OtherIntegrationFees: ").Append(OtherIntegrationFees).Append("\n");
+            sb.Append("  OtherIntegrationFeesExcludingVat: ").Append(OtherIntegrationFeesExcludingVat).Append("\n");
+            sb.Append("  OtherIntegrationFeesVatAmount: ").Append(OtherIntegrationFeesVatAmount).Append("\n");
+            sb.Append("  OtherIntegrationTips: ").Append(OtherIntegrationTips).Append("\n");
+            sb.Append("  RefundedFeesOnRefundedSales: ").Append(RefundedFeesOnRefundedSales).Append("\n");
+            sb.Append("  Vat: ").Append(Vat).Append("\n");
+            sb.Append("  RefundedFeesOnPosSales: ").Append(RefundedFeesOnPosSales).Append("\n");
+            sb.Append("  Total: ").Append(Total).Append("\n");
+            sb.Append("  ThirdPartyIntegrationFeesAndTips: ").Append(ThirdPartyIntegrationFeesAndTips).Append("\n");
+            sb.Append("  WebAndAppCardOnXOrders: ").Append(WebAndAppCardOnXOrders).Append("\n");
+            sb.Append("  WebAndAppCashOnXOrders: ").Append(WebAndAppCashOnXOrders).Append("\n");
+            sb.Append("  KioskCardOnXOrders: ").Append(KioskCardOnXOrders).Append("\n");
+            sb.Append("  KioskCashOnXOrders: ").Append(KioskCashOnXOrders).Append("\n");
+            sb.Append("  QropCardOnXOrders: ").Append(QropCardOnXOrders).Append("\n");
+            sb.Append("  QropCashOnXOrders: ").Append(QropCashOnXOrders).Append("\n");
+            sb.Append("  PosCardOnXOrders: ").Append(PosCardOnXOrders).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3DetailsFlipdishFees);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3DetailsFlipdishFees instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3DetailsFlipdishFees to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3DetailsFlipdishFees input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WebAndAppCash == input.WebAndAppCash ||
+                    (this.WebAndAppCash != null &&
+                    this.WebAndAppCash.Equals(input.WebAndAppCash))
+                ) && 
+                (
+                    this.WebAndAppCashRevenueIncludingTips == input.WebAndAppCashRevenueIncludingTips ||
+                    (this.WebAndAppCashRevenueIncludingTips != null &&
+                    this.WebAndAppCashRevenueIncludingTips.Equals(input.WebAndAppCashRevenueIncludingTips))
+                ) && 
+                (
+                    this.WebAndAppCard == input.WebAndAppCard ||
+                    (this.WebAndAppCard != null &&
+                    this.WebAndAppCard.Equals(input.WebAndAppCard))
+                ) && 
+                (
+                    this.WebAndAppCardRevenueIncludingTips == input.WebAndAppCardRevenueIncludingTips ||
+                    (this.WebAndAppCardRevenueIncludingTips != null &&
+                    this.WebAndAppCardRevenueIncludingTips.Equals(input.WebAndAppCardRevenueIncludingTips))
+                ) && 
+                (
+                    this.KioskCash == input.KioskCash ||
+                    (this.KioskCash != null &&
+                    this.KioskCash.Equals(input.KioskCash))
+                ) && 
+                (
+                    this.KioskCashRevenue == input.KioskCashRevenue ||
+                    (this.KioskCashRevenue != null &&
+                    this.KioskCashRevenue.Equals(input.KioskCashRevenue))
+                ) && 
+                (
+                    this.KioskCard == input.KioskCard ||
+                    (this.KioskCard != null &&
+                    this.KioskCard.Equals(input.KioskCard))
+                ) && 
+                (
+                    this.KioskCardRevenue == input.KioskCardRevenue ||
+                    (this.KioskCardRevenue != null &&
+                    this.KioskCardRevenue.Equals(input.KioskCardRevenue))
+                ) && 
+                (
+                    this.QropCash == input.QropCash ||
+                    (this.QropCash != null &&
+                    this.QropCash.Equals(input.QropCash))
+                ) && 
+                (
+                    this.QropCashRevenue == input.QropCashRevenue ||
+                    (this.QropCashRevenue != null &&
+                    this.QropCashRevenue.Equals(input.QropCashRevenue))
+                ) && 
+                (
+                    this.QropCard == input.QropCard ||
+                    (this.QropCard != null &&
+                    this.QropCard.Equals(input.QropCard))
+                ) && 
+                (
+                    this.QropCardRevenue == input.QropCardRevenue ||
+                    (this.QropCardRevenue != null &&
+                    this.QropCardRevenue.Equals(input.QropCardRevenue))
+                ) && 
+                (
+                    this.PosCard == input.PosCard ||
+                    (this.PosCard != null &&
+                    this.PosCard.Equals(input.PosCard))
+                ) && 
+                (
+                    this.PosCardRevenue == input.PosCardRevenue ||
+                    (this.PosCardRevenue != null &&
+                    this.PosCardRevenue.Equals(input.PosCardRevenue))
+                ) && 
+                (
+                    this.PosCardOnFlipdishOrders == input.PosCardOnFlipdishOrders ||
+                    (this.PosCardOnFlipdishOrders != null &&
+                    this.PosCardOnFlipdishOrders.Equals(input.PosCardOnFlipdishOrders))
+                ) && 
+                (
+                    this.OtherIntegrationFees == input.OtherIntegrationFees ||
+                    (this.OtherIntegrationFees != null &&
+                    this.OtherIntegrationFees.Equals(input.OtherIntegrationFees))
+                ) && 
+                (
+                    this.OtherIntegrationFeesExcludingVat == input.OtherIntegrationFeesExcludingVat ||
+                    (this.OtherIntegrationFeesExcludingVat != null &&
+                    this.OtherIntegrationFeesExcludingVat.Equals(input.OtherIntegrationFeesExcludingVat))
+                ) && 
+                (
+                    this.OtherIntegrationFeesVatAmount == input.OtherIntegrationFeesVatAmount ||
+                    (this.OtherIntegrationFeesVatAmount != null &&
+                    this.OtherIntegrationFeesVatAmount.Equals(input.OtherIntegrationFeesVatAmount))
+                ) && 
+                (
+                    this.OtherIntegrationTips == input.OtherIntegrationTips ||
+                    (this.OtherIntegrationTips != null &&
+                    this.OtherIntegrationTips.Equals(input.OtherIntegrationTips))
+                ) && 
+                (
+                    this.RefundedFeesOnRefundedSales == input.RefundedFeesOnRefundedSales ||
+                    (this.RefundedFeesOnRefundedSales != null &&
+                    this.RefundedFeesOnRefundedSales.Equals(input.RefundedFeesOnRefundedSales))
+                ) && 
+                (
+                    this.Vat == input.Vat ||
+                    (this.Vat != null &&
+                    this.Vat.Equals(input.Vat))
+                ) && 
+                (
+                    this.RefundedFeesOnPosSales == input.RefundedFeesOnPosSales ||
+                    (this.RefundedFeesOnPosSales != null &&
+                    this.RefundedFeesOnPosSales.Equals(input.RefundedFeesOnPosSales))
+                ) && 
+                (
+                    this.Total == input.Total ||
+                    (this.Total != null &&
+                    this.Total.Equals(input.Total))
+                ) && 
+                (
+                    this.ThirdPartyIntegrationFeesAndTips == input.ThirdPartyIntegrationFeesAndTips ||
+                    (this.ThirdPartyIntegrationFeesAndTips != null &&
+                    this.ThirdPartyIntegrationFeesAndTips.Equals(input.ThirdPartyIntegrationFeesAndTips))
+                ) && 
+                (
+                    this.WebAndAppCardOnXOrders == input.WebAndAppCardOnXOrders ||
+                    (this.WebAndAppCardOnXOrders != null &&
+                    this.WebAndAppCardOnXOrders.Equals(input.WebAndAppCardOnXOrders))
+                ) && 
+                (
+                    this.WebAndAppCashOnXOrders == input.WebAndAppCashOnXOrders ||
+                    (this.WebAndAppCashOnXOrders != null &&
+                    this.WebAndAppCashOnXOrders.Equals(input.WebAndAppCashOnXOrders))
+                ) && 
+                (
+                    this.KioskCardOnXOrders == input.KioskCardOnXOrders ||
+                    (this.KioskCardOnXOrders != null &&
+                    this.KioskCardOnXOrders.Equals(input.KioskCardOnXOrders))
+                ) && 
+                (
+                    this.KioskCashOnXOrders == input.KioskCashOnXOrders ||
+                    (this.KioskCashOnXOrders != null &&
+                    this.KioskCashOnXOrders.Equals(input.KioskCashOnXOrders))
+                ) && 
+                (
+                    this.QropCardOnXOrders == input.QropCardOnXOrders ||
+                    (this.QropCardOnXOrders != null &&
+                    this.QropCardOnXOrders.Equals(input.QropCardOnXOrders))
+                ) && 
+                (
+                    this.QropCashOnXOrders == input.QropCashOnXOrders ||
+                    (this.QropCashOnXOrders != null &&
+                    this.QropCashOnXOrders.Equals(input.QropCashOnXOrders))
+                ) && 
+                (
+                    this.PosCardOnXOrders == input.PosCardOnXOrders ||
+                    (this.PosCardOnXOrders != null &&
+                    this.PosCardOnXOrders.Equals(input.PosCardOnXOrders))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WebAndAppCash != null)
+                    hashCode = hashCode * 59 + this.WebAndAppCash.GetHashCode();
+                if (this.WebAndAppCashRevenueIncludingTips != null)
+                    hashCode = hashCode * 59 + this.WebAndAppCashRevenueIncludingTips.GetHashCode();
+                if (this.WebAndAppCard != null)
+                    hashCode = hashCode * 59 + this.WebAndAppCard.GetHashCode();
+                if (this.WebAndAppCardRevenueIncludingTips != null)
+                    hashCode = hashCode * 59 + this.WebAndAppCardRevenueIncludingTips.GetHashCode();
+                if (this.KioskCash != null)
+                    hashCode = hashCode * 59 + this.KioskCash.GetHashCode();
+                if (this.KioskCashRevenue != null)
+                    hashCode = hashCode * 59 + this.KioskCashRevenue.GetHashCode();
+                if (this.KioskCard != null)
+                    hashCode = hashCode * 59 + this.KioskCard.GetHashCode();
+                if (this.KioskCardRevenue != null)
+                    hashCode = hashCode * 59 + this.KioskCardRevenue.GetHashCode();
+                if (this.QropCash != null)
+                    hashCode = hashCode * 59 + this.QropCash.GetHashCode();
+                if (this.QropCashRevenue != null)
+                    hashCode = hashCode * 59 + this.QropCashRevenue.GetHashCode();
+                if (this.QropCard != null)
+                    hashCode = hashCode * 59 + this.QropCard.GetHashCode();
+                if (this.QropCardRevenue != null)
+                    hashCode = hashCode * 59 + this.QropCardRevenue.GetHashCode();
+                if (this.PosCard != null)
+                    hashCode = hashCode * 59 + this.PosCard.GetHashCode();
+                if (this.PosCardRevenue != null)
+                    hashCode = hashCode * 59 + this.PosCardRevenue.GetHashCode();
+                if (this.PosCardOnFlipdishOrders != null)
+                    hashCode = hashCode * 59 + this.PosCardOnFlipdishOrders.GetHashCode();
+                if (this.OtherIntegrationFees != null)
+                    hashCode = hashCode * 59 + this.OtherIntegrationFees.GetHashCode();
+                if (this.OtherIntegrationFeesExcludingVat != null)
+                    hashCode = hashCode * 59 + this.OtherIntegrationFeesExcludingVat.GetHashCode();
+                if (this.OtherIntegrationFeesVatAmount != null)
+                    hashCode = hashCode * 59 + this.OtherIntegrationFeesVatAmount.GetHashCode();
+                if (this.OtherIntegrationTips != null)
+                    hashCode = hashCode * 59 + this.OtherIntegrationTips.GetHashCode();
+                if (this.RefundedFeesOnRefundedSales != null)
+                    hashCode = hashCode * 59 + this.RefundedFeesOnRefundedSales.GetHashCode();
+                if (this.Vat != null)
+                    hashCode = hashCode * 59 + this.Vat.GetHashCode();
+                if (this.RefundedFeesOnPosSales != null)
+                    hashCode = hashCode * 59 + this.RefundedFeesOnPosSales.GetHashCode();
+                if (this.Total != null)
+                    hashCode = hashCode * 59 + this.Total.GetHashCode();
+                if (this.ThirdPartyIntegrationFeesAndTips != null)
+                    hashCode = hashCode * 59 + this.ThirdPartyIntegrationFeesAndTips.GetHashCode();
+                if (this.WebAndAppCardOnXOrders != null)
+                    hashCode = hashCode * 59 + this.WebAndAppCardOnXOrders.GetHashCode();
+                if (this.WebAndAppCashOnXOrders != null)
+                    hashCode = hashCode * 59 + this.WebAndAppCashOnXOrders.GetHashCode();
+                if (this.KioskCardOnXOrders != null)
+                    hashCode = hashCode * 59 + this.KioskCardOnXOrders.GetHashCode();
+                if (this.KioskCashOnXOrders != null)
+                    hashCode = hashCode * 59 + this.KioskCashOnXOrders.GetHashCode();
+                if (this.QropCardOnXOrders != null)
+                    hashCode = hashCode * 59 + this.QropCardOnXOrders.GetHashCode();
+                if (this.QropCashOnXOrders != null)
+                    hashCode = hashCode * 59 + this.QropCashOnXOrders.GetHashCode();
+                if (this.PosCardOnXOrders != null)
+                    hashCode = hashCode * 59 + this.PosCardOnXOrders.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3DetailsRevenue.cs b/src/Flipdish/Model/PayoutReport3DetailsRevenue.cs
new file mode 100644
index 00000000..9103d210
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3DetailsRevenue.cs
@@ -0,0 +1,224 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3DetailsRevenue
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3DetailsRevenue :  IEquatable<PayoutReport3DetailsRevenue>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3DetailsRevenue" /> class.
+        /// </summary>
+        /// <param name="grossSales">grossSales.</param>
+        /// <param name="salesTax">salesTax.</param>
+        /// <param name="deliveryCharges">deliveryCharges.</param>
+        /// <param name="otherCharges">otherCharges.</param>
+        /// <param name="tips">tips.</param>
+        /// <param name="totalRevenue">totalRevenue.</param>
+        /// <param name="revenueForFeeCalculations">revenueForFeeCalculations.</param>
+        /// <param name="drsCharges">drsCharges.</param>
+        public PayoutReport3DetailsRevenue(PayoutReport3DetailsSalesLine grossSales = default(PayoutReport3DetailsSalesLine), PayoutReport3DetailsSalesLine salesTax = default(PayoutReport3DetailsSalesLine), PayoutReport3DetailsSalesLine deliveryCharges = default(PayoutReport3DetailsSalesLine), PayoutReport3DetailsSalesLine otherCharges = default(PayoutReport3DetailsSalesLine), PayoutReport3DetailsSalesLine tips = default(PayoutReport3DetailsSalesLine), PayoutReport3DetailsSalesLine totalRevenue = default(PayoutReport3DetailsSalesLine), PayoutReport3DetailsSalesLine revenueForFeeCalculations = default(PayoutReport3DetailsSalesLine), PayoutReport3DetailsSalesLine drsCharges = default(PayoutReport3DetailsSalesLine))
+        {
+            this.GrossSales = grossSales;
+            this.SalesTax = salesTax;
+            this.DeliveryCharges = deliveryCharges;
+            this.OtherCharges = otherCharges;
+            this.Tips = tips;
+            this.TotalRevenue = totalRevenue;
+            this.RevenueForFeeCalculations = revenueForFeeCalculations;
+            this.DrsCharges = drsCharges;
+        }
+        
+        /// <summary>
+        /// Gets or Sets GrossSales
+        /// </summary>
+        [DataMember(Name="GrossSales", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSalesLine GrossSales { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SalesTax
+        /// </summary>
+        [DataMember(Name="SalesTax", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSalesLine SalesTax { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DeliveryCharges
+        /// </summary>
+        [DataMember(Name="DeliveryCharges", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSalesLine DeliveryCharges { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OtherCharges
+        /// </summary>
+        [DataMember(Name="OtherCharges", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSalesLine OtherCharges { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Tips
+        /// </summary>
+        [DataMember(Name="Tips", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSalesLine Tips { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TotalRevenue
+        /// </summary>
+        [DataMember(Name="TotalRevenue", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSalesLine TotalRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RevenueForFeeCalculations
+        /// </summary>
+        [DataMember(Name="RevenueForFeeCalculations", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSalesLine RevenueForFeeCalculations { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DrsCharges
+        /// </summary>
+        [DataMember(Name="DrsCharges", EmitDefaultValue=false)]
+        public PayoutReport3DetailsSalesLine DrsCharges { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3DetailsRevenue {\n");
+            sb.Append("  GrossSales: ").Append(GrossSales).Append("\n");
+            sb.Append("  SalesTax: ").Append(SalesTax).Append("\n");
+            sb.Append("  DeliveryCharges: ").Append(DeliveryCharges).Append("\n");
+            sb.Append("  OtherCharges: ").Append(OtherCharges).Append("\n");
+            sb.Append("  Tips: ").Append(Tips).Append("\n");
+            sb.Append("  TotalRevenue: ").Append(TotalRevenue).Append("\n");
+            sb.Append("  RevenueForFeeCalculations: ").Append(RevenueForFeeCalculations).Append("\n");
+            sb.Append("  DrsCharges: ").Append(DrsCharges).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3DetailsRevenue);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3DetailsRevenue instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3DetailsRevenue to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3DetailsRevenue input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.GrossSales == input.GrossSales ||
+                    (this.GrossSales != null &&
+                    this.GrossSales.Equals(input.GrossSales))
+                ) && 
+                (
+                    this.SalesTax == input.SalesTax ||
+                    (this.SalesTax != null &&
+                    this.SalesTax.Equals(input.SalesTax))
+                ) && 
+                (
+                    this.DeliveryCharges == input.DeliveryCharges ||
+                    (this.DeliveryCharges != null &&
+                    this.DeliveryCharges.Equals(input.DeliveryCharges))
+                ) && 
+                (
+                    this.OtherCharges == input.OtherCharges ||
+                    (this.OtherCharges != null &&
+                    this.OtherCharges.Equals(input.OtherCharges))
+                ) && 
+                (
+                    this.Tips == input.Tips ||
+                    (this.Tips != null &&
+                    this.Tips.Equals(input.Tips))
+                ) && 
+                (
+                    this.TotalRevenue == input.TotalRevenue ||
+                    (this.TotalRevenue != null &&
+                    this.TotalRevenue.Equals(input.TotalRevenue))
+                ) && 
+                (
+                    this.RevenueForFeeCalculations == input.RevenueForFeeCalculations ||
+                    (this.RevenueForFeeCalculations != null &&
+                    this.RevenueForFeeCalculations.Equals(input.RevenueForFeeCalculations))
+                ) && 
+                (
+                    this.DrsCharges == input.DrsCharges ||
+                    (this.DrsCharges != null &&
+                    this.DrsCharges.Equals(input.DrsCharges))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.GrossSales != null)
+                    hashCode = hashCode * 59 + this.GrossSales.GetHashCode();
+                if (this.SalesTax != null)
+                    hashCode = hashCode * 59 + this.SalesTax.GetHashCode();
+                if (this.DeliveryCharges != null)
+                    hashCode = hashCode * 59 + this.DeliveryCharges.GetHashCode();
+                if (this.OtherCharges != null)
+                    hashCode = hashCode * 59 + this.OtherCharges.GetHashCode();
+                if (this.Tips != null)
+                    hashCode = hashCode * 59 + this.Tips.GetHashCode();
+                if (this.TotalRevenue != null)
+                    hashCode = hashCode * 59 + this.TotalRevenue.GetHashCode();
+                if (this.RevenueForFeeCalculations != null)
+                    hashCode = hashCode * 59 + this.RevenueForFeeCalculations.GetHashCode();
+                if (this.DrsCharges != null)
+                    hashCode = hashCode * 59 + this.DrsCharges.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3DetailsSalesLine.cs b/src/Flipdish/Model/PayoutReport3DetailsSalesLine.cs
new file mode 100644
index 00000000..eda39a7b
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3DetailsSalesLine.cs
@@ -0,0 +1,158 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3DetailsSalesLine
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3DetailsSalesLine :  IEquatable<PayoutReport3DetailsSalesLine>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3DetailsSalesLine" /> class.
+        /// </summary>
+        /// <param name="online">online.</param>
+        /// <param name="pos">pos.</param>
+        /// <param name="other">other.</param>
+        public PayoutReport3DetailsSalesLine(double? online = default(double?), double? pos = default(double?), double? other = default(double?))
+        {
+            this.Online = online;
+            this.Pos = pos;
+            this.Other = other;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Online
+        /// </summary>
+        [DataMember(Name="Online", EmitDefaultValue=false)]
+        public double? Online { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Pos
+        /// </summary>
+        [DataMember(Name="Pos", EmitDefaultValue=false)]
+        public double? Pos { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Other
+        /// </summary>
+        [DataMember(Name="Other", EmitDefaultValue=false)]
+        public double? Other { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Total
+        /// </summary>
+        [DataMember(Name="Total", EmitDefaultValue=false)]
+        public double? Total { get; private set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3DetailsSalesLine {\n");
+            sb.Append("  Online: ").Append(Online).Append("\n");
+            sb.Append("  Pos: ").Append(Pos).Append("\n");
+            sb.Append("  Other: ").Append(Other).Append("\n");
+            sb.Append("  Total: ").Append(Total).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3DetailsSalesLine);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3DetailsSalesLine instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3DetailsSalesLine to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3DetailsSalesLine input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Online == input.Online ||
+                    (this.Online != null &&
+                    this.Online.Equals(input.Online))
+                ) && 
+                (
+                    this.Pos == input.Pos ||
+                    (this.Pos != null &&
+                    this.Pos.Equals(input.Pos))
+                ) && 
+                (
+                    this.Other == input.Other ||
+                    (this.Other != null &&
+                    this.Other.Equals(input.Other))
+                ) && 
+                (
+                    this.Total == input.Total ||
+                    (this.Total != null &&
+                    this.Total.Equals(input.Total))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Online != null)
+                    hashCode = hashCode * 59 + this.Online.GetHashCode();
+                if (this.Pos != null)
+                    hashCode = hashCode * 59 + this.Pos.GetHashCode();
+                if (this.Other != null)
+                    hashCode = hashCode * 59 + this.Other.GetHashCode();
+                if (this.Total != null)
+                    hashCode = hashCode * 59 + this.Total.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3DetailsSummary.cs b/src/Flipdish/Model/PayoutReport3DetailsSummary.cs
new file mode 100644
index 00000000..3d8c4f4f
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3DetailsSummary.cs
@@ -0,0 +1,224 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3DetailsSummary
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3DetailsSummary :  IEquatable<PayoutReport3DetailsSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3DetailsSummary" /> class.
+        /// </summary>
+        /// <param name="revenue">revenue.</param>
+        /// <param name="revenueOfWhichCash">revenueOfWhichCash.</param>
+        /// <param name="unpaidRevenue">unpaidRevenue.</param>
+        /// <param name="revenueForFeeCalculations">revenueForFeeCalculations.</param>
+        /// <param name="flipdishFees">flipdishFees.</param>
+        /// <param name="adjustments">adjustments.</param>
+        /// <param name="thirdPartyIntegrationFeesAndTips">thirdPartyIntegrationFeesAndTips.</param>
+        /// <param name="total">total.</param>
+        public PayoutReport3DetailsSummary(double? revenue = default(double?), double? revenueOfWhichCash = default(double?), double? unpaidRevenue = default(double?), double? revenueForFeeCalculations = default(double?), double? flipdishFees = default(double?), double? adjustments = default(double?), double? thirdPartyIntegrationFeesAndTips = default(double?), double? total = default(double?))
+        {
+            this.Revenue = revenue;
+            this.RevenueOfWhichCash = revenueOfWhichCash;
+            this.UnpaidRevenue = unpaidRevenue;
+            this.RevenueForFeeCalculations = revenueForFeeCalculations;
+            this.FlipdishFees = flipdishFees;
+            this.Adjustments = adjustments;
+            this.ThirdPartyIntegrationFeesAndTips = thirdPartyIntegrationFeesAndTips;
+            this.Total = total;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Revenue
+        /// </summary>
+        [DataMember(Name="Revenue", EmitDefaultValue=false)]
+        public double? Revenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RevenueOfWhichCash
+        /// </summary>
+        [DataMember(Name="RevenueOfWhichCash", EmitDefaultValue=false)]
+        public double? RevenueOfWhichCash { get; set; }
+
+        /// <summary>
+        /// Gets or Sets UnpaidRevenue
+        /// </summary>
+        [DataMember(Name="UnpaidRevenue", EmitDefaultValue=false)]
+        public double? UnpaidRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RevenueForFeeCalculations
+        /// </summary>
+        [DataMember(Name="RevenueForFeeCalculations", EmitDefaultValue=false)]
+        public double? RevenueForFeeCalculations { get; set; }
+
+        /// <summary>
+        /// Gets or Sets FlipdishFees
+        /// </summary>
+        [DataMember(Name="FlipdishFees", EmitDefaultValue=false)]
+        public double? FlipdishFees { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Adjustments
+        /// </summary>
+        [DataMember(Name="Adjustments", EmitDefaultValue=false)]
+        public double? Adjustments { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ThirdPartyIntegrationFeesAndTips
+        /// </summary>
+        [DataMember(Name="ThirdPartyIntegrationFeesAndTips", EmitDefaultValue=false)]
+        public double? ThirdPartyIntegrationFeesAndTips { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Total
+        /// </summary>
+        [DataMember(Name="Total", EmitDefaultValue=false)]
+        public double? Total { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3DetailsSummary {\n");
+            sb.Append("  Revenue: ").Append(Revenue).Append("\n");
+            sb.Append("  RevenueOfWhichCash: ").Append(RevenueOfWhichCash).Append("\n");
+            sb.Append("  UnpaidRevenue: ").Append(UnpaidRevenue).Append("\n");
+            sb.Append("  RevenueForFeeCalculations: ").Append(RevenueForFeeCalculations).Append("\n");
+            sb.Append("  FlipdishFees: ").Append(FlipdishFees).Append("\n");
+            sb.Append("  Adjustments: ").Append(Adjustments).Append("\n");
+            sb.Append("  ThirdPartyIntegrationFeesAndTips: ").Append(ThirdPartyIntegrationFeesAndTips).Append("\n");
+            sb.Append("  Total: ").Append(Total).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3DetailsSummary);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3DetailsSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3DetailsSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3DetailsSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Revenue == input.Revenue ||
+                    (this.Revenue != null &&
+                    this.Revenue.Equals(input.Revenue))
+                ) && 
+                (
+                    this.RevenueOfWhichCash == input.RevenueOfWhichCash ||
+                    (this.RevenueOfWhichCash != null &&
+                    this.RevenueOfWhichCash.Equals(input.RevenueOfWhichCash))
+                ) && 
+                (
+                    this.UnpaidRevenue == input.UnpaidRevenue ||
+                    (this.UnpaidRevenue != null &&
+                    this.UnpaidRevenue.Equals(input.UnpaidRevenue))
+                ) && 
+                (
+                    this.RevenueForFeeCalculations == input.RevenueForFeeCalculations ||
+                    (this.RevenueForFeeCalculations != null &&
+                    this.RevenueForFeeCalculations.Equals(input.RevenueForFeeCalculations))
+                ) && 
+                (
+                    this.FlipdishFees == input.FlipdishFees ||
+                    (this.FlipdishFees != null &&
+                    this.FlipdishFees.Equals(input.FlipdishFees))
+                ) && 
+                (
+                    this.Adjustments == input.Adjustments ||
+                    (this.Adjustments != null &&
+                    this.Adjustments.Equals(input.Adjustments))
+                ) && 
+                (
+                    this.ThirdPartyIntegrationFeesAndTips == input.ThirdPartyIntegrationFeesAndTips ||
+                    (this.ThirdPartyIntegrationFeesAndTips != null &&
+                    this.ThirdPartyIntegrationFeesAndTips.Equals(input.ThirdPartyIntegrationFeesAndTips))
+                ) && 
+                (
+                    this.Total == input.Total ||
+                    (this.Total != null &&
+                    this.Total.Equals(input.Total))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Revenue != null)
+                    hashCode = hashCode * 59 + this.Revenue.GetHashCode();
+                if (this.RevenueOfWhichCash != null)
+                    hashCode = hashCode * 59 + this.RevenueOfWhichCash.GetHashCode();
+                if (this.UnpaidRevenue != null)
+                    hashCode = hashCode * 59 + this.UnpaidRevenue.GetHashCode();
+                if (this.RevenueForFeeCalculations != null)
+                    hashCode = hashCode * 59 + this.RevenueForFeeCalculations.GetHashCode();
+                if (this.FlipdishFees != null)
+                    hashCode = hashCode * 59 + this.FlipdishFees.GetHashCode();
+                if (this.Adjustments != null)
+                    hashCode = hashCode * 59 + this.Adjustments.GetHashCode();
+                if (this.ThirdPartyIntegrationFeesAndTips != null)
+                    hashCode = hashCode * 59 + this.ThirdPartyIntegrationFeesAndTips.GetHashCode();
+                if (this.Total != null)
+                    hashCode = hashCode * 59 + this.Total.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3Overview.cs b/src/Flipdish/Model/PayoutReport3Overview.cs
new file mode 100644
index 00000000..6ea95079
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3Overview.cs
@@ -0,0 +1,128 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3Overview
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3Overview :  IEquatable<PayoutReport3Overview>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3Overview" /> class.
+        /// </summary>
+        /// <param name="payoutReport3OverviewHeader">payoutReport3OverviewHeader.</param>
+        /// <param name="payoutStores">payoutStores.</param>
+        public PayoutReport3Overview(PayoutReport3OverviewHeader payoutReport3OverviewHeader = default(PayoutReport3OverviewHeader), List<PayoutReport3Store> payoutStores = default(List<PayoutReport3Store>))
+        {
+            this.PayoutReport3OverviewHeader = payoutReport3OverviewHeader;
+            this.PayoutStores = payoutStores;
+        }
+        
+        /// <summary>
+        /// Gets or Sets PayoutReport3OverviewHeader
+        /// </summary>
+        [DataMember(Name="PayoutReport3OverviewHeader", EmitDefaultValue=false)]
+        public PayoutReport3OverviewHeader PayoutReport3OverviewHeader { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PayoutStores
+        /// </summary>
+        [DataMember(Name="PayoutStores", EmitDefaultValue=false)]
+        public List<PayoutReport3Store> PayoutStores { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3Overview {\n");
+            sb.Append("  PayoutReport3OverviewHeader: ").Append(PayoutReport3OverviewHeader).Append("\n");
+            sb.Append("  PayoutStores: ").Append(PayoutStores).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3Overview);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3Overview instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3Overview to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3Overview input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PayoutReport3OverviewHeader == input.PayoutReport3OverviewHeader ||
+                    (this.PayoutReport3OverviewHeader != null &&
+                    this.PayoutReport3OverviewHeader.Equals(input.PayoutReport3OverviewHeader))
+                ) && 
+                (
+                    this.PayoutStores == input.PayoutStores ||
+                    this.PayoutStores != null &&
+                    this.PayoutStores.SequenceEqual(input.PayoutStores)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PayoutReport3OverviewHeader != null)
+                    hashCode = hashCode * 59 + this.PayoutReport3OverviewHeader.GetHashCode();
+                if (this.PayoutStores != null)
+                    hashCode = hashCode * 59 + this.PayoutStores.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3OverviewHeader.cs b/src/Flipdish/Model/PayoutReport3OverviewHeader.cs
new file mode 100644
index 00000000..03974575
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3OverviewHeader.cs
@@ -0,0 +1,304 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3OverviewHeader
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3OverviewHeader :  IEquatable<PayoutReport3OverviewHeader>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3OverviewHeader" /> class.
+        /// </summary>
+        /// <param name="payoutId">payoutId.</param>
+        /// <param name="bankAccountId">bankAccountId.</param>
+        /// <param name="isManualPayout">isManualPayout.</param>
+        /// <param name="accountName">accountName.</param>
+        /// <param name="payoutStatus">payoutStatus.</param>
+        /// <param name="createdDate">createdDate.</param>
+        /// <param name="periodStartTime">periodStartTime.</param>
+        /// <param name="periodEndTime">periodEndTime.</param>
+        /// <param name="destinationBank">destinationBank.</param>
+        /// <param name="destinationAccount">destinationAccount.</param>
+        /// <param name="amount">amount.</param>
+        /// <param name="currency">currency.</param>
+        /// <param name="bankAccountHasChanged">bankAccountHasChanged.</param>
+        public PayoutReport3OverviewHeader(int? payoutId = default(int?), int? bankAccountId = default(int?), bool? isManualPayout = default(bool?), string accountName = default(string), string payoutStatus = default(string), DateTime? createdDate = default(DateTime?), DateTime? periodStartTime = default(DateTime?), DateTime? periodEndTime = default(DateTime?), string destinationBank = default(string), string destinationAccount = default(string), double? amount = default(double?), string currency = default(string), bool? bankAccountHasChanged = default(bool?))
+        {
+            this.PayoutId = payoutId;
+            this.BankAccountId = bankAccountId;
+            this.IsManualPayout = isManualPayout;
+            this.AccountName = accountName;
+            this.PayoutStatus = payoutStatus;
+            this.CreatedDate = createdDate;
+            this.PeriodStartTime = periodStartTime;
+            this.PeriodEndTime = periodEndTime;
+            this.DestinationBank = destinationBank;
+            this.DestinationAccount = destinationAccount;
+            this.Amount = amount;
+            this.Currency = currency;
+            this.BankAccountHasChanged = bankAccountHasChanged;
+        }
+        
+        /// <summary>
+        /// Gets or Sets PayoutId
+        /// </summary>
+        [DataMember(Name="PayoutId", EmitDefaultValue=false)]
+        public int? PayoutId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BankAccountId
+        /// </summary>
+        [DataMember(Name="BankAccountId", EmitDefaultValue=false)]
+        public int? BankAccountId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IsManualPayout
+        /// </summary>
+        [DataMember(Name="IsManualPayout", EmitDefaultValue=false)]
+        public bool? IsManualPayout { get; set; }
+
+        /// <summary>
+        /// Gets or Sets AccountName
+        /// </summary>
+        [DataMember(Name="AccountName", EmitDefaultValue=false)]
+        public string AccountName { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PayoutStatus
+        /// </summary>
+        [DataMember(Name="PayoutStatus", EmitDefaultValue=false)]
+        public string PayoutStatus { get; set; }
+
+        /// <summary>
+        /// Gets or Sets CreatedDate
+        /// </summary>
+        [DataMember(Name="CreatedDate", EmitDefaultValue=false)]
+        public DateTime? CreatedDate { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PeriodStartTime
+        /// </summary>
+        [DataMember(Name="PeriodStartTime", EmitDefaultValue=false)]
+        public DateTime? PeriodStartTime { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PeriodEndTime
+        /// </summary>
+        [DataMember(Name="PeriodEndTime", EmitDefaultValue=false)]
+        public DateTime? PeriodEndTime { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DestinationBank
+        /// </summary>
+        [DataMember(Name="DestinationBank", EmitDefaultValue=false)]
+        public string DestinationBank { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DestinationAccount
+        /// </summary>
+        [DataMember(Name="DestinationAccount", EmitDefaultValue=false)]
+        public string DestinationAccount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Amount
+        /// </summary>
+        [DataMember(Name="Amount", EmitDefaultValue=false)]
+        public double? Amount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Currency
+        /// </summary>
+        [DataMember(Name="Currency", EmitDefaultValue=false)]
+        public string Currency { get; set; }
+
+        /// <summary>
+        /// Gets or Sets BankAccountHasChanged
+        /// </summary>
+        [DataMember(Name="BankAccountHasChanged", EmitDefaultValue=false)]
+        public bool? BankAccountHasChanged { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3OverviewHeader {\n");
+            sb.Append("  PayoutId: ").Append(PayoutId).Append("\n");
+            sb.Append("  BankAccountId: ").Append(BankAccountId).Append("\n");
+            sb.Append("  IsManualPayout: ").Append(IsManualPayout).Append("\n");
+            sb.Append("  AccountName: ").Append(AccountName).Append("\n");
+            sb.Append("  PayoutStatus: ").Append(PayoutStatus).Append("\n");
+            sb.Append("  CreatedDate: ").Append(CreatedDate).Append("\n");
+            sb.Append("  PeriodStartTime: ").Append(PeriodStartTime).Append("\n");
+            sb.Append("  PeriodEndTime: ").Append(PeriodEndTime).Append("\n");
+            sb.Append("  DestinationBank: ").Append(DestinationBank).Append("\n");
+            sb.Append("  DestinationAccount: ").Append(DestinationAccount).Append("\n");
+            sb.Append("  Amount: ").Append(Amount).Append("\n");
+            sb.Append("  Currency: ").Append(Currency).Append("\n");
+            sb.Append("  BankAccountHasChanged: ").Append(BankAccountHasChanged).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3OverviewHeader);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3OverviewHeader instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3OverviewHeader to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3OverviewHeader input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PayoutId == input.PayoutId ||
+                    (this.PayoutId != null &&
+                    this.PayoutId.Equals(input.PayoutId))
+                ) && 
+                (
+                    this.BankAccountId == input.BankAccountId ||
+                    (this.BankAccountId != null &&
+                    this.BankAccountId.Equals(input.BankAccountId))
+                ) && 
+                (
+                    this.IsManualPayout == input.IsManualPayout ||
+                    (this.IsManualPayout != null &&
+                    this.IsManualPayout.Equals(input.IsManualPayout))
+                ) && 
+                (
+                    this.AccountName == input.AccountName ||
+                    (this.AccountName != null &&
+                    this.AccountName.Equals(input.AccountName))
+                ) && 
+                (
+                    this.PayoutStatus == input.PayoutStatus ||
+                    (this.PayoutStatus != null &&
+                    this.PayoutStatus.Equals(input.PayoutStatus))
+                ) && 
+                (
+                    this.CreatedDate == input.CreatedDate ||
+                    (this.CreatedDate != null &&
+                    this.CreatedDate.Equals(input.CreatedDate))
+                ) && 
+                (
+                    this.PeriodStartTime == input.PeriodStartTime ||
+                    (this.PeriodStartTime != null &&
+                    this.PeriodStartTime.Equals(input.PeriodStartTime))
+                ) && 
+                (
+                    this.PeriodEndTime == input.PeriodEndTime ||
+                    (this.PeriodEndTime != null &&
+                    this.PeriodEndTime.Equals(input.PeriodEndTime))
+                ) && 
+                (
+                    this.DestinationBank == input.DestinationBank ||
+                    (this.DestinationBank != null &&
+                    this.DestinationBank.Equals(input.DestinationBank))
+                ) && 
+                (
+                    this.DestinationAccount == input.DestinationAccount ||
+                    (this.DestinationAccount != null &&
+                    this.DestinationAccount.Equals(input.DestinationAccount))
+                ) && 
+                (
+                    this.Amount == input.Amount ||
+                    (this.Amount != null &&
+                    this.Amount.Equals(input.Amount))
+                ) && 
+                (
+                    this.Currency == input.Currency ||
+                    (this.Currency != null &&
+                    this.Currency.Equals(input.Currency))
+                ) && 
+                (
+                    this.BankAccountHasChanged == input.BankAccountHasChanged ||
+                    (this.BankAccountHasChanged != null &&
+                    this.BankAccountHasChanged.Equals(input.BankAccountHasChanged))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PayoutId != null)
+                    hashCode = hashCode * 59 + this.PayoutId.GetHashCode();
+                if (this.BankAccountId != null)
+                    hashCode = hashCode * 59 + this.BankAccountId.GetHashCode();
+                if (this.IsManualPayout != null)
+                    hashCode = hashCode * 59 + this.IsManualPayout.GetHashCode();
+                if (this.AccountName != null)
+                    hashCode = hashCode * 59 + this.AccountName.GetHashCode();
+                if (this.PayoutStatus != null)
+                    hashCode = hashCode * 59 + this.PayoutStatus.GetHashCode();
+                if (this.CreatedDate != null)
+                    hashCode = hashCode * 59 + this.CreatedDate.GetHashCode();
+                if (this.PeriodStartTime != null)
+                    hashCode = hashCode * 59 + this.PeriodStartTime.GetHashCode();
+                if (this.PeriodEndTime != null)
+                    hashCode = hashCode * 59 + this.PeriodEndTime.GetHashCode();
+                if (this.DestinationBank != null)
+                    hashCode = hashCode * 59 + this.DestinationBank.GetHashCode();
+                if (this.DestinationAccount != null)
+                    hashCode = hashCode * 59 + this.DestinationAccount.GetHashCode();
+                if (this.Amount != null)
+                    hashCode = hashCode * 59 + this.Amount.GetHashCode();
+                if (this.Currency != null)
+                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
+                if (this.BankAccountHasChanged != null)
+                    hashCode = hashCode * 59 + this.BankAccountHasChanged.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3PropertyDetails.cs b/src/Flipdish/Model/PayoutReport3PropertyDetails.cs
new file mode 100644
index 00000000..6c17e44e
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3PropertyDetails.cs
@@ -0,0 +1,160 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3PropertyDetails
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3PropertyDetails :  IEquatable<PayoutReport3PropertyDetails>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3PropertyDetails" /> class.
+        /// </summary>
+        /// <param name="availableProperties">availableProperties.</param>
+        /// <param name="selectedPropertyIds">selectedPropertyIds.</param>
+        /// <param name="matchedStoreIds">matchedStoreIds.</param>
+        /// <param name="details">details.</param>
+        public PayoutReport3PropertyDetails(List<PayoutReport3PropertyFilterOption> availableProperties = default(List<PayoutReport3PropertyFilterOption>), List<string> selectedPropertyIds = default(List<string>), List<int?> matchedStoreIds = default(List<int?>), PayoutReport3Details details = default(PayoutReport3Details))
+        {
+            this.AvailableProperties = availableProperties;
+            this.SelectedPropertyIds = selectedPropertyIds;
+            this.MatchedStoreIds = matchedStoreIds;
+            this.Details = details;
+        }
+        
+        /// <summary>
+        /// Gets or Sets AvailableProperties
+        /// </summary>
+        [DataMember(Name="AvailableProperties", EmitDefaultValue=false)]
+        public List<PayoutReport3PropertyFilterOption> AvailableProperties { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SelectedPropertyIds
+        /// </summary>
+        [DataMember(Name="SelectedPropertyIds", EmitDefaultValue=false)]
+        public List<string> SelectedPropertyIds { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MatchedStoreIds
+        /// </summary>
+        [DataMember(Name="MatchedStoreIds", EmitDefaultValue=false)]
+        public List<int?> MatchedStoreIds { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Details
+        /// </summary>
+        [DataMember(Name="Details", EmitDefaultValue=false)]
+        public PayoutReport3Details Details { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3PropertyDetails {\n");
+            sb.Append("  AvailableProperties: ").Append(AvailableProperties).Append("\n");
+            sb.Append("  SelectedPropertyIds: ").Append(SelectedPropertyIds).Append("\n");
+            sb.Append("  MatchedStoreIds: ").Append(MatchedStoreIds).Append("\n");
+            sb.Append("  Details: ").Append(Details).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3PropertyDetails);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3PropertyDetails instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3PropertyDetails to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3PropertyDetails input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.AvailableProperties == input.AvailableProperties ||
+                    this.AvailableProperties != null &&
+                    this.AvailableProperties.SequenceEqual(input.AvailableProperties)
+                ) && 
+                (
+                    this.SelectedPropertyIds == input.SelectedPropertyIds ||
+                    this.SelectedPropertyIds != null &&
+                    this.SelectedPropertyIds.SequenceEqual(input.SelectedPropertyIds)
+                ) && 
+                (
+                    this.MatchedStoreIds == input.MatchedStoreIds ||
+                    this.MatchedStoreIds != null &&
+                    this.MatchedStoreIds.SequenceEqual(input.MatchedStoreIds)
+                ) && 
+                (
+                    this.Details == input.Details ||
+                    (this.Details != null &&
+                    this.Details.Equals(input.Details))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.AvailableProperties != null)
+                    hashCode = hashCode * 59 + this.AvailableProperties.GetHashCode();
+                if (this.SelectedPropertyIds != null)
+                    hashCode = hashCode * 59 + this.SelectedPropertyIds.GetHashCode();
+                if (this.MatchedStoreIds != null)
+                    hashCode = hashCode * 59 + this.MatchedStoreIds.GetHashCode();
+                if (this.Details != null)
+                    hashCode = hashCode * 59 + this.Details.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3PropertyFilterOption.cs b/src/Flipdish/Model/PayoutReport3PropertyFilterOption.cs
new file mode 100644
index 00000000..05e1e58a
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3PropertyFilterOption.cs
@@ -0,0 +1,144 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3PropertyFilterOption
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3PropertyFilterOption :  IEquatable<PayoutReport3PropertyFilterOption>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3PropertyFilterOption" /> class.
+        /// </summary>
+        /// <param name="propertyId">propertyId.</param>
+        /// <param name="propertyName">propertyName.</param>
+        /// <param name="storeIds">storeIds.</param>
+        public PayoutReport3PropertyFilterOption(string propertyId = default(string), string propertyName = default(string), List<int?> storeIds = default(List<int?>))
+        {
+            this.PropertyId = propertyId;
+            this.PropertyName = propertyName;
+            this.StoreIds = storeIds;
+        }
+        
+        /// <summary>
+        /// Gets or Sets PropertyId
+        /// </summary>
+        [DataMember(Name="PropertyId", EmitDefaultValue=false)]
+        public string PropertyId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PropertyName
+        /// </summary>
+        [DataMember(Name="PropertyName", EmitDefaultValue=false)]
+        public string PropertyName { get; set; }
+
+        /// <summary>
+        /// Gets or Sets StoreIds
+        /// </summary>
+        [DataMember(Name="StoreIds", EmitDefaultValue=false)]
+        public List<int?> StoreIds { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3PropertyFilterOption {\n");
+            sb.Append("  PropertyId: ").Append(PropertyId).Append("\n");
+            sb.Append("  PropertyName: ").Append(PropertyName).Append("\n");
+            sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3PropertyFilterOption);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3PropertyFilterOption instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3PropertyFilterOption to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3PropertyFilterOption input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PropertyId == input.PropertyId ||
+                    (this.PropertyId != null &&
+                    this.PropertyId.Equals(input.PropertyId))
+                ) && 
+                (
+                    this.PropertyName == input.PropertyName ||
+                    (this.PropertyName != null &&
+                    this.PropertyName.Equals(input.PropertyName))
+                ) && 
+                (
+                    this.StoreIds == input.StoreIds ||
+                    this.StoreIds != null &&
+                    this.StoreIds.SequenceEqual(input.StoreIds)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PropertyId != null)
+                    hashCode = hashCode * 59 + this.PropertyId.GetHashCode();
+                if (this.PropertyName != null)
+                    hashCode = hashCode * 59 + this.PropertyName.GetHashCode();
+                if (this.StoreIds != null)
+                    hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3RefundedOrder.cs b/src/Flipdish/Model/PayoutReport3RefundedOrder.cs
new file mode 100644
index 00000000..68af92c7
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3RefundedOrder.cs
@@ -0,0 +1,260 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3RefundedOrder
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3RefundedOrder :  IEquatable<PayoutReport3RefundedOrder>
+    {
+        /// <summary>
+        /// Defines Type
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum TypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Cash for value: Cash
+            /// </summary>
+            [EnumMember(Value = "Cash")]
+            Cash = 1,
+            
+            /// <summary>
+            /// Enum Card for value: Card
+            /// </summary>
+            [EnumMember(Value = "Card")]
+            Card = 2
+        }
+
+        /// <summary>
+        /// Gets or Sets Type
+        /// </summary>
+        [DataMember(Name="Type", EmitDefaultValue=false)]
+        public TypeEnum? Type { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3RefundedOrder" /> class.
+        /// </summary>
+        /// <param name="orderId">orderId.</param>
+        /// <param name="placedAtTime">placedAtTime.</param>
+        /// <param name="modifiedAtTime">modifiedAtTime.</param>
+        /// <param name="storeName">storeName.</param>
+        /// <param name="type">type.</param>
+        /// <param name="refundedAmount">refundedAmount.</param>
+        /// <param name="refundedFees">refundedFees.</param>
+        /// <param name="refundType">refundType.</param>
+        /// <param name="cashFeeRefundedToCustomer">cashFeeRefundedToCustomer.</param>
+        public PayoutReport3RefundedOrder(int? orderId = default(int?), DateTime? placedAtTime = default(DateTime?), DateTime? modifiedAtTime = default(DateTime?), string storeName = default(string), TypeEnum? type = default(TypeEnum?), double? refundedAmount = default(double?), double? refundedFees = default(double?), string refundType = default(string), double? cashFeeRefundedToCustomer = default(double?))
+        {
+            this.OrderId = orderId;
+            this.PlacedAtTime = placedAtTime;
+            this.ModifiedAtTime = modifiedAtTime;
+            this.StoreName = storeName;
+            this.Type = type;
+            this.RefundedAmount = refundedAmount;
+            this.RefundedFees = refundedFees;
+            this.RefundType = refundType;
+            this.CashFeeRefundedToCustomer = cashFeeRefundedToCustomer;
+        }
+        
+        /// <summary>
+        /// Gets or Sets OrderId
+        /// </summary>
+        [DataMember(Name="OrderId", EmitDefaultValue=false)]
+        public int? OrderId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PlacedAtTime
+        /// </summary>
+        [DataMember(Name="PlacedAtTime", EmitDefaultValue=false)]
+        public DateTime? PlacedAtTime { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ModifiedAtTime
+        /// </summary>
+        [DataMember(Name="ModifiedAtTime", EmitDefaultValue=false)]
+        public DateTime? ModifiedAtTime { get; set; }
+
+        /// <summary>
+        /// Gets or Sets StoreName
+        /// </summary>
+        [DataMember(Name="StoreName", EmitDefaultValue=false)]
+        public string StoreName { get; set; }
+
+
+        /// <summary>
+        /// Gets or Sets RefundedAmount
+        /// </summary>
+        [DataMember(Name="RefundedAmount", EmitDefaultValue=false)]
+        public double? RefundedAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundedFees
+        /// </summary>
+        [DataMember(Name="RefundedFees", EmitDefaultValue=false)]
+        public double? RefundedFees { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RefundType
+        /// </summary>
+        [DataMember(Name="RefundType", EmitDefaultValue=false)]
+        public string RefundType { get; set; }
+
+        /// <summary>
+        /// Gets or Sets CashFeeRefundedToCustomer
+        /// </summary>
+        [DataMember(Name="CashFeeRefundedToCustomer", EmitDefaultValue=false)]
+        public double? CashFeeRefundedToCustomer { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3RefundedOrder {\n");
+            sb.Append("  OrderId: ").Append(OrderId).Append("\n");
+            sb.Append("  PlacedAtTime: ").Append(PlacedAtTime).Append("\n");
+            sb.Append("  ModifiedAtTime: ").Append(ModifiedAtTime).Append("\n");
+            sb.Append("  StoreName: ").Append(StoreName).Append("\n");
+            sb.Append("  Type: ").Append(Type).Append("\n");
+            sb.Append("  RefundedAmount: ").Append(RefundedAmount).Append("\n");
+            sb.Append("  RefundedFees: ").Append(RefundedFees).Append("\n");
+            sb.Append("  RefundType: ").Append(RefundType).Append("\n");
+            sb.Append("  CashFeeRefundedToCustomer: ").Append(CashFeeRefundedToCustomer).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3RefundedOrder);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3RefundedOrder instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3RefundedOrder to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3RefundedOrder input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.OrderId == input.OrderId ||
+                    (this.OrderId != null &&
+                    this.OrderId.Equals(input.OrderId))
+                ) && 
+                (
+                    this.PlacedAtTime == input.PlacedAtTime ||
+                    (this.PlacedAtTime != null &&
+                    this.PlacedAtTime.Equals(input.PlacedAtTime))
+                ) && 
+                (
+                    this.ModifiedAtTime == input.ModifiedAtTime ||
+                    (this.ModifiedAtTime != null &&
+                    this.ModifiedAtTime.Equals(input.ModifiedAtTime))
+                ) && 
+                (
+                    this.StoreName == input.StoreName ||
+                    (this.StoreName != null &&
+                    this.StoreName.Equals(input.StoreName))
+                ) && 
+                (
+                    this.Type == input.Type ||
+                    (this.Type != null &&
+                    this.Type.Equals(input.Type))
+                ) && 
+                (
+                    this.RefundedAmount == input.RefundedAmount ||
+                    (this.RefundedAmount != null &&
+                    this.RefundedAmount.Equals(input.RefundedAmount))
+                ) && 
+                (
+                    this.RefundedFees == input.RefundedFees ||
+                    (this.RefundedFees != null &&
+                    this.RefundedFees.Equals(input.RefundedFees))
+                ) && 
+                (
+                    this.RefundType == input.RefundType ||
+                    (this.RefundType != null &&
+                    this.RefundType.Equals(input.RefundType))
+                ) && 
+                (
+                    this.CashFeeRefundedToCustomer == input.CashFeeRefundedToCustomer ||
+                    (this.CashFeeRefundedToCustomer != null &&
+                    this.CashFeeRefundedToCustomer.Equals(input.CashFeeRefundedToCustomer))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.OrderId != null)
+                    hashCode = hashCode * 59 + this.OrderId.GetHashCode();
+                if (this.PlacedAtTime != null)
+                    hashCode = hashCode * 59 + this.PlacedAtTime.GetHashCode();
+                if (this.ModifiedAtTime != null)
+                    hashCode = hashCode * 59 + this.ModifiedAtTime.GetHashCode();
+                if (this.StoreName != null)
+                    hashCode = hashCode * 59 + this.StoreName.GetHashCode();
+                if (this.Type != null)
+                    hashCode = hashCode * 59 + this.Type.GetHashCode();
+                if (this.RefundedAmount != null)
+                    hashCode = hashCode * 59 + this.RefundedAmount.GetHashCode();
+                if (this.RefundedFees != null)
+                    hashCode = hashCode * 59 + this.RefundedFees.GetHashCode();
+                if (this.RefundType != null)
+                    hashCode = hashCode * 59 + this.RefundType.GetHashCode();
+                if (this.CashFeeRefundedToCustomer != null)
+                    hashCode = hashCode * 59 + this.CashFeeRefundedToCustomer.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3Store.cs b/src/Flipdish/Model/PayoutReport3Store.cs
new file mode 100644
index 00000000..5658fa44
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3Store.cs
@@ -0,0 +1,128 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3Store
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3Store :  IEquatable<PayoutReport3Store>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3Store" /> class.
+        /// </summary>
+        /// <param name="storeId">storeId.</param>
+        /// <param name="storeName">storeName.</param>
+        public PayoutReport3Store(int? storeId = default(int?), string storeName = default(string))
+        {
+            this.StoreId = storeId;
+            this.StoreName = storeName;
+        }
+        
+        /// <summary>
+        /// Gets or Sets StoreId
+        /// </summary>
+        [DataMember(Name="StoreId", EmitDefaultValue=false)]
+        public int? StoreId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets StoreName
+        /// </summary>
+        [DataMember(Name="StoreName", EmitDefaultValue=false)]
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3Store {\n");
+            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  StoreName: ").Append(StoreName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3Store);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3Store instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3Store to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3Store input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.StoreId == input.StoreId ||
+                    (this.StoreId != null &&
+                    this.StoreId.Equals(input.StoreId))
+                ) && 
+                (
+                    this.StoreName == input.StoreName ||
+                    (this.StoreName != null &&
+                    this.StoreName.Equals(input.StoreName))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.StoreId != null)
+                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.StoreName != null)
+                    hashCode = hashCode * 59 + this.StoreName.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3StorePayout.cs b/src/Flipdish/Model/PayoutReport3StorePayout.cs
new file mode 100644
index 00000000..3fb216e3
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3StorePayout.cs
@@ -0,0 +1,224 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3StorePayout
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3StorePayout :  IEquatable<PayoutReport3StorePayout>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3StorePayout" /> class.
+        /// </summary>
+        /// <param name="storeId">storeId.</param>
+        /// <param name="storeName">storeName.</param>
+        /// <param name="summaryTotalPayout">summaryTotalPayout.</param>
+        /// <param name="summaryRevenue">summaryRevenue.</param>
+        /// <param name="summaryCashRevenue">summaryCashRevenue.</param>
+        /// <param name="summaryTotalFlipdishFees">summaryTotalFlipdishFees.</param>
+        /// <param name="summaryAdjustments">summaryAdjustments.</param>
+        /// <param name="currency">currency.</param>
+        public PayoutReport3StorePayout(int? storeId = default(int?), string storeName = default(string), double? summaryTotalPayout = default(double?), double? summaryRevenue = default(double?), double? summaryCashRevenue = default(double?), double? summaryTotalFlipdishFees = default(double?), double? summaryAdjustments = default(double?), string currency = default(string))
+        {
+            this.StoreId = storeId;
+            this.StoreName = storeName;
+            this.SummaryTotalPayout = summaryTotalPayout;
+            this.SummaryRevenue = summaryRevenue;
+            this.SummaryCashRevenue = summaryCashRevenue;
+            this.SummaryTotalFlipdishFees = summaryTotalFlipdishFees;
+            this.SummaryAdjustments = summaryAdjustments;
+            this.Currency = currency;
+        }
+        
+        /// <summary>
+        /// Gets or Sets StoreId
+        /// </summary>
+        [DataMember(Name="StoreId", EmitDefaultValue=false)]
+        public int? StoreId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets StoreName
+        /// </summary>
+        [DataMember(Name="StoreName", EmitDefaultValue=false)]
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SummaryTotalPayout
+        /// </summary>
+        [DataMember(Name="SummaryTotalPayout", EmitDefaultValue=false)]
+        public double? SummaryTotalPayout { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SummaryRevenue
+        /// </summary>
+        [DataMember(Name="SummaryRevenue", EmitDefaultValue=false)]
+        public double? SummaryRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SummaryCashRevenue
+        /// </summary>
+        [DataMember(Name="SummaryCashRevenue", EmitDefaultValue=false)]
+        public double? SummaryCashRevenue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SummaryTotalFlipdishFees
+        /// </summary>
+        [DataMember(Name="SummaryTotalFlipdishFees", EmitDefaultValue=false)]
+        public double? SummaryTotalFlipdishFees { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SummaryAdjustments
+        /// </summary>
+        [DataMember(Name="SummaryAdjustments", EmitDefaultValue=false)]
+        public double? SummaryAdjustments { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Currency
+        /// </summary>
+        [DataMember(Name="Currency", EmitDefaultValue=false)]
+        public string Currency { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3StorePayout {\n");
+            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  StoreName: ").Append(StoreName).Append("\n");
+            sb.Append("  SummaryTotalPayout: ").Append(SummaryTotalPayout).Append("\n");
+            sb.Append("  SummaryRevenue: ").Append(SummaryRevenue).Append("\n");
+            sb.Append("  SummaryCashRevenue: ").Append(SummaryCashRevenue).Append("\n");
+            sb.Append("  SummaryTotalFlipdishFees: ").Append(SummaryTotalFlipdishFees).Append("\n");
+            sb.Append("  SummaryAdjustments: ").Append(SummaryAdjustments).Append("\n");
+            sb.Append("  Currency: ").Append(Currency).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3StorePayout);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3StorePayout instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3StorePayout to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3StorePayout input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.StoreId == input.StoreId ||
+                    (this.StoreId != null &&
+                    this.StoreId.Equals(input.StoreId))
+                ) && 
+                (
+                    this.StoreName == input.StoreName ||
+                    (this.StoreName != null &&
+                    this.StoreName.Equals(input.StoreName))
+                ) && 
+                (
+                    this.SummaryTotalPayout == input.SummaryTotalPayout ||
+                    (this.SummaryTotalPayout != null &&
+                    this.SummaryTotalPayout.Equals(input.SummaryTotalPayout))
+                ) && 
+                (
+                    this.SummaryRevenue == input.SummaryRevenue ||
+                    (this.SummaryRevenue != null &&
+                    this.SummaryRevenue.Equals(input.SummaryRevenue))
+                ) && 
+                (
+                    this.SummaryCashRevenue == input.SummaryCashRevenue ||
+                    (this.SummaryCashRevenue != null &&
+                    this.SummaryCashRevenue.Equals(input.SummaryCashRevenue))
+                ) && 
+                (
+                    this.SummaryTotalFlipdishFees == input.SummaryTotalFlipdishFees ||
+                    (this.SummaryTotalFlipdishFees != null &&
+                    this.SummaryTotalFlipdishFees.Equals(input.SummaryTotalFlipdishFees))
+                ) && 
+                (
+                    this.SummaryAdjustments == input.SummaryAdjustments ||
+                    (this.SummaryAdjustments != null &&
+                    this.SummaryAdjustments.Equals(input.SummaryAdjustments))
+                ) && 
+                (
+                    this.Currency == input.Currency ||
+                    (this.Currency != null &&
+                    this.Currency.Equals(input.Currency))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.StoreId != null)
+                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.StoreName != null)
+                    hashCode = hashCode * 59 + this.StoreName.GetHashCode();
+                if (this.SummaryTotalPayout != null)
+                    hashCode = hashCode * 59 + this.SummaryTotalPayout.GetHashCode();
+                if (this.SummaryRevenue != null)
+                    hashCode = hashCode * 59 + this.SummaryRevenue.GetHashCode();
+                if (this.SummaryCashRevenue != null)
+                    hashCode = hashCode * 59 + this.SummaryCashRevenue.GetHashCode();
+                if (this.SummaryTotalFlipdishFees != null)
+                    hashCode = hashCode * 59 + this.SummaryTotalFlipdishFees.GetHashCode();
+                if (this.SummaryAdjustments != null)
+                    hashCode = hashCode * 59 + this.SummaryAdjustments.GetHashCode();
+                if (this.Currency != null)
+                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutReport3StorePayouts.cs b/src/Flipdish/Model/PayoutReport3StorePayouts.cs
new file mode 100644
index 00000000..09147ff8
--- /dev/null
+++ b/src/Flipdish/Model/PayoutReport3StorePayouts.cs
@@ -0,0 +1,112 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PayoutReport3StorePayouts
+    /// </summary>
+    [DataContract]
+    public partial class PayoutReport3StorePayouts :  IEquatable<PayoutReport3StorePayouts>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayoutReport3StorePayouts" /> class.
+        /// </summary>
+        /// <param name="stores">stores.</param>
+        public PayoutReport3StorePayouts(List<PayoutReport3StorePayout> stores = default(List<PayoutReport3StorePayout>))
+        {
+            this.Stores = stores;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Stores
+        /// </summary>
+        [DataMember(Name="Stores", EmitDefaultValue=false)]
+        public List<PayoutReport3StorePayout> Stores { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PayoutReport3StorePayouts {\n");
+            sb.Append("  Stores: ").Append(Stores).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PayoutReport3StorePayouts);
+        }
+
+        /// <summary>
+        /// Returns true if PayoutReport3StorePayouts instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PayoutReport3StorePayouts to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PayoutReport3StorePayouts input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Stores == input.Stores ||
+                    this.Stores != null &&
+                    this.Stores.SequenceEqual(input.Stores)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Stores != null)
+                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PayoutRequestIds.cs b/src/Flipdish/Model/PayoutRequestIds.cs
index b8174b0c..50b254ed 100644
--- a/src/Flipdish/Model/PayoutRequestIds.cs
+++ b/src/Flipdish/Model/PayoutRequestIds.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Payout Request ids for filtering on Payouts
     /// </summary>
     [DataContract]
-    public partial class PayoutRequestIds :  IEquatable<PayoutRequestIds>, IValidatableObject
+    public partial class PayoutRequestIds :  IEquatable<PayoutRequestIds>
     {
         /// <summary>
         /// Defines States
@@ -166,16 +164,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayoutStore.cs b/src/Flipdish/Model/PayoutStore.cs
index a2e2bd3b..8052b739 100644
--- a/src/Flipdish/Model/PayoutStore.cs
+++ b/src/Flipdish/Model/PayoutStore.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Payout details for a single store
     /// </summary>
     [DataContract]
-    public partial class PayoutStore :  IEquatable<PayoutStore>, IValidatableObject
+    public partial class PayoutStore :  IEquatable<PayoutStore>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PayoutStore" /> class.
@@ -42,7 +40,9 @@ public partial class PayoutStore :  IEquatable<PayoutStore>, IValidatableObject
         /// <param name="chargebacks">Chargebacks breakdown.</param>
         /// <param name="otherCharges">Breakdown of other charges.</param>
         /// <param name="balance">Period opening and closing balance.</param>
-        public PayoutStore(int? storeId = default(int?), string storeName = default(string), double? amount = default(double?), RevenueDetail revenue = default(RevenueDetail), RevenueAdjustmentsDetails revenueAdjustments = default(RevenueAdjustmentsDetails), FlipdishFeesDetails flipdishFees = default(FlipdishFeesDetails), ChargebackDetails chargebacks = default(ChargebackDetails), OtherChargesDetails otherCharges = default(OtherChargesDetails), BalanceDetails balance = default(BalanceDetails))
+        /// <param name="posRevenue">Breakdown of POS charges.</param>
+        /// <param name="thirdPartyFees">Third party integration fees.</param>
+        public PayoutStore(int? storeId = default(int?), string storeName = default(string), double? amount = default(double?), RevenueDetail revenue = default(RevenueDetail), RevenueAdjustmentsDetails revenueAdjustments = default(RevenueAdjustmentsDetails), FlipdishFeesDetails flipdishFees = default(FlipdishFeesDetails), ChargebackDetails chargebacks = default(ChargebackDetails), OtherChargesDetails otherCharges = default(OtherChargesDetails), BalanceDetails balance = default(BalanceDetails), PosRevenueDetails posRevenue = default(PosRevenueDetails), ThirdPartyFeesDetails thirdPartyFees = default(ThirdPartyFeesDetails))
         {
             this.StoreId = storeId;
             this.StoreName = storeName;
@@ -53,6 +53,8 @@ public partial class PayoutStore :  IEquatable<PayoutStore>, IValidatableObject
             this.Chargebacks = chargebacks;
             this.OtherCharges = otherCharges;
             this.Balance = balance;
+            this.PosRevenue = posRevenue;
+            this.ThirdPartyFees = thirdPartyFees;
         }
         
         /// <summary>
@@ -125,6 +127,20 @@ public partial class PayoutStore :  IEquatable<PayoutStore>, IValidatableObject
         [DataMember(Name="Balance", EmitDefaultValue=false)]
         public BalanceDetails Balance { get; set; }
 
+        /// <summary>
+        /// Breakdown of POS charges
+        /// </summary>
+        /// <value>Breakdown of POS charges</value>
+        [DataMember(Name="PosRevenue", EmitDefaultValue=false)]
+        public PosRevenueDetails PosRevenue { get; set; }
+
+        /// <summary>
+        /// Third party integration fees
+        /// </summary>
+        /// <value>Third party integration fees</value>
+        [DataMember(Name="ThirdPartyFees", EmitDefaultValue=false)]
+        public ThirdPartyFeesDetails ThirdPartyFees { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -143,6 +159,8 @@ public override string ToString()
             sb.Append("  Chargebacks: ").Append(Chargebacks).Append("\n");
             sb.Append("  OtherCharges: ").Append(OtherCharges).Append("\n");
             sb.Append("  Balance: ").Append(Balance).Append("\n");
+            sb.Append("  PosRevenue: ").Append(PosRevenue).Append("\n");
+            sb.Append("  ThirdPartyFees: ").Append(ThirdPartyFees).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -226,6 +244,16 @@ public bool Equals(PayoutStore input)
                     this.Balance == input.Balance ||
                     (this.Balance != null &&
                     this.Balance.Equals(input.Balance))
+                ) && 
+                (
+                    this.PosRevenue == input.PosRevenue ||
+                    (this.PosRevenue != null &&
+                    this.PosRevenue.Equals(input.PosRevenue))
+                ) && 
+                (
+                    this.ThirdPartyFees == input.ThirdPartyFees ||
+                    (this.ThirdPartyFees != null &&
+                    this.ThirdPartyFees.Equals(input.ThirdPartyFees))
                 );
         }
 
@@ -258,19 +286,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OtherCharges.GetHashCode();
                 if (this.Balance != null)
                     hashCode = hashCode * 59 + this.Balance.GetHashCode();
+                if (this.PosRevenue != null)
+                    hashCode = hashCode * 59 + this.PosRevenue.GetHashCode();
+                if (this.ThirdPartyFees != null)
+                    hashCode = hashCode * 59 + this.ThirdPartyFees.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PayoutSummary.cs b/src/Flipdish/Model/PayoutSummary.cs
index d6be0fce..a23f44ae 100644
--- a/src/Flipdish/Model/PayoutSummary.cs
+++ b/src/Flipdish/Model/PayoutSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Holds the information for a whitelabel payouts summary.
     /// </summary>
     [DataContract]
-    public partial class PayoutSummary :  IEquatable<PayoutSummary>, IValidatableObject
+    public partial class PayoutSummary :  IEquatable<PayoutSummary>
     {
         /// <summary>
         /// Status of the payout
@@ -887,16 +885,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PendingInvitation.cs b/src/Flipdish/Model/PendingInvitation.cs
new file mode 100644
index 00000000..7e3ed8e5
--- /dev/null
+++ b/src/Flipdish/Model/PendingInvitation.cs
@@ -0,0 +1,164 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// An invitation to join a team at Flipdish.
+    /// </summary>
+    [DataContract]
+    public partial class PendingInvitation :  IEquatable<PendingInvitation>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PendingInvitation" /> class.
+        /// </summary>
+        /// <param name="appName">The name of the brand that you have been invited to join..</param>
+        /// <param name="email">The email address that the invitation was sent to..</param>
+        /// <param name="otc">The one-time code that can be used to accept the invitation..</param>
+        /// <param name="createdAt">The time that the invitation was created..</param>
+        public PendingInvitation(string appName = default(string), string email = default(string), string otc = default(string), DateTime? createdAt = default(DateTime?))
+        {
+            this.AppName = appName;
+            this.Email = email;
+            this.Otc = otc;
+            this.CreatedAt = createdAt;
+        }
+        
+        /// <summary>
+        /// The name of the brand that you have been invited to join.
+        /// </summary>
+        /// <value>The name of the brand that you have been invited to join.</value>
+        [DataMember(Name="AppName", EmitDefaultValue=false)]
+        public string AppName { get; set; }
+
+        /// <summary>
+        /// The email address that the invitation was sent to.
+        /// </summary>
+        /// <value>The email address that the invitation was sent to.</value>
+        [DataMember(Name="Email", EmitDefaultValue=false)]
+        public string Email { get; set; }
+
+        /// <summary>
+        /// The one-time code that can be used to accept the invitation.
+        /// </summary>
+        /// <value>The one-time code that can be used to accept the invitation.</value>
+        [DataMember(Name="Otc", EmitDefaultValue=false)]
+        public string Otc { get; set; }
+
+        /// <summary>
+        /// The time that the invitation was created.
+        /// </summary>
+        /// <value>The time that the invitation was created.</value>
+        [DataMember(Name="CreatedAt", EmitDefaultValue=false)]
+        public DateTime? CreatedAt { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PendingInvitation {\n");
+            sb.Append("  AppName: ").Append(AppName).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  Otc: ").Append(Otc).Append("\n");
+            sb.Append("  CreatedAt: ").Append(CreatedAt).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PendingInvitation);
+        }
+
+        /// <summary>
+        /// Returns true if PendingInvitation instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PendingInvitation to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PendingInvitation input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.AppName == input.AppName ||
+                    (this.AppName != null &&
+                    this.AppName.Equals(input.AppName))
+                ) && 
+                (
+                    this.Email == input.Email ||
+                    (this.Email != null &&
+                    this.Email.Equals(input.Email))
+                ) && 
+                (
+                    this.Otc == input.Otc ||
+                    (this.Otc != null &&
+                    this.Otc.Equals(input.Otc))
+                ) && 
+                (
+                    this.CreatedAt == input.CreatedAt ||
+                    (this.CreatedAt != null &&
+                    this.CreatedAt.Equals(input.CreatedAt))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.AppName != null)
+                    hashCode = hashCode * 59 + this.AppName.GetHashCode();
+                if (this.Email != null)
+                    hashCode = hashCode * 59 + this.Email.GetHashCode();
+                if (this.Otc != null)
+                    hashCode = hashCode * 59 + this.Otc.GetHashCode();
+                if (this.CreatedAt != null)
+                    hashCode = hashCode * 59 + this.CreatedAt.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PendingMenuChanges.cs b/src/Flipdish/Model/PendingMenuChanges.cs
index fb22e609..e6b8f6cd 100644
--- a/src/Flipdish/Model/PendingMenuChanges.cs
+++ b/src/Flipdish/Model/PendingMenuChanges.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Pending Menu Changes
     /// </summary>
     [DataContract]
-    public partial class PendingMenuChanges :  IEquatable<PendingMenuChanges>, IValidatableObject
+    public partial class PendingMenuChanges :  IEquatable<PendingMenuChanges>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PendingMenuChanges" /> class.
@@ -127,28 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PendingMenuChangesSummaries.cs b/src/Flipdish/Model/PendingMenuChangesSummaries.cs
index 3f8c4178..341cb6ff 100644
--- a/src/Flipdish/Model/PendingMenuChangesSummaries.cs
+++ b/src/Flipdish/Model/PendingMenuChangesSummaries.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Pending menu changes summaries
     /// </summary>
     [DataContract]
-    public partial class PendingMenuChangesSummaries :  IEquatable<PendingMenuChangesSummaries>, IValidatableObject
+    public partial class PendingMenuChangesSummaries :  IEquatable<PendingMenuChangesSummaries>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PendingMenuChangesSummaries" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PercentDiscountDetails.cs b/src/Flipdish/Model/PercentDiscountDetails.cs
index 9bf97342..292b65af 100644
--- a/src/Flipdish/Model/PercentDiscountDetails.cs
+++ b/src/Flipdish/Model/PercentDiscountDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,15 +26,17 @@ namespace Flipdish.Model
     /// Percent discount details
     /// </summary>
     [DataContract]
-    public partial class PercentDiscountDetails :  IEquatable<PercentDiscountDetails>, IValidatableObject
+    public partial class PercentDiscountDetails :  IEquatable<PercentDiscountDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PercentDiscountDetails" /> class.
         /// </summary>
         /// <param name="percentageDiscount">Percentage discount.</param>
-        public PercentDiscountDetails(int? percentageDiscount = default(int?))
+        /// <param name="maxDiscountAmount">The maximum amount that the percentage discount value can be.  If not set then there is no maximum.  If set to e.g. 20 euro, and the percentage discount is 25%, and the order total is 100 euro, then the discount will be 20 euro (not 25 euro)..</param>
+        public PercentDiscountDetails(int? percentageDiscount = default(int?), double? maxDiscountAmount = default(double?))
         {
             this.PercentageDiscount = percentageDiscount;
+            this.MaxDiscountAmount = maxDiscountAmount;
         }
         
         /// <summary>
@@ -46,6 +46,13 @@ public partial class PercentDiscountDetails :  IEquatable<PercentDiscountDetails
         [DataMember(Name="PercentageDiscount", EmitDefaultValue=false)]
         public int? PercentageDiscount { get; set; }
 
+        /// <summary>
+        /// The maximum amount that the percentage discount value can be.  If not set then there is no maximum.  If set to e.g. 20 euro, and the percentage discount is 25%, and the order total is 100 euro, then the discount will be 20 euro (not 25 euro).
+        /// </summary>
+        /// <value>The maximum amount that the percentage discount value can be.  If not set then there is no maximum.  If set to e.g. 20 euro, and the percentage discount is 25%, and the order total is 100 euro, then the discount will be 20 euro (not 25 euro).</value>
+        [DataMember(Name="MaxDiscountAmount", EmitDefaultValue=false)]
+        public double? MaxDiscountAmount { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -55,6 +62,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class PercentDiscountDetails {\n");
             sb.Append("  PercentageDiscount: ").Append(PercentageDiscount).Append("\n");
+            sb.Append("  MaxDiscountAmount: ").Append(MaxDiscountAmount).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -93,6 +101,11 @@ public bool Equals(PercentDiscountDetails input)
                     this.PercentageDiscount == input.PercentageDiscount ||
                     (this.PercentageDiscount != null &&
                     this.PercentageDiscount.Equals(input.PercentageDiscount))
+                ) && 
+                (
+                    this.MaxDiscountAmount == input.MaxDiscountAmount ||
+                    (this.MaxDiscountAmount != null &&
+                    this.MaxDiscountAmount.Equals(input.MaxDiscountAmount))
                 );
         }
 
@@ -107,19 +120,11 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.PercentageDiscount != null)
                     hashCode = hashCode * 59 + this.PercentageDiscount.GetHashCode();
+                if (this.MaxDiscountAmount != null)
+                    hashCode = hashCode * 59 + this.MaxDiscountAmount.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PhoneCall.cs b/src/Flipdish/Model/PhoneCall.cs
index 247c707f..1589b383 100644
--- a/src/Flipdish/Model/PhoneCall.cs
+++ b/src/Flipdish/Model/PhoneCall.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Phone call
     /// </summary>
     [DataContract]
-    public partial class PhoneCall :  IEquatable<PhoneCall>, IValidatableObject
+    public partial class PhoneCall :  IEquatable<PhoneCall>
     {
         /// <summary>
         /// The status of the call
@@ -103,6 +101,7 @@ public enum CallStatusEnum
         /// Initializes a new instance of the <see cref="PhoneCall" /> class.
         /// </summary>
         /// <param name="phoneCallId">Phone call id.</param>
+        /// <param name="callSid">Twilio Call SID.</param>
         /// <param name="timeOfCall">Time of the call.</param>
         /// <param name="timeOfCallLocal">Time of the call, local to the store to which the call was made.</param>
         /// <param name="storeId">ID of the store that the call was TO.</param>
@@ -112,9 +111,10 @@ public enum CallStatusEnum
         /// <param name="callerNumber">Phone number of the caller.</param>
         /// <param name="callLengthInSeconds">The amount of time the call took.</param>
         /// <param name="callStatus">The status of the call.</param>
-        public PhoneCall(int? phoneCallId = default(int?), DateTime? timeOfCall = default(DateTime?), DateTime? timeOfCallLocal = default(DateTime?), int? storeId = default(int?), string storeName = default(string), string callerName = default(string), int? callerUserId = default(int?), string callerNumber = default(string), int? callLengthInSeconds = default(int?), CallStatusEnum? callStatus = default(CallStatusEnum?))
+        public PhoneCall(int? phoneCallId = default(int?), string callSid = default(string), DateTime? timeOfCall = default(DateTime?), DateTime? timeOfCallLocal = default(DateTime?), int? storeId = default(int?), string storeName = default(string), string callerName = default(string), int? callerUserId = default(int?), string callerNumber = default(string), int? callLengthInSeconds = default(int?), CallStatusEnum? callStatus = default(CallStatusEnum?))
         {
             this.PhoneCallId = phoneCallId;
+            this.CallSid = callSid;
             this.TimeOfCall = timeOfCall;
             this.TimeOfCallLocal = timeOfCallLocal;
             this.StoreId = storeId;
@@ -133,6 +133,13 @@ public enum CallStatusEnum
         [DataMember(Name="PhoneCallId", EmitDefaultValue=false)]
         public int? PhoneCallId { get; set; }
 
+        /// <summary>
+        /// Twilio Call SID
+        /// </summary>
+        /// <value>Twilio Call SID</value>
+        [DataMember(Name="CallSid", EmitDefaultValue=false)]
+        public string CallSid { get; set; }
+
         /// <summary>
         /// Time of the call
         /// </summary>
@@ -199,6 +206,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class PhoneCall {\n");
             sb.Append("  PhoneCallId: ").Append(PhoneCallId).Append("\n");
+            sb.Append("  CallSid: ").Append(CallSid).Append("\n");
             sb.Append("  TimeOfCall: ").Append(TimeOfCall).Append("\n");
             sb.Append("  TimeOfCallLocal: ").Append(TimeOfCallLocal).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
@@ -247,6 +255,11 @@ public bool Equals(PhoneCall input)
                     (this.PhoneCallId != null &&
                     this.PhoneCallId.Equals(input.PhoneCallId))
                 ) && 
+                (
+                    this.CallSid == input.CallSid ||
+                    (this.CallSid != null &&
+                    this.CallSid.Equals(input.CallSid))
+                ) && 
                 (
                     this.TimeOfCall == input.TimeOfCall ||
                     (this.TimeOfCall != null &&
@@ -305,6 +318,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.PhoneCallId != null)
                     hashCode = hashCode * 59 + this.PhoneCallId.GetHashCode();
+                if (this.CallSid != null)
+                    hashCode = hashCode * 59 + this.CallSid.GetHashCode();
                 if (this.TimeOfCall != null)
                     hashCode = hashCode * 59 + this.TimeOfCall.GetHashCode();
                 if (this.TimeOfCallLocal != null)
@@ -326,16 +341,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PhoneCallEndedEvent.cs b/src/Flipdish/Model/PhoneCallEndedEvent.cs
index 4090ada0..63221e46 100644
--- a/src/Flipdish/Model/PhoneCallEndedEvent.cs
+++ b/src/Flipdish/Model/PhoneCallEndedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Phone call ended event
     /// </summary>
     [DataContract]
-    public partial class PhoneCallEndedEvent :  IEquatable<PhoneCallEndedEvent>, IValidatableObject
+    public partial class PhoneCallEndedEvent :  IEquatable<PhoneCallEndedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PhoneCallEndedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class PhoneCallEndedEvent :  IEquatable<PhoneCallEndedEvent>, IVa
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PhoneCallEndedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), PhoneCall phoneCall = default(PhoneCall), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PhoneCallEndedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), PhoneCall phoneCall = default(PhoneCall), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class PhoneCallEndedEvent :  IEquatable<PhoneCallEndedEvent>, IVa
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class PhoneCallEndedEvent :  IEquatable<PhoneCallEndedEvent>, IVa
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class PhoneCallEndedEvent :  IEquatable<PhoneCallEndedEvent>, IVa
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(PhoneCallEndedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PhoneCallStartedEvent.cs b/src/Flipdish/Model/PhoneCallStartedEvent.cs
index f4f2b92b..0a6e2df0 100644
--- a/src/Flipdish/Model/PhoneCallStartedEvent.cs
+++ b/src/Flipdish/Model/PhoneCallStartedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Phone call started event
     /// </summary>
     [DataContract]
-    public partial class PhoneCallStartedEvent :  IEquatable<PhoneCallStartedEvent>, IValidatableObject
+    public partial class PhoneCallStartedEvent :  IEquatable<PhoneCallStartedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PhoneCallStartedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class PhoneCallStartedEvent :  IEquatable<PhoneCallStartedEvent>,
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PhoneCallStartedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), PhoneCall phoneCall = default(PhoneCall), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PhoneCallStartedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), PhoneCall phoneCall = default(PhoneCall), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -52,7 +53,10 @@ public partial class PhoneCallStartedEvent :  IEquatable<PhoneCallStartedEvent>,
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class PhoneCallStartedEvent :  IEquatable<PhoneCallStartedEvent>,
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class PhoneCallStartedEvent :  IEquatable<PhoneCallStartedEvent>,
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(PhoneCallStartedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PixelPointProductCatalogue.cs b/src/Flipdish/Model/PixelPointProductCatalogue.cs
new file mode 100644
index 00000000..fbba60b4
--- /dev/null
+++ b/src/Flipdish/Model/PixelPointProductCatalogue.cs
@@ -0,0 +1,201 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Catalogue of PixelPoint products uploaded for a store
+    /// </summary>
+    [DataContract]
+    public partial class PixelPointProductCatalogue :  IEquatable<PixelPointProductCatalogue>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelPointProductCatalogue" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected PixelPointProductCatalogue() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelPointProductCatalogue" /> class.
+        /// </summary>
+        /// <param name="products">PixelPoint product number mapped to its display string.  Always includes the special NOT_INCLUDED sentinel entry. (required).</param>
+        /// <param name="page">Current page index (1-based) (required).</param>
+        /// <param name="limit">Current page size (required).</param>
+        /// <param name="totalRecordCount">Total number of products matching the filter (excluding the sentinel entry) (required).</param>
+        public PixelPointProductCatalogue(Dictionary<string, string> products = default(Dictionary<string, string>), int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?))
+        {
+            // to ensure "products" is required (not null)
+            if (products == null)
+            {
+                throw new InvalidDataException("products is a required property for PixelPointProductCatalogue and cannot be null");
+            }
+            else
+            {
+                this.Products = products;
+            }
+            // to ensure "page" is required (not null)
+            if (page == null)
+            {
+                throw new InvalidDataException("page is a required property for PixelPointProductCatalogue and cannot be null");
+            }
+            else
+            {
+                this.Page = page;
+            }
+            // to ensure "limit" is required (not null)
+            if (limit == null)
+            {
+                throw new InvalidDataException("limit is a required property for PixelPointProductCatalogue and cannot be null");
+            }
+            else
+            {
+                this.Limit = limit;
+            }
+            // to ensure "totalRecordCount" is required (not null)
+            if (totalRecordCount == null)
+            {
+                throw new InvalidDataException("totalRecordCount is a required property for PixelPointProductCatalogue and cannot be null");
+            }
+            else
+            {
+                this.TotalRecordCount = totalRecordCount;
+            }
+        }
+        
+        /// <summary>
+        /// PixelPoint product number mapped to its display string.  Always includes the special NOT_INCLUDED sentinel entry.
+        /// </summary>
+        /// <value>PixelPoint product number mapped to its display string.  Always includes the special NOT_INCLUDED sentinel entry.</value>
+        [DataMember(Name="Products", EmitDefaultValue=false)]
+        public Dictionary<string, string> Products { get; set; }
+
+        /// <summary>
+        /// Current page index (1-based)
+        /// </summary>
+        /// <value>Current page index (1-based)</value>
+        [DataMember(Name="Page", EmitDefaultValue=false)]
+        public int? Page { get; set; }
+
+        /// <summary>
+        /// Current page size
+        /// </summary>
+        /// <value>Current page size</value>
+        [DataMember(Name="Limit", EmitDefaultValue=false)]
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Total number of products matching the filter (excluding the sentinel entry)
+        /// </summary>
+        /// <value>Total number of products matching the filter (excluding the sentinel entry)</value>
+        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
+        public int? TotalRecordCount { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PixelPointProductCatalogue {\n");
+            sb.Append("  Products: ").Append(Products).Append("\n");
+            sb.Append("  Page: ").Append(Page).Append("\n");
+            sb.Append("  Limit: ").Append(Limit).Append("\n");
+            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PixelPointProductCatalogue);
+        }
+
+        /// <summary>
+        /// Returns true if PixelPointProductCatalogue instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PixelPointProductCatalogue to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PixelPointProductCatalogue input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Products == input.Products ||
+                    this.Products != null &&
+                    this.Products.SequenceEqual(input.Products)
+                ) && 
+                (
+                    this.Page == input.Page ||
+                    (this.Page != null &&
+                    this.Page.Equals(input.Page))
+                ) && 
+                (
+                    this.Limit == input.Limit ||
+                    (this.Limit != null &&
+                    this.Limit.Equals(input.Limit))
+                ) && 
+                (
+                    this.TotalRecordCount == input.TotalRecordCount ||
+                    (this.TotalRecordCount != null &&
+                    this.TotalRecordCount.Equals(input.TotalRecordCount))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Products != null)
+                    hashCode = hashCode * 59 + this.Products.GetHashCode();
+                if (this.Page != null)
+                    hashCode = hashCode * 59 + this.Page.GetHashCode();
+                if (this.Limit != null)
+                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
+                if (this.TotalRecordCount != null)
+                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PlayStoreConfigModel.cs b/src/Flipdish/Model/PlayStoreConfigModel.cs
new file mode 100644
index 00000000..4de84f31
--- /dev/null
+++ b/src/Flipdish/Model/PlayStoreConfigModel.cs
@@ -0,0 +1,317 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Play Store configuration model
+    /// </summary>
+    [DataContract]
+    public partial class PlayStoreConfigModel :  IEquatable<PlayStoreConfigModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlayStoreConfigModel" /> class.
+        /// </summary>
+        /// <param name="whiteLabelId">White label ID.</param>
+        /// <param name="bundleId">Bundle ID.</param>
+        /// <param name="description">Description.</param>
+        /// <param name="shortDescription">Short description.</param>
+        /// <param name="copyright">Copyright.</param>
+        /// <param name="keywords">Keywords.</param>
+        /// <param name="marketingUrl">Marketing URL.</param>
+        /// <param name="privacyUrl">Privacy URL.</param>
+        /// <param name="supportUrl">Support URL.</param>
+        /// <param name="playConsoleAccount">Play Console account: 0 &#x3D; IE, 1 &#x3D; UK, 2 &#x3D; IE2, 3 &#x3D; IE3.</param>
+        /// <param name="releaseNotes">Release notes.</param>
+        /// <param name="storeIcon">Store icon URL.</param>
+        /// <param name="readyToPublishAndroid">Ready to publish Android.</param>
+        public PlayStoreConfigModel(int? whiteLabelId = default(int?), string bundleId = default(string), string description = default(string), string shortDescription = default(string), string copyright = default(string), string keywords = default(string), string marketingUrl = default(string), string privacyUrl = default(string), string supportUrl = default(string), int? playConsoleAccount = default(int?), string releaseNotes = default(string), string storeIcon = default(string), bool? readyToPublishAndroid = default(bool?))
+        {
+            this.WhiteLabelId = whiteLabelId;
+            this.BundleId = bundleId;
+            this.Description = description;
+            this.ShortDescription = shortDescription;
+            this.Copyright = copyright;
+            this.Keywords = keywords;
+            this.MarketingUrl = marketingUrl;
+            this.PrivacyUrl = privacyUrl;
+            this.SupportUrl = supportUrl;
+            this.PlayConsoleAccount = playConsoleAccount;
+            this.ReleaseNotes = releaseNotes;
+            this.StoreIcon = storeIcon;
+            this.ReadyToPublishAndroid = readyToPublishAndroid;
+        }
+        
+        /// <summary>
+        /// White label ID
+        /// </summary>
+        /// <value>White label ID</value>
+        [DataMember(Name="WhiteLabelId", EmitDefaultValue=false)]
+        public int? WhiteLabelId { get; set; }
+
+        /// <summary>
+        /// Bundle ID
+        /// </summary>
+        /// <value>Bundle ID</value>
+        [DataMember(Name="BundleId", EmitDefaultValue=false)]
+        public string BundleId { get; set; }
+
+        /// <summary>
+        /// Description
+        /// </summary>
+        /// <value>Description</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Short description
+        /// </summary>
+        /// <value>Short description</value>
+        [DataMember(Name="ShortDescription", EmitDefaultValue=false)]
+        public string ShortDescription { get; set; }
+
+        /// <summary>
+        /// Copyright
+        /// </summary>
+        /// <value>Copyright</value>
+        [DataMember(Name="Copyright", EmitDefaultValue=false)]
+        public string Copyright { get; set; }
+
+        /// <summary>
+        /// Keywords
+        /// </summary>
+        /// <value>Keywords</value>
+        [DataMember(Name="Keywords", EmitDefaultValue=false)]
+        public string Keywords { get; set; }
+
+        /// <summary>
+        /// Marketing URL
+        /// </summary>
+        /// <value>Marketing URL</value>
+        [DataMember(Name="MarketingUrl", EmitDefaultValue=false)]
+        public string MarketingUrl { get; set; }
+
+        /// <summary>
+        /// Privacy URL
+        /// </summary>
+        /// <value>Privacy URL</value>
+        [DataMember(Name="PrivacyUrl", EmitDefaultValue=false)]
+        public string PrivacyUrl { get; set; }
+
+        /// <summary>
+        /// Support URL
+        /// </summary>
+        /// <value>Support URL</value>
+        [DataMember(Name="SupportUrl", EmitDefaultValue=false)]
+        public string SupportUrl { get; set; }
+
+        /// <summary>
+        /// Play Console account: 0 &#x3D; IE, 1 &#x3D; UK, 2 &#x3D; IE2, 3 &#x3D; IE3
+        /// </summary>
+        /// <value>Play Console account: 0 &#x3D; IE, 1 &#x3D; UK, 2 &#x3D; IE2, 3 &#x3D; IE3</value>
+        [DataMember(Name="PlayConsoleAccount", EmitDefaultValue=false)]
+        public int? PlayConsoleAccount { get; set; }
+
+        /// <summary>
+        /// Release notes
+        /// </summary>
+        /// <value>Release notes</value>
+        [DataMember(Name="ReleaseNotes", EmitDefaultValue=false)]
+        public string ReleaseNotes { get; set; }
+
+        /// <summary>
+        /// Store icon URL
+        /// </summary>
+        /// <value>Store icon URL</value>
+        [DataMember(Name="StoreIcon", EmitDefaultValue=false)]
+        public string StoreIcon { get; set; }
+
+        /// <summary>
+        /// Ready to publish Android
+        /// </summary>
+        /// <value>Ready to publish Android</value>
+        [DataMember(Name="ReadyToPublishAndroid", EmitDefaultValue=false)]
+        public bool? ReadyToPublishAndroid { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PlayStoreConfigModel {\n");
+            sb.Append("  WhiteLabelId: ").Append(WhiteLabelId).Append("\n");
+            sb.Append("  BundleId: ").Append(BundleId).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  ShortDescription: ").Append(ShortDescription).Append("\n");
+            sb.Append("  Copyright: ").Append(Copyright).Append("\n");
+            sb.Append("  Keywords: ").Append(Keywords).Append("\n");
+            sb.Append("  MarketingUrl: ").Append(MarketingUrl).Append("\n");
+            sb.Append("  PrivacyUrl: ").Append(PrivacyUrl).Append("\n");
+            sb.Append("  SupportUrl: ").Append(SupportUrl).Append("\n");
+            sb.Append("  PlayConsoleAccount: ").Append(PlayConsoleAccount).Append("\n");
+            sb.Append("  ReleaseNotes: ").Append(ReleaseNotes).Append("\n");
+            sb.Append("  StoreIcon: ").Append(StoreIcon).Append("\n");
+            sb.Append("  ReadyToPublishAndroid: ").Append(ReadyToPublishAndroid).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PlayStoreConfigModel);
+        }
+
+        /// <summary>
+        /// Returns true if PlayStoreConfigModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PlayStoreConfigModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PlayStoreConfigModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelId == input.WhiteLabelId ||
+                    (this.WhiteLabelId != null &&
+                    this.WhiteLabelId.Equals(input.WhiteLabelId))
+                ) && 
+                (
+                    this.BundleId == input.BundleId ||
+                    (this.BundleId != null &&
+                    this.BundleId.Equals(input.BundleId))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.ShortDescription == input.ShortDescription ||
+                    (this.ShortDescription != null &&
+                    this.ShortDescription.Equals(input.ShortDescription))
+                ) && 
+                (
+                    this.Copyright == input.Copyright ||
+                    (this.Copyright != null &&
+                    this.Copyright.Equals(input.Copyright))
+                ) && 
+                (
+                    this.Keywords == input.Keywords ||
+                    (this.Keywords != null &&
+                    this.Keywords.Equals(input.Keywords))
+                ) && 
+                (
+                    this.MarketingUrl == input.MarketingUrl ||
+                    (this.MarketingUrl != null &&
+                    this.MarketingUrl.Equals(input.MarketingUrl))
+                ) && 
+                (
+                    this.PrivacyUrl == input.PrivacyUrl ||
+                    (this.PrivacyUrl != null &&
+                    this.PrivacyUrl.Equals(input.PrivacyUrl))
+                ) && 
+                (
+                    this.SupportUrl == input.SupportUrl ||
+                    (this.SupportUrl != null &&
+                    this.SupportUrl.Equals(input.SupportUrl))
+                ) && 
+                (
+                    this.PlayConsoleAccount == input.PlayConsoleAccount ||
+                    (this.PlayConsoleAccount != null &&
+                    this.PlayConsoleAccount.Equals(input.PlayConsoleAccount))
+                ) && 
+                (
+                    this.ReleaseNotes == input.ReleaseNotes ||
+                    (this.ReleaseNotes != null &&
+                    this.ReleaseNotes.Equals(input.ReleaseNotes))
+                ) && 
+                (
+                    this.StoreIcon == input.StoreIcon ||
+                    (this.StoreIcon != null &&
+                    this.StoreIcon.Equals(input.StoreIcon))
+                ) && 
+                (
+                    this.ReadyToPublishAndroid == input.ReadyToPublishAndroid ||
+                    (this.ReadyToPublishAndroid != null &&
+                    this.ReadyToPublishAndroid.Equals(input.ReadyToPublishAndroid))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelId.GetHashCode();
+                if (this.BundleId != null)
+                    hashCode = hashCode * 59 + this.BundleId.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.ShortDescription != null)
+                    hashCode = hashCode * 59 + this.ShortDescription.GetHashCode();
+                if (this.Copyright != null)
+                    hashCode = hashCode * 59 + this.Copyright.GetHashCode();
+                if (this.Keywords != null)
+                    hashCode = hashCode * 59 + this.Keywords.GetHashCode();
+                if (this.MarketingUrl != null)
+                    hashCode = hashCode * 59 + this.MarketingUrl.GetHashCode();
+                if (this.PrivacyUrl != null)
+                    hashCode = hashCode * 59 + this.PrivacyUrl.GetHashCode();
+                if (this.SupportUrl != null)
+                    hashCode = hashCode * 59 + this.SupportUrl.GetHashCode();
+                if (this.PlayConsoleAccount != null)
+                    hashCode = hashCode * 59 + this.PlayConsoleAccount.GetHashCode();
+                if (this.ReleaseNotes != null)
+                    hashCode = hashCode * 59 + this.ReleaseNotes.GetHashCode();
+                if (this.StoreIcon != null)
+                    hashCode = hashCode * 59 + this.StoreIcon.GetHashCode();
+                if (this.ReadyToPublishAndroid != null)
+                    hashCode = hashCode * 59 + this.ReadyToPublishAndroid.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PosRevenueDetails.cs b/src/Flipdish/Model/PosRevenueDetails.cs
new file mode 100644
index 00000000..720c5cf1
--- /dev/null
+++ b/src/Flipdish/Model/PosRevenueDetails.cs
@@ -0,0 +1,164 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Breakdown of POS charges
+    /// </summary>
+    [DataContract]
+    public partial class PosRevenueDetails :  IEquatable<PosRevenueDetails>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PosRevenueDetails" /> class.
+        /// </summary>
+        /// <param name="posSalesAmount">POS sale amount for the store.</param>
+        /// <param name="posSalesTax">POS sale Tax for the store.</param>
+        /// <param name="posSalesTips">POS sale tips for the store.</param>
+        /// <param name="totalPosRevenue">POS Total Revenue for the store.</param>
+        public PosRevenueDetails(double? posSalesAmount = default(double?), double? posSalesTax = default(double?), double? posSalesTips = default(double?), double? totalPosRevenue = default(double?))
+        {
+            this.PosSalesAmount = posSalesAmount;
+            this.PosSalesTax = posSalesTax;
+            this.PosSalesTips = posSalesTips;
+            this.TotalPosRevenue = totalPosRevenue;
+        }
+        
+        /// <summary>
+        /// POS sale amount for the store
+        /// </summary>
+        /// <value>POS sale amount for the store</value>
+        [DataMember(Name="PosSalesAmount", EmitDefaultValue=false)]
+        public double? PosSalesAmount { get; set; }
+
+        /// <summary>
+        /// POS sale Tax for the store
+        /// </summary>
+        /// <value>POS sale Tax for the store</value>
+        [DataMember(Name="PosSalesTax", EmitDefaultValue=false)]
+        public double? PosSalesTax { get; set; }
+
+        /// <summary>
+        /// POS sale tips for the store
+        /// </summary>
+        /// <value>POS sale tips for the store</value>
+        [DataMember(Name="PosSalesTips", EmitDefaultValue=false)]
+        public double? PosSalesTips { get; set; }
+
+        /// <summary>
+        /// POS Total Revenue for the store
+        /// </summary>
+        /// <value>POS Total Revenue for the store</value>
+        [DataMember(Name="TotalPosRevenue", EmitDefaultValue=false)]
+        public double? TotalPosRevenue { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PosRevenueDetails {\n");
+            sb.Append("  PosSalesAmount: ").Append(PosSalesAmount).Append("\n");
+            sb.Append("  PosSalesTax: ").Append(PosSalesTax).Append("\n");
+            sb.Append("  PosSalesTips: ").Append(PosSalesTips).Append("\n");
+            sb.Append("  TotalPosRevenue: ").Append(TotalPosRevenue).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PosRevenueDetails);
+        }
+
+        /// <summary>
+        /// Returns true if PosRevenueDetails instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PosRevenueDetails to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PosRevenueDetails input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PosSalesAmount == input.PosSalesAmount ||
+                    (this.PosSalesAmount != null &&
+                    this.PosSalesAmount.Equals(input.PosSalesAmount))
+                ) && 
+                (
+                    this.PosSalesTax == input.PosSalesTax ||
+                    (this.PosSalesTax != null &&
+                    this.PosSalesTax.Equals(input.PosSalesTax))
+                ) && 
+                (
+                    this.PosSalesTips == input.PosSalesTips ||
+                    (this.PosSalesTips != null &&
+                    this.PosSalesTips.Equals(input.PosSalesTips))
+                ) && 
+                (
+                    this.TotalPosRevenue == input.TotalPosRevenue ||
+                    (this.TotalPosRevenue != null &&
+                    this.TotalPosRevenue.Equals(input.TotalPosRevenue))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PosSalesAmount != null)
+                    hashCode = hashCode * 59 + this.PosSalesAmount.GetHashCode();
+                if (this.PosSalesTax != null)
+                    hashCode = hashCode * 59 + this.PosSalesTax.GetHashCode();
+                if (this.PosSalesTips != null)
+                    hashCode = hashCode * 59 + this.PosSalesTips.GetHashCode();
+                if (this.TotalPosRevenue != null)
+                    hashCode = hashCode * 59 + this.TotalPosRevenue.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PreOrderConfig.cs b/src/Flipdish/Model/PreOrderConfig.cs
index 77c92259..9154d8a4 100644
--- a/src/Flipdish/Model/PreOrderConfig.cs
+++ b/src/Flipdish/Model/PreOrderConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Pre Order Config
     /// </summary>
     [DataContract]
-    public partial class PreOrderConfig :  IEquatable<PreOrderConfig>, IValidatableObject
+    public partial class PreOrderConfig :  IEquatable<PreOrderConfig>
     {
         /// <summary>
         /// Type of time displayed.
@@ -290,16 +288,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PreOrderTime.cs b/src/Flipdish/Model/PreOrderTime.cs
index 21210599..a49a9b7b 100644
--- a/src/Flipdish/Model/PreOrderTime.cs
+++ b/src/Flipdish/Model/PreOrderTime.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Time order can be placed
     /// </summary>
     [DataContract]
-    public partial class PreOrderTime :  IEquatable<PreOrderTime>, IValidatableObject
+    public partial class PreOrderTime :  IEquatable<PreOrderTime>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PreOrderTime" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PredefinedAnswer.cs b/src/Flipdish/Model/PredefinedAnswer.cs
index 0c3b7e88..f2ff93b0 100644
--- a/src/Flipdish/Model/PredefinedAnswer.cs
+++ b/src/Flipdish/Model/PredefinedAnswer.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Predefined answer
     /// </summary>
     [DataContract]
-    public partial class PredefinedAnswer :  IEquatable<PredefinedAnswer>, IValidatableObject
+    public partial class PredefinedAnswer :  IEquatable<PredefinedAnswer>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PredefinedAnswer" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PreviousOrder.cs b/src/Flipdish/Model/PreviousOrder.cs
new file mode 100644
index 00000000..cc7f7dc4
--- /dev/null
+++ b/src/Flipdish/Model/PreviousOrder.cs
@@ -0,0 +1,1166 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PreviousOrder
+    /// </summary>
+    [DataContract]
+    public partial class PreviousOrder :  IEquatable<PreviousOrder>
+    {
+        /// <summary>
+        /// Defines Currency
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum CurrencyEnum
+        {
+            
+            /// <summary>
+            /// Enum EUR for value: EUR
+            /// </summary>
+            [EnumMember(Value = "EUR")]
+            EUR = 1,
+            
+            /// <summary>
+            /// Enum USD for value: USD
+            /// </summary>
+            [EnumMember(Value = "USD")]
+            USD = 2,
+            
+            /// <summary>
+            /// Enum GBP for value: GBP
+            /// </summary>
+            [EnumMember(Value = "GBP")]
+            GBP = 3,
+            
+            /// <summary>
+            /// Enum CAD for value: CAD
+            /// </summary>
+            [EnumMember(Value = "CAD")]
+            CAD = 4,
+            
+            /// <summary>
+            /// Enum AUD for value: AUD
+            /// </summary>
+            [EnumMember(Value = "AUD")]
+            AUD = 5,
+            
+            /// <summary>
+            /// Enum DJF for value: DJF
+            /// </summary>
+            [EnumMember(Value = "DJF")]
+            DJF = 6,
+            
+            /// <summary>
+            /// Enum ZAR for value: ZAR
+            /// </summary>
+            [EnumMember(Value = "ZAR")]
+            ZAR = 7,
+            
+            /// <summary>
+            /// Enum ETB for value: ETB
+            /// </summary>
+            [EnumMember(Value = "ETB")]
+            ETB = 8,
+            
+            /// <summary>
+            /// Enum AED for value: AED
+            /// </summary>
+            [EnumMember(Value = "AED")]
+            AED = 9,
+            
+            /// <summary>
+            /// Enum BHD for value: BHD
+            /// </summary>
+            [EnumMember(Value = "BHD")]
+            BHD = 10,
+            
+            /// <summary>
+            /// Enum DZD for value: DZD
+            /// </summary>
+            [EnumMember(Value = "DZD")]
+            DZD = 11,
+            
+            /// <summary>
+            /// Enum EGP for value: EGP
+            /// </summary>
+            [EnumMember(Value = "EGP")]
+            EGP = 12,
+            
+            /// <summary>
+            /// Enum IQD for value: IQD
+            /// </summary>
+            [EnumMember(Value = "IQD")]
+            IQD = 13,
+            
+            /// <summary>
+            /// Enum JOD for value: JOD
+            /// </summary>
+            [EnumMember(Value = "JOD")]
+            JOD = 14,
+            
+            /// <summary>
+            /// Enum KWD for value: KWD
+            /// </summary>
+            [EnumMember(Value = "KWD")]
+            KWD = 15,
+            
+            /// <summary>
+            /// Enum LBP for value: LBP
+            /// </summary>
+            [EnumMember(Value = "LBP")]
+            LBP = 16,
+            
+            /// <summary>
+            /// Enum LYD for value: LYD
+            /// </summary>
+            [EnumMember(Value = "LYD")]
+            LYD = 17,
+            
+            /// <summary>
+            /// Enum MAD for value: MAD
+            /// </summary>
+            [EnumMember(Value = "MAD")]
+            MAD = 18,
+            
+            /// <summary>
+            /// Enum OMR for value: OMR
+            /// </summary>
+            [EnumMember(Value = "OMR")]
+            OMR = 19,
+            
+            /// <summary>
+            /// Enum QAR for value: QAR
+            /// </summary>
+            [EnumMember(Value = "QAR")]
+            QAR = 20,
+            
+            /// <summary>
+            /// Enum SAR for value: SAR
+            /// </summary>
+            [EnumMember(Value = "SAR")]
+            SAR = 21,
+            
+            /// <summary>
+            /// Enum SYP for value: SYP
+            /// </summary>
+            [EnumMember(Value = "SYP")]
+            SYP = 22,
+            
+            /// <summary>
+            /// Enum TND for value: TND
+            /// </summary>
+            [EnumMember(Value = "TND")]
+            TND = 23,
+            
+            /// <summary>
+            /// Enum YER for value: YER
+            /// </summary>
+            [EnumMember(Value = "YER")]
+            YER = 24,
+            
+            /// <summary>
+            /// Enum CLP for value: CLP
+            /// </summary>
+            [EnumMember(Value = "CLP")]
+            CLP = 25,
+            
+            /// <summary>
+            /// Enum INR for value: INR
+            /// </summary>
+            [EnumMember(Value = "INR")]
+            INR = 26,
+            
+            /// <summary>
+            /// Enum AZN for value: AZN
+            /// </summary>
+            [EnumMember(Value = "AZN")]
+            AZN = 27,
+            
+            /// <summary>
+            /// Enum RUB for value: RUB
+            /// </summary>
+            [EnumMember(Value = "RUB")]
+            RUB = 28,
+            
+            /// <summary>
+            /// Enum BYN for value: BYN
+            /// </summary>
+            [EnumMember(Value = "BYN")]
+            BYN = 29,
+            
+            /// <summary>
+            /// Enum BGN for value: BGN
+            /// </summary>
+            [EnumMember(Value = "BGN")]
+            BGN = 30,
+            
+            /// <summary>
+            /// Enum NGN for value: NGN
+            /// </summary>
+            [EnumMember(Value = "NGN")]
+            NGN = 31,
+            
+            /// <summary>
+            /// Enum BDT for value: BDT
+            /// </summary>
+            [EnumMember(Value = "BDT")]
+            BDT = 32,
+            
+            /// <summary>
+            /// Enum CNY for value: CNY
+            /// </summary>
+            [EnumMember(Value = "CNY")]
+            CNY = 33,
+            
+            /// <summary>
+            /// Enum BAM for value: BAM
+            /// </summary>
+            [EnumMember(Value = "BAM")]
+            BAM = 34,
+            
+            /// <summary>
+            /// Enum CZK for value: CZK
+            /// </summary>
+            [EnumMember(Value = "CZK")]
+            CZK = 35,
+            
+            /// <summary>
+            /// Enum DKK for value: DKK
+            /// </summary>
+            [EnumMember(Value = "DKK")]
+            DKK = 36,
+            
+            /// <summary>
+            /// Enum CHF for value: CHF
+            /// </summary>
+            [EnumMember(Value = "CHF")]
+            CHF = 37,
+            
+            /// <summary>
+            /// Enum MVR for value: MVR
+            /// </summary>
+            [EnumMember(Value = "MVR")]
+            MVR = 38,
+            
+            /// <summary>
+            /// Enum BTN for value: BTN
+            /// </summary>
+            [EnumMember(Value = "BTN")]
+            BTN = 39,
+            
+            /// <summary>
+            /// Enum XCD for value: XCD
+            /// </summary>
+            [EnumMember(Value = "XCD")]
+            XCD = 40,
+            
+            /// <summary>
+            /// Enum BZD for value: BZD
+            /// </summary>
+            [EnumMember(Value = "BZD")]
+            BZD = 41,
+            
+            /// <summary>
+            /// Enum HKD for value: HKD
+            /// </summary>
+            [EnumMember(Value = "HKD")]
+            HKD = 42,
+            
+            /// <summary>
+            /// Enum IDR for value: IDR
+            /// </summary>
+            [EnumMember(Value = "IDR")]
+            IDR = 43,
+            
+            /// <summary>
+            /// Enum JMD for value: JMD
+            /// </summary>
+            [EnumMember(Value = "JMD")]
+            JMD = 44,
+            
+            /// <summary>
+            /// Enum MYR for value: MYR
+            /// </summary>
+            [EnumMember(Value = "MYR")]
+            MYR = 45,
+            
+            /// <summary>
+            /// Enum NZD for value: NZD
+            /// </summary>
+            [EnumMember(Value = "NZD")]
+            NZD = 46,
+            
+            /// <summary>
+            /// Enum PHP for value: PHP
+            /// </summary>
+            [EnumMember(Value = "PHP")]
+            PHP = 47,
+            
+            /// <summary>
+            /// Enum SGD for value: SGD
+            /// </summary>
+            [EnumMember(Value = "SGD")]
+            SGD = 48,
+            
+            /// <summary>
+            /// Enum TTD for value: TTD
+            /// </summary>
+            [EnumMember(Value = "TTD")]
+            TTD = 49,
+            
+            /// <summary>
+            /// Enum XDR for value: XDR
+            /// </summary>
+            [EnumMember(Value = "XDR")]
+            XDR = 50,
+            
+            /// <summary>
+            /// Enum ARS for value: ARS
+            /// </summary>
+            [EnumMember(Value = "ARS")]
+            ARS = 51,
+            
+            /// <summary>
+            /// Enum BOB for value: BOB
+            /// </summary>
+            [EnumMember(Value = "BOB")]
+            BOB = 52,
+            
+            /// <summary>
+            /// Enum COP for value: COP
+            /// </summary>
+            [EnumMember(Value = "COP")]
+            COP = 53,
+            
+            /// <summary>
+            /// Enum CRC for value: CRC
+            /// </summary>
+            [EnumMember(Value = "CRC")]
+            CRC = 54,
+            
+            /// <summary>
+            /// Enum CUP for value: CUP
+            /// </summary>
+            [EnumMember(Value = "CUP")]
+            CUP = 55,
+            
+            /// <summary>
+            /// Enum DOP for value: DOP
+            /// </summary>
+            [EnumMember(Value = "DOP")]
+            DOP = 56,
+            
+            /// <summary>
+            /// Enum GTQ for value: GTQ
+            /// </summary>
+            [EnumMember(Value = "GTQ")]
+            GTQ = 57,
+            
+            /// <summary>
+            /// Enum HNL for value: HNL
+            /// </summary>
+            [EnumMember(Value = "HNL")]
+            HNL = 58,
+            
+            /// <summary>
+            /// Enum MXN for value: MXN
+            /// </summary>
+            [EnumMember(Value = "MXN")]
+            MXN = 59,
+            
+            /// <summary>
+            /// Enum NIO for value: NIO
+            /// </summary>
+            [EnumMember(Value = "NIO")]
+            NIO = 60,
+            
+            /// <summary>
+            /// Enum PAB for value: PAB
+            /// </summary>
+            [EnumMember(Value = "PAB")]
+            PAB = 61,
+            
+            /// <summary>
+            /// Enum PEN for value: PEN
+            /// </summary>
+            [EnumMember(Value = "PEN")]
+            PEN = 62,
+            
+            /// <summary>
+            /// Enum PYG for value: PYG
+            /// </summary>
+            [EnumMember(Value = "PYG")]
+            PYG = 63,
+            
+            /// <summary>
+            /// Enum UYU for value: UYU
+            /// </summary>
+            [EnumMember(Value = "UYU")]
+            UYU = 64,
+            
+            /// <summary>
+            /// Enum VEF for value: VEF
+            /// </summary>
+            [EnumMember(Value = "VEF")]
+            VEF = 65,
+            
+            /// <summary>
+            /// Enum IRR for value: IRR
+            /// </summary>
+            [EnumMember(Value = "IRR")]
+            IRR = 66,
+            
+            /// <summary>
+            /// Enum XOF for value: XOF
+            /// </summary>
+            [EnumMember(Value = "XOF")]
+            XOF = 67,
+            
+            /// <summary>
+            /// Enum CDF for value: CDF
+            /// </summary>
+            [EnumMember(Value = "CDF")]
+            CDF = 68,
+            
+            /// <summary>
+            /// Enum XAF for value: XAF
+            /// </summary>
+            [EnumMember(Value = "XAF")]
+            XAF = 69,
+            
+            /// <summary>
+            /// Enum HTG for value: HTG
+            /// </summary>
+            [EnumMember(Value = "HTG")]
+            HTG = 70,
+            
+            /// <summary>
+            /// Enum ILS for value: ILS
+            /// </summary>
+            [EnumMember(Value = "ILS")]
+            ILS = 71,
+            
+            /// <summary>
+            /// Enum HRK for value: HRK
+            /// </summary>
+            [EnumMember(Value = "HRK")]
+            HRK = 72,
+            
+            /// <summary>
+            /// Enum HUF for value: HUF
+            /// </summary>
+            [EnumMember(Value = "HUF")]
+            HUF = 73,
+            
+            /// <summary>
+            /// Enum AMD for value: AMD
+            /// </summary>
+            [EnumMember(Value = "AMD")]
+            AMD = 74,
+            
+            /// <summary>
+            /// Enum ISK for value: ISK
+            /// </summary>
+            [EnumMember(Value = "ISK")]
+            ISK = 75,
+            
+            /// <summary>
+            /// Enum JPY for value: JPY
+            /// </summary>
+            [EnumMember(Value = "JPY")]
+            JPY = 76,
+            
+            /// <summary>
+            /// Enum GEL for value: GEL
+            /// </summary>
+            [EnumMember(Value = "GEL")]
+            GEL = 77,
+            
+            /// <summary>
+            /// Enum KZT for value: KZT
+            /// </summary>
+            [EnumMember(Value = "KZT")]
+            KZT = 78,
+            
+            /// <summary>
+            /// Enum KHR for value: KHR
+            /// </summary>
+            [EnumMember(Value = "KHR")]
+            KHR = 79,
+            
+            /// <summary>
+            /// Enum KRW for value: KRW
+            /// </summary>
+            [EnumMember(Value = "KRW")]
+            KRW = 80,
+            
+            /// <summary>
+            /// Enum KGS for value: KGS
+            /// </summary>
+            [EnumMember(Value = "KGS")]
+            KGS = 81,
+            
+            /// <summary>
+            /// Enum LAK for value: LAK
+            /// </summary>
+            [EnumMember(Value = "LAK")]
+            LAK = 82,
+            
+            /// <summary>
+            /// Enum MKD for value: MKD
+            /// </summary>
+            [EnumMember(Value = "MKD")]
+            MKD = 83,
+            
+            /// <summary>
+            /// Enum MNT for value: MNT
+            /// </summary>
+            [EnumMember(Value = "MNT")]
+            MNT = 84,
+            
+            /// <summary>
+            /// Enum BND for value: BND
+            /// </summary>
+            [EnumMember(Value = "BND")]
+            BND = 85,
+            
+            /// <summary>
+            /// Enum MMK for value: MMK
+            /// </summary>
+            [EnumMember(Value = "MMK")]
+            MMK = 86,
+            
+            /// <summary>
+            /// Enum NOK for value: NOK
+            /// </summary>
+            [EnumMember(Value = "NOK")]
+            NOK = 87,
+            
+            /// <summary>
+            /// Enum NPR for value: NPR
+            /// </summary>
+            [EnumMember(Value = "NPR")]
+            NPR = 88,
+            
+            /// <summary>
+            /// Enum PKR for value: PKR
+            /// </summary>
+            [EnumMember(Value = "PKR")]
+            PKR = 89,
+            
+            /// <summary>
+            /// Enum PLN for value: PLN
+            /// </summary>
+            [EnumMember(Value = "PLN")]
+            PLN = 90,
+            
+            /// <summary>
+            /// Enum AFN for value: AFN
+            /// </summary>
+            [EnumMember(Value = "AFN")]
+            AFN = 91,
+            
+            /// <summary>
+            /// Enum BRL for value: BRL
+            /// </summary>
+            [EnumMember(Value = "BRL")]
+            BRL = 92,
+            
+            /// <summary>
+            /// Enum MDL for value: MDL
+            /// </summary>
+            [EnumMember(Value = "MDL")]
+            MDL = 93,
+            
+            /// <summary>
+            /// Enum RON for value: RON
+            /// </summary>
+            [EnumMember(Value = "RON")]
+            RON = 94,
+            
+            /// <summary>
+            /// Enum RWF for value: RWF
+            /// </summary>
+            [EnumMember(Value = "RWF")]
+            RWF = 95,
+            
+            /// <summary>
+            /// Enum SEK for value: SEK
+            /// </summary>
+            [EnumMember(Value = "SEK")]
+            SEK = 96,
+            
+            /// <summary>
+            /// Enum LKR for value: LKR
+            /// </summary>
+            [EnumMember(Value = "LKR")]
+            LKR = 97,
+            
+            /// <summary>
+            /// Enum SOS for value: SOS
+            /// </summary>
+            [EnumMember(Value = "SOS")]
+            SOS = 98,
+            
+            /// <summary>
+            /// Enum ALL for value: ALL
+            /// </summary>
+            [EnumMember(Value = "ALL")]
+            ALL = 99,
+            
+            /// <summary>
+            /// Enum RSD for value: RSD
+            /// </summary>
+            [EnumMember(Value = "RSD")]
+            RSD = 100,
+            
+            /// <summary>
+            /// Enum KES for value: KES
+            /// </summary>
+            [EnumMember(Value = "KES")]
+            KES = 101,
+            
+            /// <summary>
+            /// Enum TJS for value: TJS
+            /// </summary>
+            [EnumMember(Value = "TJS")]
+            TJS = 102,
+            
+            /// <summary>
+            /// Enum THB for value: THB
+            /// </summary>
+            [EnumMember(Value = "THB")]
+            THB = 103,
+            
+            /// <summary>
+            /// Enum ERN for value: ERN
+            /// </summary>
+            [EnumMember(Value = "ERN")]
+            ERN = 104,
+            
+            /// <summary>
+            /// Enum TMT for value: TMT
+            /// </summary>
+            [EnumMember(Value = "TMT")]
+            TMT = 105,
+            
+            /// <summary>
+            /// Enum BWP for value: BWP
+            /// </summary>
+            [EnumMember(Value = "BWP")]
+            BWP = 106,
+            
+            /// <summary>
+            /// Enum TRY for value: TRY
+            /// </summary>
+            [EnumMember(Value = "TRY")]
+            TRY = 107,
+            
+            /// <summary>
+            /// Enum UAH for value: UAH
+            /// </summary>
+            [EnumMember(Value = "UAH")]
+            UAH = 108,
+            
+            /// <summary>
+            /// Enum UZS for value: UZS
+            /// </summary>
+            [EnumMember(Value = "UZS")]
+            UZS = 109,
+            
+            /// <summary>
+            /// Enum VND for value: VND
+            /// </summary>
+            [EnumMember(Value = "VND")]
+            VND = 110,
+            
+            /// <summary>
+            /// Enum MOP for value: MOP
+            /// </summary>
+            [EnumMember(Value = "MOP")]
+            MOP = 111,
+            
+            /// <summary>
+            /// Enum TWD for value: TWD
+            /// </summary>
+            [EnumMember(Value = "TWD")]
+            TWD = 112,
+            
+            /// <summary>
+            /// Enum BMD for value: BMD
+            /// </summary>
+            [EnumMember(Value = "BMD")]
+            BMD = 113
+        }
+
+        /// <summary>
+        /// Gets or Sets Currency
+        /// </summary>
+        [DataMember(Name="Currency", EmitDefaultValue=false)]
+        public CurrencyEnum? Currency { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviousOrder" /> class.
+        /// </summary>
+        /// <param name="deliveryType">deliveryType.</param>
+        /// <param name="deliveryLocationAddressString">deliveryLocationAddressString.</param>
+        /// <param name="paymentAccountType">paymentAccountType.</param>
+        /// <param name="orderId">orderId.</param>
+        /// <param name="receiptCode">receiptCode.</param>
+        /// <param name="restaurantName">restaurantName.</param>
+        /// <param name="localOrderId">localOrderId.</param>
+        /// <param name="tableServiceCategory">tableServiceCategory.</param>
+        /// <param name="pickupLocationOptionValue">pickupLocationOptionValue.</param>
+        /// <param name="customerName">customerName.</param>
+        /// <param name="phoneNumberInternationalFormatString">phoneNumberInternationalFormatString.</param>
+        /// <param name="deliveryInstructions">deliveryInstructions.</param>
+        /// <param name="currency">currency.</param>
+        /// <param name="processingFee">processingFee.</param>
+        /// <param name="serviceChargePercentage">serviceChargePercentage.</param>
+        /// <param name="serviceChargeAmount">serviceChargeAmount.</param>
+        /// <param name="tipAmount">tipAmount.</param>
+        /// <param name="deliveryAmount">deliveryAmount.</param>
+        /// <param name="depositReturnFeeAmount">depositReturnFeeAmount.</param>
+        /// <param name="totalTax">totalTax.</param>
+        /// <param name="totalAmount">totalAmount.</param>
+        /// <param name="items">items.</param>
+        /// <param name="taxRates">taxRates.</param>
+        /// <param name="whiteLabelId">whiteLabelId.</param>
+        public PreviousOrder(string deliveryType = default(string), string deliveryLocationAddressString = default(string), string paymentAccountType = default(string), int? orderId = default(int?), string receiptCode = default(string), string restaurantName = default(string), string localOrderId = default(string), string tableServiceCategory = default(string), string pickupLocationOptionValue = default(string), string customerName = default(string), string phoneNumberInternationalFormatString = default(string), string deliveryInstructions = default(string), CurrencyEnum? currency = default(CurrencyEnum?), double? processingFee = default(double?), double? serviceChargePercentage = default(double?), double? serviceChargeAmount = default(double?), double? tipAmount = default(double?), double? deliveryAmount = default(double?), double? depositReturnFeeAmount = default(double?), double? totalTax = default(double?), double? totalAmount = default(double?), List<PreviousOrderItem> items = default(List<PreviousOrderItem>), List<TaxRate> taxRates = default(List<TaxRate>), int? whiteLabelId = default(int?))
+        {
+            this.DeliveryType = deliveryType;
+            this.DeliveryLocationAddressString = deliveryLocationAddressString;
+            this.PaymentAccountType = paymentAccountType;
+            this.OrderId = orderId;
+            this.ReceiptCode = receiptCode;
+            this.RestaurantName = restaurantName;
+            this.LocalOrderId = localOrderId;
+            this.TableServiceCategory = tableServiceCategory;
+            this.PickupLocationOptionValue = pickupLocationOptionValue;
+            this.CustomerName = customerName;
+            this.PhoneNumberInternationalFormatString = phoneNumberInternationalFormatString;
+            this.DeliveryInstructions = deliveryInstructions;
+            this.Currency = currency;
+            this.ProcessingFee = processingFee;
+            this.ServiceChargePercentage = serviceChargePercentage;
+            this.ServiceChargeAmount = serviceChargeAmount;
+            this.TipAmount = tipAmount;
+            this.DeliveryAmount = deliveryAmount;
+            this.DepositReturnFeeAmount = depositReturnFeeAmount;
+            this.TotalTax = totalTax;
+            this.TotalAmount = totalAmount;
+            this.Items = items;
+            this.TaxRates = taxRates;
+            this.WhiteLabelId = whiteLabelId;
+        }
+        
+        /// <summary>
+        /// Gets or Sets DeliveryType
+        /// </summary>
+        [DataMember(Name="DeliveryType", EmitDefaultValue=false)]
+        public string DeliveryType { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DeliveryLocationAddressString
+        /// </summary>
+        [DataMember(Name="DeliveryLocationAddressString", EmitDefaultValue=false)]
+        public string DeliveryLocationAddressString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PaymentAccountType
+        /// </summary>
+        [DataMember(Name="PaymentAccountType", EmitDefaultValue=false)]
+        public string PaymentAccountType { get; set; }
+
+        /// <summary>
+        /// Gets or Sets OrderId
+        /// </summary>
+        [DataMember(Name="OrderId", EmitDefaultValue=false)]
+        public int? OrderId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ReceiptCode
+        /// </summary>
+        [DataMember(Name="ReceiptCode", EmitDefaultValue=false)]
+        public string ReceiptCode { get; set; }
+
+        /// <summary>
+        /// Gets or Sets RestaurantName
+        /// </summary>
+        [DataMember(Name="RestaurantName", EmitDefaultValue=false)]
+        public string RestaurantName { get; set; }
+
+        /// <summary>
+        /// Gets or Sets LocalOrderId
+        /// </summary>
+        [DataMember(Name="LocalOrderId", EmitDefaultValue=false)]
+        public string LocalOrderId { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TableServiceCategory
+        /// </summary>
+        [DataMember(Name="TableServiceCategory", EmitDefaultValue=false)]
+        public string TableServiceCategory { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PickupLocationOptionValue
+        /// </summary>
+        [DataMember(Name="PickupLocationOptionValue", EmitDefaultValue=false)]
+        public string PickupLocationOptionValue { get; set; }
+
+        /// <summary>
+        /// Gets or Sets CustomerName
+        /// </summary>
+        [DataMember(Name="CustomerName", EmitDefaultValue=false)]
+        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PhoneNumberInternationalFormatString
+        /// </summary>
+        [DataMember(Name="PhoneNumberInternationalFormatString", EmitDefaultValue=false)]
+        public string PhoneNumberInternationalFormatString { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DeliveryInstructions
+        /// </summary>
+        [DataMember(Name="DeliveryInstructions", EmitDefaultValue=false)]
+        public string DeliveryInstructions { get; set; }
+
+
+        /// <summary>
+        /// Gets or Sets ProcessingFee
+        /// </summary>
+        [DataMember(Name="ProcessingFee", EmitDefaultValue=false)]
+        public double? ProcessingFee { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ServiceChargePercentage
+        /// </summary>
+        [DataMember(Name="ServiceChargePercentage", EmitDefaultValue=false)]
+        public double? ServiceChargePercentage { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ServiceChargeAmount
+        /// </summary>
+        [DataMember(Name="ServiceChargeAmount", EmitDefaultValue=false)]
+        public double? ServiceChargeAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TipAmount
+        /// </summary>
+        [DataMember(Name="TipAmount", EmitDefaultValue=false)]
+        public double? TipAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DeliveryAmount
+        /// </summary>
+        [DataMember(Name="DeliveryAmount", EmitDefaultValue=false)]
+        public double? DeliveryAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DepositReturnFeeAmount
+        /// </summary>
+        [DataMember(Name="DepositReturnFeeAmount", EmitDefaultValue=false)]
+        public double? DepositReturnFeeAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TotalTax
+        /// </summary>
+        [DataMember(Name="TotalTax", EmitDefaultValue=false)]
+        public double? TotalTax { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TotalAmount
+        /// </summary>
+        [DataMember(Name="TotalAmount", EmitDefaultValue=false)]
+        public double? TotalAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Items
+        /// </summary>
+        [DataMember(Name="Items", EmitDefaultValue=false)]
+        public List<PreviousOrderItem> Items { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TaxRates
+        /// </summary>
+        [DataMember(Name="TaxRates", EmitDefaultValue=false)]
+        public List<TaxRate> TaxRates { get; set; }
+
+        /// <summary>
+        /// Gets or Sets WhiteLabelId
+        /// </summary>
+        [DataMember(Name="WhiteLabelId", EmitDefaultValue=false)]
+        public int? WhiteLabelId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PreviousOrder {\n");
+            sb.Append("  DeliveryType: ").Append(DeliveryType).Append("\n");
+            sb.Append("  DeliveryLocationAddressString: ").Append(DeliveryLocationAddressString).Append("\n");
+            sb.Append("  PaymentAccountType: ").Append(PaymentAccountType).Append("\n");
+            sb.Append("  OrderId: ").Append(OrderId).Append("\n");
+            sb.Append("  ReceiptCode: ").Append(ReceiptCode).Append("\n");
+            sb.Append("  RestaurantName: ").Append(RestaurantName).Append("\n");
+            sb.Append("  LocalOrderId: ").Append(LocalOrderId).Append("\n");
+            sb.Append("  TableServiceCategory: ").Append(TableServiceCategory).Append("\n");
+            sb.Append("  PickupLocationOptionValue: ").Append(PickupLocationOptionValue).Append("\n");
+            sb.Append("  CustomerName: ").Append(CustomerName).Append("\n");
+            sb.Append("  PhoneNumberInternationalFormatString: ").Append(PhoneNumberInternationalFormatString).Append("\n");
+            sb.Append("  DeliveryInstructions: ").Append(DeliveryInstructions).Append("\n");
+            sb.Append("  Currency: ").Append(Currency).Append("\n");
+            sb.Append("  ProcessingFee: ").Append(ProcessingFee).Append("\n");
+            sb.Append("  ServiceChargePercentage: ").Append(ServiceChargePercentage).Append("\n");
+            sb.Append("  ServiceChargeAmount: ").Append(ServiceChargeAmount).Append("\n");
+            sb.Append("  TipAmount: ").Append(TipAmount).Append("\n");
+            sb.Append("  DeliveryAmount: ").Append(DeliveryAmount).Append("\n");
+            sb.Append("  DepositReturnFeeAmount: ").Append(DepositReturnFeeAmount).Append("\n");
+            sb.Append("  TotalTax: ").Append(TotalTax).Append("\n");
+            sb.Append("  TotalAmount: ").Append(TotalAmount).Append("\n");
+            sb.Append("  Items: ").Append(Items).Append("\n");
+            sb.Append("  TaxRates: ").Append(TaxRates).Append("\n");
+            sb.Append("  WhiteLabelId: ").Append(WhiteLabelId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PreviousOrder);
+        }
+
+        /// <summary>
+        /// Returns true if PreviousOrder instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PreviousOrder to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PreviousOrder input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeliveryType == input.DeliveryType ||
+                    (this.DeliveryType != null &&
+                    this.DeliveryType.Equals(input.DeliveryType))
+                ) && 
+                (
+                    this.DeliveryLocationAddressString == input.DeliveryLocationAddressString ||
+                    (this.DeliveryLocationAddressString != null &&
+                    this.DeliveryLocationAddressString.Equals(input.DeliveryLocationAddressString))
+                ) && 
+                (
+                    this.PaymentAccountType == input.PaymentAccountType ||
+                    (this.PaymentAccountType != null &&
+                    this.PaymentAccountType.Equals(input.PaymentAccountType))
+                ) && 
+                (
+                    this.OrderId == input.OrderId ||
+                    (this.OrderId != null &&
+                    this.OrderId.Equals(input.OrderId))
+                ) && 
+                (
+                    this.ReceiptCode == input.ReceiptCode ||
+                    (this.ReceiptCode != null &&
+                    this.ReceiptCode.Equals(input.ReceiptCode))
+                ) && 
+                (
+                    this.RestaurantName == input.RestaurantName ||
+                    (this.RestaurantName != null &&
+                    this.RestaurantName.Equals(input.RestaurantName))
+                ) && 
+                (
+                    this.LocalOrderId == input.LocalOrderId ||
+                    (this.LocalOrderId != null &&
+                    this.LocalOrderId.Equals(input.LocalOrderId))
+                ) && 
+                (
+                    this.TableServiceCategory == input.TableServiceCategory ||
+                    (this.TableServiceCategory != null &&
+                    this.TableServiceCategory.Equals(input.TableServiceCategory))
+                ) && 
+                (
+                    this.PickupLocationOptionValue == input.PickupLocationOptionValue ||
+                    (this.PickupLocationOptionValue != null &&
+                    this.PickupLocationOptionValue.Equals(input.PickupLocationOptionValue))
+                ) && 
+                (
+                    this.CustomerName == input.CustomerName ||
+                    (this.CustomerName != null &&
+                    this.CustomerName.Equals(input.CustomerName))
+                ) && 
+                (
+                    this.PhoneNumberInternationalFormatString == input.PhoneNumberInternationalFormatString ||
+                    (this.PhoneNumberInternationalFormatString != null &&
+                    this.PhoneNumberInternationalFormatString.Equals(input.PhoneNumberInternationalFormatString))
+                ) && 
+                (
+                    this.DeliveryInstructions == input.DeliveryInstructions ||
+                    (this.DeliveryInstructions != null &&
+                    this.DeliveryInstructions.Equals(input.DeliveryInstructions))
+                ) && 
+                (
+                    this.Currency == input.Currency ||
+                    (this.Currency != null &&
+                    this.Currency.Equals(input.Currency))
+                ) && 
+                (
+                    this.ProcessingFee == input.ProcessingFee ||
+                    (this.ProcessingFee != null &&
+                    this.ProcessingFee.Equals(input.ProcessingFee))
+                ) && 
+                (
+                    this.ServiceChargePercentage == input.ServiceChargePercentage ||
+                    (this.ServiceChargePercentage != null &&
+                    this.ServiceChargePercentage.Equals(input.ServiceChargePercentage))
+                ) && 
+                (
+                    this.ServiceChargeAmount == input.ServiceChargeAmount ||
+                    (this.ServiceChargeAmount != null &&
+                    this.ServiceChargeAmount.Equals(input.ServiceChargeAmount))
+                ) && 
+                (
+                    this.TipAmount == input.TipAmount ||
+                    (this.TipAmount != null &&
+                    this.TipAmount.Equals(input.TipAmount))
+                ) && 
+                (
+                    this.DeliveryAmount == input.DeliveryAmount ||
+                    (this.DeliveryAmount != null &&
+                    this.DeliveryAmount.Equals(input.DeliveryAmount))
+                ) && 
+                (
+                    this.DepositReturnFeeAmount == input.DepositReturnFeeAmount ||
+                    (this.DepositReturnFeeAmount != null &&
+                    this.DepositReturnFeeAmount.Equals(input.DepositReturnFeeAmount))
+                ) && 
+                (
+                    this.TotalTax == input.TotalTax ||
+                    (this.TotalTax != null &&
+                    this.TotalTax.Equals(input.TotalTax))
+                ) && 
+                (
+                    this.TotalAmount == input.TotalAmount ||
+                    (this.TotalAmount != null &&
+                    this.TotalAmount.Equals(input.TotalAmount))
+                ) && 
+                (
+                    this.Items == input.Items ||
+                    this.Items != null &&
+                    this.Items.SequenceEqual(input.Items)
+                ) && 
+                (
+                    this.TaxRates == input.TaxRates ||
+                    this.TaxRates != null &&
+                    this.TaxRates.SequenceEqual(input.TaxRates)
+                ) && 
+                (
+                    this.WhiteLabelId == input.WhiteLabelId ||
+                    (this.WhiteLabelId != null &&
+                    this.WhiteLabelId.Equals(input.WhiteLabelId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeliveryType != null)
+                    hashCode = hashCode * 59 + this.DeliveryType.GetHashCode();
+                if (this.DeliveryLocationAddressString != null)
+                    hashCode = hashCode * 59 + this.DeliveryLocationAddressString.GetHashCode();
+                if (this.PaymentAccountType != null)
+                    hashCode = hashCode * 59 + this.PaymentAccountType.GetHashCode();
+                if (this.OrderId != null)
+                    hashCode = hashCode * 59 + this.OrderId.GetHashCode();
+                if (this.ReceiptCode != null)
+                    hashCode = hashCode * 59 + this.ReceiptCode.GetHashCode();
+                if (this.RestaurantName != null)
+                    hashCode = hashCode * 59 + this.RestaurantName.GetHashCode();
+                if (this.LocalOrderId != null)
+                    hashCode = hashCode * 59 + this.LocalOrderId.GetHashCode();
+                if (this.TableServiceCategory != null)
+                    hashCode = hashCode * 59 + this.TableServiceCategory.GetHashCode();
+                if (this.PickupLocationOptionValue != null)
+                    hashCode = hashCode * 59 + this.PickupLocationOptionValue.GetHashCode();
+                if (this.CustomerName != null)
+                    hashCode = hashCode * 59 + this.CustomerName.GetHashCode();
+                if (this.PhoneNumberInternationalFormatString != null)
+                    hashCode = hashCode * 59 + this.PhoneNumberInternationalFormatString.GetHashCode();
+                if (this.DeliveryInstructions != null)
+                    hashCode = hashCode * 59 + this.DeliveryInstructions.GetHashCode();
+                if (this.Currency != null)
+                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
+                if (this.ProcessingFee != null)
+                    hashCode = hashCode * 59 + this.ProcessingFee.GetHashCode();
+                if (this.ServiceChargePercentage != null)
+                    hashCode = hashCode * 59 + this.ServiceChargePercentage.GetHashCode();
+                if (this.ServiceChargeAmount != null)
+                    hashCode = hashCode * 59 + this.ServiceChargeAmount.GetHashCode();
+                if (this.TipAmount != null)
+                    hashCode = hashCode * 59 + this.TipAmount.GetHashCode();
+                if (this.DeliveryAmount != null)
+                    hashCode = hashCode * 59 + this.DeliveryAmount.GetHashCode();
+                if (this.DepositReturnFeeAmount != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFeeAmount.GetHashCode();
+                if (this.TotalTax != null)
+                    hashCode = hashCode * 59 + this.TotalTax.GetHashCode();
+                if (this.TotalAmount != null)
+                    hashCode = hashCode * 59 + this.TotalAmount.GetHashCode();
+                if (this.Items != null)
+                    hashCode = hashCode * 59 + this.Items.GetHashCode();
+                if (this.TaxRates != null)
+                    hashCode = hashCode * 59 + this.TaxRates.GetHashCode();
+                if (this.WhiteLabelId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PreviousOrderItem.cs b/src/Flipdish/Model/PreviousOrderItem.cs
new file mode 100644
index 00000000..48e2491f
--- /dev/null
+++ b/src/Flipdish/Model/PreviousOrderItem.cs
@@ -0,0 +1,208 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PreviousOrderItem
+    /// </summary>
+    [DataContract]
+    public partial class PreviousOrderItem :  IEquatable<PreviousOrderItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviousOrderItem" /> class.
+        /// </summary>
+        /// <param name="menuSectionDisplayOrder">menuSectionDisplayOrder.</param>
+        /// <param name="menuSectionName">menuSectionName.</param>
+        /// <param name="name">name.</param>
+        /// <param name="priceIncludingOptionSetItems">priceIncludingOptionSetItems.</param>
+        /// <param name="depositReturnFee">depositReturnFee.</param>
+        /// <param name="taxAmount">taxAmount.</param>
+        /// <param name="previousOrderItemOptions">previousOrderItemOptions.</param>
+        public PreviousOrderItem(int? menuSectionDisplayOrder = default(int?), string menuSectionName = default(string), string name = default(string), double? priceIncludingOptionSetItems = default(double?), double? depositReturnFee = default(double?), double? taxAmount = default(double?), List<PreviousOrderItemOption> previousOrderItemOptions = default(List<PreviousOrderItemOption>))
+        {
+            this.MenuSectionDisplayOrder = menuSectionDisplayOrder;
+            this.MenuSectionName = menuSectionName;
+            this.Name = name;
+            this.PriceIncludingOptionSetItems = priceIncludingOptionSetItems;
+            this.DepositReturnFee = depositReturnFee;
+            this.TaxAmount = taxAmount;
+            this.PreviousOrderItemOptions = previousOrderItemOptions;
+        }
+        
+        /// <summary>
+        /// Gets or Sets MenuSectionDisplayOrder
+        /// </summary>
+        [DataMember(Name="MenuSectionDisplayOrder", EmitDefaultValue=false)]
+        public int? MenuSectionDisplayOrder { get; set; }
+
+        /// <summary>
+        /// Gets or Sets MenuSectionName
+        /// </summary>
+        [DataMember(Name="MenuSectionName", EmitDefaultValue=false)]
+        public string MenuSectionName { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PriceIncludingOptionSetItems
+        /// </summary>
+        [DataMember(Name="PriceIncludingOptionSetItems", EmitDefaultValue=false)]
+        public double? PriceIncludingOptionSetItems { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DepositReturnFee
+        /// </summary>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
+        /// <summary>
+        /// Gets or Sets TaxAmount
+        /// </summary>
+        [DataMember(Name="TaxAmount", EmitDefaultValue=false)]
+        public double? TaxAmount { get; set; }
+
+        /// <summary>
+        /// Gets or Sets PreviousOrderItemOptions
+        /// </summary>
+        [DataMember(Name="PreviousOrderItemOptions", EmitDefaultValue=false)]
+        public List<PreviousOrderItemOption> PreviousOrderItemOptions { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PreviousOrderItem {\n");
+            sb.Append("  MenuSectionDisplayOrder: ").Append(MenuSectionDisplayOrder).Append("\n");
+            sb.Append("  MenuSectionName: ").Append(MenuSectionName).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  PriceIncludingOptionSetItems: ").Append(PriceIncludingOptionSetItems).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
+            sb.Append("  TaxAmount: ").Append(TaxAmount).Append("\n");
+            sb.Append("  PreviousOrderItemOptions: ").Append(PreviousOrderItemOptions).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PreviousOrderItem);
+        }
+
+        /// <summary>
+        /// Returns true if PreviousOrderItem instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PreviousOrderItem to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PreviousOrderItem input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.MenuSectionDisplayOrder == input.MenuSectionDisplayOrder ||
+                    (this.MenuSectionDisplayOrder != null &&
+                    this.MenuSectionDisplayOrder.Equals(input.MenuSectionDisplayOrder))
+                ) && 
+                (
+                    this.MenuSectionName == input.MenuSectionName ||
+                    (this.MenuSectionName != null &&
+                    this.MenuSectionName.Equals(input.MenuSectionName))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.PriceIncludingOptionSetItems == input.PriceIncludingOptionSetItems ||
+                    (this.PriceIncludingOptionSetItems != null &&
+                    this.PriceIncludingOptionSetItems.Equals(input.PriceIncludingOptionSetItems))
+                ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
+                ) && 
+                (
+                    this.TaxAmount == input.TaxAmount ||
+                    (this.TaxAmount != null &&
+                    this.TaxAmount.Equals(input.TaxAmount))
+                ) && 
+                (
+                    this.PreviousOrderItemOptions == input.PreviousOrderItemOptions ||
+                    this.PreviousOrderItemOptions != null &&
+                    this.PreviousOrderItemOptions.SequenceEqual(input.PreviousOrderItemOptions)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.MenuSectionDisplayOrder != null)
+                    hashCode = hashCode * 59 + this.MenuSectionDisplayOrder.GetHashCode();
+                if (this.MenuSectionName != null)
+                    hashCode = hashCode * 59 + this.MenuSectionName.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.PriceIncludingOptionSetItems != null)
+                    hashCode = hashCode * 59 + this.PriceIncludingOptionSetItems.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
+                if (this.TaxAmount != null)
+                    hashCode = hashCode * 59 + this.TaxAmount.GetHashCode();
+                if (this.PreviousOrderItemOptions != null)
+                    hashCode = hashCode * 59 + this.PreviousOrderItemOptions.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PreviousOrderItemOption.cs b/src/Flipdish/Model/PreviousOrderItemOption.cs
new file mode 100644
index 00000000..e8a0c008
--- /dev/null
+++ b/src/Flipdish/Model/PreviousOrderItemOption.cs
@@ -0,0 +1,128 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// PreviousOrderItemOption
+    /// </summary>
+    [DataContract]
+    public partial class PreviousOrderItemOption :  IEquatable<PreviousOrderItemOption>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviousOrderItemOption" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        /// <param name="depositReturnFee">depositReturnFee.</param>
+        public PreviousOrderItemOption(string name = default(string), double? depositReturnFee = default(double?))
+        {
+            this.Name = name;
+            this.DepositReturnFee = depositReturnFee;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or Sets DepositReturnFee
+        /// </summary>
+        [DataMember(Name="DepositReturnFee", EmitDefaultValue=false)]
+        public double? DepositReturnFee { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PreviousOrderItemOption {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  DepositReturnFee: ").Append(DepositReturnFee).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PreviousOrderItemOption);
+        }
+
+        /// <summary>
+        /// Returns true if PreviousOrderItemOption instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PreviousOrderItemOption to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PreviousOrderItemOption input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.DepositReturnFee == input.DepositReturnFee ||
+                    (this.DepositReturnFee != null &&
+                    this.DepositReturnFee.Equals(input.DepositReturnFee))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.DepositReturnFee != null)
+                    hashCode = hashCode * 59 + this.DepositReturnFee.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/Price.cs b/src/Flipdish/Model/Price.cs
deleted file mode 100644
index a972613f..00000000
--- a/src/Flipdish/Model/Price.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Defines a price
-    /// </summary>
-    [DataContract]
-    public partial class Price :  IEquatable<Price>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Price" /> class.
-        /// </summary>
-        /// <param name="amount">Amount (including tax).</param>
-        /// <param name="tax">Tax (only required in tax exclusive prices).</param>
-        public Price(double? amount = default(double?), double? tax = default(double?))
-        {
-            this.Amount = amount;
-            this.Tax = tax;
-        }
-        
-        /// <summary>
-        /// Amount (including tax)
-        /// </summary>
-        /// <value>Amount (including tax)</value>
-        [DataMember(Name="Amount", EmitDefaultValue=false)]
-        public double? Amount { get; set; }
-
-        /// <summary>
-        /// Tax (only required in tax exclusive prices)
-        /// </summary>
-        /// <value>Tax (only required in tax exclusive prices)</value>
-        [DataMember(Name="Tax", EmitDefaultValue=false)]
-        public double? Tax { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class Price {\n");
-            sb.Append("  Amount: ").Append(Amount).Append("\n");
-            sb.Append("  Tax: ").Append(Tax).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Price);
-        }
-
-        /// <summary>
-        /// Returns true if Price instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Price to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Price input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Amount == input.Amount ||
-                    (this.Amount != null &&
-                    this.Amount.Equals(input.Amount))
-                ) && 
-                (
-                    this.Tax == input.Tax ||
-                    (this.Tax != null &&
-                    this.Tax.Equals(input.Tax))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Amount != null)
-                    hashCode = hashCode * 59 + this.Amount.GetHashCode();
-                if (this.Tax != null)
-                    hashCode = hashCode * 59 + this.Tax.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/Printer.cs b/src/Flipdish/Model/Printer.cs
index cd2d1006..855e1d58 100644
--- a/src/Flipdish/Model/Printer.cs
+++ b/src/Flipdish/Model/Printer.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Printer
     /// </summary>
     [DataContract]
-    public partial class Printer :  IEquatable<Printer>, IValidatableObject
+    public partial class Printer :  IEquatable<Printer>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Printer" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PrinterAssignedToStoreEvent.cs b/src/Flipdish/Model/PrinterAssignedToStoreEvent.cs
index f69e5cb0..4e76d0e7 100644
--- a/src/Flipdish/Model/PrinterAssignedToStoreEvent.cs
+++ b/src/Flipdish/Model/PrinterAssignedToStoreEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Printer assigned to store event
     /// </summary>
     [DataContract]
-    public partial class PrinterAssignedToStoreEvent :  IEquatable<PrinterAssignedToStoreEvent>, IValidatableObject
+    public partial class PrinterAssignedToStoreEvent :  IEquatable<PrinterAssignedToStoreEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PrinterAssignedToStoreEvent" /> class.
@@ -43,8 +41,11 @@ public partial class PrinterAssignedToStoreEvent :  IEquatable<PrinterAssignedTo
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PrinterAssignedToStoreEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), Printer printer = default(Printer), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PrinterAssignedToStoreEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), Printer printer = default(Printer), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -56,7 +57,10 @@ public partial class PrinterAssignedToStoreEvent :  IEquatable<PrinterAssignedTo
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class PrinterAssignedToStoreEvent :  IEquatable<PrinterAssignedTo
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class PrinterAssignedToStoreEvent :  IEquatable<PrinterAssignedTo
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(PrinterAssignedToStoreEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PrinterTurnedOffEvent.cs b/src/Flipdish/Model/PrinterTurnedOffEvent.cs
index 2fbb0487..e3bccade 100644
--- a/src/Flipdish/Model/PrinterTurnedOffEvent.cs
+++ b/src/Flipdish/Model/PrinterTurnedOffEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Printer turned off event
     /// </summary>
     [DataContract]
-    public partial class PrinterTurnedOffEvent :  IEquatable<PrinterTurnedOffEvent>, IValidatableObject
+    public partial class PrinterTurnedOffEvent :  IEquatable<PrinterTurnedOffEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PrinterTurnedOffEvent" /> class.
@@ -43,8 +41,11 @@ public partial class PrinterTurnedOffEvent :  IEquatable<PrinterTurnedOffEvent>,
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PrinterTurnedOffEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), Printer printer = default(Printer), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PrinterTurnedOffEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), Printer printer = default(Printer), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -56,7 +57,10 @@ public partial class PrinterTurnedOffEvent :  IEquatable<PrinterTurnedOffEvent>,
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class PrinterTurnedOffEvent :  IEquatable<PrinterTurnedOffEvent>,
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class PrinterTurnedOffEvent :  IEquatable<PrinterTurnedOffEvent>,
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(PrinterTurnedOffEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PrinterTurnedOnEvent.cs b/src/Flipdish/Model/PrinterTurnedOnEvent.cs
index f983f5a7..fab5c70b 100644
--- a/src/Flipdish/Model/PrinterTurnedOnEvent.cs
+++ b/src/Flipdish/Model/PrinterTurnedOnEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Printer turned on event
     /// </summary>
     [DataContract]
-    public partial class PrinterTurnedOnEvent :  IEquatable<PrinterTurnedOnEvent>, IValidatableObject
+    public partial class PrinterTurnedOnEvent :  IEquatable<PrinterTurnedOnEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PrinterTurnedOnEvent" /> class.
@@ -43,8 +41,11 @@ public partial class PrinterTurnedOnEvent :  IEquatable<PrinterTurnedOnEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PrinterTurnedOnEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), Printer printer = default(Printer), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PrinterTurnedOnEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), Printer printer = default(Printer), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -56,7 +57,10 @@ public partial class PrinterTurnedOnEvent :  IEquatable<PrinterTurnedOnEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class PrinterTurnedOnEvent :  IEquatable<PrinterTurnedOnEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class PrinterTurnedOnEvent :  IEquatable<PrinterTurnedOnEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(PrinterTurnedOnEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PrinterUnassignedFromStoreEvent.cs b/src/Flipdish/Model/PrinterUnassignedFromStoreEvent.cs
index 688a2f68..b6273e1f 100644
--- a/src/Flipdish/Model/PrinterUnassignedFromStoreEvent.cs
+++ b/src/Flipdish/Model/PrinterUnassignedFromStoreEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Printer assigned from store event
     /// </summary>
     [DataContract]
-    public partial class PrinterUnassignedFromStoreEvent :  IEquatable<PrinterUnassignedFromStoreEvent>, IValidatableObject
+    public partial class PrinterUnassignedFromStoreEvent :  IEquatable<PrinterUnassignedFromStoreEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PrinterUnassignedFromStoreEvent" /> class.
@@ -43,8 +41,11 @@ public partial class PrinterUnassignedFromStoreEvent :  IEquatable<PrinterUnassi
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PrinterUnassignedFromStoreEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), Printer printer = default(Printer), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PrinterUnassignedFromStoreEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), Printer printer = default(Printer), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -56,7 +57,10 @@ public partial class PrinterUnassignedFromStoreEvent :  IEquatable<PrinterUnassi
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class PrinterUnassignedFromStoreEvent :  IEquatable<PrinterUnassi
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class PrinterUnassignedFromStoreEvent :  IEquatable<PrinterUnassi
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(PrinterUnassignedFromStoreEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ProcessPaymentIntentRequest.cs b/src/Flipdish/Model/ProcessPaymentIntentRequest.cs
index aa0b2876..55ab7f1f 100644
--- a/src/Flipdish/Model/ProcessPaymentIntentRequest.cs
+++ b/src/Flipdish/Model/ProcessPaymentIntentRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Initiate card reader Payment process request
     /// </summary>
     [DataContract]
-    public partial class ProcessPaymentIntentRequest :  IEquatable<ProcessPaymentIntentRequest>, IValidatableObject
+    public partial class ProcessPaymentIntentRequest :  IEquatable<ProcessPaymentIntentRequest>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ProcessPaymentIntentRequest" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ProcessingFeeConfig.cs b/src/Flipdish/Model/ProcessingFeeConfig.cs
index 02ec9e7f..e4978f09 100644
--- a/src/Flipdish/Model/ProcessingFeeConfig.cs
+++ b/src/Flipdish/Model/ProcessingFeeConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Processing fee config
     /// </summary>
     [DataContract]
-    public partial class ProcessingFeeConfig :  IEquatable<ProcessingFeeConfig>, IValidatableObject
+    public partial class ProcessingFeeConfig :  IEquatable<ProcessingFeeConfig>
     {
         /// <summary>
         /// Payment account type
@@ -90,7 +88,13 @@ public enum PaymentAccountTypeEnum
             /// Enum PayGreen for value: PayGreen
             /// </summary>
             [EnumMember(Value = "PayGreen")]
-            PayGreen = 9
+            PayGreen = 9,
+            
+            /// <summary>
+            /// Enum GoogleWalletToken for value: GoogleWalletToken
+            /// </summary>
+            [EnumMember(Value = "GoogleWalletToken")]
+            GoogleWalletToken = 10
         }
 
         /// <summary>
@@ -224,16 +228,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Product.cs b/src/Flipdish/Model/Product.cs
index 2e102b85..84131f48 100644
--- a/src/Flipdish/Model/Product.cs
+++ b/src/Flipdish/Model/Product.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Product
     /// </summary>
     [DataContract]
-    public partial class Product :  IEquatable<Product>, IValidatableObject
+    public partial class Product :  IEquatable<Product>
     {
         /// <summary>
         /// Type of item (Product, Modifier, etc)
@@ -338,82 +336,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 3000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 3000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ProductItem.cs b/src/Flipdish/Model/ProductItem.cs
deleted file mode 100644
index 25c96781..00000000
--- a/src/Flipdish/Model/ProductItem.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Item
-    /// </summary>
-    [DataContract]
-    public partial class ProductItem :  IEquatable<ProductItem>, IValidatableObject
-    {
-        /// <summary>
-        /// Small | Medium | Large | HiddenImage  Affects the layout of the menu.
-        /// </summary>
-        /// <value>Small | Medium | Large | HiddenImage  Affects the layout of the menu.</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum CellLayoutTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Small for value: Small
-            /// </summary>
-            [EnumMember(Value = "Small")]
-            Small = 1,
-            
-            /// <summary>
-            /// Enum Medium for value: Medium
-            /// </summary>
-            [EnumMember(Value = "Medium")]
-            Medium = 2,
-            
-            /// <summary>
-            /// Enum Large for value: Large
-            /// </summary>
-            [EnumMember(Value = "Large")]
-            Large = 3,
-            
-            /// <summary>
-            /// Enum HiddenImage for value: HiddenImage
-            /// </summary>
-            [EnumMember(Value = "HiddenImage")]
-            HiddenImage = 4
-        }
-
-        /// <summary>
-        /// Small | Medium | Large | HiddenImage  Affects the layout of the menu.
-        /// </summary>
-        /// <value>Small | Medium | Large | HiddenImage  Affects the layout of the menu.</value>
-        [DataMember(Name="CellLayoutType", EmitDefaultValue=false)]
-        public CellLayoutTypeEnum? CellLayoutType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProductItem" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected ProductItem() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProductItem" /> class.
-        /// </summary>
-        /// <param name="productId">Product Id to the product to add as Menu Item (required).</param>
-        /// <param name="cellLayoutType">Small | Medium | Large | HiddenImage  Affects the layout of the menu..</param>
-        public ProductItem(string productId = default(string), CellLayoutTypeEnum? cellLayoutType = default(CellLayoutTypeEnum?))
-        {
-            // to ensure "productId" is required (not null)
-            if (productId == null)
-            {
-                throw new InvalidDataException("productId is a required property for ProductItem and cannot be null");
-            }
-            else
-            {
-                this.ProductId = productId;
-            }
-            this.CellLayoutType = cellLayoutType;
-        }
-        
-        /// <summary>
-        /// Product Id to the product to add as Menu Item
-        /// </summary>
-        /// <value>Product Id to the product to add as Menu Item</value>
-        [DataMember(Name="ProductId", EmitDefaultValue=false)]
-        public string ProductId { get; set; }
-
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class ProductItem {\n");
-            sb.Append("  ProductId: ").Append(ProductId).Append("\n");
-            sb.Append("  CellLayoutType: ").Append(CellLayoutType).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as ProductItem);
-        }
-
-        /// <summary>
-        /// Returns true if ProductItem instances are equal
-        /// </summary>
-        /// <param name="input">Instance of ProductItem to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(ProductItem input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.ProductId == input.ProductId ||
-                    (this.ProductId != null &&
-                    this.ProductId.Equals(input.ProductId))
-                ) && 
-                (
-                    this.CellLayoutType == input.CellLayoutType ||
-                    (this.CellLayoutType != null &&
-                    this.CellLayoutType.Equals(input.CellLayoutType))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.ProductId != null)
-                    hashCode = hashCode * 59 + this.ProductId.GetHashCode();
-                if (this.CellLayoutType != null)
-                    hashCode = hashCode * 59 + this.CellLayoutType.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // ProductId (string) maxLength
-            if(this.ProductId != null && this.ProductId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ProductId, length must be less than 30.", new [] { "ProductId" });
-            }
-
-            // ProductId (string) minLength
-            if(this.ProductId != null && this.ProductId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ProductId, length must be greater than 0.", new [] { "ProductId" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/ProductReference.cs b/src/Flipdish/Model/ProductReference.cs
index bc5d2581..fd1afcdf 100644
--- a/src/Flipdish/Model/ProductReference.cs
+++ b/src/Flipdish/Model/ProductReference.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Catalog Item associated
     /// </summary>
     [DataContract]
-    public partial class ProductReference :  IEquatable<ProductReference>, IValidatableObject
+    public partial class ProductReference :  IEquatable<ProductReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -65,8 +63,8 @@ protected ProductReference() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="ProductReference" /> class.
         /// </summary>
-        /// <param name="item">Details of the referenced {Flipdish.PublicModels.V1.Catalog.Groups.ProductReference.Product}.</param>
-        /// <param name="product">Details of the referenced {Flipdish.PublicModels.V1.Catalog.Groups.ProductReference.Product}.</param>
+        /// <param name="item">Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Groups.ProductReference.Product}.</param>
+        /// <param name="product">Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Groups.ProductReference.Product}.</param>
         /// <param name="catalogItemId">Identifier of the CatalogItemId to use as SubProduct (required).</param>
         /// <param name="productType">Type of the SupProduct (required).</param>
         /// <param name="preselectedQuantity">Quantity of the modifier that will be set when the parent product is placed in the basket.</param>
@@ -96,16 +94,16 @@ protected ProductReference() { }
         }
         
         /// <summary>
-        /// Details of the referenced {Flipdish.PublicModels.V1.Catalog.Groups.ProductReference.Product}
+        /// Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Groups.ProductReference.Product}
         /// </summary>
-        /// <value>Details of the referenced {Flipdish.PublicModels.V1.Catalog.Groups.ProductReference.Product}</value>
+        /// <value>Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Groups.ProductReference.Product}</value>
         [DataMember(Name="Item", EmitDefaultValue=false)]
         public Product Item { get; set; }
 
         /// <summary>
-        /// Details of the referenced {Flipdish.PublicModels.V1.Catalog.Groups.ProductReference.Product}
+        /// Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Groups.ProductReference.Product}
         /// </summary>
-        /// <value>Details of the referenced {Flipdish.PublicModels.V1.Catalog.Groups.ProductReference.Product}</value>
+        /// <value>Details of the referenced {Flipdish.Menus.PublicModels.V1.Catalog.Groups.ProductReference.Product}</value>
         [DataMember(Name="Product", EmitDefaultValue=false)]
         public Product Product { get; set; }
 
@@ -220,28 +218,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PromotionAward.cs b/src/Flipdish/Model/PromotionAward.cs
new file mode 100644
index 00000000..c4193c0b
--- /dev/null
+++ b/src/Flipdish/Model/PromotionAward.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Promotion
+    /// </summary>
+    [DataContract]
+    public partial class PromotionAward :  IEquatable<PromotionAward>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PromotionAward" /> class.
+        /// </summary>
+        /// <param name="promotionAwardId">Promotion Award Id.</param>
+        /// <param name="menuItemPublicId">The public id of the menu item that will be awarded.</param>
+        public PromotionAward(int? promotionAwardId = default(int?), Guid? menuItemPublicId = default(Guid?))
+        {
+            this.PromotionAwardId = promotionAwardId;
+            this.MenuItemPublicId = menuItemPublicId;
+        }
+        
+        /// <summary>
+        /// Promotion Award Id
+        /// </summary>
+        /// <value>Promotion Award Id</value>
+        [DataMember(Name="PromotionAwardId", EmitDefaultValue=false)]
+        public int? PromotionAwardId { get; set; }
+
+        /// <summary>
+        /// The public id of the menu item that will be awarded
+        /// </summary>
+        /// <value>The public id of the menu item that will be awarded</value>
+        [DataMember(Name="MenuItemPublicId", EmitDefaultValue=false)]
+        public Guid? MenuItemPublicId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PromotionAward {\n");
+            sb.Append("  PromotionAwardId: ").Append(PromotionAwardId).Append("\n");
+            sb.Append("  MenuItemPublicId: ").Append(MenuItemPublicId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PromotionAward);
+        }
+
+        /// <summary>
+        /// Returns true if PromotionAward instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PromotionAward to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PromotionAward input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PromotionAwardId == input.PromotionAwardId ||
+                    (this.PromotionAwardId != null &&
+                    this.PromotionAwardId.Equals(input.PromotionAwardId))
+                ) && 
+                (
+                    this.MenuItemPublicId == input.MenuItemPublicId ||
+                    (this.MenuItemPublicId != null &&
+                    this.MenuItemPublicId.Equals(input.MenuItemPublicId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PromotionAwardId != null)
+                    hashCode = hashCode * 59 + this.PromotionAwardId.GetHashCode();
+                if (this.MenuItemPublicId != null)
+                    hashCode = hashCode * 59 + this.MenuItemPublicId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PromotionDetails.cs b/src/Flipdish/Model/PromotionDetails.cs
new file mode 100644
index 00000000..b682a5bc
--- /dev/null
+++ b/src/Flipdish/Model/PromotionDetails.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Promotion
+    /// </summary>
+    [DataContract]
+    public partial class PromotionDetails :  IEquatable<PromotionDetails>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PromotionDetails" /> class.
+        /// </summary>
+        /// <param name="promotionId">Promotion Id.</param>
+        /// <param name="name">The name of the promotion.</param>
+        /// <param name="promotionAwards">The items that this promotion will award.</param>
+        public PromotionDetails(int? promotionId = default(int?), string name = default(string), List<PromotionAward> promotionAwards = default(List<PromotionAward>))
+        {
+            this.PromotionId = promotionId;
+            this.Name = name;
+            this.PromotionAwards = promotionAwards;
+        }
+        
+        /// <summary>
+        /// Promotion Id
+        /// </summary>
+        /// <value>Promotion Id</value>
+        [DataMember(Name="PromotionId", EmitDefaultValue=false)]
+        public int? PromotionId { get; set; }
+
+        /// <summary>
+        /// The name of the promotion
+        /// </summary>
+        /// <value>The name of the promotion</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The items that this promotion will award
+        /// </summary>
+        /// <value>The items that this promotion will award</value>
+        [DataMember(Name="PromotionAwards", EmitDefaultValue=false)]
+        public List<PromotionAward> PromotionAwards { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class PromotionDetails {\n");
+            sb.Append("  PromotionId: ").Append(PromotionId).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  PromotionAwards: ").Append(PromotionAwards).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as PromotionDetails);
+        }
+
+        /// <summary>
+        /// Returns true if PromotionDetails instances are equal
+        /// </summary>
+        /// <param name="input">Instance of PromotionDetails to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(PromotionDetails input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PromotionId == input.PromotionId ||
+                    (this.PromotionId != null &&
+                    this.PromotionId.Equals(input.PromotionId))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.PromotionAwards == input.PromotionAwards ||
+                    this.PromotionAwards != null &&
+                    this.PromotionAwards.SequenceEqual(input.PromotionAwards)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PromotionId != null)
+                    hashCode = hashCode * 59 + this.PromotionId.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.PromotionAwards != null)
+                    hashCode = hashCode * 59 + this.PromotionAwards.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/PublishMenuChanges.cs b/src/Flipdish/Model/PublishMenuChanges.cs
index 23f524c8..9c79c5a6 100644
--- a/src/Flipdish/Model/PublishMenuChanges.cs
+++ b/src/Flipdish/Model/PublishMenuChanges.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Publish Menu Changes
     /// </summary>
     [DataContract]
-    public partial class PublishMenuChanges :  IEquatable<PublishMenuChanges>, IValidatableObject
+    public partial class PublishMenuChanges :  IEquatable<PublishMenuChanges>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PublishMenuChanges" /> class.
@@ -127,28 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PushNotificationDeletedEvent.cs b/src/Flipdish/Model/PushNotificationDeletedEvent.cs
index feb1325f..ea38952f 100644
--- a/src/Flipdish/Model/PushNotificationDeletedEvent.cs
+++ b/src/Flipdish/Model/PushNotificationDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// PushNotificationDeletedEvent
     /// </summary>
     [DataContract]
-    public partial class PushNotificationDeletedEvent :  IEquatable<PushNotificationDeletedEvent>, IValidatableObject
+    public partial class PushNotificationDeletedEvent :  IEquatable<PushNotificationDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PushNotificationDeletedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class PushNotificationDeletedEvent :  IEquatable<PushNotification
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PushNotificationDeletedEvent(string eventName = default(string), string description = default(string), PushNotificationRequest pushNotification = default(PushNotificationRequest), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PushNotificationDeletedEvent(string eventName = default(string), string description = default(string), PushNotificationRequest pushNotification = default(PushNotificationRequest), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class PushNotificationDeletedEvent :  IEquatable<PushNotification
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -100,6 +104,13 @@ public partial class PushNotificationDeletedEvent :  IEquatable<PushNotification
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -107,6 +118,20 @@ public partial class PushNotificationDeletedEvent :  IEquatable<PushNotification
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -122,7 +147,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -192,10 +220,25 @@ public bool Equals(PushNotificationDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -222,21 +265,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PushNotificationRequest.cs b/src/Flipdish/Model/PushNotificationRequest.cs
index 94ab23a8..84a3736e 100644
--- a/src/Flipdish/Model/PushNotificationRequest.cs
+++ b/src/Flipdish/Model/PushNotificationRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Push Notification Details
     /// </summary>
     [DataContract]
-    public partial class PushNotificationRequest :  IEquatable<PushNotificationRequest>, IValidatableObject
+    public partial class PushNotificationRequest :  IEquatable<PushNotificationRequest>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PushNotificationRequest" /> class.
@@ -157,16 +155,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PushNotificationResponse.cs b/src/Flipdish/Model/PushNotificationResponse.cs
index 1460e055..ee520a5a 100644
--- a/src/Flipdish/Model/PushNotificationResponse.cs
+++ b/src/Flipdish/Model/PushNotificationResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Push Notification
     /// </summary>
     [DataContract]
-    public partial class PushNotificationResponse :  IEquatable<PushNotificationResponse>, IValidatableObject
+    public partial class PushNotificationResponse :  IEquatable<PushNotificationResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PushNotificationResponse" /> class.
@@ -191,16 +189,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PushNotificationScheduledEvent.cs b/src/Flipdish/Model/PushNotificationScheduledEvent.cs
index a5a1cef8..6d373c30 100644
--- a/src/Flipdish/Model/PushNotificationScheduledEvent.cs
+++ b/src/Flipdish/Model/PushNotificationScheduledEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// PushNotificationScheduledEvent
     /// </summary>
     [DataContract]
-    public partial class PushNotificationScheduledEvent :  IEquatable<PushNotificationScheduledEvent>, IValidatableObject
+    public partial class PushNotificationScheduledEvent :  IEquatable<PushNotificationScheduledEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PushNotificationScheduledEvent" /> class.
@@ -41,8 +39,11 @@ public partial class PushNotificationScheduledEvent :  IEquatable<PushNotificati
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PushNotificationScheduledEvent(string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), PushNotificationRequest pushNotification = default(PushNotificationRequest), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PushNotificationScheduledEvent(string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), PushNotificationRequest pushNotification = default(PushNotificationRequest), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.User = user;
@@ -52,7 +53,10 @@ public partial class PushNotificationScheduledEvent :  IEquatable<PushNotificati
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -108,6 +112,13 @@ public partial class PushNotificationScheduledEvent :  IEquatable<PushNotificati
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -115,6 +126,20 @@ public partial class PushNotificationScheduledEvent :  IEquatable<PushNotificati
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -131,7 +156,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -206,10 +234,25 @@ public bool Equals(PushNotificationScheduledEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -238,21 +281,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/PushNotificationSentEvent.cs b/src/Flipdish/Model/PushNotificationSentEvent.cs
index 966bae86..7f27b40a 100644
--- a/src/Flipdish/Model/PushNotificationSentEvent.cs
+++ b/src/Flipdish/Model/PushNotificationSentEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// PushNotificationSentEvent
     /// </summary>
     [DataContract]
-    public partial class PushNotificationSentEvent :  IEquatable<PushNotificationSentEvent>, IValidatableObject
+    public partial class PushNotificationSentEvent :  IEquatable<PushNotificationSentEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PushNotificationSentEvent" /> class.
@@ -40,8 +38,11 @@ public partial class PushNotificationSentEvent :  IEquatable<PushNotificationSen
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public PushNotificationSentEvent(string eventName = default(string), string description = default(string), PushNotificationRequest pushNotification = default(PushNotificationRequest), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public PushNotificationSentEvent(string eventName = default(string), string description = default(string), PushNotificationRequest pushNotification = default(PushNotificationRequest), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class PushNotificationSentEvent :  IEquatable<PushNotificationSen
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -101,6 +105,13 @@ public partial class PushNotificationSentEvent :  IEquatable<PushNotificationSen
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -108,6 +119,20 @@ public partial class PushNotificationSentEvent :  IEquatable<PushNotificationSen
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -123,7 +148,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -193,10 +221,25 @@ public bool Equals(PushNotificationSentEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -223,21 +266,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Range.cs b/src/Flipdish/Model/Range.cs
index b0aef1e5..10cb8d1c 100644
--- a/src/Flipdish/Model/Range.cs
+++ b/src/Flipdish/Model/Range.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// A class that represents a single opening period in a day.  This starts &#39;StartTime&#39; after midnight and runs for a &#39;Period&#39;  after that, on the given DayOfWeek.
     /// </summary>
     [DataContract]
-    public partial class Range :  IEquatable<Range>, IValidatableObject
+    public partial class Range :  IEquatable<Range>
     {
         /// <summary>
         /// Day of week
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ReaderActionStateInfo.cs b/src/Flipdish/Model/ReaderActionStateInfo.cs
index 065b577e..24a1829c 100644
--- a/src/Flipdish/Model/ReaderActionStateInfo.cs
+++ b/src/Flipdish/Model/ReaderActionStateInfo.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Card reader state information
     /// </summary>
     [DataContract]
-    public partial class ReaderActionStateInfo :  IEquatable<ReaderActionStateInfo>, IValidatableObject
+    public partial class ReaderActionStateInfo :  IEquatable<ReaderActionStateInfo>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ReaderActionStateInfo" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RedeemInvitationResult.cs b/src/Flipdish/Model/RedeemInvitationResult.cs
index 3762d662..3f56ba70 100644
--- a/src/Flipdish/Model/RedeemInvitationResult.cs
+++ b/src/Flipdish/Model/RedeemInvitationResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// RedeemInvitationResult
     /// </summary>
     [DataContract]
-    public partial class RedeemInvitationResult :  IEquatable<RedeemInvitationResult>, IValidatableObject
+    public partial class RedeemInvitationResult :  IEquatable<RedeemInvitationResult>
     {
         /// <summary>
         /// Invitation status
@@ -154,16 +152,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Refund.cs b/src/Flipdish/Model/Refund.cs
index 37b493ef..c6a0aa6e 100644
--- a/src/Flipdish/Model/Refund.cs
+++ b/src/Flipdish/Model/Refund.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Refund
     /// </summary>
     [DataContract]
-    public partial class Refund :  IEquatable<Refund>, IValidatableObject
+    public partial class Refund :  IEquatable<Refund>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Refund" /> class.
@@ -165,22 +163,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // RefundAmount (double?) minimum
-            if(this.RefundAmount < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for RefundAmount, must be a value greater than or equal to 0.", new [] { "RefundAmount" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Reject.cs b/src/Flipdish/Model/Reject.cs
index 07226839..b8e871f8 100644
--- a/src/Flipdish/Model/Reject.cs
+++ b/src/Flipdish/Model/Reject.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Reject
     /// </summary>
     [DataContract]
-    public partial class Reject :  IEquatable<Reject>, IValidatableObject
+    public partial class Reject :  IEquatable<Reject>
     {
         /// <summary>
         /// Reject reason.
@@ -203,16 +201,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RequestLoginPinModel.cs b/src/Flipdish/Model/RequestLoginPinModel.cs
deleted file mode 100644
index f85b6c7d..00000000
--- a/src/Flipdish/Model/RequestLoginPinModel.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Request login PIN response
-    /// </summary>
-    [DataContract]
-    public partial class RequestLoginPinModel :  IEquatable<RequestLoginPinModel>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestLoginPinModel" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RequestLoginPinModel() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestLoginPinModel" /> class.
-        /// </summary>
-        /// <param name="email">Email address (required).</param>
-        public RequestLoginPinModel(string email = default(string))
-        {
-            // to ensure "email" is required (not null)
-            if (email == null)
-            {
-                throw new InvalidDataException("email is a required property for RequestLoginPinModel and cannot be null");
-            }
-            else
-            {
-                this.Email = email;
-            }
-        }
-        
-        /// <summary>
-        /// Email address
-        /// </summary>
-        /// <value>Email address</value>
-        [DataMember(Name="Email", EmitDefaultValue=false)]
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RequestLoginPinModel {\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RequestLoginPinModel);
-        }
-
-        /// <summary>
-        /// Returns true if RequestLoginPinModel instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RequestLoginPinModel to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RequestLoginPinModel input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Email == input.Email ||
-                    (this.Email != null &&
-                    this.Email.Equals(input.Email))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Email != null)
-                    hashCode = hashCode * 59 + this.Email.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RequestLoginPinResposne.cs b/src/Flipdish/Model/RequestLoginPinResposne.cs
deleted file mode 100644
index f2196ca5..00000000
--- a/src/Flipdish/Model/RequestLoginPinResposne.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Request login PIN response
-    /// </summary>
-    [DataContract]
-    public partial class RequestLoginPinResposne :  IEquatable<RequestLoginPinResposne>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestLoginPinResposne" /> class.
-        /// </summary>
-        /// <param name="loginPinSentViaEmail">Login PIN sent via email to user.</param>
-        public RequestLoginPinResposne(bool? loginPinSentViaEmail = default(bool?))
-        {
-            this.LoginPinSentViaEmail = loginPinSentViaEmail;
-        }
-        
-        /// <summary>
-        /// Login PIN sent via email to user
-        /// </summary>
-        /// <value>Login PIN sent via email to user</value>
-        [DataMember(Name="LoginPinSentViaEmail", EmitDefaultValue=false)]
-        public bool? LoginPinSentViaEmail { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RequestLoginPinResposne {\n");
-            sb.Append("  LoginPinSentViaEmail: ").Append(LoginPinSentViaEmail).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RequestLoginPinResposne);
-        }
-
-        /// <summary>
-        /// Returns true if RequestLoginPinResposne instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RequestLoginPinResposne to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RequestLoginPinResposne input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.LoginPinSentViaEmail == input.LoginPinSentViaEmail ||
-                    (this.LoginPinSentViaEmail != null &&
-                    this.LoginPinSentViaEmail.Equals(input.LoginPinSentViaEmail))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.LoginPinSentViaEmail != null)
-                    hashCode = hashCode * 59 + this.LoginPinSentViaEmail.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RequestPasswordResetModel.cs b/src/Flipdish/Model/RequestPasswordResetModel.cs
index 784e0744..0803dc70 100644
--- a/src/Flipdish/Model/RequestPasswordResetModel.cs
+++ b/src/Flipdish/Model/RequestPasswordResetModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,15 +26,17 @@ namespace Flipdish.Model
     /// RequestPasswordResetModel
     /// </summary>
     [DataContract]
-    public partial class RequestPasswordResetModel :  IEquatable<RequestPasswordResetModel>, IValidatableObject
+    public partial class RequestPasswordResetModel :  IEquatable<RequestPasswordResetModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestPasswordResetModel" /> class.
         /// </summary>
         /// <param name="email">Email address.</param>
-        public RequestPasswordResetModel(string email = default(string))
+        /// <param name="recaptchaToken">Google Recaptcha Token.</param>
+        public RequestPasswordResetModel(string email = default(string), string recaptchaToken = default(string))
         {
             this.Email = email;
+            this.RecaptchaToken = recaptchaToken;
         }
         
         /// <summary>
@@ -46,6 +46,13 @@ public partial class RequestPasswordResetModel :  IEquatable<RequestPasswordRese
         [DataMember(Name="Email", EmitDefaultValue=false)]
         public string Email { get; set; }
 
+        /// <summary>
+        /// Google Recaptcha Token
+        /// </summary>
+        /// <value>Google Recaptcha Token</value>
+        [DataMember(Name="RecaptchaToken", EmitDefaultValue=false)]
+        public string RecaptchaToken { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -55,6 +62,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class RequestPasswordResetModel {\n");
             sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  RecaptchaToken: ").Append(RecaptchaToken).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -93,6 +101,11 @@ public bool Equals(RequestPasswordResetModel input)
                     this.Email == input.Email ||
                     (this.Email != null &&
                     this.Email.Equals(input.Email))
+                ) && 
+                (
+                    this.RecaptchaToken == input.RecaptchaToken ||
+                    (this.RecaptchaToken != null &&
+                    this.RecaptchaToken.Equals(input.RecaptchaToken))
                 );
         }
 
@@ -107,19 +120,11 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.Email != null)
                     hashCode = hashCode * 59 + this.Email.GetHashCode();
+                if (this.RecaptchaToken != null)
+                    hashCode = hashCode * 59 + this.RecaptchaToken.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RequestPasswordResetPinResponse.cs b/src/Flipdish/Model/RequestPasswordResetPinResponse.cs
deleted file mode 100644
index 54f1f5e9..00000000
--- a/src/Flipdish/Model/RequestPasswordResetPinResponse.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Request Password Reset PIN response
-    /// </summary>
-    [DataContract]
-    public partial class RequestPasswordResetPinResponse :  IEquatable<RequestPasswordResetPinResponse>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestPasswordResetPinResponse" /> class.
-        /// </summary>
-        /// <param name="passwordResetPinSentViaEmail">Password Reset PIN sent via email to user.</param>
-        public RequestPasswordResetPinResponse(bool? passwordResetPinSentViaEmail = default(bool?))
-        {
-            this.PasswordResetPinSentViaEmail = passwordResetPinSentViaEmail;
-        }
-        
-        /// <summary>
-        /// Password Reset PIN sent via email to user
-        /// </summary>
-        /// <value>Password Reset PIN sent via email to user</value>
-        [DataMember(Name="PasswordResetPinSentViaEmail", EmitDefaultValue=false)]
-        public bool? PasswordResetPinSentViaEmail { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RequestPasswordResetPinResponse {\n");
-            sb.Append("  PasswordResetPinSentViaEmail: ").Append(PasswordResetPinSentViaEmail).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RequestPasswordResetPinResponse);
-        }
-
-        /// <summary>
-        /// Returns true if RequestPasswordResetPinResponse instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RequestPasswordResetPinResponse to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RequestPasswordResetPinResponse input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.PasswordResetPinSentViaEmail == input.PasswordResetPinSentViaEmail ||
-                    (this.PasswordResetPinSentViaEmail != null &&
-                    this.PasswordResetPinSentViaEmail.Equals(input.PasswordResetPinSentViaEmail))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.PasswordResetPinSentViaEmail != null)
-                    hashCode = hashCode * 59 + this.PasswordResetPinSentViaEmail.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/Response.cs b/src/Flipdish/Model/Response.cs
index eb888365..aa4972a0 100644
--- a/src/Flipdish/Model/Response.cs
+++ b/src/Flipdish/Model/Response.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Response
     /// </summary>
     [DataContract]
-    public partial class Response :  IEquatable<Response>, IValidatableObject
+    public partial class Response :  IEquatable<Response>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Response" /> class.
@@ -109,16 +107,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultAllMetadataResult.cs b/src/Flipdish/Model/RestApiArrayResultAllMetadataResult.cs
index d4bed417..ab07152d 100644
--- a/src/Flipdish/Model/RestApiArrayResultAllMetadataResult.cs
+++ b/src/Flipdish/Model/RestApiArrayResultAllMetadataResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultAllMetadataResult :  IEquatable<RestApiArrayResultAllMetadataResult>, IValidatableObject
+    public partial class RestApiArrayResultAllMetadataResult :  IEquatable<RestApiArrayResultAllMetadataResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultAllMetadataResult" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultAllergen.cs b/src/Flipdish/Model/RestApiArrayResultAllergen.cs
new file mode 100644
index 00000000..ea477625
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultAllergen.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultAllergen :  IEquatable<RestApiArrayResultAllergen>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultAllergen" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultAllergen() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultAllergen" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultAllergen(List<Allergen> data = default(List<Allergen>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultAllergen and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<Allergen> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultAllergen {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultAllergen);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultAllergen instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultAllergen to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultAllergen input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultApmCurrencyDataPoint.cs b/src/Flipdish/Model/RestApiArrayResultApmCurrencyDataPoint.cs
index 4630c24a..cccac23a 100644
--- a/src/Flipdish/Model/RestApiArrayResultApmCurrencyDataPoint.cs
+++ b/src/Flipdish/Model/RestApiArrayResultApmCurrencyDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultApmCurrencyDataPoint :  IEquatable<RestApiArrayResultApmCurrencyDataPoint>, IValidatableObject
+    public partial class RestApiArrayResultApmCurrencyDataPoint :  IEquatable<RestApiArrayResultApmCurrencyDataPoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultApmCurrencyDataPoint" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultApmDataPoint.cs b/src/Flipdish/Model/RestApiArrayResultApmDataPoint.cs
index 0df73ceb..5991905d 100644
--- a/src/Flipdish/Model/RestApiArrayResultApmDataPoint.cs
+++ b/src/Flipdish/Model/RestApiArrayResultApmDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultApmDataPoint :  IEquatable<RestApiArrayResultApmDataPoint>, IValidatableObject
+    public partial class RestApiArrayResultApmDataPoint :  IEquatable<RestApiArrayResultApmDataPoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultApmDataPoint" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultApmHourlyDataPoint.cs b/src/Flipdish/Model/RestApiArrayResultApmHourlyDataPoint.cs
index 9b2647cb..a482ec80 100644
--- a/src/Flipdish/Model/RestApiArrayResultApmHourlyDataPoint.cs
+++ b/src/Flipdish/Model/RestApiArrayResultApmHourlyDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultApmHourlyDataPoint :  IEquatable<RestApiArrayResultApmHourlyDataPoint>, IValidatableObject
+    public partial class RestApiArrayResultApmHourlyDataPoint :  IEquatable<RestApiArrayResultApmHourlyDataPoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultApmHourlyDataPoint" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultAppConfigurationHeader.cs b/src/Flipdish/Model/RestApiArrayResultAppConfigurationHeader.cs
deleted file mode 100644
index 4cbc0e55..00000000
--- a/src/Flipdish/Model/RestApiArrayResultAppConfigurationHeader.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultAppConfigurationHeader :  IEquatable<RestApiArrayResultAppConfigurationHeader>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultAppConfigurationHeader" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultAppConfigurationHeader() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultAppConfigurationHeader" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultAppConfigurationHeader(List<AppConfigurationHeader> data = default(List<AppConfigurationHeader>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultAppConfigurationHeader and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<AppConfigurationHeader> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultAppConfigurationHeader {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultAppConfigurationHeader);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultAppConfigurationHeader instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultAppConfigurationHeader to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultAppConfigurationHeader input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiArrayResultAppConfigurationSummary.cs b/src/Flipdish/Model/RestApiArrayResultAppConfigurationSummary.cs
deleted file mode 100644
index eea806f0..00000000
--- a/src/Flipdish/Model/RestApiArrayResultAppConfigurationSummary.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultAppConfigurationSummary :  IEquatable<RestApiArrayResultAppConfigurationSummary>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultAppConfigurationSummary" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultAppConfigurationSummary() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultAppConfigurationSummary" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultAppConfigurationSummary(List<AppConfigurationSummary> data = default(List<AppConfigurationSummary>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultAppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<AppConfigurationSummary> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultAppConfigurationSummary {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultAppConfigurationSummary);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultAppConfigurationSummary instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultAppConfigurationSummary to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultAppConfigurationSummary input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiArrayResultAppStoreAppConfigurationHeader.cs b/src/Flipdish/Model/RestApiArrayResultAppStoreAppConfigurationHeader.cs
deleted file mode 100644
index 3a8e2eb8..00000000
--- a/src/Flipdish/Model/RestApiArrayResultAppStoreAppConfigurationHeader.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultAppStoreAppConfigurationHeader :  IEquatable<RestApiArrayResultAppStoreAppConfigurationHeader>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultAppStoreAppConfigurationHeader" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultAppStoreAppConfigurationHeader() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultAppStoreAppConfigurationHeader" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultAppStoreAppConfigurationHeader(List<AppStoreAppConfigurationHeader> data = default(List<AppStoreAppConfigurationHeader>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultAppStoreAppConfigurationHeader and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<AppStoreAppConfigurationHeader> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultAppStoreAppConfigurationHeader {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultAppStoreAppConfigurationHeader);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultAppStoreAppConfigurationHeader instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultAppStoreAppConfigurationHeader to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultAppStoreAppConfigurationHeader input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiArrayResultAppStoreAppConfigurationSummary.cs b/src/Flipdish/Model/RestApiArrayResultAppStoreAppConfigurationSummary.cs
index fb7eb7ae..9d87bb7f 100644
--- a/src/Flipdish/Model/RestApiArrayResultAppStoreAppConfigurationSummary.cs
+++ b/src/Flipdish/Model/RestApiArrayResultAppStoreAppConfigurationSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultAppStoreAppConfigurationSummary :  IEquatable<RestApiArrayResultAppStoreAppConfigurationSummary>, IValidatableObject
+    public partial class RestApiArrayResultAppStoreAppConfigurationSummary :  IEquatable<RestApiArrayResultAppStoreAppConfigurationSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultAppStoreAppConfigurationSummary" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultAppStoreAppSummary.cs b/src/Flipdish/Model/RestApiArrayResultAppStoreAppSummary.cs
new file mode 100644
index 00000000..c8f6cc7e
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultAppStoreAppSummary.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultAppStoreAppSummary :  IEquatable<RestApiArrayResultAppStoreAppSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultAppStoreAppSummary" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultAppStoreAppSummary() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultAppStoreAppSummary" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultAppStoreAppSummary(List<AppStoreAppSummary> data = default(List<AppStoreAppSummary>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultAppStoreAppSummary and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<AppStoreAppSummary> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultAppStoreAppSummary {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultAppStoreAppSummary);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultAppStoreAppSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultAppStoreAppSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultAppStoreAppSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultBankAccountSummary.cs b/src/Flipdish/Model/RestApiArrayResultBankAccountSummary.cs
index 574fc7d5..484d4ecd 100644
--- a/src/Flipdish/Model/RestApiArrayResultBankAccountSummary.cs
+++ b/src/Flipdish/Model/RestApiArrayResultBankAccountSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultBankAccountSummary :  IEquatable<RestApiArrayResultBankAccountSummary>, IValidatableObject
+    public partial class RestApiArrayResultBankAccountSummary :  IEquatable<RestApiArrayResultBankAccountSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultBankAccountSummary" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultBusinessHoursPeriod.cs b/src/Flipdish/Model/RestApiArrayResultBusinessHoursPeriod.cs
index 2400923a..05e4a0f8 100644
--- a/src/Flipdish/Model/RestApiArrayResultBusinessHoursPeriod.cs
+++ b/src/Flipdish/Model/RestApiArrayResultBusinessHoursPeriod.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultBusinessHoursPeriod :  IEquatable<RestApiArrayResultBusinessHoursPeriod>, IValidatableObject
+    public partial class RestApiArrayResultBusinessHoursPeriod :  IEquatable<RestApiArrayResultBusinessHoursPeriod>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultBusinessHoursPeriod" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultChannel.cs b/src/Flipdish/Model/RestApiArrayResultChannel.cs
index d93ef8ad..74e9b956 100644
--- a/src/Flipdish/Model/RestApiArrayResultChannel.cs
+++ b/src/Flipdish/Model/RestApiArrayResultChannel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultChannel :  IEquatable<RestApiArrayResultChannel>, IValidatableObject
+    public partial class RestApiArrayResultChannel :  IEquatable<RestApiArrayResultChannel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultChannel" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultClientDeviceSummary.cs b/src/Flipdish/Model/RestApiArrayResultClientDeviceSummary.cs
new file mode 100644
index 00000000..b4a8fdaa
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultClientDeviceSummary.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultClientDeviceSummary :  IEquatable<RestApiArrayResultClientDeviceSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultClientDeviceSummary" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultClientDeviceSummary() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultClientDeviceSummary" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultClientDeviceSummary(List<ClientDeviceSummary> data = default(List<ClientDeviceSummary>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultClientDeviceSummary and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<ClientDeviceSummary> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultClientDeviceSummary {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultClientDeviceSummary);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultClientDeviceSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultClientDeviceSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultClientDeviceSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultConfiguredAppHeader.cs b/src/Flipdish/Model/RestApiArrayResultConfiguredAppHeader.cs
deleted file mode 100644
index b9150452..00000000
--- a/src/Flipdish/Model/RestApiArrayResultConfiguredAppHeader.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultConfiguredAppHeader :  IEquatable<RestApiArrayResultConfiguredAppHeader>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultConfiguredAppHeader" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultConfiguredAppHeader() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultConfiguredAppHeader" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultConfiguredAppHeader(List<ConfiguredAppHeader> data = default(List<ConfiguredAppHeader>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultConfiguredAppHeader and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<ConfiguredAppHeader> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultConfiguredAppHeader {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultConfiguredAppHeader);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultConfiguredAppHeader instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultConfiguredAppHeader to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultConfiguredAppHeader input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiArrayResultCountryWithAccountFieldsDefinitions.cs b/src/Flipdish/Model/RestApiArrayResultCountryWithAccountFieldsDefinitions.cs
index 3e8a96f5..989c0898 100644
--- a/src/Flipdish/Model/RestApiArrayResultCountryWithAccountFieldsDefinitions.cs
+++ b/src/Flipdish/Model/RestApiArrayResultCountryWithAccountFieldsDefinitions.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultCountryWithAccountFieldsDefinitions :  IEquatable<RestApiArrayResultCountryWithAccountFieldsDefinitions>, IValidatableObject
+    public partial class RestApiArrayResultCountryWithAccountFieldsDefinitions :  IEquatable<RestApiArrayResultCountryWithAccountFieldsDefinitions>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultCountryWithAccountFieldsDefinitions" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultDeliveryZone.cs b/src/Flipdish/Model/RestApiArrayResultDeliveryZone.cs
index 3acc5d78..e88abc94 100644
--- a/src/Flipdish/Model/RestApiArrayResultDeliveryZone.cs
+++ b/src/Flipdish/Model/RestApiArrayResultDeliveryZone.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultDeliveryZone :  IEquatable<RestApiArrayResultDeliveryZone>, IValidatableObject
+    public partial class RestApiArrayResultDeliveryZone :  IEquatable<RestApiArrayResultDeliveryZone>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultDeliveryZone" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultDriver.cs b/src/Flipdish/Model/RestApiArrayResultDriver.cs
deleted file mode 100644
index 873a2d8e..00000000
--- a/src/Flipdish/Model/RestApiArrayResultDriver.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultDriver :  IEquatable<RestApiArrayResultDriver>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultDriver" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultDriver() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultDriver" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultDriver(List<Driver> data = default(List<Driver>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultDriver and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<Driver> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultDriver {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultDriver);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultDriver instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultDriver to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultDriver input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiArrayResultDriverStore.cs b/src/Flipdish/Model/RestApiArrayResultDriverStore.cs
deleted file mode 100644
index dd05dcda..00000000
--- a/src/Flipdish/Model/RestApiArrayResultDriverStore.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultDriverStore :  IEquatable<RestApiArrayResultDriverStore>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultDriverStore" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultDriverStore() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultDriverStore" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultDriverStore(List<DriverStore> data = default(List<DriverStore>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultDriverStore and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<DriverStore> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultDriverStore {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultDriverStore);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultDriverStore instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultDriverStore to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultDriverStore input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiArrayResultEmvTerminalWithAssignments.cs b/src/Flipdish/Model/RestApiArrayResultEmvTerminalWithAssignments.cs
index 7ba690ba..304cde5b 100644
--- a/src/Flipdish/Model/RestApiArrayResultEmvTerminalWithAssignments.cs
+++ b/src/Flipdish/Model/RestApiArrayResultEmvTerminalWithAssignments.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultEmvTerminalWithAssignments :  IEquatable<RestApiArrayResultEmvTerminalWithAssignments>, IValidatableObject
+    public partial class RestApiArrayResultEmvTerminalWithAssignments :  IEquatable<RestApiArrayResultEmvTerminalWithAssignments>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultEmvTerminalWithAssignments" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultFlipdishAccountName.cs b/src/Flipdish/Model/RestApiArrayResultFlipdishAccountName.cs
new file mode 100644
index 00000000..a762df59
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultFlipdishAccountName.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultFlipdishAccountName :  IEquatable<RestApiArrayResultFlipdishAccountName>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultFlipdishAccountName" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultFlipdishAccountName() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultFlipdishAccountName" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultFlipdishAccountName(List<FlipdishAccountName> data = default(List<FlipdishAccountName>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultFlipdishAccountName and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<FlipdishAccountName> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultFlipdishAccountName {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultFlipdishAccountName);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultFlipdishAccountName instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultFlipdishAccountName to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultFlipdishAccountName input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultFulfillmentStatesConfigurationSummary.cs b/src/Flipdish/Model/RestApiArrayResultFulfillmentStatesConfigurationSummary.cs
index 3981e7cc..bfca4537 100644
--- a/src/Flipdish/Model/RestApiArrayResultFulfillmentStatesConfigurationSummary.cs
+++ b/src/Flipdish/Model/RestApiArrayResultFulfillmentStatesConfigurationSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultFulfillmentStatesConfigurationSummary :  IEquatable<RestApiArrayResultFulfillmentStatesConfigurationSummary>, IValidatableObject
+    public partial class RestApiArrayResultFulfillmentStatesConfigurationSummary :  IEquatable<RestApiArrayResultFulfillmentStatesConfigurationSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultFulfillmentStatesConfigurationSummary" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultHomeAction.cs b/src/Flipdish/Model/RestApiArrayResultHomeAction.cs
index bdbd1595..10bffe19 100644
--- a/src/Flipdish/Model/RestApiArrayResultHomeAction.cs
+++ b/src/Flipdish/Model/RestApiArrayResultHomeAction.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultHomeAction :  IEquatable<RestApiArrayResultHomeAction>, IValidatableObject
+    public partial class RestApiArrayResultHomeAction :  IEquatable<RestApiArrayResultHomeAction>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultHomeAction" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultKioskCashPaymentSettings.cs b/src/Flipdish/Model/RestApiArrayResultKioskCashPaymentSettings.cs
index 7dd70c6d..347d4f4c 100644
--- a/src/Flipdish/Model/RestApiArrayResultKioskCashPaymentSettings.cs
+++ b/src/Flipdish/Model/RestApiArrayResultKioskCashPaymentSettings.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultKioskCashPaymentSettings :  IEquatable<RestApiArrayResultKioskCashPaymentSettings>, IValidatableObject
+    public partial class RestApiArrayResultKioskCashPaymentSettings :  IEquatable<RestApiArrayResultKioskCashPaymentSettings>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultKioskCashPaymentSettings" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultLocalisedTimeZone.cs b/src/Flipdish/Model/RestApiArrayResultLocalisedTimeZone.cs
index 6b7ab71c..ae83d071 100644
--- a/src/Flipdish/Model/RestApiArrayResultLocalisedTimeZone.cs
+++ b/src/Flipdish/Model/RestApiArrayResultLocalisedTimeZone.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultLocalisedTimeZone :  IEquatable<RestApiArrayResultLocalisedTimeZone>, IValidatableObject
+    public partial class RestApiArrayResultLocalisedTimeZone :  IEquatable<RestApiArrayResultLocalisedTimeZone>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultLocalisedTimeZone" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultLocationAreaLocation.cs b/src/Flipdish/Model/RestApiArrayResultLocationAreaLocation.cs
index c6f6c8b8..ae798efc 100644
--- a/src/Flipdish/Model/RestApiArrayResultLocationAreaLocation.cs
+++ b/src/Flipdish/Model/RestApiArrayResultLocationAreaLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultLocationAreaLocation :  IEquatable<RestApiArrayResultLocationAreaLocation>, IValidatableObject
+    public partial class RestApiArrayResultLocationAreaLocation :  IEquatable<RestApiArrayResultLocationAreaLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultLocationAreaLocation" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultLocationAreaWithLocations.cs b/src/Flipdish/Model/RestApiArrayResultLocationAreaWithLocations.cs
index e954f889..4d8ae7ee 100644
--- a/src/Flipdish/Model/RestApiArrayResultLocationAreaWithLocations.cs
+++ b/src/Flipdish/Model/RestApiArrayResultLocationAreaWithLocations.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultLocationAreaWithLocations :  IEquatable<RestApiArrayResultLocationAreaWithLocations>, IValidatableObject
+    public partial class RestApiArrayResultLocationAreaWithLocations :  IEquatable<RestApiArrayResultLocationAreaWithLocations>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultLocationAreaWithLocations" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultLoyaltyCampaign.cs b/src/Flipdish/Model/RestApiArrayResultLoyaltyCampaign.cs
index ffce4fa2..dc64dbaf 100644
--- a/src/Flipdish/Model/RestApiArrayResultLoyaltyCampaign.cs
+++ b/src/Flipdish/Model/RestApiArrayResultLoyaltyCampaign.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultLoyaltyCampaign :  IEquatable<RestApiArrayResultLoyaltyCampaign>, IValidatableObject
+    public partial class RestApiArrayResultLoyaltyCampaign :  IEquatable<RestApiArrayResultLoyaltyCampaign>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultLoyaltyCampaign" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuCheckpoint.cs b/src/Flipdish/Model/RestApiArrayResultMenuCheckpoint.cs
index 36541763..169f84f8 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuCheckpoint.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuCheckpoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuCheckpoint :  IEquatable<RestApiArrayResultMenuCheckpoint>, IValidatableObject
+    public partial class RestApiArrayResultMenuCheckpoint :  IEquatable<RestApiArrayResultMenuCheckpoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuCheckpoint" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuElementEditResponse.cs b/src/Flipdish/Model/RestApiArrayResultMenuElementEditResponse.cs
index 823d0140..43ad9ba6 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuElementEditResponse.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuElementEditResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuElementEditResponse :  IEquatable<RestApiArrayResultMenuElementEditResponse>, IValidatableObject
+    public partial class RestApiArrayResultMenuElementEditResponse :  IEquatable<RestApiArrayResultMenuElementEditResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuElementEditResponse" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuElementListResponse.cs b/src/Flipdish/Model/RestApiArrayResultMenuElementListResponse.cs
index 40de0982..c822f42d 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuElementListResponse.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuElementListResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuElementListResponse :  IEquatable<RestApiArrayResultMenuElementListResponse>, IValidatableObject
+    public partial class RestApiArrayResultMenuElementListResponse :  IEquatable<RestApiArrayResultMenuElementListResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuElementListResponse" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuItemOptionSet.cs b/src/Flipdish/Model/RestApiArrayResultMenuItemOptionSet.cs
index 1998d75b..5e37cdb3 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuItemOptionSet.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuItemOptionSet.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuItemOptionSet :  IEquatable<RestApiArrayResultMenuItemOptionSet>, IValidatableObject
+    public partial class RestApiArrayResultMenuItemOptionSet :  IEquatable<RestApiArrayResultMenuItemOptionSet>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuItemOptionSet" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuItemOptionSetItem.cs b/src/Flipdish/Model/RestApiArrayResultMenuItemOptionSetItem.cs
index 1b079db0..6b5a205d 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuItemOptionSetItem.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuItemOptionSetItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuItemOptionSetItem :  IEquatable<RestApiArrayResultMenuItemOptionSetItem>, IValidatableObject
+    public partial class RestApiArrayResultMenuItemOptionSetItem :  IEquatable<RestApiArrayResultMenuItemOptionSetItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuItemOptionSetItem" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuSection.cs b/src/Flipdish/Model/RestApiArrayResultMenuSection.cs
index eeb5a250..b49b6b24 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuSection.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuSection.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuSection :  IEquatable<RestApiArrayResultMenuSection>, IValidatableObject
+    public partial class RestApiArrayResultMenuSection :  IEquatable<RestApiArrayResultMenuSection>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuSection" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuSectionItem.cs b/src/Flipdish/Model/RestApiArrayResultMenuSectionItem.cs
index fcb41282..8f1bbf4d 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuSectionItem.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuSectionItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuSectionItem :  IEquatable<RestApiArrayResultMenuSectionItem>, IValidatableObject
+    public partial class RestApiArrayResultMenuSectionItem :  IEquatable<RestApiArrayResultMenuSectionItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuSectionItem" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuStoreNames.cs b/src/Flipdish/Model/RestApiArrayResultMenuStoreNames.cs
index e61c8afb..389e00f3 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuStoreNames.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuStoreNames.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuStoreNames :  IEquatable<RestApiArrayResultMenuStoreNames>, IValidatableObject
+    public partial class RestApiArrayResultMenuStoreNames :  IEquatable<RestApiArrayResultMenuStoreNames>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuStoreNames" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuSummary.cs b/src/Flipdish/Model/RestApiArrayResultMenuSummary.cs
index cb36e8f9..ca55dff2 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuSummary.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuSummary :  IEquatable<RestApiArrayResultMenuSummary>, IValidatableObject
+    public partial class RestApiArrayResultMenuSummary :  IEquatable<RestApiArrayResultMenuSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuSummary" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuTaxDetails.cs b/src/Flipdish/Model/RestApiArrayResultMenuTaxDetails.cs
index 05f31048..4e1a0554 100644
--- a/src/Flipdish/Model/RestApiArrayResultMenuTaxDetails.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMenuTaxDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMenuTaxDetails :  IEquatable<RestApiArrayResultMenuTaxDetails>, IValidatableObject
+    public partial class RestApiArrayResultMenuTaxDetails :  IEquatable<RestApiArrayResultMenuTaxDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMenuTaxDetails" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMenuZone.cs b/src/Flipdish/Model/RestApiArrayResultMenuZone.cs
new file mode 100644
index 00000000..033d102f
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultMenuZone.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultMenuZone :  IEquatable<RestApiArrayResultMenuZone>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultMenuZone" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultMenuZone() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultMenuZone" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultMenuZone(List<MenuZone> data = default(List<MenuZone>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultMenuZone and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<MenuZone> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultMenuZone {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultMenuZone);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultMenuZone instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultMenuZone to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultMenuZone input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultMetadata.cs b/src/Flipdish/Model/RestApiArrayResultMetadata.cs
index a3f86bb2..39e79456 100644
--- a/src/Flipdish/Model/RestApiArrayResultMetadata.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMetadata.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMetadata :  IEquatable<RestApiArrayResultMetadata>, IValidatableObject
+    public partial class RestApiArrayResultMetadata :  IEquatable<RestApiArrayResultMetadata>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMetadata" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultMobileAppsStatistics.cs b/src/Flipdish/Model/RestApiArrayResultMobileAppsStatistics.cs
index 8c8ebed6..35cb2b29 100644
--- a/src/Flipdish/Model/RestApiArrayResultMobileAppsStatistics.cs
+++ b/src/Flipdish/Model/RestApiArrayResultMobileAppsStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultMobileAppsStatistics :  IEquatable<RestApiArrayResultMobileAppsStatistics>, IValidatableObject
+    public partial class RestApiArrayResultMobileAppsStatistics :  IEquatable<RestApiArrayResultMobileAppsStatistics>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultMobileAppsStatistics" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultOAuthApp.cs b/src/Flipdish/Model/RestApiArrayResultOAuthApp.cs
index a621bd88..760c0744 100644
--- a/src/Flipdish/Model/RestApiArrayResultOAuthApp.cs
+++ b/src/Flipdish/Model/RestApiArrayResultOAuthApp.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultOAuthApp :  IEquatable<RestApiArrayResultOAuthApp>, IValidatableObject
+    public partial class RestApiArrayResultOAuthApp :  IEquatable<RestApiArrayResultOAuthApp>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultOAuthApp" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultOauthClientRedirectUri.cs b/src/Flipdish/Model/RestApiArrayResultOauthClientRedirectUri.cs
index 2aa8bfb6..5d2984a9 100644
--- a/src/Flipdish/Model/RestApiArrayResultOauthClientRedirectUri.cs
+++ b/src/Flipdish/Model/RestApiArrayResultOauthClientRedirectUri.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultOauthClientRedirectUri :  IEquatable<RestApiArrayResultOauthClientRedirectUri>, IValidatableObject
+    public partial class RestApiArrayResultOauthClientRedirectUri :  IEquatable<RestApiArrayResultOauthClientRedirectUri>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultOauthClientRedirectUri" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultOrderBatch.cs b/src/Flipdish/Model/RestApiArrayResultOrderBatch.cs
new file mode 100644
index 00000000..bc560af2
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultOrderBatch.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultOrderBatch :  IEquatable<RestApiArrayResultOrderBatch>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultOrderBatch" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultOrderBatch() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultOrderBatch" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultOrderBatch(List<OrderBatch> data = default(List<OrderBatch>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultOrderBatch and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<OrderBatch> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultOrderBatch {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultOrderBatch);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultOrderBatch instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultOrderBatch to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultOrderBatch input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultOrderBatchItem.cs b/src/Flipdish/Model/RestApiArrayResultOrderBatchItem.cs
deleted file mode 100644
index b078a53a..00000000
--- a/src/Flipdish/Model/RestApiArrayResultOrderBatchItem.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultOrderBatchItem :  IEquatable<RestApiArrayResultOrderBatchItem>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultOrderBatchItem" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultOrderBatchItem() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultOrderBatchItem" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultOrderBatchItem(List<OrderBatchItem> data = default(List<OrderBatchItem>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultOrderBatchItem and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<OrderBatchItem> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultOrderBatchItem {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultOrderBatchItem);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultOrderBatchItem instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultOrderBatchItem to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultOrderBatchItem input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiArrayResultOrderFulfillmentStatus.cs b/src/Flipdish/Model/RestApiArrayResultOrderFulfillmentStatus.cs
index 9a1e4eed..4aaf7e34 100644
--- a/src/Flipdish/Model/RestApiArrayResultOrderFulfillmentStatus.cs
+++ b/src/Flipdish/Model/RestApiArrayResultOrderFulfillmentStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultOrderFulfillmentStatus :  IEquatable<RestApiArrayResultOrderFulfillmentStatus>, IValidatableObject
+    public partial class RestApiArrayResultOrderFulfillmentStatus :  IEquatable<RestApiArrayResultOrderFulfillmentStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultOrderFulfillmentStatus" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultPayoutSummary.cs b/src/Flipdish/Model/RestApiArrayResultPayoutSummary.cs
index a8e23864..0ba0ea7a 100644
--- a/src/Flipdish/Model/RestApiArrayResultPayoutSummary.cs
+++ b/src/Flipdish/Model/RestApiArrayResultPayoutSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultPayoutSummary :  IEquatable<RestApiArrayResultPayoutSummary>, IValidatableObject
+    public partial class RestApiArrayResultPayoutSummary :  IEquatable<RestApiArrayResultPayoutSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultPayoutSummary" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultPendingInvitation.cs b/src/Flipdish/Model/RestApiArrayResultPendingInvitation.cs
new file mode 100644
index 00000000..a3ec79e0
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultPendingInvitation.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultPendingInvitation :  IEquatable<RestApiArrayResultPendingInvitation>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultPendingInvitation" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultPendingInvitation() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultPendingInvitation" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultPendingInvitation(List<PendingInvitation> data = default(List<PendingInvitation>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultPendingInvitation and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<PendingInvitation> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultPendingInvitation {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultPendingInvitation);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultPendingInvitation instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultPendingInvitation to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultPendingInvitation input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultPendingMenuChangesSummaries.cs b/src/Flipdish/Model/RestApiArrayResultPendingMenuChangesSummaries.cs
index 6008db1d..2bbaa0a7 100644
--- a/src/Flipdish/Model/RestApiArrayResultPendingMenuChangesSummaries.cs
+++ b/src/Flipdish/Model/RestApiArrayResultPendingMenuChangesSummaries.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultPendingMenuChangesSummaries :  IEquatable<RestApiArrayResultPendingMenuChangesSummaries>, IValidatableObject
+    public partial class RestApiArrayResultPendingMenuChangesSummaries :  IEquatable<RestApiArrayResultPendingMenuChangesSummaries>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultPendingMenuChangesSummaries" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultPreOrderTime.cs b/src/Flipdish/Model/RestApiArrayResultPreOrderTime.cs
index 2736d03a..cc461d90 100644
--- a/src/Flipdish/Model/RestApiArrayResultPreOrderTime.cs
+++ b/src/Flipdish/Model/RestApiArrayResultPreOrderTime.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultPreOrderTime :  IEquatable<RestApiArrayResultPreOrderTime>, IValidatableObject
+    public partial class RestApiArrayResultPreOrderTime :  IEquatable<RestApiArrayResultPreOrderTime>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultPreOrderTime" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultProcessingFeeConfig.cs b/src/Flipdish/Model/RestApiArrayResultProcessingFeeConfig.cs
index 05823822..8aece1fc 100644
--- a/src/Flipdish/Model/RestApiArrayResultProcessingFeeConfig.cs
+++ b/src/Flipdish/Model/RestApiArrayResultProcessingFeeConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultProcessingFeeConfig :  IEquatable<RestApiArrayResultProcessingFeeConfig>, IValidatableObject
+    public partial class RestApiArrayResultProcessingFeeConfig :  IEquatable<RestApiArrayResultProcessingFeeConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultProcessingFeeConfig" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultRedeemInvitationResult.cs b/src/Flipdish/Model/RestApiArrayResultRedeemInvitationResult.cs
new file mode 100644
index 00000000..ab60f2cb
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultRedeemInvitationResult.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultRedeemInvitationResult :  IEquatable<RestApiArrayResultRedeemInvitationResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultRedeemInvitationResult" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultRedeemInvitationResult() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultRedeemInvitationResult" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultRedeemInvitationResult(List<RedeemInvitationResult> data = default(List<RedeemInvitationResult>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultRedeemInvitationResult and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<RedeemInvitationResult> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultRedeemInvitationResult {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultRedeemInvitationResult);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultRedeemInvitationResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultRedeemInvitationResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultRedeemInvitationResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultRestApiDefaultResponse.cs b/src/Flipdish/Model/RestApiArrayResultRestApiDefaultResponse.cs
index b22a82f0..01f7d6d5 100644
--- a/src/Flipdish/Model/RestApiArrayResultRestApiDefaultResponse.cs
+++ b/src/Flipdish/Model/RestApiArrayResultRestApiDefaultResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultRestApiDefaultResponse :  IEquatable<RestApiArrayResultRestApiDefaultResponse>, IValidatableObject
+    public partial class RestApiArrayResultRestApiDefaultResponse :  IEquatable<RestApiArrayResultRestApiDefaultResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultRestApiDefaultResponse" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherEligibleStore.cs b/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherEligibleStore.cs
index ff3e4b87..0266ae57 100644
--- a/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherEligibleStore.cs
+++ b/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherEligibleStore.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultRestaurantVoucherEligibleStore :  IEquatable<RestApiArrayResultRestaurantVoucherEligibleStore>, IValidatableObject
+    public partial class RestApiArrayResultRestaurantVoucherEligibleStore :  IEquatable<RestApiArrayResultRestaurantVoucherEligibleStore>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultRestaurantVoucherEligibleStore" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherPayGreenConfiguration.cs b/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherPayGreenConfiguration.cs
new file mode 100644
index 00000000..00a57d37
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherPayGreenConfiguration.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultRestaurantVoucherPayGreenConfiguration :  IEquatable<RestApiArrayResultRestaurantVoucherPayGreenConfiguration>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultRestaurantVoucherPayGreenConfiguration" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultRestaurantVoucherPayGreenConfiguration() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultRestaurantVoucherPayGreenConfiguration" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultRestaurantVoucherPayGreenConfiguration(List<RestaurantVoucherPayGreenConfiguration> data = default(List<RestaurantVoucherPayGreenConfiguration>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultRestaurantVoucherPayGreenConfiguration and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<RestaurantVoucherPayGreenConfiguration> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultRestaurantVoucherPayGreenConfiguration {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultRestaurantVoucherPayGreenConfiguration);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultRestaurantVoucherPayGreenConfiguration instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultRestaurantVoucherPayGreenConfiguration to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultRestaurantVoucherPayGreenConfiguration input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary.cs b/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary.cs
new file mode 100644
index 00000000..78461156
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary :  IEquatable<RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary(List<RestaurantVoucherPayGreenConfigurationSummary> data = default(List<RestaurantVoucherPayGreenConfigurationSummary>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<RestaurantVoucherPayGreenConfigurationSummary> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultRestaurantVoucherPayGreenConfigurationSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultRetentionCampaign.cs b/src/Flipdish/Model/RestApiArrayResultRetentionCampaign.cs
index 53774c0d..b8c3f123 100644
--- a/src/Flipdish/Model/RestApiArrayResultRetentionCampaign.cs
+++ b/src/Flipdish/Model/RestApiArrayResultRetentionCampaign.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultRetentionCampaign :  IEquatable<RestApiArrayResultRetentionCampaign>, IValidatableObject
+    public partial class RestApiArrayResultRetentionCampaign :  IEquatable<RestApiArrayResultRetentionCampaign>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultRetentionCampaign" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultSmsProviderCredential.cs b/src/Flipdish/Model/RestApiArrayResultSmsProviderCredential.cs
new file mode 100644
index 00000000..60fba7a9
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultSmsProviderCredential.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultSmsProviderCredential :  IEquatable<RestApiArrayResultSmsProviderCredential>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultSmsProviderCredential" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultSmsProviderCredential() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultSmsProviderCredential" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultSmsProviderCredential(List<SmsProviderCredential> data = default(List<SmsProviderCredential>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultSmsProviderCredential and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<SmsProviderCredential> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultSmsProviderCredential {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultSmsProviderCredential);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultSmsProviderCredential instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultSmsProviderCredential to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultSmsProviderCredential input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultStoreChannelAssignment.cs b/src/Flipdish/Model/RestApiArrayResultStoreChannelAssignment.cs
index 00a6f88b..9a23a7be 100644
--- a/src/Flipdish/Model/RestApiArrayResultStoreChannelAssignment.cs
+++ b/src/Flipdish/Model/RestApiArrayResultStoreChannelAssignment.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultStoreChannelAssignment :  IEquatable<RestApiArrayResultStoreChannelAssignment>, IValidatableObject
+    public partial class RestApiArrayResultStoreChannelAssignment :  IEquatable<RestApiArrayResultStoreChannelAssignment>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultStoreChannelAssignment" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultStoreChannelStoreMapping.cs b/src/Flipdish/Model/RestApiArrayResultStoreChannelStoreMapping.cs
deleted file mode 100644
index f56d905f..00000000
--- a/src/Flipdish/Model/RestApiArrayResultStoreChannelStoreMapping.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultStoreChannelStoreMapping :  IEquatable<RestApiArrayResultStoreChannelStoreMapping>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultStoreChannelStoreMapping" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultStoreChannelStoreMapping() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultStoreChannelStoreMapping" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultStoreChannelStoreMapping(List<StoreChannelStoreMapping> data = default(List<StoreChannelStoreMapping>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultStoreChannelStoreMapping and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<StoreChannelStoreMapping> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultStoreChannelStoreMapping {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultStoreChannelStoreMapping);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultStoreChannelStoreMapping instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultStoreChannelStoreMapping to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultStoreChannelStoreMapping input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiArrayResultStoreDeliveryZoneFeeConfig.cs b/src/Flipdish/Model/RestApiArrayResultStoreDeliveryZoneFeeConfig.cs
new file mode 100644
index 00000000..f4c7ef44
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultStoreDeliveryZoneFeeConfig.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultStoreDeliveryZoneFeeConfig :  IEquatable<RestApiArrayResultStoreDeliveryZoneFeeConfig>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultStoreDeliveryZoneFeeConfig" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultStoreDeliveryZoneFeeConfig() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultStoreDeliveryZoneFeeConfig" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultStoreDeliveryZoneFeeConfig(List<StoreDeliveryZoneFeeConfig> data = default(List<StoreDeliveryZoneFeeConfig>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultStoreDeliveryZoneFeeConfig and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<StoreDeliveryZoneFeeConfig> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultStoreDeliveryZoneFeeConfig {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultStoreDeliveryZoneFeeConfig);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultStoreDeliveryZoneFeeConfig instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultStoreDeliveryZoneFeeConfig to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultStoreDeliveryZoneFeeConfig input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultStoreListItem.cs b/src/Flipdish/Model/RestApiArrayResultStoreListItem.cs
index ae1912d1..552a1ec4 100644
--- a/src/Flipdish/Model/RestApiArrayResultStoreListItem.cs
+++ b/src/Flipdish/Model/RestApiArrayResultStoreListItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultStoreListItem :  IEquatable<RestApiArrayResultStoreListItem>, IValidatableObject
+    public partial class RestApiArrayResultStoreListItem :  IEquatable<RestApiArrayResultStoreListItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultStoreListItem" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultStoreStatistics.cs b/src/Flipdish/Model/RestApiArrayResultStoreStatistics.cs
index 3dd02e84..f04dc083 100644
--- a/src/Flipdish/Model/RestApiArrayResultStoreStatistics.cs
+++ b/src/Flipdish/Model/RestApiArrayResultStoreStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultStoreStatistics :  IEquatable<RestApiArrayResultStoreStatistics>, IValidatableObject
+    public partial class RestApiArrayResultStoreStatistics :  IEquatable<RestApiArrayResultStoreStatistics>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultStoreStatistics" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultStripeCustomConnectedAccount.cs b/src/Flipdish/Model/RestApiArrayResultStripeCustomConnectedAccount.cs
new file mode 100644
index 00000000..85632952
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultStripeCustomConnectedAccount.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultStripeCustomConnectedAccount :  IEquatable<RestApiArrayResultStripeCustomConnectedAccount>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultStripeCustomConnectedAccount" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultStripeCustomConnectedAccount() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultStripeCustomConnectedAccount" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultStripeCustomConnectedAccount(List<StripeCustomConnectedAccount> data = default(List<StripeCustomConnectedAccount>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultStripeCustomConnectedAccount and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<StripeCustomConnectedAccount> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultStripeCustomConnectedAccount {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultStripeCustomConnectedAccount);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultStripeCustomConnectedAccount instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultStripeCustomConnectedAccount to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultStripeCustomConnectedAccount input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultSubscriptionSummary.cs b/src/Flipdish/Model/RestApiArrayResultSubscriptionSummary.cs
new file mode 100644
index 00000000..0429f1d8
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultSubscriptionSummary.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultSubscriptionSummary :  IEquatable<RestApiArrayResultSubscriptionSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultSubscriptionSummary" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultSubscriptionSummary() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultSubscriptionSummary" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultSubscriptionSummary(List<SubscriptionSummary> data = default(List<SubscriptionSummary>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultSubscriptionSummary and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<SubscriptionSummary> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultSubscriptionSummary {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultSubscriptionSummary);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultSubscriptionSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultSubscriptionSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultSubscriptionSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultSupportedCountry.cs b/src/Flipdish/Model/RestApiArrayResultSupportedCountry.cs
index e69f8798..a6a4374a 100644
--- a/src/Flipdish/Model/RestApiArrayResultSupportedCountry.cs
+++ b/src/Flipdish/Model/RestApiArrayResultSupportedCountry.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultSupportedCountry :  IEquatable<RestApiArrayResultSupportedCountry>, IValidatableObject
+    public partial class RestApiArrayResultSupportedCountry :  IEquatable<RestApiArrayResultSupportedCountry>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultSupportedCountry" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultTeammate.cs b/src/Flipdish/Model/RestApiArrayResultTeammate.cs
index 320c9700..676e720f 100644
--- a/src/Flipdish/Model/RestApiArrayResultTeammate.cs
+++ b/src/Flipdish/Model/RestApiArrayResultTeammate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultTeammate :  IEquatable<RestApiArrayResultTeammate>, IValidatableObject
+    public partial class RestApiArrayResultTeammate :  IEquatable<RestApiArrayResultTeammate>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultTeammate" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultUserDeliveryLocationAdmin.cs b/src/Flipdish/Model/RestApiArrayResultUserDeliveryLocationAdmin.cs
new file mode 100644
index 00000000..48db143f
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultUserDeliveryLocationAdmin.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultUserDeliveryLocationAdmin :  IEquatable<RestApiArrayResultUserDeliveryLocationAdmin>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserDeliveryLocationAdmin" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultUserDeliveryLocationAdmin() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserDeliveryLocationAdmin" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultUserDeliveryLocationAdmin(List<UserDeliveryLocationAdmin> data = default(List<UserDeliveryLocationAdmin>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultUserDeliveryLocationAdmin and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<UserDeliveryLocationAdmin> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultUserDeliveryLocationAdmin {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultUserDeliveryLocationAdmin);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultUserDeliveryLocationAdmin instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultUserDeliveryLocationAdmin to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultUserDeliveryLocationAdmin input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultUserFlipdishAccount.cs b/src/Flipdish/Model/RestApiArrayResultUserFlipdishAccount.cs
new file mode 100644
index 00000000..39f1db92
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultUserFlipdishAccount.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultUserFlipdishAccount :  IEquatable<RestApiArrayResultUserFlipdishAccount>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserFlipdishAccount" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultUserFlipdishAccount() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserFlipdishAccount" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultUserFlipdishAccount(List<UserFlipdishAccount> data = default(List<UserFlipdishAccount>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultUserFlipdishAccount and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<UserFlipdishAccount> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultUserFlipdishAccount {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultUserFlipdishAccount);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultUserFlipdishAccount instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultUserFlipdishAccount to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultUserFlipdishAccount input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultUserNote.cs b/src/Flipdish/Model/RestApiArrayResultUserNote.cs
new file mode 100644
index 00000000..3fe3ac3d
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultUserNote.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultUserNote :  IEquatable<RestApiArrayResultUserNote>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserNote" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultUserNote() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserNote" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultUserNote(List<UserNote> data = default(List<UserNote>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultUserNote and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<UserNote> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultUserNote {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultUserNote);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultUserNote instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultUserNote to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultUserNote input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultUserOrderSummary.cs b/src/Flipdish/Model/RestApiArrayResultUserOrderSummary.cs
new file mode 100644
index 00000000..803331ed
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultUserOrderSummary.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultUserOrderSummary :  IEquatable<RestApiArrayResultUserOrderSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserOrderSummary" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultUserOrderSummary() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserOrderSummary" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultUserOrderSummary(List<UserOrderSummary> data = default(List<UserOrderSummary>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultUserOrderSummary and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<UserOrderSummary> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultUserOrderSummary {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultUserOrderSummary);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultUserOrderSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultUserOrderSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultUserOrderSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultUserSmsChatItem.cs b/src/Flipdish/Model/RestApiArrayResultUserSmsChatItem.cs
new file mode 100644
index 00000000..23c2db7c
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultUserSmsChatItem.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultUserSmsChatItem :  IEquatable<RestApiArrayResultUserSmsChatItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserSmsChatItem" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultUserSmsChatItem() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserSmsChatItem" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultUserSmsChatItem(List<UserSmsChatItem> data = default(List<UserSmsChatItem>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultUserSmsChatItem and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<UserSmsChatItem> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultUserSmsChatItem {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultUserSmsChatItem);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultUserSmsChatItem instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultUserSmsChatItem to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultUserSmsChatItem input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultUserStoreInfo.cs b/src/Flipdish/Model/RestApiArrayResultUserStoreInfo.cs
new file mode 100644
index 00000000..7492ea54
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultUserStoreInfo.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultUserStoreInfo :  IEquatable<RestApiArrayResultUserStoreInfo>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserStoreInfo" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultUserStoreInfo() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultUserStoreInfo" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultUserStoreInfo(List<UserStoreInfo> data = default(List<UserStoreInfo>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultUserStoreInfo and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<UserStoreInfo> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultUserStoreInfo {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultUserStoreInfo);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultUserStoreInfo instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultUserStoreInfo to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultUserStoreInfo input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultVoucherDataPoint.cs b/src/Flipdish/Model/RestApiArrayResultVoucherDataPoint.cs
index c7468f42..19b88b6a 100644
--- a/src/Flipdish/Model/RestApiArrayResultVoucherDataPoint.cs
+++ b/src/Flipdish/Model/RestApiArrayResultVoucherDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api array result
     /// </summary>
     [DataContract]
-    public partial class RestApiArrayResultVoucherDataPoint :  IEquatable<RestApiArrayResultVoucherDataPoint>, IValidatableObject
+    public partial class RestApiArrayResultVoucherDataPoint :  IEquatable<RestApiArrayResultVoucherDataPoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiArrayResultVoucherDataPoint" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiArrayResultVoucherSummary.cs b/src/Flipdish/Model/RestApiArrayResultVoucherSummary.cs
new file mode 100644
index 00000000..66807fde
--- /dev/null
+++ b/src/Flipdish/Model/RestApiArrayResultVoucherSummary.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api array result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiArrayResultVoucherSummary :  IEquatable<RestApiArrayResultVoucherSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultVoucherSummary" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiArrayResultVoucherSummary() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiArrayResultVoucherSummary" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiArrayResultVoucherSummary(List<VoucherSummary> data = default(List<VoucherSummary>))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiArrayResultVoucherSummary and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<VoucherSummary> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiArrayResultVoucherSummary {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiArrayResultVoucherSummary);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiArrayResultVoucherSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiArrayResultVoucherSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiArrayResultVoucherSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiArrayResultWebhookSubscription.cs b/src/Flipdish/Model/RestApiArrayResultWebhookSubscription.cs
deleted file mode 100644
index cd33821f..00000000
--- a/src/Flipdish/Model/RestApiArrayResultWebhookSubscription.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api array result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiArrayResultWebhookSubscription :  IEquatable<RestApiArrayResultWebhookSubscription>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultWebhookSubscription" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiArrayResultWebhookSubscription() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiArrayResultWebhookSubscription" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiArrayResultWebhookSubscription(List<WebhookSubscription> data = default(List<WebhookSubscription>))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiArrayResultWebhookSubscription and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<WebhookSubscription> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiArrayResultWebhookSubscription {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiArrayResultWebhookSubscription);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiArrayResultWebhookSubscription instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiArrayResultWebhookSubscription to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiArrayResultWebhookSubscription input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiDefaultResponse.cs b/src/Flipdish/Model/RestApiDefaultResponse.cs
index e473efd4..598f0125 100644
--- a/src/Flipdish/Model/RestApiDefaultResponse.cs
+++ b/src/Flipdish/Model/RestApiDefaultResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api default response
     /// </summary>
     [DataContract]
-    public partial class RestApiDefaultResponse :  IEquatable<RestApiDefaultResponse>, IValidatableObject
+    public partial class RestApiDefaultResponse :  IEquatable<RestApiDefaultResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiDefaultResponse" /> class.
@@ -109,16 +107,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiErrorResult.cs b/src/Flipdish/Model/RestApiErrorResult.cs
index 32ff3ab4..4f47bf76 100644
--- a/src/Flipdish/Model/RestApiErrorResult.cs
+++ b/src/Flipdish/Model/RestApiErrorResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api error result
     /// </summary>
     [DataContract]
-    public partial class RestApiErrorResult :  IEquatable<RestApiErrorResult>, IValidatableObject
+    public partial class RestApiErrorResult :  IEquatable<RestApiErrorResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiErrorResult" /> class.
@@ -174,16 +172,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiEventSearchPaginationResult.cs b/src/Flipdish/Model/RestApiEventSearchPaginationResult.cs
index 56248b86..e325796e 100644
--- a/src/Flipdish/Model/RestApiEventSearchPaginationResult.cs
+++ b/src/Flipdish/Model/RestApiEventSearchPaginationResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// RestApiEventSearchPaginationResult
     /// </summary>
     [DataContract]
-    public partial class RestApiEventSearchPaginationResult :  IEquatable<RestApiEventSearchPaginationResult>, IValidatableObject
+    public partial class RestApiEventSearchPaginationResult :  IEquatable<RestApiEventSearchPaginationResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiEventSearchPaginationResult" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiFinanceSearchPaginationResultInvoice.cs b/src/Flipdish/Model/RestApiFinanceSearchPaginationResultInvoice.cs
new file mode 100644
index 00000000..9e112709
--- /dev/null
+++ b/src/Flipdish/Model/RestApiFinanceSearchPaginationResultInvoice.cs
@@ -0,0 +1,201 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api finance search pagination result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiFinanceSearchPaginationResultInvoice :  IEquatable<RestApiFinanceSearchPaginationResultInvoice>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiFinanceSearchPaginationResultInvoice" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiFinanceSearchPaginationResultInvoice() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiFinanceSearchPaginationResultInvoice" /> class.
+        /// </summary>
+        /// <param name="nextPage">Next page (required).</param>
+        /// <param name="limit">Current page size (required).</param>
+        /// <param name="totalRecordCount">Total record count (required).</param>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiFinanceSearchPaginationResultInvoice(string nextPage = default(string), int? limit = default(int?), int? totalRecordCount = default(int?), List<Invoice> data = default(List<Invoice>))
+        {
+            // to ensure "nextPage" is required (not null)
+            if (nextPage == null)
+            {
+                throw new InvalidDataException("nextPage is a required property for RestApiFinanceSearchPaginationResultInvoice and cannot be null");
+            }
+            else
+            {
+                this.NextPage = nextPage;
+            }
+            // to ensure "limit" is required (not null)
+            if (limit == null)
+            {
+                throw new InvalidDataException("limit is a required property for RestApiFinanceSearchPaginationResultInvoice and cannot be null");
+            }
+            else
+            {
+                this.Limit = limit;
+            }
+            // to ensure "totalRecordCount" is required (not null)
+            if (totalRecordCount == null)
+            {
+                throw new InvalidDataException("totalRecordCount is a required property for RestApiFinanceSearchPaginationResultInvoice and cannot be null");
+            }
+            else
+            {
+                this.TotalRecordCount = totalRecordCount;
+            }
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiFinanceSearchPaginationResultInvoice and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Next page
+        /// </summary>
+        /// <value>Next page</value>
+        [DataMember(Name="NextPage", EmitDefaultValue=false)]
+        public string NextPage { get; set; }
+
+        /// <summary>
+        /// Current page size
+        /// </summary>
+        /// <value>Current page size</value>
+        [DataMember(Name="Limit", EmitDefaultValue=false)]
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Total record count
+        /// </summary>
+        /// <value>Total record count</value>
+        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
+        public int? TotalRecordCount { get; set; }
+
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<Invoice> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiFinanceSearchPaginationResultInvoice {\n");
+            sb.Append("  NextPage: ").Append(NextPage).Append("\n");
+            sb.Append("  Limit: ").Append(Limit).Append("\n");
+            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiFinanceSearchPaginationResultInvoice);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiFinanceSearchPaginationResultInvoice instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiFinanceSearchPaginationResultInvoice to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiFinanceSearchPaginationResultInvoice input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.NextPage == input.NextPage ||
+                    (this.NextPage != null &&
+                    this.NextPage.Equals(input.NextPage))
+                ) && 
+                (
+                    this.Limit == input.Limit ||
+                    (this.Limit != null &&
+                    this.Limit.Equals(input.Limit))
+                ) && 
+                (
+                    this.TotalRecordCount == input.TotalRecordCount ||
+                    (this.TotalRecordCount != null &&
+                    this.TotalRecordCount.Equals(input.TotalRecordCount))
+                ) && 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.NextPage != null)
+                    hashCode = hashCode * 59 + this.NextPage.GetHashCode();
+                if (this.Limit != null)
+                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
+                if (this.TotalRecordCount != null)
+                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiFinanceSearchPaginationResultSubscriptionInvoice.cs b/src/Flipdish/Model/RestApiFinanceSearchPaginationResultSubscriptionInvoice.cs
new file mode 100644
index 00000000..dbd6516e
--- /dev/null
+++ b/src/Flipdish/Model/RestApiFinanceSearchPaginationResultSubscriptionInvoice.cs
@@ -0,0 +1,201 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api finance search pagination result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiFinanceSearchPaginationResultSubscriptionInvoice :  IEquatable<RestApiFinanceSearchPaginationResultSubscriptionInvoice>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiFinanceSearchPaginationResultSubscriptionInvoice" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiFinanceSearchPaginationResultSubscriptionInvoice() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiFinanceSearchPaginationResultSubscriptionInvoice" /> class.
+        /// </summary>
+        /// <param name="nextPage">Next page (required).</param>
+        /// <param name="limit">Current page size (required).</param>
+        /// <param name="totalRecordCount">Total record count (required).</param>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiFinanceSearchPaginationResultSubscriptionInvoice(string nextPage = default(string), int? limit = default(int?), int? totalRecordCount = default(int?), List<SubscriptionInvoice> data = default(List<SubscriptionInvoice>))
+        {
+            // to ensure "nextPage" is required (not null)
+            if (nextPage == null)
+            {
+                throw new InvalidDataException("nextPage is a required property for RestApiFinanceSearchPaginationResultSubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.NextPage = nextPage;
+            }
+            // to ensure "limit" is required (not null)
+            if (limit == null)
+            {
+                throw new InvalidDataException("limit is a required property for RestApiFinanceSearchPaginationResultSubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.Limit = limit;
+            }
+            // to ensure "totalRecordCount" is required (not null)
+            if (totalRecordCount == null)
+            {
+                throw new InvalidDataException("totalRecordCount is a required property for RestApiFinanceSearchPaginationResultSubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.TotalRecordCount = totalRecordCount;
+            }
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiFinanceSearchPaginationResultSubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Next page
+        /// </summary>
+        /// <value>Next page</value>
+        [DataMember(Name="NextPage", EmitDefaultValue=false)]
+        public string NextPage { get; set; }
+
+        /// <summary>
+        /// Current page size
+        /// </summary>
+        /// <value>Current page size</value>
+        [DataMember(Name="Limit", EmitDefaultValue=false)]
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Total record count
+        /// </summary>
+        /// <value>Total record count</value>
+        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
+        public int? TotalRecordCount { get; set; }
+
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<SubscriptionInvoice> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiFinanceSearchPaginationResultSubscriptionInvoice {\n");
+            sb.Append("  NextPage: ").Append(NextPage).Append("\n");
+            sb.Append("  Limit: ").Append(Limit).Append("\n");
+            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiFinanceSearchPaginationResultSubscriptionInvoice);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiFinanceSearchPaginationResultSubscriptionInvoice instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiFinanceSearchPaginationResultSubscriptionInvoice to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiFinanceSearchPaginationResultSubscriptionInvoice input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.NextPage == input.NextPage ||
+                    (this.NextPage != null &&
+                    this.NextPage.Equals(input.NextPage))
+                ) && 
+                (
+                    this.Limit == input.Limit ||
+                    (this.Limit != null &&
+                    this.Limit.Equals(input.Limit))
+                ) && 
+                (
+                    this.TotalRecordCount == input.TotalRecordCount ||
+                    (this.TotalRecordCount != null &&
+                    this.TotalRecordCount.Equals(input.TotalRecordCount))
+                ) && 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.NextPage != null)
+                    hashCode = hashCode * 59 + this.NextPage.GetHashCode();
+                if (this.Limit != null)
+                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
+                if (this.TotalRecordCount != null)
+                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiForbiddenResult.cs b/src/Flipdish/Model/RestApiForbiddenResult.cs
index 61087216..b4a9b00b 100644
--- a/src/Flipdish/Model/RestApiForbiddenResult.cs
+++ b/src/Flipdish/Model/RestApiForbiddenResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest Api Forbidden Result
     /// </summary>
     [DataContract]
-    public partial class RestApiForbiddenResult :  IEquatable<RestApiForbiddenResult>, IValidatableObject
+    public partial class RestApiForbiddenResult :  IEquatable<RestApiForbiddenResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiForbiddenResult" /> class.
@@ -109,16 +107,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiIntegerResult.cs b/src/Flipdish/Model/RestApiIntegerResult.cs
index 24d7b5a9..757d06a8 100644
--- a/src/Flipdish/Model/RestApiIntegerResult.cs
+++ b/src/Flipdish/Model/RestApiIntegerResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api integer result
     /// </summary>
     [DataContract]
-    public partial class RestApiIntegerResult :  IEquatable<RestApiIntegerResult>, IValidatableObject
+    public partial class RestApiIntegerResult :  IEquatable<RestApiIntegerResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiIntegerResult" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultApp.cs b/src/Flipdish/Model/RestApiPaginationResultApp.cs
index f27d491c..c5a44977 100644
--- a/src/Flipdish/Model/RestApiPaginationResultApp.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultApp.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultApp :  IEquatable<RestApiPaginationResultApp>, IValidatableObject
+    public partial class RestApiPaginationResultApp :  IEquatable<RestApiPaginationResultApp>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultApp" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultAppStoreAppSummary.cs b/src/Flipdish/Model/RestApiPaginationResultAppStoreAppSummary.cs
index e4e8be64..5bfee755 100644
--- a/src/Flipdish/Model/RestApiPaginationResultAppStoreAppSummary.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultAppStoreAppSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultAppStoreAppSummary :  IEquatable<RestApiPaginationResultAppStoreAppSummary>, IValidatableObject
+    public partial class RestApiPaginationResultAppStoreAppSummary :  IEquatable<RestApiPaginationResultAppStoreAppSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultAppStoreAppSummary" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultAppSummary.cs b/src/Flipdish/Model/RestApiPaginationResultAppSummary.cs
deleted file mode 100644
index 90588ec7..00000000
--- a/src/Flipdish/Model/RestApiPaginationResultAppSummary.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api pagination result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiPaginationResultAppSummary :  IEquatable<RestApiPaginationResultAppSummary>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultAppSummary" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiPaginationResultAppSummary() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultAppSummary" /> class.
-        /// </summary>
-        /// <param name="page">Current page index (required).</param>
-        /// <param name="limit">Current page size (required).</param>
-        /// <param name="totalRecordCount">Total record count (required).</param>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiPaginationResultAppSummary(int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?), List<AppSummary> data = default(List<AppSummary>))
-        {
-            // to ensure "page" is required (not null)
-            if (page == null)
-            {
-                throw new InvalidDataException("page is a required property for RestApiPaginationResultAppSummary and cannot be null");
-            }
-            else
-            {
-                this.Page = page;
-            }
-            // to ensure "limit" is required (not null)
-            if (limit == null)
-            {
-                throw new InvalidDataException("limit is a required property for RestApiPaginationResultAppSummary and cannot be null");
-            }
-            else
-            {
-                this.Limit = limit;
-            }
-            // to ensure "totalRecordCount" is required (not null)
-            if (totalRecordCount == null)
-            {
-                throw new InvalidDataException("totalRecordCount is a required property for RestApiPaginationResultAppSummary and cannot be null");
-            }
-            else
-            {
-                this.TotalRecordCount = totalRecordCount;
-            }
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiPaginationResultAppSummary and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Current page index
-        /// </summary>
-        /// <value>Current page index</value>
-        [DataMember(Name="Page", EmitDefaultValue=false)]
-        public int? Page { get; set; }
-
-        /// <summary>
-        /// Current page size
-        /// </summary>
-        /// <value>Current page size</value>
-        [DataMember(Name="Limit", EmitDefaultValue=false)]
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Total record count
-        /// </summary>
-        /// <value>Total record count</value>
-        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
-        public int? TotalRecordCount { get; set; }
-
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<AppSummary> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiPaginationResultAppSummary {\n");
-            sb.Append("  Page: ").Append(Page).Append("\n");
-            sb.Append("  Limit: ").Append(Limit).Append("\n");
-            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiPaginationResultAppSummary);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiPaginationResultAppSummary instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiPaginationResultAppSummary to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiPaginationResultAppSummary input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Page == input.Page ||
-                    (this.Page != null &&
-                    this.Page.Equals(input.Page))
-                ) && 
-                (
-                    this.Limit == input.Limit ||
-                    (this.Limit != null &&
-                    this.Limit.Equals(input.Limit))
-                ) && 
-                (
-                    this.TotalRecordCount == input.TotalRecordCount ||
-                    (this.TotalRecordCount != null &&
-                    this.TotalRecordCount.Equals(input.TotalRecordCount))
-                ) && 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Page != null)
-                    hashCode = hashCode * 59 + this.Page.GetHashCode();
-                if (this.Limit != null)
-                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
-                if (this.TotalRecordCount != null)
-                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiPaginationResultBusinessHoursOverride.cs b/src/Flipdish/Model/RestApiPaginationResultBusinessHoursOverride.cs
index a4c00fad..bf6e6e0c 100644
--- a/src/Flipdish/Model/RestApiPaginationResultBusinessHoursOverride.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultBusinessHoursOverride.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultBusinessHoursOverride :  IEquatable<RestApiPaginationResultBusinessHoursOverride>, IValidatableObject
+    public partial class RestApiPaginationResultBusinessHoursOverride :  IEquatable<RestApiPaginationResultBusinessHoursOverride>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultBusinessHoursOverride" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultCatalogGroup.cs b/src/Flipdish/Model/RestApiPaginationResultCatalogGroup.cs
deleted file mode 100644
index da25faee..00000000
--- a/src/Flipdish/Model/RestApiPaginationResultCatalogGroup.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api pagination result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiPaginationResultCatalogGroup :  IEquatable<RestApiPaginationResultCatalogGroup>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultCatalogGroup" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiPaginationResultCatalogGroup() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultCatalogGroup" /> class.
-        /// </summary>
-        /// <param name="page">Current page index (required).</param>
-        /// <param name="limit">Current page size (required).</param>
-        /// <param name="totalRecordCount">Total record count (required).</param>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiPaginationResultCatalogGroup(int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?), List<CatalogGroup> data = default(List<CatalogGroup>))
-        {
-            // to ensure "page" is required (not null)
-            if (page == null)
-            {
-                throw new InvalidDataException("page is a required property for RestApiPaginationResultCatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.Page = page;
-            }
-            // to ensure "limit" is required (not null)
-            if (limit == null)
-            {
-                throw new InvalidDataException("limit is a required property for RestApiPaginationResultCatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.Limit = limit;
-            }
-            // to ensure "totalRecordCount" is required (not null)
-            if (totalRecordCount == null)
-            {
-                throw new InvalidDataException("totalRecordCount is a required property for RestApiPaginationResultCatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.TotalRecordCount = totalRecordCount;
-            }
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiPaginationResultCatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Current page index
-        /// </summary>
-        /// <value>Current page index</value>
-        [DataMember(Name="Page", EmitDefaultValue=false)]
-        public int? Page { get; set; }
-
-        /// <summary>
-        /// Current page size
-        /// </summary>
-        /// <value>Current page size</value>
-        [DataMember(Name="Limit", EmitDefaultValue=false)]
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Total record count
-        /// </summary>
-        /// <value>Total record count</value>
-        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
-        public int? TotalRecordCount { get; set; }
-
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<CatalogGroup> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiPaginationResultCatalogGroup {\n");
-            sb.Append("  Page: ").Append(Page).Append("\n");
-            sb.Append("  Limit: ").Append(Limit).Append("\n");
-            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiPaginationResultCatalogGroup);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiPaginationResultCatalogGroup instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiPaginationResultCatalogGroup to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiPaginationResultCatalogGroup input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Page == input.Page ||
-                    (this.Page != null &&
-                    this.Page.Equals(input.Page))
-                ) && 
-                (
-                    this.Limit == input.Limit ||
-                    (this.Limit != null &&
-                    this.Limit.Equals(input.Limit))
-                ) && 
-                (
-                    this.TotalRecordCount == input.TotalRecordCount ||
-                    (this.TotalRecordCount != null &&
-                    this.TotalRecordCount.Equals(input.TotalRecordCount))
-                ) && 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Page != null)
-                    hashCode = hashCode * 59 + this.Page.GetHashCode();
-                if (this.Limit != null)
-                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
-                if (this.TotalRecordCount != null)
-                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiPaginationResultCatalogItem.cs b/src/Flipdish/Model/RestApiPaginationResultCatalogItem.cs
index 1de2eef3..00aa83f9 100644
--- a/src/Flipdish/Model/RestApiPaginationResultCatalogItem.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultCatalogItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultCatalogItem :  IEquatable<RestApiPaginationResultCatalogItem>, IValidatableObject
+    public partial class RestApiPaginationResultCatalogItem :  IEquatable<RestApiPaginationResultCatalogItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultCatalogItem" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultChannel.cs b/src/Flipdish/Model/RestApiPaginationResultChannel.cs
deleted file mode 100644
index 8e21aaf4..00000000
--- a/src/Flipdish/Model/RestApiPaginationResultChannel.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api pagination result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiPaginationResultChannel :  IEquatable<RestApiPaginationResultChannel>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultChannel" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiPaginationResultChannel() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultChannel" /> class.
-        /// </summary>
-        /// <param name="page">Current page index (required).</param>
-        /// <param name="limit">Current page size (required).</param>
-        /// <param name="totalRecordCount">Total record count (required).</param>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiPaginationResultChannel(int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?), List<Channel> data = default(List<Channel>))
-        {
-            // to ensure "page" is required (not null)
-            if (page == null)
-            {
-                throw new InvalidDataException("page is a required property for RestApiPaginationResultChannel and cannot be null");
-            }
-            else
-            {
-                this.Page = page;
-            }
-            // to ensure "limit" is required (not null)
-            if (limit == null)
-            {
-                throw new InvalidDataException("limit is a required property for RestApiPaginationResultChannel and cannot be null");
-            }
-            else
-            {
-                this.Limit = limit;
-            }
-            // to ensure "totalRecordCount" is required (not null)
-            if (totalRecordCount == null)
-            {
-                throw new InvalidDataException("totalRecordCount is a required property for RestApiPaginationResultChannel and cannot be null");
-            }
-            else
-            {
-                this.TotalRecordCount = totalRecordCount;
-            }
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiPaginationResultChannel and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Current page index
-        /// </summary>
-        /// <value>Current page index</value>
-        [DataMember(Name="Page", EmitDefaultValue=false)]
-        public int? Page { get; set; }
-
-        /// <summary>
-        /// Current page size
-        /// </summary>
-        /// <value>Current page size</value>
-        [DataMember(Name="Limit", EmitDefaultValue=false)]
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Total record count
-        /// </summary>
-        /// <value>Total record count</value>
-        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
-        public int? TotalRecordCount { get; set; }
-
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<Channel> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiPaginationResultChannel {\n");
-            sb.Append("  Page: ").Append(Page).Append("\n");
-            sb.Append("  Limit: ").Append(Limit).Append("\n");
-            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiPaginationResultChannel);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiPaginationResultChannel instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiPaginationResultChannel to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiPaginationResultChannel input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Page == input.Page ||
-                    (this.Page != null &&
-                    this.Page.Equals(input.Page))
-                ) && 
-                (
-                    this.Limit == input.Limit ||
-                    (this.Limit != null &&
-                    this.Limit.Equals(input.Limit))
-                ) && 
-                (
-                    this.TotalRecordCount == input.TotalRecordCount ||
-                    (this.TotalRecordCount != null &&
-                    this.TotalRecordCount.Equals(input.TotalRecordCount))
-                ) && 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Page != null)
-                    hashCode = hashCode * 59 + this.Page.GetHashCode();
-                if (this.Limit != null)
-                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
-                if (this.TotalRecordCount != null)
-                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiPaginationResultGroup.cs b/src/Flipdish/Model/RestApiPaginationResultGroup.cs
index 190fe251..57ece035 100644
--- a/src/Flipdish/Model/RestApiPaginationResultGroup.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultGroup.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultGroup :  IEquatable<RestApiPaginationResultGroup>, IValidatableObject
+    public partial class RestApiPaginationResultGroup :  IEquatable<RestApiPaginationResultGroup>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultGroup" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultHttpRequestAndResponseLog.cs b/src/Flipdish/Model/RestApiPaginationResultHttpRequestAndResponseLog.cs
deleted file mode 100644
index b2bfa0ed..00000000
--- a/src/Flipdish/Model/RestApiPaginationResultHttpRequestAndResponseLog.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api pagination result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiPaginationResultHttpRequestAndResponseLog :  IEquatable<RestApiPaginationResultHttpRequestAndResponseLog>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultHttpRequestAndResponseLog" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiPaginationResultHttpRequestAndResponseLog() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultHttpRequestAndResponseLog" /> class.
-        /// </summary>
-        /// <param name="page">Current page index (required).</param>
-        /// <param name="limit">Current page size (required).</param>
-        /// <param name="totalRecordCount">Total record count (required).</param>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiPaginationResultHttpRequestAndResponseLog(int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?), List<HttpRequestAndResponseLog> data = default(List<HttpRequestAndResponseLog>))
-        {
-            // to ensure "page" is required (not null)
-            if (page == null)
-            {
-                throw new InvalidDataException("page is a required property for RestApiPaginationResultHttpRequestAndResponseLog and cannot be null");
-            }
-            else
-            {
-                this.Page = page;
-            }
-            // to ensure "limit" is required (not null)
-            if (limit == null)
-            {
-                throw new InvalidDataException("limit is a required property for RestApiPaginationResultHttpRequestAndResponseLog and cannot be null");
-            }
-            else
-            {
-                this.Limit = limit;
-            }
-            // to ensure "totalRecordCount" is required (not null)
-            if (totalRecordCount == null)
-            {
-                throw new InvalidDataException("totalRecordCount is a required property for RestApiPaginationResultHttpRequestAndResponseLog and cannot be null");
-            }
-            else
-            {
-                this.TotalRecordCount = totalRecordCount;
-            }
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiPaginationResultHttpRequestAndResponseLog and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Current page index
-        /// </summary>
-        /// <value>Current page index</value>
-        [DataMember(Name="Page", EmitDefaultValue=false)]
-        public int? Page { get; set; }
-
-        /// <summary>
-        /// Current page size
-        /// </summary>
-        /// <value>Current page size</value>
-        [DataMember(Name="Limit", EmitDefaultValue=false)]
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Total record count
-        /// </summary>
-        /// <value>Total record count</value>
-        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
-        public int? TotalRecordCount { get; set; }
-
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<HttpRequestAndResponseLog> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiPaginationResultHttpRequestAndResponseLog {\n");
-            sb.Append("  Page: ").Append(Page).Append("\n");
-            sb.Append("  Limit: ").Append(Limit).Append("\n");
-            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiPaginationResultHttpRequestAndResponseLog);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiPaginationResultHttpRequestAndResponseLog instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiPaginationResultHttpRequestAndResponseLog to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiPaginationResultHttpRequestAndResponseLog input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Page == input.Page ||
-                    (this.Page != null &&
-                    this.Page.Equals(input.Page))
-                ) && 
-                (
-                    this.Limit == input.Limit ||
-                    (this.Limit != null &&
-                    this.Limit.Equals(input.Limit))
-                ) && 
-                (
-                    this.TotalRecordCount == input.TotalRecordCount ||
-                    (this.TotalRecordCount != null &&
-                    this.TotalRecordCount.Equals(input.TotalRecordCount))
-                ) && 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Page != null)
-                    hashCode = hashCode * 59 + this.Page.GetHashCode();
-                if (this.Limit != null)
-                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
-                if (this.TotalRecordCount != null)
-                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiPaginationResultHydraDeviceDetails.cs b/src/Flipdish/Model/RestApiPaginationResultHydraDeviceDetails.cs
index d3f2f882..9782fc69 100644
--- a/src/Flipdish/Model/RestApiPaginationResultHydraDeviceDetails.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultHydraDeviceDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultHydraDeviceDetails :  IEquatable<RestApiPaginationResultHydraDeviceDetails>, IValidatableObject
+    public partial class RestApiPaginationResultHydraDeviceDetails :  IEquatable<RestApiPaginationResultHydraDeviceDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultHydraDeviceDetails" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultMetafieldDefinition.cs b/src/Flipdish/Model/RestApiPaginationResultMetafieldDefinition.cs
index cc69a8f3..7735db6d 100644
--- a/src/Flipdish/Model/RestApiPaginationResultMetafieldDefinition.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultMetafieldDefinition.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultMetafieldDefinition :  IEquatable<RestApiPaginationResultMetafieldDefinition>, IValidatableObject
+    public partial class RestApiPaginationResultMetafieldDefinition :  IEquatable<RestApiPaginationResultMetafieldDefinition>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultMetafieldDefinition" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultMetafieldDefinitionRecommendation.cs b/src/Flipdish/Model/RestApiPaginationResultMetafieldDefinitionRecommendation.cs
index c2d06a6e..5f8bbdf3 100644
--- a/src/Flipdish/Model/RestApiPaginationResultMetafieldDefinitionRecommendation.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultMetafieldDefinitionRecommendation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultMetafieldDefinitionRecommendation :  IEquatable<RestApiPaginationResultMetafieldDefinitionRecommendation>, IValidatableObject
+    public partial class RestApiPaginationResultMetafieldDefinitionRecommendation :  IEquatable<RestApiPaginationResultMetafieldDefinitionRecommendation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultMetafieldDefinitionRecommendation" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultOAuthTokenModel.cs b/src/Flipdish/Model/RestApiPaginationResultOAuthTokenModel.cs
index 72b84278..d6d3207a 100644
--- a/src/Flipdish/Model/RestApiPaginationResultOAuthTokenModel.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultOAuthTokenModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultOAuthTokenModel :  IEquatable<RestApiPaginationResultOAuthTokenModel>, IValidatableObject
+    public partial class RestApiPaginationResultOAuthTokenModel :  IEquatable<RestApiPaginationResultOAuthTokenModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultOAuthTokenModel" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultOrder.cs b/src/Flipdish/Model/RestApiPaginationResultOrder.cs
index 302f74d8..55d59608 100644
--- a/src/Flipdish/Model/RestApiPaginationResultOrder.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultOrder.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultOrder :  IEquatable<RestApiPaginationResultOrder>, IValidatableObject
+    public partial class RestApiPaginationResultOrder :  IEquatable<RestApiPaginationResultOrder>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultOrder" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultOrderSummary.cs b/src/Flipdish/Model/RestApiPaginationResultOrderSummary.cs
index c6821b7d..6b6e9fe8 100644
--- a/src/Flipdish/Model/RestApiPaginationResultOrderSummary.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultOrderSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultOrderSummary :  IEquatable<RestApiPaginationResultOrderSummary>, IValidatableObject
+    public partial class RestApiPaginationResultOrderSummary :  IEquatable<RestApiPaginationResultOrderSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultOrderSummary" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultOwnerEntityConfigurations.cs b/src/Flipdish/Model/RestApiPaginationResultOwnerEntityConfigurations.cs
deleted file mode 100644
index e0eca266..00000000
--- a/src/Flipdish/Model/RestApiPaginationResultOwnerEntityConfigurations.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api pagination result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiPaginationResultOwnerEntityConfigurations :  IEquatable<RestApiPaginationResultOwnerEntityConfigurations>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultOwnerEntityConfigurations" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiPaginationResultOwnerEntityConfigurations() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiPaginationResultOwnerEntityConfigurations" /> class.
-        /// </summary>
-        /// <param name="page">Current page index (required).</param>
-        /// <param name="limit">Current page size (required).</param>
-        /// <param name="totalRecordCount">Total record count (required).</param>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiPaginationResultOwnerEntityConfigurations(int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?), List<OwnerEntityConfigurations> data = default(List<OwnerEntityConfigurations>))
-        {
-            // to ensure "page" is required (not null)
-            if (page == null)
-            {
-                throw new InvalidDataException("page is a required property for RestApiPaginationResultOwnerEntityConfigurations and cannot be null");
-            }
-            else
-            {
-                this.Page = page;
-            }
-            // to ensure "limit" is required (not null)
-            if (limit == null)
-            {
-                throw new InvalidDataException("limit is a required property for RestApiPaginationResultOwnerEntityConfigurations and cannot be null");
-            }
-            else
-            {
-                this.Limit = limit;
-            }
-            // to ensure "totalRecordCount" is required (not null)
-            if (totalRecordCount == null)
-            {
-                throw new InvalidDataException("totalRecordCount is a required property for RestApiPaginationResultOwnerEntityConfigurations and cannot be null");
-            }
-            else
-            {
-                this.TotalRecordCount = totalRecordCount;
-            }
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiPaginationResultOwnerEntityConfigurations and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Current page index
-        /// </summary>
-        /// <value>Current page index</value>
-        [DataMember(Name="Page", EmitDefaultValue=false)]
-        public int? Page { get; set; }
-
-        /// <summary>
-        /// Current page size
-        /// </summary>
-        /// <value>Current page size</value>
-        [DataMember(Name="Limit", EmitDefaultValue=false)]
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Total record count
-        /// </summary>
-        /// <value>Total record count</value>
-        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
-        public int? TotalRecordCount { get; set; }
-
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public List<OwnerEntityConfigurations> Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiPaginationResultOwnerEntityConfigurations {\n");
-            sb.Append("  Page: ").Append(Page).Append("\n");
-            sb.Append("  Limit: ").Append(Limit).Append("\n");
-            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiPaginationResultOwnerEntityConfigurations);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiPaginationResultOwnerEntityConfigurations instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiPaginationResultOwnerEntityConfigurations to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiPaginationResultOwnerEntityConfigurations input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Page == input.Page ||
-                    (this.Page != null &&
-                    this.Page.Equals(input.Page))
-                ) && 
-                (
-                    this.Limit == input.Limit ||
-                    (this.Limit != null &&
-                    this.Limit.Equals(input.Limit))
-                ) && 
-                (
-                    this.TotalRecordCount == input.TotalRecordCount ||
-                    (this.TotalRecordCount != null &&
-                    this.TotalRecordCount.Equals(input.TotalRecordCount))
-                ) && 
-                (
-                    this.Data == input.Data ||
-                    this.Data != null &&
-                    this.Data.SequenceEqual(input.Data)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Page != null)
-                    hashCode = hashCode * 59 + this.Page.GetHashCode();
-                if (this.Limit != null)
-                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
-                if (this.TotalRecordCount != null)
-                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiPaginationResultPayout.cs b/src/Flipdish/Model/RestApiPaginationResultPayout.cs
index 7e8edb53..da706097 100644
--- a/src/Flipdish/Model/RestApiPaginationResultPayout.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultPayout.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultPayout :  IEquatable<RestApiPaginationResultPayout>, IValidatableObject
+    public partial class RestApiPaginationResultPayout :  IEquatable<RestApiPaginationResultPayout>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultPayout" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultPayoutChargeback.cs b/src/Flipdish/Model/RestApiPaginationResultPayoutChargeback.cs
index 215853e3..a401bdc4 100644
--- a/src/Flipdish/Model/RestApiPaginationResultPayoutChargeback.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultPayoutChargeback.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultPayoutChargeback :  IEquatable<RestApiPaginationResultPayoutChargeback>, IValidatableObject
+    public partial class RestApiPaginationResultPayoutChargeback :  IEquatable<RestApiPaginationResultPayoutChargeback>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultPayoutChargeback" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultPayoutOrder.cs b/src/Flipdish/Model/RestApiPaginationResultPayoutOrder.cs
index e49ad330..aed46a74 100644
--- a/src/Flipdish/Model/RestApiPaginationResultPayoutOrder.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultPayoutOrder.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultPayoutOrder :  IEquatable<RestApiPaginationResultPayoutOrder>, IValidatableObject
+    public partial class RestApiPaginationResultPayoutOrder :  IEquatable<RestApiPaginationResultPayoutOrder>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultPayoutOrder" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultPayoutOtherCharge.cs b/src/Flipdish/Model/RestApiPaginationResultPayoutOtherCharge.cs
index 10fbdd89..61116555 100644
--- a/src/Flipdish/Model/RestApiPaginationResultPayoutOtherCharge.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultPayoutOtherCharge.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultPayoutOtherCharge :  IEquatable<RestApiPaginationResultPayoutOtherCharge>, IValidatableObject
+    public partial class RestApiPaginationResultPayoutOtherCharge :  IEquatable<RestApiPaginationResultPayoutOtherCharge>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultPayoutOtherCharge" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultPayoutRefund.cs b/src/Flipdish/Model/RestApiPaginationResultPayoutRefund.cs
index 01c51fb2..1c712807 100644
--- a/src/Flipdish/Model/RestApiPaginationResultPayoutRefund.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultPayoutRefund.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultPayoutRefund :  IEquatable<RestApiPaginationResultPayoutRefund>, IValidatableObject
+    public partial class RestApiPaginationResultPayoutRefund :  IEquatable<RestApiPaginationResultPayoutRefund>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultPayoutRefund" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultPayoutReport3RefundedOrder.cs b/src/Flipdish/Model/RestApiPaginationResultPayoutReport3RefundedOrder.cs
new file mode 100644
index 00000000..af06c119
--- /dev/null
+++ b/src/Flipdish/Model/RestApiPaginationResultPayoutReport3RefundedOrder.cs
@@ -0,0 +1,201 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api pagination result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiPaginationResultPayoutReport3RefundedOrder :  IEquatable<RestApiPaginationResultPayoutReport3RefundedOrder>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiPaginationResultPayoutReport3RefundedOrder" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiPaginationResultPayoutReport3RefundedOrder() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiPaginationResultPayoutReport3RefundedOrder" /> class.
+        /// </summary>
+        /// <param name="page">Current page index (required).</param>
+        /// <param name="limit">Current page size (required).</param>
+        /// <param name="totalRecordCount">Total record count (required).</param>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiPaginationResultPayoutReport3RefundedOrder(int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?), List<PayoutReport3RefundedOrder> data = default(List<PayoutReport3RefundedOrder>))
+        {
+            // to ensure "page" is required (not null)
+            if (page == null)
+            {
+                throw new InvalidDataException("page is a required property for RestApiPaginationResultPayoutReport3RefundedOrder and cannot be null");
+            }
+            else
+            {
+                this.Page = page;
+            }
+            // to ensure "limit" is required (not null)
+            if (limit == null)
+            {
+                throw new InvalidDataException("limit is a required property for RestApiPaginationResultPayoutReport3RefundedOrder and cannot be null");
+            }
+            else
+            {
+                this.Limit = limit;
+            }
+            // to ensure "totalRecordCount" is required (not null)
+            if (totalRecordCount == null)
+            {
+                throw new InvalidDataException("totalRecordCount is a required property for RestApiPaginationResultPayoutReport3RefundedOrder and cannot be null");
+            }
+            else
+            {
+                this.TotalRecordCount = totalRecordCount;
+            }
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiPaginationResultPayoutReport3RefundedOrder and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Current page index
+        /// </summary>
+        /// <value>Current page index</value>
+        [DataMember(Name="Page", EmitDefaultValue=false)]
+        public int? Page { get; set; }
+
+        /// <summary>
+        /// Current page size
+        /// </summary>
+        /// <value>Current page size</value>
+        [DataMember(Name="Limit", EmitDefaultValue=false)]
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Total record count
+        /// </summary>
+        /// <value>Total record count</value>
+        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
+        public int? TotalRecordCount { get; set; }
+
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<PayoutReport3RefundedOrder> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiPaginationResultPayoutReport3RefundedOrder {\n");
+            sb.Append("  Page: ").Append(Page).Append("\n");
+            sb.Append("  Limit: ").Append(Limit).Append("\n");
+            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiPaginationResultPayoutReport3RefundedOrder);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiPaginationResultPayoutReport3RefundedOrder instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiPaginationResultPayoutReport3RefundedOrder to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiPaginationResultPayoutReport3RefundedOrder input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Page == input.Page ||
+                    (this.Page != null &&
+                    this.Page.Equals(input.Page))
+                ) && 
+                (
+                    this.Limit == input.Limit ||
+                    (this.Limit != null &&
+                    this.Limit.Equals(input.Limit))
+                ) && 
+                (
+                    this.TotalRecordCount == input.TotalRecordCount ||
+                    (this.TotalRecordCount != null &&
+                    this.TotalRecordCount.Equals(input.TotalRecordCount))
+                ) && 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Page != null)
+                    hashCode = hashCode * 59 + this.Page.GetHashCode();
+                if (this.Limit != null)
+                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
+                if (this.TotalRecordCount != null)
+                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiPaginationResultPendingMenuChanges.cs b/src/Flipdish/Model/RestApiPaginationResultPendingMenuChanges.cs
index c4e83eb9..5d482c42 100644
--- a/src/Flipdish/Model/RestApiPaginationResultPendingMenuChanges.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultPendingMenuChanges.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultPendingMenuChanges :  IEquatable<RestApiPaginationResultPendingMenuChanges>, IValidatableObject
+    public partial class RestApiPaginationResultPendingMenuChanges :  IEquatable<RestApiPaginationResultPendingMenuChanges>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultPendingMenuChanges" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultPhoneCall.cs b/src/Flipdish/Model/RestApiPaginationResultPhoneCall.cs
index 1fc47604..5bae65a7 100644
--- a/src/Flipdish/Model/RestApiPaginationResultPhoneCall.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultPhoneCall.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultPhoneCall :  IEquatable<RestApiPaginationResultPhoneCall>, IValidatableObject
+    public partial class RestApiPaginationResultPhoneCall :  IEquatable<RestApiPaginationResultPhoneCall>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultPhoneCall" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultProduct.cs b/src/Flipdish/Model/RestApiPaginationResultProduct.cs
index 8958fd50..fa2f2fcd 100644
--- a/src/Flipdish/Model/RestApiPaginationResultProduct.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultProduct.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultProduct :  IEquatable<RestApiPaginationResultProduct>, IValidatableObject
+    public partial class RestApiPaginationResultProduct :  IEquatable<RestApiPaginationResultProduct>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultProduct" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultPushNotificationResponse.cs b/src/Flipdish/Model/RestApiPaginationResultPushNotificationResponse.cs
index 430275c9..40b13c90 100644
--- a/src/Flipdish/Model/RestApiPaginationResultPushNotificationResponse.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultPushNotificationResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultPushNotificationResponse :  IEquatable<RestApiPaginationResultPushNotificationResponse>, IValidatableObject
+    public partial class RestApiPaginationResultPushNotificationResponse :  IEquatable<RestApiPaginationResultPushNotificationResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultPushNotificationResponse" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultRestaurant.cs b/src/Flipdish/Model/RestApiPaginationResultRestaurant.cs
new file mode 100644
index 00000000..ef59fe97
--- /dev/null
+++ b/src/Flipdish/Model/RestApiPaginationResultRestaurant.cs
@@ -0,0 +1,201 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api pagination result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiPaginationResultRestaurant :  IEquatable<RestApiPaginationResultRestaurant>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiPaginationResultRestaurant" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiPaginationResultRestaurant() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiPaginationResultRestaurant" /> class.
+        /// </summary>
+        /// <param name="page">Current page index (required).</param>
+        /// <param name="limit">Current page size (required).</param>
+        /// <param name="totalRecordCount">Total record count (required).</param>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiPaginationResultRestaurant(int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?), List<Restaurant> data = default(List<Restaurant>))
+        {
+            // to ensure "page" is required (not null)
+            if (page == null)
+            {
+                throw new InvalidDataException("page is a required property for RestApiPaginationResultRestaurant and cannot be null");
+            }
+            else
+            {
+                this.Page = page;
+            }
+            // to ensure "limit" is required (not null)
+            if (limit == null)
+            {
+                throw new InvalidDataException("limit is a required property for RestApiPaginationResultRestaurant and cannot be null");
+            }
+            else
+            {
+                this.Limit = limit;
+            }
+            // to ensure "totalRecordCount" is required (not null)
+            if (totalRecordCount == null)
+            {
+                throw new InvalidDataException("totalRecordCount is a required property for RestApiPaginationResultRestaurant and cannot be null");
+            }
+            else
+            {
+                this.TotalRecordCount = totalRecordCount;
+            }
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiPaginationResultRestaurant and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Current page index
+        /// </summary>
+        /// <value>Current page index</value>
+        [DataMember(Name="Page", EmitDefaultValue=false)]
+        public int? Page { get; set; }
+
+        /// <summary>
+        /// Current page size
+        /// </summary>
+        /// <value>Current page size</value>
+        [DataMember(Name="Limit", EmitDefaultValue=false)]
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Total record count
+        /// </summary>
+        /// <value>Total record count</value>
+        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
+        public int? TotalRecordCount { get; set; }
+
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<Restaurant> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiPaginationResultRestaurant {\n");
+            sb.Append("  Page: ").Append(Page).Append("\n");
+            sb.Append("  Limit: ").Append(Limit).Append("\n");
+            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiPaginationResultRestaurant);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiPaginationResultRestaurant instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiPaginationResultRestaurant to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiPaginationResultRestaurant input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Page == input.Page ||
+                    (this.Page != null &&
+                    this.Page.Equals(input.Page))
+                ) && 
+                (
+                    this.Limit == input.Limit ||
+                    (this.Limit != null &&
+                    this.Limit.Equals(input.Limit))
+                ) && 
+                (
+                    this.TotalRecordCount == input.TotalRecordCount ||
+                    (this.TotalRecordCount != null &&
+                    this.TotalRecordCount.Equals(input.TotalRecordCount))
+                ) && 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Page != null)
+                    hashCode = hashCode * 59 + this.Page.GetHashCode();
+                if (this.Limit != null)
+                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
+                if (this.TotalRecordCount != null)
+                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiPaginationResultStore.cs b/src/Flipdish/Model/RestApiPaginationResultStore.cs
index 22227994..b896423a 100644
--- a/src/Flipdish/Model/RestApiPaginationResultStore.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultStore.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultStore :  IEquatable<RestApiPaginationResultStore>, IValidatableObject
+    public partial class RestApiPaginationResultStore :  IEquatable<RestApiPaginationResultStore>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultStore" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultStoreGroup.cs b/src/Flipdish/Model/RestApiPaginationResultStoreGroup.cs
index 5b3c8b67..5e2b11a0 100644
--- a/src/Flipdish/Model/RestApiPaginationResultStoreGroup.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultStoreGroup.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultStoreGroup :  IEquatable<RestApiPaginationResultStoreGroup>, IValidatableObject
+    public partial class RestApiPaginationResultStoreGroup :  IEquatable<RestApiPaginationResultStoreGroup>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultStoreGroup" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultStoreGroupExtended.cs b/src/Flipdish/Model/RestApiPaginationResultStoreGroupExtended.cs
index d8deb013..6285b6fc 100644
--- a/src/Flipdish/Model/RestApiPaginationResultStoreGroupExtended.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultStoreGroupExtended.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultStoreGroupExtended :  IEquatable<RestApiPaginationResultStoreGroupExtended>, IValidatableObject
+    public partial class RestApiPaginationResultStoreGroupExtended :  IEquatable<RestApiPaginationResultStoreGroupExtended>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultStoreGroupExtended" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultStoreHeader.cs b/src/Flipdish/Model/RestApiPaginationResultStoreHeader.cs
index db38798c..da458522 100644
--- a/src/Flipdish/Model/RestApiPaginationResultStoreHeader.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultStoreHeader.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultStoreHeader :  IEquatable<RestApiPaginationResultStoreHeader>, IValidatableObject
+    public partial class RestApiPaginationResultStoreHeader :  IEquatable<RestApiPaginationResultStoreHeader>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultStoreHeader" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultStoreValidationConfig.cs b/src/Flipdish/Model/RestApiPaginationResultStoreValidationConfig.cs
index a52a53c3..fff278e9 100644
--- a/src/Flipdish/Model/RestApiPaginationResultStoreValidationConfig.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultStoreValidationConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultStoreValidationConfig :  IEquatable<RestApiPaginationResultStoreValidationConfig>, IValidatableObject
+    public partial class RestApiPaginationResultStoreValidationConfig :  IEquatable<RestApiPaginationResultStoreValidationConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultStoreValidationConfig" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultUserSearch.cs b/src/Flipdish/Model/RestApiPaginationResultUserSearch.cs
new file mode 100644
index 00000000..3e715663
--- /dev/null
+++ b/src/Flipdish/Model/RestApiPaginationResultUserSearch.cs
@@ -0,0 +1,201 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api pagination result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiPaginationResultUserSearch :  IEquatable<RestApiPaginationResultUserSearch>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiPaginationResultUserSearch" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiPaginationResultUserSearch() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiPaginationResultUserSearch" /> class.
+        /// </summary>
+        /// <param name="page">Current page index (required).</param>
+        /// <param name="limit">Current page size (required).</param>
+        /// <param name="totalRecordCount">Total record count (required).</param>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiPaginationResultUserSearch(int? page = default(int?), int? limit = default(int?), int? totalRecordCount = default(int?), List<UserSearch> data = default(List<UserSearch>))
+        {
+            // to ensure "page" is required (not null)
+            if (page == null)
+            {
+                throw new InvalidDataException("page is a required property for RestApiPaginationResultUserSearch and cannot be null");
+            }
+            else
+            {
+                this.Page = page;
+            }
+            // to ensure "limit" is required (not null)
+            if (limit == null)
+            {
+                throw new InvalidDataException("limit is a required property for RestApiPaginationResultUserSearch and cannot be null");
+            }
+            else
+            {
+                this.Limit = limit;
+            }
+            // to ensure "totalRecordCount" is required (not null)
+            if (totalRecordCount == null)
+            {
+                throw new InvalidDataException("totalRecordCount is a required property for RestApiPaginationResultUserSearch and cannot be null");
+            }
+            else
+            {
+                this.TotalRecordCount = totalRecordCount;
+            }
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiPaginationResultUserSearch and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Current page index
+        /// </summary>
+        /// <value>Current page index</value>
+        [DataMember(Name="Page", EmitDefaultValue=false)]
+        public int? Page { get; set; }
+
+        /// <summary>
+        /// Current page size
+        /// </summary>
+        /// <value>Current page size</value>
+        [DataMember(Name="Limit", EmitDefaultValue=false)]
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Total record count
+        /// </summary>
+        /// <value>Total record count</value>
+        [DataMember(Name="TotalRecordCount", EmitDefaultValue=false)]
+        public int? TotalRecordCount { get; set; }
+
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public List<UserSearch> Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiPaginationResultUserSearch {\n");
+            sb.Append("  Page: ").Append(Page).Append("\n");
+            sb.Append("  Limit: ").Append(Limit).Append("\n");
+            sb.Append("  TotalRecordCount: ").Append(TotalRecordCount).Append("\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiPaginationResultUserSearch);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiPaginationResultUserSearch instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiPaginationResultUserSearch to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiPaginationResultUserSearch input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Page == input.Page ||
+                    (this.Page != null &&
+                    this.Page.Equals(input.Page))
+                ) && 
+                (
+                    this.Limit == input.Limit ||
+                    (this.Limit != null &&
+                    this.Limit.Equals(input.Limit))
+                ) && 
+                (
+                    this.TotalRecordCount == input.TotalRecordCount ||
+                    (this.TotalRecordCount != null &&
+                    this.TotalRecordCount.Equals(input.TotalRecordCount))
+                ) && 
+                (
+                    this.Data == input.Data ||
+                    this.Data != null &&
+                    this.Data.SequenceEqual(input.Data)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Page != null)
+                    hashCode = hashCode * 59 + this.Page.GetHashCode();
+                if (this.Limit != null)
+                    hashCode = hashCode * 59 + this.Limit.GetHashCode();
+                if (this.TotalRecordCount != null)
+                    hashCode = hashCode * 59 + this.TotalRecordCount.GetHashCode();
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiPaginationResultVoucherSummary.cs b/src/Flipdish/Model/RestApiPaginationResultVoucherSummary.cs
index d50ce8b2..c155d393 100644
--- a/src/Flipdish/Model/RestApiPaginationResultVoucherSummary.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultVoucherSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultVoucherSummary :  IEquatable<RestApiPaginationResultVoucherSummary>, IValidatableObject
+    public partial class RestApiPaginationResultVoucherSummary :  IEquatable<RestApiPaginationResultVoucherSummary>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultVoucherSummary" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultWebhookLog.cs b/src/Flipdish/Model/RestApiPaginationResultWebhookLog.cs
index 6480caf0..a2cd1aec 100644
--- a/src/Flipdish/Model/RestApiPaginationResultWebhookLog.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultWebhookLog.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultWebhookLog :  IEquatable<RestApiPaginationResultWebhookLog>, IValidatableObject
+    public partial class RestApiPaginationResultWebhookLog :  IEquatable<RestApiPaginationResultWebhookLog>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultWebhookLog" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiPaginationResultWebhookSubscription.cs b/src/Flipdish/Model/RestApiPaginationResultWebhookSubscription.cs
index 8ae6e678..f9d46f51 100644
--- a/src/Flipdish/Model/RestApiPaginationResultWebhookSubscription.cs
+++ b/src/Flipdish/Model/RestApiPaginationResultWebhookSubscription.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api pagination result
     /// </summary>
     [DataContract]
-    public partial class RestApiPaginationResultWebhookSubscription :  IEquatable<RestApiPaginationResultWebhookSubscription>, IValidatableObject
+    public partial class RestApiPaginationResultWebhookSubscription :  IEquatable<RestApiPaginationResultWebhookSubscription>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiPaginationResultWebhookSubscription" /> class.
@@ -198,16 +196,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResult.cs b/src/Flipdish/Model/RestApiResult.cs
deleted file mode 100644
index 536141ac..00000000
--- a/src/Flipdish/Model/RestApiResult.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResult :  IEquatable<RestApiResult>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResult" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        public RestApiResult()
-        {
-        }
-        
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResult {\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResult);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResult instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResult to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResult input)
-        {
-            if (input == null)
-                return false;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultAcceptInvitationResult.cs b/src/Flipdish/Model/RestApiResultAcceptInvitationResult.cs
new file mode 100644
index 00000000..f0a8323d
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultAcceptInvitationResult.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultAcceptInvitationResult :  IEquatable<RestApiResultAcceptInvitationResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAcceptInvitationResult" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultAcceptInvitationResult() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAcceptInvitationResult" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultAcceptInvitationResult(AcceptInvitationResult data = default(AcceptInvitationResult))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultAcceptInvitationResult and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public AcceptInvitationResult Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultAcceptInvitationResult {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultAcceptInvitationResult);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultAcceptInvitationResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultAcceptInvitationResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultAcceptInvitationResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultAccountDetail.cs b/src/Flipdish/Model/RestApiResultAccountDetail.cs
index a28166af..83153106 100644
--- a/src/Flipdish/Model/RestApiResultAccountDetail.cs
+++ b/src/Flipdish/Model/RestApiResultAccountDetail.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAccountDetail :  IEquatable<RestApiResultAccountDetail>, IValidatableObject
+    public partial class RestApiResultAccountDetail :  IEquatable<RestApiResultAccountDetail>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAccountDetail" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultAccountFieldsDefinitions.cs b/src/Flipdish/Model/RestApiResultAccountFieldsDefinitions.cs
index 591bbe3e..79e43e96 100644
--- a/src/Flipdish/Model/RestApiResultAccountFieldsDefinitions.cs
+++ b/src/Flipdish/Model/RestApiResultAccountFieldsDefinitions.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAccountFieldsDefinitions :  IEquatable<RestApiResultAccountFieldsDefinitions>, IValidatableObject
+    public partial class RestApiResultAccountFieldsDefinitions :  IEquatable<RestApiResultAccountFieldsDefinitions>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAccountFieldsDefinitions" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultAddressFormResponse.cs b/src/Flipdish/Model/RestApiResultAddressFormResponse.cs
index cf3166f3..0f70133c 100644
--- a/src/Flipdish/Model/RestApiResultAddressFormResponse.cs
+++ b/src/Flipdish/Model/RestApiResultAddressFormResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAddressFormResponse :  IEquatable<RestApiResultAddressFormResponse>, IValidatableObject
+    public partial class RestApiResultAddressFormResponse :  IEquatable<RestApiResultAddressFormResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAddressFormResponse" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultApmStatistics.cs b/src/Flipdish/Model/RestApiResultApmStatistics.cs
index bec0e427..e59811ad 100644
--- a/src/Flipdish/Model/RestApiResultApmStatistics.cs
+++ b/src/Flipdish/Model/RestApiResultApmStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultApmStatistics :  IEquatable<RestApiResultApmStatistics>, IValidatableObject
+    public partial class RestApiResultApmStatistics :  IEquatable<RestApiResultApmStatistics>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultApmStatistics" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultApmStatus.cs b/src/Flipdish/Model/RestApiResultApmStatus.cs
index 90f39a0d..49b122cc 100644
--- a/src/Flipdish/Model/RestApiResultApmStatus.cs
+++ b/src/Flipdish/Model/RestApiResultApmStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultApmStatus :  IEquatable<RestApiResultApmStatus>, IValidatableObject
+    public partial class RestApiResultApmStatus :  IEquatable<RestApiResultApmStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultApmStatus" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultApp.cs b/src/Flipdish/Model/RestApiResultApp.cs
index 5bea313f..f8e8d72d 100644
--- a/src/Flipdish/Model/RestApiResultApp.cs
+++ b/src/Flipdish/Model/RestApiResultApp.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultApp :  IEquatable<RestApiResultApp>, IValidatableObject
+    public partial class RestApiResultApp :  IEquatable<RestApiResultApp>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultApp" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultAppChannelAssignment.cs b/src/Flipdish/Model/RestApiResultAppChannelAssignment.cs
index 5febc93e..a25648c4 100644
--- a/src/Flipdish/Model/RestApiResultAppChannelAssignment.cs
+++ b/src/Flipdish/Model/RestApiResultAppChannelAssignment.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAppChannelAssignment :  IEquatable<RestApiResultAppChannelAssignment>, IValidatableObject
+    public partial class RestApiResultAppChannelAssignment :  IEquatable<RestApiResultAppChannelAssignment>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAppChannelAssignment" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultAppCompliance.cs b/src/Flipdish/Model/RestApiResultAppCompliance.cs
index 62acecce..68b92066 100644
--- a/src/Flipdish/Model/RestApiResultAppCompliance.cs
+++ b/src/Flipdish/Model/RestApiResultAppCompliance.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAppCompliance :  IEquatable<RestApiResultAppCompliance>, IValidatableObject
+    public partial class RestApiResultAppCompliance :  IEquatable<RestApiResultAppCompliance>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAppCompliance" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultAppConfigSalesChannel.cs b/src/Flipdish/Model/RestApiResultAppConfigSalesChannel.cs
index 946cfbd3..19a70240 100644
--- a/src/Flipdish/Model/RestApiResultAppConfigSalesChannel.cs
+++ b/src/Flipdish/Model/RestApiResultAppConfigSalesChannel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAppConfigSalesChannel :  IEquatable<RestApiResultAppConfigSalesChannel>, IValidatableObject
+    public partial class RestApiResultAppConfigSalesChannel :  IEquatable<RestApiResultAppConfigSalesChannel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAppConfigSalesChannel" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultAppConfigurationSummary.cs b/src/Flipdish/Model/RestApiResultAppConfigurationSummary.cs
deleted file mode 100644
index 10fb927b..00000000
--- a/src/Flipdish/Model/RestApiResultAppConfigurationSummary.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultAppConfigurationSummary :  IEquatable<RestApiResultAppConfigurationSummary>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultAppConfigurationSummary" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultAppConfigurationSummary() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultAppConfigurationSummary" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultAppConfigurationSummary(AppConfigurationSummary data = default(AppConfigurationSummary))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultAppConfigurationSummary and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public AppConfigurationSummary Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultAppConfigurationSummary {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultAppConfigurationSummary);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultAppConfigurationSummary instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultAppConfigurationSummary to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultAppConfigurationSummary input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultAppDetail.cs b/src/Flipdish/Model/RestApiResultAppDetail.cs
deleted file mode 100644
index feb1ec94..00000000
--- a/src/Flipdish/Model/RestApiResultAppDetail.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultAppDetail :  IEquatable<RestApiResultAppDetail>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultAppDetail" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultAppDetail() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultAppDetail" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultAppDetail(AppDetail data = default(AppDetail))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultAppDetail and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public AppDetail Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultAppDetail {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultAppDetail);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultAppDetail instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultAppDetail to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultAppDetail input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultAppGeneralConfigModel.cs b/src/Flipdish/Model/RestApiResultAppGeneralConfigModel.cs
new file mode 100644
index 00000000..49d36912
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultAppGeneralConfigModel.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultAppGeneralConfigModel :  IEquatable<RestApiResultAppGeneralConfigModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAppGeneralConfigModel" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultAppGeneralConfigModel() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAppGeneralConfigModel" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultAppGeneralConfigModel(AppGeneralConfigModel data = default(AppGeneralConfigModel))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultAppGeneralConfigModel and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public AppGeneralConfigModel Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultAppGeneralConfigModel {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultAppGeneralConfigModel);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultAppGeneralConfigModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultAppGeneralConfigModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultAppGeneralConfigModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultAppStoreApp.cs b/src/Flipdish/Model/RestApiResultAppStoreApp.cs
index ef4bbfb1..fae237a0 100644
--- a/src/Flipdish/Model/RestApiResultAppStoreApp.cs
+++ b/src/Flipdish/Model/RestApiResultAppStoreApp.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAppStoreApp :  IEquatable<RestApiResultAppStoreApp>, IValidatableObject
+    public partial class RestApiResultAppStoreApp :  IEquatable<RestApiResultAppStoreApp>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAppStoreApp" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultAppStoreAppConfiguration.cs b/src/Flipdish/Model/RestApiResultAppStoreAppConfiguration.cs
index 97681eac..c612d4a8 100644
--- a/src/Flipdish/Model/RestApiResultAppStoreAppConfiguration.cs
+++ b/src/Flipdish/Model/RestApiResultAppStoreAppConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAppStoreAppConfiguration :  IEquatable<RestApiResultAppStoreAppConfiguration>, IValidatableObject
+    public partial class RestApiResultAppStoreAppConfiguration :  IEquatable<RestApiResultAppStoreAppConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAppStoreAppConfiguration" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultAppStoreAppEntitlements.cs b/src/Flipdish/Model/RestApiResultAppStoreAppEntitlements.cs
new file mode 100644
index 00000000..b35fb160
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultAppStoreAppEntitlements.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultAppStoreAppEntitlements :  IEquatable<RestApiResultAppStoreAppEntitlements>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAppStoreAppEntitlements" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultAppStoreAppEntitlements() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAppStoreAppEntitlements" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultAppStoreAppEntitlements(AppStoreAppEntitlements data = default(AppStoreAppEntitlements))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultAppStoreAppEntitlements and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public AppStoreAppEntitlements Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultAppStoreAppEntitlements {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultAppStoreAppEntitlements);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultAppStoreAppEntitlements instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultAppStoreAppEntitlements to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultAppStoreAppEntitlements input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultAppStoreConfigModel.cs b/src/Flipdish/Model/RestApiResultAppStoreConfigModel.cs
new file mode 100644
index 00000000..5166e447
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultAppStoreConfigModel.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultAppStoreConfigModel :  IEquatable<RestApiResultAppStoreConfigModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAppStoreConfigModel" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultAppStoreConfigModel() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAppStoreConfigModel" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultAppStoreConfigModel(AppStoreConfigModel data = default(AppStoreConfigModel))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultAppStoreConfigModel and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public AppStoreConfigModel Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultAppStoreConfigModel {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultAppStoreConfigModel);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultAppStoreConfigModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultAppStoreConfigModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultAppStoreConfigModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultAssetResultModel.cs b/src/Flipdish/Model/RestApiResultAssetResultModel.cs
new file mode 100644
index 00000000..04889ab6
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultAssetResultModel.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultAssetResultModel :  IEquatable<RestApiResultAssetResultModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAssetResultModel" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultAssetResultModel() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultAssetResultModel" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultAssetResultModel(AssetResultModel data = default(AssetResultModel))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultAssetResultModel and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public AssetResultModel Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultAssetResultModel {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultAssetResultModel);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultAssetResultModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultAssetResultModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultAssetResultModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultAssignedBankAccount.cs b/src/Flipdish/Model/RestApiResultAssignedBankAccount.cs
index 7dfae107..a89b74b0 100644
--- a/src/Flipdish/Model/RestApiResultAssignedBankAccount.cs
+++ b/src/Flipdish/Model/RestApiResultAssignedBankAccount.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultAssignedBankAccount :  IEquatable<RestApiResultAssignedBankAccount>, IValidatableObject
+    public partial class RestApiResultAssignedBankAccount :  IEquatable<RestApiResultAssignedBankAccount>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultAssignedBankAccount" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultBankAccountDetail.cs b/src/Flipdish/Model/RestApiResultBankAccountDetail.cs
index 46bd5755..c32871fb 100644
--- a/src/Flipdish/Model/RestApiResultBankAccountDetail.cs
+++ b/src/Flipdish/Model/RestApiResultBankAccountDetail.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultBankAccountDetail :  IEquatable<RestApiResultBankAccountDetail>, IValidatableObject
+    public partial class RestApiResultBankAccountDetail :  IEquatable<RestApiResultBankAccountDetail>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultBankAccountDetail" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultBluetoothTerminalStatus.cs b/src/Flipdish/Model/RestApiResultBluetoothTerminalStatus.cs
index 4f681de8..febddb64 100644
--- a/src/Flipdish/Model/RestApiResultBluetoothTerminalStatus.cs
+++ b/src/Flipdish/Model/RestApiResultBluetoothTerminalStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultBluetoothTerminalStatus :  IEquatable<RestApiResultBluetoothTerminalStatus>, IValidatableObject
+    public partial class RestApiResultBluetoothTerminalStatus :  IEquatable<RestApiResultBluetoothTerminalStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultBluetoothTerminalStatus" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultBuildResultModel.cs b/src/Flipdish/Model/RestApiResultBuildResultModel.cs
new file mode 100644
index 00000000..c796b92b
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultBuildResultModel.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultBuildResultModel :  IEquatable<RestApiResultBuildResultModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultBuildResultModel" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultBuildResultModel() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultBuildResultModel" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultBuildResultModel(BuildResultModel data = default(BuildResultModel))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultBuildResultModel and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public BuildResultModel Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultBuildResultModel {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultBuildResultModel);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultBuildResultModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultBuildResultModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultBuildResultModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultBusinessHoursOverride.cs b/src/Flipdish/Model/RestApiResultBusinessHoursOverride.cs
index 5770bd94..62973914 100644
--- a/src/Flipdish/Model/RestApiResultBusinessHoursOverride.cs
+++ b/src/Flipdish/Model/RestApiResultBusinessHoursOverride.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultBusinessHoursOverride :  IEquatable<RestApiResultBusinessHoursOverride>, IValidatableObject
+    public partial class RestApiResultBusinessHoursOverride :  IEquatable<RestApiResultBusinessHoursOverride>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultBusinessHoursOverride" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultBusinessHoursPeriod.cs b/src/Flipdish/Model/RestApiResultBusinessHoursPeriod.cs
index 7ad8cc77..5798bb53 100644
--- a/src/Flipdish/Model/RestApiResultBusinessHoursPeriod.cs
+++ b/src/Flipdish/Model/RestApiResultBusinessHoursPeriod.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultBusinessHoursPeriod :  IEquatable<RestApiResultBusinessHoursPeriod>, IValidatableObject
+    public partial class RestApiResultBusinessHoursPeriod :  IEquatable<RestApiResultBusinessHoursPeriod>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultBusinessHoursPeriod" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultCard.cs b/src/Flipdish/Model/RestApiResultCard.cs
deleted file mode 100644
index 51a12caa..00000000
--- a/src/Flipdish/Model/RestApiResultCard.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultCard :  IEquatable<RestApiResultCard>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultCard" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultCard() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultCard" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultCard(Card data = default(Card))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultCard and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public Card Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultCard {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultCard);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultCard instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultCard to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultCard input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultCardReader.cs b/src/Flipdish/Model/RestApiResultCardReader.cs
index 894e366e..eed1acab 100644
--- a/src/Flipdish/Model/RestApiResultCardReader.cs
+++ b/src/Flipdish/Model/RestApiResultCardReader.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultCardReader :  IEquatable<RestApiResultCardReader>, IValidatableObject
+    public partial class RestApiResultCardReader :  IEquatable<RestApiResultCardReader>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultCardReader" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultCatalogGroup.cs b/src/Flipdish/Model/RestApiResultCatalogGroup.cs
deleted file mode 100644
index 9b5cc9af..00000000
--- a/src/Flipdish/Model/RestApiResultCatalogGroup.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultCatalogGroup :  IEquatable<RestApiResultCatalogGroup>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultCatalogGroup" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultCatalogGroup() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultCatalogGroup" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultCatalogGroup(CatalogGroup data = default(CatalogGroup))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultCatalogGroup and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public CatalogGroup Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultCatalogGroup {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultCatalogGroup);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultCatalogGroup instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultCatalogGroup to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultCatalogGroup input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultCatalogItem.cs b/src/Flipdish/Model/RestApiResultCatalogItem.cs
index 21c099d8..005b1f30 100644
--- a/src/Flipdish/Model/RestApiResultCatalogItem.cs
+++ b/src/Flipdish/Model/RestApiResultCatalogItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultCatalogItem :  IEquatable<RestApiResultCatalogItem>, IValidatableObject
+    public partial class RestApiResultCatalogItem :  IEquatable<RestApiResultCatalogItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultCatalogItem" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultChannel.cs b/src/Flipdish/Model/RestApiResultChannel.cs
index 3ea40f8b..3328f052 100644
--- a/src/Flipdish/Model/RestApiResultChannel.cs
+++ b/src/Flipdish/Model/RestApiResultChannel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultChannel :  IEquatable<RestApiResultChannel>, IValidatableObject
+    public partial class RestApiResultChannel :  IEquatable<RestApiResultChannel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultChannel" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultClientDevice.cs b/src/Flipdish/Model/RestApiResultClientDevice.cs
new file mode 100644
index 00000000..57cd723f
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultClientDevice.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultClientDevice :  IEquatable<RestApiResultClientDevice>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultClientDevice" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultClientDevice() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultClientDevice" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultClientDevice(ClientDevice data = default(ClientDevice))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultClientDevice and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public ClientDevice Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultClientDevice {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultClientDevice);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultClientDevice instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultClientDevice to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultClientDevice input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultClientDeviceEnrollmentResult.cs b/src/Flipdish/Model/RestApiResultClientDeviceEnrollmentResult.cs
new file mode 100644
index 00000000..edad2ca1
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultClientDeviceEnrollmentResult.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultClientDeviceEnrollmentResult :  IEquatable<RestApiResultClientDeviceEnrollmentResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultClientDeviceEnrollmentResult" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultClientDeviceEnrollmentResult() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultClientDeviceEnrollmentResult" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultClientDeviceEnrollmentResult(ClientDeviceEnrollmentResult data = default(ClientDeviceEnrollmentResult))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultClientDeviceEnrollmentResult and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public ClientDeviceEnrollmentResult Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultClientDeviceEnrollmentResult {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultClientDeviceEnrollmentResult);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultClientDeviceEnrollmentResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultClientDeviceEnrollmentResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultClientDeviceEnrollmentResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultCoordinates.cs b/src/Flipdish/Model/RestApiResultCoordinates.cs
index 38917fbc..d0c14330 100644
--- a/src/Flipdish/Model/RestApiResultCoordinates.cs
+++ b/src/Flipdish/Model/RestApiResultCoordinates.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultCoordinates :  IEquatable<RestApiResultCoordinates>, IValidatableObject
+    public partial class RestApiResultCoordinates :  IEquatable<RestApiResultCoordinates>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultCoordinates" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultCountryFormResponse.cs b/src/Flipdish/Model/RestApiResultCountryFormResponse.cs
index 370812b5..f0097aae 100644
--- a/src/Flipdish/Model/RestApiResultCountryFormResponse.cs
+++ b/src/Flipdish/Model/RestApiResultCountryFormResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultCountryFormResponse :  IEquatable<RestApiResultCountryFormResponse>, IValidatableObject
+    public partial class RestApiResultCountryFormResponse :  IEquatable<RestApiResultCountryFormResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultCountryFormResponse" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultCreatedMenuSectionItems.cs b/src/Flipdish/Model/RestApiResultCreatedMenuSectionItems.cs
index a8188cab..145f7465 100644
--- a/src/Flipdish/Model/RestApiResultCreatedMenuSectionItems.cs
+++ b/src/Flipdish/Model/RestApiResultCreatedMenuSectionItems.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultCreatedMenuSectionItems :  IEquatable<RestApiResultCreatedMenuSectionItems>, IValidatableObject
+    public partial class RestApiResultCreatedMenuSectionItems :  IEquatable<RestApiResultCreatedMenuSectionItems>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultCreatedMenuSectionItems" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultCrossSellMenuItems.cs b/src/Flipdish/Model/RestApiResultCrossSellMenuItems.cs
new file mode 100644
index 00000000..4e53c82a
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultCrossSellMenuItems.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultCrossSellMenuItems :  IEquatable<RestApiResultCrossSellMenuItems>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultCrossSellMenuItems" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultCrossSellMenuItems() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultCrossSellMenuItems" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultCrossSellMenuItems(CrossSellMenuItems data = default(CrossSellMenuItems))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultCrossSellMenuItems and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public CrossSellMenuItems Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultCrossSellMenuItems {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultCrossSellMenuItems);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultCrossSellMenuItems instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultCrossSellMenuItems to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultCrossSellMenuItems input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultCustomer.cs b/src/Flipdish/Model/RestApiResultCustomer.cs
index 57abca1e..07ac7b62 100644
--- a/src/Flipdish/Model/RestApiResultCustomer.cs
+++ b/src/Flipdish/Model/RestApiResultCustomer.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultCustomer :  IEquatable<RestApiResultCustomer>, IValidatableObject
+    public partial class RestApiResultCustomer :  IEquatable<RestApiResultCustomer>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultCustomer" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultCustomers.cs b/src/Flipdish/Model/RestApiResultCustomers.cs
new file mode 100644
index 00000000..501dc53a
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultCustomers.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultCustomers :  IEquatable<RestApiResultCustomers>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultCustomers" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultCustomers() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultCustomers" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultCustomers(Customers data = default(Customers))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultCustomers and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public Customers Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultCustomers {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultCustomers);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultCustomers instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultCustomers to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultCustomers input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultDeliveryZone.cs b/src/Flipdish/Model/RestApiResultDeliveryZone.cs
index 046c63d9..7bddf73e 100644
--- a/src/Flipdish/Model/RestApiResultDeliveryZone.cs
+++ b/src/Flipdish/Model/RestApiResultDeliveryZone.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultDeliveryZone :  IEquatable<RestApiResultDeliveryZone>, IValidatableObject
+    public partial class RestApiResultDeliveryZone :  IEquatable<RestApiResultDeliveryZone>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultDeliveryZone" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultDnsRecordInformation.cs b/src/Flipdish/Model/RestApiResultDnsRecordInformation.cs
index 3368adc8..76a1b96a 100644
--- a/src/Flipdish/Model/RestApiResultDnsRecordInformation.cs
+++ b/src/Flipdish/Model/RestApiResultDnsRecordInformation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultDnsRecordInformation :  IEquatable<RestApiResultDnsRecordInformation>, IValidatableObject
+    public partial class RestApiResultDnsRecordInformation :  IEquatable<RestApiResultDnsRecordInformation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultDnsRecordInformation" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultDriver.cs b/src/Flipdish/Model/RestApiResultDriver.cs
deleted file mode 100644
index fb36a5e8..00000000
--- a/src/Flipdish/Model/RestApiResultDriver.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultDriver :  IEquatable<RestApiResultDriver>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultDriver" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultDriver() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultDriver" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultDriver(Driver data = default(Driver))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultDriver and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public Driver Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultDriver {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultDriver);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultDriver instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultDriver to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultDriver input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultEndUserFeeConfig.cs b/src/Flipdish/Model/RestApiResultEndUserFeeConfig.cs
new file mode 100644
index 00000000..0489dd01
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultEndUserFeeConfig.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultEndUserFeeConfig :  IEquatable<RestApiResultEndUserFeeConfig>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultEndUserFeeConfig" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultEndUserFeeConfig() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultEndUserFeeConfig" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultEndUserFeeConfig(EndUserFeeConfig data = default(EndUserFeeConfig))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultEndUserFeeConfig and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public EndUserFeeConfig Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultEndUserFeeConfig {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultEndUserFeeConfig);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultEndUserFeeConfig instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultEndUserFeeConfig to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultEndUserFeeConfig input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultExecuteConfigurationActionResult.cs b/src/Flipdish/Model/RestApiResultExecuteConfigurationActionResult.cs
new file mode 100644
index 00000000..fe8fe9a2
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultExecuteConfigurationActionResult.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultExecuteConfigurationActionResult :  IEquatable<RestApiResultExecuteConfigurationActionResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultExecuteConfigurationActionResult" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultExecuteConfigurationActionResult() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultExecuteConfigurationActionResult" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultExecuteConfigurationActionResult(ExecuteConfigurationActionResult data = default(ExecuteConfigurationActionResult))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultExecuteConfigurationActionResult and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public ExecuteConfigurationActionResult Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultExecuteConfigurationActionResult {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultExecuteConfigurationActionResult);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultExecuteConfigurationActionResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultExecuteConfigurationActionResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultExecuteConfigurationActionResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultFulfillmentStatesConfiguration.cs b/src/Flipdish/Model/RestApiResultFulfillmentStatesConfiguration.cs
index ab82347f..1421d1cf 100644
--- a/src/Flipdish/Model/RestApiResultFulfillmentStatesConfiguration.cs
+++ b/src/Flipdish/Model/RestApiResultFulfillmentStatesConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultFulfillmentStatesConfiguration :  IEquatable<RestApiResultFulfillmentStatesConfiguration>, IValidatableObject
+    public partial class RestApiResultFulfillmentStatesConfiguration :  IEquatable<RestApiResultFulfillmentStatesConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultFulfillmentStatesConfiguration" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultGetEndUserFeeConfigsResponse.cs b/src/Flipdish/Model/RestApiResultGetEndUserFeeConfigsResponse.cs
new file mode 100644
index 00000000..7435aa04
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultGetEndUserFeeConfigsResponse.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultGetEndUserFeeConfigsResponse :  IEquatable<RestApiResultGetEndUserFeeConfigsResponse>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultGetEndUserFeeConfigsResponse" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultGetEndUserFeeConfigsResponse() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultGetEndUserFeeConfigsResponse" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultGetEndUserFeeConfigsResponse(GetEndUserFeeConfigsResponse data = default(GetEndUserFeeConfigsResponse))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultGetEndUserFeeConfigsResponse and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public GetEndUserFeeConfigsResponse Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultGetEndUserFeeConfigsResponse {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultGetEndUserFeeConfigsResponse);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultGetEndUserFeeConfigsResponse instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultGetEndUserFeeConfigsResponse to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultGetEndUserFeeConfigsResponse input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultGroup.cs b/src/Flipdish/Model/RestApiResultGroup.cs
index ed48315c..a3b21875 100644
--- a/src/Flipdish/Model/RestApiResultGroup.cs
+++ b/src/Flipdish/Model/RestApiResultGroup.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultGroup :  IEquatable<RestApiResultGroup>, IValidatableObject
+    public partial class RestApiResultGroup :  IEquatable<RestApiResultGroup>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultGroup" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultHasPaymentMethodResponse.cs b/src/Flipdish/Model/RestApiResultHasPaymentMethodResponse.cs
new file mode 100644
index 00000000..1768adc8
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultHasPaymentMethodResponse.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultHasPaymentMethodResponse :  IEquatable<RestApiResultHasPaymentMethodResponse>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultHasPaymentMethodResponse" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultHasPaymentMethodResponse() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultHasPaymentMethodResponse" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultHasPaymentMethodResponse(HasPaymentMethodResponse data = default(HasPaymentMethodResponse))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultHasPaymentMethodResponse and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public HasPaymentMethodResponse Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultHasPaymentMethodResponse {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultHasPaymentMethodResponse);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultHasPaymentMethodResponse instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultHasPaymentMethodResponse to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultHasPaymentMethodResponse input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultHomeStatistics.cs b/src/Flipdish/Model/RestApiResultHomeStatistics.cs
index b367c499..f6966e63 100644
--- a/src/Flipdish/Model/RestApiResultHomeStatistics.cs
+++ b/src/Flipdish/Model/RestApiResultHomeStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultHomeStatistics :  IEquatable<RestApiResultHomeStatistics>, IValidatableObject
+    public partial class RestApiResultHomeStatistics :  IEquatable<RestApiResultHomeStatistics>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultHomeStatistics" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultHydraConfig.cs b/src/Flipdish/Model/RestApiResultHydraConfig.cs
index 8043aff4..d01bc0f4 100644
--- a/src/Flipdish/Model/RestApiResultHydraConfig.cs
+++ b/src/Flipdish/Model/RestApiResultHydraConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultHydraConfig :  IEquatable<RestApiResultHydraConfig>, IValidatableObject
+    public partial class RestApiResultHydraConfig :  IEquatable<RestApiResultHydraConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultHydraConfig" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultHydraDeviceDetails.cs b/src/Flipdish/Model/RestApiResultHydraDeviceDetails.cs
index ab37ac8f..d2288f11 100644
--- a/src/Flipdish/Model/RestApiResultHydraDeviceDetails.cs
+++ b/src/Flipdish/Model/RestApiResultHydraDeviceDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultHydraDeviceDetails :  IEquatable<RestApiResultHydraDeviceDetails>, IValidatableObject
+    public partial class RestApiResultHydraDeviceDetails :  IEquatable<RestApiResultHydraDeviceDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultHydraDeviceDetails" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultHydraStatus.cs b/src/Flipdish/Model/RestApiResultHydraStatus.cs
index ea8358b8..c2c9d086 100644
--- a/src/Flipdish/Model/RestApiResultHydraStatus.cs
+++ b/src/Flipdish/Model/RestApiResultHydraStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultHydraStatus :  IEquatable<RestApiResultHydraStatus>, IValidatableObject
+    public partial class RestApiResultHydraStatus :  IEquatable<RestApiResultHydraStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultHydraStatus" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultIndexPage.cs b/src/Flipdish/Model/RestApiResultIndexPage.cs
index 0e24ad5e..a9effea7 100644
--- a/src/Flipdish/Model/RestApiResultIndexPage.cs
+++ b/src/Flipdish/Model/RestApiResultIndexPage.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultIndexPage :  IEquatable<RestApiResultIndexPage>, IValidatableObject
+    public partial class RestApiResultIndexPage :  IEquatable<RestApiResultIndexPage>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultIndexPage" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultIndexPageBase.cs b/src/Flipdish/Model/RestApiResultIndexPageBase.cs
index 0e86fa59..218dabfc 100644
--- a/src/Flipdish/Model/RestApiResultIndexPageBase.cs
+++ b/src/Flipdish/Model/RestApiResultIndexPageBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultIndexPageBase :  IEquatable<RestApiResultIndexPageBase>, IValidatableObject
+    public partial class RestApiResultIndexPageBase :  IEquatable<RestApiResultIndexPageBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultIndexPageBase" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultIntercomUserHash.cs b/src/Flipdish/Model/RestApiResultIntercomUserHash.cs
new file mode 100644
index 00000000..71c2ddfd
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultIntercomUserHash.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultIntercomUserHash :  IEquatable<RestApiResultIntercomUserHash>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultIntercomUserHash" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultIntercomUserHash() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultIntercomUserHash" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultIntercomUserHash(IntercomUserHash data = default(IntercomUserHash))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultIntercomUserHash and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public IntercomUserHash Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultIntercomUserHash {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultIntercomUserHash);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultIntercomUserHash instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultIntercomUserHash to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultIntercomUserHash input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultJobResponse.cs b/src/Flipdish/Model/RestApiResultJobResponse.cs
index e0edb552..922c344c 100644
--- a/src/Flipdish/Model/RestApiResultJobResponse.cs
+++ b/src/Flipdish/Model/RestApiResultJobResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultJobResponse :  IEquatable<RestApiResultJobResponse>, IValidatableObject
+    public partial class RestApiResultJobResponse :  IEquatable<RestApiResultJobResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultJobResponse" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultKioskCashSetting.cs b/src/Flipdish/Model/RestApiResultKioskCashSetting.cs
deleted file mode 100644
index ffc2ea3d..00000000
--- a/src/Flipdish/Model/RestApiResultKioskCashSetting.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultKioskCashSetting :  IEquatable<RestApiResultKioskCashSetting>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultKioskCashSetting" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultKioskCashSetting() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultKioskCashSetting" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultKioskCashSetting(KioskCashSetting data = default(KioskCashSetting))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultKioskCashSetting and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public KioskCashSetting Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultKioskCashSetting {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultKioskCashSetting);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultKioskCashSetting instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultKioskCashSetting to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultKioskCashSetting input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultKioskEntitlementsResult.cs b/src/Flipdish/Model/RestApiResultKioskEntitlementsResult.cs
new file mode 100644
index 00000000..02a59d11
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultKioskEntitlementsResult.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultKioskEntitlementsResult :  IEquatable<RestApiResultKioskEntitlementsResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultKioskEntitlementsResult" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultKioskEntitlementsResult() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultKioskEntitlementsResult" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultKioskEntitlementsResult(KioskEntitlementsResult data = default(KioskEntitlementsResult))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultKioskEntitlementsResult and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public KioskEntitlementsResult Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultKioskEntitlementsResult {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultKioskEntitlementsResult);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultKioskEntitlementsResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultKioskEntitlementsResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultKioskEntitlementsResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultKioskIotConnectionParameters.cs b/src/Flipdish/Model/RestApiResultKioskIotConnectionParameters.cs
index a78d3f83..a7296440 100644
--- a/src/Flipdish/Model/RestApiResultKioskIotConnectionParameters.cs
+++ b/src/Flipdish/Model/RestApiResultKioskIotConnectionParameters.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultKioskIotConnectionParameters :  IEquatable<RestApiResultKioskIotConnectionParameters>, IValidatableObject
+    public partial class RestApiResultKioskIotConnectionParameters :  IEquatable<RestApiResultKioskIotConnectionParameters>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultKioskIotConnectionParameters" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultKioskSettings.cs b/src/Flipdish/Model/RestApiResultKioskSettings.cs
new file mode 100644
index 00000000..0aa7f905
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultKioskSettings.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultKioskSettings :  IEquatable<RestApiResultKioskSettings>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultKioskSettings" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultKioskSettings() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultKioskSettings" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultKioskSettings(KioskSettings data = default(KioskSettings))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultKioskSettings and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public KioskSettings Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultKioskSettings {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultKioskSettings);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultKioskSettings instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultKioskSettings to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultKioskSettings input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultKioskStoreSettings.cs b/src/Flipdish/Model/RestApiResultKioskStoreSettings.cs
deleted file mode 100644
index 2800c8e6..00000000
--- a/src/Flipdish/Model/RestApiResultKioskStoreSettings.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultKioskStoreSettings :  IEquatable<RestApiResultKioskStoreSettings>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultKioskStoreSettings" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultKioskStoreSettings() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultKioskStoreSettings" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultKioskStoreSettings(KioskStoreSettings data = default(KioskStoreSettings))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultKioskStoreSettings and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public KioskStoreSettings Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultKioskStoreSettings {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultKioskStoreSettings);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultKioskStoreSettings instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultKioskStoreSettings to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultKioskStoreSettings input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultKioskStripeLocation.cs b/src/Flipdish/Model/RestApiResultKioskStripeLocation.cs
new file mode 100644
index 00000000..33691184
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultKioskStripeLocation.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultKioskStripeLocation :  IEquatable<RestApiResultKioskStripeLocation>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultKioskStripeLocation" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultKioskStripeLocation() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultKioskStripeLocation" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultKioskStripeLocation(KioskStripeLocation data = default(KioskStripeLocation))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultKioskStripeLocation and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public KioskStripeLocation Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultKioskStripeLocation {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultKioskStripeLocation);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultKioskStripeLocation instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultKioskStripeLocation to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultKioskStripeLocation input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultLightspeedSettings.cs b/src/Flipdish/Model/RestApiResultLightspeedSettings.cs
index 58625d13..4e7b02e8 100644
--- a/src/Flipdish/Model/RestApiResultLightspeedSettings.cs
+++ b/src/Flipdish/Model/RestApiResultLightspeedSettings.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultLightspeedSettings :  IEquatable<RestApiResultLightspeedSettings>, IValidatableObject
+    public partial class RestApiResultLightspeedSettings :  IEquatable<RestApiResultLightspeedSettings>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultLightspeedSettings" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultLocationArea.cs b/src/Flipdish/Model/RestApiResultLocationArea.cs
index 637fae00..299733c6 100644
--- a/src/Flipdish/Model/RestApiResultLocationArea.cs
+++ b/src/Flipdish/Model/RestApiResultLocationArea.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultLocationArea :  IEquatable<RestApiResultLocationArea>, IValidatableObject
+    public partial class RestApiResultLocationArea :  IEquatable<RestApiResultLocationArea>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultLocationArea" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultLocationAreaLocation.cs b/src/Flipdish/Model/RestApiResultLocationAreaLocation.cs
index be3f14af..f0acb891 100644
--- a/src/Flipdish/Model/RestApiResultLocationAreaLocation.cs
+++ b/src/Flipdish/Model/RestApiResultLocationAreaLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultLocationAreaLocation :  IEquatable<RestApiResultLocationAreaLocation>, IValidatableObject
+    public partial class RestApiResultLocationAreaLocation :  IEquatable<RestApiResultLocationAreaLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultLocationAreaLocation" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultLocationAreaWithLocations.cs b/src/Flipdish/Model/RestApiResultLocationAreaWithLocations.cs
index 486aed7f..6b542f7c 100644
--- a/src/Flipdish/Model/RestApiResultLocationAreaWithLocations.cs
+++ b/src/Flipdish/Model/RestApiResultLocationAreaWithLocations.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultLocationAreaWithLocations :  IEquatable<RestApiResultLocationAreaWithLocations>, IValidatableObject
+    public partial class RestApiResultLocationAreaWithLocations :  IEquatable<RestApiResultLocationAreaWithLocations>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultLocationAreaWithLocations" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultLoyaltyCampaign.cs b/src/Flipdish/Model/RestApiResultLoyaltyCampaign.cs
index ed5c9fa0..4ad29c06 100644
--- a/src/Flipdish/Model/RestApiResultLoyaltyCampaign.cs
+++ b/src/Flipdish/Model/RestApiResultLoyaltyCampaign.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultLoyaltyCampaign :  IEquatable<RestApiResultLoyaltyCampaign>, IValidatableObject
+    public partial class RestApiResultLoyaltyCampaign :  IEquatable<RestApiResultLoyaltyCampaign>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultLoyaltyCampaign" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMappedLocation.cs b/src/Flipdish/Model/RestApiResultMappedLocation.cs
index ea4c741f..9a7c27ee 100644
--- a/src/Flipdish/Model/RestApiResultMappedLocation.cs
+++ b/src/Flipdish/Model/RestApiResultMappedLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMappedLocation :  IEquatable<RestApiResultMappedLocation>, IValidatableObject
+    public partial class RestApiResultMappedLocation :  IEquatable<RestApiResultMappedLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMappedLocation" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMenu.cs b/src/Flipdish/Model/RestApiResultMenu.cs
index 50b1ad63..f2b98531 100644
--- a/src/Flipdish/Model/RestApiResultMenu.cs
+++ b/src/Flipdish/Model/RestApiResultMenu.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMenu :  IEquatable<RestApiResultMenu>, IValidatableObject
+    public partial class RestApiResultMenu :  IEquatable<RestApiResultMenu>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMenu" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMenuItemOptionSet.cs b/src/Flipdish/Model/RestApiResultMenuItemOptionSet.cs
index 9cd784b1..343b4d09 100644
--- a/src/Flipdish/Model/RestApiResultMenuItemOptionSet.cs
+++ b/src/Flipdish/Model/RestApiResultMenuItemOptionSet.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMenuItemOptionSet :  IEquatable<RestApiResultMenuItemOptionSet>, IValidatableObject
+    public partial class RestApiResultMenuItemOptionSet :  IEquatable<RestApiResultMenuItemOptionSet>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMenuItemOptionSet" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMenuItemOptionSetItem.cs b/src/Flipdish/Model/RestApiResultMenuItemOptionSetItem.cs
index adf3b15a..4dcd97fa 100644
--- a/src/Flipdish/Model/RestApiResultMenuItemOptionSetItem.cs
+++ b/src/Flipdish/Model/RestApiResultMenuItemOptionSetItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMenuItemOptionSetItem :  IEquatable<RestApiResultMenuItemOptionSetItem>, IValidatableObject
+    public partial class RestApiResultMenuItemOptionSetItem :  IEquatable<RestApiResultMenuItemOptionSetItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMenuItemOptionSetItem" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMenuNutritionInfoHeader.cs b/src/Flipdish/Model/RestApiResultMenuNutritionInfoHeader.cs
new file mode 100644
index 00000000..b933a4a4
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultMenuNutritionInfoHeader.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultMenuNutritionInfoHeader :  IEquatable<RestApiResultMenuNutritionInfoHeader>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultMenuNutritionInfoHeader" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultMenuNutritionInfoHeader() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultMenuNutritionInfoHeader" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultMenuNutritionInfoHeader(MenuNutritionInfoHeader data = default(MenuNutritionInfoHeader))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultMenuNutritionInfoHeader and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public MenuNutritionInfoHeader Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultMenuNutritionInfoHeader {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultMenuNutritionInfoHeader);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultMenuNutritionInfoHeader instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultMenuNutritionInfoHeader to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultMenuNutritionInfoHeader input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultMenuSection.cs b/src/Flipdish/Model/RestApiResultMenuSection.cs
index eb6d3b1f..a852346e 100644
--- a/src/Flipdish/Model/RestApiResultMenuSection.cs
+++ b/src/Flipdish/Model/RestApiResultMenuSection.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMenuSection :  IEquatable<RestApiResultMenuSection>, IValidatableObject
+    public partial class RestApiResultMenuSection :  IEquatable<RestApiResultMenuSection>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMenuSection" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMenuSectionAvailability.cs b/src/Flipdish/Model/RestApiResultMenuSectionAvailability.cs
index 59093ec2..f1015030 100644
--- a/src/Flipdish/Model/RestApiResultMenuSectionAvailability.cs
+++ b/src/Flipdish/Model/RestApiResultMenuSectionAvailability.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMenuSectionAvailability :  IEquatable<RestApiResultMenuSectionAvailability>, IValidatableObject
+    public partial class RestApiResultMenuSectionAvailability :  IEquatable<RestApiResultMenuSectionAvailability>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMenuSectionAvailability" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMenuSectionItem.cs b/src/Flipdish/Model/RestApiResultMenuSectionItem.cs
index 9f9d4d25..d2ea798b 100644
--- a/src/Flipdish/Model/RestApiResultMenuSectionItem.cs
+++ b/src/Flipdish/Model/RestApiResultMenuSectionItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMenuSectionItem :  IEquatable<RestApiResultMenuSectionItem>, IValidatableObject
+    public partial class RestApiResultMenuSectionItem :  IEquatable<RestApiResultMenuSectionItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMenuSectionItem" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMenuZone.cs b/src/Flipdish/Model/RestApiResultMenuZone.cs
new file mode 100644
index 00000000..c5cece70
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultMenuZone.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultMenuZone :  IEquatable<RestApiResultMenuZone>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultMenuZone" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultMenuZone() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultMenuZone" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultMenuZone(MenuZone data = default(MenuZone))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultMenuZone and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public MenuZone Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultMenuZone {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultMenuZone);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultMenuZone instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultMenuZone to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultMenuZone input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultMetadata.cs b/src/Flipdish/Model/RestApiResultMetadata.cs
index a1cf4bf8..8ade16e9 100644
--- a/src/Flipdish/Model/RestApiResultMetadata.cs
+++ b/src/Flipdish/Model/RestApiResultMetadata.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMetadata :  IEquatable<RestApiResultMetadata>, IValidatableObject
+    public partial class RestApiResultMetadata :  IEquatable<RestApiResultMetadata>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMetadata" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMetafieldDefinition.cs b/src/Flipdish/Model/RestApiResultMetafieldDefinition.cs
index d008dd0b..9536319a 100644
--- a/src/Flipdish/Model/RestApiResultMetafieldDefinition.cs
+++ b/src/Flipdish/Model/RestApiResultMetafieldDefinition.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMetafieldDefinition :  IEquatable<RestApiResultMetafieldDefinition>, IValidatableObject
+    public partial class RestApiResultMetafieldDefinition :  IEquatable<RestApiResultMetafieldDefinition>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMetafieldDefinition" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMobileAppsDetails.cs b/src/Flipdish/Model/RestApiResultMobileAppsDetails.cs
deleted file mode 100644
index a8df31d1..00000000
--- a/src/Flipdish/Model/RestApiResultMobileAppsDetails.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultMobileAppsDetails :  IEquatable<RestApiResultMobileAppsDetails>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultMobileAppsDetails" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultMobileAppsDetails() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultMobileAppsDetails" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultMobileAppsDetails(MobileAppsDetails data = default(MobileAppsDetails))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultMobileAppsDetails and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public MobileAppsDetails Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultMobileAppsDetails {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultMobileAppsDetails);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultMobileAppsDetails instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultMobileAppsDetails to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultMobileAppsDetails input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultMobileAppsImage.cs b/src/Flipdish/Model/RestApiResultMobileAppsImage.cs
index f8433fbe..aa6ff5aa 100644
--- a/src/Flipdish/Model/RestApiResultMobileAppsImage.cs
+++ b/src/Flipdish/Model/RestApiResultMobileAppsImage.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMobileAppsImage :  IEquatable<RestApiResultMobileAppsImage>, IValidatableObject
+    public partial class RestApiResultMobileAppsImage :  IEquatable<RestApiResultMobileAppsImage>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMobileAppsImage" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMobileAppsSubmission.cs b/src/Flipdish/Model/RestApiResultMobileAppsSubmission.cs
index dae7395d..c5a6c2d2 100644
--- a/src/Flipdish/Model/RestApiResultMobileAppsSubmission.cs
+++ b/src/Flipdish/Model/RestApiResultMobileAppsSubmission.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMobileAppsSubmission :  IEquatable<RestApiResultMobileAppsSubmission>, IValidatableObject
+    public partial class RestApiResultMobileAppsSubmission :  IEquatable<RestApiResultMobileAppsSubmission>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMobileAppsSubmission" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMobileAppsSubmissionDetails.cs b/src/Flipdish/Model/RestApiResultMobileAppsSubmissionDetails.cs
index 3f10c1d1..b671fdcb 100644
--- a/src/Flipdish/Model/RestApiResultMobileAppsSubmissionDetails.cs
+++ b/src/Flipdish/Model/RestApiResultMobileAppsSubmissionDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMobileAppsSubmissionDetails :  IEquatable<RestApiResultMobileAppsSubmissionDetails>, IValidatableObject
+    public partial class RestApiResultMobileAppsSubmissionDetails :  IEquatable<RestApiResultMobileAppsSubmissionDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMobileAppsSubmissionDetails" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultMobileAppsSubmissionStatus.cs b/src/Flipdish/Model/RestApiResultMobileAppsSubmissionStatus.cs
index 620b8860..80e1a9de 100644
--- a/src/Flipdish/Model/RestApiResultMobileAppsSubmissionStatus.cs
+++ b/src/Flipdish/Model/RestApiResultMobileAppsSubmissionStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultMobileAppsSubmissionStatus :  IEquatable<RestApiResultMobileAppsSubmissionStatus>, IValidatableObject
+    public partial class RestApiResultMobileAppsSubmissionStatus :  IEquatable<RestApiResultMobileAppsSubmissionStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultMobileAppsSubmissionStatus" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultModelBase.cs b/src/Flipdish/Model/RestApiResultModelBase.cs
index cf397d08..b8c50afe 100644
--- a/src/Flipdish/Model/RestApiResultModelBase.cs
+++ b/src/Flipdish/Model/RestApiResultModelBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultModelBase :  IEquatable<RestApiResultModelBase>, IValidatableObject
+    public partial class RestApiResultModelBase :  IEquatable<RestApiResultModelBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultModelBase" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultNutritionInfo.cs b/src/Flipdish/Model/RestApiResultNutritionInfo.cs
new file mode 100644
index 00000000..f3ab87fb
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultNutritionInfo.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultNutritionInfo :  IEquatable<RestApiResultNutritionInfo>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultNutritionInfo" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultNutritionInfo() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultNutritionInfo" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultNutritionInfo(NutritionInfo data = default(NutritionInfo))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultNutritionInfo and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public NutritionInfo Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultNutritionInfo {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultNutritionInfo);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultNutritionInfo instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultNutritionInfo to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultNutritionInfo input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultNutritionInfoV2.cs b/src/Flipdish/Model/RestApiResultNutritionInfoV2.cs
new file mode 100644
index 00000000..df62a5cc
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultNutritionInfoV2.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultNutritionInfoV2 :  IEquatable<RestApiResultNutritionInfoV2>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultNutritionInfoV2" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultNutritionInfoV2() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultNutritionInfoV2" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultNutritionInfoV2(NutritionInfoV2 data = default(NutritionInfoV2))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultNutritionInfoV2 and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public NutritionInfoV2 Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultNutritionInfoV2 {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultNutritionInfoV2);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultNutritionInfoV2 instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultNutritionInfoV2 to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultNutritionInfoV2 input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultOAuthApp.cs b/src/Flipdish/Model/RestApiResultOAuthApp.cs
index 15672e6c..e647e8f0 100644
--- a/src/Flipdish/Model/RestApiResultOAuthApp.cs
+++ b/src/Flipdish/Model/RestApiResultOAuthApp.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOAuthApp :  IEquatable<RestApiResultOAuthApp>, IValidatableObject
+    public partial class RestApiResultOAuthApp :  IEquatable<RestApiResultOAuthApp>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOAuthApp" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultOauthClientRedirectUri.cs b/src/Flipdish/Model/RestApiResultOauthClientRedirectUri.cs
index 1b7ec196..db313dc8 100644
--- a/src/Flipdish/Model/RestApiResultOauthClientRedirectUri.cs
+++ b/src/Flipdish/Model/RestApiResultOauthClientRedirectUri.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOauthClientRedirectUri :  IEquatable<RestApiResultOauthClientRedirectUri>, IValidatableObject
+    public partial class RestApiResultOauthClientRedirectUri :  IEquatable<RestApiResultOauthClientRedirectUri>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOauthClientRedirectUri" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultOktaPortalFeatureFlag.cs b/src/Flipdish/Model/RestApiResultOktaPortalFeatureFlag.cs
new file mode 100644
index 00000000..6b47ca8c
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultOktaPortalFeatureFlag.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultOktaPortalFeatureFlag :  IEquatable<RestApiResultOktaPortalFeatureFlag>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultOktaPortalFeatureFlag" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultOktaPortalFeatureFlag() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultOktaPortalFeatureFlag" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultOktaPortalFeatureFlag(OktaPortalFeatureFlag data = default(OktaPortalFeatureFlag))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultOktaPortalFeatureFlag and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public OktaPortalFeatureFlag Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultOktaPortalFeatureFlag {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultOktaPortalFeatureFlag);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultOktaPortalFeatureFlag instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultOktaPortalFeatureFlag to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultOktaPortalFeatureFlag input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultOrder.cs b/src/Flipdish/Model/RestApiResultOrder.cs
index e82db3ba..de726fcc 100644
--- a/src/Flipdish/Model/RestApiResultOrder.cs
+++ b/src/Flipdish/Model/RestApiResultOrder.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOrder :  IEquatable<RestApiResultOrder>, IValidatableObject
+    public partial class RestApiResultOrder :  IEquatable<RestApiResultOrder>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOrder" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultOrderBatch.cs b/src/Flipdish/Model/RestApiResultOrderBatch.cs
index 00aece5a..c70f194f 100644
--- a/src/Flipdish/Model/RestApiResultOrderBatch.cs
+++ b/src/Flipdish/Model/RestApiResultOrderBatch.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOrderBatch :  IEquatable<RestApiResultOrderBatch>, IValidatableObject
+    public partial class RestApiResultOrderBatch :  IEquatable<RestApiResultOrderBatch>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOrderBatch" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultOrderBatchingConfiguration.cs b/src/Flipdish/Model/RestApiResultOrderBatchingConfiguration.cs
index eaf1a928..23686e1c 100644
--- a/src/Flipdish/Model/RestApiResultOrderBatchingConfiguration.cs
+++ b/src/Flipdish/Model/RestApiResultOrderBatchingConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOrderBatchingConfiguration :  IEquatable<RestApiResultOrderBatchingConfiguration>, IValidatableObject
+    public partial class RestApiResultOrderBatchingConfiguration :  IEquatable<RestApiResultOrderBatchingConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOrderBatchingConfiguration" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultOrderDeliveryInformation.cs b/src/Flipdish/Model/RestApiResultOrderDeliveryInformation.cs
index e42d6ac8..19805f62 100644
--- a/src/Flipdish/Model/RestApiResultOrderDeliveryInformation.cs
+++ b/src/Flipdish/Model/RestApiResultOrderDeliveryInformation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOrderDeliveryInformation :  IEquatable<RestApiResultOrderDeliveryInformation>, IValidatableObject
+    public partial class RestApiResultOrderDeliveryInformation :  IEquatable<RestApiResultOrderDeliveryInformation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOrderDeliveryInformation" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultOrderFulfillmentStatus.cs b/src/Flipdish/Model/RestApiResultOrderFulfillmentStatus.cs
index c273f7a8..5400f320 100644
--- a/src/Flipdish/Model/RestApiResultOrderFulfillmentStatus.cs
+++ b/src/Flipdish/Model/RestApiResultOrderFulfillmentStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOrderFulfillmentStatus :  IEquatable<RestApiResultOrderFulfillmentStatus>, IValidatableObject
+    public partial class RestApiResultOrderFulfillmentStatus :  IEquatable<RestApiResultOrderFulfillmentStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOrderFulfillmentStatus" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultOrderFulfillmentStatusWithConfigurationActions.cs b/src/Flipdish/Model/RestApiResultOrderFulfillmentStatusWithConfigurationActions.cs
index 9788c1fe..0d99c098 100644
--- a/src/Flipdish/Model/RestApiResultOrderFulfillmentStatusWithConfigurationActions.cs
+++ b/src/Flipdish/Model/RestApiResultOrderFulfillmentStatusWithConfigurationActions.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOrderFulfillmentStatusWithConfigurationActions :  IEquatable<RestApiResultOrderFulfillmentStatusWithConfigurationActions>, IValidatableObject
+    public partial class RestApiResultOrderFulfillmentStatusWithConfigurationActions :  IEquatable<RestApiResultOrderFulfillmentStatusWithConfigurationActions>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOrderFulfillmentStatusWithConfigurationActions" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultOrderIngestSubmitOrderResponse.cs b/src/Flipdish/Model/RestApiResultOrderIngestSubmitOrderResponse.cs
deleted file mode 100644
index ec5749d3..00000000
--- a/src/Flipdish/Model/RestApiResultOrderIngestSubmitOrderResponse.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultOrderIngestSubmitOrderResponse :  IEquatable<RestApiResultOrderIngestSubmitOrderResponse>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultOrderIngestSubmitOrderResponse" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultOrderIngestSubmitOrderResponse() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultOrderIngestSubmitOrderResponse" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultOrderIngestSubmitOrderResponse(OrderIngestSubmitOrderResponse data = default(OrderIngestSubmitOrderResponse))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultOrderIngestSubmitOrderResponse and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public OrderIngestSubmitOrderResponse Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultOrderIngestSubmitOrderResponse {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultOrderIngestSubmitOrderResponse);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultOrderIngestSubmitOrderResponse instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultOrderIngestSubmitOrderResponse to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultOrderIngestSubmitOrderResponse input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultOrderLeadTimes.cs b/src/Flipdish/Model/RestApiResultOrderLeadTimes.cs
new file mode 100644
index 00000000..feac3386
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultOrderLeadTimes.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultOrderLeadTimes :  IEquatable<RestApiResultOrderLeadTimes>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultOrderLeadTimes" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultOrderLeadTimes() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultOrderLeadTimes" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultOrderLeadTimes(OrderLeadTimes data = default(OrderLeadTimes))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultOrderLeadTimes and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public OrderLeadTimes Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultOrderLeadTimes {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultOrderLeadTimes);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultOrderLeadTimes instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultOrderLeadTimes to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultOrderLeadTimes input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultOrderPaymentInformation.cs b/src/Flipdish/Model/RestApiResultOrderPaymentInformation.cs
index d05d968c..8ca63312 100644
--- a/src/Flipdish/Model/RestApiResultOrderPaymentInformation.cs
+++ b/src/Flipdish/Model/RestApiResultOrderPaymentInformation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultOrderPaymentInformation :  IEquatable<RestApiResultOrderPaymentInformation>, IValidatableObject
+    public partial class RestApiResultOrderPaymentInformation :  IEquatable<RestApiResultOrderPaymentInformation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultOrderPaymentInformation" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultPaymentIntent.cs b/src/Flipdish/Model/RestApiResultPaymentIntent.cs
index 7a885adb..4de44dff 100644
--- a/src/Flipdish/Model/RestApiResultPaymentIntent.cs
+++ b/src/Flipdish/Model/RestApiResultPaymentIntent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultPaymentIntent :  IEquatable<RestApiResultPaymentIntent>, IValidatableObject
+    public partial class RestApiResultPaymentIntent :  IEquatable<RestApiResultPaymentIntent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultPaymentIntent" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultPaymentTerminalDetails.cs b/src/Flipdish/Model/RestApiResultPaymentTerminalDetails.cs
index c6d14c9a..cd070321 100644
--- a/src/Flipdish/Model/RestApiResultPaymentTerminalDetails.cs
+++ b/src/Flipdish/Model/RestApiResultPaymentTerminalDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultPaymentTerminalDetails :  IEquatable<RestApiResultPaymentTerminalDetails>, IValidatableObject
+    public partial class RestApiResultPaymentTerminalDetails :  IEquatable<RestApiResultPaymentTerminalDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultPaymentTerminalDetails" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultPaymentTerminalTransactionDetails.cs b/src/Flipdish/Model/RestApiResultPaymentTerminalTransactionDetails.cs
index d546d532..1cb9fe30 100644
--- a/src/Flipdish/Model/RestApiResultPaymentTerminalTransactionDetails.cs
+++ b/src/Flipdish/Model/RestApiResultPaymentTerminalTransactionDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultPaymentTerminalTransactionDetails :  IEquatable<RestApiResultPaymentTerminalTransactionDetails>, IValidatableObject
+    public partial class RestApiResultPaymentTerminalTransactionDetails :  IEquatable<RestApiResultPaymentTerminalTransactionDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultPaymentTerminalTransactionDetails" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultPayoutReport3Details.cs b/src/Flipdish/Model/RestApiResultPayoutReport3Details.cs
new file mode 100644
index 00000000..faf764e7
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultPayoutReport3Details.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultPayoutReport3Details :  IEquatable<RestApiResultPayoutReport3Details>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPayoutReport3Details" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultPayoutReport3Details() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPayoutReport3Details" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultPayoutReport3Details(PayoutReport3Details data = default(PayoutReport3Details))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultPayoutReport3Details and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public PayoutReport3Details Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultPayoutReport3Details {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultPayoutReport3Details);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultPayoutReport3Details instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultPayoutReport3Details to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultPayoutReport3Details input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultPayoutReport3Overview.cs b/src/Flipdish/Model/RestApiResultPayoutReport3Overview.cs
new file mode 100644
index 00000000..ed689c5c
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultPayoutReport3Overview.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultPayoutReport3Overview :  IEquatable<RestApiResultPayoutReport3Overview>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPayoutReport3Overview" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultPayoutReport3Overview() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPayoutReport3Overview" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultPayoutReport3Overview(PayoutReport3Overview data = default(PayoutReport3Overview))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultPayoutReport3Overview and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public PayoutReport3Overview Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultPayoutReport3Overview {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultPayoutReport3Overview);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultPayoutReport3Overview instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultPayoutReport3Overview to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultPayoutReport3Overview input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultPayoutReport3PropertyDetails.cs b/src/Flipdish/Model/RestApiResultPayoutReport3PropertyDetails.cs
new file mode 100644
index 00000000..a5b27295
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultPayoutReport3PropertyDetails.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultPayoutReport3PropertyDetails :  IEquatable<RestApiResultPayoutReport3PropertyDetails>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPayoutReport3PropertyDetails" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultPayoutReport3PropertyDetails() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPayoutReport3PropertyDetails" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultPayoutReport3PropertyDetails(PayoutReport3PropertyDetails data = default(PayoutReport3PropertyDetails))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultPayoutReport3PropertyDetails and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public PayoutReport3PropertyDetails Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultPayoutReport3PropertyDetails {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultPayoutReport3PropertyDetails);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultPayoutReport3PropertyDetails instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultPayoutReport3PropertyDetails to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultPayoutReport3PropertyDetails input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultPayoutReport3StorePayouts.cs b/src/Flipdish/Model/RestApiResultPayoutReport3StorePayouts.cs
new file mode 100644
index 00000000..0e74d314
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultPayoutReport3StorePayouts.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultPayoutReport3StorePayouts :  IEquatable<RestApiResultPayoutReport3StorePayouts>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPayoutReport3StorePayouts" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultPayoutReport3StorePayouts() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPayoutReport3StorePayouts" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultPayoutReport3StorePayouts(PayoutReport3StorePayouts data = default(PayoutReport3StorePayouts))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultPayoutReport3StorePayouts and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public PayoutReport3StorePayouts Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultPayoutReport3StorePayouts {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultPayoutReport3StorePayouts);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultPayoutReport3StorePayouts instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultPayoutReport3StorePayouts to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultPayoutReport3StorePayouts input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultPixelPointProductCatalogue.cs b/src/Flipdish/Model/RestApiResultPixelPointProductCatalogue.cs
new file mode 100644
index 00000000..7137434b
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultPixelPointProductCatalogue.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultPixelPointProductCatalogue :  IEquatable<RestApiResultPixelPointProductCatalogue>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPixelPointProductCatalogue" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultPixelPointProductCatalogue() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPixelPointProductCatalogue" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultPixelPointProductCatalogue(PixelPointProductCatalogue data = default(PixelPointProductCatalogue))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultPixelPointProductCatalogue and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public PixelPointProductCatalogue Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultPixelPointProductCatalogue {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultPixelPointProductCatalogue);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultPixelPointProductCatalogue instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultPixelPointProductCatalogue to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultPixelPointProductCatalogue input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultPlayStoreConfigModel.cs b/src/Flipdish/Model/RestApiResultPlayStoreConfigModel.cs
new file mode 100644
index 00000000..a918317f
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultPlayStoreConfigModel.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultPlayStoreConfigModel :  IEquatable<RestApiResultPlayStoreConfigModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPlayStoreConfigModel" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultPlayStoreConfigModel() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultPlayStoreConfigModel" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultPlayStoreConfigModel(PlayStoreConfigModel data = default(PlayStoreConfigModel))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultPlayStoreConfigModel and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public PlayStoreConfigModel Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultPlayStoreConfigModel {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultPlayStoreConfigModel);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultPlayStoreConfigModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultPlayStoreConfigModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultPlayStoreConfigModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultPreOrderConfig.cs b/src/Flipdish/Model/RestApiResultPreOrderConfig.cs
index ea167f14..84e9f694 100644
--- a/src/Flipdish/Model/RestApiResultPreOrderConfig.cs
+++ b/src/Flipdish/Model/RestApiResultPreOrderConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultPreOrderConfig :  IEquatable<RestApiResultPreOrderConfig>, IValidatableObject
+    public partial class RestApiResultPreOrderConfig :  IEquatable<RestApiResultPreOrderConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultPreOrderConfig" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultProcessingFeeConfig.cs b/src/Flipdish/Model/RestApiResultProcessingFeeConfig.cs
index 56b11243..a4a97baf 100644
--- a/src/Flipdish/Model/RestApiResultProcessingFeeConfig.cs
+++ b/src/Flipdish/Model/RestApiResultProcessingFeeConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultProcessingFeeConfig :  IEquatable<RestApiResultProcessingFeeConfig>, IValidatableObject
+    public partial class RestApiResultProcessingFeeConfig :  IEquatable<RestApiResultProcessingFeeConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultProcessingFeeConfig" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultProduct.cs b/src/Flipdish/Model/RestApiResultProduct.cs
index 4a688f3a..aafe8ac1 100644
--- a/src/Flipdish/Model/RestApiResultProduct.cs
+++ b/src/Flipdish/Model/RestApiResultProduct.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultProduct :  IEquatable<RestApiResultProduct>, IValidatableObject
+    public partial class RestApiResultProduct :  IEquatable<RestApiResultProduct>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultProduct" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultPushNotificationResponse.cs b/src/Flipdish/Model/RestApiResultPushNotificationResponse.cs
index cf6bab77..3c32b434 100644
--- a/src/Flipdish/Model/RestApiResultPushNotificationResponse.cs
+++ b/src/Flipdish/Model/RestApiResultPushNotificationResponse.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultPushNotificationResponse :  IEquatable<RestApiResultPushNotificationResponse>, IValidatableObject
+    public partial class RestApiResultPushNotificationResponse :  IEquatable<RestApiResultPushNotificationResponse>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultPushNotificationResponse" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultRedeemInvitationResult.cs b/src/Flipdish/Model/RestApiResultRedeemInvitationResult.cs
index 5cb95bf8..0839b663 100644
--- a/src/Flipdish/Model/RestApiResultRedeemInvitationResult.cs
+++ b/src/Flipdish/Model/RestApiResultRedeemInvitationResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultRedeemInvitationResult :  IEquatable<RestApiResultRedeemInvitationResult>, IValidatableObject
+    public partial class RestApiResultRedeemInvitationResult :  IEquatable<RestApiResultRedeemInvitationResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultRedeemInvitationResult" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultRestApiDefaultResponse.cs b/src/Flipdish/Model/RestApiResultRestApiDefaultResponse.cs
new file mode 100644
index 00000000..58f00366
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultRestApiDefaultResponse.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultRestApiDefaultResponse :  IEquatable<RestApiResultRestApiDefaultResponse>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultRestApiDefaultResponse" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultRestApiDefaultResponse() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultRestApiDefaultResponse" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultRestApiDefaultResponse(RestApiDefaultResponse data = default(RestApiDefaultResponse))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultRestApiDefaultResponse and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public RestApiDefaultResponse Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultRestApiDefaultResponse {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultRestApiDefaultResponse);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultRestApiDefaultResponse instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultRestApiDefaultResponse to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultRestApiDefaultResponse input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultRestApiIntegerResult.cs b/src/Flipdish/Model/RestApiResultRestApiIntegerResult.cs
new file mode 100644
index 00000000..b5baa854
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultRestApiIntegerResult.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultRestApiIntegerResult :  IEquatable<RestApiResultRestApiIntegerResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultRestApiIntegerResult" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultRestApiIntegerResult() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultRestApiIntegerResult" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultRestApiIntegerResult(RestApiIntegerResult data = default(RestApiIntegerResult))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultRestApiIntegerResult and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public RestApiIntegerResult Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultRestApiIntegerResult {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultRestApiIntegerResult);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultRestApiIntegerResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultRestApiIntegerResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultRestApiIntegerResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultRestaurantVoucherPayGreenConfiguration.cs b/src/Flipdish/Model/RestApiResultRestaurantVoucherPayGreenConfiguration.cs
new file mode 100644
index 00000000..d5ccc272
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultRestaurantVoucherPayGreenConfiguration.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultRestaurantVoucherPayGreenConfiguration :  IEquatable<RestApiResultRestaurantVoucherPayGreenConfiguration>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultRestaurantVoucherPayGreenConfiguration" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultRestaurantVoucherPayGreenConfiguration() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultRestaurantVoucherPayGreenConfiguration" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultRestaurantVoucherPayGreenConfiguration(RestaurantVoucherPayGreenConfiguration data = default(RestaurantVoucherPayGreenConfiguration))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultRestaurantVoucherPayGreenConfiguration and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public RestaurantVoucherPayGreenConfiguration Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultRestaurantVoucherPayGreenConfiguration {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultRestaurantVoucherPayGreenConfiguration);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultRestaurantVoucherPayGreenConfiguration instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultRestaurantVoucherPayGreenConfiguration to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultRestaurantVoucherPayGreenConfiguration input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultRestaurantVoucherPayGreenStoreConfiguration.cs b/src/Flipdish/Model/RestApiResultRestaurantVoucherPayGreenStoreConfiguration.cs
new file mode 100644
index 00000000..52bea6e6
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultRestaurantVoucherPayGreenStoreConfiguration.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultRestaurantVoucherPayGreenStoreConfiguration :  IEquatable<RestApiResultRestaurantVoucherPayGreenStoreConfiguration>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultRestaurantVoucherPayGreenStoreConfiguration" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultRestaurantVoucherPayGreenStoreConfiguration() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultRestaurantVoucherPayGreenStoreConfiguration" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultRestaurantVoucherPayGreenStoreConfiguration(RestaurantVoucherPayGreenStoreConfiguration data = default(RestaurantVoucherPayGreenStoreConfiguration))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultRestaurantVoucherPayGreenStoreConfiguration and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public RestaurantVoucherPayGreenStoreConfiguration Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultRestaurantVoucherPayGreenStoreConfiguration {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultRestaurantVoucherPayGreenStoreConfiguration);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultRestaurantVoucherPayGreenStoreConfiguration instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultRestaurantVoucherPayGreenStoreConfiguration to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultRestaurantVoucherPayGreenStoreConfiguration input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultRetentionCampaign.cs b/src/Flipdish/Model/RestApiResultRetentionCampaign.cs
index 68e5fb31..1a200453 100644
--- a/src/Flipdish/Model/RestApiResultRetentionCampaign.cs
+++ b/src/Flipdish/Model/RestApiResultRetentionCampaign.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultRetentionCampaign :  IEquatable<RestApiResultRetentionCampaign>, IValidatableObject
+    public partial class RestApiResultRetentionCampaign :  IEquatable<RestApiResultRetentionCampaign>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultRetentionCampaign" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultServiceCharge.cs b/src/Flipdish/Model/RestApiResultServiceCharge.cs
index 5992beac..43cfd48a 100644
--- a/src/Flipdish/Model/RestApiResultServiceCharge.cs
+++ b/src/Flipdish/Model/RestApiResultServiceCharge.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultServiceCharge :  IEquatable<RestApiResultServiceCharge>, IValidatableObject
+    public partial class RestApiResultServiceCharge :  IEquatable<RestApiResultServiceCharge>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultServiceCharge" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultSetV2FeeCalculationRequest.cs b/src/Flipdish/Model/RestApiResultSetV2FeeCalculationRequest.cs
new file mode 100644
index 00000000..c46d102e
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultSetV2FeeCalculationRequest.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultSetV2FeeCalculationRequest :  IEquatable<RestApiResultSetV2FeeCalculationRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultSetV2FeeCalculationRequest" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultSetV2FeeCalculationRequest() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultSetV2FeeCalculationRequest" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultSetV2FeeCalculationRequest(SetV2FeeCalculationRequest data = default(SetV2FeeCalculationRequest))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultSetV2FeeCalculationRequest and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public SetV2FeeCalculationRequest Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultSetV2FeeCalculationRequest {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultSetV2FeeCalculationRequest);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultSetV2FeeCalculationRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultSetV2FeeCalculationRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultSetV2FeeCalculationRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultSmsProviderCredential.cs b/src/Flipdish/Model/RestApiResultSmsProviderCredential.cs
new file mode 100644
index 00000000..a3305171
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultSmsProviderCredential.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultSmsProviderCredential :  IEquatable<RestApiResultSmsProviderCredential>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultSmsProviderCredential" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultSmsProviderCredential() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultSmsProviderCredential" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultSmsProviderCredential(SmsProviderCredential data = default(SmsProviderCredential))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultSmsProviderCredential and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public SmsProviderCredential Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultSmsProviderCredential {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultSmsProviderCredential);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultSmsProviderCredential instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultSmsProviderCredential to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultSmsProviderCredential input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultStore.cs b/src/Flipdish/Model/RestApiResultStore.cs
index 3effcdde..7a6f5cf3 100644
--- a/src/Flipdish/Model/RestApiResultStore.cs
+++ b/src/Flipdish/Model/RestApiResultStore.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStore :  IEquatable<RestApiResultStore>, IValidatableObject
+    public partial class RestApiResultStore :  IEquatable<RestApiResultStore>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStore" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStoreAddress.cs b/src/Flipdish/Model/RestApiResultStoreAddress.cs
index e41f7705..90a334d5 100644
--- a/src/Flipdish/Model/RestApiResultStoreAddress.cs
+++ b/src/Flipdish/Model/RestApiResultStoreAddress.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStoreAddress :  IEquatable<RestApiResultStoreAddress>, IValidatableObject
+    public partial class RestApiResultStoreAddress :  IEquatable<RestApiResultStoreAddress>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStoreAddress" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStoreChannelAssignment.cs b/src/Flipdish/Model/RestApiResultStoreChannelAssignment.cs
index 4c2180db..af7bd71e 100644
--- a/src/Flipdish/Model/RestApiResultStoreChannelAssignment.cs
+++ b/src/Flipdish/Model/RestApiResultStoreChannelAssignment.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStoreChannelAssignment :  IEquatable<RestApiResultStoreChannelAssignment>, IValidatableObject
+    public partial class RestApiResultStoreChannelAssignment :  IEquatable<RestApiResultStoreChannelAssignment>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStoreChannelAssignment" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStoreEndOfDayReport.cs b/src/Flipdish/Model/RestApiResultStoreEndOfDayReport.cs
index 3009223c..7ba9bed4 100644
--- a/src/Flipdish/Model/RestApiResultStoreEndOfDayReport.cs
+++ b/src/Flipdish/Model/RestApiResultStoreEndOfDayReport.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStoreEndOfDayReport :  IEquatable<RestApiResultStoreEndOfDayReport>, IValidatableObject
+    public partial class RestApiResultStoreEndOfDayReport :  IEquatable<RestApiResultStoreEndOfDayReport>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStoreEndOfDayReport" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStoreGroup.cs b/src/Flipdish/Model/RestApiResultStoreGroup.cs
index 228f601f..f81216e4 100644
--- a/src/Flipdish/Model/RestApiResultStoreGroup.cs
+++ b/src/Flipdish/Model/RestApiResultStoreGroup.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStoreGroup :  IEquatable<RestApiResultStoreGroup>, IValidatableObject
+    public partial class RestApiResultStoreGroup :  IEquatable<RestApiResultStoreGroup>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStoreGroup" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStoreGroupBase.cs b/src/Flipdish/Model/RestApiResultStoreGroupBase.cs
index 48fe292a..88a17e75 100644
--- a/src/Flipdish/Model/RestApiResultStoreGroupBase.cs
+++ b/src/Flipdish/Model/RestApiResultStoreGroupBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStoreGroupBase :  IEquatable<RestApiResultStoreGroupBase>, IValidatableObject
+    public partial class RestApiResultStoreGroupBase :  IEquatable<RestApiResultStoreGroupBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStoreGroupBase" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStoreKioskSettings.cs b/src/Flipdish/Model/RestApiResultStoreKioskSettings.cs
deleted file mode 100644
index 6347a958..00000000
--- a/src/Flipdish/Model/RestApiResultStoreKioskSettings.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultStoreKioskSettings :  IEquatable<RestApiResultStoreKioskSettings>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultStoreKioskSettings" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultStoreKioskSettings() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultStoreKioskSettings" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultStoreKioskSettings(StoreKioskSettings data = default(StoreKioskSettings))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultStoreKioskSettings and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public StoreKioskSettings Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultStoreKioskSettings {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultStoreKioskSettings);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultStoreKioskSettings instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultStoreKioskSettings to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultStoreKioskSettings input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultStoreOrderCapacityConfig.cs b/src/Flipdish/Model/RestApiResultStoreOrderCapacityConfig.cs
index 686fbff5..c02d0672 100644
--- a/src/Flipdish/Model/RestApiResultStoreOrderCapacityConfig.cs
+++ b/src/Flipdish/Model/RestApiResultStoreOrderCapacityConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStoreOrderCapacityConfig :  IEquatable<RestApiResultStoreOrderCapacityConfig>, IValidatableObject
+    public partial class RestApiResultStoreOrderCapacityConfig :  IEquatable<RestApiResultStoreOrderCapacityConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStoreOrderCapacityConfig" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStripeConnectedAccount.cs b/src/Flipdish/Model/RestApiResultStripeConnectedAccount.cs
index 74b15167..8f908c15 100644
--- a/src/Flipdish/Model/RestApiResultStripeConnectedAccount.cs
+++ b/src/Flipdish/Model/RestApiResultStripeConnectedAccount.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStripeConnectedAccount :  IEquatable<RestApiResultStripeConnectedAccount>, IValidatableObject
+    public partial class RestApiResultStripeConnectedAccount :  IEquatable<RestApiResultStripeConnectedAccount>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStripeConnectedAccount" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStripeTerminalConnectionToken.cs b/src/Flipdish/Model/RestApiResultStripeTerminalConnectionToken.cs
index f37a63ca..b322345f 100644
--- a/src/Flipdish/Model/RestApiResultStripeTerminalConnectionToken.cs
+++ b/src/Flipdish/Model/RestApiResultStripeTerminalConnectionToken.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStripeTerminalConnectionToken :  IEquatable<RestApiResultStripeTerminalConnectionToken>, IValidatableObject
+    public partial class RestApiResultStripeTerminalConnectionToken :  IEquatable<RestApiResultStripeTerminalConnectionToken>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStripeTerminalConnectionToken" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStripeTerminalLocation.cs b/src/Flipdish/Model/RestApiResultStripeTerminalLocation.cs
index 0d5f25b1..727f2760 100644
--- a/src/Flipdish/Model/RestApiResultStripeTerminalLocation.cs
+++ b/src/Flipdish/Model/RestApiResultStripeTerminalLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStripeTerminalLocation :  IEquatable<RestApiResultStripeTerminalLocation>, IValidatableObject
+    public partial class RestApiResultStripeTerminalLocation :  IEquatable<RestApiResultStripeTerminalLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStripeTerminalLocation" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultStripeTerminalPrivateKey.cs b/src/Flipdish/Model/RestApiResultStripeTerminalPrivateKey.cs
deleted file mode 100644
index 9afb9c72..00000000
--- a/src/Flipdish/Model/RestApiResultStripeTerminalPrivateKey.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultStripeTerminalPrivateKey :  IEquatable<RestApiResultStripeTerminalPrivateKey>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultStripeTerminalPrivateKey" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultStripeTerminalPrivateKey() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultStripeTerminalPrivateKey" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultStripeTerminalPrivateKey(StripeTerminalPrivateKey data = default(StripeTerminalPrivateKey))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultStripeTerminalPrivateKey and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public StripeTerminalPrivateKey Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultStripeTerminalPrivateKey {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultStripeTerminalPrivateKey);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultStripeTerminalPrivateKey instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultStripeTerminalPrivateKey to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultStripeTerminalPrivateKey input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultStuartSettings.cs b/src/Flipdish/Model/RestApiResultStuartSettings.cs
index f045c8d4..39a1ae44 100644
--- a/src/Flipdish/Model/RestApiResultStuartSettings.cs
+++ b/src/Flipdish/Model/RestApiResultStuartSettings.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultStuartSettings :  IEquatable<RestApiResultStuartSettings>, IValidatableObject
+    public partial class RestApiResultStuartSettings :  IEquatable<RestApiResultStuartSettings>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultStuartSettings" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultSubscription.cs b/src/Flipdish/Model/RestApiResultSubscription.cs
index 1f09a05c..c9038cb4 100644
--- a/src/Flipdish/Model/RestApiResultSubscription.cs
+++ b/src/Flipdish/Model/RestApiResultSubscription.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultSubscription :  IEquatable<RestApiResultSubscription>, IValidatableObject
+    public partial class RestApiResultSubscription :  IEquatable<RestApiResultSubscription>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultSubscription" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultSubscriptionPlansResponse.cs b/src/Flipdish/Model/RestApiResultSubscriptionPlansResponse.cs
deleted file mode 100644
index d95312ca..00000000
--- a/src/Flipdish/Model/RestApiResultSubscriptionPlansResponse.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Rest api result
-    /// </summary>
-    [DataContract]
-    public partial class RestApiResultSubscriptionPlansResponse :  IEquatable<RestApiResultSubscriptionPlansResponse>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultSubscriptionPlansResponse" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected RestApiResultSubscriptionPlansResponse() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RestApiResultSubscriptionPlansResponse" /> class.
-        /// </summary>
-        /// <param name="data">Generic data object. (required).</param>
-        public RestApiResultSubscriptionPlansResponse(SubscriptionPlansResponse data = default(SubscriptionPlansResponse))
-        {
-            // to ensure "data" is required (not null)
-            if (data == null)
-            {
-                throw new InvalidDataException("data is a required property for RestApiResultSubscriptionPlansResponse and cannot be null");
-            }
-            else
-            {
-                this.Data = data;
-            }
-        }
-        
-        /// <summary>
-        /// Generic data object.
-        /// </summary>
-        /// <value>Generic data object.</value>
-        [DataMember(Name="Data", EmitDefaultValue=false)]
-        public SubscriptionPlansResponse Data { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class RestApiResultSubscriptionPlansResponse {\n");
-            sb.Append("  Data: ").Append(Data).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as RestApiResultSubscriptionPlansResponse);
-        }
-
-        /// <summary>
-        /// Returns true if RestApiResultSubscriptionPlansResponse instances are equal
-        /// </summary>
-        /// <param name="input">Instance of RestApiResultSubscriptionPlansResponse to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(RestApiResultSubscriptionPlansResponse input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Data == input.Data ||
-                    (this.Data != null &&
-                    this.Data.Equals(input.Data))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Data != null)
-                    hashCode = hashCode * 59 + this.Data.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/RestApiResultTeammate.cs b/src/Flipdish/Model/RestApiResultTeammate.cs
index 33bca0f0..3a9660b0 100644
--- a/src/Flipdish/Model/RestApiResultTeammate.cs
+++ b/src/Flipdish/Model/RestApiResultTeammate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultTeammate :  IEquatable<RestApiResultTeammate>, IValidatableObject
+    public partial class RestApiResultTeammate :  IEquatable<RestApiResultTeammate>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultTeammate" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultTelemetrySeriesResult.cs b/src/Flipdish/Model/RestApiResultTelemetrySeriesResult.cs
index 48e25b3a..6feaad70 100644
--- a/src/Flipdish/Model/RestApiResultTelemetrySeriesResult.cs
+++ b/src/Flipdish/Model/RestApiResultTelemetrySeriesResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultTelemetrySeriesResult :  IEquatable<RestApiResultTelemetrySeriesResult>, IValidatableObject
+    public partial class RestApiResultTelemetrySeriesResult :  IEquatable<RestApiResultTelemetrySeriesResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultTelemetrySeriesResult" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultTipConfiguration.cs b/src/Flipdish/Model/RestApiResultTipConfiguration.cs
index 15cf2cd5..1ed39d09 100644
--- a/src/Flipdish/Model/RestApiResultTipConfiguration.cs
+++ b/src/Flipdish/Model/RestApiResultTipConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultTipConfiguration :  IEquatable<RestApiResultTipConfiguration>, IValidatableObject
+    public partial class RestApiResultTipConfiguration :  IEquatable<RestApiResultTipConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultTipConfiguration" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultUpdateMobileAppsSubmissionStatus.cs b/src/Flipdish/Model/RestApiResultUpdateMobileAppsSubmissionStatus.cs
index 7442a45a..07018889 100644
--- a/src/Flipdish/Model/RestApiResultUpdateMobileAppsSubmissionStatus.cs
+++ b/src/Flipdish/Model/RestApiResultUpdateMobileAppsSubmissionStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultUpdateMobileAppsSubmissionStatus :  IEquatable<RestApiResultUpdateMobileAppsSubmissionStatus>, IValidatableObject
+    public partial class RestApiResultUpdateMobileAppsSubmissionStatus :  IEquatable<RestApiResultUpdateMobileAppsSubmissionStatus>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultUpdateMobileAppsSubmissionStatus" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultUserInfo.cs b/src/Flipdish/Model/RestApiResultUserInfo.cs
new file mode 100644
index 00000000..f7ee3586
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultUserInfo.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultUserInfo :  IEquatable<RestApiResultUserInfo>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultUserInfo" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultUserInfo() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultUserInfo" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultUserInfo(UserInfo data = default(UserInfo))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultUserInfo and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public UserInfo Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultUserInfo {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultUserInfo);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultUserInfo instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultUserInfo to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultUserInfo input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultUserPushNotificationSentResult.cs b/src/Flipdish/Model/RestApiResultUserPushNotificationSentResult.cs
new file mode 100644
index 00000000..aa68adee
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultUserPushNotificationSentResult.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultUserPushNotificationSentResult :  IEquatable<RestApiResultUserPushNotificationSentResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultUserPushNotificationSentResult" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultUserPushNotificationSentResult() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultUserPushNotificationSentResult" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultUserPushNotificationSentResult(UserPushNotificationSentResult data = default(UserPushNotificationSentResult))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultUserPushNotificationSentResult and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public UserPushNotificationSentResult Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultUserPushNotificationSentResult {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultUserPushNotificationSentResult);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultUserPushNotificationSentResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultUserPushNotificationSentResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultUserPushNotificationSentResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultUserRole.cs b/src/Flipdish/Model/RestApiResultUserRole.cs
new file mode 100644
index 00000000..4ac9d8b1
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultUserRole.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultUserRole :  IEquatable<RestApiResultUserRole>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultUserRole" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultUserRole() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultUserRole" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultUserRole(UserRole data = default(UserRole))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultUserRole and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public UserRole Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultUserRole {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultUserRole);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultUserRole instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultUserRole to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultUserRole input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultVoucher.cs b/src/Flipdish/Model/RestApiResultVoucher.cs
new file mode 100644
index 00000000..d05f57cb
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultVoucher.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultVoucher :  IEquatable<RestApiResultVoucher>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultVoucher" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultVoucher() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultVoucher" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultVoucher(Voucher data = default(Voucher))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultVoucher and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public Voucher Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultVoucher {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultVoucher);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultVoucher instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultVoucher to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultVoucher input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiResultVoucherWithStats.cs b/src/Flipdish/Model/RestApiResultVoucherWithStats.cs
index 85ade324..395816c2 100644
--- a/src/Flipdish/Model/RestApiResultVoucherWithStats.cs
+++ b/src/Flipdish/Model/RestApiResultVoucherWithStats.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultVoucherWithStats :  IEquatable<RestApiResultVoucherWithStats>, IValidatableObject
+    public partial class RestApiResultVoucherWithStats :  IEquatable<RestApiResultVoucherWithStats>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultVoucherWithStats" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultWebsiteImage.cs b/src/Flipdish/Model/RestApiResultWebsiteImage.cs
index 3606ac61..e549e516 100644
--- a/src/Flipdish/Model/RestApiResultWebsiteImage.cs
+++ b/src/Flipdish/Model/RestApiResultWebsiteImage.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultWebsiteImage :  IEquatable<RestApiResultWebsiteImage>, IValidatableObject
+    public partial class RestApiResultWebsiteImage :  IEquatable<RestApiResultWebsiteImage>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultWebsiteImage" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultWebsiteTestimonial.cs b/src/Flipdish/Model/RestApiResultWebsiteTestimonial.cs
index 3f1faa87..c44d619b 100644
--- a/src/Flipdish/Model/RestApiResultWebsiteTestimonial.cs
+++ b/src/Flipdish/Model/RestApiResultWebsiteTestimonial.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api result
     /// </summary>
     [DataContract]
-    public partial class RestApiResultWebsiteTestimonial :  IEquatable<RestApiResultWebsiteTestimonial>, IValidatableObject
+    public partial class RestApiResultWebsiteTestimonial :  IEquatable<RestApiResultWebsiteTestimonial>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiResultWebsiteTestimonial" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiResultWhiteLabelConfigModel.cs b/src/Flipdish/Model/RestApiResultWhiteLabelConfigModel.cs
new file mode 100644
index 00000000..96870dd0
--- /dev/null
+++ b/src/Flipdish/Model/RestApiResultWhiteLabelConfigModel.cs
@@ -0,0 +1,126 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Rest api result
+    /// </summary>
+    [DataContract]
+    public partial class RestApiResultWhiteLabelConfigModel :  IEquatable<RestApiResultWhiteLabelConfigModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultWhiteLabelConfigModel" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected RestApiResultWhiteLabelConfigModel() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestApiResultWhiteLabelConfigModel" /> class.
+        /// </summary>
+        /// <param name="data">Generic data object. (required).</param>
+        public RestApiResultWhiteLabelConfigModel(WhiteLabelConfigModel data = default(WhiteLabelConfigModel))
+        {
+            // to ensure "data" is required (not null)
+            if (data == null)
+            {
+                throw new InvalidDataException("data is a required property for RestApiResultWhiteLabelConfigModel and cannot be null");
+            }
+            else
+            {
+                this.Data = data;
+            }
+        }
+        
+        /// <summary>
+        /// Generic data object.
+        /// </summary>
+        /// <value>Generic data object.</value>
+        [DataMember(Name="Data", EmitDefaultValue=false)]
+        public WhiteLabelConfigModel Data { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestApiResultWhiteLabelConfigModel {\n");
+            sb.Append("  Data: ").Append(Data).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestApiResultWhiteLabelConfigModel);
+        }
+
+        /// <summary>
+        /// Returns true if RestApiResultWhiteLabelConfigModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestApiResultWhiteLabelConfigModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestApiResultWhiteLabelConfigModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Data == input.Data ||
+                    (this.Data != null &&
+                    this.Data.Equals(input.Data))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Data != null)
+                    hashCode = hashCode * 59 + this.Data.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestApiStringArrayResult.cs b/src/Flipdish/Model/RestApiStringArrayResult.cs
index 3a35c397..15df8d1a 100644
--- a/src/Flipdish/Model/RestApiStringArrayResult.cs
+++ b/src/Flipdish/Model/RestApiStringArrayResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api string array result
     /// </summary>
     [DataContract]
-    public partial class RestApiStringArrayResult :  IEquatable<RestApiStringArrayResult>, IValidatableObject
+    public partial class RestApiStringArrayResult :  IEquatable<RestApiStringArrayResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiStringArrayResult" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiStringResult.cs b/src/Flipdish/Model/RestApiStringResult.cs
index 87c81ddc..fcb42f57 100644
--- a/src/Flipdish/Model/RestApiStringResult.cs
+++ b/src/Flipdish/Model/RestApiStringResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api string result
     /// </summary>
     [DataContract]
-    public partial class RestApiStringResult :  IEquatable<RestApiStringResult>, IValidatableObject
+    public partial class RestApiStringResult :  IEquatable<RestApiStringResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiStringResult" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestApiUnauthorizedResult.cs b/src/Flipdish/Model/RestApiUnauthorizedResult.cs
index 70d68875..d4e0e9cc 100644
--- a/src/Flipdish/Model/RestApiUnauthorizedResult.cs
+++ b/src/Flipdish/Model/RestApiUnauthorizedResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Rest api unauthorized result
     /// </summary>
     [DataContract]
-    public partial class RestApiUnauthorizedResult :  IEquatable<RestApiUnauthorizedResult>, IValidatableObject
+    public partial class RestApiUnauthorizedResult :  IEquatable<RestApiUnauthorizedResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestApiUnauthorizedResult" /> class.
@@ -109,16 +107,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Restaurant.cs b/src/Flipdish/Model/Restaurant.cs
new file mode 100644
index 00000000..e9014743
--- /dev/null
+++ b/src/Flipdish/Model/Restaurant.cs
@@ -0,0 +1,283 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Restaurant search result
+    /// </summary>
+    [DataContract]
+    public partial class Restaurant :  IEquatable<Restaurant>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Restaurant" /> class.
+        /// </summary>
+        /// <param name="whiteLabelConfigs">Collection of white label configurations.</param>
+        /// <param name="virtualRestaurantId">Virtual restaurant identifier.</param>
+        /// <param name="virtualRestaurantName">Virtual restaurant name.</param>
+        /// <param name="virtualRestaurantUrl">Virtual restaurant URL.</param>
+        /// <param name="physicalRestaurantId">Physical restaurant identifier.</param>
+        /// <param name="physicalRestaurantName">Physical restaurant name.</param>
+        /// <param name="physicalRestaurantAddress">Physical restaurant address.</param>
+        /// <param name="menuId">Menu identifier.</param>
+        /// <param name="isArchived">Indicates if the restaurant is archived.</param>
+        /// <param name="isPublished">Indicates if the restaurant is published.</param>
+        /// <param name="flipdishStripeCustomConnectedAccounts">List of Flipdish Stripe custom connected account identifiers.</param>
+        public Restaurant(List<WhiteLabelConfig> whiteLabelConfigs = default(List<WhiteLabelConfig>), int? virtualRestaurantId = default(int?), string virtualRestaurantName = default(string), string virtualRestaurantUrl = default(string), int? physicalRestaurantId = default(int?), string physicalRestaurantName = default(string), string physicalRestaurantAddress = default(string), int? menuId = default(int?), bool? isArchived = default(bool?), bool? isPublished = default(bool?), List<int?> flipdishStripeCustomConnectedAccounts = default(List<int?>))
+        {
+            this.WhiteLabelConfigs = whiteLabelConfigs;
+            this.VirtualRestaurantId = virtualRestaurantId;
+            this.VirtualRestaurantName = virtualRestaurantName;
+            this.VirtualRestaurantUrl = virtualRestaurantUrl;
+            this.PhysicalRestaurantId = physicalRestaurantId;
+            this.PhysicalRestaurantName = physicalRestaurantName;
+            this.PhysicalRestaurantAddress = physicalRestaurantAddress;
+            this.MenuId = menuId;
+            this.IsArchived = isArchived;
+            this.IsPublished = isPublished;
+            this.FlipdishStripeCustomConnectedAccounts = flipdishStripeCustomConnectedAccounts;
+        }
+        
+        /// <summary>
+        /// Collection of white label configurations
+        /// </summary>
+        /// <value>Collection of white label configurations</value>
+        [DataMember(Name="WhiteLabelConfigs", EmitDefaultValue=false)]
+        public List<WhiteLabelConfig> WhiteLabelConfigs { get; set; }
+
+        /// <summary>
+        /// Virtual restaurant identifier
+        /// </summary>
+        /// <value>Virtual restaurant identifier</value>
+        [DataMember(Name="VirtualRestaurantId", EmitDefaultValue=false)]
+        public int? VirtualRestaurantId { get; set; }
+
+        /// <summary>
+        /// Virtual restaurant name
+        /// </summary>
+        /// <value>Virtual restaurant name</value>
+        [DataMember(Name="VirtualRestaurantName", EmitDefaultValue=false)]
+        public string VirtualRestaurantName { get; set; }
+
+        /// <summary>
+        /// Virtual restaurant URL
+        /// </summary>
+        /// <value>Virtual restaurant URL</value>
+        [DataMember(Name="VirtualRestaurantUrl", EmitDefaultValue=false)]
+        public string VirtualRestaurantUrl { get; set; }
+
+        /// <summary>
+        /// Physical restaurant identifier
+        /// </summary>
+        /// <value>Physical restaurant identifier</value>
+        [DataMember(Name="PhysicalRestaurantId", EmitDefaultValue=false)]
+        public int? PhysicalRestaurantId { get; set; }
+
+        /// <summary>
+        /// Physical restaurant name
+        /// </summary>
+        /// <value>Physical restaurant name</value>
+        [DataMember(Name="PhysicalRestaurantName", EmitDefaultValue=false)]
+        public string PhysicalRestaurantName { get; set; }
+
+        /// <summary>
+        /// Physical restaurant address
+        /// </summary>
+        /// <value>Physical restaurant address</value>
+        [DataMember(Name="PhysicalRestaurantAddress", EmitDefaultValue=false)]
+        public string PhysicalRestaurantAddress { get; set; }
+
+        /// <summary>
+        /// Menu identifier
+        /// </summary>
+        /// <value>Menu identifier</value>
+        [DataMember(Name="MenuId", EmitDefaultValue=false)]
+        public int? MenuId { get; set; }
+
+        /// <summary>
+        /// Indicates if the restaurant is archived
+        /// </summary>
+        /// <value>Indicates if the restaurant is archived</value>
+        [DataMember(Name="IsArchived", EmitDefaultValue=false)]
+        public bool? IsArchived { get; set; }
+
+        /// <summary>
+        /// Indicates if the restaurant is published
+        /// </summary>
+        /// <value>Indicates if the restaurant is published</value>
+        [DataMember(Name="IsPublished", EmitDefaultValue=false)]
+        public bool? IsPublished { get; set; }
+
+        /// <summary>
+        /// List of Flipdish Stripe custom connected account identifiers
+        /// </summary>
+        /// <value>List of Flipdish Stripe custom connected account identifiers</value>
+        [DataMember(Name="FlipdishStripeCustomConnectedAccounts", EmitDefaultValue=false)]
+        public List<int?> FlipdishStripeCustomConnectedAccounts { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Restaurant {\n");
+            sb.Append("  WhiteLabelConfigs: ").Append(WhiteLabelConfigs).Append("\n");
+            sb.Append("  VirtualRestaurantId: ").Append(VirtualRestaurantId).Append("\n");
+            sb.Append("  VirtualRestaurantName: ").Append(VirtualRestaurantName).Append("\n");
+            sb.Append("  VirtualRestaurantUrl: ").Append(VirtualRestaurantUrl).Append("\n");
+            sb.Append("  PhysicalRestaurantId: ").Append(PhysicalRestaurantId).Append("\n");
+            sb.Append("  PhysicalRestaurantName: ").Append(PhysicalRestaurantName).Append("\n");
+            sb.Append("  PhysicalRestaurantAddress: ").Append(PhysicalRestaurantAddress).Append("\n");
+            sb.Append("  MenuId: ").Append(MenuId).Append("\n");
+            sb.Append("  IsArchived: ").Append(IsArchived).Append("\n");
+            sb.Append("  IsPublished: ").Append(IsPublished).Append("\n");
+            sb.Append("  FlipdishStripeCustomConnectedAccounts: ").Append(FlipdishStripeCustomConnectedAccounts).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Restaurant);
+        }
+
+        /// <summary>
+        /// Returns true if Restaurant instances are equal
+        /// </summary>
+        /// <param name="input">Instance of Restaurant to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Restaurant input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelConfigs == input.WhiteLabelConfigs ||
+                    this.WhiteLabelConfigs != null &&
+                    this.WhiteLabelConfigs.SequenceEqual(input.WhiteLabelConfigs)
+                ) && 
+                (
+                    this.VirtualRestaurantId == input.VirtualRestaurantId ||
+                    (this.VirtualRestaurantId != null &&
+                    this.VirtualRestaurantId.Equals(input.VirtualRestaurantId))
+                ) && 
+                (
+                    this.VirtualRestaurantName == input.VirtualRestaurantName ||
+                    (this.VirtualRestaurantName != null &&
+                    this.VirtualRestaurantName.Equals(input.VirtualRestaurantName))
+                ) && 
+                (
+                    this.VirtualRestaurantUrl == input.VirtualRestaurantUrl ||
+                    (this.VirtualRestaurantUrl != null &&
+                    this.VirtualRestaurantUrl.Equals(input.VirtualRestaurantUrl))
+                ) && 
+                (
+                    this.PhysicalRestaurantId == input.PhysicalRestaurantId ||
+                    (this.PhysicalRestaurantId != null &&
+                    this.PhysicalRestaurantId.Equals(input.PhysicalRestaurantId))
+                ) && 
+                (
+                    this.PhysicalRestaurantName == input.PhysicalRestaurantName ||
+                    (this.PhysicalRestaurantName != null &&
+                    this.PhysicalRestaurantName.Equals(input.PhysicalRestaurantName))
+                ) && 
+                (
+                    this.PhysicalRestaurantAddress == input.PhysicalRestaurantAddress ||
+                    (this.PhysicalRestaurantAddress != null &&
+                    this.PhysicalRestaurantAddress.Equals(input.PhysicalRestaurantAddress))
+                ) && 
+                (
+                    this.MenuId == input.MenuId ||
+                    (this.MenuId != null &&
+                    this.MenuId.Equals(input.MenuId))
+                ) && 
+                (
+                    this.IsArchived == input.IsArchived ||
+                    (this.IsArchived != null &&
+                    this.IsArchived.Equals(input.IsArchived))
+                ) && 
+                (
+                    this.IsPublished == input.IsPublished ||
+                    (this.IsPublished != null &&
+                    this.IsPublished.Equals(input.IsPublished))
+                ) && 
+                (
+                    this.FlipdishStripeCustomConnectedAccounts == input.FlipdishStripeCustomConnectedAccounts ||
+                    this.FlipdishStripeCustomConnectedAccounts != null &&
+                    this.FlipdishStripeCustomConnectedAccounts.SequenceEqual(input.FlipdishStripeCustomConnectedAccounts)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelConfigs != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelConfigs.GetHashCode();
+                if (this.VirtualRestaurantId != null)
+                    hashCode = hashCode * 59 + this.VirtualRestaurantId.GetHashCode();
+                if (this.VirtualRestaurantName != null)
+                    hashCode = hashCode * 59 + this.VirtualRestaurantName.GetHashCode();
+                if (this.VirtualRestaurantUrl != null)
+                    hashCode = hashCode * 59 + this.VirtualRestaurantUrl.GetHashCode();
+                if (this.PhysicalRestaurantId != null)
+                    hashCode = hashCode * 59 + this.PhysicalRestaurantId.GetHashCode();
+                if (this.PhysicalRestaurantName != null)
+                    hashCode = hashCode * 59 + this.PhysicalRestaurantName.GetHashCode();
+                if (this.PhysicalRestaurantAddress != null)
+                    hashCode = hashCode * 59 + this.PhysicalRestaurantAddress.GetHashCode();
+                if (this.MenuId != null)
+                    hashCode = hashCode * 59 + this.MenuId.GetHashCode();
+                if (this.IsArchived != null)
+                    hashCode = hashCode * 59 + this.IsArchived.GetHashCode();
+                if (this.IsPublished != null)
+                    hashCode = hashCode * 59 + this.IsPublished.GetHashCode();
+                if (this.FlipdishStripeCustomConnectedAccounts != null)
+                    hashCode = hashCode * 59 + this.FlipdishStripeCustomConnectedAccounts.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestaurantVoucherAssignedStore.cs b/src/Flipdish/Model/RestaurantVoucherAssignedStore.cs
index 6a4ae235..67facaab 100644
--- a/src/Flipdish/Model/RestaurantVoucherAssignedStore.cs
+++ b/src/Flipdish/Model/RestaurantVoucherAssignedStore.cs
@@ -12,30 +12,28 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// RestaurantVoucherAssignedStore
+    /// RestaurantVoucherAssignedStore.
     /// </summary>
     [DataContract]
-    public partial class RestaurantVoucherAssignedStore :  IEquatable<RestaurantVoucherAssignedStore>, IValidatableObject
+    public partial class RestaurantVoucherAssignedStore :  IEquatable<RestaurantVoucherAssignedStore>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestaurantVoucherAssignedStore" /> class.
         /// </summary>
-        /// <param name="storeId">storeId.</param>
-        /// <param name="name">name.</param>
-        /// <param name="active">active.</param>
+        /// <param name="storeId">StoreId..</param>
+        /// <param name="name">Name..</param>
+        /// <param name="active">Active..</param>
         public RestaurantVoucherAssignedStore(int? storeId = default(int?), string name = default(string), bool? active = default(bool?))
         {
             this.StoreId = storeId;
@@ -44,20 +42,23 @@ public partial class RestaurantVoucherAssignedStore :  IEquatable<RestaurantVouc
         }
         
         /// <summary>
-        /// Gets or Sets StoreId
+        /// StoreId.
         /// </summary>
+        /// <value>StoreId.</value>
         [DataMember(Name="StoreId", EmitDefaultValue=false)]
         public int? StoreId { get; set; }
 
         /// <summary>
-        /// Gets or Sets Name
+        /// Name.
         /// </summary>
+        /// <value>Name.</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or Sets Active
+        /// Active.
         /// </summary>
+        /// <value>Active.</value>
         [DataMember(Name="Active", EmitDefaultValue=false)]
         public bool? Active { get; set; }
 
@@ -141,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestaurantVoucherEligibleStore.cs b/src/Flipdish/Model/RestaurantVoucherEligibleStore.cs
index b90730fd..284e7c20 100644
--- a/src/Flipdish/Model/RestaurantVoucherEligibleStore.cs
+++ b/src/Flipdish/Model/RestaurantVoucherEligibleStore.cs
@@ -12,29 +12,27 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// RestaurantVoucherEligibleStore
+    /// RestaurantVoucherEligibleStore.
     /// </summary>
     [DataContract]
-    public partial class RestaurantVoucherEligibleStore :  IEquatable<RestaurantVoucherEligibleStore>, IValidatableObject
+    public partial class RestaurantVoucherEligibleStore :  IEquatable<RestaurantVoucherEligibleStore>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RestaurantVoucherEligibleStore" /> class.
         /// </summary>
-        /// <param name="storeId">storeId.</param>
-        /// <param name="name">name.</param>
+        /// <param name="storeId">StoreId..</param>
+        /// <param name="name">Name..</param>
         public RestaurantVoucherEligibleStore(int? storeId = default(int?), string name = default(string))
         {
             this.StoreId = storeId;
@@ -42,14 +40,16 @@ public partial class RestaurantVoucherEligibleStore :  IEquatable<RestaurantVouc
         }
         
         /// <summary>
-        /// Gets or Sets StoreId
+        /// StoreId.
         /// </summary>
+        /// <value>StoreId.</value>
         [DataMember(Name="StoreId", EmitDefaultValue=false)]
         public int? StoreId { get; set; }
 
         /// <summary>
-        /// Gets or Sets Name
+        /// Name.
         /// </summary>
+        /// <value>Name.</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
@@ -125,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RestaurantVoucherPayGreenConfiguration.cs b/src/Flipdish/Model/RestaurantVoucherPayGreenConfiguration.cs
new file mode 100644
index 00000000..88d46225
--- /dev/null
+++ b/src/Flipdish/Model/RestaurantVoucherPayGreenConfiguration.cs
@@ -0,0 +1,164 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// RestaurantVoucherPayGreenConfiguration.
+    /// </summary>
+    [DataContract]
+    public partial class RestaurantVoucherPayGreenConfiguration :  IEquatable<RestaurantVoucherPayGreenConfiguration>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestaurantVoucherPayGreenConfiguration" /> class.
+        /// </summary>
+        /// <param name="name">Name..</param>
+        /// <param name="payGreenId">PayGreenId..</param>
+        /// <param name="payGreenConfigurationId">PayGreenConfigurationId..</param>
+        /// <param name="assignedStores">AssignedStores..</param>
+        public RestaurantVoucherPayGreenConfiguration(string name = default(string), string payGreenId = default(string), int? payGreenConfigurationId = default(int?), List<RestaurantVoucherAssignedStore> assignedStores = default(List<RestaurantVoucherAssignedStore>))
+        {
+            this.Name = name;
+            this.PayGreenId = payGreenId;
+            this.PayGreenConfigurationId = payGreenConfigurationId;
+            this.AssignedStores = assignedStores;
+        }
+        
+        /// <summary>
+        /// Name.
+        /// </summary>
+        /// <value>Name.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// PayGreenId.
+        /// </summary>
+        /// <value>PayGreenId.</value>
+        [DataMember(Name="PayGreenId", EmitDefaultValue=false)]
+        public string PayGreenId { get; set; }
+
+        /// <summary>
+        /// PayGreenConfigurationId.
+        /// </summary>
+        /// <value>PayGreenConfigurationId.</value>
+        [DataMember(Name="PayGreenConfigurationId", EmitDefaultValue=false)]
+        public int? PayGreenConfigurationId { get; set; }
+
+        /// <summary>
+        /// AssignedStores.
+        /// </summary>
+        /// <value>AssignedStores.</value>
+        [DataMember(Name="AssignedStores", EmitDefaultValue=false)]
+        public List<RestaurantVoucherAssignedStore> AssignedStores { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestaurantVoucherPayGreenConfiguration {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  PayGreenId: ").Append(PayGreenId).Append("\n");
+            sb.Append("  PayGreenConfigurationId: ").Append(PayGreenConfigurationId).Append("\n");
+            sb.Append("  AssignedStores: ").Append(AssignedStores).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestaurantVoucherPayGreenConfiguration);
+        }
+
+        /// <summary>
+        /// Returns true if RestaurantVoucherPayGreenConfiguration instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestaurantVoucherPayGreenConfiguration to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestaurantVoucherPayGreenConfiguration input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.PayGreenId == input.PayGreenId ||
+                    (this.PayGreenId != null &&
+                    this.PayGreenId.Equals(input.PayGreenId))
+                ) && 
+                (
+                    this.PayGreenConfigurationId == input.PayGreenConfigurationId ||
+                    (this.PayGreenConfigurationId != null &&
+                    this.PayGreenConfigurationId.Equals(input.PayGreenConfigurationId))
+                ) && 
+                (
+                    this.AssignedStores == input.AssignedStores ||
+                    this.AssignedStores != null &&
+                    this.AssignedStores.SequenceEqual(input.AssignedStores)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.PayGreenId != null)
+                    hashCode = hashCode * 59 + this.PayGreenId.GetHashCode();
+                if (this.PayGreenConfigurationId != null)
+                    hashCode = hashCode * 59 + this.PayGreenConfigurationId.GetHashCode();
+                if (this.AssignedStores != null)
+                    hashCode = hashCode * 59 + this.AssignedStores.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestaurantVoucherPayGreenConfigurationSummary.cs b/src/Flipdish/Model/RestaurantVoucherPayGreenConfigurationSummary.cs
new file mode 100644
index 00000000..7a1bfa77
--- /dev/null
+++ b/src/Flipdish/Model/RestaurantVoucherPayGreenConfigurationSummary.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// RestaurantVoucherPayGreenConfigurationSummary.
+    /// </summary>
+    [DataContract]
+    public partial class RestaurantVoucherPayGreenConfigurationSummary :  IEquatable<RestaurantVoucherPayGreenConfigurationSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestaurantVoucherPayGreenConfigurationSummary" /> class.
+        /// </summary>
+        /// <param name="name">Name..</param>
+        /// <param name="payGreenConfigurationId">PayGreenConfigurationId..</param>
+        public RestaurantVoucherPayGreenConfigurationSummary(string name = default(string), int? payGreenConfigurationId = default(int?))
+        {
+            this.Name = name;
+            this.PayGreenConfigurationId = payGreenConfigurationId;
+        }
+        
+        /// <summary>
+        /// Name.
+        /// </summary>
+        /// <value>Name.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// PayGreenConfigurationId.
+        /// </summary>
+        /// <value>PayGreenConfigurationId.</value>
+        [DataMember(Name="PayGreenConfigurationId", EmitDefaultValue=false)]
+        public int? PayGreenConfigurationId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestaurantVoucherPayGreenConfigurationSummary {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  PayGreenConfigurationId: ").Append(PayGreenConfigurationId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestaurantVoucherPayGreenConfigurationSummary);
+        }
+
+        /// <summary>
+        /// Returns true if RestaurantVoucherPayGreenConfigurationSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestaurantVoucherPayGreenConfigurationSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestaurantVoucherPayGreenConfigurationSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.PayGreenConfigurationId == input.PayGreenConfigurationId ||
+                    (this.PayGreenConfigurationId != null &&
+                    this.PayGreenConfigurationId.Equals(input.PayGreenConfigurationId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.PayGreenConfigurationId != null)
+                    hashCode = hashCode * 59 + this.PayGreenConfigurationId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RestaurantVoucherPayGreenStoreConfiguration.cs b/src/Flipdish/Model/RestaurantVoucherPayGreenStoreConfiguration.cs
new file mode 100644
index 00000000..f70537f3
--- /dev/null
+++ b/src/Flipdish/Model/RestaurantVoucherPayGreenStoreConfiguration.cs
@@ -0,0 +1,164 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// RestaurantVoucherPayGreenStoreConfiguration.
+    /// </summary>
+    [DataContract]
+    public partial class RestaurantVoucherPayGreenStoreConfiguration :  IEquatable<RestaurantVoucherPayGreenStoreConfiguration>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RestaurantVoucherPayGreenStoreConfiguration" /> class.
+        /// </summary>
+        /// <param name="name">Name..</param>
+        /// <param name="active">Active..</param>
+        /// <param name="payGreenId">PayGreenId..</param>
+        /// <param name="payGreenConfigurationId">PayGreenConfigurationId..</param>
+        public RestaurantVoucherPayGreenStoreConfiguration(string name = default(string), bool? active = default(bool?), string payGreenId = default(string), int? payGreenConfigurationId = default(int?))
+        {
+            this.Name = name;
+            this.Active = active;
+            this.PayGreenId = payGreenId;
+            this.PayGreenConfigurationId = payGreenConfigurationId;
+        }
+        
+        /// <summary>
+        /// Name.
+        /// </summary>
+        /// <value>Name.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Active.
+        /// </summary>
+        /// <value>Active.</value>
+        [DataMember(Name="Active", EmitDefaultValue=false)]
+        public bool? Active { get; set; }
+
+        /// <summary>
+        /// PayGreenId.
+        /// </summary>
+        /// <value>PayGreenId.</value>
+        [DataMember(Name="PayGreenId", EmitDefaultValue=false)]
+        public string PayGreenId { get; set; }
+
+        /// <summary>
+        /// PayGreenConfigurationId.
+        /// </summary>
+        /// <value>PayGreenConfigurationId.</value>
+        [DataMember(Name="PayGreenConfigurationId", EmitDefaultValue=false)]
+        public int? PayGreenConfigurationId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class RestaurantVoucherPayGreenStoreConfiguration {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Active: ").Append(Active).Append("\n");
+            sb.Append("  PayGreenId: ").Append(PayGreenId).Append("\n");
+            sb.Append("  PayGreenConfigurationId: ").Append(PayGreenConfigurationId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as RestaurantVoucherPayGreenStoreConfiguration);
+        }
+
+        /// <summary>
+        /// Returns true if RestaurantVoucherPayGreenStoreConfiguration instances are equal
+        /// </summary>
+        /// <param name="input">Instance of RestaurantVoucherPayGreenStoreConfiguration to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(RestaurantVoucherPayGreenStoreConfiguration input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Active == input.Active ||
+                    (this.Active != null &&
+                    this.Active.Equals(input.Active))
+                ) && 
+                (
+                    this.PayGreenId == input.PayGreenId ||
+                    (this.PayGreenId != null &&
+                    this.PayGreenId.Equals(input.PayGreenId))
+                ) && 
+                (
+                    this.PayGreenConfigurationId == input.PayGreenConfigurationId ||
+                    (this.PayGreenConfigurationId != null &&
+                    this.PayGreenConfigurationId.Equals(input.PayGreenConfigurationId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Active != null)
+                    hashCode = hashCode * 59 + this.Active.GetHashCode();
+                if (this.PayGreenId != null)
+                    hashCode = hashCode * 59 + this.PayGreenId.GetHashCode();
+                if (this.PayGreenConfigurationId != null)
+                    hashCode = hashCode * 59 + this.PayGreenConfigurationId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/RetentionCampaign.cs b/src/Flipdish/Model/RetentionCampaign.cs
index a3c001d2..e3fe40b0 100644
--- a/src/Flipdish/Model/RetentionCampaign.cs
+++ b/src/Flipdish/Model/RetentionCampaign.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Retention campaign
     /// </summary>
     [DataContract]
-    public partial class RetentionCampaign :  IEquatable<RetentionCampaign>, IValidatableObject
+    public partial class RetentionCampaign :  IEquatable<RetentionCampaign>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RetentionCampaign" /> class.
@@ -36,8 +34,10 @@ public partial class RetentionCampaign :  IEquatable<RetentionCampaign>, IValida
         /// <param name="campaignId">Id of campaign.</param>
         /// <param name="statistics">Statistics of campaign.</param>
         /// <param name="stores">Stores this campaign applies to with campaign start time in Utc.</param>
+        /// <param name="publicId">Permanent reference to the item..</param>
         /// <param name="notifyCustomerAfterMinutes">Time in minutes, after which customer will receive retention voucher if he/she does not order.</param>
         /// <param name="percentDiscountAmount">Discount amount in percents.</param>
+        /// <param name="maxDiscount">Maximum discount for percentage discounts.</param>
         /// <param name="lumpDiscountAmount">Discount amount in sum of money.</param>
         /// <param name="voucherValidPeriodDays">Number of days for which the voucher will be valid..</param>
         /// <param name="includeDeliveryFee">Discount will include delivery fee.</param>
@@ -45,13 +45,17 @@ public partial class RetentionCampaign :  IEquatable<RetentionCampaign>, IValida
         /// <param name="includeExistingOrders">Campaign will apply to existing orders.</param>
         /// <param name="isEnabled">Is campaign enabled.</param>
         /// <param name="storeIds">Ids of stores this campaign applies to.</param>
-        public RetentionCampaign(int? campaignId = default(int?), CampaignStatistics statistics = default(CampaignStatistics), List<StoreCampaignStartTime> stores = default(List<StoreCampaignStartTime>), int? notifyCustomerAfterMinutes = default(int?), int? percentDiscountAmount = default(int?), double? lumpDiscountAmount = default(double?), int? voucherValidPeriodDays = default(int?), bool? includeDeliveryFee = default(bool?), bool? autoApplyResultingVouchers = default(bool?), bool? includeExistingOrders = default(bool?), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>))
+        /// <param name="appId">The app that this campaign belongs to..</param>
+        /// <param name="forceDiscount">Controls whether the voucher generated from this campaign will override discount exclusions.</param>
+        public RetentionCampaign(int? campaignId = default(int?), CampaignStatistics statistics = default(CampaignStatistics), List<StoreCampaignStartTime> stores = default(List<StoreCampaignStartTime>), Guid? publicId = default(Guid?), int? notifyCustomerAfterMinutes = default(int?), int? percentDiscountAmount = default(int?), double? maxDiscount = default(double?), double? lumpDiscountAmount = default(double?), int? voucherValidPeriodDays = default(int?), bool? includeDeliveryFee = default(bool?), bool? autoApplyResultingVouchers = default(bool?), bool? includeExistingOrders = default(bool?), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>), string appId = default(string), bool? forceDiscount = default(bool?))
         {
             this.CampaignId = campaignId;
             this.Statistics = statistics;
             this.Stores = stores;
+            this.PublicId = publicId;
             this.NotifyCustomerAfterMinutes = notifyCustomerAfterMinutes;
             this.PercentDiscountAmount = percentDiscountAmount;
+            this.MaxDiscount = maxDiscount;
             this.LumpDiscountAmount = lumpDiscountAmount;
             this.VoucherValidPeriodDays = voucherValidPeriodDays;
             this.IncludeDeliveryFee = includeDeliveryFee;
@@ -59,6 +63,8 @@ public partial class RetentionCampaign :  IEquatable<RetentionCampaign>, IValida
             this.IncludeExistingOrders = includeExistingOrders;
             this.IsEnabled = isEnabled;
             this.StoreIds = storeIds;
+            this.AppId = appId;
+            this.ForceDiscount = forceDiscount;
         }
         
         /// <summary>
@@ -82,6 +88,13 @@ public partial class RetentionCampaign :  IEquatable<RetentionCampaign>, IValida
         [DataMember(Name="Stores", EmitDefaultValue=false)]
         public List<StoreCampaignStartTime> Stores { get; set; }
 
+        /// <summary>
+        /// Permanent reference to the item.
+        /// </summary>
+        /// <value>Permanent reference to the item.</value>
+        [DataMember(Name="PublicId", EmitDefaultValue=false)]
+        public Guid? PublicId { get; set; }
+
         /// <summary>
         /// Time in minutes, after which customer will receive retention voucher if he/she does not order
         /// </summary>
@@ -96,6 +109,13 @@ public partial class RetentionCampaign :  IEquatable<RetentionCampaign>, IValida
         [DataMember(Name="PercentDiscountAmount", EmitDefaultValue=false)]
         public int? PercentDiscountAmount { get; set; }
 
+        /// <summary>
+        /// Maximum discount for percentage discounts
+        /// </summary>
+        /// <value>Maximum discount for percentage discounts</value>
+        [DataMember(Name="MaxDiscount", EmitDefaultValue=false)]
+        public double? MaxDiscount { get; set; }
+
         /// <summary>
         /// Discount amount in sum of money
         /// </summary>
@@ -145,6 +165,20 @@ public partial class RetentionCampaign :  IEquatable<RetentionCampaign>, IValida
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
+        /// <summary>
+        /// The app that this campaign belongs to.
+        /// </summary>
+        /// <value>The app that this campaign belongs to.</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Controls whether the voucher generated from this campaign will override discount exclusions
+        /// </summary>
+        /// <value>Controls whether the voucher generated from this campaign will override discount exclusions</value>
+        [DataMember(Name="ForceDiscount", EmitDefaultValue=false)]
+        public bool? ForceDiscount { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -156,8 +190,10 @@ public override string ToString()
             sb.Append("  CampaignId: ").Append(CampaignId).Append("\n");
             sb.Append("  Statistics: ").Append(Statistics).Append("\n");
             sb.Append("  Stores: ").Append(Stores).Append("\n");
+            sb.Append("  PublicId: ").Append(PublicId).Append("\n");
             sb.Append("  NotifyCustomerAfterMinutes: ").Append(NotifyCustomerAfterMinutes).Append("\n");
             sb.Append("  PercentDiscountAmount: ").Append(PercentDiscountAmount).Append("\n");
+            sb.Append("  MaxDiscount: ").Append(MaxDiscount).Append("\n");
             sb.Append("  LumpDiscountAmount: ").Append(LumpDiscountAmount).Append("\n");
             sb.Append("  VoucherValidPeriodDays: ").Append(VoucherValidPeriodDays).Append("\n");
             sb.Append("  IncludeDeliveryFee: ").Append(IncludeDeliveryFee).Append("\n");
@@ -165,6 +201,8 @@ public override string ToString()
             sb.Append("  IncludeExistingOrders: ").Append(IncludeExistingOrders).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  ForceDiscount: ").Append(ForceDiscount).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -214,6 +252,11 @@ public bool Equals(RetentionCampaign input)
                     this.Stores != null &&
                     this.Stores.SequenceEqual(input.Stores)
                 ) && 
+                (
+                    this.PublicId == input.PublicId ||
+                    (this.PublicId != null &&
+                    this.PublicId.Equals(input.PublicId))
+                ) && 
                 (
                     this.NotifyCustomerAfterMinutes == input.NotifyCustomerAfterMinutes ||
                     (this.NotifyCustomerAfterMinutes != null &&
@@ -224,6 +267,11 @@ public bool Equals(RetentionCampaign input)
                     (this.PercentDiscountAmount != null &&
                     this.PercentDiscountAmount.Equals(input.PercentDiscountAmount))
                 ) && 
+                (
+                    this.MaxDiscount == input.MaxDiscount ||
+                    (this.MaxDiscount != null &&
+                    this.MaxDiscount.Equals(input.MaxDiscount))
+                ) && 
                 (
                     this.LumpDiscountAmount == input.LumpDiscountAmount ||
                     (this.LumpDiscountAmount != null &&
@@ -258,6 +306,16 @@ public bool Equals(RetentionCampaign input)
                     this.StoreIds == input.StoreIds ||
                     this.StoreIds != null &&
                     this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.ForceDiscount == input.ForceDiscount ||
+                    (this.ForceDiscount != null &&
+                    this.ForceDiscount.Equals(input.ForceDiscount))
                 );
         }
 
@@ -276,10 +334,14 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Statistics.GetHashCode();
                 if (this.Stores != null)
                     hashCode = hashCode * 59 + this.Stores.GetHashCode();
+                if (this.PublicId != null)
+                    hashCode = hashCode * 59 + this.PublicId.GetHashCode();
                 if (this.NotifyCustomerAfterMinutes != null)
                     hashCode = hashCode * 59 + this.NotifyCustomerAfterMinutes.GetHashCode();
                 if (this.PercentDiscountAmount != null)
                     hashCode = hashCode * 59 + this.PercentDiscountAmount.GetHashCode();
+                if (this.MaxDiscount != null)
+                    hashCode = hashCode * 59 + this.MaxDiscount.GetHashCode();
                 if (this.LumpDiscountAmount != null)
                     hashCode = hashCode * 59 + this.LumpDiscountAmount.GetHashCode();
                 if (this.VoucherValidPeriodDays != null)
@@ -294,67 +356,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.ForceDiscount != null)
+                    hashCode = hashCode * 59 + this.ForceDiscount.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // NotifyCustomerAfterMinutes (int?) maximum
-            if(this.NotifyCustomerAfterMinutes > (int?)2147483647)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for NotifyCustomerAfterMinutes, must be a value less than or equal to 2147483647.", new [] { "NotifyCustomerAfterMinutes" });
-            }
-
-            // NotifyCustomerAfterMinutes (int?) minimum
-            if(this.NotifyCustomerAfterMinutes < (int?)1440)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for NotifyCustomerAfterMinutes, must be a value greater than or equal to 1440.", new [] { "NotifyCustomerAfterMinutes" });
-            }
-
-            // PercentDiscountAmount (int?) maximum
-            if(this.PercentDiscountAmount > (int?)100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PercentDiscountAmount, must be a value less than or equal to 100.", new [] { "PercentDiscountAmount" });
-            }
-
-            // PercentDiscountAmount (int?) minimum
-            if(this.PercentDiscountAmount < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PercentDiscountAmount, must be a value greater than or equal to 1.", new [] { "PercentDiscountAmount" });
-            }
-
-            // LumpDiscountAmount (double?) maximum
-            if(this.LumpDiscountAmount > (double?)2147483647)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for LumpDiscountAmount, must be a value less than or equal to 2147483647.", new [] { "LumpDiscountAmount" });
-            }
-
-            // LumpDiscountAmount (double?) minimum
-            if(this.LumpDiscountAmount < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for LumpDiscountAmount, must be a value greater than or equal to 0.", new [] { "LumpDiscountAmount" });
-            }
-
-            // VoucherValidPeriodDays (int?) maximum
-            if(this.VoucherValidPeriodDays > (int?)300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VoucherValidPeriodDays, must be a value less than or equal to 300.", new [] { "VoucherValidPeriodDays" });
-            }
-
-            // VoucherValidPeriodDays (int?) minimum
-            if(this.VoucherValidPeriodDays < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VoucherValidPeriodDays, must be a value greater than or equal to 1.", new [] { "VoucherValidPeriodDays" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RetentionCampaignBase.cs b/src/Flipdish/Model/RetentionCampaignBase.cs
index 9a9e3776..4a0b3dfa 100644
--- a/src/Flipdish/Model/RetentionCampaignBase.cs
+++ b/src/Flipdish/Model/RetentionCampaignBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,13 +26,14 @@ namespace Flipdish.Model
     /// Retention campaign base
     /// </summary>
     [DataContract]
-    public partial class RetentionCampaignBase :  IEquatable<RetentionCampaignBase>, IValidatableObject
+    public partial class RetentionCampaignBase :  IEquatable<RetentionCampaignBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RetentionCampaignBase" /> class.
         /// </summary>
         /// <param name="notifyCustomerAfterMinutes">Time in minutes, after which customer will receive retention voucher if he/she does not order.</param>
         /// <param name="percentDiscountAmount">Discount amount in percents.</param>
+        /// <param name="maxDiscount">Maximum discount for percentage discounts.</param>
         /// <param name="lumpDiscountAmount">Discount amount in sum of money.</param>
         /// <param name="voucherValidPeriodDays">Number of days for which the voucher will be valid..</param>
         /// <param name="includeDeliveryFee">Discount will include delivery fee.</param>
@@ -42,10 +41,13 @@ public partial class RetentionCampaignBase :  IEquatable<RetentionCampaignBase>,
         /// <param name="includeExistingOrders">Campaign will apply to existing orders.</param>
         /// <param name="isEnabled">Is campaign enabled.</param>
         /// <param name="storeIds">Ids of stores this campaign applies to.</param>
-        public RetentionCampaignBase(int? notifyCustomerAfterMinutes = default(int?), int? percentDiscountAmount = default(int?), double? lumpDiscountAmount = default(double?), int? voucherValidPeriodDays = default(int?), bool? includeDeliveryFee = default(bool?), bool? autoApplyResultingVouchers = default(bool?), bool? includeExistingOrders = default(bool?), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>))
+        /// <param name="appId">The app that this campaign belongs to..</param>
+        /// <param name="forceDiscount">Controls whether the voucher generated from this campaign will override discount exclusions.</param>
+        public RetentionCampaignBase(int? notifyCustomerAfterMinutes = default(int?), int? percentDiscountAmount = default(int?), double? maxDiscount = default(double?), double? lumpDiscountAmount = default(double?), int? voucherValidPeriodDays = default(int?), bool? includeDeliveryFee = default(bool?), bool? autoApplyResultingVouchers = default(bool?), bool? includeExistingOrders = default(bool?), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>), string appId = default(string), bool? forceDiscount = default(bool?))
         {
             this.NotifyCustomerAfterMinutes = notifyCustomerAfterMinutes;
             this.PercentDiscountAmount = percentDiscountAmount;
+            this.MaxDiscount = maxDiscount;
             this.LumpDiscountAmount = lumpDiscountAmount;
             this.VoucherValidPeriodDays = voucherValidPeriodDays;
             this.IncludeDeliveryFee = includeDeliveryFee;
@@ -53,6 +55,8 @@ public partial class RetentionCampaignBase :  IEquatable<RetentionCampaignBase>,
             this.IncludeExistingOrders = includeExistingOrders;
             this.IsEnabled = isEnabled;
             this.StoreIds = storeIds;
+            this.AppId = appId;
+            this.ForceDiscount = forceDiscount;
         }
         
         /// <summary>
@@ -69,6 +73,13 @@ public partial class RetentionCampaignBase :  IEquatable<RetentionCampaignBase>,
         [DataMember(Name="PercentDiscountAmount", EmitDefaultValue=false)]
         public int? PercentDiscountAmount { get; set; }
 
+        /// <summary>
+        /// Maximum discount for percentage discounts
+        /// </summary>
+        /// <value>Maximum discount for percentage discounts</value>
+        [DataMember(Name="MaxDiscount", EmitDefaultValue=false)]
+        public double? MaxDiscount { get; set; }
+
         /// <summary>
         /// Discount amount in sum of money
         /// </summary>
@@ -118,6 +129,20 @@ public partial class RetentionCampaignBase :  IEquatable<RetentionCampaignBase>,
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
+        /// <summary>
+        /// The app that this campaign belongs to.
+        /// </summary>
+        /// <value>The app that this campaign belongs to.</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Controls whether the voucher generated from this campaign will override discount exclusions
+        /// </summary>
+        /// <value>Controls whether the voucher generated from this campaign will override discount exclusions</value>
+        [DataMember(Name="ForceDiscount", EmitDefaultValue=false)]
+        public bool? ForceDiscount { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -128,6 +153,7 @@ public override string ToString()
             sb.Append("class RetentionCampaignBase {\n");
             sb.Append("  NotifyCustomerAfterMinutes: ").Append(NotifyCustomerAfterMinutes).Append("\n");
             sb.Append("  PercentDiscountAmount: ").Append(PercentDiscountAmount).Append("\n");
+            sb.Append("  MaxDiscount: ").Append(MaxDiscount).Append("\n");
             sb.Append("  LumpDiscountAmount: ").Append(LumpDiscountAmount).Append("\n");
             sb.Append("  VoucherValidPeriodDays: ").Append(VoucherValidPeriodDays).Append("\n");
             sb.Append("  IncludeDeliveryFee: ").Append(IncludeDeliveryFee).Append("\n");
@@ -135,6 +161,8 @@ public override string ToString()
             sb.Append("  IncludeExistingOrders: ").Append(IncludeExistingOrders).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  ForceDiscount: ").Append(ForceDiscount).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -179,6 +207,11 @@ public bool Equals(RetentionCampaignBase input)
                     (this.PercentDiscountAmount != null &&
                     this.PercentDiscountAmount.Equals(input.PercentDiscountAmount))
                 ) && 
+                (
+                    this.MaxDiscount == input.MaxDiscount ||
+                    (this.MaxDiscount != null &&
+                    this.MaxDiscount.Equals(input.MaxDiscount))
+                ) && 
                 (
                     this.LumpDiscountAmount == input.LumpDiscountAmount ||
                     (this.LumpDiscountAmount != null &&
@@ -213,6 +246,16 @@ public bool Equals(RetentionCampaignBase input)
                     this.StoreIds == input.StoreIds ||
                     this.StoreIds != null &&
                     this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.ForceDiscount == input.ForceDiscount ||
+                    (this.ForceDiscount != null &&
+                    this.ForceDiscount.Equals(input.ForceDiscount))
                 );
         }
 
@@ -229,6 +272,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.NotifyCustomerAfterMinutes.GetHashCode();
                 if (this.PercentDiscountAmount != null)
                     hashCode = hashCode * 59 + this.PercentDiscountAmount.GetHashCode();
+                if (this.MaxDiscount != null)
+                    hashCode = hashCode * 59 + this.MaxDiscount.GetHashCode();
                 if (this.LumpDiscountAmount != null)
                     hashCode = hashCode * 59 + this.LumpDiscountAmount.GetHashCode();
                 if (this.VoucherValidPeriodDays != null)
@@ -243,67 +288,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.ForceDiscount != null)
+                    hashCode = hashCode * 59 + this.ForceDiscount.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // NotifyCustomerAfterMinutes (int?) maximum
-            if(this.NotifyCustomerAfterMinutes > (int?)2147483647)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for NotifyCustomerAfterMinutes, must be a value less than or equal to 2147483647.", new [] { "NotifyCustomerAfterMinutes" });
-            }
-
-            // NotifyCustomerAfterMinutes (int?) minimum
-            if(this.NotifyCustomerAfterMinutes < (int?)1440)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for NotifyCustomerAfterMinutes, must be a value greater than or equal to 1440.", new [] { "NotifyCustomerAfterMinutes" });
-            }
-
-            // PercentDiscountAmount (int?) maximum
-            if(this.PercentDiscountAmount > (int?)100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PercentDiscountAmount, must be a value less than or equal to 100.", new [] { "PercentDiscountAmount" });
-            }
-
-            // PercentDiscountAmount (int?) minimum
-            if(this.PercentDiscountAmount < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PercentDiscountAmount, must be a value greater than or equal to 1.", new [] { "PercentDiscountAmount" });
-            }
-
-            // LumpDiscountAmount (double?) maximum
-            if(this.LumpDiscountAmount > (double?)2147483647)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for LumpDiscountAmount, must be a value less than or equal to 2147483647.", new [] { "LumpDiscountAmount" });
-            }
-
-            // LumpDiscountAmount (double?) minimum
-            if(this.LumpDiscountAmount < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for LumpDiscountAmount, must be a value greater than or equal to 0.", new [] { "LumpDiscountAmount" });
-            }
-
-            // VoucherValidPeriodDays (int?) maximum
-            if(this.VoucherValidPeriodDays > (int?)300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VoucherValidPeriodDays, must be a value less than or equal to 300.", new [] { "VoucherValidPeriodDays" });
-            }
-
-            // VoucherValidPeriodDays (int?) minimum
-            if(this.VoucherValidPeriodDays < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for VoucherValidPeriodDays, must be a value greater than or equal to 1.", new [] { "VoucherValidPeriodDays" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RetentionCampaignCreatedEvent.cs b/src/Flipdish/Model/RetentionCampaignCreatedEvent.cs
index e86f593a..c3bd82f7 100644
--- a/src/Flipdish/Model/RetentionCampaignCreatedEvent.cs
+++ b/src/Flipdish/Model/RetentionCampaignCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Retention campaign created event
     /// </summary>
     [DataContract]
-    public partial class RetentionCampaignCreatedEvent :  IEquatable<RetentionCampaignCreatedEvent>, IValidatableObject
+    public partial class RetentionCampaignCreatedEvent :  IEquatable<RetentionCampaignCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RetentionCampaignCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class RetentionCampaignCreatedEvent :  IEquatable<RetentionCampai
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public RetentionCampaignCreatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), RetentionCampaign retentionCampaign = default(RetentionCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public RetentionCampaignCreatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), RetentionCampaign retentionCampaign = default(RetentionCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class RetentionCampaignCreatedEvent :  IEquatable<RetentionCampai
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class RetentionCampaignCreatedEvent :  IEquatable<RetentionCampai
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class RetentionCampaignCreatedEvent :  IEquatable<RetentionCampai
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(RetentionCampaignCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RetentionCampaignDeletedEvent.cs b/src/Flipdish/Model/RetentionCampaignDeletedEvent.cs
index 0f4b8ffd..f872e54d 100644
--- a/src/Flipdish/Model/RetentionCampaignDeletedEvent.cs
+++ b/src/Flipdish/Model/RetentionCampaignDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Retention campaign deleted event
     /// </summary>
     [DataContract]
-    public partial class RetentionCampaignDeletedEvent :  IEquatable<RetentionCampaignDeletedEvent>, IValidatableObject
+    public partial class RetentionCampaignDeletedEvent :  IEquatable<RetentionCampaignDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RetentionCampaignDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class RetentionCampaignDeletedEvent :  IEquatable<RetentionCampai
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public RetentionCampaignDeletedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), RetentionCampaign retentionCampaign = default(RetentionCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public RetentionCampaignDeletedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), RetentionCampaign retentionCampaign = default(RetentionCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class RetentionCampaignDeletedEvent :  IEquatable<RetentionCampai
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class RetentionCampaignDeletedEvent :  IEquatable<RetentionCampai
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class RetentionCampaignDeletedEvent :  IEquatable<RetentionCampai
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(RetentionCampaignDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RetentionCampaignUpdatedEvent.cs b/src/Flipdish/Model/RetentionCampaignUpdatedEvent.cs
index d5bf67df..58fcef0f 100644
--- a/src/Flipdish/Model/RetentionCampaignUpdatedEvent.cs
+++ b/src/Flipdish/Model/RetentionCampaignUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Retention campaign updated event
     /// </summary>
     [DataContract]
-    public partial class RetentionCampaignUpdatedEvent :  IEquatable<RetentionCampaignUpdatedEvent>, IValidatableObject
+    public partial class RetentionCampaignUpdatedEvent :  IEquatable<RetentionCampaignUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RetentionCampaignUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class RetentionCampaignUpdatedEvent :  IEquatable<RetentionCampai
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public RetentionCampaignUpdatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), RetentionCampaign retentionCampaign = default(RetentionCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public RetentionCampaignUpdatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), RetentionCampaign retentionCampaign = default(RetentionCampaign), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -54,7 +55,10 @@ public partial class RetentionCampaignUpdatedEvent :  IEquatable<RetentionCampai
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class RetentionCampaignUpdatedEvent :  IEquatable<RetentionCampai
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class RetentionCampaignUpdatedEvent :  IEquatable<RetentionCampai
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(RetentionCampaignUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RevenueAdjustmentsDetails.cs b/src/Flipdish/Model/RevenueAdjustmentsDetails.cs
index 648dd025..50117679 100644
--- a/src/Flipdish/Model/RevenueAdjustmentsDetails.cs
+++ b/src/Flipdish/Model/RevenueAdjustmentsDetails.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,22 +26,28 @@ namespace Flipdish.Model
     /// Revenue Adjustments breakdown
     /// </summary>
     [DataContract]
-    public partial class RevenueAdjustmentsDetails :  IEquatable<RevenueAdjustmentsDetails>, IValidatableObject
+    public partial class RevenueAdjustmentsDetails :  IEquatable<RevenueAdjustmentsDetails>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RevenueAdjustmentsDetails" /> class.
         /// </summary>
         /// <param name="onlineSalesRefundedAmount">Online sales refunds.</param>
+        /// <param name="posSalesRefundedAmount">POS Online sales refunds.</param>
         /// <param name="cashSalesRefundedAmount">Cash sales refunds.</param>
         /// <param name="customerCashFees">Customer cash fees.</param>
         /// <param name="refundsCount">Number of refunds.</param>
+        /// <param name="payGreenSalesAmount">PayGreen sales.</param>
+        /// <param name="payGreenProcessingFees">PayGreen processing fees charged to end-user.</param>
         /// <param name="totalOnlineRevenueAdjustments">Total revenue adjustments.</param>
-        public RevenueAdjustmentsDetails(double? onlineSalesRefundedAmount = default(double?), double? cashSalesRefundedAmount = default(double?), double? customerCashFees = default(double?), int? refundsCount = default(int?), double? totalOnlineRevenueAdjustments = default(double?))
+        public RevenueAdjustmentsDetails(double? onlineSalesRefundedAmount = default(double?), double? posSalesRefundedAmount = default(double?), double? cashSalesRefundedAmount = default(double?), double? customerCashFees = default(double?), int? refundsCount = default(int?), double? payGreenSalesAmount = default(double?), double? payGreenProcessingFees = default(double?), double? totalOnlineRevenueAdjustments = default(double?))
         {
             this.OnlineSalesRefundedAmount = onlineSalesRefundedAmount;
+            this.PosSalesRefundedAmount = posSalesRefundedAmount;
             this.CashSalesRefundedAmount = cashSalesRefundedAmount;
             this.CustomerCashFees = customerCashFees;
             this.RefundsCount = refundsCount;
+            this.PayGreenSalesAmount = payGreenSalesAmount;
+            this.PayGreenProcessingFees = payGreenProcessingFees;
             this.TotalOnlineRevenueAdjustments = totalOnlineRevenueAdjustments;
         }
         
@@ -54,6 +58,13 @@ public partial class RevenueAdjustmentsDetails :  IEquatable<RevenueAdjustmentsD
         [DataMember(Name="OnlineSalesRefundedAmount", EmitDefaultValue=false)]
         public double? OnlineSalesRefundedAmount { get; set; }
 
+        /// <summary>
+        /// POS Online sales refunds
+        /// </summary>
+        /// <value>POS Online sales refunds</value>
+        [DataMember(Name="PosSalesRefundedAmount", EmitDefaultValue=false)]
+        public double? PosSalesRefundedAmount { get; set; }
+
         /// <summary>
         /// Cash sales refunds
         /// </summary>
@@ -75,6 +86,20 @@ public partial class RevenueAdjustmentsDetails :  IEquatable<RevenueAdjustmentsD
         [DataMember(Name="RefundsCount", EmitDefaultValue=false)]
         public int? RefundsCount { get; set; }
 
+        /// <summary>
+        /// PayGreen sales
+        /// </summary>
+        /// <value>PayGreen sales</value>
+        [DataMember(Name="PayGreenSalesAmount", EmitDefaultValue=false)]
+        public double? PayGreenSalesAmount { get; set; }
+
+        /// <summary>
+        /// PayGreen processing fees charged to end-user
+        /// </summary>
+        /// <value>PayGreen processing fees charged to end-user</value>
+        [DataMember(Name="PayGreenProcessingFees", EmitDefaultValue=false)]
+        public double? PayGreenProcessingFees { get; set; }
+
         /// <summary>
         /// Total revenue adjustments
         /// </summary>
@@ -91,9 +116,12 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class RevenueAdjustmentsDetails {\n");
             sb.Append("  OnlineSalesRefundedAmount: ").Append(OnlineSalesRefundedAmount).Append("\n");
+            sb.Append("  PosSalesRefundedAmount: ").Append(PosSalesRefundedAmount).Append("\n");
             sb.Append("  CashSalesRefundedAmount: ").Append(CashSalesRefundedAmount).Append("\n");
             sb.Append("  CustomerCashFees: ").Append(CustomerCashFees).Append("\n");
             sb.Append("  RefundsCount: ").Append(RefundsCount).Append("\n");
+            sb.Append("  PayGreenSalesAmount: ").Append(PayGreenSalesAmount).Append("\n");
+            sb.Append("  PayGreenProcessingFees: ").Append(PayGreenProcessingFees).Append("\n");
             sb.Append("  TotalOnlineRevenueAdjustments: ").Append(TotalOnlineRevenueAdjustments).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -134,6 +162,11 @@ public bool Equals(RevenueAdjustmentsDetails input)
                     (this.OnlineSalesRefundedAmount != null &&
                     this.OnlineSalesRefundedAmount.Equals(input.OnlineSalesRefundedAmount))
                 ) && 
+                (
+                    this.PosSalesRefundedAmount == input.PosSalesRefundedAmount ||
+                    (this.PosSalesRefundedAmount != null &&
+                    this.PosSalesRefundedAmount.Equals(input.PosSalesRefundedAmount))
+                ) && 
                 (
                     this.CashSalesRefundedAmount == input.CashSalesRefundedAmount ||
                     (this.CashSalesRefundedAmount != null &&
@@ -149,6 +182,16 @@ public bool Equals(RevenueAdjustmentsDetails input)
                     (this.RefundsCount != null &&
                     this.RefundsCount.Equals(input.RefundsCount))
                 ) && 
+                (
+                    this.PayGreenSalesAmount == input.PayGreenSalesAmount ||
+                    (this.PayGreenSalesAmount != null &&
+                    this.PayGreenSalesAmount.Equals(input.PayGreenSalesAmount))
+                ) && 
+                (
+                    this.PayGreenProcessingFees == input.PayGreenProcessingFees ||
+                    (this.PayGreenProcessingFees != null &&
+                    this.PayGreenProcessingFees.Equals(input.PayGreenProcessingFees))
+                ) && 
                 (
                     this.TotalOnlineRevenueAdjustments == input.TotalOnlineRevenueAdjustments ||
                     (this.TotalOnlineRevenueAdjustments != null &&
@@ -167,27 +210,23 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.OnlineSalesRefundedAmount != null)
                     hashCode = hashCode * 59 + this.OnlineSalesRefundedAmount.GetHashCode();
+                if (this.PosSalesRefundedAmount != null)
+                    hashCode = hashCode * 59 + this.PosSalesRefundedAmount.GetHashCode();
                 if (this.CashSalesRefundedAmount != null)
                     hashCode = hashCode * 59 + this.CashSalesRefundedAmount.GetHashCode();
                 if (this.CustomerCashFees != null)
                     hashCode = hashCode * 59 + this.CustomerCashFees.GetHashCode();
                 if (this.RefundsCount != null)
                     hashCode = hashCode * 59 + this.RefundsCount.GetHashCode();
+                if (this.PayGreenSalesAmount != null)
+                    hashCode = hashCode * 59 + this.PayGreenSalesAmount.GetHashCode();
+                if (this.PayGreenProcessingFees != null)
+                    hashCode = hashCode * 59 + this.PayGreenProcessingFees.GetHashCode();
                 if (this.TotalOnlineRevenueAdjustments != null)
                     hashCode = hashCode * 59 + this.TotalOnlineRevenueAdjustments.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/RevenueDetail.cs b/src/Flipdish/Model/RevenueDetail.cs
index 4444c075..db7ad2b3 100644
--- a/src/Flipdish/Model/RevenueDetail.cs
+++ b/src/Flipdish/Model/RevenueDetail.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Sales information
     /// </summary>
     [DataContract]
-    public partial class RevenueDetail :  IEquatable<RevenueDetail>, IValidatableObject
+    public partial class RevenueDetail :  IEquatable<RevenueDetail>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RevenueDetail" /> class.
@@ -314,16 +312,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/SafeWaitHandle.cs b/src/Flipdish/Model/SafeWaitHandle.cs
new file mode 100644
index 00000000..012e7e33
--- /dev/null
+++ b/src/Flipdish/Model/SafeWaitHandle.cs
@@ -0,0 +1,125 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// SafeWaitHandle
+    /// </summary>
+    [DataContract]
+    public partial class SafeWaitHandle :  IEquatable<SafeWaitHandle>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SafeWaitHandle" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        public SafeWaitHandle()
+        {
+        }
+        
+        /// <summary>
+        /// Gets or Sets IsInvalid
+        /// </summary>
+        [DataMember(Name="IsInvalid", EmitDefaultValue=false)]
+        public bool? IsInvalid { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets IsClosed
+        /// </summary>
+        [DataMember(Name="IsClosed", EmitDefaultValue=false)]
+        public bool? IsClosed { get; private set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SafeWaitHandle {\n");
+            sb.Append("  IsInvalid: ").Append(IsInvalid).Append("\n");
+            sb.Append("  IsClosed: ").Append(IsClosed).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SafeWaitHandle);
+        }
+
+        /// <summary>
+        /// Returns true if SafeWaitHandle instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SafeWaitHandle to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SafeWaitHandle input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.IsInvalid == input.IsInvalid ||
+                    (this.IsInvalid != null &&
+                    this.IsInvalid.Equals(input.IsInvalid))
+                ) && 
+                (
+                    this.IsClosed == input.IsClosed ||
+                    (this.IsClosed != null &&
+                    this.IsClosed.Equals(input.IsClosed))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.IsInvalid != null)
+                    hashCode = hashCode * 59 + this.IsInvalid.GetHashCode();
+                if (this.IsClosed != null)
+                    hashCode = hashCode * 59 + this.IsClosed.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SearchCriteria.cs b/src/Flipdish/Model/SearchCriteria.cs
index f5c57d3c..c73e8cef 100644
--- a/src/Flipdish/Model/SearchCriteria.cs
+++ b/src/Flipdish/Model/SearchCriteria.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Search Criteria for Audit Logs
     /// </summary>
     [DataContract]
-    public partial class SearchCriteria :  IEquatable<SearchCriteria>, IValidatableObject
+    public partial class SearchCriteria :  IEquatable<SearchCriteria>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SearchCriteria" /> class.
@@ -39,14 +37,17 @@ public partial class SearchCriteria :  IEquatable<SearchCriteria>, IValidatableO
         /// <param name="end">End date.</param>
         /// <param name="orderId">Events that have Order Id.</param>
         /// <param name="storeId">Events that have Store Id.</param>
+        /// <param name="storeIdList">Events that have Store Id List.</param>
         /// <param name="storeGroupId">Events that have Store Group Id.</param>
         /// <param name="userId">Events that have User Id.</param>
+        /// <param name="menuId">Events that have Menu Id.</param>
+        /// <param name="campaignId">Events that have Campaign Id.</param>
         /// <param name="userEmail">Events that have User Email.</param>
         /// <param name="userName">Events that have User Name.</param>
         /// <param name="voucherCode">Events that have voucher code.</param>
         /// <param name="eventType">Events that have event type\\s.</param>
         /// <param name="flipdishEventId">Unique Identifier of Event, if this is specified, all other criteria are ignored..</param>
-        public SearchCriteria(int? limit = default(int?), int? page = default(int?), DateTime? start = default(DateTime?), DateTime? end = default(DateTime?), int? orderId = default(int?), int? storeId = default(int?), int? storeGroupId = default(int?), int? userId = default(int?), string userEmail = default(string), string userName = default(string), string voucherCode = default(string), List<string> eventType = default(List<string>), string flipdishEventId = default(string))
+        public SearchCriteria(int? limit = default(int?), int? page = default(int?), DateTime? start = default(DateTime?), DateTime? end = default(DateTime?), int? orderId = default(int?), int? storeId = default(int?), List<int?> storeIdList = default(List<int?>), int? storeGroupId = default(int?), int? userId = default(int?), int? menuId = default(int?), int? campaignId = default(int?), string userEmail = default(string), string userName = default(string), string voucherCode = default(string), List<string> eventType = default(List<string>), string flipdishEventId = default(string))
         {
             this.Limit = limit;
             this.Page = page;
@@ -54,8 +55,11 @@ public partial class SearchCriteria :  IEquatable<SearchCriteria>, IValidatableO
             this.End = end;
             this.OrderId = orderId;
             this.StoreId = storeId;
+            this.StoreIdList = storeIdList;
             this.StoreGroupId = storeGroupId;
             this.UserId = userId;
+            this.MenuId = menuId;
+            this.CampaignId = campaignId;
             this.UserEmail = userEmail;
             this.UserName = userName;
             this.VoucherCode = voucherCode;
@@ -105,6 +109,13 @@ public partial class SearchCriteria :  IEquatable<SearchCriteria>, IValidatableO
         [DataMember(Name="StoreId", EmitDefaultValue=false)]
         public int? StoreId { get; set; }
 
+        /// <summary>
+        /// Events that have Store Id List
+        /// </summary>
+        /// <value>Events that have Store Id List</value>
+        [DataMember(Name="StoreIdList", EmitDefaultValue=false)]
+        public List<int?> StoreIdList { get; set; }
+
         /// <summary>
         /// Events that have Store Group Id
         /// </summary>
@@ -119,6 +130,20 @@ public partial class SearchCriteria :  IEquatable<SearchCriteria>, IValidatableO
         [DataMember(Name="UserId", EmitDefaultValue=false)]
         public int? UserId { get; set; }
 
+        /// <summary>
+        /// Events that have Menu Id
+        /// </summary>
+        /// <value>Events that have Menu Id</value>
+        [DataMember(Name="MenuId", EmitDefaultValue=false)]
+        public int? MenuId { get; set; }
+
+        /// <summary>
+        /// Events that have Campaign Id
+        /// </summary>
+        /// <value>Events that have Campaign Id</value>
+        [DataMember(Name="CampaignId", EmitDefaultValue=false)]
+        public int? CampaignId { get; set; }
+
         /// <summary>
         /// Events that have User Email
         /// </summary>
@@ -168,8 +193,11 @@ public override string ToString()
             sb.Append("  End: ").Append(End).Append("\n");
             sb.Append("  OrderId: ").Append(OrderId).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  StoreIdList: ").Append(StoreIdList).Append("\n");
             sb.Append("  StoreGroupId: ").Append(StoreGroupId).Append("\n");
             sb.Append("  UserId: ").Append(UserId).Append("\n");
+            sb.Append("  MenuId: ").Append(MenuId).Append("\n");
+            sb.Append("  CampaignId: ").Append(CampaignId).Append("\n");
             sb.Append("  UserEmail: ").Append(UserEmail).Append("\n");
             sb.Append("  UserName: ").Append(UserName).Append("\n");
             sb.Append("  VoucherCode: ").Append(VoucherCode).Append("\n");
@@ -239,6 +267,11 @@ public bool Equals(SearchCriteria input)
                     (this.StoreId != null &&
                     this.StoreId.Equals(input.StoreId))
                 ) && 
+                (
+                    this.StoreIdList == input.StoreIdList ||
+                    this.StoreIdList != null &&
+                    this.StoreIdList.SequenceEqual(input.StoreIdList)
+                ) && 
                 (
                     this.StoreGroupId == input.StoreGroupId ||
                     (this.StoreGroupId != null &&
@@ -249,6 +282,16 @@ public bool Equals(SearchCriteria input)
                     (this.UserId != null &&
                     this.UserId.Equals(input.UserId))
                 ) && 
+                (
+                    this.MenuId == input.MenuId ||
+                    (this.MenuId != null &&
+                    this.MenuId.Equals(input.MenuId))
+                ) && 
+                (
+                    this.CampaignId == input.CampaignId ||
+                    (this.CampaignId != null &&
+                    this.CampaignId.Equals(input.CampaignId))
+                ) && 
                 (
                     this.UserEmail == input.UserEmail ||
                     (this.UserEmail != null &&
@@ -297,10 +340,16 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.OrderId.GetHashCode();
                 if (this.StoreId != null)
                     hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.StoreIdList != null)
+                    hashCode = hashCode * 59 + this.StoreIdList.GetHashCode();
                 if (this.StoreGroupId != null)
                     hashCode = hashCode * 59 + this.StoreGroupId.GetHashCode();
                 if (this.UserId != null)
                     hashCode = hashCode * 59 + this.UserId.GetHashCode();
+                if (this.MenuId != null)
+                    hashCode = hashCode * 59 + this.MenuId.GetHashCode();
+                if (this.CampaignId != null)
+                    hashCode = hashCode * 59 + this.CampaignId.GetHashCode();
                 if (this.UserEmail != null)
                     hashCode = hashCode * 59 + this.UserEmail.GetHashCode();
                 if (this.UserName != null)
@@ -314,16 +363,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/SendUserPushNotificationRequest.cs b/src/Flipdish/Model/SendUserPushNotificationRequest.cs
new file mode 100644
index 00000000..8ea2919f
--- /dev/null
+++ b/src/Flipdish/Model/SendUserPushNotificationRequest.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Send a push notification to a user.
+    /// </summary>
+    [DataContract]
+    public partial class SendUserPushNotificationRequest :  IEquatable<SendUserPushNotificationRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SendUserPushNotificationRequest" /> class.
+        /// </summary>
+        /// <param name="whiteLabelId">WhiteLabelId..</param>
+        /// <param name="message">Message..</param>
+        public SendUserPushNotificationRequest(int? whiteLabelId = default(int?), string message = default(string))
+        {
+            this.WhiteLabelId = whiteLabelId;
+            this.Message = message;
+        }
+        
+        /// <summary>
+        /// WhiteLabelId.
+        /// </summary>
+        /// <value>WhiteLabelId.</value>
+        [DataMember(Name="WhiteLabelId", EmitDefaultValue=false)]
+        public int? WhiteLabelId { get; set; }
+
+        /// <summary>
+        /// Message.
+        /// </summary>
+        /// <value>Message.</value>
+        [DataMember(Name="Message", EmitDefaultValue=false)]
+        public string Message { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SendUserPushNotificationRequest {\n");
+            sb.Append("  WhiteLabelId: ").Append(WhiteLabelId).Append("\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SendUserPushNotificationRequest);
+        }
+
+        /// <summary>
+        /// Returns true if SendUserPushNotificationRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SendUserPushNotificationRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SendUserPushNotificationRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelId == input.WhiteLabelId ||
+                    (this.WhiteLabelId != null &&
+                    this.WhiteLabelId.Equals(input.WhiteLabelId))
+                ) && 
+                (
+                    this.Message == input.Message ||
+                    (this.Message != null &&
+                    this.Message.Equals(input.Message))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelId.GetHashCode();
+                if (this.Message != null)
+                    hashCode = hashCode * 59 + this.Message.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SendUserSmsRequest.cs b/src/Flipdish/Model/SendUserSmsRequest.cs
new file mode 100644
index 00000000..67f766a8
--- /dev/null
+++ b/src/Flipdish/Model/SendUserSmsRequest.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Send an SMS to a user from admin.
+    /// </summary>
+    [DataContract]
+    public partial class SendUserSmsRequest :  IEquatable<SendUserSmsRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SendUserSmsRequest" /> class.
+        /// </summary>
+        /// <param name="message">Message..</param>
+        /// <param name="whiteLabelId">WhiteLabelId..</param>
+        /// <param name="fromNumber">FromNumber..</param>
+        public SendUserSmsRequest(string message = default(string), int? whiteLabelId = default(int?), string fromNumber = default(string))
+        {
+            this.Message = message;
+            this.WhiteLabelId = whiteLabelId;
+            this.FromNumber = fromNumber;
+        }
+        
+        /// <summary>
+        /// Message.
+        /// </summary>
+        /// <value>Message.</value>
+        [DataMember(Name="Message", EmitDefaultValue=false)]
+        public string Message { get; set; }
+
+        /// <summary>
+        /// WhiteLabelId.
+        /// </summary>
+        /// <value>WhiteLabelId.</value>
+        [DataMember(Name="WhiteLabelId", EmitDefaultValue=false)]
+        public int? WhiteLabelId { get; set; }
+
+        /// <summary>
+        /// FromNumber.
+        /// </summary>
+        /// <value>FromNumber.</value>
+        [DataMember(Name="FromNumber", EmitDefaultValue=false)]
+        public string FromNumber { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SendUserSmsRequest {\n");
+            sb.Append("  Message: ").Append(Message).Append("\n");
+            sb.Append("  WhiteLabelId: ").Append(WhiteLabelId).Append("\n");
+            sb.Append("  FromNumber: ").Append(FromNumber).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SendUserSmsRequest);
+        }
+
+        /// <summary>
+        /// Returns true if SendUserSmsRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SendUserSmsRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SendUserSmsRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Message == input.Message ||
+                    (this.Message != null &&
+                    this.Message.Equals(input.Message))
+                ) && 
+                (
+                    this.WhiteLabelId == input.WhiteLabelId ||
+                    (this.WhiteLabelId != null &&
+                    this.WhiteLabelId.Equals(input.WhiteLabelId))
+                ) && 
+                (
+                    this.FromNumber == input.FromNumber ||
+                    (this.FromNumber != null &&
+                    this.FromNumber.Equals(input.FromNumber))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Message != null)
+                    hashCode = hashCode * 59 + this.Message.GetHashCode();
+                if (this.WhiteLabelId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelId.GetHashCode();
+                if (this.FromNumber != null)
+                    hashCode = hashCode * 59 + this.FromNumber.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ServiceCharge.cs b/src/Flipdish/Model/ServiceCharge.cs
index bad9f597..b08dd85e 100644
--- a/src/Flipdish/Model/ServiceCharge.cs
+++ b/src/Flipdish/Model/ServiceCharge.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Service Charge
     /// </summary>
     [DataContract]
-    public partial class ServiceCharge :  IEquatable<ServiceCharge>, IValidatableObject
+    public partial class ServiceCharge :  IEquatable<ServiceCharge>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ServiceCharge" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/SetOrderBatchingConfiguration.cs b/src/Flipdish/Model/SetOrderBatchingConfiguration.cs
index b2f5dd68..c876f7f8 100644
--- a/src/Flipdish/Model/SetOrderBatchingConfiguration.cs
+++ b/src/Flipdish/Model/SetOrderBatchingConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,25 +26,25 @@ namespace Flipdish.Model
     /// Describes the configuration of OrderBatching
     /// </summary>
     [DataContract]
-    public partial class SetOrderBatchingConfiguration :  IEquatable<SetOrderBatchingConfiguration>, IValidatableObject
+    public partial class SetOrderBatchingConfiguration :  IEquatable<SetOrderBatchingConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SetOrderBatchingConfiguration" /> class.
         /// </summary>
-        /// <param name="batchIntervalInMinutes">Batch sending interval in minutes.</param>
+        /// <param name="batchIntervalInSeconds">Batch sending interval in seconds.</param>
         /// <param name="enabled">OrderBatching is enabled or not.</param>
-        public SetOrderBatchingConfiguration(int? batchIntervalInMinutes = default(int?), bool? enabled = default(bool?))
+        public SetOrderBatchingConfiguration(int? batchIntervalInSeconds = default(int?), bool? enabled = default(bool?))
         {
-            this.BatchIntervalInMinutes = batchIntervalInMinutes;
+            this.BatchIntervalInSeconds = batchIntervalInSeconds;
             this.Enabled = enabled;
         }
         
         /// <summary>
-        /// Batch sending interval in minutes
+        /// Batch sending interval in seconds
         /// </summary>
-        /// <value>Batch sending interval in minutes</value>
-        [DataMember(Name="BatchIntervalInMinutes", EmitDefaultValue=false)]
-        public int? BatchIntervalInMinutes { get; set; }
+        /// <value>Batch sending interval in seconds</value>
+        [DataMember(Name="BatchIntervalInSeconds", EmitDefaultValue=false)]
+        public int? BatchIntervalInSeconds { get; set; }
 
         /// <summary>
         /// OrderBatching is enabled or not
@@ -63,7 +61,7 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class SetOrderBatchingConfiguration {\n");
-            sb.Append("  BatchIntervalInMinutes: ").Append(BatchIntervalInMinutes).Append("\n");
+            sb.Append("  BatchIntervalInSeconds: ").Append(BatchIntervalInSeconds).Append("\n");
             sb.Append("  Enabled: ").Append(Enabled).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -100,9 +98,9 @@ public bool Equals(SetOrderBatchingConfiguration input)
 
             return 
                 (
-                    this.BatchIntervalInMinutes == input.BatchIntervalInMinutes ||
-                    (this.BatchIntervalInMinutes != null &&
-                    this.BatchIntervalInMinutes.Equals(input.BatchIntervalInMinutes))
+                    this.BatchIntervalInSeconds == input.BatchIntervalInSeconds ||
+                    (this.BatchIntervalInSeconds != null &&
+                    this.BatchIntervalInSeconds.Equals(input.BatchIntervalInSeconds))
                 ) && 
                 (
                     this.Enabled == input.Enabled ||
@@ -120,23 +118,13 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
-                if (this.BatchIntervalInMinutes != null)
-                    hashCode = hashCode * 59 + this.BatchIntervalInMinutes.GetHashCode();
+                if (this.BatchIntervalInSeconds != null)
+                    hashCode = hashCode * 59 + this.BatchIntervalInSeconds.GetHashCode();
                 if (this.Enabled != null)
                     hashCode = hashCode * 59 + this.Enabled.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/SetPasswordWithPinModel.cs b/src/Flipdish/Model/SetPasswordWithPinModel.cs
deleted file mode 100644
index 94bd538c..00000000
--- a/src/Flipdish/Model/SetPasswordWithPinModel.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Set password with PIN model
-    /// </summary>
-    [DataContract]
-    public partial class SetPasswordWithPinModel :  IEquatable<SetPasswordWithPinModel>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetPasswordWithPinModel" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected SetPasswordWithPinModel() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetPasswordWithPinModel" /> class.
-        /// </summary>
-        /// <param name="pin">PIN code (received via email) (required).</param>
-        /// <param name="newPassword">New Password (required).</param>
-        public SetPasswordWithPinModel(int? pin = default(int?), string newPassword = default(string))
-        {
-            // to ensure "pin" is required (not null)
-            if (pin == null)
-            {
-                throw new InvalidDataException("pin is a required property for SetPasswordWithPinModel and cannot be null");
-            }
-            else
-            {
-                this.Pin = pin;
-            }
-            // to ensure "newPassword" is required (not null)
-            if (newPassword == null)
-            {
-                throw new InvalidDataException("newPassword is a required property for SetPasswordWithPinModel and cannot be null");
-            }
-            else
-            {
-                this.NewPassword = newPassword;
-            }
-        }
-        
-        /// <summary>
-        /// PIN code (received via email)
-        /// </summary>
-        /// <value>PIN code (received via email)</value>
-        [DataMember(Name="Pin", EmitDefaultValue=false)]
-        public int? Pin { get; set; }
-
-        /// <summary>
-        /// New Password
-        /// </summary>
-        /// <value>New Password</value>
-        [DataMember(Name="NewPassword", EmitDefaultValue=false)]
-        public string NewPassword { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class SetPasswordWithPinModel {\n");
-            sb.Append("  Pin: ").Append(Pin).Append("\n");
-            sb.Append("  NewPassword: ").Append(NewPassword).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as SetPasswordWithPinModel);
-        }
-
-        /// <summary>
-        /// Returns true if SetPasswordWithPinModel instances are equal
-        /// </summary>
-        /// <param name="input">Instance of SetPasswordWithPinModel to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(SetPasswordWithPinModel input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Pin == input.Pin ||
-                    (this.Pin != null &&
-                    this.Pin.Equals(input.Pin))
-                ) && 
-                (
-                    this.NewPassword == input.NewPassword ||
-                    (this.NewPassword != null &&
-                    this.NewPassword.Equals(input.NewPassword))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Pin != null)
-                    hashCode = hashCode * 59 + this.Pin.GetHashCode();
-                if (this.NewPassword != null)
-                    hashCode = hashCode * 59 + this.NewPassword.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/SetUserDeliveryLocationCoordinatesRequest.cs b/src/Flipdish/Model/SetUserDeliveryLocationCoordinatesRequest.cs
new file mode 100644
index 00000000..e759af65
--- /dev/null
+++ b/src/Flipdish/Model/SetUserDeliveryLocationCoordinatesRequest.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Set delivery location coordinates.
+    /// </summary>
+    [DataContract]
+    public partial class SetUserDeliveryLocationCoordinatesRequest :  IEquatable<SetUserDeliveryLocationCoordinatesRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetUserDeliveryLocationCoordinatesRequest" /> class.
+        /// </summary>
+        /// <param name="latitude">Latitude..</param>
+        /// <param name="longitude">Longitude..</param>
+        public SetUserDeliveryLocationCoordinatesRequest(double? latitude = default(double?), double? longitude = default(double?))
+        {
+            this.Latitude = latitude;
+            this.Longitude = longitude;
+        }
+        
+        /// <summary>
+        /// Latitude.
+        /// </summary>
+        /// <value>Latitude.</value>
+        [DataMember(Name="Latitude", EmitDefaultValue=false)]
+        public double? Latitude { get; set; }
+
+        /// <summary>
+        /// Longitude.
+        /// </summary>
+        /// <value>Longitude.</value>
+        [DataMember(Name="Longitude", EmitDefaultValue=false)]
+        public double? Longitude { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SetUserDeliveryLocationCoordinatesRequest {\n");
+            sb.Append("  Latitude: ").Append(Latitude).Append("\n");
+            sb.Append("  Longitude: ").Append(Longitude).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SetUserDeliveryLocationCoordinatesRequest);
+        }
+
+        /// <summary>
+        /// Returns true if SetUserDeliveryLocationCoordinatesRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SetUserDeliveryLocationCoordinatesRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SetUserDeliveryLocationCoordinatesRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Latitude == input.Latitude ||
+                    (this.Latitude != null &&
+                    this.Latitude.Equals(input.Latitude))
+                ) && 
+                (
+                    this.Longitude == input.Longitude ||
+                    (this.Longitude != null &&
+                    this.Longitude.Equals(input.Longitude))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Latitude != null)
+                    hashCode = hashCode * 59 + this.Latitude.GetHashCode();
+                if (this.Longitude != null)
+                    hashCode = hashCode * 59 + this.Longitude.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SetUserDeliveryLocationFieldRequest.cs b/src/Flipdish/Model/SetUserDeliveryLocationFieldRequest.cs
new file mode 100644
index 00000000..dc34b889
--- /dev/null
+++ b/src/Flipdish/Model/SetUserDeliveryLocationFieldRequest.cs
@@ -0,0 +1,169 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Update a single delivery location field (matches legacy SetDeliveryLocationInfo names).
+    /// </summary>
+    [DataContract]
+    public partial class SetUserDeliveryLocationFieldRequest :  IEquatable<SetUserDeliveryLocationFieldRequest>
+    {
+        /// <summary>
+        /// Which field to update. Omit or set to null for a validation error.
+        /// </summary>
+        /// <value>Which field to update. Omit or set to null for a validation error.</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum FieldEnum
+        {
+            
+            /// <summary>
+            /// Enum DeliveryInstructions for value: DeliveryInstructions
+            /// </summary>
+            [EnumMember(Value = "DeliveryInstructions")]
+            DeliveryInstructions = 1,
+            
+            /// <summary>
+            /// Enum IsDisplayed for value: IsDisplayed
+            /// </summary>
+            [EnumMember(Value = "IsDisplayed")]
+            IsDisplayed = 2,
+            
+            /// <summary>
+            /// Enum BuildingString for value: BuildingString
+            /// </summary>
+            [EnumMember(Value = "BuildingString")]
+            BuildingString = 3,
+            
+            /// <summary>
+            /// Enum StreetString for value: StreetString
+            /// </summary>
+            [EnumMember(Value = "StreetString")]
+            StreetString = 4,
+            
+            /// <summary>
+            /// Enum TownString for value: TownString
+            /// </summary>
+            [EnumMember(Value = "TownString")]
+            TownString = 5
+        }
+
+        /// <summary>
+        /// Which field to update. Omit or set to null for a validation error.
+        /// </summary>
+        /// <value>Which field to update. Omit or set to null for a validation error.</value>
+        [DataMember(Name="Field", EmitDefaultValue=false)]
+        public FieldEnum? Field { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetUserDeliveryLocationFieldRequest" /> class.
+        /// </summary>
+        /// <param name="field">Which field to update. Omit or set to null for a validation error..</param>
+        /// <param name="value">Value..</param>
+        public SetUserDeliveryLocationFieldRequest(FieldEnum? field = default(FieldEnum?), string value = default(string))
+        {
+            this.Field = field;
+            this.Value = value;
+        }
+        
+
+        /// <summary>
+        /// Value.
+        /// </summary>
+        /// <value>Value.</value>
+        [DataMember(Name="Value", EmitDefaultValue=false)]
+        public string Value { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SetUserDeliveryLocationFieldRequest {\n");
+            sb.Append("  Field: ").Append(Field).Append("\n");
+            sb.Append("  Value: ").Append(Value).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SetUserDeliveryLocationFieldRequest);
+        }
+
+        /// <summary>
+        /// Returns true if SetUserDeliveryLocationFieldRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SetUserDeliveryLocationFieldRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SetUserDeliveryLocationFieldRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Field == input.Field ||
+                    (this.Field != null &&
+                    this.Field.Equals(input.Field))
+                ) && 
+                (
+                    this.Value == input.Value ||
+                    (this.Value != null &&
+                    this.Value.Equals(input.Value))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Field != null)
+                    hashCode = hashCode * 59 + this.Field.GetHashCode();
+                if (this.Value != null)
+                    hashCode = hashCode * 59 + this.Value.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SetV2FeeCalculationRequest.cs b/src/Flipdish/Model/SetV2FeeCalculationRequest.cs
new file mode 100644
index 00000000..fa1d220a
--- /dev/null
+++ b/src/Flipdish/Model/SetV2FeeCalculationRequest.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Input model for setting whether the V2 (tiered) fee calculation is enabled for a Store
+    /// </summary>
+    [DataContract]
+    public partial class SetV2FeeCalculationRequest :  IEquatable<SetV2FeeCalculationRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetV2FeeCalculationRequest" /> class.
+        /// </summary>
+        /// <param name="isEnabled">Whether the V2 (tiered) fee calculation should be enabled for this Store. Required..</param>
+        public SetV2FeeCalculationRequest(bool? isEnabled = default(bool?))
+        {
+            this.IsEnabled = isEnabled;
+        }
+        
+        /// <summary>
+        /// Whether the V2 (tiered) fee calculation should be enabled for this Store. Required.
+        /// </summary>
+        /// <value>Whether the V2 (tiered) fee calculation should be enabled for this Store. Required.</value>
+        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
+        public bool? IsEnabled { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SetV2FeeCalculationRequest {\n");
+            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SetV2FeeCalculationRequest);
+        }
+
+        /// <summary>
+        /// Returns true if SetV2FeeCalculationRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SetV2FeeCalculationRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SetV2FeeCalculationRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.IsEnabled == input.IsEnabled ||
+                    (this.IsEnabled != null &&
+                    this.IsEnabled.Equals(input.IsEnabled))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.IsEnabled != null)
+                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SetVoucherValidityPeriodsSimplifiedRequest.cs b/src/Flipdish/Model/SetVoucherValidityPeriodsSimplifiedRequest.cs
new file mode 100644
index 00000000..73331688
--- /dev/null
+++ b/src/Flipdish/Model/SetVoucherValidityPeriodsSimplifiedRequest.cs
@@ -0,0 +1,198 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Set the validity periods of a voucher.
+    /// </summary>
+    [DataContract]
+    public partial class SetVoucherValidityPeriodsSimplifiedRequest :  IEquatable<SetVoucherValidityPeriodsSimplifiedRequest>
+    {
+        /// <summary>
+        /// Defines DaysOfWeek
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum DaysOfWeekEnum
+        {
+            
+            /// <summary>
+            /// Enum Sunday for value: Sunday
+            /// </summary>
+            [EnumMember(Value = "Sunday")]
+            Sunday = 1,
+            
+            /// <summary>
+            /// Enum Monday for value: Monday
+            /// </summary>
+            [EnumMember(Value = "Monday")]
+            Monday = 2,
+            
+            /// <summary>
+            /// Enum Tuesday for value: Tuesday
+            /// </summary>
+            [EnumMember(Value = "Tuesday")]
+            Tuesday = 3,
+            
+            /// <summary>
+            /// Enum Wednesday for value: Wednesday
+            /// </summary>
+            [EnumMember(Value = "Wednesday")]
+            Wednesday = 4,
+            
+            /// <summary>
+            /// Enum Thursday for value: Thursday
+            /// </summary>
+            [EnumMember(Value = "Thursday")]
+            Thursday = 5,
+            
+            /// <summary>
+            /// Enum Friday for value: Friday
+            /// </summary>
+            [EnumMember(Value = "Friday")]
+            Friday = 6,
+            
+            /// <summary>
+            /// Enum Saturday for value: Saturday
+            /// </summary>
+            [EnumMember(Value = "Saturday")]
+            Saturday = 7
+        }
+
+
+        /// <summary>
+        /// Days of week when the voucher is valid
+        /// </summary>
+        /// <value>Days of week when the voucher is valid</value>
+        [DataMember(Name="DaysOfWeek", EmitDefaultValue=false)]
+        public List<DaysOfWeekEnum> DaysOfWeek { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetVoucherValidityPeriodsSimplifiedRequest" /> class.
+        /// </summary>
+        /// <param name="daysOfWeek">Days of week when the voucher is valid.</param>
+        /// <param name="startTime">Start time of the day when the voucher is valid.</param>
+        /// <param name="endTime">End time of the day when the voucher is valid.  If the end time is before the start time, the end time is assumed to be the next day..</param>
+        public SetVoucherValidityPeriodsSimplifiedRequest(List<DaysOfWeekEnum> daysOfWeek = default(List<DaysOfWeekEnum>), string startTime = default(string), string endTime = default(string))
+        {
+            this.DaysOfWeek = daysOfWeek;
+            this.StartTime = startTime;
+            this.EndTime = endTime;
+        }
+        
+
+        /// <summary>
+        /// Start time of the day when the voucher is valid
+        /// </summary>
+        /// <value>Start time of the day when the voucher is valid</value>
+        [DataMember(Name="StartTime", EmitDefaultValue=false)]
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// End time of the day when the voucher is valid.  If the end time is before the start time, the end time is assumed to be the next day.
+        /// </summary>
+        /// <value>End time of the day when the voucher is valid.  If the end time is before the start time, the end time is assumed to be the next day.</value>
+        [DataMember(Name="EndTime", EmitDefaultValue=false)]
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SetVoucherValidityPeriodsSimplifiedRequest {\n");
+            sb.Append("  DaysOfWeek: ").Append(DaysOfWeek).Append("\n");
+            sb.Append("  StartTime: ").Append(StartTime).Append("\n");
+            sb.Append("  EndTime: ").Append(EndTime).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SetVoucherValidityPeriodsSimplifiedRequest);
+        }
+
+        /// <summary>
+        /// Returns true if SetVoucherValidityPeriodsSimplifiedRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SetVoucherValidityPeriodsSimplifiedRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SetVoucherValidityPeriodsSimplifiedRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DaysOfWeek == input.DaysOfWeek ||
+                    this.DaysOfWeek != null &&
+                    this.DaysOfWeek.SequenceEqual(input.DaysOfWeek)
+                ) && 
+                (
+                    this.StartTime == input.StartTime ||
+                    (this.StartTime != null &&
+                    this.StartTime.Equals(input.StartTime))
+                ) && 
+                (
+                    this.EndTime == input.EndTime ||
+                    (this.EndTime != null &&
+                    this.EndTime.Equals(input.EndTime))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DaysOfWeek != null)
+                    hashCode = hashCode * 59 + this.DaysOfWeek.GetHashCode();
+                if (this.StartTime != null)
+                    hashCode = hashCode * 59 + this.StartTime.GetHashCode();
+                if (this.EndTime != null)
+                    hashCode = hashCode * 59 + this.EndTime.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/Setting.cs b/src/Flipdish/Model/Setting.cs
index 8e4688a1..6bf5d03c 100644
--- a/src/Flipdish/Model/Setting.cs
+++ b/src/Flipdish/Model/Setting.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,13 +26,13 @@ namespace Flipdish.Model
     /// Setting
     /// </summary>
     [DataContract]
-    public partial class Setting :  IEquatable<Setting>, IValidatableObject
+    public partial class Setting :  IEquatable<Setting>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Setting" /> class.
         /// </summary>
-        /// <param name="key">Key.</param>
-        /// <param name="value">Value.</param>
+        /// <param name="key">key.</param>
+        /// <param name="value">value.</param>
         public Setting(string key = default(string), string value = default(string))
         {
             this.Key = key;
@@ -42,16 +40,14 @@ public partial class Setting :  IEquatable<Setting>, IValidatableObject
         }
         
         /// <summary>
-        /// Key
+        /// Gets or Sets Key
         /// </summary>
-        /// <value>Key</value>
         [DataMember(Name="Key", EmitDefaultValue=false)]
         public string Key { get; set; }
 
         /// <summary>
-        /// Value
+        /// Gets or Sets Value
         /// </summary>
-        /// <value>Value</value>
         [DataMember(Name="Value", EmitDefaultValue=false)]
         public string Value { get; set; }
 
@@ -127,16 +123,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/SignupStep.cs b/src/Flipdish/Model/SignupStep.cs
index 281a836a..a8f80048 100644
--- a/src/Flipdish/Model/SignupStep.cs
+++ b/src/Flipdish/Model/SignupStep.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// SignupStep
     /// </summary>
     [DataContract]
-    public partial class SignupStep :  IEquatable<SignupStep>, IValidatableObject
+    public partial class SignupStep :  IEquatable<SignupStep>
     {
         /// <summary>
         /// Action needs to take
@@ -54,7 +52,13 @@ public enum ActionEnum
             /// Enum PaymentSubscription for value: PaymentSubscription
             /// </summary>
             [EnumMember(Value = "PaymentSubscription")]
-            PaymentSubscription = 3
+            PaymentSubscription = 3,
+            
+            /// <summary>
+            /// Enum StoreName for value: StoreName
+            /// </summary>
+            [EnumMember(Value = "StoreName")]
+            StoreName = 4
         }
 
         /// <summary>
@@ -171,16 +175,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/SimpleProduct.cs b/src/Flipdish/Model/SimpleProduct.cs
deleted file mode 100644
index 053acd0f..00000000
--- a/src/Flipdish/Model/SimpleProduct.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Simple Product
-    /// </summary>
-    [DataContract]
-    public partial class SimpleProduct : Product,  IEquatable<SimpleProduct>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimpleProduct" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected SimpleProduct() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimpleProduct" /> class.
-        /// </summary>
-        /// <param name="subProducts">Collection of products associated with this product.</param>
-        public SimpleProduct(List<SimpleProductSubProduct> subProducts = default(List<SimpleProductSubProduct>), string productId = default(string), string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), ProductTypeEnum? productType = default(ProductTypeEnum?), string imageFileName = default(string), bool? isArchived = default(bool?), bool? alcohol = default(bool?), string discriminator = "SimpleProduct") : base(productId, sku, name, description, price, productType, imageFileName, isArchived, alcohol, discriminator)
-        {
-            this.subProducts = subProducts;
-        }
-        
-        /// <summary>
-        /// Collection of products associated with this product
-        /// </summary>
-        /// <value>Collection of products associated with this product</value>
-        [DataMember(Name="subProducts", EmitDefaultValue=false)]
-        public List<SimpleProductSubProduct> subProducts { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class SimpleProduct {\n");
-            sb.Append("  ").Append(base.ToString().Replace("\n", "\n  ")).Append("\n");
-            sb.Append("  subProducts: ").Append(subProducts).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public override string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as SimpleProduct);
-        }
-
-        /// <summary>
-        /// Returns true if SimpleProduct instances are equal
-        /// </summary>
-        /// <param name="input">Instance of SimpleProduct to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(SimpleProduct input)
-        {
-            if (input == null)
-                return false;
-
-            return base.Equals(input) && 
-                (
-                    this.subProducts == input.subProducts ||
-                    this.subProducts != null &&
-                    this.subProducts.SequenceEqual(input.subProducts)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = base.GetHashCode();
-                if (this.subProducts != null)
-                    hashCode = hashCode * 59 + this.subProducts.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            foreach(var x in BaseValidate(validationContext)) yield return x;
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/SimpleProductSubProduct.cs b/src/Flipdish/Model/SimpleProductSubProduct.cs
deleted file mode 100644
index 3ae2a616..00000000
--- a/src/Flipdish/Model/SimpleProductSubProduct.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Product associated to a SimpleProduct
-    /// </summary>
-    [DataContract]
-    public partial class SimpleProductSubProduct :  IEquatable<SimpleProductSubProduct>, IValidatableObject
-    {
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ProductTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum SimpleProduct for value: SimpleProduct
-            /// </summary>
-            [EnumMember(Value = "SimpleProduct")]
-            SimpleProduct = 1,
-            
-            /// <summary>
-            /// Enum Modifier for value: Modifier
-            /// </summary>
-            [EnumMember(Value = "Modifier")]
-            Modifier = 2,
-            
-            /// <summary>
-            /// Enum ModifierGroup for value: ModifierGroup
-            /// </summary>
-            [EnumMember(Value = "ModifierGroup")]
-            ModifierGroup = 3
-        }
-
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [DataMember(Name="ProductType", EmitDefaultValue=false)]
-        public ProductTypeEnum ProductType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimpleProductSubProduct" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected SimpleProductSubProduct() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimpleProductSubProduct" /> class.
-        /// </summary>
-        /// <param name="minSelection">Minimum number of items that must be selected.</param>
-        /// <param name="maxSelection">Maximum number of items that can be selected.</param>
-        /// <param name="productId">Identifier of the ProductId to use as SubProduct (required).</param>
-        /// <param name="productType">Type of the SupProduct (required).</param>
-        /// <param name="product">Details of the sub product.</param>
-        public SimpleProductSubProduct(int? minSelection = default(int?), int? maxSelection = default(int?), string productId = default(string), ProductTypeEnum productType = default(ProductTypeEnum), Product product = default(Product))
-        {
-            // to ensure "productId" is required (not null)
-            if (productId == null)
-            {
-                throw new InvalidDataException("productId is a required property for SimpleProductSubProduct and cannot be null");
-            }
-            else
-            {
-                this.ProductId = productId;
-            }
-            // to ensure "productType" is required (not null)
-            if (productType == null)
-            {
-                throw new InvalidDataException("productType is a required property for SimpleProductSubProduct and cannot be null");
-            }
-            else
-            {
-                this.ProductType = productType;
-            }
-            this.MinSelection = minSelection;
-            this.MaxSelection = maxSelection;
-            this.Product = product;
-        }
-        
-        /// <summary>
-        /// Minimum number of items that must be selected
-        /// </summary>
-        /// <value>Minimum number of items that must be selected</value>
-        [DataMember(Name="MinSelection", EmitDefaultValue=false)]
-        public int? MinSelection { get; set; }
-
-        /// <summary>
-        /// Maximum number of items that can be selected
-        /// </summary>
-        /// <value>Maximum number of items that can be selected</value>
-        [DataMember(Name="MaxSelection", EmitDefaultValue=false)]
-        public int? MaxSelection { get; set; }
-
-        /// <summary>
-        /// Identifier of the ProductId to use as SubProduct
-        /// </summary>
-        /// <value>Identifier of the ProductId to use as SubProduct</value>
-        [DataMember(Name="ProductId", EmitDefaultValue=false)]
-        public string ProductId { get; set; }
-
-
-        /// <summary>
-        /// Details of the sub product
-        /// </summary>
-        /// <value>Details of the sub product</value>
-        [DataMember(Name="Product", EmitDefaultValue=false)]
-        public Product Product { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class SimpleProductSubProduct {\n");
-            sb.Append("  MinSelection: ").Append(MinSelection).Append("\n");
-            sb.Append("  MaxSelection: ").Append(MaxSelection).Append("\n");
-            sb.Append("  ProductId: ").Append(ProductId).Append("\n");
-            sb.Append("  ProductType: ").Append(ProductType).Append("\n");
-            sb.Append("  Product: ").Append(Product).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as SimpleProductSubProduct);
-        }
-
-        /// <summary>
-        /// Returns true if SimpleProductSubProduct instances are equal
-        /// </summary>
-        /// <param name="input">Instance of SimpleProductSubProduct to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(SimpleProductSubProduct input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.MinSelection == input.MinSelection ||
-                    (this.MinSelection != null &&
-                    this.MinSelection.Equals(input.MinSelection))
-                ) && 
-                (
-                    this.MaxSelection == input.MaxSelection ||
-                    (this.MaxSelection != null &&
-                    this.MaxSelection.Equals(input.MaxSelection))
-                ) && 
-                (
-                    this.ProductId == input.ProductId ||
-                    (this.ProductId != null &&
-                    this.ProductId.Equals(input.ProductId))
-                ) && 
-                (
-                    this.ProductType == input.ProductType ||
-                    (this.ProductType != null &&
-                    this.ProductType.Equals(input.ProductType))
-                ) && 
-                (
-                    this.Product == input.Product ||
-                    (this.Product != null &&
-                    this.Product.Equals(input.Product))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.MinSelection != null)
-                    hashCode = hashCode * 59 + this.MinSelection.GetHashCode();
-                if (this.MaxSelection != null)
-                    hashCode = hashCode * 59 + this.MaxSelection.GetHashCode();
-                if (this.ProductId != null)
-                    hashCode = hashCode * 59 + this.ProductId.GetHashCode();
-                if (this.ProductType != null)
-                    hashCode = hashCode * 59 + this.ProductType.GetHashCode();
-                if (this.Product != null)
-                    hashCode = hashCode * 59 + this.Product.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // ProductId (string) maxLength
-            if(this.ProductId != null && this.ProductId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ProductId, length must be less than 30.", new [] { "ProductId" });
-            }
-
-            // ProductId (string) minLength
-            if(this.ProductId != null && this.ProductId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ProductId, length must be greater than 0.", new [] { "ProductId" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/SmsInfo.cs b/src/Flipdish/Model/SmsInfo.cs
index d0fefc16..dd79b557 100644
--- a/src/Flipdish/Model/SmsInfo.cs
+++ b/src/Flipdish/Model/SmsInfo.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Sms Info
     /// </summary>
     [DataContract]
-    public partial class SmsInfo :  IEquatable<SmsInfo>, IValidatableObject
+    public partial class SmsInfo :  IEquatable<SmsInfo>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SmsInfo" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/SmsProviderCredential.cs b/src/Flipdish/Model/SmsProviderCredential.cs
new file mode 100644
index 00000000..2c456381
--- /dev/null
+++ b/src/Flipdish/Model/SmsProviderCredential.cs
@@ -0,0 +1,237 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// SmsProviderCredential.
+    /// </summary>
+    [DataContract]
+    public partial class SmsProviderCredential :  IEquatable<SmsProviderCredential>
+    {
+        /// <summary>
+        /// SmsServiceType.
+        /// </summary>
+        /// <value>SmsServiceType.</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum SmsServiceTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Nexmo for value: Nexmo
+            /// </summary>
+            [EnumMember(Value = "Nexmo")]
+            Nexmo = 1,
+            
+            /// <summary>
+            /// Enum Twilio for value: Twilio
+            /// </summary>
+            [EnumMember(Value = "Twilio")]
+            Twilio = 2,
+            
+            /// <summary>
+            /// Enum Default for value: Default
+            /// </summary>
+            [EnumMember(Value = "Default")]
+            Default = 3,
+            
+            /// <summary>
+            /// Enum MessageBird for value: MessageBird
+            /// </summary>
+            [EnumMember(Value = "MessageBird")]
+            MessageBird = 4,
+            
+            /// <summary>
+            /// Enum CommunicationService for value: CommunicationService
+            /// </summary>
+            [EnumMember(Value = "CommunicationService")]
+            CommunicationService = 5
+        }
+
+        /// <summary>
+        /// SmsServiceType.
+        /// </summary>
+        /// <value>SmsServiceType.</value>
+        [DataMember(Name="SmsServiceType", EmitDefaultValue=false)]
+        public SmsServiceTypeEnum? SmsServiceType { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SmsProviderCredential" /> class.
+        /// </summary>
+        /// <param name="orgId">OrgId..</param>
+        /// <param name="brandId">BrandId..</param>
+        /// <param name="smsServiceType">SmsServiceType..</param>
+        /// <param name="senderId">SenderId..</param>
+        /// <param name="username">Username..</param>
+        /// <param name="authToken">AuthToken..</param>
+        public SmsProviderCredential(string orgId = default(string), string brandId = default(string), SmsServiceTypeEnum? smsServiceType = default(SmsServiceTypeEnum?), string senderId = default(string), string username = default(string), string authToken = default(string))
+        {
+            this.OrgId = orgId;
+            this.BrandId = brandId;
+            this.SmsServiceType = smsServiceType;
+            this.SenderId = senderId;
+            this.Username = username;
+            this.AuthToken = authToken;
+        }
+        
+        /// <summary>
+        /// OrgId.
+        /// </summary>
+        /// <value>OrgId.</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// BrandId.
+        /// </summary>
+        /// <value>BrandId.</value>
+        [DataMember(Name="BrandId", EmitDefaultValue=false)]
+        public string BrandId { get; set; }
+
+
+        /// <summary>
+        /// SenderId.
+        /// </summary>
+        /// <value>SenderId.</value>
+        [DataMember(Name="SenderId", EmitDefaultValue=false)]
+        public string SenderId { get; set; }
+
+        /// <summary>
+        /// Username.
+        /// </summary>
+        /// <value>Username.</value>
+        [DataMember(Name="Username", EmitDefaultValue=false)]
+        public string Username { get; set; }
+
+        /// <summary>
+        /// AuthToken.
+        /// </summary>
+        /// <value>AuthToken.</value>
+        [DataMember(Name="AuthToken", EmitDefaultValue=false)]
+        public string AuthToken { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SmsProviderCredential {\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  BrandId: ").Append(BrandId).Append("\n");
+            sb.Append("  SmsServiceType: ").Append(SmsServiceType).Append("\n");
+            sb.Append("  SenderId: ").Append(SenderId).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  AuthToken: ").Append(AuthToken).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SmsProviderCredential);
+        }
+
+        /// <summary>
+        /// Returns true if SmsProviderCredential instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SmsProviderCredential to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SmsProviderCredential input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.BrandId == input.BrandId ||
+                    (this.BrandId != null &&
+                    this.BrandId.Equals(input.BrandId))
+                ) && 
+                (
+                    this.SmsServiceType == input.SmsServiceType ||
+                    (this.SmsServiceType != null &&
+                    this.SmsServiceType.Equals(input.SmsServiceType))
+                ) && 
+                (
+                    this.SenderId == input.SenderId ||
+                    (this.SenderId != null &&
+                    this.SenderId.Equals(input.SenderId))
+                ) && 
+                (
+                    this.Username == input.Username ||
+                    (this.Username != null &&
+                    this.Username.Equals(input.Username))
+                ) && 
+                (
+                    this.AuthToken == input.AuthToken ||
+                    (this.AuthToken != null &&
+                    this.AuthToken.Equals(input.AuthToken))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.BrandId != null)
+                    hashCode = hashCode * 59 + this.BrandId.GetHashCode();
+                if (this.SmsServiceType != null)
+                    hashCode = hashCode * 59 + this.SmsServiceType.GetHashCode();
+                if (this.SenderId != null)
+                    hashCode = hashCode * 59 + this.SenderId.GetHashCode();
+                if (this.Username != null)
+                    hashCode = hashCode * 59 + this.Username.GetHashCode();
+                if (this.AuthToken != null)
+                    hashCode = hashCode * 59 + this.AuthToken.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SmsProviderCredentialUpdateRequest.cs b/src/Flipdish/Model/SmsProviderCredentialUpdateRequest.cs
new file mode 100644
index 00000000..8d589c0c
--- /dev/null
+++ b/src/Flipdish/Model/SmsProviderCredentialUpdateRequest.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// SmsProviderCredentialUpdateRequest.
+    /// </summary>
+    [DataContract]
+    public partial class SmsProviderCredentialUpdateRequest :  IEquatable<SmsProviderCredentialUpdateRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SmsProviderCredentialUpdateRequest" /> class.
+        /// </summary>
+        /// <param name="senderId">SenderId..</param>
+        /// <param name="username">Username..</param>
+        /// <param name="authToken">AuthToken..</param>
+        public SmsProviderCredentialUpdateRequest(string senderId = default(string), string username = default(string), string authToken = default(string))
+        {
+            this.SenderId = senderId;
+            this.Username = username;
+            this.AuthToken = authToken;
+        }
+        
+        /// <summary>
+        /// SenderId.
+        /// </summary>
+        /// <value>SenderId.</value>
+        [DataMember(Name="SenderId", EmitDefaultValue=false)]
+        public string SenderId { get; set; }
+
+        /// <summary>
+        /// Username.
+        /// </summary>
+        /// <value>Username.</value>
+        [DataMember(Name="Username", EmitDefaultValue=false)]
+        public string Username { get; set; }
+
+        /// <summary>
+        /// AuthToken.
+        /// </summary>
+        /// <value>AuthToken.</value>
+        [DataMember(Name="AuthToken", EmitDefaultValue=false)]
+        public string AuthToken { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SmsProviderCredentialUpdateRequest {\n");
+            sb.Append("  SenderId: ").Append(SenderId).Append("\n");
+            sb.Append("  Username: ").Append(Username).Append("\n");
+            sb.Append("  AuthToken: ").Append(AuthToken).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SmsProviderCredentialUpdateRequest);
+        }
+
+        /// <summary>
+        /// Returns true if SmsProviderCredentialUpdateRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SmsProviderCredentialUpdateRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SmsProviderCredentialUpdateRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.SenderId == input.SenderId ||
+                    (this.SenderId != null &&
+                    this.SenderId.Equals(input.SenderId))
+                ) && 
+                (
+                    this.Username == input.Username ||
+                    (this.Username != null &&
+                    this.Username.Equals(input.Username))
+                ) && 
+                (
+                    this.AuthToken == input.AuthToken ||
+                    (this.AuthToken != null &&
+                    this.AuthToken.Equals(input.AuthToken))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.SenderId != null)
+                    hashCode = hashCode * 59 + this.SenderId.GetHashCode();
+                if (this.Username != null)
+                    hashCode = hashCode * 59 + this.Username.GetHashCode();
+                if (this.AuthToken != null)
+                    hashCode = hashCode * 59 + this.AuthToken.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SmsReceivedEvent.cs b/src/Flipdish/Model/SmsReceivedEvent.cs
index 2ff6cc4e..9a9a4a6c 100644
--- a/src/Flipdish/Model/SmsReceivedEvent.cs
+++ b/src/Flipdish/Model/SmsReceivedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Sms received event
     /// </summary>
     [DataContract]
-    public partial class SmsReceivedEvent :  IEquatable<SmsReceivedEvent>, IValidatableObject
+    public partial class SmsReceivedEvent :  IEquatable<SmsReceivedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SmsReceivedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class SmsReceivedEvent :  IEquatable<SmsReceivedEvent>, IValidata
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public SmsReceivedEvent(string eventName = default(string), string description = default(string), SmsInfo smsInfo = default(SmsInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public SmsReceivedEvent(string eventName = default(string), string description = default(string), SmsInfo smsInfo = default(SmsInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class SmsReceivedEvent :  IEquatable<SmsReceivedEvent>, IValidata
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class SmsReceivedEvent :  IEquatable<SmsReceivedEvent>, IValidata
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class SmsReceivedEvent :  IEquatable<SmsReceivedEvent>, IValidata
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(SmsReceivedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StatisticsCurrencyDataPoint.cs b/src/Flipdish/Model/StatisticsCurrencyDataPoint.cs
index 6240dc38..fafac7ae 100644
--- a/src/Flipdish/Model/StatisticsCurrencyDataPoint.cs
+++ b/src/Flipdish/Model/StatisticsCurrencyDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// A single currency data point, with no date
     /// </summary>
     [DataContract]
-    public partial class StatisticsCurrencyDataPoint :  IEquatable<StatisticsCurrencyDataPoint>, IValidatableObject
+    public partial class StatisticsCurrencyDataPoint :  IEquatable<StatisticsCurrencyDataPoint>
     {
         /// <summary>
         /// Currency
@@ -848,16 +846,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Store.cs b/src/Flipdish/Model/Store.cs
index 6a611f28..21116460 100644
--- a/src/Flipdish/Model/Store.cs
+++ b/src/Flipdish/Model/Store.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store
     /// </summary>
     [DataContract]
-    public partial class Store :  IEquatable<Store>, IValidatableObject
+    public partial class Store :  IEquatable<Store>
     {
         /// <summary>
         /// Printout layout
@@ -763,6 +761,78 @@ public enum CurrencyEnum
         [DataMember(Name="Currency", EmitDefaultValue=false)]
         public CurrencyEnum? Currency { get; set; }
         /// <summary>
+        /// Defines SalesChannelTypes
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum SalesChannelTypesEnum
+        {
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 1,
+            
+            /// <summary>
+            /// Enum App for value: App
+            /// </summary>
+            [EnumMember(Value = "App")]
+            App = 2,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 3,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 4,
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 5,
+            
+            /// <summary>
+            /// Enum PhoneAgent for value: PhoneAgent
+            /// </summary>
+            [EnumMember(Value = "PhoneAgent")]
+            PhoneAgent = 6
+        }
+
+
+        /// <summary>
+        /// Sales Channel Types
+        /// </summary>
+        /// <value>Sales Channel Types</value>
+        [DataMember(Name="SalesChannelTypes", EmitDefaultValue=false)]
+        public List<SalesChannelTypesEnum> SalesChannelTypes { get; set; }
+        /// <summary>
+        /// Defines InheritanceConfigTypes
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum InheritanceConfigTypesEnum
+        {
+            
+            /// <summary>
+            /// Enum CollectionSettings for value: CollectionSettings
+            /// </summary>
+            [EnumMember(Value = "CollectionSettings")]
+            CollectionSettings = 1
+        }
+
+
+        /// <summary>
+        /// Inheritance Config Types
+        /// </summary>
+        /// <value>Inheritance Config Types</value>
+        [DataMember(Name="InheritanceConfigTypes", EmitDefaultValue=false)]
+        public List<InheritanceConfigTypesEnum> InheritanceConfigTypes { get; set; }
+        /// <summary>
         /// Initializes a new instance of the <see cref="Store" /> class.
         /// </summary>
         /// <param name="storeId">Store identifier.</param>
@@ -784,6 +854,8 @@ public enum CurrencyEnum
         /// <param name="preOrderPickupEnabled">Is PerOrder Enabled for Pickup.</param>
         /// <param name="logoUrl">Url for logo image.</param>
         /// <param name="fraudPreventionStrategy">Fraud Prevention Strategy.</param>
+        /// <param name="appIds">Store&#39;s app ids.</param>
+        /// <param name="propertyId">Property Id.</param>
         /// <param name="phoneNumber">Phone number.</param>
         /// <param name="alwaysAppearOpen">True if the store always appears open.</param>
         /// <param name="preOrderEnabled">True if the store accepts pre-orders.</param>
@@ -813,7 +885,9 @@ public enum CurrencyEnum
         /// <param name="name">Name.</param>
         /// <param name="emailAddress">Email address (visible to customers).</param>
         /// <param name="staffLanguage">Staff Language (used for communication with the staff)  Emails, Printouts etc.</param>
-        public Store(int? storeId = default(int?), int? storeGroupId = default(int?), StoreAddress address = default(StoreAddress), List<DeliveryZone> deliveryZones = default(List<DeliveryZone>), string apmPhoneNumber = default(string), List<BusinessHoursPeriod> pickupHours = default(List<BusinessHoursPeriod>), List<BusinessHoursPeriod> deliveryHours = default(List<BusinessHoursPeriod>), int? menuId = default(int?), string orderConfirmationMessageOverrideDelivery = default(string), string orderConfirmationMessageOverridePickup = default(string), PrintoutLayoutTypeEnum? printoutLayoutType = default(PrintoutLayoutTypeEnum?), List<StoreNote> storeNotes = default(List<StoreNote>), string microsoftTimeZone = default(string), string ianaTimeZone = default(string), CurrencyEnum? currency = default(CurrencyEnum?), bool? preOrderDeliveryEnabled = default(bool?), bool? preOrderPickupEnabled = default(bool?), string logoUrl = default(string), string fraudPreventionStrategy = default(string), string phoneNumber = default(string), bool? alwaysAppearOpen = default(bool?), bool? preOrderEnabled = default(bool?), bool? takeOutEnabled = default(bool?), bool? tableServiceEnabled = default(bool?), bool? dineInEnabled = default(bool?), bool? allowPreOrdersAndTableService = default(bool?), bool? pickupEnabled = default(bool?), bool? deliveryEnabled = default(bool?), bool? cardOrderDeliveryEnabled = default(bool?), bool? cashOrdersDeliveryEnabled = default(bool?), bool? cardOrdersPickupEnabled = default(bool?), bool? cashOrdersPickupEnabled = default(bool?), bool? tipsEnabled = default(bool?), bool? automaticallyAcceptOrders = default(bool?), bool? openForDelivery = default(bool?), bool? openForPickup = default(bool?), double? minimumPickupOrderAmount = default(double?), bool? requireCustomerNameForPickup = default(bool?), bool? gdprCustomerPhoneNumbers = default(bool?), bool? requireCustomerNameForDelivery = default(bool?), bool? allowChefNotes = default(bool?), bool? etaInPickupConfirmationSmsEnabled = default(bool?), bool? etaInDeliveryConfirmationSmsEnabled = default(bool?), bool? isArchived = default(bool?), bool? isPublished = default(bool?), string name = default(string), string emailAddress = default(string), string staffLanguage = default(string))
+        /// <param name="salesChannelTypes">Sales Channel Types.</param>
+        /// <param name="inheritanceConfigTypes">Inheritance Config Types.</param>
+        public Store(int? storeId = default(int?), int? storeGroupId = default(int?), StoreAddress address = default(StoreAddress), List<DeliveryZone> deliveryZones = default(List<DeliveryZone>), string apmPhoneNumber = default(string), List<BusinessHoursPeriod> pickupHours = default(List<BusinessHoursPeriod>), List<BusinessHoursPeriod> deliveryHours = default(List<BusinessHoursPeriod>), int? menuId = default(int?), string orderConfirmationMessageOverrideDelivery = default(string), string orderConfirmationMessageOverridePickup = default(string), PrintoutLayoutTypeEnum? printoutLayoutType = default(PrintoutLayoutTypeEnum?), List<StoreNote> storeNotes = default(List<StoreNote>), string microsoftTimeZone = default(string), string ianaTimeZone = default(string), CurrencyEnum? currency = default(CurrencyEnum?), bool? preOrderDeliveryEnabled = default(bool?), bool? preOrderPickupEnabled = default(bool?), string logoUrl = default(string), string fraudPreventionStrategy = default(string), List<string> appIds = default(List<string>), string propertyId = default(string), string phoneNumber = default(string), bool? alwaysAppearOpen = default(bool?), bool? preOrderEnabled = default(bool?), bool? takeOutEnabled = default(bool?), bool? tableServiceEnabled = default(bool?), bool? dineInEnabled = default(bool?), bool? allowPreOrdersAndTableService = default(bool?), bool? pickupEnabled = default(bool?), bool? deliveryEnabled = default(bool?), bool? cardOrderDeliveryEnabled = default(bool?), bool? cashOrdersDeliveryEnabled = default(bool?), bool? cardOrdersPickupEnabled = default(bool?), bool? cashOrdersPickupEnabled = default(bool?), bool? tipsEnabled = default(bool?), bool? automaticallyAcceptOrders = default(bool?), bool? openForDelivery = default(bool?), bool? openForPickup = default(bool?), double? minimumPickupOrderAmount = default(double?), bool? requireCustomerNameForPickup = default(bool?), bool? gdprCustomerPhoneNumbers = default(bool?), bool? requireCustomerNameForDelivery = default(bool?), bool? allowChefNotes = default(bool?), bool? etaInPickupConfirmationSmsEnabled = default(bool?), bool? etaInDeliveryConfirmationSmsEnabled = default(bool?), bool? isArchived = default(bool?), bool? isPublished = default(bool?), string name = default(string), string emailAddress = default(string), string staffLanguage = default(string), List<SalesChannelTypesEnum> salesChannelTypes = default(List<SalesChannelTypesEnum>), List<InheritanceConfigTypesEnum> inheritanceConfigTypes = default(List<InheritanceConfigTypesEnum>))
         {
             this.StoreId = storeId;
             this.StoreGroupId = storeGroupId;
@@ -834,6 +908,8 @@ public enum CurrencyEnum
             this.PreOrderPickupEnabled = preOrderPickupEnabled;
             this.LogoUrl = logoUrl;
             this.FraudPreventionStrategy = fraudPreventionStrategy;
+            this.AppIds = appIds;
+            this.PropertyId = propertyId;
             this.PhoneNumber = phoneNumber;
             this.AlwaysAppearOpen = alwaysAppearOpen;
             this.PreOrderEnabled = preOrderEnabled;
@@ -863,6 +939,8 @@ public enum CurrencyEnum
             this.Name = name;
             this.EmailAddress = emailAddress;
             this.StaffLanguage = staffLanguage;
+            this.SalesChannelTypes = salesChannelTypes;
+            this.InheritanceConfigTypes = inheritanceConfigTypes;
         }
         
         /// <summary>
@@ -986,6 +1064,20 @@ public enum CurrencyEnum
         [DataMember(Name="FraudPreventionStrategy", EmitDefaultValue=false)]
         public string FraudPreventionStrategy { get; set; }
 
+        /// <summary>
+        /// Store&#39;s app ids
+        /// </summary>
+        /// <value>Store&#39;s app ids</value>
+        [DataMember(Name="AppIds", EmitDefaultValue=false)]
+        public List<string> AppIds { get; set; }
+
+        /// <summary>
+        /// Property Id
+        /// </summary>
+        /// <value>Property Id</value>
+        [DataMember(Name="PropertyId", EmitDefaultValue=false)]
+        public string PropertyId { get; set; }
+
         /// <summary>
         /// Phone number
         /// </summary>
@@ -1189,6 +1281,8 @@ public enum CurrencyEnum
         [DataMember(Name="StaffLanguage", EmitDefaultValue=false)]
         public string StaffLanguage { get; set; }
 
+
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -1216,6 +1310,8 @@ public override string ToString()
             sb.Append("  PreOrderPickupEnabled: ").Append(PreOrderPickupEnabled).Append("\n");
             sb.Append("  LogoUrl: ").Append(LogoUrl).Append("\n");
             sb.Append("  FraudPreventionStrategy: ").Append(FraudPreventionStrategy).Append("\n");
+            sb.Append("  AppIds: ").Append(AppIds).Append("\n");
+            sb.Append("  PropertyId: ").Append(PropertyId).Append("\n");
             sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
             sb.Append("  AlwaysAppearOpen: ").Append(AlwaysAppearOpen).Append("\n");
             sb.Append("  PreOrderEnabled: ").Append(PreOrderEnabled).Append("\n");
@@ -1245,6 +1341,8 @@ public override string ToString()
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  EmailAddress: ").Append(EmailAddress).Append("\n");
             sb.Append("  StaffLanguage: ").Append(StaffLanguage).Append("\n");
+            sb.Append("  SalesChannelTypes: ").Append(SalesChannelTypes).Append("\n");
+            sb.Append("  InheritanceConfigTypes: ").Append(InheritanceConfigTypes).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -1374,6 +1472,16 @@ public bool Equals(Store input)
                     (this.FraudPreventionStrategy != null &&
                     this.FraudPreventionStrategy.Equals(input.FraudPreventionStrategy))
                 ) && 
+                (
+                    this.AppIds == input.AppIds ||
+                    this.AppIds != null &&
+                    this.AppIds.SequenceEqual(input.AppIds)
+                ) && 
+                (
+                    this.PropertyId == input.PropertyId ||
+                    (this.PropertyId != null &&
+                    this.PropertyId.Equals(input.PropertyId))
+                ) && 
                 (
                     this.PhoneNumber == input.PhoneNumber ||
                     (this.PhoneNumber != null &&
@@ -1518,6 +1626,16 @@ public bool Equals(Store input)
                     this.StaffLanguage == input.StaffLanguage ||
                     (this.StaffLanguage != null &&
                     this.StaffLanguage.Equals(input.StaffLanguage))
+                ) && 
+                (
+                    this.SalesChannelTypes == input.SalesChannelTypes ||
+                    this.SalesChannelTypes != null &&
+                    this.SalesChannelTypes.SequenceEqual(input.SalesChannelTypes)
+                ) && 
+                (
+                    this.InheritanceConfigTypes == input.InheritanceConfigTypes ||
+                    this.InheritanceConfigTypes != null &&
+                    this.InheritanceConfigTypes.SequenceEqual(input.InheritanceConfigTypes)
                 );
         }
 
@@ -1568,6 +1686,10 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.LogoUrl.GetHashCode();
                 if (this.FraudPreventionStrategy != null)
                     hashCode = hashCode * 59 + this.FraudPreventionStrategy.GetHashCode();
+                if (this.AppIds != null)
+                    hashCode = hashCode * 59 + this.AppIds.GetHashCode();
+                if (this.PropertyId != null)
+                    hashCode = hashCode * 59 + this.PropertyId.GetHashCode();
                 if (this.PhoneNumber != null)
                     hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
                 if (this.AlwaysAppearOpen != null)
@@ -1626,31 +1748,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.EmailAddress.GetHashCode();
                 if (this.StaffLanguage != null)
                     hashCode = hashCode * 59 + this.StaffLanguage.GetHashCode();
+                if (this.SalesChannelTypes != null)
+                    hashCode = hashCode * 59 + this.SalesChannelTypes.GetHashCode();
+                if (this.InheritanceConfigTypes != null)
+                    hashCode = hashCode * 59 + this.InheritanceConfigTypes.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // EmailAddress (string) maxLength
-            if(this.EmailAddress != null && this.EmailAddress.Length > 100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EmailAddress, length must be less than 100.", new [] { "EmailAddress" });
-            }
-
-            // EmailAddress (string) minLength
-            if(this.EmailAddress != null && this.EmailAddress.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EmailAddress, length must be greater than 0.", new [] { "EmailAddress" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreAddress.cs b/src/Flipdish/Model/StoreAddress.cs
index b7fc779e..3ea6e662 100644
--- a/src/Flipdish/Model/StoreAddress.cs
+++ b/src/Flipdish/Model/StoreAddress.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store address
     /// </summary>
     [DataContract]
-    public partial class StoreAddress :  IEquatable<StoreAddress>, IValidatableObject
+    public partial class StoreAddress :  IEquatable<StoreAddress>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreAddress" /> class.
@@ -263,28 +261,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CountryCode (string) maxLength
-            if(this.CountryCode != null && this.CountryCode.Length > 2)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CountryCode, length must be less than 2.", new [] { "CountryCode" });
-            }
-
-            // CountryCode (string) minLength
-            if(this.CountryCode != null && this.CountryCode.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CountryCode, length must be greater than 0.", new [] { "CountryCode" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreAddressBase.cs b/src/Flipdish/Model/StoreAddressBase.cs
index 3bbaf288..24e8bc92 100644
--- a/src/Flipdish/Model/StoreAddressBase.cs
+++ b/src/Flipdish/Model/StoreAddressBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store address base
     /// </summary>
     [DataContract]
-    public partial class StoreAddressBase :  IEquatable<StoreAddressBase>, IValidatableObject
+    public partial class StoreAddressBase :  IEquatable<StoreAddressBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreAddressBase" /> class.
@@ -229,28 +227,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CountryCode (string) maxLength
-            if(this.CountryCode != null && this.CountryCode.Length > 2)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CountryCode, length must be less than 2.", new [] { "CountryCode" });
-            }
-
-            // CountryCode (string) minLength
-            if(this.CountryCode != null && this.CountryCode.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CountryCode, length must be greater than 0.", new [] { "CountryCode" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreAddressForm.cs b/src/Flipdish/Model/StoreAddressForm.cs
index 3d19447f..88c21660 100644
--- a/src/Flipdish/Model/StoreAddressForm.cs
+++ b/src/Flipdish/Model/StoreAddressForm.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Address form payload.
     /// </summary>
     [DataContract]
-    public partial class StoreAddressForm :  IEquatable<StoreAddressForm>, IValidatableObject
+    public partial class StoreAddressForm :  IEquatable<StoreAddressForm>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreAddressForm" /> class.
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreAddressUpdatedEvent.cs b/src/Flipdish/Model/StoreAddressUpdatedEvent.cs
index 545baf81..aacddc35 100644
--- a/src/Flipdish/Model/StoreAddressUpdatedEvent.cs
+++ b/src/Flipdish/Model/StoreAddressUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,13 @@ namespace Flipdish.Model
     /// Store Address Updated Event
     /// </summary>
     [DataContract]
-    public partial class StoreAddressUpdatedEvent :  IEquatable<StoreAddressUpdatedEvent>, IValidatableObject
+    public partial class StoreAddressUpdatedEvent :  IEquatable<StoreAddressUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreAddressUpdatedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="storeId">Store Id.</param>
         /// <param name="storeGroupId">Store group Id.</param>
         /// <param name="user">User which updated this store address.</param>
@@ -44,9 +43,12 @@ public partial class StoreAddressUpdatedEvent :  IEquatable<StoreAddressUpdatedE
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreAddressUpdatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreAddress storeAddress = default(StoreAddress), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreAddressUpdatedEvent(string eventName = default(string), string orgId = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreAddress storeAddress = default(StoreAddress), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.StoreId = storeId;
             this.StoreGroupId = storeGroupId;
             this.User = user;
@@ -57,6 +59,8 @@ public partial class StoreAddressUpdatedEvent :  IEquatable<StoreAddressUpdatedE
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -66,6 +70,13 @@ public partial class StoreAddressUpdatedEvent :  IEquatable<StoreAddressUpdatedE
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Store Id
         /// </summary>
@@ -136,6 +147,20 @@ public partial class StoreAddressUpdatedEvent :  IEquatable<StoreAddressUpdatedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -145,6 +170,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class StoreAddressUpdatedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
             sb.Append("  StoreGroupId: ").Append(StoreGroupId).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
@@ -155,6 +181,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,6 +222,11 @@ public bool Equals(StoreAddressUpdatedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.StoreId == input.StoreId ||
                     (this.StoreId != null &&
@@ -243,6 +276,16 @@ public bool Equals(StoreAddressUpdatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -257,6 +300,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.StoreId != null)
                     hashCode = hashCode * 59 + this.StoreId.GetHashCode();
                 if (this.StoreGroupId != null)
@@ -277,19 +322,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreArchivedEvent.cs b/src/Flipdish/Model/StoreArchivedEvent.cs
index 07768cd1..3962f3ac 100644
--- a/src/Flipdish/Model/StoreArchivedEvent.cs
+++ b/src/Flipdish/Model/StoreArchivedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Archived Event
     /// </summary>
     [DataContract]
-    public partial class StoreArchivedEvent :  IEquatable<StoreArchivedEvent>, IValidatableObject
+    public partial class StoreArchivedEvent :  IEquatable<StoreArchivedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreArchivedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreArchivedEvent :  IEquatable<StoreArchivedEvent>, IVali
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreArchivedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreArchivedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StoreArchivedEvent :  IEquatable<StoreArchivedEvent>, IVali
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -127,6 +131,13 @@ public partial class StoreArchivedEvent :  IEquatable<StoreArchivedEvent>, IVali
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -134,6 +145,20 @@ public partial class StoreArchivedEvent :  IEquatable<StoreArchivedEvent>, IVali
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -152,7 +177,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -237,10 +265,25 @@ public bool Equals(StoreArchivedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -273,21 +316,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreBase.cs b/src/Flipdish/Model/StoreBase.cs
index ee29ef6d..b88923dd 100644
--- a/src/Flipdish/Model/StoreBase.cs
+++ b/src/Flipdish/Model/StoreBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,8 +26,80 @@ namespace Flipdish.Model
     /// Store Base
     /// </summary>
     [DataContract]
-    public partial class StoreBase :  IEquatable<StoreBase>, IValidatableObject
+    public partial class StoreBase :  IEquatable<StoreBase>
     {
+        /// <summary>
+        /// Defines SalesChannelTypes
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum SalesChannelTypesEnum
+        {
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 1,
+            
+            /// <summary>
+            /// Enum App for value: App
+            /// </summary>
+            [EnumMember(Value = "App")]
+            App = 2,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 3,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 4,
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 5,
+            
+            /// <summary>
+            /// Enum PhoneAgent for value: PhoneAgent
+            /// </summary>
+            [EnumMember(Value = "PhoneAgent")]
+            PhoneAgent = 6
+        }
+
+
+        /// <summary>
+        /// Sales Channel Types
+        /// </summary>
+        /// <value>Sales Channel Types</value>
+        [DataMember(Name="SalesChannelTypes", EmitDefaultValue=false)]
+        public List<SalesChannelTypesEnum> SalesChannelTypes { get; set; }
+        /// <summary>
+        /// Defines InheritanceConfigTypes
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum InheritanceConfigTypesEnum
+        {
+            
+            /// <summary>
+            /// Enum CollectionSettings for value: CollectionSettings
+            /// </summary>
+            [EnumMember(Value = "CollectionSettings")]
+            CollectionSettings = 1
+        }
+
+
+        /// <summary>
+        /// Inheritance Config Types
+        /// </summary>
+        /// <value>Inheritance Config Types</value>
+        [DataMember(Name="InheritanceConfigTypes", EmitDefaultValue=false)]
+        public List<InheritanceConfigTypesEnum> InheritanceConfigTypes { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreBase" /> class.
         /// </summary>
@@ -62,7 +132,9 @@ public partial class StoreBase :  IEquatable<StoreBase>, IValidatableObject
         /// <param name="name">Name.</param>
         /// <param name="emailAddress">Email address (visible to customers).</param>
         /// <param name="staffLanguage">Staff Language (used for communication with the staff)  Emails, Printouts etc.</param>
-        public StoreBase(string phoneNumber = default(string), bool? alwaysAppearOpen = default(bool?), bool? preOrderEnabled = default(bool?), bool? takeOutEnabled = default(bool?), bool? tableServiceEnabled = default(bool?), bool? dineInEnabled = default(bool?), bool? allowPreOrdersAndTableService = default(bool?), bool? pickupEnabled = default(bool?), bool? deliveryEnabled = default(bool?), bool? cardOrderDeliveryEnabled = default(bool?), bool? cashOrdersDeliveryEnabled = default(bool?), bool? cardOrdersPickupEnabled = default(bool?), bool? cashOrdersPickupEnabled = default(bool?), bool? tipsEnabled = default(bool?), bool? automaticallyAcceptOrders = default(bool?), bool? openForDelivery = default(bool?), bool? openForPickup = default(bool?), double? minimumPickupOrderAmount = default(double?), bool? requireCustomerNameForPickup = default(bool?), bool? gdprCustomerPhoneNumbers = default(bool?), bool? requireCustomerNameForDelivery = default(bool?), bool? allowChefNotes = default(bool?), bool? etaInPickupConfirmationSmsEnabled = default(bool?), bool? etaInDeliveryConfirmationSmsEnabled = default(bool?), bool? isArchived = default(bool?), bool? isPublished = default(bool?), string name = default(string), string emailAddress = default(string), string staffLanguage = default(string))
+        /// <param name="salesChannelTypes">Sales Channel Types.</param>
+        /// <param name="inheritanceConfigTypes">Inheritance Config Types.</param>
+        public StoreBase(string phoneNumber = default(string), bool? alwaysAppearOpen = default(bool?), bool? preOrderEnabled = default(bool?), bool? takeOutEnabled = default(bool?), bool? tableServiceEnabled = default(bool?), bool? dineInEnabled = default(bool?), bool? allowPreOrdersAndTableService = default(bool?), bool? pickupEnabled = default(bool?), bool? deliveryEnabled = default(bool?), bool? cardOrderDeliveryEnabled = default(bool?), bool? cashOrdersDeliveryEnabled = default(bool?), bool? cardOrdersPickupEnabled = default(bool?), bool? cashOrdersPickupEnabled = default(bool?), bool? tipsEnabled = default(bool?), bool? automaticallyAcceptOrders = default(bool?), bool? openForDelivery = default(bool?), bool? openForPickup = default(bool?), double? minimumPickupOrderAmount = default(double?), bool? requireCustomerNameForPickup = default(bool?), bool? gdprCustomerPhoneNumbers = default(bool?), bool? requireCustomerNameForDelivery = default(bool?), bool? allowChefNotes = default(bool?), bool? etaInPickupConfirmationSmsEnabled = default(bool?), bool? etaInDeliveryConfirmationSmsEnabled = default(bool?), bool? isArchived = default(bool?), bool? isPublished = default(bool?), string name = default(string), string emailAddress = default(string), string staffLanguage = default(string), List<SalesChannelTypesEnum> salesChannelTypes = default(List<SalesChannelTypesEnum>), List<InheritanceConfigTypesEnum> inheritanceConfigTypes = default(List<InheritanceConfigTypesEnum>))
         {
             this.PhoneNumber = phoneNumber;
             this.AlwaysAppearOpen = alwaysAppearOpen;
@@ -93,6 +165,8 @@ public partial class StoreBase :  IEquatable<StoreBase>, IValidatableObject
             this.Name = name;
             this.EmailAddress = emailAddress;
             this.StaffLanguage = staffLanguage;
+            this.SalesChannelTypes = salesChannelTypes;
+            this.InheritanceConfigTypes = inheritanceConfigTypes;
         }
         
         /// <summary>
@@ -298,6 +372,8 @@ public partial class StoreBase :  IEquatable<StoreBase>, IValidatableObject
         [DataMember(Name="StaffLanguage", EmitDefaultValue=false)]
         public string StaffLanguage { get; set; }
 
+
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -335,6 +411,8 @@ public override string ToString()
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  EmailAddress: ").Append(EmailAddress).Append("\n");
             sb.Append("  StaffLanguage: ").Append(StaffLanguage).Append("\n");
+            sb.Append("  SalesChannelTypes: ").Append(SalesChannelTypes).Append("\n");
+            sb.Append("  InheritanceConfigTypes: ").Append(InheritanceConfigTypes).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -513,6 +591,16 @@ public bool Equals(StoreBase input)
                     this.StaffLanguage == input.StaffLanguage ||
                     (this.StaffLanguage != null &&
                     this.StaffLanguage.Equals(input.StaffLanguage))
+                ) && 
+                (
+                    this.SalesChannelTypes == input.SalesChannelTypes ||
+                    this.SalesChannelTypes != null &&
+                    this.SalesChannelTypes.SequenceEqual(input.SalesChannelTypes)
+                ) && 
+                (
+                    this.InheritanceConfigTypes == input.InheritanceConfigTypes ||
+                    this.InheritanceConfigTypes != null &&
+                    this.InheritanceConfigTypes.SequenceEqual(input.InheritanceConfigTypes)
                 );
         }
 
@@ -583,31 +671,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.EmailAddress.GetHashCode();
                 if (this.StaffLanguage != null)
                     hashCode = hashCode * 59 + this.StaffLanguage.GetHashCode();
+                if (this.SalesChannelTypes != null)
+                    hashCode = hashCode * 59 + this.SalesChannelTypes.GetHashCode();
+                if (this.InheritanceConfigTypes != null)
+                    hashCode = hashCode * 59 + this.InheritanceConfigTypes.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // EmailAddress (string) maxLength
-            if(this.EmailAddress != null && this.EmailAddress.Length > 100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EmailAddress, length must be less than 100.", new [] { "EmailAddress" });
-            }
-
-            // EmailAddress (string) minLength
-            if(this.EmailAddress != null && this.EmailAddress.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EmailAddress, length must be greater than 0.", new [] { "EmailAddress" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreBusinessHoursOverrideCreatedEvent.cs b/src/Flipdish/Model/StoreBusinessHoursOverrideCreatedEvent.cs
index fa56caef..7a70634d 100644
--- a/src/Flipdish/Model/StoreBusinessHoursOverrideCreatedEvent.cs
+++ b/src/Flipdish/Model/StoreBusinessHoursOverrideCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Business Hours Override Created
     /// </summary>
     [DataContract]
-    public partial class StoreBusinessHoursOverrideCreatedEvent :  IEquatable<StoreBusinessHoursOverrideCreatedEvent>, IValidatableObject
+    public partial class StoreBusinessHoursOverrideCreatedEvent :  IEquatable<StoreBusinessHoursOverrideCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreBusinessHoursOverrideCreatedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class StoreBusinessHoursOverrideCreatedEvent :  IEquatable<StoreB
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreBusinessHoursOverrideCreatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), BusinessHoursOverride businessHoursOverride = default(BusinessHoursOverride), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreBusinessHoursOverrideCreatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), BusinessHoursOverride businessHoursOverride = default(BusinessHoursOverride), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -56,7 +57,10 @@ public partial class StoreBusinessHoursOverrideCreatedEvent :  IEquatable<StoreB
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class StoreBusinessHoursOverrideCreatedEvent :  IEquatable<StoreB
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class StoreBusinessHoursOverrideCreatedEvent :  IEquatable<StoreB
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(StoreBusinessHoursOverrideCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreBusinessHoursOverrideDeletedEvent.cs b/src/Flipdish/Model/StoreBusinessHoursOverrideDeletedEvent.cs
index 2295a740..cc4fd572 100644
--- a/src/Flipdish/Model/StoreBusinessHoursOverrideDeletedEvent.cs
+++ b/src/Flipdish/Model/StoreBusinessHoursOverrideDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Business Hours Override Deleted
     /// </summary>
     [DataContract]
-    public partial class StoreBusinessHoursOverrideDeletedEvent :  IEquatable<StoreBusinessHoursOverrideDeletedEvent>, IValidatableObject
+    public partial class StoreBusinessHoursOverrideDeletedEvent :  IEquatable<StoreBusinessHoursOverrideDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreBusinessHoursOverrideDeletedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class StoreBusinessHoursOverrideDeletedEvent :  IEquatable<StoreB
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreBusinessHoursOverrideDeletedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), BusinessHoursOverride businessHoursOverride = default(BusinessHoursOverride), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreBusinessHoursOverrideDeletedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), BusinessHoursOverride businessHoursOverride = default(BusinessHoursOverride), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -56,7 +57,10 @@ public partial class StoreBusinessHoursOverrideDeletedEvent :  IEquatable<StoreB
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class StoreBusinessHoursOverrideDeletedEvent :  IEquatable<StoreB
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class StoreBusinessHoursOverrideDeletedEvent :  IEquatable<StoreB
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(StoreBusinessHoursOverrideDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreCampaignStartTime.cs b/src/Flipdish/Model/StoreCampaignStartTime.cs
index 274c9a87..acef2a56 100644
--- a/src/Flipdish/Model/StoreCampaignStartTime.cs
+++ b/src/Flipdish/Model/StoreCampaignStartTime.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store campaign start time
     /// </summary>
     [DataContract]
-    public partial class StoreCampaignStartTime :  IEquatable<StoreCampaignStartTime>, IValidatableObject
+    public partial class StoreCampaignStartTime :  IEquatable<StoreCampaignStartTime>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreCampaignStartTime" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreChannelAssignment.cs b/src/Flipdish/Model/StoreChannelAssignment.cs
index 610a0134..89e074e4 100644
--- a/src/Flipdish/Model/StoreChannelAssignment.cs
+++ b/src/Flipdish/Model/StoreChannelAssignment.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a store that is assigned to a Sales Channel
     /// </summary>
     [DataContract]
-    public partial class StoreChannelAssignment :  IEquatable<StoreChannelAssignment>, IValidatableObject
+    public partial class StoreChannelAssignment :  IEquatable<StoreChannelAssignment>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreChannelAssignment" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreChannelStoreMapping.cs b/src/Flipdish/Model/StoreChannelStoreMapping.cs
deleted file mode 100644
index 7ba8f267..00000000
--- a/src/Flipdish/Model/StoreChannelStoreMapping.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Describes an ID mapping between Flipdish Store and Channel Store
-    /// </summary>
-    [DataContract]
-    public partial class StoreChannelStoreMapping :  IEquatable<StoreChannelStoreMapping>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreChannelStoreMapping" /> class.
-        /// </summary>
-        /// <param name="channelId">Channel Id.</param>
-        /// <param name="storeId">Store Id.</param>
-        /// <param name="channelStoreId">Channel Store Id.</param>
-        public StoreChannelStoreMapping(int? channelId = default(int?), int? storeId = default(int?), string channelStoreId = default(string))
-        {
-            this.ChannelId = channelId;
-            this.StoreId = storeId;
-            this.ChannelStoreId = channelStoreId;
-        }
-        
-        /// <summary>
-        /// Channel Id
-        /// </summary>
-        /// <value>Channel Id</value>
-        [DataMember(Name="ChannelId", EmitDefaultValue=false)]
-        public int? ChannelId { get; set; }
-
-        /// <summary>
-        /// Store Id
-        /// </summary>
-        /// <value>Store Id</value>
-        [DataMember(Name="StoreId", EmitDefaultValue=false)]
-        public int? StoreId { get; set; }
-
-        /// <summary>
-        /// Channel Store Id
-        /// </summary>
-        /// <value>Channel Store Id</value>
-        [DataMember(Name="ChannelStoreId", EmitDefaultValue=false)]
-        public string ChannelStoreId { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class StoreChannelStoreMapping {\n");
-            sb.Append("  ChannelId: ").Append(ChannelId).Append("\n");
-            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
-            sb.Append("  ChannelStoreId: ").Append(ChannelStoreId).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as StoreChannelStoreMapping);
-        }
-
-        /// <summary>
-        /// Returns true if StoreChannelStoreMapping instances are equal
-        /// </summary>
-        /// <param name="input">Instance of StoreChannelStoreMapping to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(StoreChannelStoreMapping input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.ChannelId == input.ChannelId ||
-                    (this.ChannelId != null &&
-                    this.ChannelId.Equals(input.ChannelId))
-                ) && 
-                (
-                    this.StoreId == input.StoreId ||
-                    (this.StoreId != null &&
-                    this.StoreId.Equals(input.StoreId))
-                ) && 
-                (
-                    this.ChannelStoreId == input.ChannelStoreId ||
-                    (this.ChannelStoreId != null &&
-                    this.ChannelStoreId.Equals(input.ChannelStoreId))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.ChannelId != null)
-                    hashCode = hashCode * 59 + this.ChannelId.GetHashCode();
-                if (this.StoreId != null)
-                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
-                if (this.ChannelStoreId != null)
-                    hashCode = hashCode * 59 + this.ChannelStoreId.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/StoreCloneSettings.cs b/src/Flipdish/Model/StoreCloneSettings.cs
index 97bb8850..cbb9ffbd 100644
--- a/src/Flipdish/Model/StoreCloneSettings.cs
+++ b/src/Flipdish/Model/StoreCloneSettings.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Settings for cloning a store
     /// </summary>
     [DataContract]
-    public partial class StoreCloneSettings :  IEquatable<StoreCloneSettings>, IValidatableObject
+    public partial class StoreCloneSettings :  IEquatable<StoreCloneSettings>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreCloneSettings" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreCollectionSettings.cs b/src/Flipdish/Model/StoreCollectionSettings.cs
new file mode 100644
index 00000000..533c44b1
--- /dev/null
+++ b/src/Flipdish/Model/StoreCollectionSettings.cs
@@ -0,0 +1,251 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Store Collection Settings
+    /// </summary>
+    [DataContract]
+    public partial class StoreCollectionSettings :  IEquatable<StoreCollectionSettings>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreCollectionSettings" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected StoreCollectionSettings() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreCollectionSettings" /> class.
+        /// </summary>
+        /// <param name="pickupEnabled">True if the store accepts pickup orders (required).</param>
+        /// <param name="minimumPickupOrderAmount">Minimum pickup order amount (required).</param>
+        /// <param name="requireCustomerNameForPickup">True if customer name required for pickup orders (required).</param>
+        /// <param name="cashOrdersPickupEnabled">True if the store accepts cash payment for pickup orders (required).</param>
+        /// <param name="leadTimeMinutes">Auto accept lead time for collection orders (required).</param>
+        /// <param name="etaInPickupConfirmationSmsEnabled">True if order confirmation sms includes estimated time when order will be ready for collection (required).</param>
+        public StoreCollectionSettings(bool? pickupEnabled = default(bool?), double? minimumPickupOrderAmount = default(double?), bool? requireCustomerNameForPickup = default(bool?), bool? cashOrdersPickupEnabled = default(bool?), int? leadTimeMinutes = default(int?), bool? etaInPickupConfirmationSmsEnabled = default(bool?))
+        {
+            // to ensure "pickupEnabled" is required (not null)
+            if (pickupEnabled == null)
+            {
+                throw new InvalidDataException("pickupEnabled is a required property for StoreCollectionSettings and cannot be null");
+            }
+            else
+            {
+                this.PickupEnabled = pickupEnabled;
+            }
+            // to ensure "minimumPickupOrderAmount" is required (not null)
+            if (minimumPickupOrderAmount == null)
+            {
+                throw new InvalidDataException("minimumPickupOrderAmount is a required property for StoreCollectionSettings and cannot be null");
+            }
+            else
+            {
+                this.MinimumPickupOrderAmount = minimumPickupOrderAmount;
+            }
+            // to ensure "requireCustomerNameForPickup" is required (not null)
+            if (requireCustomerNameForPickup == null)
+            {
+                throw new InvalidDataException("requireCustomerNameForPickup is a required property for StoreCollectionSettings and cannot be null");
+            }
+            else
+            {
+                this.RequireCustomerNameForPickup = requireCustomerNameForPickup;
+            }
+            // to ensure "cashOrdersPickupEnabled" is required (not null)
+            if (cashOrdersPickupEnabled == null)
+            {
+                throw new InvalidDataException("cashOrdersPickupEnabled is a required property for StoreCollectionSettings and cannot be null");
+            }
+            else
+            {
+                this.CashOrdersPickupEnabled = cashOrdersPickupEnabled;
+            }
+            // to ensure "leadTimeMinutes" is required (not null)
+            if (leadTimeMinutes == null)
+            {
+                throw new InvalidDataException("leadTimeMinutes is a required property for StoreCollectionSettings and cannot be null");
+            }
+            else
+            {
+                this.LeadTimeMinutes = leadTimeMinutes;
+            }
+            // to ensure "etaInPickupConfirmationSmsEnabled" is required (not null)
+            if (etaInPickupConfirmationSmsEnabled == null)
+            {
+                throw new InvalidDataException("etaInPickupConfirmationSmsEnabled is a required property for StoreCollectionSettings and cannot be null");
+            }
+            else
+            {
+                this.EtaInPickupConfirmationSmsEnabled = etaInPickupConfirmationSmsEnabled;
+            }
+        }
+        
+        /// <summary>
+        /// True if the store accepts pickup orders
+        /// </summary>
+        /// <value>True if the store accepts pickup orders</value>
+        [DataMember(Name="PickupEnabled", EmitDefaultValue=false)]
+        public bool? PickupEnabled { get; set; }
+
+        /// <summary>
+        /// Minimum pickup order amount
+        /// </summary>
+        /// <value>Minimum pickup order amount</value>
+        [DataMember(Name="MinimumPickupOrderAmount", EmitDefaultValue=false)]
+        public double? MinimumPickupOrderAmount { get; set; }
+
+        /// <summary>
+        /// True if customer name required for pickup orders
+        /// </summary>
+        /// <value>True if customer name required for pickup orders</value>
+        [DataMember(Name="RequireCustomerNameForPickup", EmitDefaultValue=false)]
+        public bool? RequireCustomerNameForPickup { get; set; }
+
+        /// <summary>
+        /// True if the store accepts cash payment for pickup orders
+        /// </summary>
+        /// <value>True if the store accepts cash payment for pickup orders</value>
+        [DataMember(Name="CashOrdersPickupEnabled", EmitDefaultValue=false)]
+        public bool? CashOrdersPickupEnabled { get; set; }
+
+        /// <summary>
+        /// Auto accept lead time for collection orders
+        /// </summary>
+        /// <value>Auto accept lead time for collection orders</value>
+        [DataMember(Name="LeadTimeMinutes", EmitDefaultValue=false)]
+        public int? LeadTimeMinutes { get; set; }
+
+        /// <summary>
+        /// True if order confirmation sms includes estimated time when order will be ready for collection
+        /// </summary>
+        /// <value>True if order confirmation sms includes estimated time when order will be ready for collection</value>
+        [DataMember(Name="EtaInPickupConfirmationSmsEnabled", EmitDefaultValue=false)]
+        public bool? EtaInPickupConfirmationSmsEnabled { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class StoreCollectionSettings {\n");
+            sb.Append("  PickupEnabled: ").Append(PickupEnabled).Append("\n");
+            sb.Append("  MinimumPickupOrderAmount: ").Append(MinimumPickupOrderAmount).Append("\n");
+            sb.Append("  RequireCustomerNameForPickup: ").Append(RequireCustomerNameForPickup).Append("\n");
+            sb.Append("  CashOrdersPickupEnabled: ").Append(CashOrdersPickupEnabled).Append("\n");
+            sb.Append("  LeadTimeMinutes: ").Append(LeadTimeMinutes).Append("\n");
+            sb.Append("  EtaInPickupConfirmationSmsEnabled: ").Append(EtaInPickupConfirmationSmsEnabled).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as StoreCollectionSettings);
+        }
+
+        /// <summary>
+        /// Returns true if StoreCollectionSettings instances are equal
+        /// </summary>
+        /// <param name="input">Instance of StoreCollectionSettings to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(StoreCollectionSettings input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PickupEnabled == input.PickupEnabled ||
+                    (this.PickupEnabled != null &&
+                    this.PickupEnabled.Equals(input.PickupEnabled))
+                ) && 
+                (
+                    this.MinimumPickupOrderAmount == input.MinimumPickupOrderAmount ||
+                    (this.MinimumPickupOrderAmount != null &&
+                    this.MinimumPickupOrderAmount.Equals(input.MinimumPickupOrderAmount))
+                ) && 
+                (
+                    this.RequireCustomerNameForPickup == input.RequireCustomerNameForPickup ||
+                    (this.RequireCustomerNameForPickup != null &&
+                    this.RequireCustomerNameForPickup.Equals(input.RequireCustomerNameForPickup))
+                ) && 
+                (
+                    this.CashOrdersPickupEnabled == input.CashOrdersPickupEnabled ||
+                    (this.CashOrdersPickupEnabled != null &&
+                    this.CashOrdersPickupEnabled.Equals(input.CashOrdersPickupEnabled))
+                ) && 
+                (
+                    this.LeadTimeMinutes == input.LeadTimeMinutes ||
+                    (this.LeadTimeMinutes != null &&
+                    this.LeadTimeMinutes.Equals(input.LeadTimeMinutes))
+                ) && 
+                (
+                    this.EtaInPickupConfirmationSmsEnabled == input.EtaInPickupConfirmationSmsEnabled ||
+                    (this.EtaInPickupConfirmationSmsEnabled != null &&
+                    this.EtaInPickupConfirmationSmsEnabled.Equals(input.EtaInPickupConfirmationSmsEnabled))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PickupEnabled != null)
+                    hashCode = hashCode * 59 + this.PickupEnabled.GetHashCode();
+                if (this.MinimumPickupOrderAmount != null)
+                    hashCode = hashCode * 59 + this.MinimumPickupOrderAmount.GetHashCode();
+                if (this.RequireCustomerNameForPickup != null)
+                    hashCode = hashCode * 59 + this.RequireCustomerNameForPickup.GetHashCode();
+                if (this.CashOrdersPickupEnabled != null)
+                    hashCode = hashCode * 59 + this.CashOrdersPickupEnabled.GetHashCode();
+                if (this.LeadTimeMinutes != null)
+                    hashCode = hashCode * 59 + this.LeadTimeMinutes.GetHashCode();
+                if (this.EtaInPickupConfirmationSmsEnabled != null)
+                    hashCode = hashCode * 59 + this.EtaInPickupConfirmationSmsEnabled.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/StoreConfig.cs b/src/Flipdish/Model/StoreConfig.cs
index dff70885..9c785c6a 100644
--- a/src/Flipdish/Model/StoreConfig.cs
+++ b/src/Flipdish/Model/StoreConfig.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// StoreConfig
+    /// StoreConfig.
     /// </summary>
     [DataContract]
-    public partial class StoreConfig :  IEquatable<StoreConfig>, IValidatableObject
+    public partial class StoreConfig :  IEquatable<StoreConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreConfig" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreCreateBase.cs b/src/Flipdish/Model/StoreCreateBase.cs
index 497fc2d0..3add7a9f 100644
--- a/src/Flipdish/Model/StoreCreateBase.cs
+++ b/src/Flipdish/Model/StoreCreateBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,19 +26,74 @@ namespace Flipdish.Model
     /// Store Create Base
     /// </summary>
     [DataContract]
-    public partial class StoreCreateBase :  IEquatable<StoreCreateBase>, IValidatableObject
+    public partial class StoreCreateBase :  IEquatable<StoreCreateBase>
     {
+        /// <summary>
+        /// Sales Channel Type
+        /// </summary>
+        /// <value>Sales Channel Type</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum SalesChannelTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 1,
+            
+            /// <summary>
+            /// Enum App for value: App
+            /// </summary>
+            [EnumMember(Value = "App")]
+            App = 2,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 3,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 4,
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 5,
+            
+            /// <summary>
+            /// Enum PhoneAgent for value: PhoneAgent
+            /// </summary>
+            [EnumMember(Value = "PhoneAgent")]
+            PhoneAgent = 6
+        }
+
+        /// <summary>
+        /// Sales Channel Type
+        /// </summary>
+        /// <value>Sales Channel Type</value>
+        [DataMember(Name="SalesChannelType", EmitDefaultValue=false)]
+        public SalesChannelTypeEnum? SalesChannelType { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreCreateBase" /> class.
         /// </summary>
         /// <param name="name">Name.</param>
         /// <param name="emailAddress">Email address (visible to customers).</param>
         /// <param name="staffLanguage">Staff Language (used for communication with the staff)  Emails, Printouts etc.</param>
-        public StoreCreateBase(string name = default(string), string emailAddress = default(string), string staffLanguage = default(string))
+        /// <param name="salesChannelType">Sales Channel Type.</param>
+        /// <param name="phoneNumber">Phone Number.</param>
+        public StoreCreateBase(string name = default(string), string emailAddress = default(string), string staffLanguage = default(string), SalesChannelTypeEnum? salesChannelType = default(SalesChannelTypeEnum?), string phoneNumber = default(string))
         {
             this.Name = name;
             this.EmailAddress = emailAddress;
             this.StaffLanguage = staffLanguage;
+            this.SalesChannelType = salesChannelType;
+            this.PhoneNumber = phoneNumber;
         }
         
         /// <summary>
@@ -64,6 +117,14 @@ public partial class StoreCreateBase :  IEquatable<StoreCreateBase>, IValidatabl
         [DataMember(Name="StaffLanguage", EmitDefaultValue=false)]
         public string StaffLanguage { get; set; }
 
+
+        /// <summary>
+        /// Phone Number
+        /// </summary>
+        /// <value>Phone Number</value>
+        [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
+        public string PhoneNumber { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -75,6 +136,8 @@ public override string ToString()
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  EmailAddress: ").Append(EmailAddress).Append("\n");
             sb.Append("  StaffLanguage: ").Append(StaffLanguage).Append("\n");
+            sb.Append("  SalesChannelType: ").Append(SalesChannelType).Append("\n");
+            sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -123,6 +186,16 @@ public bool Equals(StoreCreateBase input)
                     this.StaffLanguage == input.StaffLanguage ||
                     (this.StaffLanguage != null &&
                     this.StaffLanguage.Equals(input.StaffLanguage))
+                ) && 
+                (
+                    this.SalesChannelType == input.SalesChannelType ||
+                    (this.SalesChannelType != null &&
+                    this.SalesChannelType.Equals(input.SalesChannelType))
+                ) && 
+                (
+                    this.PhoneNumber == input.PhoneNumber ||
+                    (this.PhoneNumber != null &&
+                    this.PhoneNumber.Equals(input.PhoneNumber))
                 );
         }
 
@@ -141,31 +214,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.EmailAddress.GetHashCode();
                 if (this.StaffLanguage != null)
                     hashCode = hashCode * 59 + this.StaffLanguage.GetHashCode();
+                if (this.SalesChannelType != null)
+                    hashCode = hashCode * 59 + this.SalesChannelType.GetHashCode();
+                if (this.PhoneNumber != null)
+                    hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // EmailAddress (string) maxLength
-            if(this.EmailAddress != null && this.EmailAddress.Length > 100)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EmailAddress, length must be less than 100.", new [] { "EmailAddress" });
-            }
-
-            // EmailAddress (string) minLength
-            if(this.EmailAddress != null && this.EmailAddress.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for EmailAddress, length must be greater than 0.", new [] { "EmailAddress" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreCreatedEvent.cs b/src/Flipdish/Model/StoreCreatedEvent.cs
index 16e347aa..60d7ddd7 100644
--- a/src/Flipdish/Model/StoreCreatedEvent.cs
+++ b/src/Flipdish/Model/StoreCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,13 @@ namespace Flipdish.Model
     /// Store Created Event
     /// </summary>
     [DataContract]
-    public partial class StoreCreatedEvent :  IEquatable<StoreCreatedEvent>, IValidatableObject
+    public partial class StoreCreatedEvent :  IEquatable<StoreCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreCreatedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="storeId">Store Id.</param>
         /// <param name="user">User which created this store.</param>
         /// <param name="description">Description.</param>
@@ -43,9 +42,12 @@ public partial class StoreCreatedEvent :  IEquatable<StoreCreatedEvent>, IValida
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreCreatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreCreatedEvent(string eventName = default(string), string orgId = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.StoreId = storeId;
             this.User = user;
             this.Description = description;
@@ -55,6 +57,8 @@ public partial class StoreCreatedEvent :  IEquatable<StoreCreatedEvent>, IValida
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -64,6 +68,13 @@ public partial class StoreCreatedEvent :  IEquatable<StoreCreatedEvent>, IValida
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Store Id
         /// </summary>
@@ -127,6 +138,20 @@ public partial class StoreCreatedEvent :  IEquatable<StoreCreatedEvent>, IValida
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -136,6 +161,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class StoreCreatedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
@@ -145,6 +171,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -184,6 +212,11 @@ public bool Equals(StoreCreatedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.StoreId == input.StoreId ||
                     (this.StoreId != null &&
@@ -228,6 +261,16 @@ public bool Equals(StoreCreatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -242,6 +285,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.StoreId != null)
                     hashCode = hashCode * 59 + this.StoreId.GetHashCode();
                 if (this.User != null)
@@ -260,19 +305,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreDataPoint.cs b/src/Flipdish/Model/StoreDataPoint.cs
index 329fb266..b0d2495e 100644
--- a/src/Flipdish/Model/StoreDataPoint.cs
+++ b/src/Flipdish/Model/StoreDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Data Point
     /// </summary>
     [DataContract]
-    public partial class StoreDataPoint :  IEquatable<StoreDataPoint>, IValidatableObject
+    public partial class StoreDataPoint :  IEquatable<StoreDataPoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreDataPoint" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreDeletedEvent.cs b/src/Flipdish/Model/StoreDeletedEvent.cs
index e758ce03..b17693c7 100644
--- a/src/Flipdish/Model/StoreDeletedEvent.cs
+++ b/src/Flipdish/Model/StoreDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Deleted Event
     /// </summary>
     [DataContract]
-    public partial class StoreDeletedEvent :  IEquatable<StoreDeletedEvent>, IValidatableObject
+    public partial class StoreDeletedEvent :  IEquatable<StoreDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreDeletedEvent :  IEquatable<StoreDeletedEvent>, IValida
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreDeletedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreDeletedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StoreDeletedEvent :  IEquatable<StoreDeletedEvent>, IValida
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -127,6 +131,13 @@ public partial class StoreDeletedEvent :  IEquatable<StoreDeletedEvent>, IValida
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -134,6 +145,20 @@ public partial class StoreDeletedEvent :  IEquatable<StoreDeletedEvent>, IValida
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -152,7 +177,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -237,10 +265,25 @@ public bool Equals(StoreDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -273,21 +316,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreDeliveryZoneFeeConfig.cs b/src/Flipdish/Model/StoreDeliveryZoneFeeConfig.cs
new file mode 100644
index 00000000..bfbd652c
--- /dev/null
+++ b/src/Flipdish/Model/StoreDeliveryZoneFeeConfig.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Store delivery zone fee config
+    /// </summary>
+    [DataContract]
+    public partial class StoreDeliveryZoneFeeConfig :  IEquatable<StoreDeliveryZoneFeeConfig>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreDeliveryZoneFeeConfig" /> class.
+        /// </summary>
+        /// <param name="deliveryZoneId">ID of the delivery zone this fee corresponds to.</param>
+        /// <param name="fee">Fee for delivery within this zone.</param>
+        public StoreDeliveryZoneFeeConfig(int? deliveryZoneId = default(int?), double? fee = default(double?))
+        {
+            this.DeliveryZoneId = deliveryZoneId;
+            this.Fee = fee;
+        }
+        
+        /// <summary>
+        /// ID of the delivery zone this fee corresponds to
+        /// </summary>
+        /// <value>ID of the delivery zone this fee corresponds to</value>
+        [DataMember(Name="DeliveryZoneId", EmitDefaultValue=false)]
+        public int? DeliveryZoneId { get; set; }
+
+        /// <summary>
+        /// Fee for delivery within this zone
+        /// </summary>
+        /// <value>Fee for delivery within this zone</value>
+        [DataMember(Name="Fee", EmitDefaultValue=false)]
+        public double? Fee { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class StoreDeliveryZoneFeeConfig {\n");
+            sb.Append("  DeliveryZoneId: ").Append(DeliveryZoneId).Append("\n");
+            sb.Append("  Fee: ").Append(Fee).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as StoreDeliveryZoneFeeConfig);
+        }
+
+        /// <summary>
+        /// Returns true if StoreDeliveryZoneFeeConfig instances are equal
+        /// </summary>
+        /// <param name="input">Instance of StoreDeliveryZoneFeeConfig to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(StoreDeliveryZoneFeeConfig input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeliveryZoneId == input.DeliveryZoneId ||
+                    (this.DeliveryZoneId != null &&
+                    this.DeliveryZoneId.Equals(input.DeliveryZoneId))
+                ) && 
+                (
+                    this.Fee == input.Fee ||
+                    (this.Fee != null &&
+                    this.Fee.Equals(input.Fee))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeliveryZoneId != null)
+                    hashCode = hashCode * 59 + this.DeliveryZoneId.GetHashCode();
+                if (this.Fee != null)
+                    hashCode = hashCode * 59 + this.Fee.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/StoreDeliveryZoneFeeConfigUpdateRequest.cs b/src/Flipdish/Model/StoreDeliveryZoneFeeConfigUpdateRequest.cs
new file mode 100644
index 00000000..61239fa0
--- /dev/null
+++ b/src/Flipdish/Model/StoreDeliveryZoneFeeConfigUpdateRequest.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Request to update store delivery zone fee config
+    /// </summary>
+    [DataContract]
+    public partial class StoreDeliveryZoneFeeConfigUpdateRequest :  IEquatable<StoreDeliveryZoneFeeConfigUpdateRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreDeliveryZoneFeeConfigUpdateRequest" /> class.
+        /// </summary>
+        /// <param name="deliveryZoneFees">Delivery zone fees to update.</param>
+        public StoreDeliveryZoneFeeConfigUpdateRequest(List<StoreDeliveryZoneFeeConfig> deliveryZoneFees = default(List<StoreDeliveryZoneFeeConfig>))
+        {
+            this.DeliveryZoneFees = deliveryZoneFees;
+        }
+        
+        /// <summary>
+        /// Delivery zone fees to update
+        /// </summary>
+        /// <value>Delivery zone fees to update</value>
+        [DataMember(Name="DeliveryZoneFees", EmitDefaultValue=false)]
+        public List<StoreDeliveryZoneFeeConfig> DeliveryZoneFees { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class StoreDeliveryZoneFeeConfigUpdateRequest {\n");
+            sb.Append("  DeliveryZoneFees: ").Append(DeliveryZoneFees).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as StoreDeliveryZoneFeeConfigUpdateRequest);
+        }
+
+        /// <summary>
+        /// Returns true if StoreDeliveryZoneFeeConfigUpdateRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of StoreDeliveryZoneFeeConfigUpdateRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(StoreDeliveryZoneFeeConfigUpdateRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeliveryZoneFees == input.DeliveryZoneFees ||
+                    this.DeliveryZoneFees != null &&
+                    this.DeliveryZoneFees.SequenceEqual(input.DeliveryZoneFees)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeliveryZoneFees != null)
+                    hashCode = hashCode * 59 + this.DeliveryZoneFees.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/StoreEndOfDayReport.cs b/src/Flipdish/Model/StoreEndOfDayReport.cs
index 49fb82df..acadb5df 100644
--- a/src/Flipdish/Model/StoreEndOfDayReport.cs
+++ b/src/Flipdish/Model/StoreEndOfDayReport.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store end of day report
     /// </summary>
     [DataContract]
-    public partial class StoreEndOfDayReport :  IEquatable<StoreEndOfDayReport>, IValidatableObject
+    public partial class StoreEndOfDayReport :  IEquatable<StoreEndOfDayReport>
     {
         /// <summary>
         /// Currency
@@ -1222,16 +1220,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreFeeConfig.cs b/src/Flipdish/Model/StoreFeeConfig.cs
index 9f3303ed..7e2c1662 100644
--- a/src/Flipdish/Model/StoreFeeConfig.cs
+++ b/src/Flipdish/Model/StoreFeeConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// StoreFeeConfig
     /// </summary>
     [DataContract]
-    public partial class StoreFeeConfig :  IEquatable<StoreFeeConfig>, IValidatableObject
+    public partial class StoreFeeConfig :  IEquatable<StoreFeeConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreFeeConfig" /> class.
@@ -55,6 +53,8 @@ public partial class StoreFeeConfig :  IEquatable<StoreFeeConfig>, IValidatableO
         /// <param name="percentFeeCashOrdersChargedToCustomerIncludingVat">percentFeeCashOrdersChargedToCustomerIncludingVat.</param>
         /// <param name="fixedFeeCashOrdersChargedToCustomerIncludingVat">fixedFeeCashOrdersChargedToCustomerIncludingVat.</param>
         /// <param name="percentFeeTips">Gets or sets the percent fee tips..</param>
+        /// <param name="percentFeeTipsCollection">Gets or sets the percent fee tips for collection..</param>
+        /// <param name="percentFeeTipsDelivery">Gets or sets the percent fee tips for delivery..</param>
         /// <param name="taxRatePercent">Gets or sets the tax rate percent..</param>
         /// <param name="percentFeeCardOrdersLocationService">Gets or sets the percent fee card orders location service..</param>
         /// <param name="percentFeeCashOrdersLocationService">Gets or sets the percent fee cash orders location service..</param>
@@ -68,7 +68,23 @@ public partial class StoreFeeConfig :  IEquatable<StoreFeeConfig>, IValidatableO
         /// <param name="percentFeeCashOrdersIngest">Gets or sets the percent fee cash orders ingest..</param>
         /// <param name="fixedFeeCardOrdersIngest">Gets or sets the fixed fee card orders ingest..</param>
         /// <param name="fixedFeeCashOrdersIngest">Gets or sets the fixed fee cash orders ingest..</param>
-        public StoreFeeConfig(int? feeConfigId = default(int?), int? storeId = default(int?), DateTime? startTime = default(DateTime?), double? percentFeeCardOrders = default(double?), double? percentFeeCashOrders = default(double?), double? percentFeeCardOrdersWeb = default(double?), double? percentFeeCashOrdersWeb = default(double?), double? percentFeeCardOrdersKiosk = default(double?), double? percentFeeCashOrdersKiosk = default(double?), double? fixedFeeCardOrdersKiosk = default(double?), double? fixedFeeCashOrdersKiosk = default(double?), double? percentFeeCardOrdersKioskChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrdersKioskChargedToCustomerIncludingVat = default(double?), double? percentFeeCashOrdersKioskChargedToCustomerIncludingVat = default(double?), double? fixedFeeCashOrdersKioskChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrders = default(double?), double? fixedFeeCashOrders = default(double?), double? percentFeeCardOrdersChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrdersChargedToCustomerIncludingVat = default(double?), double? percentFeeCashOrdersChargedToCustomerIncludingVat = default(double?), double? fixedFeeCashOrdersChargedToCustomerIncludingVat = default(double?), double? percentFeeTips = default(double?), double? taxRatePercent = default(double?), double? percentFeeCardOrdersLocationService = default(double?), double? percentFeeCashOrdersLocationService = default(double?), double? fixedFeeCardOrdersLocationService = default(double?), double? fixedFeeCashOrdersLocationService = default(double?), double? percentFeeCardOrdersLocationServiceChargedToCustomerIncludingVat = default(double?), double? percentFeeCashOrdersLocationServiceChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrdersLocationServiceChargedToCustomerIncludingVat = default(double?), double? fixedFeeCashOrdersLocationServiceChargedToCustomerIncludingVat = default(double?), double? percentFeeCardOrdersIngest = default(double?), double? percentFeeCashOrdersIngest = default(double?), double? fixedFeeCardOrdersIngest = default(double?), double? fixedFeeCashOrdersIngest = default(double?))
+        /// <param name="percentFeeDelivery">Gets or sets the percent fee for delivery orders..</param>
+        /// <param name="fixedFeeDelivery">Gets or sets the fixed fee for delivery orders..</param>
+        /// <param name="percentFeeCardPosTransaction">Gets or sets the percent fee for POS transactions..</param>
+        /// <param name="fixedFeeCardPosTransaction">Gets or sets the fixed fee for POS transactions..</param>
+        /// <param name="percentFeeOrderWithGoogle">Additional percentage fee charged on orders submitted through Order With Google.</param>
+        /// <param name="fixedFeeOrderWithGoogle">Additional fixed fee charged on orders submitted through Order With Google.</param>
+        /// <param name="shouldNotAutoIncreaseBefore">Should not auto increase fees before this date.</param>
+        /// <param name="reason">Reason for the last fee change (optional).</param>
+        /// <param name="percentFeeCardOrdersPhoneAgent">Gets or sets the percent fee card orders phone agent..</param>
+        /// <param name="percentFeeCashOrdersPhoneAgent">Gets or sets the percent fee cash orders phone agent..</param>
+        /// <param name="fixedFeeCardOrdersPhoneAgent">Gets or sets the fixed fee card orders phone agent..</param>
+        /// <param name="fixedFeeCashOrdersPhoneAgent">Gets or sets the fixed fee cash orders phone agent..</param>
+        /// <param name="percentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat">Gets or sets the percent fee card orders phone agent charged to customer including vat..</param>
+        /// <param name="percentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat">Gets or sets the percent fee cash orders phone agent charged to customer including vat..</param>
+        /// <param name="fixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat">Gets or sets the fixed fee card orders phone agent charged to customer including vat..</param>
+        /// <param name="fixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat">Gets or sets the fixed fee cash orders phone agent charged to customer including vat..</param>
+        public StoreFeeConfig(int? feeConfigId = default(int?), int? storeId = default(int?), DateTime? startTime = default(DateTime?), double? percentFeeCardOrders = default(double?), double? percentFeeCashOrders = default(double?), double? percentFeeCardOrdersWeb = default(double?), double? percentFeeCashOrdersWeb = default(double?), double? percentFeeCardOrdersKiosk = default(double?), double? percentFeeCashOrdersKiosk = default(double?), double? fixedFeeCardOrdersKiosk = default(double?), double? fixedFeeCashOrdersKiosk = default(double?), double? percentFeeCardOrdersKioskChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrdersKioskChargedToCustomerIncludingVat = default(double?), double? percentFeeCashOrdersKioskChargedToCustomerIncludingVat = default(double?), double? fixedFeeCashOrdersKioskChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrders = default(double?), double? fixedFeeCashOrders = default(double?), double? percentFeeCardOrdersChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrdersChargedToCustomerIncludingVat = default(double?), double? percentFeeCashOrdersChargedToCustomerIncludingVat = default(double?), double? fixedFeeCashOrdersChargedToCustomerIncludingVat = default(double?), double? percentFeeTips = default(double?), double? percentFeeTipsCollection = default(double?), double? percentFeeTipsDelivery = default(double?), double? taxRatePercent = default(double?), double? percentFeeCardOrdersLocationService = default(double?), double? percentFeeCashOrdersLocationService = default(double?), double? fixedFeeCardOrdersLocationService = default(double?), double? fixedFeeCashOrdersLocationService = default(double?), double? percentFeeCardOrdersLocationServiceChargedToCustomerIncludingVat = default(double?), double? percentFeeCashOrdersLocationServiceChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrdersLocationServiceChargedToCustomerIncludingVat = default(double?), double? fixedFeeCashOrdersLocationServiceChargedToCustomerIncludingVat = default(double?), double? percentFeeCardOrdersIngest = default(double?), double? percentFeeCashOrdersIngest = default(double?), double? fixedFeeCardOrdersIngest = default(double?), double? fixedFeeCashOrdersIngest = default(double?), double? percentFeeDelivery = default(double?), double? fixedFeeDelivery = default(double?), double? percentFeeCardPosTransaction = default(double?), double? fixedFeeCardPosTransaction = default(double?), double? percentFeeOrderWithGoogle = default(double?), double? fixedFeeOrderWithGoogle = default(double?), DateTime? shouldNotAutoIncreaseBefore = default(DateTime?), string reason = default(string), double? percentFeeCardOrdersPhoneAgent = default(double?), double? percentFeeCashOrdersPhoneAgent = default(double?), double? fixedFeeCardOrdersPhoneAgent = default(double?), double? fixedFeeCashOrdersPhoneAgent = default(double?), double? percentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat = default(double?), double? percentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat = default(double?), double? fixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat = default(double?), double? fixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat = default(double?))
         {
             this.FeeConfigId = feeConfigId;
             this.StoreId = storeId;
@@ -92,6 +108,8 @@ public partial class StoreFeeConfig :  IEquatable<StoreFeeConfig>, IValidatableO
             this.PercentFeeCashOrdersChargedToCustomerIncludingVat = percentFeeCashOrdersChargedToCustomerIncludingVat;
             this.FixedFeeCashOrdersChargedToCustomerIncludingVat = fixedFeeCashOrdersChargedToCustomerIncludingVat;
             this.PercentFeeTips = percentFeeTips;
+            this.PercentFeeTipsCollection = percentFeeTipsCollection;
+            this.PercentFeeTipsDelivery = percentFeeTipsDelivery;
             this.TaxRatePercent = taxRatePercent;
             this.PercentFeeCardOrdersLocationService = percentFeeCardOrdersLocationService;
             this.PercentFeeCashOrdersLocationService = percentFeeCashOrdersLocationService;
@@ -105,6 +123,22 @@ public partial class StoreFeeConfig :  IEquatable<StoreFeeConfig>, IValidatableO
             this.PercentFeeCashOrdersIngest = percentFeeCashOrdersIngest;
             this.FixedFeeCardOrdersIngest = fixedFeeCardOrdersIngest;
             this.FixedFeeCashOrdersIngest = fixedFeeCashOrdersIngest;
+            this.PercentFeeDelivery = percentFeeDelivery;
+            this.FixedFeeDelivery = fixedFeeDelivery;
+            this.PercentFeeCardPosTransaction = percentFeeCardPosTransaction;
+            this.FixedFeeCardPosTransaction = fixedFeeCardPosTransaction;
+            this.PercentFeeOrderWithGoogle = percentFeeOrderWithGoogle;
+            this.FixedFeeOrderWithGoogle = fixedFeeOrderWithGoogle;
+            this.ShouldNotAutoIncreaseBefore = shouldNotAutoIncreaseBefore;
+            this.Reason = reason;
+            this.PercentFeeCardOrdersPhoneAgent = percentFeeCardOrdersPhoneAgent;
+            this.PercentFeeCashOrdersPhoneAgent = percentFeeCashOrdersPhoneAgent;
+            this.FixedFeeCardOrdersPhoneAgent = fixedFeeCardOrdersPhoneAgent;
+            this.FixedFeeCashOrdersPhoneAgent = fixedFeeCashOrdersPhoneAgent;
+            this.PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat = percentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat;
+            this.PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat = percentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat;
+            this.FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat = fixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat;
+            this.FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat = fixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat;
         }
         
         /// <summary>
@@ -240,6 +274,20 @@ public partial class StoreFeeConfig :  IEquatable<StoreFeeConfig>, IValidatableO
         [DataMember(Name="PercentFeeTips", EmitDefaultValue=false)]
         public double? PercentFeeTips { get; set; }
 
+        /// <summary>
+        /// Gets or sets the percent fee tips for collection.
+        /// </summary>
+        /// <value>Gets or sets the percent fee tips for collection.</value>
+        [DataMember(Name="PercentFeeTipsCollection", EmitDefaultValue=false)]
+        public double? PercentFeeTipsCollection { get; set; }
+
+        /// <summary>
+        /// Gets or sets the percent fee tips for delivery.
+        /// </summary>
+        /// <value>Gets or sets the percent fee tips for delivery.</value>
+        [DataMember(Name="PercentFeeTipsDelivery", EmitDefaultValue=false)]
+        public double? PercentFeeTipsDelivery { get; set; }
+
         /// <summary>
         /// Gets or sets the tax rate percent.
         /// </summary>
@@ -331,6 +379,118 @@ public partial class StoreFeeConfig :  IEquatable<StoreFeeConfig>, IValidatableO
         [DataMember(Name="FixedFeeCashOrdersIngest", EmitDefaultValue=false)]
         public double? FixedFeeCashOrdersIngest { get; set; }
 
+        /// <summary>
+        /// Gets or sets the percent fee for delivery orders.
+        /// </summary>
+        /// <value>Gets or sets the percent fee for delivery orders.</value>
+        [DataMember(Name="PercentFeeDelivery", EmitDefaultValue=false)]
+        public double? PercentFeeDelivery { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fixed fee for delivery orders.
+        /// </summary>
+        /// <value>Gets or sets the fixed fee for delivery orders.</value>
+        [DataMember(Name="FixedFeeDelivery", EmitDefaultValue=false)]
+        public double? FixedFeeDelivery { get; set; }
+
+        /// <summary>
+        /// Gets or sets the percent fee for POS transactions.
+        /// </summary>
+        /// <value>Gets or sets the percent fee for POS transactions.</value>
+        [DataMember(Name="PercentFeeCardPosTransaction", EmitDefaultValue=false)]
+        public double? PercentFeeCardPosTransaction { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fixed fee for POS transactions.
+        /// </summary>
+        /// <value>Gets or sets the fixed fee for POS transactions.</value>
+        [DataMember(Name="FixedFeeCardPosTransaction", EmitDefaultValue=false)]
+        public double? FixedFeeCardPosTransaction { get; set; }
+
+        /// <summary>
+        /// Additional percentage fee charged on orders submitted through Order With Google
+        /// </summary>
+        /// <value>Additional percentage fee charged on orders submitted through Order With Google</value>
+        [DataMember(Name="PercentFeeOrderWithGoogle", EmitDefaultValue=false)]
+        public double? PercentFeeOrderWithGoogle { get; set; }
+
+        /// <summary>
+        /// Additional fixed fee charged on orders submitted through Order With Google
+        /// </summary>
+        /// <value>Additional fixed fee charged on orders submitted through Order With Google</value>
+        [DataMember(Name="FixedFeeOrderWithGoogle", EmitDefaultValue=false)]
+        public double? FixedFeeOrderWithGoogle { get; set; }
+
+        /// <summary>
+        /// Should not auto increase fees before this date
+        /// </summary>
+        /// <value>Should not auto increase fees before this date</value>
+        [DataMember(Name="ShouldNotAutoIncreaseBefore", EmitDefaultValue=false)]
+        public DateTime? ShouldNotAutoIncreaseBefore { get; set; }
+
+        /// <summary>
+        /// Reason for the last fee change (optional)
+        /// </summary>
+        /// <value>Reason for the last fee change (optional)</value>
+        [DataMember(Name="Reason", EmitDefaultValue=false)]
+        public string Reason { get; set; }
+
+        /// <summary>
+        /// Gets or sets the percent fee card orders phone agent.
+        /// </summary>
+        /// <value>Gets or sets the percent fee card orders phone agent.</value>
+        [DataMember(Name="PercentFeeCardOrdersPhoneAgent", EmitDefaultValue=false)]
+        public double? PercentFeeCardOrdersPhoneAgent { get; set; }
+
+        /// <summary>
+        /// Gets or sets the percent fee cash orders phone agent.
+        /// </summary>
+        /// <value>Gets or sets the percent fee cash orders phone agent.</value>
+        [DataMember(Name="PercentFeeCashOrdersPhoneAgent", EmitDefaultValue=false)]
+        public double? PercentFeeCashOrdersPhoneAgent { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fixed fee card orders phone agent.
+        /// </summary>
+        /// <value>Gets or sets the fixed fee card orders phone agent.</value>
+        [DataMember(Name="FixedFeeCardOrdersPhoneAgent", EmitDefaultValue=false)]
+        public double? FixedFeeCardOrdersPhoneAgent { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fixed fee cash orders phone agent.
+        /// </summary>
+        /// <value>Gets or sets the fixed fee cash orders phone agent.</value>
+        [DataMember(Name="FixedFeeCashOrdersPhoneAgent", EmitDefaultValue=false)]
+        public double? FixedFeeCashOrdersPhoneAgent { get; set; }
+
+        /// <summary>
+        /// Gets or sets the percent fee card orders phone agent charged to customer including vat.
+        /// </summary>
+        /// <value>Gets or sets the percent fee card orders phone agent charged to customer including vat.</value>
+        [DataMember(Name="PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat", EmitDefaultValue=false)]
+        public double? PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat { get; set; }
+
+        /// <summary>
+        /// Gets or sets the percent fee cash orders phone agent charged to customer including vat.
+        /// </summary>
+        /// <value>Gets or sets the percent fee cash orders phone agent charged to customer including vat.</value>
+        [DataMember(Name="PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat", EmitDefaultValue=false)]
+        public double? PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fixed fee card orders phone agent charged to customer including vat.
+        /// </summary>
+        /// <value>Gets or sets the fixed fee card orders phone agent charged to customer including vat.</value>
+        [DataMember(Name="FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat", EmitDefaultValue=false)]
+        public double? FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fixed fee cash orders phone agent charged to customer including vat.
+        /// </summary>
+        /// <value>Gets or sets the fixed fee cash orders phone agent charged to customer including vat.</value>
+        [DataMember(Name="FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat", EmitDefaultValue=false)]
+        public double? FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -361,6 +521,8 @@ public override string ToString()
             sb.Append("  PercentFeeCashOrdersChargedToCustomerIncludingVat: ").Append(PercentFeeCashOrdersChargedToCustomerIncludingVat).Append("\n");
             sb.Append("  FixedFeeCashOrdersChargedToCustomerIncludingVat: ").Append(FixedFeeCashOrdersChargedToCustomerIncludingVat).Append("\n");
             sb.Append("  PercentFeeTips: ").Append(PercentFeeTips).Append("\n");
+            sb.Append("  PercentFeeTipsCollection: ").Append(PercentFeeTipsCollection).Append("\n");
+            sb.Append("  PercentFeeTipsDelivery: ").Append(PercentFeeTipsDelivery).Append("\n");
             sb.Append("  TaxRatePercent: ").Append(TaxRatePercent).Append("\n");
             sb.Append("  PercentFeeCardOrdersLocationService: ").Append(PercentFeeCardOrdersLocationService).Append("\n");
             sb.Append("  PercentFeeCashOrdersLocationService: ").Append(PercentFeeCashOrdersLocationService).Append("\n");
@@ -374,6 +536,22 @@ public override string ToString()
             sb.Append("  PercentFeeCashOrdersIngest: ").Append(PercentFeeCashOrdersIngest).Append("\n");
             sb.Append("  FixedFeeCardOrdersIngest: ").Append(FixedFeeCardOrdersIngest).Append("\n");
             sb.Append("  FixedFeeCashOrdersIngest: ").Append(FixedFeeCashOrdersIngest).Append("\n");
+            sb.Append("  PercentFeeDelivery: ").Append(PercentFeeDelivery).Append("\n");
+            sb.Append("  FixedFeeDelivery: ").Append(FixedFeeDelivery).Append("\n");
+            sb.Append("  PercentFeeCardPosTransaction: ").Append(PercentFeeCardPosTransaction).Append("\n");
+            sb.Append("  FixedFeeCardPosTransaction: ").Append(FixedFeeCardPosTransaction).Append("\n");
+            sb.Append("  PercentFeeOrderWithGoogle: ").Append(PercentFeeOrderWithGoogle).Append("\n");
+            sb.Append("  FixedFeeOrderWithGoogle: ").Append(FixedFeeOrderWithGoogle).Append("\n");
+            sb.Append("  ShouldNotAutoIncreaseBefore: ").Append(ShouldNotAutoIncreaseBefore).Append("\n");
+            sb.Append("  Reason: ").Append(Reason).Append("\n");
+            sb.Append("  PercentFeeCardOrdersPhoneAgent: ").Append(PercentFeeCardOrdersPhoneAgent).Append("\n");
+            sb.Append("  PercentFeeCashOrdersPhoneAgent: ").Append(PercentFeeCashOrdersPhoneAgent).Append("\n");
+            sb.Append("  FixedFeeCardOrdersPhoneAgent: ").Append(FixedFeeCardOrdersPhoneAgent).Append("\n");
+            sb.Append("  FixedFeeCashOrdersPhoneAgent: ").Append(FixedFeeCashOrdersPhoneAgent).Append("\n");
+            sb.Append("  PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat: ").Append(PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat).Append("\n");
+            sb.Append("  PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat: ").Append(PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat).Append("\n");
+            sb.Append("  FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat: ").Append(FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat).Append("\n");
+            sb.Append("  FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat: ").Append(FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -518,6 +696,16 @@ public bool Equals(StoreFeeConfig input)
                     (this.PercentFeeTips != null &&
                     this.PercentFeeTips.Equals(input.PercentFeeTips))
                 ) && 
+                (
+                    this.PercentFeeTipsCollection == input.PercentFeeTipsCollection ||
+                    (this.PercentFeeTipsCollection != null &&
+                    this.PercentFeeTipsCollection.Equals(input.PercentFeeTipsCollection))
+                ) && 
+                (
+                    this.PercentFeeTipsDelivery == input.PercentFeeTipsDelivery ||
+                    (this.PercentFeeTipsDelivery != null &&
+                    this.PercentFeeTipsDelivery.Equals(input.PercentFeeTipsDelivery))
+                ) && 
                 (
                     this.TaxRatePercent == input.TaxRatePercent ||
                     (this.TaxRatePercent != null &&
@@ -582,6 +770,86 @@ public bool Equals(StoreFeeConfig input)
                     this.FixedFeeCashOrdersIngest == input.FixedFeeCashOrdersIngest ||
                     (this.FixedFeeCashOrdersIngest != null &&
                     this.FixedFeeCashOrdersIngest.Equals(input.FixedFeeCashOrdersIngest))
+                ) && 
+                (
+                    this.PercentFeeDelivery == input.PercentFeeDelivery ||
+                    (this.PercentFeeDelivery != null &&
+                    this.PercentFeeDelivery.Equals(input.PercentFeeDelivery))
+                ) && 
+                (
+                    this.FixedFeeDelivery == input.FixedFeeDelivery ||
+                    (this.FixedFeeDelivery != null &&
+                    this.FixedFeeDelivery.Equals(input.FixedFeeDelivery))
+                ) && 
+                (
+                    this.PercentFeeCardPosTransaction == input.PercentFeeCardPosTransaction ||
+                    (this.PercentFeeCardPosTransaction != null &&
+                    this.PercentFeeCardPosTransaction.Equals(input.PercentFeeCardPosTransaction))
+                ) && 
+                (
+                    this.FixedFeeCardPosTransaction == input.FixedFeeCardPosTransaction ||
+                    (this.FixedFeeCardPosTransaction != null &&
+                    this.FixedFeeCardPosTransaction.Equals(input.FixedFeeCardPosTransaction))
+                ) && 
+                (
+                    this.PercentFeeOrderWithGoogle == input.PercentFeeOrderWithGoogle ||
+                    (this.PercentFeeOrderWithGoogle != null &&
+                    this.PercentFeeOrderWithGoogle.Equals(input.PercentFeeOrderWithGoogle))
+                ) && 
+                (
+                    this.FixedFeeOrderWithGoogle == input.FixedFeeOrderWithGoogle ||
+                    (this.FixedFeeOrderWithGoogle != null &&
+                    this.FixedFeeOrderWithGoogle.Equals(input.FixedFeeOrderWithGoogle))
+                ) && 
+                (
+                    this.ShouldNotAutoIncreaseBefore == input.ShouldNotAutoIncreaseBefore ||
+                    (this.ShouldNotAutoIncreaseBefore != null &&
+                    this.ShouldNotAutoIncreaseBefore.Equals(input.ShouldNotAutoIncreaseBefore))
+                ) && 
+                (
+                    this.Reason == input.Reason ||
+                    (this.Reason != null &&
+                    this.Reason.Equals(input.Reason))
+                ) && 
+                (
+                    this.PercentFeeCardOrdersPhoneAgent == input.PercentFeeCardOrdersPhoneAgent ||
+                    (this.PercentFeeCardOrdersPhoneAgent != null &&
+                    this.PercentFeeCardOrdersPhoneAgent.Equals(input.PercentFeeCardOrdersPhoneAgent))
+                ) && 
+                (
+                    this.PercentFeeCashOrdersPhoneAgent == input.PercentFeeCashOrdersPhoneAgent ||
+                    (this.PercentFeeCashOrdersPhoneAgent != null &&
+                    this.PercentFeeCashOrdersPhoneAgent.Equals(input.PercentFeeCashOrdersPhoneAgent))
+                ) && 
+                (
+                    this.FixedFeeCardOrdersPhoneAgent == input.FixedFeeCardOrdersPhoneAgent ||
+                    (this.FixedFeeCardOrdersPhoneAgent != null &&
+                    this.FixedFeeCardOrdersPhoneAgent.Equals(input.FixedFeeCardOrdersPhoneAgent))
+                ) && 
+                (
+                    this.FixedFeeCashOrdersPhoneAgent == input.FixedFeeCashOrdersPhoneAgent ||
+                    (this.FixedFeeCashOrdersPhoneAgent != null &&
+                    this.FixedFeeCashOrdersPhoneAgent.Equals(input.FixedFeeCashOrdersPhoneAgent))
+                ) && 
+                (
+                    this.PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat == input.PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat ||
+                    (this.PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat != null &&
+                    this.PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat.Equals(input.PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat))
+                ) && 
+                (
+                    this.PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat == input.PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat ||
+                    (this.PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat != null &&
+                    this.PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat.Equals(input.PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat))
+                ) && 
+                (
+                    this.FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat == input.FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat ||
+                    (this.FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat != null &&
+                    this.FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat.Equals(input.FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat))
+                ) && 
+                (
+                    this.FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat == input.FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat ||
+                    (this.FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat != null &&
+                    this.FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat.Equals(input.FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat))
                 );
         }
 
@@ -638,6 +906,10 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.FixedFeeCashOrdersChargedToCustomerIncludingVat.GetHashCode();
                 if (this.PercentFeeTips != null)
                     hashCode = hashCode * 59 + this.PercentFeeTips.GetHashCode();
+                if (this.PercentFeeTipsCollection != null)
+                    hashCode = hashCode * 59 + this.PercentFeeTipsCollection.GetHashCode();
+                if (this.PercentFeeTipsDelivery != null)
+                    hashCode = hashCode * 59 + this.PercentFeeTipsDelivery.GetHashCode();
                 if (this.TaxRatePercent != null)
                     hashCode = hashCode * 59 + this.TaxRatePercent.GetHashCode();
                 if (this.PercentFeeCardOrdersLocationService != null)
@@ -664,19 +936,41 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.FixedFeeCardOrdersIngest.GetHashCode();
                 if (this.FixedFeeCashOrdersIngest != null)
                     hashCode = hashCode * 59 + this.FixedFeeCashOrdersIngest.GetHashCode();
+                if (this.PercentFeeDelivery != null)
+                    hashCode = hashCode * 59 + this.PercentFeeDelivery.GetHashCode();
+                if (this.FixedFeeDelivery != null)
+                    hashCode = hashCode * 59 + this.FixedFeeDelivery.GetHashCode();
+                if (this.PercentFeeCardPosTransaction != null)
+                    hashCode = hashCode * 59 + this.PercentFeeCardPosTransaction.GetHashCode();
+                if (this.FixedFeeCardPosTransaction != null)
+                    hashCode = hashCode * 59 + this.FixedFeeCardPosTransaction.GetHashCode();
+                if (this.PercentFeeOrderWithGoogle != null)
+                    hashCode = hashCode * 59 + this.PercentFeeOrderWithGoogle.GetHashCode();
+                if (this.FixedFeeOrderWithGoogle != null)
+                    hashCode = hashCode * 59 + this.FixedFeeOrderWithGoogle.GetHashCode();
+                if (this.ShouldNotAutoIncreaseBefore != null)
+                    hashCode = hashCode * 59 + this.ShouldNotAutoIncreaseBefore.GetHashCode();
+                if (this.Reason != null)
+                    hashCode = hashCode * 59 + this.Reason.GetHashCode();
+                if (this.PercentFeeCardOrdersPhoneAgent != null)
+                    hashCode = hashCode * 59 + this.PercentFeeCardOrdersPhoneAgent.GetHashCode();
+                if (this.PercentFeeCashOrdersPhoneAgent != null)
+                    hashCode = hashCode * 59 + this.PercentFeeCashOrdersPhoneAgent.GetHashCode();
+                if (this.FixedFeeCardOrdersPhoneAgent != null)
+                    hashCode = hashCode * 59 + this.FixedFeeCardOrdersPhoneAgent.GetHashCode();
+                if (this.FixedFeeCashOrdersPhoneAgent != null)
+                    hashCode = hashCode * 59 + this.FixedFeeCashOrdersPhoneAgent.GetHashCode();
+                if (this.PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat != null)
+                    hashCode = hashCode * 59 + this.PercentFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat.GetHashCode();
+                if (this.PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat != null)
+                    hashCode = hashCode * 59 + this.PercentFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat.GetHashCode();
+                if (this.FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat != null)
+                    hashCode = hashCode * 59 + this.FixedFeeCardOrdersPhoneAgentChargedToCustomerIncludingVat.GetHashCode();
+                if (this.FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat != null)
+                    hashCode = hashCode * 59 + this.FixedFeeCashOrdersPhoneAgentChargedToCustomerIncludingVat.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreFeeConfigUpdatedEvent.cs b/src/Flipdish/Model/StoreFeeConfigUpdatedEvent.cs
new file mode 100644
index 00000000..a1ef9e36
--- /dev/null
+++ b/src/Flipdish/Model/StoreFeeConfigUpdatedEvent.cs
@@ -0,0 +1,351 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Fee Config Updated Event
+    /// </summary>
+    [DataContract]
+    public partial class StoreFeeConfigUpdatedEvent :  IEquatable<StoreFeeConfigUpdatedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StoreFeeConfigUpdatedEvent" /> class.
+        /// </summary>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="storeId">Store Id.</param>
+        /// <param name="storeGroupId">Store group Id.</param>
+        /// <param name="user">User which updated this store address.</param>
+        /// <param name="description">Description.</param>
+        /// <param name="changes">Diff between before and after.</param>
+        /// <param name="storeFeeConfig">Store fee config.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreFeeConfigUpdatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), string changes = default(string), StoreFeeConfig storeFeeConfig = default(StoreFeeConfig), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.EventName = eventName;
+            this.StoreId = storeId;
+            this.StoreGroupId = storeGroupId;
+            this.User = user;
+            this.Description = description;
+            this.Changes = changes;
+            this.StoreFeeConfig = storeFeeConfig;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// Store Id
+        /// </summary>
+        /// <value>Store Id</value>
+        [DataMember(Name="StoreId", EmitDefaultValue=false)]
+        public int? StoreId { get; set; }
+
+        /// <summary>
+        /// Store group Id
+        /// </summary>
+        /// <value>Store group Id</value>
+        [DataMember(Name="StoreGroupId", EmitDefaultValue=false)]
+        public int? StoreGroupId { get; set; }
+
+        /// <summary>
+        /// User which updated this store address
+        /// </summary>
+        /// <value>User which updated this store address</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public UserEventInfo User { get; set; }
+
+        /// <summary>
+        /// Description
+        /// </summary>
+        /// <value>Description</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Diff between before and after
+        /// </summary>
+        /// <value>Diff between before and after</value>
+        [DataMember(Name="Changes", EmitDefaultValue=false)]
+        public string Changes { get; set; }
+
+        /// <summary>
+        /// Store fee config
+        /// </summary>
+        /// <value>Store fee config</value>
+        [DataMember(Name="StoreFeeConfig", EmitDefaultValue=false)]
+        public StoreFeeConfig StoreFeeConfig { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class StoreFeeConfigUpdatedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  StoreGroupId: ").Append(StoreGroupId).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  Changes: ").Append(Changes).Append("\n");
+            sb.Append("  StoreFeeConfig: ").Append(StoreFeeConfig).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as StoreFeeConfigUpdatedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if StoreFeeConfigUpdatedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of StoreFeeConfigUpdatedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(StoreFeeConfigUpdatedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.StoreId == input.StoreId ||
+                    (this.StoreId != null &&
+                    this.StoreId.Equals(input.StoreId))
+                ) && 
+                (
+                    this.StoreGroupId == input.StoreGroupId ||
+                    (this.StoreGroupId != null &&
+                    this.StoreGroupId.Equals(input.StoreGroupId))
+                ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.Changes == input.Changes ||
+                    (this.Changes != null &&
+                    this.Changes.Equals(input.Changes))
+                ) && 
+                (
+                    this.StoreFeeConfig == input.StoreFeeConfig ||
+                    (this.StoreFeeConfig != null &&
+                    this.StoreFeeConfig.Equals(input.StoreFeeConfig))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.StoreId != null)
+                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.StoreGroupId != null)
+                    hashCode = hashCode * 59 + this.StoreGroupId.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.Changes != null)
+                    hashCode = hashCode * 59 + this.Changes.GetHashCode();
+                if (this.StoreFeeConfig != null)
+                    hashCode = hashCode * 59 + this.StoreFeeConfig.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/StoreGroup.cs b/src/Flipdish/Model/StoreGroup.cs
index f88f051a..9511c1ce 100644
--- a/src/Flipdish/Model/StoreGroup.cs
+++ b/src/Flipdish/Model/StoreGroup.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Group
     /// </summary>
     [DataContract]
-    public partial class StoreGroup :  IEquatable<StoreGroup>, IValidatableObject
+    public partial class StoreGroup :  IEquatable<StoreGroup>
     {
         /// <summary>
         /// Currency used by the stores in this group
@@ -729,13 +727,19 @@ public enum CurrencyEnum
         /// <param name="storeGroupId">Unique Store Group Identifier.</param>
         /// <param name="generalRating">Store Group rating.</param>
         /// <param name="generalRatingCount">Store Group rating count.</param>
+        /// <param name="deliveryMenuMessage">Delivery menu message.</param>
+        /// <param name="pickupMenuMessage">Pickup menu message.</param>
+        /// <param name="brandIds">List of brand ids (AppIds) that are associated with this store group.</param>
         /// <param name="name">Store Group Name.</param>
         /// <param name="currency">Currency used by the stores in this group.</param>
-        public StoreGroup(int? storeGroupId = default(int?), double? generalRating = default(double?), int? generalRatingCount = default(int?), string name = default(string), CurrencyEnum? currency = default(CurrencyEnum?))
+        public StoreGroup(int? storeGroupId = default(int?), double? generalRating = default(double?), int? generalRatingCount = default(int?), string deliveryMenuMessage = default(string), string pickupMenuMessage = default(string), List<string> brandIds = default(List<string>), string name = default(string), CurrencyEnum? currency = default(CurrencyEnum?))
         {
             this.StoreGroupId = storeGroupId;
             this.GeneralRating = generalRating;
             this.GeneralRatingCount = generalRatingCount;
+            this.DeliveryMenuMessage = deliveryMenuMessage;
+            this.PickupMenuMessage = pickupMenuMessage;
+            this.BrandIds = brandIds;
             this.Name = name;
             this.Currency = currency;
         }
@@ -761,6 +765,27 @@ public enum CurrencyEnum
         [DataMember(Name="GeneralRatingCount", EmitDefaultValue=false)]
         public int? GeneralRatingCount { get; set; }
 
+        /// <summary>
+        /// Delivery menu message
+        /// </summary>
+        /// <value>Delivery menu message</value>
+        [DataMember(Name="DeliveryMenuMessage", EmitDefaultValue=false)]
+        public string DeliveryMenuMessage { get; set; }
+
+        /// <summary>
+        /// Pickup menu message
+        /// </summary>
+        /// <value>Pickup menu message</value>
+        [DataMember(Name="PickupMenuMessage", EmitDefaultValue=false)]
+        public string PickupMenuMessage { get; set; }
+
+        /// <summary>
+        /// List of brand ids (AppIds) that are associated with this store group
+        /// </summary>
+        /// <value>List of brand ids (AppIds) that are associated with this store group</value>
+        [DataMember(Name="BrandIds", EmitDefaultValue=false)]
+        public List<string> BrandIds { get; set; }
+
         /// <summary>
         /// Store Group Name
         /// </summary>
@@ -780,6 +805,9 @@ public override string ToString()
             sb.Append("  StoreGroupId: ").Append(StoreGroupId).Append("\n");
             sb.Append("  GeneralRating: ").Append(GeneralRating).Append("\n");
             sb.Append("  GeneralRatingCount: ").Append(GeneralRatingCount).Append("\n");
+            sb.Append("  DeliveryMenuMessage: ").Append(DeliveryMenuMessage).Append("\n");
+            sb.Append("  PickupMenuMessage: ").Append(PickupMenuMessage).Append("\n");
+            sb.Append("  BrandIds: ").Append(BrandIds).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Currency: ").Append(Currency).Append("\n");
             sb.Append("}\n");
@@ -831,6 +859,21 @@ public bool Equals(StoreGroup input)
                     (this.GeneralRatingCount != null &&
                     this.GeneralRatingCount.Equals(input.GeneralRatingCount))
                 ) && 
+                (
+                    this.DeliveryMenuMessage == input.DeliveryMenuMessage ||
+                    (this.DeliveryMenuMessage != null &&
+                    this.DeliveryMenuMessage.Equals(input.DeliveryMenuMessage))
+                ) && 
+                (
+                    this.PickupMenuMessage == input.PickupMenuMessage ||
+                    (this.PickupMenuMessage != null &&
+                    this.PickupMenuMessage.Equals(input.PickupMenuMessage))
+                ) && 
+                (
+                    this.BrandIds == input.BrandIds ||
+                    this.BrandIds != null &&
+                    this.BrandIds.SequenceEqual(input.BrandIds)
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -858,6 +901,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.GeneralRating.GetHashCode();
                 if (this.GeneralRatingCount != null)
                     hashCode = hashCode * 59 + this.GeneralRatingCount.GetHashCode();
+                if (this.DeliveryMenuMessage != null)
+                    hashCode = hashCode * 59 + this.DeliveryMenuMessage.GetHashCode();
+                if (this.PickupMenuMessage != null)
+                    hashCode = hashCode * 59 + this.PickupMenuMessage.GetHashCode();
+                if (this.BrandIds != null)
+                    hashCode = hashCode * 59 + this.BrandIds.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Currency != null)
@@ -865,16 +914,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreGroupBase.cs b/src/Flipdish/Model/StoreGroupBase.cs
index a81fad3c..942ebfda 100644
--- a/src/Flipdish/Model/StoreGroupBase.cs
+++ b/src/Flipdish/Model/StoreGroupBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Update Store Group
     /// </summary>
     [DataContract]
-    public partial class StoreGroupBase :  IEquatable<StoreGroupBase>, IValidatableObject
+    public partial class StoreGroupBase :  IEquatable<StoreGroupBase>
     {
         /// <summary>
         /// Currency used by the stores in this group
@@ -814,16 +812,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreGroupCreatedEvent.cs b/src/Flipdish/Model/StoreGroupCreatedEvent.cs
index 9df662c3..8b566750 100644
--- a/src/Flipdish/Model/StoreGroupCreatedEvent.cs
+++ b/src/Flipdish/Model/StoreGroupCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Group Created Event
     /// </summary>
     [DataContract]
-    public partial class StoreGroupCreatedEvent :  IEquatable<StoreGroupCreatedEvent>, IValidatableObject
+    public partial class StoreGroupCreatedEvent :  IEquatable<StoreGroupCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreGroupCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreGroupCreatedEvent :  IEquatable<StoreGroupCreatedEvent
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreGroupCreatedEvent(string eventName = default(string), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreGroup storeGroup = default(StoreGroup), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreGroupCreatedEvent(string eventName = default(string), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreGroup storeGroup = default(StoreGroup), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreGroupId = storeGroupId;
@@ -54,7 +55,10 @@ public partial class StoreGroupCreatedEvent :  IEquatable<StoreGroupCreatedEvent
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class StoreGroupCreatedEvent :  IEquatable<StoreGroupCreatedEvent
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class StoreGroupCreatedEvent :  IEquatable<StoreGroupCreatedEvent
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(StoreGroupCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreGroupDeletedEvent.cs b/src/Flipdish/Model/StoreGroupDeletedEvent.cs
index 12d47614..83c5ac51 100644
--- a/src/Flipdish/Model/StoreGroupDeletedEvent.cs
+++ b/src/Flipdish/Model/StoreGroupDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Group Deleted Event
     /// </summary>
     [DataContract]
-    public partial class StoreGroupDeletedEvent :  IEquatable<StoreGroupDeletedEvent>, IValidatableObject
+    public partial class StoreGroupDeletedEvent :  IEquatable<StoreGroupDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreGroupDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreGroupDeletedEvent :  IEquatable<StoreGroupDeletedEvent
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreGroupDeletedEvent(string eventName = default(string), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreGroup storeGroup = default(StoreGroup), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreGroupDeletedEvent(string eventName = default(string), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreGroup storeGroup = default(StoreGroup), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreGroupId = storeGroupId;
@@ -54,7 +55,10 @@ public partial class StoreGroupDeletedEvent :  IEquatable<StoreGroupDeletedEvent
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class StoreGroupDeletedEvent :  IEquatable<StoreGroupDeletedEvent
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class StoreGroupDeletedEvent :  IEquatable<StoreGroupDeletedEvent
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(StoreGroupDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreGroupExtended.cs b/src/Flipdish/Model/StoreGroupExtended.cs
index 2fd9c0c9..a04c5b82 100644
--- a/src/Flipdish/Model/StoreGroupExtended.cs
+++ b/src/Flipdish/Model/StoreGroupExtended.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Group Extended
     /// </summary>
     [DataContract]
-    public partial class StoreGroupExtended :  IEquatable<StoreGroupExtended>, IValidatableObject
+    public partial class StoreGroupExtended :  IEquatable<StoreGroupExtended>
     {
         /// <summary>
         /// Currency used by the stores in this group
@@ -732,9 +730,12 @@ public enum CurrencyEnum
         /// <param name="storeGroupId">Unique Store Group Identifier.</param>
         /// <param name="generalRating">Store Group rating.</param>
         /// <param name="generalRatingCount">Store Group rating count.</param>
+        /// <param name="deliveryMenuMessage">Delivery menu message.</param>
+        /// <param name="pickupMenuMessage">Pickup menu message.</param>
+        /// <param name="brandIds">List of brand ids (AppIds) that are associated with this store group.</param>
         /// <param name="name">Store Group Name.</param>
         /// <param name="currency">Currency used by the stores in this group.</param>
-        public StoreGroupExtended(int? totalStores = default(int?), List<GroupedCoordinates> groupedCoordinates = default(List<GroupedCoordinates>), List<StoreHeader> storeHeaders = default(List<StoreHeader>), int? storeGroupId = default(int?), double? generalRating = default(double?), int? generalRatingCount = default(int?), string name = default(string), CurrencyEnum? currency = default(CurrencyEnum?))
+        public StoreGroupExtended(int? totalStores = default(int?), List<GroupedCoordinates> groupedCoordinates = default(List<GroupedCoordinates>), List<StoreHeader> storeHeaders = default(List<StoreHeader>), int? storeGroupId = default(int?), double? generalRating = default(double?), int? generalRatingCount = default(int?), string deliveryMenuMessage = default(string), string pickupMenuMessage = default(string), List<string> brandIds = default(List<string>), string name = default(string), CurrencyEnum? currency = default(CurrencyEnum?))
         {
             this.TotalStores = totalStores;
             this.GroupedCoordinates = groupedCoordinates;
@@ -742,6 +743,9 @@ public enum CurrencyEnum
             this.StoreGroupId = storeGroupId;
             this.GeneralRating = generalRating;
             this.GeneralRatingCount = generalRatingCount;
+            this.DeliveryMenuMessage = deliveryMenuMessage;
+            this.PickupMenuMessage = pickupMenuMessage;
+            this.BrandIds = brandIds;
             this.Name = name;
             this.Currency = currency;
         }
@@ -788,6 +792,27 @@ public enum CurrencyEnum
         [DataMember(Name="GeneralRatingCount", EmitDefaultValue=false)]
         public int? GeneralRatingCount { get; set; }
 
+        /// <summary>
+        /// Delivery menu message
+        /// </summary>
+        /// <value>Delivery menu message</value>
+        [DataMember(Name="DeliveryMenuMessage", EmitDefaultValue=false)]
+        public string DeliveryMenuMessage { get; set; }
+
+        /// <summary>
+        /// Pickup menu message
+        /// </summary>
+        /// <value>Pickup menu message</value>
+        [DataMember(Name="PickupMenuMessage", EmitDefaultValue=false)]
+        public string PickupMenuMessage { get; set; }
+
+        /// <summary>
+        /// List of brand ids (AppIds) that are associated with this store group
+        /// </summary>
+        /// <value>List of brand ids (AppIds) that are associated with this store group</value>
+        [DataMember(Name="BrandIds", EmitDefaultValue=false)]
+        public List<string> BrandIds { get; set; }
+
         /// <summary>
         /// Store Group Name
         /// </summary>
@@ -810,6 +835,9 @@ public override string ToString()
             sb.Append("  StoreGroupId: ").Append(StoreGroupId).Append("\n");
             sb.Append("  GeneralRating: ").Append(GeneralRating).Append("\n");
             sb.Append("  GeneralRatingCount: ").Append(GeneralRatingCount).Append("\n");
+            sb.Append("  DeliveryMenuMessage: ").Append(DeliveryMenuMessage).Append("\n");
+            sb.Append("  PickupMenuMessage: ").Append(PickupMenuMessage).Append("\n");
+            sb.Append("  BrandIds: ").Append(BrandIds).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Currency: ").Append(Currency).Append("\n");
             sb.Append("}\n");
@@ -876,6 +904,21 @@ public bool Equals(StoreGroupExtended input)
                     (this.GeneralRatingCount != null &&
                     this.GeneralRatingCount.Equals(input.GeneralRatingCount))
                 ) && 
+                (
+                    this.DeliveryMenuMessage == input.DeliveryMenuMessage ||
+                    (this.DeliveryMenuMessage != null &&
+                    this.DeliveryMenuMessage.Equals(input.DeliveryMenuMessage))
+                ) && 
+                (
+                    this.PickupMenuMessage == input.PickupMenuMessage ||
+                    (this.PickupMenuMessage != null &&
+                    this.PickupMenuMessage.Equals(input.PickupMenuMessage))
+                ) && 
+                (
+                    this.BrandIds == input.BrandIds ||
+                    this.BrandIds != null &&
+                    this.BrandIds.SequenceEqual(input.BrandIds)
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -909,6 +952,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.GeneralRating.GetHashCode();
                 if (this.GeneralRatingCount != null)
                     hashCode = hashCode * 59 + this.GeneralRatingCount.GetHashCode();
+                if (this.DeliveryMenuMessage != null)
+                    hashCode = hashCode * 59 + this.DeliveryMenuMessage.GetHashCode();
+                if (this.PickupMenuMessage != null)
+                    hashCode = hashCode * 59 + this.PickupMenuMessage.GetHashCode();
+                if (this.BrandIds != null)
+                    hashCode = hashCode * 59 + this.BrandIds.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Currency != null)
@@ -916,16 +965,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreGroupUpdatedEvent.cs b/src/Flipdish/Model/StoreGroupUpdatedEvent.cs
index a15e21dc..00390f9f 100644
--- a/src/Flipdish/Model/StoreGroupUpdatedEvent.cs
+++ b/src/Flipdish/Model/StoreGroupUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Group Updated Event
     /// </summary>
     [DataContract]
-    public partial class StoreGroupUpdatedEvent :  IEquatable<StoreGroupUpdatedEvent>, IValidatableObject
+    public partial class StoreGroupUpdatedEvent :  IEquatable<StoreGroupUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreGroupUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreGroupUpdatedEvent :  IEquatable<StoreGroupUpdatedEvent
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreGroupUpdatedEvent(string eventName = default(string), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreGroup storeGroup = default(StoreGroup), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreGroupUpdatedEvent(string eventName = default(string), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreGroup storeGroup = default(StoreGroup), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreGroupId = storeGroupId;
@@ -54,7 +55,10 @@ public partial class StoreGroupUpdatedEvent :  IEquatable<StoreGroupUpdatedEvent
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class StoreGroupUpdatedEvent :  IEquatable<StoreGroupUpdatedEvent
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class StoreGroupUpdatedEvent :  IEquatable<StoreGroupUpdatedEvent
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(StoreGroupUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreHeader.cs b/src/Flipdish/Model/StoreHeader.cs
index b23d93aa..139d30a9 100644
--- a/src/Flipdish/Model/StoreHeader.cs
+++ b/src/Flipdish/Model/StoreHeader.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents the most basic store information, used mostly for searches
     /// </summary>
     [DataContract]
-    public partial class StoreHeader :  IEquatable<StoreHeader>, IValidatableObject
+    public partial class StoreHeader :  IEquatable<StoreHeader>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreHeader" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreItemHeader.cs b/src/Flipdish/Model/StoreItemHeader.cs
index 51daccf0..a45d5cba 100644
--- a/src/Flipdish/Model/StoreItemHeader.cs
+++ b/src/Flipdish/Model/StoreItemHeader.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// StoreItemHeader
     /// </summary>
     [DataContract]
-    public partial class StoreItemHeader :  IEquatable<StoreItemHeader>, IValidatableObject
+    public partial class StoreItemHeader :  IEquatable<StoreItemHeader>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreItemHeader" /> class.
@@ -125,16 +123,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreKioskSetting.cs b/src/Flipdish/Model/StoreKioskSetting.cs
index ae64ec95..021942a9 100644
--- a/src/Flipdish/Model/StoreKioskSetting.cs
+++ b/src/Flipdish/Model/StoreKioskSetting.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Kiosk Settings
     /// </summary>
     [DataContract]
-    public partial class StoreKioskSetting :  IEquatable<StoreKioskSetting>, IValidatableObject
+    public partial class StoreKioskSetting :  IEquatable<StoreKioskSetting>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreKioskSetting" /> class.
@@ -246,16 +244,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreKioskSettingModel.cs b/src/Flipdish/Model/StoreKioskSettingModel.cs
deleted file mode 100644
index 0c460c63..00000000
--- a/src/Flipdish/Model/StoreKioskSettingModel.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Store Kiosk Settings
-    /// </summary>
-    [DataContract]
-    public partial class StoreKioskSettingModel :  IEquatable<StoreKioskSettingModel>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreKioskSettingModel" /> class.
-        /// </summary>
-        /// <param name="kioskName">Name of the Kiosk.</param>
-        /// <param name="requireCustomerName">Require customer name flag.</param>
-        /// <param name="requireCustomerPhoneNumber">Require customer phone number flag.</param>
-        /// <param name="requestTableNumber">Request table number flag.</param>
-        /// <param name="offerDineInOrTakeawayOptions">Offer Dine-In/Takeaway option flag.</param>
-        /// <param name="sortOrder">Order in which the Kiosks should be listed.</param>
-        /// <param name="configId">Kiosk (Hydra) config id.</param>
-        /// <param name="storeId">Id of the store (Physical Restaurant).</param>
-        public StoreKioskSettingModel(string kioskName = default(string), bool? requireCustomerName = default(bool?), bool? requireCustomerPhoneNumber = default(bool?), bool? requestTableNumber = default(bool?), bool? offerDineInOrTakeawayOptions = default(bool?), int? sortOrder = default(int?), int? configId = default(int?), int? storeId = default(int?))
-        {
-            this.KioskName = kioskName;
-            this.RequireCustomerName = requireCustomerName;
-            this.RequireCustomerPhoneNumber = requireCustomerPhoneNumber;
-            this.RequestTableNumber = requestTableNumber;
-            this.OfferDineInOrTakeawayOptions = offerDineInOrTakeawayOptions;
-            this.SortOrder = sortOrder;
-            this.ConfigId = configId;
-            this.StoreId = storeId;
-        }
-        
-        /// <summary>
-        /// Name of the Kiosk
-        /// </summary>
-        /// <value>Name of the Kiosk</value>
-        [DataMember(Name="KioskName", EmitDefaultValue=false)]
-        public string KioskName { get; set; }
-
-        /// <summary>
-        /// Require customer name flag
-        /// </summary>
-        /// <value>Require customer name flag</value>
-        [DataMember(Name="RequireCustomerName", EmitDefaultValue=false)]
-        public bool? RequireCustomerName { get; set; }
-
-        /// <summary>
-        /// Require customer phone number flag
-        /// </summary>
-        /// <value>Require customer phone number flag</value>
-        [DataMember(Name="RequireCustomerPhoneNumber", EmitDefaultValue=false)]
-        public bool? RequireCustomerPhoneNumber { get; set; }
-
-        /// <summary>
-        /// Request table number flag
-        /// </summary>
-        /// <value>Request table number flag</value>
-        [DataMember(Name="RequestTableNumber", EmitDefaultValue=false)]
-        public bool? RequestTableNumber { get; set; }
-
-        /// <summary>
-        /// Offer Dine-In/Takeaway option flag
-        /// </summary>
-        /// <value>Offer Dine-In/Takeaway option flag</value>
-        [DataMember(Name="OfferDineInOrTakeawayOptions", EmitDefaultValue=false)]
-        public bool? OfferDineInOrTakeawayOptions { get; set; }
-
-        /// <summary>
-        /// Order in which the Kiosks should be listed
-        /// </summary>
-        /// <value>Order in which the Kiosks should be listed</value>
-        [DataMember(Name="SortOrder", EmitDefaultValue=false)]
-        public int? SortOrder { get; set; }
-
-        /// <summary>
-        /// Kiosk (Hydra) config id
-        /// </summary>
-        /// <value>Kiosk (Hydra) config id</value>
-        [DataMember(Name="ConfigId", EmitDefaultValue=false)]
-        public int? ConfigId { get; set; }
-
-        /// <summary>
-        /// Id of the store (Physical Restaurant)
-        /// </summary>
-        /// <value>Id of the store (Physical Restaurant)</value>
-        [DataMember(Name="StoreId", EmitDefaultValue=false)]
-        public int? StoreId { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class StoreKioskSettingModel {\n");
-            sb.Append("  KioskName: ").Append(KioskName).Append("\n");
-            sb.Append("  RequireCustomerName: ").Append(RequireCustomerName).Append("\n");
-            sb.Append("  RequireCustomerPhoneNumber: ").Append(RequireCustomerPhoneNumber).Append("\n");
-            sb.Append("  RequestTableNumber: ").Append(RequestTableNumber).Append("\n");
-            sb.Append("  OfferDineInOrTakeawayOptions: ").Append(OfferDineInOrTakeawayOptions).Append("\n");
-            sb.Append("  SortOrder: ").Append(SortOrder).Append("\n");
-            sb.Append("  ConfigId: ").Append(ConfigId).Append("\n");
-            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as StoreKioskSettingModel);
-        }
-
-        /// <summary>
-        /// Returns true if StoreKioskSettingModel instances are equal
-        /// </summary>
-        /// <param name="input">Instance of StoreKioskSettingModel to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(StoreKioskSettingModel input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.KioskName == input.KioskName ||
-                    (this.KioskName != null &&
-                    this.KioskName.Equals(input.KioskName))
-                ) && 
-                (
-                    this.RequireCustomerName == input.RequireCustomerName ||
-                    (this.RequireCustomerName != null &&
-                    this.RequireCustomerName.Equals(input.RequireCustomerName))
-                ) && 
-                (
-                    this.RequireCustomerPhoneNumber == input.RequireCustomerPhoneNumber ||
-                    (this.RequireCustomerPhoneNumber != null &&
-                    this.RequireCustomerPhoneNumber.Equals(input.RequireCustomerPhoneNumber))
-                ) && 
-                (
-                    this.RequestTableNumber == input.RequestTableNumber ||
-                    (this.RequestTableNumber != null &&
-                    this.RequestTableNumber.Equals(input.RequestTableNumber))
-                ) && 
-                (
-                    this.OfferDineInOrTakeawayOptions == input.OfferDineInOrTakeawayOptions ||
-                    (this.OfferDineInOrTakeawayOptions != null &&
-                    this.OfferDineInOrTakeawayOptions.Equals(input.OfferDineInOrTakeawayOptions))
-                ) && 
-                (
-                    this.SortOrder == input.SortOrder ||
-                    (this.SortOrder != null &&
-                    this.SortOrder.Equals(input.SortOrder))
-                ) && 
-                (
-                    this.ConfigId == input.ConfigId ||
-                    (this.ConfigId != null &&
-                    this.ConfigId.Equals(input.ConfigId))
-                ) && 
-                (
-                    this.StoreId == input.StoreId ||
-                    (this.StoreId != null &&
-                    this.StoreId.Equals(input.StoreId))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.KioskName != null)
-                    hashCode = hashCode * 59 + this.KioskName.GetHashCode();
-                if (this.RequireCustomerName != null)
-                    hashCode = hashCode * 59 + this.RequireCustomerName.GetHashCode();
-                if (this.RequireCustomerPhoneNumber != null)
-                    hashCode = hashCode * 59 + this.RequireCustomerPhoneNumber.GetHashCode();
-                if (this.RequestTableNumber != null)
-                    hashCode = hashCode * 59 + this.RequestTableNumber.GetHashCode();
-                if (this.OfferDineInOrTakeawayOptions != null)
-                    hashCode = hashCode * 59 + this.OfferDineInOrTakeawayOptions.GetHashCode();
-                if (this.SortOrder != null)
-                    hashCode = hashCode * 59 + this.SortOrder.GetHashCode();
-                if (this.ConfigId != null)
-                    hashCode = hashCode * 59 + this.ConfigId.GetHashCode();
-                if (this.StoreId != null)
-                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/StoreKioskSettingUpdatedEvent.cs b/src/Flipdish/Model/StoreKioskSettingUpdatedEvent.cs
index b39cd6fb..ed631aea 100644
--- a/src/Flipdish/Model/StoreKioskSettingUpdatedEvent.cs
+++ b/src/Flipdish/Model/StoreKioskSettingUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store kiosk setting updated
     /// </summary>
     [DataContract]
-    public partial class StoreKioskSettingUpdatedEvent :  IEquatable<StoreKioskSettingUpdatedEvent>, IValidatableObject
+    public partial class StoreKioskSettingUpdatedEvent :  IEquatable<StoreKioskSettingUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreKioskSettingUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreKioskSettingUpdatedEvent :  IEquatable<StoreKioskSetti
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreKioskSettingUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreKioskSetting storeKioskSetting = default(StoreKioskSetting), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreKioskSettingUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreKioskSetting storeKioskSetting = default(StoreKioskSetting), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StoreKioskSettingUpdatedEvent :  IEquatable<StoreKioskSetti
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class StoreKioskSettingUpdatedEvent :  IEquatable<StoreKioskSetti
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class StoreKioskSettingUpdatedEvent :  IEquatable<StoreKioskSetti
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(StoreKioskSettingUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreKioskSettings.cs b/src/Flipdish/Model/StoreKioskSettings.cs
deleted file mode 100644
index 5dcb20d9..00000000
--- a/src/Flipdish/Model/StoreKioskSettings.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Store Kiosk Settings
-    /// </summary>
-    [DataContract]
-    public partial class StoreKioskSettings :  IEquatable<StoreKioskSettings>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreKioskSettings" /> class.
-        /// </summary>
-        /// <param name="kioskStoreSettings">List of Store Kiosk Settings.</param>
-        /// <param name="storeLogoUrl">Store Logo Url.</param>
-        public StoreKioskSettings(List<StoreKioskSettingModel> kioskStoreSettings = default(List<StoreKioskSettingModel>), string storeLogoUrl = default(string))
-        {
-            this.KioskStoreSettings = kioskStoreSettings;
-            this.StoreLogoUrl = storeLogoUrl;
-        }
-        
-        /// <summary>
-        /// List of Store Kiosk Settings
-        /// </summary>
-        /// <value>List of Store Kiosk Settings</value>
-        [DataMember(Name="KioskStoreSettings", EmitDefaultValue=false)]
-        public List<StoreKioskSettingModel> KioskStoreSettings { get; set; }
-
-        /// <summary>
-        /// Store Logo Url
-        /// </summary>
-        /// <value>Store Logo Url</value>
-        [DataMember(Name="StoreLogoUrl", EmitDefaultValue=false)]
-        public string StoreLogoUrl { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class StoreKioskSettings {\n");
-            sb.Append("  KioskStoreSettings: ").Append(KioskStoreSettings).Append("\n");
-            sb.Append("  StoreLogoUrl: ").Append(StoreLogoUrl).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as StoreKioskSettings);
-        }
-
-        /// <summary>
-        /// Returns true if StoreKioskSettings instances are equal
-        /// </summary>
-        /// <param name="input">Instance of StoreKioskSettings to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(StoreKioskSettings input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.KioskStoreSettings == input.KioskStoreSettings ||
-                    this.KioskStoreSettings != null &&
-                    this.KioskStoreSettings.SequenceEqual(input.KioskStoreSettings)
-                ) && 
-                (
-                    this.StoreLogoUrl == input.StoreLogoUrl ||
-                    (this.StoreLogoUrl != null &&
-                    this.StoreLogoUrl.Equals(input.StoreLogoUrl))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.KioskStoreSettings != null)
-                    hashCode = hashCode * 59 + this.KioskStoreSettings.GetHashCode();
-                if (this.StoreLogoUrl != null)
-                    hashCode = hashCode * 59 + this.StoreLogoUrl.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/StoreListItem.cs b/src/Flipdish/Model/StoreListItem.cs
index 2166cf47..fbecff80 100644
--- a/src/Flipdish/Model/StoreListItem.cs
+++ b/src/Flipdish/Model/StoreListItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store id and name
     /// </summary>
     [DataContract]
-    public partial class StoreListItem :  IEquatable<StoreListItem>, IValidatableObject
+    public partial class StoreListItem :  IEquatable<StoreListItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreListItem" /> class.
@@ -212,16 +210,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreLogoCreatedEvent.cs b/src/Flipdish/Model/StoreLogoCreatedEvent.cs
index a94b6214..367cb464 100644
--- a/src/Flipdish/Model/StoreLogoCreatedEvent.cs
+++ b/src/Flipdish/Model/StoreLogoCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,13 +26,15 @@ namespace Flipdish.Model
     /// Store logo created
     /// </summary>
     [DataContract]
-    public partial class StoreLogoCreatedEvent :  IEquatable<StoreLogoCreatedEvent>, IValidatableObject
+    public partial class StoreLogoCreatedEvent :  IEquatable<StoreLogoCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreLogoCreatedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="storeId">ID of store that the logo has been added to.</param>
+        /// <param name="logoUrl">Url of logo.</param>
         /// <param name="description">Description.</param>
         /// <param name="user">User who added the logo.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
@@ -42,10 +42,14 @@ public partial class StoreLogoCreatedEvent :  IEquatable<StoreLogoCreatedEvent>,
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreLogoCreatedEvent(string eventName = default(string), int? storeId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreLogoCreatedEvent(string eventName = default(string), string orgId = default(string), int? storeId = default(int?), string logoUrl = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.StoreId = storeId;
+            this.LogoUrl = logoUrl;
             this.Description = description;
             this.User = user;
             this.FlipdishEventId = flipdishEventId;
@@ -53,6 +57,8 @@ public partial class StoreLogoCreatedEvent :  IEquatable<StoreLogoCreatedEvent>,
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -62,6 +68,13 @@ public partial class StoreLogoCreatedEvent :  IEquatable<StoreLogoCreatedEvent>,
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// ID of store that the logo has been added to
         /// </summary>
@@ -69,6 +82,13 @@ public partial class StoreLogoCreatedEvent :  IEquatable<StoreLogoCreatedEvent>,
         [DataMember(Name="StoreId", EmitDefaultValue=false)]
         public int? StoreId { get; set; }
 
+        /// <summary>
+        /// Url of logo
+        /// </summary>
+        /// <value>Url of logo</value>
+        [DataMember(Name="LogoUrl", EmitDefaultValue=false)]
+        public string LogoUrl { get; set; }
+
         /// <summary>
         /// Description
         /// </summary>
@@ -118,6 +138,20 @@ public partial class StoreLogoCreatedEvent :  IEquatable<StoreLogoCreatedEvent>,
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -127,7 +161,9 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class StoreLogoCreatedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  LogoUrl: ").Append(LogoUrl).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
@@ -135,6 +171,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,11 +212,21 @@ public bool Equals(StoreLogoCreatedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.StoreId == input.StoreId ||
                     (this.StoreId != null &&
                     this.StoreId.Equals(input.StoreId))
                 ) && 
+                (
+                    this.LogoUrl == input.LogoUrl ||
+                    (this.LogoUrl != null &&
+                    this.LogoUrl.Equals(input.LogoUrl))
+                ) && 
                 (
                     this.Description == input.Description ||
                     (this.Description != null &&
@@ -213,6 +261,16 @@ public bool Equals(StoreLogoCreatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -227,8 +285,12 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.StoreId != null)
                     hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.LogoUrl != null)
+                    hashCode = hashCode * 59 + this.LogoUrl.GetHashCode();
                 if (this.Description != null)
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
                 if (this.User != null)
@@ -243,19 +305,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreLogoDeletedEvent.cs b/src/Flipdish/Model/StoreLogoDeletedEvent.cs
index 07cd19de..0a117b78 100644
--- a/src/Flipdish/Model/StoreLogoDeletedEvent.cs
+++ b/src/Flipdish/Model/StoreLogoDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,13 @@ namespace Flipdish.Model
     /// Store logo deleted
     /// </summary>
     [DataContract]
-    public partial class StoreLogoDeletedEvent :  IEquatable<StoreLogoDeletedEvent>, IValidatableObject
+    public partial class StoreLogoDeletedEvent :  IEquatable<StoreLogoDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreLogoDeletedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="storeId">ID of store that the logo has been added to.</param>
         /// <param name="description">Description.</param>
         /// <param name="user">User who removed the logo.</param>
@@ -42,9 +41,12 @@ public partial class StoreLogoDeletedEvent :  IEquatable<StoreLogoDeletedEvent>,
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreLogoDeletedEvent(string eventName = default(string), int? storeId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreLogoDeletedEvent(string eventName = default(string), string orgId = default(string), int? storeId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.StoreId = storeId;
             this.Description = description;
             this.User = user;
@@ -53,6 +55,8 @@ public partial class StoreLogoDeletedEvent :  IEquatable<StoreLogoDeletedEvent>,
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -62,6 +66,13 @@ public partial class StoreLogoDeletedEvent :  IEquatable<StoreLogoDeletedEvent>,
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// ID of store that the logo has been added to
         /// </summary>
@@ -118,6 +129,20 @@ public partial class StoreLogoDeletedEvent :  IEquatable<StoreLogoDeletedEvent>,
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -127,6 +152,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class StoreLogoDeletedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
@@ -135,6 +161,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,6 +202,11 @@ public bool Equals(StoreLogoDeletedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.StoreId == input.StoreId ||
                     (this.StoreId != null &&
@@ -213,6 +246,16 @@ public bool Equals(StoreLogoDeletedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -227,6 +270,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.StoreId != null)
                     hashCode = hashCode * 59 + this.StoreId.GetHashCode();
                 if (this.Description != null)
@@ -243,19 +288,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreLogoUpdatedEvent.cs b/src/Flipdish/Model/StoreLogoUpdatedEvent.cs
index 89af959b..b0edf441 100644
--- a/src/Flipdish/Model/StoreLogoUpdatedEvent.cs
+++ b/src/Flipdish/Model/StoreLogoUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,13 +26,15 @@ namespace Flipdish.Model
     /// Store logo updated
     /// </summary>
     [DataContract]
-    public partial class StoreLogoUpdatedEvent :  IEquatable<StoreLogoUpdatedEvent>, IValidatableObject
+    public partial class StoreLogoUpdatedEvent :  IEquatable<StoreLogoUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreLogoUpdatedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="storeId">ID of store that the logo has been added to.</param>
+        /// <param name="logoUrl">Url of logo.</param>
         /// <param name="description">Description.</param>
         /// <param name="user">User who updated the logo.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
@@ -42,10 +42,14 @@ public partial class StoreLogoUpdatedEvent :  IEquatable<StoreLogoUpdatedEvent>,
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreLogoUpdatedEvent(string eventName = default(string), int? storeId = default(int?), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreLogoUpdatedEvent(string eventName = default(string), string orgId = default(string), int? storeId = default(int?), string logoUrl = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.StoreId = storeId;
+            this.LogoUrl = logoUrl;
             this.Description = description;
             this.User = user;
             this.FlipdishEventId = flipdishEventId;
@@ -53,6 +57,8 @@ public partial class StoreLogoUpdatedEvent :  IEquatable<StoreLogoUpdatedEvent>,
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -62,6 +68,13 @@ public partial class StoreLogoUpdatedEvent :  IEquatable<StoreLogoUpdatedEvent>,
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// ID of store that the logo has been added to
         /// </summary>
@@ -69,6 +82,13 @@ public partial class StoreLogoUpdatedEvent :  IEquatable<StoreLogoUpdatedEvent>,
         [DataMember(Name="StoreId", EmitDefaultValue=false)]
         public int? StoreId { get; set; }
 
+        /// <summary>
+        /// Url of logo
+        /// </summary>
+        /// <value>Url of logo</value>
+        [DataMember(Name="LogoUrl", EmitDefaultValue=false)]
+        public string LogoUrl { get; set; }
+
         /// <summary>
         /// Description
         /// </summary>
@@ -118,6 +138,20 @@ public partial class StoreLogoUpdatedEvent :  IEquatable<StoreLogoUpdatedEvent>,
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -127,7 +161,9 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class StoreLogoUpdatedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  LogoUrl: ").Append(LogoUrl).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
@@ -135,6 +171,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -174,11 +212,21 @@ public bool Equals(StoreLogoUpdatedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.StoreId == input.StoreId ||
                     (this.StoreId != null &&
                     this.StoreId.Equals(input.StoreId))
                 ) && 
+                (
+                    this.LogoUrl == input.LogoUrl ||
+                    (this.LogoUrl != null &&
+                    this.LogoUrl.Equals(input.LogoUrl))
+                ) && 
                 (
                     this.Description == input.Description ||
                     (this.Description != null &&
@@ -213,6 +261,16 @@ public bool Equals(StoreLogoUpdatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -227,8 +285,12 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.StoreId != null)
                     hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.LogoUrl != null)
+                    hashCode = hashCode * 59 + this.LogoUrl.GetHashCode();
                 if (this.Description != null)
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
                 if (this.User != null)
@@ -243,19 +305,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreMenuAssignedEvent.cs b/src/Flipdish/Model/StoreMenuAssignedEvent.cs
index 3ae24e43..7e5f340e 100644
--- a/src/Flipdish/Model/StoreMenuAssignedEvent.cs
+++ b/src/Flipdish/Model/StoreMenuAssignedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Menu Assigned To Store Event
     /// </summary>
     [DataContract]
-    public partial class StoreMenuAssignedEvent :  IEquatable<StoreMenuAssignedEvent>, IValidatableObject
+    public partial class StoreMenuAssignedEvent :  IEquatable<StoreMenuAssignedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreMenuAssignedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreMenuAssignedEvent :  IEquatable<StoreMenuAssignedEvent
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreMenuAssignedEvent(string eventName = default(string), int? storeId = default(int?), int? menuId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreMenuAssignedEvent(string eventName = default(string), int? storeId = default(int?), int? menuId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StoreMenuAssignedEvent :  IEquatable<StoreMenuAssignedEvent
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class StoreMenuAssignedEvent :  IEquatable<StoreMenuAssignedEvent
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class StoreMenuAssignedEvent :  IEquatable<StoreMenuAssignedEvent
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(StoreMenuAssignedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreNote.cs b/src/Flipdish/Model/StoreNote.cs
index b9e9cce5..30961849 100644
--- a/src/Flipdish/Model/StoreNote.cs
+++ b/src/Flipdish/Model/StoreNote.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store note
     /// </summary>
     [DataContract]
-    public partial class StoreNote :  IEquatable<StoreNote>, IValidatableObject
+    public partial class StoreNote :  IEquatable<StoreNote>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreNote" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreOpeningHoursUpdatedEvent.cs b/src/Flipdish/Model/StoreOpeningHoursUpdatedEvent.cs
index d3e31c83..b520613f 100644
--- a/src/Flipdish/Model/StoreOpeningHoursUpdatedEvent.cs
+++ b/src/Flipdish/Model/StoreOpeningHoursUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Opening Hours Updated Event
     /// </summary>
     [DataContract]
-    public partial class StoreOpeningHoursUpdatedEvent :  IEquatable<StoreOpeningHoursUpdatedEvent>, IValidatableObject
+    public partial class StoreOpeningHoursUpdatedEvent :  IEquatable<StoreOpeningHoursUpdatedEvent>
     {
         /// <summary>
         /// Type of opening hours Delivery / Pickup
@@ -58,13 +56,42 @@ public enum DeliveryTypeEnum
         [DataMember(Name="DeliveryType", EmitDefaultValue=false)]
         public DeliveryTypeEnum? DeliveryType { get; set; }
         /// <summary>
+        /// Type of opening hours Delivery / Pickup as a string
+        /// </summary>
+        /// <value>Type of opening hours Delivery / Pickup as a string</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum DeliveryTypeStringEnum
+        {
+            
+            /// <summary>
+            /// Enum Delivery for value: Delivery
+            /// </summary>
+            [EnumMember(Value = "Delivery")]
+            Delivery = 1,
+            
+            /// <summary>
+            /// Enum Pickup for value: Pickup
+            /// </summary>
+            [EnumMember(Value = "Pickup")]
+            Pickup = 2
+        }
+
+        /// <summary>
+        /// Type of opening hours Delivery / Pickup as a string
+        /// </summary>
+        /// <value>Type of opening hours Delivery / Pickup as a string</value>
+        [DataMember(Name="DeliveryTypeString", EmitDefaultValue=false)]
+        public DeliveryTypeStringEnum? DeliveryTypeString { get; set; }
+        /// <summary>
         /// Initializes a new instance of the <see cref="StoreOpeningHoursUpdatedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="storeId">Store Id.</param>
         /// <param name="storeGroupId">Store group Id.</param>
         /// <param name="user">User which updated opening hours for this store.</param>
         /// <param name="deliveryType">Type of opening hours Delivery / Pickup.</param>
+        /// <param name="deliveryTypeString">Type of opening hours Delivery / Pickup as a string.</param>
         /// <param name="businessHoursPeriodOld">The period that was updated.</param>
         /// <param name="businessHoursPeriod">The new values of the period.</param>
         /// <param name="description">Description.</param>
@@ -73,13 +100,17 @@ public enum DeliveryTypeEnum
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreOpeningHoursUpdatedEvent(string eventName = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), DeliveryTypeEnum? deliveryType = default(DeliveryTypeEnum?), BusinessHoursPeriod businessHoursPeriodOld = default(BusinessHoursPeriod), BusinessHoursPeriod businessHoursPeriod = default(BusinessHoursPeriod), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreOpeningHoursUpdatedEvent(string eventName = default(string), string orgId = default(string), int? storeId = default(int?), int? storeGroupId = default(int?), UserEventInfo user = default(UserEventInfo), DeliveryTypeEnum? deliveryType = default(DeliveryTypeEnum?), DeliveryTypeStringEnum? deliveryTypeString = default(DeliveryTypeStringEnum?), BusinessHoursPeriod businessHoursPeriodOld = default(BusinessHoursPeriod), BusinessHoursPeriod businessHoursPeriod = default(BusinessHoursPeriod), string description = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.StoreId = storeId;
             this.StoreGroupId = storeGroupId;
             this.User = user;
             this.DeliveryType = deliveryType;
+            this.DeliveryTypeString = deliveryTypeString;
             this.BusinessHoursPeriodOld = businessHoursPeriodOld;
             this.BusinessHoursPeriod = businessHoursPeriod;
             this.Description = description;
@@ -88,6 +119,8 @@ public enum DeliveryTypeEnum
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -97,6 +130,13 @@ public enum DeliveryTypeEnum
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Store Id
         /// </summary>
@@ -119,6 +159,7 @@ public enum DeliveryTypeEnum
         public UserEventInfo User { get; set; }
 
 
+
         /// <summary>
         /// The period that was updated
         /// </summary>
@@ -175,6 +216,20 @@ public enum DeliveryTypeEnum
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -184,10 +239,12 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class StoreOpeningHoursUpdatedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
             sb.Append("  StoreGroupId: ").Append(StoreGroupId).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  DeliveryType: ").Append(DeliveryType).Append("\n");
+            sb.Append("  DeliveryTypeString: ").Append(DeliveryTypeString).Append("\n");
             sb.Append("  BusinessHoursPeriodOld: ").Append(BusinessHoursPeriodOld).Append("\n");
             sb.Append("  BusinessHoursPeriod: ").Append(BusinessHoursPeriod).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
@@ -196,6 +253,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -235,6 +294,11 @@ public bool Equals(StoreOpeningHoursUpdatedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.StoreId == input.StoreId ||
                     (this.StoreId != null &&
@@ -255,6 +319,11 @@ public bool Equals(StoreOpeningHoursUpdatedEvent input)
                     (this.DeliveryType != null &&
                     this.DeliveryType.Equals(input.DeliveryType))
                 ) && 
+                (
+                    this.DeliveryTypeString == input.DeliveryTypeString ||
+                    (this.DeliveryTypeString != null &&
+                    this.DeliveryTypeString.Equals(input.DeliveryTypeString))
+                ) && 
                 (
                     this.BusinessHoursPeriodOld == input.BusinessHoursPeriodOld ||
                     (this.BusinessHoursPeriodOld != null &&
@@ -294,6 +363,16 @@ public bool Equals(StoreOpeningHoursUpdatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -308,6 +387,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.StoreId != null)
                     hashCode = hashCode * 59 + this.StoreId.GetHashCode();
                 if (this.StoreGroupId != null)
@@ -316,6 +397,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.DeliveryType != null)
                     hashCode = hashCode * 59 + this.DeliveryType.GetHashCode();
+                if (this.DeliveryTypeString != null)
+                    hashCode = hashCode * 59 + this.DeliveryTypeString.GetHashCode();
                 if (this.BusinessHoursPeriodOld != null)
                     hashCode = hashCode * 59 + this.BusinessHoursPeriodOld.GetHashCode();
                 if (this.BusinessHoursPeriod != null)
@@ -332,19 +415,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreOrderCapacityConfig.cs b/src/Flipdish/Model/StoreOrderCapacityConfig.cs
index 878776a6..5e248371 100644
--- a/src/Flipdish/Model/StoreOrderCapacityConfig.cs
+++ b/src/Flipdish/Model/StoreOrderCapacityConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents one store&#39;s order capacity configuration
     /// </summary>
     [DataContract]
-    public partial class StoreOrderCapacityConfig :  IEquatable<StoreOrderCapacityConfig>, IValidatableObject
+    public partial class StoreOrderCapacityConfig :  IEquatable<StoreOrderCapacityConfig>
     {
         /// <summary>
         /// Signifies whether the order capacity configuration is for Delivery / Pickup
@@ -182,16 +180,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreOrderCapacityConfigEditModel.cs b/src/Flipdish/Model/StoreOrderCapacityConfigEditModel.cs
index a1c2d024..b9a1d73f 100644
--- a/src/Flipdish/Model/StoreOrderCapacityConfigEditModel.cs
+++ b/src/Flipdish/Model/StoreOrderCapacityConfigEditModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents one store&#39;s order capacity configuration edit
     /// </summary>
     [DataContract]
-    public partial class StoreOrderCapacityConfigEditModel :  IEquatable<StoreOrderCapacityConfigEditModel>, IValidatableObject
+    public partial class StoreOrderCapacityConfigEditModel :  IEquatable<StoreOrderCapacityConfigEditModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreOrderCapacityConfigEditModel" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreOrderCapacityPeriod.cs b/src/Flipdish/Model/StoreOrderCapacityPeriod.cs
index b6a1e46a..6b41691d 100644
--- a/src/Flipdish/Model/StoreOrderCapacityPeriod.cs
+++ b/src/Flipdish/Model/StoreOrderCapacityPeriod.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a single order capacity period
     /// </summary>
     [DataContract]
-    public partial class StoreOrderCapacityPeriod :  IEquatable<StoreOrderCapacityPeriod>, IValidatableObject
+    public partial class StoreOrderCapacityPeriod :  IEquatable<StoreOrderCapacityPeriod>
     {
         /// <summary>
         /// Day of the week the period pertains to
@@ -246,16 +244,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreOrderCapacityUpdatedEvent.cs b/src/Flipdish/Model/StoreOrderCapacityUpdatedEvent.cs
deleted file mode 100644
index 91dbc4c8..00000000
--- a/src/Flipdish/Model/StoreOrderCapacityUpdatedEvent.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Store&#39;s Order Capacity Configuration Updated
-    /// </summary>
-    [DataContract]
-    public partial class StoreOrderCapacityUpdatedEvent :  IEquatable<StoreOrderCapacityUpdatedEvent>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StoreOrderCapacityUpdatedEvent" /> class.
-        /// </summary>
-        /// <param name="eventName">The event name.</param>
-        /// <param name="storeId">Id of the store whose order capacity configuration has been updated.</param>
-        /// <param name="user">User which updated order capacity configuration for this store.</param>
-        /// <param name="description">Description.</param>
-        /// <param name="orderCapacityConfig">Updated order capacity configuration.</param>
-        /// <param name="flipdishEventId">The identitfier of the event.</param>
-        /// <param name="createTime">The time of creation of the event.</param>
-        /// <param name="position">Position.</param>
-        /// <param name="appId">App id.</param>
-        public StoreOrderCapacityUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), StoreOrderCapacityConfigEditModel orderCapacityConfig = default(StoreOrderCapacityConfigEditModel), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string))
-        {
-            this.EventName = eventName;
-            this.StoreId = storeId;
-            this.User = user;
-            this.Description = description;
-            this.OrderCapacityConfig = orderCapacityConfig;
-            this.FlipdishEventId = flipdishEventId;
-            this.CreateTime = createTime;
-            this.Position = position;
-            this.AppId = appId;
-        }
-        
-        /// <summary>
-        /// The event name
-        /// </summary>
-        /// <value>The event name</value>
-        [DataMember(Name="EventName", EmitDefaultValue=false)]
-        public string EventName { get; set; }
-
-        /// <summary>
-        /// Id of the store whose order capacity configuration has been updated
-        /// </summary>
-        /// <value>Id of the store whose order capacity configuration has been updated</value>
-        [DataMember(Name="StoreId", EmitDefaultValue=false)]
-        public int? StoreId { get; set; }
-
-        /// <summary>
-        /// User which updated order capacity configuration for this store
-        /// </summary>
-        /// <value>User which updated order capacity configuration for this store</value>
-        [DataMember(Name="User", EmitDefaultValue=false)]
-        public UserEventInfo User { get; set; }
-
-        /// <summary>
-        /// Description
-        /// </summary>
-        /// <value>Description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Updated order capacity configuration
-        /// </summary>
-        /// <value>Updated order capacity configuration</value>
-        [DataMember(Name="OrderCapacityConfig", EmitDefaultValue=false)]
-        public StoreOrderCapacityConfigEditModel OrderCapacityConfig { get; set; }
-
-        /// <summary>
-        /// The identitfier of the event
-        /// </summary>
-        /// <value>The identitfier of the event</value>
-        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
-        public Guid? FlipdishEventId { get; set; }
-
-        /// <summary>
-        /// The time of creation of the event
-        /// </summary>
-        /// <value>The time of creation of the event</value>
-        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
-        public DateTime? CreateTime { get; set; }
-
-        /// <summary>
-        /// Position
-        /// </summary>
-        /// <value>Position</value>
-        [DataMember(Name="Position", EmitDefaultValue=false)]
-        public int? Position { get; set; }
-
-        /// <summary>
-        /// App id
-        /// </summary>
-        /// <value>App id</value>
-        [DataMember(Name="AppId", EmitDefaultValue=false)]
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class StoreOrderCapacityUpdatedEvent {\n");
-            sb.Append("  EventName: ").Append(EventName).Append("\n");
-            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
-            sb.Append("  User: ").Append(User).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  OrderCapacityConfig: ").Append(OrderCapacityConfig).Append("\n");
-            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
-            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
-            sb.Append("  Position: ").Append(Position).Append("\n");
-            sb.Append("  AppId: ").Append(AppId).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as StoreOrderCapacityUpdatedEvent);
-        }
-
-        /// <summary>
-        /// Returns true if StoreOrderCapacityUpdatedEvent instances are equal
-        /// </summary>
-        /// <param name="input">Instance of StoreOrderCapacityUpdatedEvent to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(StoreOrderCapacityUpdatedEvent input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.EventName == input.EventName ||
-                    (this.EventName != null &&
-                    this.EventName.Equals(input.EventName))
-                ) && 
-                (
-                    this.StoreId == input.StoreId ||
-                    (this.StoreId != null &&
-                    this.StoreId.Equals(input.StoreId))
-                ) && 
-                (
-                    this.User == input.User ||
-                    (this.User != null &&
-                    this.User.Equals(input.User))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.OrderCapacityConfig == input.OrderCapacityConfig ||
-                    (this.OrderCapacityConfig != null &&
-                    this.OrderCapacityConfig.Equals(input.OrderCapacityConfig))
-                ) && 
-                (
-                    this.FlipdishEventId == input.FlipdishEventId ||
-                    (this.FlipdishEventId != null &&
-                    this.FlipdishEventId.Equals(input.FlipdishEventId))
-                ) && 
-                (
-                    this.CreateTime == input.CreateTime ||
-                    (this.CreateTime != null &&
-                    this.CreateTime.Equals(input.CreateTime))
-                ) && 
-                (
-                    this.Position == input.Position ||
-                    (this.Position != null &&
-                    this.Position.Equals(input.Position))
-                ) && 
-                (
-                    this.AppId == input.AppId ||
-                    (this.AppId != null &&
-                    this.AppId.Equals(input.AppId))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.EventName != null)
-                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
-                if (this.StoreId != null)
-                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
-                if (this.User != null)
-                    hashCode = hashCode * 59 + this.User.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.OrderCapacityConfig != null)
-                    hashCode = hashCode * 59 + this.OrderCapacityConfig.GetHashCode();
-                if (this.FlipdishEventId != null)
-                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
-                if (this.CreateTime != null)
-                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
-                if (this.Position != null)
-                    hashCode = hashCode * 59 + this.Position.GetHashCode();
-                if (this.AppId != null)
-                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/StorePreOrderConfigUpdatedEvent.cs b/src/Flipdish/Model/StorePreOrderConfigUpdatedEvent.cs
index 7bb19871..40558feb 100644
--- a/src/Flipdish/Model/StorePreOrderConfigUpdatedEvent.cs
+++ b/src/Flipdish/Model/StorePreOrderConfigUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Pre order config updated
     /// </summary>
     [DataContract]
-    public partial class StorePreOrderConfigUpdatedEvent :  IEquatable<StorePreOrderConfigUpdatedEvent>, IValidatableObject
+    public partial class StorePreOrderConfigUpdatedEvent :  IEquatable<StorePreOrderConfigUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StorePreOrderConfigUpdatedEvent" /> class.
@@ -43,8 +41,11 @@ public partial class StorePreOrderConfigUpdatedEvent :  IEquatable<StorePreOrder
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StorePreOrderConfigUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), PreOrderConfig preOrderConfig = default(PreOrderConfig), PreOrderConfig oldPreOrderConfig = default(PreOrderConfig), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StorePreOrderConfigUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), PreOrderConfig preOrderConfig = default(PreOrderConfig), PreOrderConfig oldPreOrderConfig = default(PreOrderConfig), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -56,7 +57,10 @@ public partial class StorePreOrderConfigUpdatedEvent :  IEquatable<StorePreOrder
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -129,6 +133,13 @@ public partial class StorePreOrderConfigUpdatedEvent :  IEquatable<StorePreOrder
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -136,6 +147,20 @@ public partial class StorePreOrderConfigUpdatedEvent :  IEquatable<StorePreOrder
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -154,7 +179,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -239,10 +267,25 @@ public bool Equals(StorePreOrderConfigUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -275,21 +318,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StorePublishedEvent.cs b/src/Flipdish/Model/StorePublishedEvent.cs
index b1003673..b19913a1 100644
--- a/src/Flipdish/Model/StorePublishedEvent.cs
+++ b/src/Flipdish/Model/StorePublishedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Published Event
     /// </summary>
     [DataContract]
-    public partial class StorePublishedEvent :  IEquatable<StorePublishedEvent>, IValidatableObject
+    public partial class StorePublishedEvent :  IEquatable<StorePublishedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StorePublishedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StorePublishedEvent :  IEquatable<StorePublishedEvent>, IVa
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StorePublishedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StorePublishedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StorePublishedEvent :  IEquatable<StorePublishedEvent>, IVa
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -127,6 +131,13 @@ public partial class StorePublishedEvent :  IEquatable<StorePublishedEvent>, IVa
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -134,6 +145,20 @@ public partial class StorePublishedEvent :  IEquatable<StorePublishedEvent>, IVa
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -152,7 +177,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -237,10 +265,25 @@ public bool Equals(StorePublishedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -273,21 +316,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreServiceChargeUpdatedEvent.cs b/src/Flipdish/Model/StoreServiceChargeUpdatedEvent.cs
index c5f9d536..bf193cb4 100644
--- a/src/Flipdish/Model/StoreServiceChargeUpdatedEvent.cs
+++ b/src/Flipdish/Model/StoreServiceChargeUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Service Charge Updated Event
     /// </summary>
     [DataContract]
-    public partial class StoreServiceChargeUpdatedEvent :  IEquatable<StoreServiceChargeUpdatedEvent>, IValidatableObject
+    public partial class StoreServiceChargeUpdatedEvent :  IEquatable<StoreServiceChargeUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreServiceChargeUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreServiceChargeUpdatedEvent :  IEquatable<StoreServiceCh
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreServiceChargeUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), ServiceCharge serviceCharge = default(ServiceCharge), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreServiceChargeUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), ServiceCharge serviceCharge = default(ServiceCharge), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StoreServiceChargeUpdatedEvent :  IEquatable<StoreServiceCh
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class StoreServiceChargeUpdatedEvent :  IEquatable<StoreServiceCh
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class StoreServiceChargeUpdatedEvent :  IEquatable<StoreServiceCh
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(StoreServiceChargeUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreStatistics.cs b/src/Flipdish/Model/StoreStatistics.cs
index 35c51ff6..aa0954e5 100644
--- a/src/Flipdish/Model/StoreStatistics.cs
+++ b/src/Flipdish/Model/StoreStatistics.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store statistics
     /// </summary>
     [DataContract]
-    public partial class StoreStatistics :  IEquatable<StoreStatistics>, IValidatableObject
+    public partial class StoreStatistics :  IEquatable<StoreStatistics>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreStatistics" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreSummary.cs b/src/Flipdish/Model/StoreSummary.cs
index 864230ed..4c15282a 100644
--- a/src/Flipdish/Model/StoreSummary.cs
+++ b/src/Flipdish/Model/StoreSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store summary
     /// </summary>
     [DataContract]
-    public partial class StoreSummary :  IEquatable<StoreSummary>, IValidatableObject
+    public partial class StoreSummary :  IEquatable<StoreSummary>
     {
         /// <summary>
         /// Currency which used by the Store
@@ -729,21 +727,33 @@ public enum CurrencyEnum
         /// <param name="id">Store identifier.</param>
         /// <param name="name">Store name.</param>
         /// <param name="menuId">Stores menu identifier.</param>
+        /// <param name="menuPublishId">Stores menu publish GUID.</param>
         /// <param name="metadata">Store metadata.</param>
         /// <param name="currency">Currency which used by the Store.</param>
         /// <param name="coordinates">Latitude and longitude of the store.</param>
         /// <param name="storeTimezone">Timezone of store.</param>
+        /// <param name="storeIanaTimezone">IANA Timezone of store.</param>
         /// <param name="storeGroupId">Store group id of store.</param>
-        public StoreSummary(int? id = default(int?), string name = default(string), int? menuId = default(int?), Dictionary<string, string> metadata = default(Dictionary<string, string>), CurrencyEnum? currency = default(CurrencyEnum?), Coordinates coordinates = default(Coordinates), string storeTimezone = default(string), int? storeGroupId = default(int?))
+        /// <param name="taxId">VAT number or generic Tax ID of the store.</param>
+        /// <param name="prettyAddress">Address of the store.</param>
+        /// <param name="countryCode">Country code of the store address (ISO 3166-1 alpha-2).</param>
+        /// <param name="propertyId">Property identifier.</param>
+        public StoreSummary(int? id = default(int?), string name = default(string), int? menuId = default(int?), Guid? menuPublishId = default(Guid?), Dictionary<string, string> metadata = default(Dictionary<string, string>), CurrencyEnum? currency = default(CurrencyEnum?), Coordinates coordinates = default(Coordinates), string storeTimezone = default(string), string storeIanaTimezone = default(string), int? storeGroupId = default(int?), string taxId = default(string), string prettyAddress = default(string), string countryCode = default(string), string propertyId = default(string))
         {
             this.Id = id;
             this.Name = name;
             this.MenuId = menuId;
+            this.MenuPublishId = menuPublishId;
             this.Metadata = metadata;
             this.Currency = currency;
             this.Coordinates = coordinates;
             this.StoreTimezone = storeTimezone;
+            this.StoreIanaTimezone = storeIanaTimezone;
             this.StoreGroupId = storeGroupId;
+            this.TaxId = taxId;
+            this.PrettyAddress = prettyAddress;
+            this.CountryCode = countryCode;
+            this.PropertyId = propertyId;
         }
         
         /// <summary>
@@ -767,6 +777,13 @@ public enum CurrencyEnum
         [DataMember(Name="MenuId", EmitDefaultValue=false)]
         public int? MenuId { get; set; }
 
+        /// <summary>
+        /// Stores menu publish GUID
+        /// </summary>
+        /// <value>Stores menu publish GUID</value>
+        [DataMember(Name="MenuPublishId", EmitDefaultValue=false)]
+        public Guid? MenuPublishId { get; set; }
+
         /// <summary>
         /// Store metadata
         /// </summary>
@@ -789,6 +806,13 @@ public enum CurrencyEnum
         [DataMember(Name="StoreTimezone", EmitDefaultValue=false)]
         public string StoreTimezone { get; set; }
 
+        /// <summary>
+        /// IANA Timezone of store
+        /// </summary>
+        /// <value>IANA Timezone of store</value>
+        [DataMember(Name="StoreIanaTimezone", EmitDefaultValue=false)]
+        public string StoreIanaTimezone { get; set; }
+
         /// <summary>
         /// Store group id of store
         /// </summary>
@@ -796,6 +820,34 @@ public enum CurrencyEnum
         [DataMember(Name="StoreGroupId", EmitDefaultValue=false)]
         public int? StoreGroupId { get; set; }
 
+        /// <summary>
+        /// VAT number or generic Tax ID of the store
+        /// </summary>
+        /// <value>VAT number or generic Tax ID of the store</value>
+        [DataMember(Name="TaxId", EmitDefaultValue=false)]
+        public string TaxId { get; set; }
+
+        /// <summary>
+        /// Address of the store
+        /// </summary>
+        /// <value>Address of the store</value>
+        [DataMember(Name="PrettyAddress", EmitDefaultValue=false)]
+        public string PrettyAddress { get; set; }
+
+        /// <summary>
+        /// Country code of the store address (ISO 3166-1 alpha-2)
+        /// </summary>
+        /// <value>Country code of the store address (ISO 3166-1 alpha-2)</value>
+        [DataMember(Name="CountryCode", EmitDefaultValue=false)]
+        public string CountryCode { get; set; }
+
+        /// <summary>
+        /// Property identifier
+        /// </summary>
+        /// <value>Property identifier</value>
+        [DataMember(Name="PropertyId", EmitDefaultValue=false)]
+        public string PropertyId { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -807,11 +859,17 @@ public override string ToString()
             sb.Append("  Id: ").Append(Id).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  MenuId: ").Append(MenuId).Append("\n");
+            sb.Append("  MenuPublishId: ").Append(MenuPublishId).Append("\n");
             sb.Append("  Metadata: ").Append(Metadata).Append("\n");
             sb.Append("  Currency: ").Append(Currency).Append("\n");
             sb.Append("  Coordinates: ").Append(Coordinates).Append("\n");
             sb.Append("  StoreTimezone: ").Append(StoreTimezone).Append("\n");
+            sb.Append("  StoreIanaTimezone: ").Append(StoreIanaTimezone).Append("\n");
             sb.Append("  StoreGroupId: ").Append(StoreGroupId).Append("\n");
+            sb.Append("  TaxId: ").Append(TaxId).Append("\n");
+            sb.Append("  PrettyAddress: ").Append(PrettyAddress).Append("\n");
+            sb.Append("  CountryCode: ").Append(CountryCode).Append("\n");
+            sb.Append("  PropertyId: ").Append(PropertyId).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -861,6 +919,11 @@ public bool Equals(StoreSummary input)
                     (this.MenuId != null &&
                     this.MenuId.Equals(input.MenuId))
                 ) && 
+                (
+                    this.MenuPublishId == input.MenuPublishId ||
+                    (this.MenuPublishId != null &&
+                    this.MenuPublishId.Equals(input.MenuPublishId))
+                ) && 
                 (
                     this.Metadata == input.Metadata ||
                     this.Metadata != null &&
@@ -881,10 +944,35 @@ public bool Equals(StoreSummary input)
                     (this.StoreTimezone != null &&
                     this.StoreTimezone.Equals(input.StoreTimezone))
                 ) && 
+                (
+                    this.StoreIanaTimezone == input.StoreIanaTimezone ||
+                    (this.StoreIanaTimezone != null &&
+                    this.StoreIanaTimezone.Equals(input.StoreIanaTimezone))
+                ) && 
                 (
                     this.StoreGroupId == input.StoreGroupId ||
                     (this.StoreGroupId != null &&
                     this.StoreGroupId.Equals(input.StoreGroupId))
+                ) && 
+                (
+                    this.TaxId == input.TaxId ||
+                    (this.TaxId != null &&
+                    this.TaxId.Equals(input.TaxId))
+                ) && 
+                (
+                    this.PrettyAddress == input.PrettyAddress ||
+                    (this.PrettyAddress != null &&
+                    this.PrettyAddress.Equals(input.PrettyAddress))
+                ) && 
+                (
+                    this.CountryCode == input.CountryCode ||
+                    (this.CountryCode != null &&
+                    this.CountryCode.Equals(input.CountryCode))
+                ) && 
+                (
+                    this.PropertyId == input.PropertyId ||
+                    (this.PropertyId != null &&
+                    this.PropertyId.Equals(input.PropertyId))
                 );
         }
 
@@ -903,6 +991,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.MenuId != null)
                     hashCode = hashCode * 59 + this.MenuId.GetHashCode();
+                if (this.MenuPublishId != null)
+                    hashCode = hashCode * 59 + this.MenuPublishId.GetHashCode();
                 if (this.Metadata != null)
                     hashCode = hashCode * 59 + this.Metadata.GetHashCode();
                 if (this.Currency != null)
@@ -911,21 +1001,21 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Coordinates.GetHashCode();
                 if (this.StoreTimezone != null)
                     hashCode = hashCode * 59 + this.StoreTimezone.GetHashCode();
+                if (this.StoreIanaTimezone != null)
+                    hashCode = hashCode * 59 + this.StoreIanaTimezone.GetHashCode();
                 if (this.StoreGroupId != null)
                     hashCode = hashCode * 59 + this.StoreGroupId.GetHashCode();
+                if (this.TaxId != null)
+                    hashCode = hashCode * 59 + this.TaxId.GetHashCode();
+                if (this.PrettyAddress != null)
+                    hashCode = hashCode * 59 + this.PrettyAddress.GetHashCode();
+                if (this.CountryCode != null)
+                    hashCode = hashCode * 59 + this.CountryCode.GetHashCode();
+                if (this.PropertyId != null)
+                    hashCode = hashCode * 59 + this.PropertyId.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreTipUpdatedEvent.cs b/src/Flipdish/Model/StoreTipUpdatedEvent.cs
index f13b907f..33952777 100644
--- a/src/Flipdish/Model/StoreTipUpdatedEvent.cs
+++ b/src/Flipdish/Model/StoreTipUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Tip Updated
     /// </summary>
     [DataContract]
-    public partial class StoreTipUpdatedEvent :  IEquatable<StoreTipUpdatedEvent>, IValidatableObject
+    public partial class StoreTipUpdatedEvent :  IEquatable<StoreTipUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreTipUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreTipUpdatedEvent :  IEquatable<StoreTipUpdatedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreTipUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), UpdateTipConfiguration config = default(UpdateTipConfiguration), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreTipUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), UpdateTipConfiguration config = default(UpdateTipConfiguration), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StoreTipUpdatedEvent :  IEquatable<StoreTipUpdatedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class StoreTipUpdatedEvent :  IEquatable<StoreTipUpdatedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class StoreTipUpdatedEvent :  IEquatable<StoreTipUpdatedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(StoreTipUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreUnarchivedEvent.cs b/src/Flipdish/Model/StoreUnarchivedEvent.cs
index 716d9784..ecff88f5 100644
--- a/src/Flipdish/Model/StoreUnarchivedEvent.cs
+++ b/src/Flipdish/Model/StoreUnarchivedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Unarchived Event
     /// </summary>
     [DataContract]
-    public partial class StoreUnarchivedEvent :  IEquatable<StoreUnarchivedEvent>, IValidatableObject
+    public partial class StoreUnarchivedEvent :  IEquatable<StoreUnarchivedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreUnarchivedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreUnarchivedEvent :  IEquatable<StoreUnarchivedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreUnarchivedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreUnarchivedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StoreUnarchivedEvent :  IEquatable<StoreUnarchivedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -127,6 +131,13 @@ public partial class StoreUnarchivedEvent :  IEquatable<StoreUnarchivedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -134,6 +145,20 @@ public partial class StoreUnarchivedEvent :  IEquatable<StoreUnarchivedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -152,7 +177,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -237,10 +265,25 @@ public bool Equals(StoreUnarchivedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -273,21 +316,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreUnpublishedEvent.cs b/src/Flipdish/Model/StoreUnpublishedEvent.cs
index 39b91279..89bed4cf 100644
--- a/src/Flipdish/Model/StoreUnpublishedEvent.cs
+++ b/src/Flipdish/Model/StoreUnpublishedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Store Unpublished Event
     /// </summary>
     [DataContract]
-    public partial class StoreUnpublishedEvent :  IEquatable<StoreUnpublishedEvent>, IValidatableObject
+    public partial class StoreUnpublishedEvent :  IEquatable<StoreUnpublishedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreUnpublishedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class StoreUnpublishedEvent :  IEquatable<StoreUnpublishedEvent>,
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreUnpublishedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreUnpublishedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.StoreId = storeId;
@@ -54,7 +55,10 @@ public partial class StoreUnpublishedEvent :  IEquatable<StoreUnpublishedEvent>,
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -127,6 +131,13 @@ public partial class StoreUnpublishedEvent :  IEquatable<StoreUnpublishedEvent>,
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -134,6 +145,20 @@ public partial class StoreUnpublishedEvent :  IEquatable<StoreUnpublishedEvent>,
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -152,7 +177,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -237,10 +265,25 @@ public bool Equals(StoreUnpublishedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -273,21 +316,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreUpdatedEvent.cs b/src/Flipdish/Model/StoreUpdatedEvent.cs
index 7eca6071..7198f2ac 100644
--- a/src/Flipdish/Model/StoreUpdatedEvent.cs
+++ b/src/Flipdish/Model/StoreUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,12 +26,13 @@ namespace Flipdish.Model
     /// Store Updated Event
     /// </summary>
     [DataContract]
-    public partial class StoreUpdatedEvent :  IEquatable<StoreUpdatedEvent>, IValidatableObject
+    public partial class StoreUpdatedEvent :  IEquatable<StoreUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreUpdatedEvent" /> class.
         /// </summary>
         /// <param name="eventName">The event name.</param>
+        /// <param name="orgId">Organisation Id.</param>
         /// <param name="storeId">Store Id.</param>
         /// <param name="user">User which updated this store.</param>
         /// <param name="description">Description.</param>
@@ -43,9 +42,12 @@ public partial class StoreUpdatedEvent :  IEquatable<StoreUpdatedEvent>, IValida
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public StoreUpdatedEvent(string eventName = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public StoreUpdatedEvent(string eventName = default(string), string orgId = default(string), int? storeId = default(int?), UserEventInfo user = default(UserEventInfo), string description = default(string), Store store = default(Store), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
+            this.OrgId = orgId;
             this.StoreId = storeId;
             this.User = user;
             this.Description = description;
@@ -55,6 +57,8 @@ public partial class StoreUpdatedEvent :  IEquatable<StoreUpdatedEvent>, IValida
             this.Position = position;
             this.AppId = appId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -64,6 +68,13 @@ public partial class StoreUpdatedEvent :  IEquatable<StoreUpdatedEvent>, IValida
         [DataMember(Name="EventName", EmitDefaultValue=false)]
         public string EventName { get; set; }
 
+        /// <summary>
+        /// Organisation Id
+        /// </summary>
+        /// <value>Organisation Id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Store Id
         /// </summary>
@@ -134,6 +145,20 @@ public partial class StoreUpdatedEvent :  IEquatable<StoreUpdatedEvent>, IValida
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -143,6 +168,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class StoreUpdatedEvent {\n");
             sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  StoreId: ").Append(StoreId).Append("\n");
             sb.Append("  StoreGroupId: ").Append(StoreGroupId).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
@@ -153,6 +179,8 @@ public override string ToString()
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -192,6 +220,11 @@ public bool Equals(StoreUpdatedEvent input)
                     (this.EventName != null &&
                     this.EventName.Equals(input.EventName))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.StoreId == input.StoreId ||
                     (this.StoreId != null &&
@@ -241,6 +274,16 @@ public bool Equals(StoreUpdatedEvent input)
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -255,6 +298,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.EventName != null)
                     hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.StoreId != null)
                     hashCode = hashCode * 59 + this.StoreId.GetHashCode();
                 if (this.StoreGroupId != null)
@@ -275,19 +320,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StoreValidationConfig.cs b/src/Flipdish/Model/StoreValidationConfig.cs
index a24ad989..e0fcda04 100644
--- a/src/Flipdish/Model/StoreValidationConfig.cs
+++ b/src/Flipdish/Model/StoreValidationConfig.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,16 +26,16 @@ namespace Flipdish.Model
     /// Hey
     /// </summary>
     [DataContract]
-    public partial class StoreValidationConfig :  IEquatable<StoreValidationConfig>, IValidatableObject
+    public partial class StoreValidationConfig :  IEquatable<StoreValidationConfig>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StoreValidationConfig" /> class.
         /// </summary>
         /// <param name="storeId">Store identifier.</param>
-        /// <param name="name">name.</param>
+        /// <param name="name">Name.</param>
         /// <param name="isValid">Is Store Valid for Kiosk.</param>
         /// <param name="storeGroupId">Store group Id.</param>
-        /// <param name="configValidation">configValidation.</param>
+        /// <param name="configValidation">Store list of validations.</param>
         public StoreValidationConfig(int? storeId = default(int?), string name = default(string), bool? isValid = default(bool?), int? storeGroupId = default(int?), StoreConfig configValidation = default(StoreConfig))
         {
             this.StoreId = storeId;
@@ -55,8 +53,9 @@ public partial class StoreValidationConfig :  IEquatable<StoreValidationConfig>,
         public int? StoreId { get; set; }
 
         /// <summary>
-        /// Gets or Sets Name
+        /// Name
         /// </summary>
+        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
@@ -75,8 +74,9 @@ public partial class StoreValidationConfig :  IEquatable<StoreValidationConfig>,
         public int? StoreGroupId { get; set; }
 
         /// <summary>
-        /// Gets or Sets ConfigValidation
+        /// Store list of validations
         /// </summary>
+        /// <value>Store list of validations</value>
         [DataMember(Name="ConfigValidation", EmitDefaultValue=false)]
         public StoreConfig ConfigValidation { get; set; }
 
@@ -176,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Stream.cs b/src/Flipdish/Model/Stream.cs
new file mode 100644
index 00000000..affb866f
--- /dev/null
+++ b/src/Flipdish/Model/Stream.cs
@@ -0,0 +1,214 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Stream
+    /// </summary>
+    [DataContract]
+    public partial class Stream :  IEquatable<Stream>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Stream" /> class.
+        /// </summary>
+        /// <param name="position">position.</param>
+        /// <param name="readTimeout">readTimeout.</param>
+        /// <param name="writeTimeout">writeTimeout.</param>
+        public Stream(long? position = default(long?), int? readTimeout = default(int?), int? writeTimeout = default(int?))
+        {
+            this.Position = position;
+            this.ReadTimeout = readTimeout;
+            this.WriteTimeout = writeTimeout;
+        }
+        
+        /// <summary>
+        /// Gets or Sets CanRead
+        /// </summary>
+        [DataMember(Name="CanRead", EmitDefaultValue=false)]
+        public bool? CanRead { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets CanSeek
+        /// </summary>
+        [DataMember(Name="CanSeek", EmitDefaultValue=false)]
+        public bool? CanSeek { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets CanTimeout
+        /// </summary>
+        [DataMember(Name="CanTimeout", EmitDefaultValue=false)]
+        public bool? CanTimeout { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets CanWrite
+        /// </summary>
+        [DataMember(Name="CanWrite", EmitDefaultValue=false)]
+        public bool? CanWrite { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets Length
+        /// </summary>
+        [DataMember(Name="Length", EmitDefaultValue=false)]
+        public long? Length { get; private set; }
+
+        /// <summary>
+        /// Gets or Sets Position
+        /// </summary>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public long? Position { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ReadTimeout
+        /// </summary>
+        [DataMember(Name="ReadTimeout", EmitDefaultValue=false)]
+        public int? ReadTimeout { get; set; }
+
+        /// <summary>
+        /// Gets or Sets WriteTimeout
+        /// </summary>
+        [DataMember(Name="WriteTimeout", EmitDefaultValue=false)]
+        public int? WriteTimeout { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class Stream {\n");
+            sb.Append("  CanRead: ").Append(CanRead).Append("\n");
+            sb.Append("  CanSeek: ").Append(CanSeek).Append("\n");
+            sb.Append("  CanTimeout: ").Append(CanTimeout).Append("\n");
+            sb.Append("  CanWrite: ").Append(CanWrite).Append("\n");
+            sb.Append("  Length: ").Append(Length).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  ReadTimeout: ").Append(ReadTimeout).Append("\n");
+            sb.Append("  WriteTimeout: ").Append(WriteTimeout).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as Stream);
+        }
+
+        /// <summary>
+        /// Returns true if Stream instances are equal
+        /// </summary>
+        /// <param name="input">Instance of Stream to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(Stream input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.CanRead == input.CanRead ||
+                    (this.CanRead != null &&
+                    this.CanRead.Equals(input.CanRead))
+                ) && 
+                (
+                    this.CanSeek == input.CanSeek ||
+                    (this.CanSeek != null &&
+                    this.CanSeek.Equals(input.CanSeek))
+                ) && 
+                (
+                    this.CanTimeout == input.CanTimeout ||
+                    (this.CanTimeout != null &&
+                    this.CanTimeout.Equals(input.CanTimeout))
+                ) && 
+                (
+                    this.CanWrite == input.CanWrite ||
+                    (this.CanWrite != null &&
+                    this.CanWrite.Equals(input.CanWrite))
+                ) && 
+                (
+                    this.Length == input.Length ||
+                    (this.Length != null &&
+                    this.Length.Equals(input.Length))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.ReadTimeout == input.ReadTimeout ||
+                    (this.ReadTimeout != null &&
+                    this.ReadTimeout.Equals(input.ReadTimeout))
+                ) && 
+                (
+                    this.WriteTimeout == input.WriteTimeout ||
+                    (this.WriteTimeout != null &&
+                    this.WriteTimeout.Equals(input.WriteTimeout))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.CanRead != null)
+                    hashCode = hashCode * 59 + this.CanRead.GetHashCode();
+                if (this.CanSeek != null)
+                    hashCode = hashCode * 59 + this.CanSeek.GetHashCode();
+                if (this.CanTimeout != null)
+                    hashCode = hashCode * 59 + this.CanTimeout.GetHashCode();
+                if (this.CanWrite != null)
+                    hashCode = hashCode * 59 + this.CanWrite.GetHashCode();
+                if (this.Length != null)
+                    hashCode = hashCode * 59 + this.Length.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.ReadTimeout != null)
+                    hashCode = hashCode * 59 + this.ReadTimeout.GetHashCode();
+                if (this.WriteTimeout != null)
+                    hashCode = hashCode * 59 + this.WriteTimeout.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/StripeAccountLinkRequest.cs b/src/Flipdish/Model/StripeAccountLinkRequest.cs
index 0ab0880c..123f58ff 100644
--- a/src/Flipdish/Model/StripeAccountLinkRequest.cs
+++ b/src/Flipdish/Model/StripeAccountLinkRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a request for Stripe account link creation
     /// </summary>
     [DataContract]
-    public partial class StripeAccountLinkRequest :  IEquatable<StripeAccountLinkRequest>, IValidatableObject
+    public partial class StripeAccountLinkRequest :  IEquatable<StripeAccountLinkRequest>
     {
         /// <summary>
         /// Which information to collect from users at this stage
@@ -203,16 +201,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StripeConnectedAccount.cs b/src/Flipdish/Model/StripeConnectedAccount.cs
index 3c5adb03..58ef7298 100644
--- a/src/Flipdish/Model/StripeConnectedAccount.cs
+++ b/src/Flipdish/Model/StripeConnectedAccount.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a Stripe custom connected account
     /// </summary>
     [DataContract]
-    public partial class StripeConnectedAccount :  IEquatable<StripeConnectedAccount>, IValidatableObject
+    public partial class StripeConnectedAccount :  IEquatable<StripeConnectedAccount>
     {
         /// <summary>
         /// Card payments capability status (Inactive, Pending, Active, Unrequested)
@@ -156,7 +154,13 @@ public enum AccountStatusEnum
             /// Enum UpdateExternalAccount for value: UpdateExternalAccount
             /// </summary>
             [EnumMember(Value = "UpdateExternalAccount")]
-            UpdateExternalAccount = 7
+            UpdateExternalAccount = 7,
+            
+            /// <summary>
+            /// Enum PlatformPaused for value: PlatformPaused
+            /// </summary>
+            [EnumMember(Value = "PlatformPaused")]
+            PlatformPaused = 8
         }
 
         /// <summary>
@@ -174,7 +178,9 @@ public enum AccountStatusEnum
         /// <param name="cardPaymentsStatus">Card payments capability status (Inactive, Pending, Active, Unrequested).</param>
         /// <param name="transfersStatus">Transfers capability status (Inactive, Pending, Active, Unrequested).</param>
         /// <param name="accountStatus">Current status of the account.</param>
-        public StripeConnectedAccount(int? flipdishConnectedAccountId = default(int?), string stripeId = default(string), int? whitelabelConfigId = default(int?), CardPaymentsStatusEnum? cardPaymentsStatus = default(CardPaymentsStatusEnum?), TransfersStatusEnum? transfersStatus = default(TransfersStatusEnum?), AccountStatusEnum? accountStatus = default(AccountStatusEnum?))
+        /// <param name="payoutsEnabled">Payouts Enabled status.</param>
+        /// <param name="paymentsEnabled">Payments Enabled status.</param>
+        public StripeConnectedAccount(int? flipdishConnectedAccountId = default(int?), string stripeId = default(string), int? whitelabelConfigId = default(int?), CardPaymentsStatusEnum? cardPaymentsStatus = default(CardPaymentsStatusEnum?), TransfersStatusEnum? transfersStatus = default(TransfersStatusEnum?), AccountStatusEnum? accountStatus = default(AccountStatusEnum?), bool? payoutsEnabled = default(bool?), bool? paymentsEnabled = default(bool?))
         {
             this.FlipdishConnectedAccountId = flipdishConnectedAccountId;
             this.StripeId = stripeId;
@@ -182,6 +188,8 @@ public enum AccountStatusEnum
             this.CardPaymentsStatus = cardPaymentsStatus;
             this.TransfersStatus = transfersStatus;
             this.AccountStatus = accountStatus;
+            this.PayoutsEnabled = payoutsEnabled;
+            this.PaymentsEnabled = paymentsEnabled;
         }
         
         /// <summary>
@@ -208,6 +216,20 @@ public enum AccountStatusEnum
 
 
 
+        /// <summary>
+        /// Payouts Enabled status
+        /// </summary>
+        /// <value>Payouts Enabled status</value>
+        [DataMember(Name="PayoutsEnabled", EmitDefaultValue=false)]
+        public bool? PayoutsEnabled { get; set; }
+
+        /// <summary>
+        /// Payments Enabled status
+        /// </summary>
+        /// <value>Payments Enabled status</value>
+        [DataMember(Name="PaymentsEnabled", EmitDefaultValue=false)]
+        public bool? PaymentsEnabled { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -222,6 +244,8 @@ public override string ToString()
             sb.Append("  CardPaymentsStatus: ").Append(CardPaymentsStatus).Append("\n");
             sb.Append("  TransfersStatus: ").Append(TransfersStatus).Append("\n");
             sb.Append("  AccountStatus: ").Append(AccountStatus).Append("\n");
+            sb.Append("  PayoutsEnabled: ").Append(PayoutsEnabled).Append("\n");
+            sb.Append("  PaymentsEnabled: ").Append(PaymentsEnabled).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -285,6 +309,16 @@ public bool Equals(StripeConnectedAccount input)
                     this.AccountStatus == input.AccountStatus ||
                     (this.AccountStatus != null &&
                     this.AccountStatus.Equals(input.AccountStatus))
+                ) && 
+                (
+                    this.PayoutsEnabled == input.PayoutsEnabled ||
+                    (this.PayoutsEnabled != null &&
+                    this.PayoutsEnabled.Equals(input.PayoutsEnabled))
+                ) && 
+                (
+                    this.PaymentsEnabled == input.PaymentsEnabled ||
+                    (this.PaymentsEnabled != null &&
+                    this.PaymentsEnabled.Equals(input.PaymentsEnabled))
                 );
         }
 
@@ -309,19 +343,13 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.TransfersStatus.GetHashCode();
                 if (this.AccountStatus != null)
                     hashCode = hashCode * 59 + this.AccountStatus.GetHashCode();
+                if (this.PayoutsEnabled != null)
+                    hashCode = hashCode * 59 + this.PayoutsEnabled.GetHashCode();
+                if (this.PaymentsEnabled != null)
+                    hashCode = hashCode * 59 + this.PaymentsEnabled.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StripeConnectedAccountInfo.cs b/src/Flipdish/Model/StripeConnectedAccountInfo.cs
index 4743af4b..e4f458a6 100644
--- a/src/Flipdish/Model/StripeConnectedAccountInfo.cs
+++ b/src/Flipdish/Model/StripeConnectedAccountInfo.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents information about a Stripe connected account associated with a bank account
     /// </summary>
     [DataContract]
-    public partial class StripeConnectedAccountInfo :  IEquatable<StripeConnectedAccountInfo>, IValidatableObject
+    public partial class StripeConnectedAccountInfo :  IEquatable<StripeConnectedAccountInfo>
     {
         /// <summary>
         /// Stripe connected account status
@@ -78,7 +76,13 @@ public enum AccountStatusEnum
             /// Enum UpdateExternalAccount for value: UpdateExternalAccount
             /// </summary>
             [EnumMember(Value = "UpdateExternalAccount")]
-            UpdateExternalAccount = 7
+            UpdateExternalAccount = 7,
+            
+            /// <summary>
+            /// Enum PlatformPaused for value: PlatformPaused
+            /// </summary>
+            [EnumMember(Value = "PlatformPaused")]
+            PlatformPaused = 8
         }
 
         /// <summary>
@@ -172,12 +176,20 @@ public enum PayoutScheduleIntervalEnum
         /// <param name="stripeId">Stripe connected account id.</param>
         /// <param name="cardPaymentStatus">Current status of the Card Payment capability of the account.</param>
         /// <param name="payoutScheduleInterval">Payouts Schedule Interval.</param>
-        public StripeConnectedAccountInfo(AccountStatusEnum? accountStatus = default(AccountStatusEnum?), string stripeId = default(string), CardPaymentStatusEnum? cardPaymentStatus = default(CardPaymentStatusEnum?), PayoutScheduleIntervalEnum? payoutScheduleInterval = default(PayoutScheduleIntervalEnum?))
+        /// <param name="payoutsEnabled">Payouts Enabled status.</param>
+        /// <param name="payoutsPaused">Flag indicating if payouts are paused.</param>
+        /// <param name="paymentsEnabled">Flag indicating if payments are enabled.</param>
+        /// <param name="disabledReason">If the Stripe connected account is disabled, this is Stripe&#39;s raw  requirements.disabled_reason describing why, as last recorded from a Stripe  connected-account webhook. Known values are requirements.fields_needed,  requirements.past_due, requirements.pending_verification,  rejected.fraud, rejected.terms_of_service, rejected.listed,  rejected.other and platform_paused, but Stripe can introduce new ones, so  the value is passed through unmapped (the same way  CapabilityRequirementsInfo.DisabledReason is). null when the account is  not disabled. Note that {Flipdish.PublicModels.V1.BankAccount.StripeConnectedAccountInfo.AccountStatus} is a deliberately lossy mapping of  this value and the two can legitimately disagree - do not derive one from the other..</param>
+        public StripeConnectedAccountInfo(AccountStatusEnum? accountStatus = default(AccountStatusEnum?), string stripeId = default(string), CardPaymentStatusEnum? cardPaymentStatus = default(CardPaymentStatusEnum?), PayoutScheduleIntervalEnum? payoutScheduleInterval = default(PayoutScheduleIntervalEnum?), bool? payoutsEnabled = default(bool?), bool? payoutsPaused = default(bool?), bool? paymentsEnabled = default(bool?), string disabledReason = default(string))
         {
             this.AccountStatus = accountStatus;
             this.StripeId = stripeId;
             this.CardPaymentStatus = cardPaymentStatus;
             this.PayoutScheduleInterval = payoutScheduleInterval;
+            this.PayoutsEnabled = payoutsEnabled;
+            this.PayoutsPaused = payoutsPaused;
+            this.PaymentsEnabled = paymentsEnabled;
+            this.DisabledReason = disabledReason;
         }
         
 
@@ -190,6 +202,34 @@ public enum PayoutScheduleIntervalEnum
 
 
 
+        /// <summary>
+        /// Payouts Enabled status
+        /// </summary>
+        /// <value>Payouts Enabled status</value>
+        [DataMember(Name="PayoutsEnabled", EmitDefaultValue=false)]
+        public bool? PayoutsEnabled { get; set; }
+
+        /// <summary>
+        /// Flag indicating if payouts are paused
+        /// </summary>
+        /// <value>Flag indicating if payouts are paused</value>
+        [DataMember(Name="PayoutsPaused", EmitDefaultValue=false)]
+        public bool? PayoutsPaused { get; set; }
+
+        /// <summary>
+        /// Flag indicating if payments are enabled
+        /// </summary>
+        /// <value>Flag indicating if payments are enabled</value>
+        [DataMember(Name="PaymentsEnabled", EmitDefaultValue=false)]
+        public bool? PaymentsEnabled { get; set; }
+
+        /// <summary>
+        /// If the Stripe connected account is disabled, this is Stripe&#39;s raw  requirements.disabled_reason describing why, as last recorded from a Stripe  connected-account webhook. Known values are requirements.fields_needed,  requirements.past_due, requirements.pending_verification,  rejected.fraud, rejected.terms_of_service, rejected.listed,  rejected.other and platform_paused, but Stripe can introduce new ones, so  the value is passed through unmapped (the same way  CapabilityRequirementsInfo.DisabledReason is). null when the account is  not disabled. Note that {Flipdish.PublicModels.V1.BankAccount.StripeConnectedAccountInfo.AccountStatus} is a deliberately lossy mapping of  this value and the two can legitimately disagree - do not derive one from the other.
+        /// </summary>
+        /// <value>If the Stripe connected account is disabled, this is Stripe&#39;s raw  requirements.disabled_reason describing why, as last recorded from a Stripe  connected-account webhook. Known values are requirements.fields_needed,  requirements.past_due, requirements.pending_verification,  rejected.fraud, rejected.terms_of_service, rejected.listed,  rejected.other and platform_paused, but Stripe can introduce new ones, so  the value is passed through unmapped (the same way  CapabilityRequirementsInfo.DisabledReason is). null when the account is  not disabled. Note that {Flipdish.PublicModels.V1.BankAccount.StripeConnectedAccountInfo.AccountStatus} is a deliberately lossy mapping of  this value and the two can legitimately disagree - do not derive one from the other.</value>
+        [DataMember(Name="DisabledReason", EmitDefaultValue=false)]
+        public string DisabledReason { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -202,6 +242,10 @@ public override string ToString()
             sb.Append("  StripeId: ").Append(StripeId).Append("\n");
             sb.Append("  CardPaymentStatus: ").Append(CardPaymentStatus).Append("\n");
             sb.Append("  PayoutScheduleInterval: ").Append(PayoutScheduleInterval).Append("\n");
+            sb.Append("  PayoutsEnabled: ").Append(PayoutsEnabled).Append("\n");
+            sb.Append("  PayoutsPaused: ").Append(PayoutsPaused).Append("\n");
+            sb.Append("  PaymentsEnabled: ").Append(PaymentsEnabled).Append("\n");
+            sb.Append("  DisabledReason: ").Append(DisabledReason).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -255,6 +299,26 @@ public bool Equals(StripeConnectedAccountInfo input)
                     this.PayoutScheduleInterval == input.PayoutScheduleInterval ||
                     (this.PayoutScheduleInterval != null &&
                     this.PayoutScheduleInterval.Equals(input.PayoutScheduleInterval))
+                ) && 
+                (
+                    this.PayoutsEnabled == input.PayoutsEnabled ||
+                    (this.PayoutsEnabled != null &&
+                    this.PayoutsEnabled.Equals(input.PayoutsEnabled))
+                ) && 
+                (
+                    this.PayoutsPaused == input.PayoutsPaused ||
+                    (this.PayoutsPaused != null &&
+                    this.PayoutsPaused.Equals(input.PayoutsPaused))
+                ) && 
+                (
+                    this.PaymentsEnabled == input.PaymentsEnabled ||
+                    (this.PaymentsEnabled != null &&
+                    this.PaymentsEnabled.Equals(input.PaymentsEnabled))
+                ) && 
+                (
+                    this.DisabledReason == input.DisabledReason ||
+                    (this.DisabledReason != null &&
+                    this.DisabledReason.Equals(input.DisabledReason))
                 );
         }
 
@@ -275,19 +339,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.CardPaymentStatus.GetHashCode();
                 if (this.PayoutScheduleInterval != null)
                     hashCode = hashCode * 59 + this.PayoutScheduleInterval.GetHashCode();
+                if (this.PayoutsEnabled != null)
+                    hashCode = hashCode * 59 + this.PayoutsEnabled.GetHashCode();
+                if (this.PayoutsPaused != null)
+                    hashCode = hashCode * 59 + this.PayoutsPaused.GetHashCode();
+                if (this.PaymentsEnabled != null)
+                    hashCode = hashCode * 59 + this.PaymentsEnabled.GetHashCode();
+                if (this.DisabledReason != null)
+                    hashCode = hashCode * 59 + this.DisabledReason.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StripeCustomConnectedAccount.cs b/src/Flipdish/Model/StripeCustomConnectedAccount.cs
new file mode 100644
index 00000000..3abe703d
--- /dev/null
+++ b/src/Flipdish/Model/StripeCustomConnectedAccount.cs
@@ -0,0 +1,304 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Flipdish Stripe Custom Connected Account associated to the Store
+    /// </summary>
+    [DataContract]
+    public partial class StripeCustomConnectedAccount :  IEquatable<StripeCustomConnectedAccount>
+    {
+        /// <summary>
+        /// Card payments capability status (Inactive, Pending, Active, Unrequested)
+        /// </summary>
+        /// <value>Card payments capability status (Inactive, Pending, Active, Unrequested)</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum CardPaymentsStatusEnum
+        {
+            
+            /// <summary>
+            /// Enum Inactive for value: Inactive
+            /// </summary>
+            [EnumMember(Value = "Inactive")]
+            Inactive = 1,
+            
+            /// <summary>
+            /// Enum Pending for value: Pending
+            /// </summary>
+            [EnumMember(Value = "Pending")]
+            Pending = 2,
+            
+            /// <summary>
+            /// Enum Active for value: Active
+            /// </summary>
+            [EnumMember(Value = "Active")]
+            Active = 3,
+            
+            /// <summary>
+            /// Enum Unrequested for value: Unrequested
+            /// </summary>
+            [EnumMember(Value = "Unrequested")]
+            Unrequested = 4
+        }
+
+        /// <summary>
+        /// Card payments capability status (Inactive, Pending, Active, Unrequested)
+        /// </summary>
+        /// <value>Card payments capability status (Inactive, Pending, Active, Unrequested)</value>
+        [DataMember(Name="CardPaymentsStatus", EmitDefaultValue=false)]
+        public CardPaymentsStatusEnum? CardPaymentsStatus { get; set; }
+        /// <summary>
+        /// Transfers capability status (Inactive, Pending, Active, Unrequested)
+        /// </summary>
+        /// <value>Transfers capability status (Inactive, Pending, Active, Unrequested)</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum TransfersStatusEnum
+        {
+            
+            /// <summary>
+            /// Enum Inactive for value: Inactive
+            /// </summary>
+            [EnumMember(Value = "Inactive")]
+            Inactive = 1,
+            
+            /// <summary>
+            /// Enum Pending for value: Pending
+            /// </summary>
+            [EnumMember(Value = "Pending")]
+            Pending = 2,
+            
+            /// <summary>
+            /// Enum Active for value: Active
+            /// </summary>
+            [EnumMember(Value = "Active")]
+            Active = 3,
+            
+            /// <summary>
+            /// Enum Unrequested for value: Unrequested
+            /// </summary>
+            [EnumMember(Value = "Unrequested")]
+            Unrequested = 4
+        }
+
+        /// <summary>
+        /// Transfers capability status (Inactive, Pending, Active, Unrequested)
+        /// </summary>
+        /// <value>Transfers capability status (Inactive, Pending, Active, Unrequested)</value>
+        [DataMember(Name="TransfersStatus", EmitDefaultValue=false)]
+        public TransfersStatusEnum? TransfersStatus { get; set; }
+        /// <summary>
+        /// Current status of the account
+        /// </summary>
+        /// <value>Current status of the account</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum AccountStatusEnum
+        {
+            
+            /// <summary>
+            /// Enum Disabled for value: Disabled
+            /// </summary>
+            [EnumMember(Value = "Disabled")]
+            Disabled = 1,
+            
+            /// <summary>
+            /// Enum Enabled for value: Enabled
+            /// </summary>
+            [EnumMember(Value = "Enabled")]
+            Enabled = 2,
+            
+            /// <summary>
+            /// Enum AdditionalInformationRequired for value: AdditionalInformationRequired
+            /// </summary>
+            [EnumMember(Value = "AdditionalInformationRequired")]
+            AdditionalInformationRequired = 3,
+            
+            /// <summary>
+            /// Enum PendingVerification for value: PendingVerification
+            /// </summary>
+            [EnumMember(Value = "PendingVerification")]
+            PendingVerification = 4,
+            
+            /// <summary>
+            /// Enum Unverified for value: Unverified
+            /// </summary>
+            [EnumMember(Value = "Unverified")]
+            Unverified = 5,
+            
+            /// <summary>
+            /// Enum Rejected for value: Rejected
+            /// </summary>
+            [EnumMember(Value = "Rejected")]
+            Rejected = 6,
+            
+            /// <summary>
+            /// Enum UpdateExternalAccount for value: UpdateExternalAccount
+            /// </summary>
+            [EnumMember(Value = "UpdateExternalAccount")]
+            UpdateExternalAccount = 7,
+            
+            /// <summary>
+            /// Enum PlatformPaused for value: PlatformPaused
+            /// </summary>
+            [EnumMember(Value = "PlatformPaused")]
+            PlatformPaused = 8
+        }
+
+        /// <summary>
+        /// Current status of the account
+        /// </summary>
+        /// <value>Current status of the account</value>
+        [DataMember(Name="AccountStatus", EmitDefaultValue=false)]
+        public AccountStatusEnum? AccountStatus { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StripeCustomConnectedAccount" /> class.
+        /// </summary>
+        /// <param name="storeId">Physical Restaurant Id.</param>
+        /// <param name="stripeId">Stripe&#39;s own connected account identifier.</param>
+        /// <param name="cardPaymentsStatus">Card payments capability status (Inactive, Pending, Active, Unrequested).</param>
+        /// <param name="transfersStatus">Transfers capability status (Inactive, Pending, Active, Unrequested).</param>
+        /// <param name="accountStatus">Current status of the account.</param>
+        public StripeCustomConnectedAccount(int? storeId = default(int?), string stripeId = default(string), CardPaymentsStatusEnum? cardPaymentsStatus = default(CardPaymentsStatusEnum?), TransfersStatusEnum? transfersStatus = default(TransfersStatusEnum?), AccountStatusEnum? accountStatus = default(AccountStatusEnum?))
+        {
+            this.StoreId = storeId;
+            this.StripeId = stripeId;
+            this.CardPaymentsStatus = cardPaymentsStatus;
+            this.TransfersStatus = transfersStatus;
+            this.AccountStatus = accountStatus;
+        }
+        
+        /// <summary>
+        /// Physical Restaurant Id
+        /// </summary>
+        /// <value>Physical Restaurant Id</value>
+        [DataMember(Name="StoreId", EmitDefaultValue=false)]
+        public int? StoreId { get; set; }
+
+        /// <summary>
+        /// Stripe&#39;s own connected account identifier
+        /// </summary>
+        /// <value>Stripe&#39;s own connected account identifier</value>
+        [DataMember(Name="StripeId", EmitDefaultValue=false)]
+        public string StripeId { get; set; }
+
+
+
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class StripeCustomConnectedAccount {\n");
+            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  StripeId: ").Append(StripeId).Append("\n");
+            sb.Append("  CardPaymentsStatus: ").Append(CardPaymentsStatus).Append("\n");
+            sb.Append("  TransfersStatus: ").Append(TransfersStatus).Append("\n");
+            sb.Append("  AccountStatus: ").Append(AccountStatus).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as StripeCustomConnectedAccount);
+        }
+
+        /// <summary>
+        /// Returns true if StripeCustomConnectedAccount instances are equal
+        /// </summary>
+        /// <param name="input">Instance of StripeCustomConnectedAccount to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(StripeCustomConnectedAccount input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.StoreId == input.StoreId ||
+                    (this.StoreId != null &&
+                    this.StoreId.Equals(input.StoreId))
+                ) && 
+                (
+                    this.StripeId == input.StripeId ||
+                    (this.StripeId != null &&
+                    this.StripeId.Equals(input.StripeId))
+                ) && 
+                (
+                    this.CardPaymentsStatus == input.CardPaymentsStatus ||
+                    (this.CardPaymentsStatus != null &&
+                    this.CardPaymentsStatus.Equals(input.CardPaymentsStatus))
+                ) && 
+                (
+                    this.TransfersStatus == input.TransfersStatus ||
+                    (this.TransfersStatus != null &&
+                    this.TransfersStatus.Equals(input.TransfersStatus))
+                ) && 
+                (
+                    this.AccountStatus == input.AccountStatus ||
+                    (this.AccountStatus != null &&
+                    this.AccountStatus.Equals(input.AccountStatus))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.StoreId != null)
+                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.StripeId != null)
+                    hashCode = hashCode * 59 + this.StripeId.GetHashCode();
+                if (this.CardPaymentsStatus != null)
+                    hashCode = hashCode * 59 + this.CardPaymentsStatus.GetHashCode();
+                if (this.TransfersStatus != null)
+                    hashCode = hashCode * 59 + this.TransfersStatus.GetHashCode();
+                if (this.AccountStatus != null)
+                    hashCode = hashCode * 59 + this.AccountStatus.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/StripeTerminalConnectionToken.cs b/src/Flipdish/Model/StripeTerminalConnectionToken.cs
index c8985350..5c6e9b38 100644
--- a/src/Flipdish/Model/StripeTerminalConnectionToken.cs
+++ b/src/Flipdish/Model/StripeTerminalConnectionToken.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Stripe Terminal Connection Token
     /// </summary>
     [DataContract]
-    public partial class StripeTerminalConnectionToken :  IEquatable<StripeTerminalConnectionToken>, IValidatableObject
+    public partial class StripeTerminalConnectionToken :  IEquatable<StripeTerminalConnectionToken>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StripeTerminalConnectionToken" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StripeTerminalLocation.cs b/src/Flipdish/Model/StripeTerminalLocation.cs
index a782fd8b..9bb9684c 100644
--- a/src/Flipdish/Model/StripeTerminalLocation.cs
+++ b/src/Flipdish/Model/StripeTerminalLocation.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Stripe Terminal Private Key
     /// </summary>
     [DataContract]
-    public partial class StripeTerminalLocation :  IEquatable<StripeTerminalLocation>, IValidatableObject
+    public partial class StripeTerminalLocation :  IEquatable<StripeTerminalLocation>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StripeTerminalLocation" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StripeTerminalPrivateKey.cs b/src/Flipdish/Model/StripeTerminalPrivateKey.cs
deleted file mode 100644
index 2dc46eca..00000000
--- a/src/Flipdish/Model/StripeTerminalPrivateKey.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Stripe Terminal Private Key
-    /// </summary>
-    [DataContract]
-    public partial class StripeTerminalPrivateKey :  IEquatable<StripeTerminalPrivateKey>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StripeTerminalPrivateKey" /> class.
-        /// </summary>
-        /// <param name="location">Registered location of the terminal.</param>
-        /// <param name="secret">Secret used to pass to stripe to attach terminal.</param>
-        public StripeTerminalPrivateKey(string location = default(string), string secret = default(string))
-        {
-            this.Location = location;
-            this.Secret = secret;
-        }
-        
-        /// <summary>
-        /// Registered location of the terminal
-        /// </summary>
-        /// <value>Registered location of the terminal</value>
-        [DataMember(Name="Location", EmitDefaultValue=false)]
-        public string Location { get; set; }
-
-        /// <summary>
-        /// Secret used to pass to stripe to attach terminal
-        /// </summary>
-        /// <value>Secret used to pass to stripe to attach terminal</value>
-        [DataMember(Name="Secret", EmitDefaultValue=false)]
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class StripeTerminalPrivateKey {\n");
-            sb.Append("  Location: ").Append(Location).Append("\n");
-            sb.Append("  Secret: ").Append(Secret).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as StripeTerminalPrivateKey);
-        }
-
-        /// <summary>
-        /// Returns true if StripeTerminalPrivateKey instances are equal
-        /// </summary>
-        /// <param name="input">Instance of StripeTerminalPrivateKey to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(StripeTerminalPrivateKey input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Location == input.Location ||
-                    (this.Location != null &&
-                    this.Location.Equals(input.Location))
-                ) && 
-                (
-                    this.Secret == input.Secret ||
-                    (this.Secret != null &&
-                    this.Secret.Equals(input.Secret))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Location != null)
-                    hashCode = hashCode * 59 + this.Location.GetHashCode();
-                if (this.Secret != null)
-                    hashCode = hashCode * 59 + this.Secret.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/StuartSettings.cs b/src/Flipdish/Model/StuartSettings.cs
index b5b0ba91..6f733a5c 100644
--- a/src/Flipdish/Model/StuartSettings.cs
+++ b/src/Flipdish/Model/StuartSettings.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Stuart settings
     /// </summary>
     [DataContract]
-    public partial class StuartSettings :  IEquatable<StuartSettings>, IValidatableObject
+    public partial class StuartSettings :  IEquatable<StuartSettings>
     {
         /// <summary>
         /// Package type
@@ -352,16 +350,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/StuartSettingsTransportPrices.cs b/src/Flipdish/Model/StuartSettingsTransportPrices.cs
index 570c75bf..efc99a69 100644
--- a/src/Flipdish/Model/StuartSettingsTransportPrices.cs
+++ b/src/Flipdish/Model/StuartSettingsTransportPrices.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// If the order exceeds are certain amount this configuration will determine a new vehicle type
     /// </summary>
     [DataContract]
-    public partial class StuartSettingsTransportPrices :  IEquatable<StuartSettingsTransportPrices>, IValidatableObject
+    public partial class StuartSettingsTransportPrices :  IEquatable<StuartSettingsTransportPrices>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StuartSettingsTransportPrices" /> class.
@@ -205,16 +203,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/Subscription.cs b/src/Flipdish/Model/Subscription.cs
index ecd80d1d..41031923 100644
--- a/src/Flipdish/Model/Subscription.cs
+++ b/src/Flipdish/Model/Subscription.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,47 +26,758 @@ namespace Flipdish.Model
     /// Subscription
     /// </summary>
     [DataContract]
-    public partial class Subscription :  IEquatable<Subscription>, IValidatableObject
+    public partial class Subscription :  IEquatable<Subscription>
     {
         /// <summary>
-        /// Status of the subscription (TrialPeriod, Ongoing, Unpaid, Canceled)
+        /// Status
         /// </summary>
-        /// <value>Status of the subscription (TrialPeriod, Ongoing, Unpaid, Canceled)</value>
+        /// <value>Status</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StatusEnum
         {
             
             /// <summary>
-            /// Enum TrialPeriod for value: TrialPeriod
+            /// Enum Incomplete for value: Incomplete
             /// </summary>
-            [EnumMember(Value = "TrialPeriod")]
-            TrialPeriod = 1,
+            [EnumMember(Value = "Incomplete")]
+            Incomplete = 1,
             
             /// <summary>
-            /// Enum Ongoing for value: Ongoing
+            /// Enum IncompleteExpired for value: IncompleteExpired
             /// </summary>
-            [EnumMember(Value = "Ongoing")]
-            Ongoing = 2,
+            [EnumMember(Value = "IncompleteExpired")]
+            IncompleteExpired = 2,
             
             /// <summary>
-            /// Enum Unpaid for value: Unpaid
+            /// Enum Trialing for value: Trialing
             /// </summary>
-            [EnumMember(Value = "Unpaid")]
-            Unpaid = 3,
+            [EnumMember(Value = "Trialing")]
+            Trialing = 3,
+            
+            /// <summary>
+            /// Enum Active for value: Active
+            /// </summary>
+            [EnumMember(Value = "Active")]
+            Active = 4,
+            
+            /// <summary>
+            /// Enum PastDue for value: PastDue
+            /// </summary>
+            [EnumMember(Value = "PastDue")]
+            PastDue = 5,
             
             /// <summary>
             /// Enum Canceled for value: Canceled
             /// </summary>
             [EnumMember(Value = "Canceled")]
-            Canceled = 4
+            Canceled = 6,
+            
+            /// <summary>
+            /// Enum Unpaid for value: Unpaid
+            /// </summary>
+            [EnumMember(Value = "Unpaid")]
+            Unpaid = 7
         }
 
         /// <summary>
-        /// Status of the subscription (TrialPeriod, Ongoing, Unpaid, Canceled)
+        /// Status
         /// </summary>
-        /// <value>Status of the subscription (TrialPeriod, Ongoing, Unpaid, Canceled)</value>
+        /// <value>Status</value>
         [DataMember(Name="Status", EmitDefaultValue=false)]
-        public StatusEnum? Status { get; set; }
+        public StatusEnum Status { get; set; }
+        /// <summary>
+        /// Currency
+        /// </summary>
+        /// <value>Currency</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum CurrencyEnum
+        {
+            
+            /// <summary>
+            /// Enum EUR for value: EUR
+            /// </summary>
+            [EnumMember(Value = "EUR")]
+            EUR = 1,
+            
+            /// <summary>
+            /// Enum USD for value: USD
+            /// </summary>
+            [EnumMember(Value = "USD")]
+            USD = 2,
+            
+            /// <summary>
+            /// Enum GBP for value: GBP
+            /// </summary>
+            [EnumMember(Value = "GBP")]
+            GBP = 3,
+            
+            /// <summary>
+            /// Enum CAD for value: CAD
+            /// </summary>
+            [EnumMember(Value = "CAD")]
+            CAD = 4,
+            
+            /// <summary>
+            /// Enum AUD for value: AUD
+            /// </summary>
+            [EnumMember(Value = "AUD")]
+            AUD = 5,
+            
+            /// <summary>
+            /// Enum DJF for value: DJF
+            /// </summary>
+            [EnumMember(Value = "DJF")]
+            DJF = 6,
+            
+            /// <summary>
+            /// Enum ZAR for value: ZAR
+            /// </summary>
+            [EnumMember(Value = "ZAR")]
+            ZAR = 7,
+            
+            /// <summary>
+            /// Enum ETB for value: ETB
+            /// </summary>
+            [EnumMember(Value = "ETB")]
+            ETB = 8,
+            
+            /// <summary>
+            /// Enum AED for value: AED
+            /// </summary>
+            [EnumMember(Value = "AED")]
+            AED = 9,
+            
+            /// <summary>
+            /// Enum BHD for value: BHD
+            /// </summary>
+            [EnumMember(Value = "BHD")]
+            BHD = 10,
+            
+            /// <summary>
+            /// Enum DZD for value: DZD
+            /// </summary>
+            [EnumMember(Value = "DZD")]
+            DZD = 11,
+            
+            /// <summary>
+            /// Enum EGP for value: EGP
+            /// </summary>
+            [EnumMember(Value = "EGP")]
+            EGP = 12,
+            
+            /// <summary>
+            /// Enum IQD for value: IQD
+            /// </summary>
+            [EnumMember(Value = "IQD")]
+            IQD = 13,
+            
+            /// <summary>
+            /// Enum JOD for value: JOD
+            /// </summary>
+            [EnumMember(Value = "JOD")]
+            JOD = 14,
+            
+            /// <summary>
+            /// Enum KWD for value: KWD
+            /// </summary>
+            [EnumMember(Value = "KWD")]
+            KWD = 15,
+            
+            /// <summary>
+            /// Enum LBP for value: LBP
+            /// </summary>
+            [EnumMember(Value = "LBP")]
+            LBP = 16,
+            
+            /// <summary>
+            /// Enum LYD for value: LYD
+            /// </summary>
+            [EnumMember(Value = "LYD")]
+            LYD = 17,
+            
+            /// <summary>
+            /// Enum MAD for value: MAD
+            /// </summary>
+            [EnumMember(Value = "MAD")]
+            MAD = 18,
+            
+            /// <summary>
+            /// Enum OMR for value: OMR
+            /// </summary>
+            [EnumMember(Value = "OMR")]
+            OMR = 19,
+            
+            /// <summary>
+            /// Enum QAR for value: QAR
+            /// </summary>
+            [EnumMember(Value = "QAR")]
+            QAR = 20,
+            
+            /// <summary>
+            /// Enum SAR for value: SAR
+            /// </summary>
+            [EnumMember(Value = "SAR")]
+            SAR = 21,
+            
+            /// <summary>
+            /// Enum SYP for value: SYP
+            /// </summary>
+            [EnumMember(Value = "SYP")]
+            SYP = 22,
+            
+            /// <summary>
+            /// Enum TND for value: TND
+            /// </summary>
+            [EnumMember(Value = "TND")]
+            TND = 23,
+            
+            /// <summary>
+            /// Enum YER for value: YER
+            /// </summary>
+            [EnumMember(Value = "YER")]
+            YER = 24,
+            
+            /// <summary>
+            /// Enum CLP for value: CLP
+            /// </summary>
+            [EnumMember(Value = "CLP")]
+            CLP = 25,
+            
+            /// <summary>
+            /// Enum INR for value: INR
+            /// </summary>
+            [EnumMember(Value = "INR")]
+            INR = 26,
+            
+            /// <summary>
+            /// Enum AZN for value: AZN
+            /// </summary>
+            [EnumMember(Value = "AZN")]
+            AZN = 27,
+            
+            /// <summary>
+            /// Enum RUB for value: RUB
+            /// </summary>
+            [EnumMember(Value = "RUB")]
+            RUB = 28,
+            
+            /// <summary>
+            /// Enum BYN for value: BYN
+            /// </summary>
+            [EnumMember(Value = "BYN")]
+            BYN = 29,
+            
+            /// <summary>
+            /// Enum BGN for value: BGN
+            /// </summary>
+            [EnumMember(Value = "BGN")]
+            BGN = 30,
+            
+            /// <summary>
+            /// Enum NGN for value: NGN
+            /// </summary>
+            [EnumMember(Value = "NGN")]
+            NGN = 31,
+            
+            /// <summary>
+            /// Enum BDT for value: BDT
+            /// </summary>
+            [EnumMember(Value = "BDT")]
+            BDT = 32,
+            
+            /// <summary>
+            /// Enum CNY for value: CNY
+            /// </summary>
+            [EnumMember(Value = "CNY")]
+            CNY = 33,
+            
+            /// <summary>
+            /// Enum BAM for value: BAM
+            /// </summary>
+            [EnumMember(Value = "BAM")]
+            BAM = 34,
+            
+            /// <summary>
+            /// Enum CZK for value: CZK
+            /// </summary>
+            [EnumMember(Value = "CZK")]
+            CZK = 35,
+            
+            /// <summary>
+            /// Enum DKK for value: DKK
+            /// </summary>
+            [EnumMember(Value = "DKK")]
+            DKK = 36,
+            
+            /// <summary>
+            /// Enum CHF for value: CHF
+            /// </summary>
+            [EnumMember(Value = "CHF")]
+            CHF = 37,
+            
+            /// <summary>
+            /// Enum MVR for value: MVR
+            /// </summary>
+            [EnumMember(Value = "MVR")]
+            MVR = 38,
+            
+            /// <summary>
+            /// Enum BTN for value: BTN
+            /// </summary>
+            [EnumMember(Value = "BTN")]
+            BTN = 39,
+            
+            /// <summary>
+            /// Enum XCD for value: XCD
+            /// </summary>
+            [EnumMember(Value = "XCD")]
+            XCD = 40,
+            
+            /// <summary>
+            /// Enum BZD for value: BZD
+            /// </summary>
+            [EnumMember(Value = "BZD")]
+            BZD = 41,
+            
+            /// <summary>
+            /// Enum HKD for value: HKD
+            /// </summary>
+            [EnumMember(Value = "HKD")]
+            HKD = 42,
+            
+            /// <summary>
+            /// Enum IDR for value: IDR
+            /// </summary>
+            [EnumMember(Value = "IDR")]
+            IDR = 43,
+            
+            /// <summary>
+            /// Enum JMD for value: JMD
+            /// </summary>
+            [EnumMember(Value = "JMD")]
+            JMD = 44,
+            
+            /// <summary>
+            /// Enum MYR for value: MYR
+            /// </summary>
+            [EnumMember(Value = "MYR")]
+            MYR = 45,
+            
+            /// <summary>
+            /// Enum NZD for value: NZD
+            /// </summary>
+            [EnumMember(Value = "NZD")]
+            NZD = 46,
+            
+            /// <summary>
+            /// Enum PHP for value: PHP
+            /// </summary>
+            [EnumMember(Value = "PHP")]
+            PHP = 47,
+            
+            /// <summary>
+            /// Enum SGD for value: SGD
+            /// </summary>
+            [EnumMember(Value = "SGD")]
+            SGD = 48,
+            
+            /// <summary>
+            /// Enum TTD for value: TTD
+            /// </summary>
+            [EnumMember(Value = "TTD")]
+            TTD = 49,
+            
+            /// <summary>
+            /// Enum XDR for value: XDR
+            /// </summary>
+            [EnumMember(Value = "XDR")]
+            XDR = 50,
+            
+            /// <summary>
+            /// Enum ARS for value: ARS
+            /// </summary>
+            [EnumMember(Value = "ARS")]
+            ARS = 51,
+            
+            /// <summary>
+            /// Enum BOB for value: BOB
+            /// </summary>
+            [EnumMember(Value = "BOB")]
+            BOB = 52,
+            
+            /// <summary>
+            /// Enum COP for value: COP
+            /// </summary>
+            [EnumMember(Value = "COP")]
+            COP = 53,
+            
+            /// <summary>
+            /// Enum CRC for value: CRC
+            /// </summary>
+            [EnumMember(Value = "CRC")]
+            CRC = 54,
+            
+            /// <summary>
+            /// Enum CUP for value: CUP
+            /// </summary>
+            [EnumMember(Value = "CUP")]
+            CUP = 55,
+            
+            /// <summary>
+            /// Enum DOP for value: DOP
+            /// </summary>
+            [EnumMember(Value = "DOP")]
+            DOP = 56,
+            
+            /// <summary>
+            /// Enum GTQ for value: GTQ
+            /// </summary>
+            [EnumMember(Value = "GTQ")]
+            GTQ = 57,
+            
+            /// <summary>
+            /// Enum HNL for value: HNL
+            /// </summary>
+            [EnumMember(Value = "HNL")]
+            HNL = 58,
+            
+            /// <summary>
+            /// Enum MXN for value: MXN
+            /// </summary>
+            [EnumMember(Value = "MXN")]
+            MXN = 59,
+            
+            /// <summary>
+            /// Enum NIO for value: NIO
+            /// </summary>
+            [EnumMember(Value = "NIO")]
+            NIO = 60,
+            
+            /// <summary>
+            /// Enum PAB for value: PAB
+            /// </summary>
+            [EnumMember(Value = "PAB")]
+            PAB = 61,
+            
+            /// <summary>
+            /// Enum PEN for value: PEN
+            /// </summary>
+            [EnumMember(Value = "PEN")]
+            PEN = 62,
+            
+            /// <summary>
+            /// Enum PYG for value: PYG
+            /// </summary>
+            [EnumMember(Value = "PYG")]
+            PYG = 63,
+            
+            /// <summary>
+            /// Enum UYU for value: UYU
+            /// </summary>
+            [EnumMember(Value = "UYU")]
+            UYU = 64,
+            
+            /// <summary>
+            /// Enum VEF for value: VEF
+            /// </summary>
+            [EnumMember(Value = "VEF")]
+            VEF = 65,
+            
+            /// <summary>
+            /// Enum IRR for value: IRR
+            /// </summary>
+            [EnumMember(Value = "IRR")]
+            IRR = 66,
+            
+            /// <summary>
+            /// Enum XOF for value: XOF
+            /// </summary>
+            [EnumMember(Value = "XOF")]
+            XOF = 67,
+            
+            /// <summary>
+            /// Enum CDF for value: CDF
+            /// </summary>
+            [EnumMember(Value = "CDF")]
+            CDF = 68,
+            
+            /// <summary>
+            /// Enum XAF for value: XAF
+            /// </summary>
+            [EnumMember(Value = "XAF")]
+            XAF = 69,
+            
+            /// <summary>
+            /// Enum HTG for value: HTG
+            /// </summary>
+            [EnumMember(Value = "HTG")]
+            HTG = 70,
+            
+            /// <summary>
+            /// Enum ILS for value: ILS
+            /// </summary>
+            [EnumMember(Value = "ILS")]
+            ILS = 71,
+            
+            /// <summary>
+            /// Enum HRK for value: HRK
+            /// </summary>
+            [EnumMember(Value = "HRK")]
+            HRK = 72,
+            
+            /// <summary>
+            /// Enum HUF for value: HUF
+            /// </summary>
+            [EnumMember(Value = "HUF")]
+            HUF = 73,
+            
+            /// <summary>
+            /// Enum AMD for value: AMD
+            /// </summary>
+            [EnumMember(Value = "AMD")]
+            AMD = 74,
+            
+            /// <summary>
+            /// Enum ISK for value: ISK
+            /// </summary>
+            [EnumMember(Value = "ISK")]
+            ISK = 75,
+            
+            /// <summary>
+            /// Enum JPY for value: JPY
+            /// </summary>
+            [EnumMember(Value = "JPY")]
+            JPY = 76,
+            
+            /// <summary>
+            /// Enum GEL for value: GEL
+            /// </summary>
+            [EnumMember(Value = "GEL")]
+            GEL = 77,
+            
+            /// <summary>
+            /// Enum KZT for value: KZT
+            /// </summary>
+            [EnumMember(Value = "KZT")]
+            KZT = 78,
+            
+            /// <summary>
+            /// Enum KHR for value: KHR
+            /// </summary>
+            [EnumMember(Value = "KHR")]
+            KHR = 79,
+            
+            /// <summary>
+            /// Enum KRW for value: KRW
+            /// </summary>
+            [EnumMember(Value = "KRW")]
+            KRW = 80,
+            
+            /// <summary>
+            /// Enum KGS for value: KGS
+            /// </summary>
+            [EnumMember(Value = "KGS")]
+            KGS = 81,
+            
+            /// <summary>
+            /// Enum LAK for value: LAK
+            /// </summary>
+            [EnumMember(Value = "LAK")]
+            LAK = 82,
+            
+            /// <summary>
+            /// Enum MKD for value: MKD
+            /// </summary>
+            [EnumMember(Value = "MKD")]
+            MKD = 83,
+            
+            /// <summary>
+            /// Enum MNT for value: MNT
+            /// </summary>
+            [EnumMember(Value = "MNT")]
+            MNT = 84,
+            
+            /// <summary>
+            /// Enum BND for value: BND
+            /// </summary>
+            [EnumMember(Value = "BND")]
+            BND = 85,
+            
+            /// <summary>
+            /// Enum MMK for value: MMK
+            /// </summary>
+            [EnumMember(Value = "MMK")]
+            MMK = 86,
+            
+            /// <summary>
+            /// Enum NOK for value: NOK
+            /// </summary>
+            [EnumMember(Value = "NOK")]
+            NOK = 87,
+            
+            /// <summary>
+            /// Enum NPR for value: NPR
+            /// </summary>
+            [EnumMember(Value = "NPR")]
+            NPR = 88,
+            
+            /// <summary>
+            /// Enum PKR for value: PKR
+            /// </summary>
+            [EnumMember(Value = "PKR")]
+            PKR = 89,
+            
+            /// <summary>
+            /// Enum PLN for value: PLN
+            /// </summary>
+            [EnumMember(Value = "PLN")]
+            PLN = 90,
+            
+            /// <summary>
+            /// Enum AFN for value: AFN
+            /// </summary>
+            [EnumMember(Value = "AFN")]
+            AFN = 91,
+            
+            /// <summary>
+            /// Enum BRL for value: BRL
+            /// </summary>
+            [EnumMember(Value = "BRL")]
+            BRL = 92,
+            
+            /// <summary>
+            /// Enum MDL for value: MDL
+            /// </summary>
+            [EnumMember(Value = "MDL")]
+            MDL = 93,
+            
+            /// <summary>
+            /// Enum RON for value: RON
+            /// </summary>
+            [EnumMember(Value = "RON")]
+            RON = 94,
+            
+            /// <summary>
+            /// Enum RWF for value: RWF
+            /// </summary>
+            [EnumMember(Value = "RWF")]
+            RWF = 95,
+            
+            /// <summary>
+            /// Enum SEK for value: SEK
+            /// </summary>
+            [EnumMember(Value = "SEK")]
+            SEK = 96,
+            
+            /// <summary>
+            /// Enum LKR for value: LKR
+            /// </summary>
+            [EnumMember(Value = "LKR")]
+            LKR = 97,
+            
+            /// <summary>
+            /// Enum SOS for value: SOS
+            /// </summary>
+            [EnumMember(Value = "SOS")]
+            SOS = 98,
+            
+            /// <summary>
+            /// Enum ALL for value: ALL
+            /// </summary>
+            [EnumMember(Value = "ALL")]
+            ALL = 99,
+            
+            /// <summary>
+            /// Enum RSD for value: RSD
+            /// </summary>
+            [EnumMember(Value = "RSD")]
+            RSD = 100,
+            
+            /// <summary>
+            /// Enum KES for value: KES
+            /// </summary>
+            [EnumMember(Value = "KES")]
+            KES = 101,
+            
+            /// <summary>
+            /// Enum TJS for value: TJS
+            /// </summary>
+            [EnumMember(Value = "TJS")]
+            TJS = 102,
+            
+            /// <summary>
+            /// Enum THB for value: THB
+            /// </summary>
+            [EnumMember(Value = "THB")]
+            THB = 103,
+            
+            /// <summary>
+            /// Enum ERN for value: ERN
+            /// </summary>
+            [EnumMember(Value = "ERN")]
+            ERN = 104,
+            
+            /// <summary>
+            /// Enum TMT for value: TMT
+            /// </summary>
+            [EnumMember(Value = "TMT")]
+            TMT = 105,
+            
+            /// <summary>
+            /// Enum BWP for value: BWP
+            /// </summary>
+            [EnumMember(Value = "BWP")]
+            BWP = 106,
+            
+            /// <summary>
+            /// Enum TRY for value: TRY
+            /// </summary>
+            [EnumMember(Value = "TRY")]
+            TRY = 107,
+            
+            /// <summary>
+            /// Enum UAH for value: UAH
+            /// </summary>
+            [EnumMember(Value = "UAH")]
+            UAH = 108,
+            
+            /// <summary>
+            /// Enum UZS for value: UZS
+            /// </summary>
+            [EnumMember(Value = "UZS")]
+            UZS = 109,
+            
+            /// <summary>
+            /// Enum VND for value: VND
+            /// </summary>
+            [EnumMember(Value = "VND")]
+            VND = 110,
+            
+            /// <summary>
+            /// Enum MOP for value: MOP
+            /// </summary>
+            [EnumMember(Value = "MOP")]
+            MOP = 111,
+            
+            /// <summary>
+            /// Enum TWD for value: TWD
+            /// </summary>
+            [EnumMember(Value = "TWD")]
+            TWD = 112,
+            
+            /// <summary>
+            /// Enum BMD for value: BMD
+            /// </summary>
+            [EnumMember(Value = "BMD")]
+            BMD = 113
+        }
+
+        /// <summary>
+        /// Currency
+        /// </summary>
+        /// <value>Currency</value>
+        [DataMember(Name="Currency", EmitDefaultValue=false)]
+        public CurrencyEnum Currency { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="Subscription" /> class.
         /// </summary>
@@ -77,118 +786,171 @@ protected Subscription() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="Subscription" /> class.
         /// </summary>
-        /// <param name="subscriptionId">The subscription identifier.</param>
-        /// <param name="startDate">Starting date of the subscription.</param>
-        /// <param name="status">Status of the subscription (TrialPeriod, Ongoing, Unpaid, Canceled).</param>
-        /// <param name="userId">Flipdish user identifier.</param>
-        /// <param name="subscriptionPlan">Subscription Plan.</param>
-        /// <param name="card">Card.</param>
-        /// <param name="appId">App name Id of the subscription (required).</param>
-        /// <param name="vatNumber">Last 4 digits of the card.</param>
-        /// <param name="vatCountryCode">Expiry date of the card (required).</param>
-        /// <param name="quantity">Number of physical restaurants.</param>
-        /// <param name="subscriptionPlanId">Subscription plan identifier.</param>
-        public Subscription(int? subscriptionId = default(int?), DateTime? startDate = default(DateTime?), StatusEnum? status = default(StatusEnum?), int? userId = default(int?), SubscriptionPlan subscriptionPlan = default(SubscriptionPlan), Card card = default(Card), string appId = default(string), string vatNumber = default(string), string vatCountryCode = default(string), int? quantity = default(int?), int? subscriptionPlanId = default(int?))
+        /// <param name="products">Products (required).</param>
+        /// <param name="nextInvoiceAmount">Next invoice amount.</param>
+        /// <param name="nextInvoiceBillingDate">Next invoice billing date.</param>
+        /// <param name="upcomingInvoiceItems">Upcoming invoice items.</param>
+        /// <param name="upcomingInvoiceDiscounts">Upcoming invoice discounts.</param>
+        /// <param name="upcomingInvoice">Upcoming invoice.</param>
+        /// <param name="subscriptionId">The subscription identifier (required).</param>
+        /// <param name="name">Name (required).</param>
+        /// <param name="status">Status (required).</param>
+        /// <param name="currency">Currency (required).</param>
+        /// <param name="user">User (required).</param>
+        /// <param name="defaultPaymentDescription">Default payment description.</param>
+        /// <param name="cancellationRequestDate">Cancellation Date.</param>
+        /// <param name="cancellationDate">Cancel Date.</param>
+        public Subscription(List<SubscriptionProduct> products = default(List<SubscriptionProduct>), double? nextInvoiceAmount = default(double?), DateTime? nextInvoiceBillingDate = default(DateTime?), List<InvoiceItem> upcomingInvoiceItems = default(List<InvoiceItem>), List<InvoiceDiscount> upcomingInvoiceDiscounts = default(List<InvoiceDiscount>), UpcomingInvoice upcomingInvoice = default(UpcomingInvoice), string subscriptionId = default(string), string name = default(string), StatusEnum status = default(StatusEnum), CurrencyEnum currency = default(CurrencyEnum), string user = default(string), string defaultPaymentDescription = default(string), DateTime? cancellationRequestDate = default(DateTime?), DateTime? cancellationDate = default(DateTime?))
         {
-            // to ensure "appId" is required (not null)
-            if (appId == null)
+            // to ensure "products" is required (not null)
+            if (products == null)
+            {
+                throw new InvalidDataException("products is a required property for Subscription and cannot be null");
+            }
+            else
+            {
+                this.Products = products;
+            }
+            // to ensure "subscriptionId" is required (not null)
+            if (subscriptionId == null)
+            {
+                throw new InvalidDataException("subscriptionId is a required property for Subscription and cannot be null");
+            }
+            else
+            {
+                this.SubscriptionId = subscriptionId;
+            }
+            // to ensure "name" is required (not null)
+            if (name == null)
+            {
+                throw new InvalidDataException("name is a required property for Subscription and cannot be null");
+            }
+            else
+            {
+                this.Name = name;
+            }
+            // to ensure "status" is required (not null)
+            if (status == null)
+            {
+                throw new InvalidDataException("status is a required property for Subscription and cannot be null");
+            }
+            else
+            {
+                this.Status = status;
+            }
+            // to ensure "currency" is required (not null)
+            if (currency == null)
             {
-                throw new InvalidDataException("appId is a required property for Subscription and cannot be null");
+                throw new InvalidDataException("currency is a required property for Subscription and cannot be null");
             }
             else
             {
-                this.AppId = appId;
+                this.Currency = currency;
             }
-            // to ensure "vatCountryCode" is required (not null)
-            if (vatCountryCode == null)
+            // to ensure "user" is required (not null)
+            if (user == null)
             {
-                throw new InvalidDataException("vatCountryCode is a required property for Subscription and cannot be null");
+                throw new InvalidDataException("user is a required property for Subscription and cannot be null");
             }
             else
             {
-                this.VatCountryCode = vatCountryCode;
+                this.User = user;
             }
-            this.SubscriptionId = subscriptionId;
-            this.StartDate = startDate;
-            this.Status = status;
-            this.UserId = userId;
-            this.SubscriptionPlan = subscriptionPlan;
-            this.Card = card;
-            this.VatNumber = vatNumber;
-            this.Quantity = quantity;
-            this.SubscriptionPlanId = subscriptionPlanId;
+            this.NextInvoiceAmount = nextInvoiceAmount;
+            this.NextInvoiceBillingDate = nextInvoiceBillingDate;
+            this.UpcomingInvoiceItems = upcomingInvoiceItems;
+            this.UpcomingInvoiceDiscounts = upcomingInvoiceDiscounts;
+            this.UpcomingInvoice = upcomingInvoice;
+            this.DefaultPaymentDescription = defaultPaymentDescription;
+            this.CancellationRequestDate = cancellationRequestDate;
+            this.CancellationDate = cancellationDate;
         }
         
         /// <summary>
-        /// The subscription identifier
+        /// Products
         /// </summary>
-        /// <value>The subscription identifier</value>
-        [DataMember(Name="SubscriptionId", EmitDefaultValue=false)]
-        public int? SubscriptionId { get; set; }
+        /// <value>Products</value>
+        [DataMember(Name="Products", EmitDefaultValue=false)]
+        public List<SubscriptionProduct> Products { get; set; }
 
         /// <summary>
-        /// Starting date of the subscription
+        /// Next invoice amount
         /// </summary>
-        /// <value>Starting date of the subscription</value>
-        [DataMember(Name="StartDate", EmitDefaultValue=false)]
-        public DateTime? StartDate { get; set; }
+        /// <value>Next invoice amount</value>
+        [DataMember(Name="NextInvoiceAmount", EmitDefaultValue=false)]
+        public double? NextInvoiceAmount { get; set; }
 
+        /// <summary>
+        /// Next invoice billing date
+        /// </summary>
+        /// <value>Next invoice billing date</value>
+        [DataMember(Name="NextInvoiceBillingDate", EmitDefaultValue=false)]
+        public DateTime? NextInvoiceBillingDate { get; set; }
+
+        /// <summary>
+        /// Upcoming invoice items
+        /// </summary>
+        /// <value>Upcoming invoice items</value>
+        [DataMember(Name="UpcomingInvoiceItems", EmitDefaultValue=false)]
+        public List<InvoiceItem> UpcomingInvoiceItems { get; set; }
 
         /// <summary>
-        /// Flipdish user identifier
+        /// Upcoming invoice discounts
         /// </summary>
-        /// <value>Flipdish user identifier</value>
-        [DataMember(Name="UserId", EmitDefaultValue=false)]
-        public int? UserId { get; set; }
+        /// <value>Upcoming invoice discounts</value>
+        [DataMember(Name="UpcomingInvoiceDiscounts", EmitDefaultValue=false)]
+        public List<InvoiceDiscount> UpcomingInvoiceDiscounts { get; set; }
 
         /// <summary>
-        /// Subscription Plan
+        /// Upcoming invoice
         /// </summary>
-        /// <value>Subscription Plan</value>
-        [DataMember(Name="SubscriptionPlan", EmitDefaultValue=false)]
-        public SubscriptionPlan SubscriptionPlan { get; set; }
+        /// <value>Upcoming invoice</value>
+        [DataMember(Name="UpcomingInvoice", EmitDefaultValue=false)]
+        public UpcomingInvoice UpcomingInvoice { get; set; }
 
         /// <summary>
-        /// Card
+        /// The subscription identifier
         /// </summary>
-        /// <value>Card</value>
-        [DataMember(Name="Card", EmitDefaultValue=false)]
-        public Card Card { get; set; }
+        /// <value>The subscription identifier</value>
+        [DataMember(Name="SubscriptionId", EmitDefaultValue=false)]
+        public string SubscriptionId { get; set; }
 
         /// <summary>
-        /// App name Id of the subscription
+        /// Name
         /// </summary>
-        /// <value>App name Id of the subscription</value>
-        [DataMember(Name="AppId", EmitDefaultValue=false)]
-        public string AppId { get; set; }
+        /// <value>Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+
 
         /// <summary>
-        /// Last 4 digits of the card
+        /// User
         /// </summary>
-        /// <value>Last 4 digits of the card</value>
-        [DataMember(Name="VatNumber", EmitDefaultValue=false)]
-        public string VatNumber { get; set; }
+        /// <value>User</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public string User { get; set; }
 
         /// <summary>
-        /// Expiry date of the card
+        /// Default payment description
         /// </summary>
-        /// <value>Expiry date of the card</value>
-        [DataMember(Name="VatCountryCode", EmitDefaultValue=false)]
-        public string VatCountryCode { get; set; }
+        /// <value>Default payment description</value>
+        [DataMember(Name="DefaultPaymentDescription", EmitDefaultValue=false)]
+        public string DefaultPaymentDescription { get; set; }
 
         /// <summary>
-        /// Number of physical restaurants
+        /// Cancellation Date
         /// </summary>
-        /// <value>Number of physical restaurants</value>
-        [DataMember(Name="Quantity", EmitDefaultValue=false)]
-        public int? Quantity { get; set; }
+        /// <value>Cancellation Date</value>
+        [DataMember(Name="CancellationRequestDate", EmitDefaultValue=false)]
+        public DateTime? CancellationRequestDate { get; set; }
 
         /// <summary>
-        /// Subscription plan identifier
+        /// Cancel Date
         /// </summary>
-        /// <value>Subscription plan identifier</value>
-        [DataMember(Name="SubscriptionPlanId", EmitDefaultValue=false)]
-        public int? SubscriptionPlanId { get; set; }
+        /// <value>Cancel Date</value>
+        [DataMember(Name="CancellationDate", EmitDefaultValue=false)]
+        public DateTime? CancellationDate { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -198,17 +960,20 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class Subscription {\n");
+            sb.Append("  Products: ").Append(Products).Append("\n");
+            sb.Append("  NextInvoiceAmount: ").Append(NextInvoiceAmount).Append("\n");
+            sb.Append("  NextInvoiceBillingDate: ").Append(NextInvoiceBillingDate).Append("\n");
+            sb.Append("  UpcomingInvoiceItems: ").Append(UpcomingInvoiceItems).Append("\n");
+            sb.Append("  UpcomingInvoiceDiscounts: ").Append(UpcomingInvoiceDiscounts).Append("\n");
+            sb.Append("  UpcomingInvoice: ").Append(UpcomingInvoice).Append("\n");
             sb.Append("  SubscriptionId: ").Append(SubscriptionId).Append("\n");
-            sb.Append("  StartDate: ").Append(StartDate).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Status: ").Append(Status).Append("\n");
-            sb.Append("  UserId: ").Append(UserId).Append("\n");
-            sb.Append("  SubscriptionPlan: ").Append(SubscriptionPlan).Append("\n");
-            sb.Append("  Card: ").Append(Card).Append("\n");
-            sb.Append("  AppId: ").Append(AppId).Append("\n");
-            sb.Append("  VatNumber: ").Append(VatNumber).Append("\n");
-            sb.Append("  VatCountryCode: ").Append(VatCountryCode).Append("\n");
-            sb.Append("  Quantity: ").Append(Quantity).Append("\n");
-            sb.Append("  SubscriptionPlanId: ").Append(SubscriptionPlanId).Append("\n");
+            sb.Append("  Currency: ").Append(Currency).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  DefaultPaymentDescription: ").Append(DefaultPaymentDescription).Append("\n");
+            sb.Append("  CancellationRequestDate: ").Append(CancellationRequestDate).Append("\n");
+            sb.Append("  CancellationDate: ").Append(CancellationDate).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -244,59 +1009,74 @@ public bool Equals(Subscription input)
 
             return 
                 (
-                    this.SubscriptionId == input.SubscriptionId ||
-                    (this.SubscriptionId != null &&
-                    this.SubscriptionId.Equals(input.SubscriptionId))
+                    this.Products == input.Products ||
+                    this.Products != null &&
+                    this.Products.SequenceEqual(input.Products)
                 ) && 
                 (
-                    this.StartDate == input.StartDate ||
-                    (this.StartDate != null &&
-                    this.StartDate.Equals(input.StartDate))
+                    this.NextInvoiceAmount == input.NextInvoiceAmount ||
+                    (this.NextInvoiceAmount != null &&
+                    this.NextInvoiceAmount.Equals(input.NextInvoiceAmount))
                 ) && 
                 (
-                    this.Status == input.Status ||
-                    (this.Status != null &&
-                    this.Status.Equals(input.Status))
+                    this.NextInvoiceBillingDate == input.NextInvoiceBillingDate ||
+                    (this.NextInvoiceBillingDate != null &&
+                    this.NextInvoiceBillingDate.Equals(input.NextInvoiceBillingDate))
+                ) && 
+                (
+                    this.UpcomingInvoiceItems == input.UpcomingInvoiceItems ||
+                    this.UpcomingInvoiceItems != null &&
+                    this.UpcomingInvoiceItems.SequenceEqual(input.UpcomingInvoiceItems)
+                ) && 
+                (
+                    this.UpcomingInvoiceDiscounts == input.UpcomingInvoiceDiscounts ||
+                    this.UpcomingInvoiceDiscounts != null &&
+                    this.UpcomingInvoiceDiscounts.SequenceEqual(input.UpcomingInvoiceDiscounts)
                 ) && 
                 (
-                    this.UserId == input.UserId ||
-                    (this.UserId != null &&
-                    this.UserId.Equals(input.UserId))
+                    this.UpcomingInvoice == input.UpcomingInvoice ||
+                    (this.UpcomingInvoice != null &&
+                    this.UpcomingInvoice.Equals(input.UpcomingInvoice))
                 ) && 
                 (
-                    this.SubscriptionPlan == input.SubscriptionPlan ||
-                    (this.SubscriptionPlan != null &&
-                    this.SubscriptionPlan.Equals(input.SubscriptionPlan))
+                    this.SubscriptionId == input.SubscriptionId ||
+                    (this.SubscriptionId != null &&
+                    this.SubscriptionId.Equals(input.SubscriptionId))
                 ) && 
                 (
-                    this.Card == input.Card ||
-                    (this.Card != null &&
-                    this.Card.Equals(input.Card))
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
                 ) && 
                 (
-                    this.AppId == input.AppId ||
-                    (this.AppId != null &&
-                    this.AppId.Equals(input.AppId))
+                    this.Status == input.Status ||
+                    (this.Status != null &&
+                    this.Status.Equals(input.Status))
                 ) && 
                 (
-                    this.VatNumber == input.VatNumber ||
-                    (this.VatNumber != null &&
-                    this.VatNumber.Equals(input.VatNumber))
+                    this.Currency == input.Currency ||
+                    (this.Currency != null &&
+                    this.Currency.Equals(input.Currency))
                 ) && 
                 (
-                    this.VatCountryCode == input.VatCountryCode ||
-                    (this.VatCountryCode != null &&
-                    this.VatCountryCode.Equals(input.VatCountryCode))
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
                 ) && 
                 (
-                    this.Quantity == input.Quantity ||
-                    (this.Quantity != null &&
-                    this.Quantity.Equals(input.Quantity))
+                    this.DefaultPaymentDescription == input.DefaultPaymentDescription ||
+                    (this.DefaultPaymentDescription != null &&
+                    this.DefaultPaymentDescription.Equals(input.DefaultPaymentDescription))
                 ) && 
                 (
-                    this.SubscriptionPlanId == input.SubscriptionPlanId ||
-                    (this.SubscriptionPlanId != null &&
-                    this.SubscriptionPlanId.Equals(input.SubscriptionPlanId))
+                    this.CancellationRequestDate == input.CancellationRequestDate ||
+                    (this.CancellationRequestDate != null &&
+                    this.CancellationRequestDate.Equals(input.CancellationRequestDate))
+                ) && 
+                (
+                    this.CancellationDate == input.CancellationDate ||
+                    (this.CancellationDate != null &&
+                    this.CancellationDate.Equals(input.CancellationDate))
                 );
         }
 
@@ -309,41 +1089,37 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.Products != null)
+                    hashCode = hashCode * 59 + this.Products.GetHashCode();
+                if (this.NextInvoiceAmount != null)
+                    hashCode = hashCode * 59 + this.NextInvoiceAmount.GetHashCode();
+                if (this.NextInvoiceBillingDate != null)
+                    hashCode = hashCode * 59 + this.NextInvoiceBillingDate.GetHashCode();
+                if (this.UpcomingInvoiceItems != null)
+                    hashCode = hashCode * 59 + this.UpcomingInvoiceItems.GetHashCode();
+                if (this.UpcomingInvoiceDiscounts != null)
+                    hashCode = hashCode * 59 + this.UpcomingInvoiceDiscounts.GetHashCode();
+                if (this.UpcomingInvoice != null)
+                    hashCode = hashCode * 59 + this.UpcomingInvoice.GetHashCode();
                 if (this.SubscriptionId != null)
                     hashCode = hashCode * 59 + this.SubscriptionId.GetHashCode();
-                if (this.StartDate != null)
-                    hashCode = hashCode * 59 + this.StartDate.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Status != null)
                     hashCode = hashCode * 59 + this.Status.GetHashCode();
-                if (this.UserId != null)
-                    hashCode = hashCode * 59 + this.UserId.GetHashCode();
-                if (this.SubscriptionPlan != null)
-                    hashCode = hashCode * 59 + this.SubscriptionPlan.GetHashCode();
-                if (this.Card != null)
-                    hashCode = hashCode * 59 + this.Card.GetHashCode();
-                if (this.AppId != null)
-                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
-                if (this.VatNumber != null)
-                    hashCode = hashCode * 59 + this.VatNumber.GetHashCode();
-                if (this.VatCountryCode != null)
-                    hashCode = hashCode * 59 + this.VatCountryCode.GetHashCode();
-                if (this.Quantity != null)
-                    hashCode = hashCode * 59 + this.Quantity.GetHashCode();
-                if (this.SubscriptionPlanId != null)
-                    hashCode = hashCode * 59 + this.SubscriptionPlanId.GetHashCode();
+                if (this.Currency != null)
+                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.DefaultPaymentDescription != null)
+                    hashCode = hashCode * 59 + this.DefaultPaymentDescription.GetHashCode();
+                if (this.CancellationRequestDate != null)
+                    hashCode = hashCode * 59 + this.CancellationRequestDate.GetHashCode();
+                if (this.CancellationDate != null)
+                    hashCode = hashCode * 59 + this.CancellationDate.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/SubscriptionBase.cs b/src/Flipdish/Model/SubscriptionBase.cs
deleted file mode 100644
index 5b64c5f6..00000000
--- a/src/Flipdish/Model/SubscriptionBase.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Subscription Base
-    /// </summary>
-    [DataContract]
-    public partial class SubscriptionBase :  IEquatable<SubscriptionBase>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SubscriptionBase" /> class.
-        /// </summary>
-        /// <param name="quantity">Number of physical restaurants.</param>
-        /// <param name="subscriptionPlanId">Subscription plan identifier.</param>
-        public SubscriptionBase(int? quantity = default(int?), int? subscriptionPlanId = default(int?))
-        {
-            this.Quantity = quantity;
-            this.SubscriptionPlanId = subscriptionPlanId;
-        }
-        
-        /// <summary>
-        /// Number of physical restaurants
-        /// </summary>
-        /// <value>Number of physical restaurants</value>
-        [DataMember(Name="Quantity", EmitDefaultValue=false)]
-        public int? Quantity { get; set; }
-
-        /// <summary>
-        /// Subscription plan identifier
-        /// </summary>
-        /// <value>Subscription plan identifier</value>
-        [DataMember(Name="SubscriptionPlanId", EmitDefaultValue=false)]
-        public int? SubscriptionPlanId { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class SubscriptionBase {\n");
-            sb.Append("  Quantity: ").Append(Quantity).Append("\n");
-            sb.Append("  SubscriptionPlanId: ").Append(SubscriptionPlanId).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as SubscriptionBase);
-        }
-
-        /// <summary>
-        /// Returns true if SubscriptionBase instances are equal
-        /// </summary>
-        /// <param name="input">Instance of SubscriptionBase to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(SubscriptionBase input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Quantity == input.Quantity ||
-                    (this.Quantity != null &&
-                    this.Quantity.Equals(input.Quantity))
-                ) && 
-                (
-                    this.SubscriptionPlanId == input.SubscriptionPlanId ||
-                    (this.SubscriptionPlanId != null &&
-                    this.SubscriptionPlanId.Equals(input.SubscriptionPlanId))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Quantity != null)
-                    hashCode = hashCode * 59 + this.Quantity.GetHashCode();
-                if (this.SubscriptionPlanId != null)
-                    hashCode = hashCode * 59 + this.SubscriptionPlanId.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/SubscriptionInvoice.cs b/src/Flipdish/Model/SubscriptionInvoice.cs
new file mode 100644
index 00000000..9256665c
--- /dev/null
+++ b/src/Flipdish/Model/SubscriptionInvoice.cs
@@ -0,0 +1,1070 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Invoice
+    /// </summary>
+    [DataContract]
+    public partial class SubscriptionInvoice :  IEquatable<SubscriptionInvoice>
+    {
+        /// <summary>
+        /// Currency
+        /// </summary>
+        /// <value>Currency</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum CurrencyEnum
+        {
+            
+            /// <summary>
+            /// Enum EUR for value: EUR
+            /// </summary>
+            [EnumMember(Value = "EUR")]
+            EUR = 1,
+            
+            /// <summary>
+            /// Enum USD for value: USD
+            /// </summary>
+            [EnumMember(Value = "USD")]
+            USD = 2,
+            
+            /// <summary>
+            /// Enum GBP for value: GBP
+            /// </summary>
+            [EnumMember(Value = "GBP")]
+            GBP = 3,
+            
+            /// <summary>
+            /// Enum CAD for value: CAD
+            /// </summary>
+            [EnumMember(Value = "CAD")]
+            CAD = 4,
+            
+            /// <summary>
+            /// Enum AUD for value: AUD
+            /// </summary>
+            [EnumMember(Value = "AUD")]
+            AUD = 5,
+            
+            /// <summary>
+            /// Enum DJF for value: DJF
+            /// </summary>
+            [EnumMember(Value = "DJF")]
+            DJF = 6,
+            
+            /// <summary>
+            /// Enum ZAR for value: ZAR
+            /// </summary>
+            [EnumMember(Value = "ZAR")]
+            ZAR = 7,
+            
+            /// <summary>
+            /// Enum ETB for value: ETB
+            /// </summary>
+            [EnumMember(Value = "ETB")]
+            ETB = 8,
+            
+            /// <summary>
+            /// Enum AED for value: AED
+            /// </summary>
+            [EnumMember(Value = "AED")]
+            AED = 9,
+            
+            /// <summary>
+            /// Enum BHD for value: BHD
+            /// </summary>
+            [EnumMember(Value = "BHD")]
+            BHD = 10,
+            
+            /// <summary>
+            /// Enum DZD for value: DZD
+            /// </summary>
+            [EnumMember(Value = "DZD")]
+            DZD = 11,
+            
+            /// <summary>
+            /// Enum EGP for value: EGP
+            /// </summary>
+            [EnumMember(Value = "EGP")]
+            EGP = 12,
+            
+            /// <summary>
+            /// Enum IQD for value: IQD
+            /// </summary>
+            [EnumMember(Value = "IQD")]
+            IQD = 13,
+            
+            /// <summary>
+            /// Enum JOD for value: JOD
+            /// </summary>
+            [EnumMember(Value = "JOD")]
+            JOD = 14,
+            
+            /// <summary>
+            /// Enum KWD for value: KWD
+            /// </summary>
+            [EnumMember(Value = "KWD")]
+            KWD = 15,
+            
+            /// <summary>
+            /// Enum LBP for value: LBP
+            /// </summary>
+            [EnumMember(Value = "LBP")]
+            LBP = 16,
+            
+            /// <summary>
+            /// Enum LYD for value: LYD
+            /// </summary>
+            [EnumMember(Value = "LYD")]
+            LYD = 17,
+            
+            /// <summary>
+            /// Enum MAD for value: MAD
+            /// </summary>
+            [EnumMember(Value = "MAD")]
+            MAD = 18,
+            
+            /// <summary>
+            /// Enum OMR for value: OMR
+            /// </summary>
+            [EnumMember(Value = "OMR")]
+            OMR = 19,
+            
+            /// <summary>
+            /// Enum QAR for value: QAR
+            /// </summary>
+            [EnumMember(Value = "QAR")]
+            QAR = 20,
+            
+            /// <summary>
+            /// Enum SAR for value: SAR
+            /// </summary>
+            [EnumMember(Value = "SAR")]
+            SAR = 21,
+            
+            /// <summary>
+            /// Enum SYP for value: SYP
+            /// </summary>
+            [EnumMember(Value = "SYP")]
+            SYP = 22,
+            
+            /// <summary>
+            /// Enum TND for value: TND
+            /// </summary>
+            [EnumMember(Value = "TND")]
+            TND = 23,
+            
+            /// <summary>
+            /// Enum YER for value: YER
+            /// </summary>
+            [EnumMember(Value = "YER")]
+            YER = 24,
+            
+            /// <summary>
+            /// Enum CLP for value: CLP
+            /// </summary>
+            [EnumMember(Value = "CLP")]
+            CLP = 25,
+            
+            /// <summary>
+            /// Enum INR for value: INR
+            /// </summary>
+            [EnumMember(Value = "INR")]
+            INR = 26,
+            
+            /// <summary>
+            /// Enum AZN for value: AZN
+            /// </summary>
+            [EnumMember(Value = "AZN")]
+            AZN = 27,
+            
+            /// <summary>
+            /// Enum RUB for value: RUB
+            /// </summary>
+            [EnumMember(Value = "RUB")]
+            RUB = 28,
+            
+            /// <summary>
+            /// Enum BYN for value: BYN
+            /// </summary>
+            [EnumMember(Value = "BYN")]
+            BYN = 29,
+            
+            /// <summary>
+            /// Enum BGN for value: BGN
+            /// </summary>
+            [EnumMember(Value = "BGN")]
+            BGN = 30,
+            
+            /// <summary>
+            /// Enum NGN for value: NGN
+            /// </summary>
+            [EnumMember(Value = "NGN")]
+            NGN = 31,
+            
+            /// <summary>
+            /// Enum BDT for value: BDT
+            /// </summary>
+            [EnumMember(Value = "BDT")]
+            BDT = 32,
+            
+            /// <summary>
+            /// Enum CNY for value: CNY
+            /// </summary>
+            [EnumMember(Value = "CNY")]
+            CNY = 33,
+            
+            /// <summary>
+            /// Enum BAM for value: BAM
+            /// </summary>
+            [EnumMember(Value = "BAM")]
+            BAM = 34,
+            
+            /// <summary>
+            /// Enum CZK for value: CZK
+            /// </summary>
+            [EnumMember(Value = "CZK")]
+            CZK = 35,
+            
+            /// <summary>
+            /// Enum DKK for value: DKK
+            /// </summary>
+            [EnumMember(Value = "DKK")]
+            DKK = 36,
+            
+            /// <summary>
+            /// Enum CHF for value: CHF
+            /// </summary>
+            [EnumMember(Value = "CHF")]
+            CHF = 37,
+            
+            /// <summary>
+            /// Enum MVR for value: MVR
+            /// </summary>
+            [EnumMember(Value = "MVR")]
+            MVR = 38,
+            
+            /// <summary>
+            /// Enum BTN for value: BTN
+            /// </summary>
+            [EnumMember(Value = "BTN")]
+            BTN = 39,
+            
+            /// <summary>
+            /// Enum XCD for value: XCD
+            /// </summary>
+            [EnumMember(Value = "XCD")]
+            XCD = 40,
+            
+            /// <summary>
+            /// Enum BZD for value: BZD
+            /// </summary>
+            [EnumMember(Value = "BZD")]
+            BZD = 41,
+            
+            /// <summary>
+            /// Enum HKD for value: HKD
+            /// </summary>
+            [EnumMember(Value = "HKD")]
+            HKD = 42,
+            
+            /// <summary>
+            /// Enum IDR for value: IDR
+            /// </summary>
+            [EnumMember(Value = "IDR")]
+            IDR = 43,
+            
+            /// <summary>
+            /// Enum JMD for value: JMD
+            /// </summary>
+            [EnumMember(Value = "JMD")]
+            JMD = 44,
+            
+            /// <summary>
+            /// Enum MYR for value: MYR
+            /// </summary>
+            [EnumMember(Value = "MYR")]
+            MYR = 45,
+            
+            /// <summary>
+            /// Enum NZD for value: NZD
+            /// </summary>
+            [EnumMember(Value = "NZD")]
+            NZD = 46,
+            
+            /// <summary>
+            /// Enum PHP for value: PHP
+            /// </summary>
+            [EnumMember(Value = "PHP")]
+            PHP = 47,
+            
+            /// <summary>
+            /// Enum SGD for value: SGD
+            /// </summary>
+            [EnumMember(Value = "SGD")]
+            SGD = 48,
+            
+            /// <summary>
+            /// Enum TTD for value: TTD
+            /// </summary>
+            [EnumMember(Value = "TTD")]
+            TTD = 49,
+            
+            /// <summary>
+            /// Enum XDR for value: XDR
+            /// </summary>
+            [EnumMember(Value = "XDR")]
+            XDR = 50,
+            
+            /// <summary>
+            /// Enum ARS for value: ARS
+            /// </summary>
+            [EnumMember(Value = "ARS")]
+            ARS = 51,
+            
+            /// <summary>
+            /// Enum BOB for value: BOB
+            /// </summary>
+            [EnumMember(Value = "BOB")]
+            BOB = 52,
+            
+            /// <summary>
+            /// Enum COP for value: COP
+            /// </summary>
+            [EnumMember(Value = "COP")]
+            COP = 53,
+            
+            /// <summary>
+            /// Enum CRC for value: CRC
+            /// </summary>
+            [EnumMember(Value = "CRC")]
+            CRC = 54,
+            
+            /// <summary>
+            /// Enum CUP for value: CUP
+            /// </summary>
+            [EnumMember(Value = "CUP")]
+            CUP = 55,
+            
+            /// <summary>
+            /// Enum DOP for value: DOP
+            /// </summary>
+            [EnumMember(Value = "DOP")]
+            DOP = 56,
+            
+            /// <summary>
+            /// Enum GTQ for value: GTQ
+            /// </summary>
+            [EnumMember(Value = "GTQ")]
+            GTQ = 57,
+            
+            /// <summary>
+            /// Enum HNL for value: HNL
+            /// </summary>
+            [EnumMember(Value = "HNL")]
+            HNL = 58,
+            
+            /// <summary>
+            /// Enum MXN for value: MXN
+            /// </summary>
+            [EnumMember(Value = "MXN")]
+            MXN = 59,
+            
+            /// <summary>
+            /// Enum NIO for value: NIO
+            /// </summary>
+            [EnumMember(Value = "NIO")]
+            NIO = 60,
+            
+            /// <summary>
+            /// Enum PAB for value: PAB
+            /// </summary>
+            [EnumMember(Value = "PAB")]
+            PAB = 61,
+            
+            /// <summary>
+            /// Enum PEN for value: PEN
+            /// </summary>
+            [EnumMember(Value = "PEN")]
+            PEN = 62,
+            
+            /// <summary>
+            /// Enum PYG for value: PYG
+            /// </summary>
+            [EnumMember(Value = "PYG")]
+            PYG = 63,
+            
+            /// <summary>
+            /// Enum UYU for value: UYU
+            /// </summary>
+            [EnumMember(Value = "UYU")]
+            UYU = 64,
+            
+            /// <summary>
+            /// Enum VEF for value: VEF
+            /// </summary>
+            [EnumMember(Value = "VEF")]
+            VEF = 65,
+            
+            /// <summary>
+            /// Enum IRR for value: IRR
+            /// </summary>
+            [EnumMember(Value = "IRR")]
+            IRR = 66,
+            
+            /// <summary>
+            /// Enum XOF for value: XOF
+            /// </summary>
+            [EnumMember(Value = "XOF")]
+            XOF = 67,
+            
+            /// <summary>
+            /// Enum CDF for value: CDF
+            /// </summary>
+            [EnumMember(Value = "CDF")]
+            CDF = 68,
+            
+            /// <summary>
+            /// Enum XAF for value: XAF
+            /// </summary>
+            [EnumMember(Value = "XAF")]
+            XAF = 69,
+            
+            /// <summary>
+            /// Enum HTG for value: HTG
+            /// </summary>
+            [EnumMember(Value = "HTG")]
+            HTG = 70,
+            
+            /// <summary>
+            /// Enum ILS for value: ILS
+            /// </summary>
+            [EnumMember(Value = "ILS")]
+            ILS = 71,
+            
+            /// <summary>
+            /// Enum HRK for value: HRK
+            /// </summary>
+            [EnumMember(Value = "HRK")]
+            HRK = 72,
+            
+            /// <summary>
+            /// Enum HUF for value: HUF
+            /// </summary>
+            [EnumMember(Value = "HUF")]
+            HUF = 73,
+            
+            /// <summary>
+            /// Enum AMD for value: AMD
+            /// </summary>
+            [EnumMember(Value = "AMD")]
+            AMD = 74,
+            
+            /// <summary>
+            /// Enum ISK for value: ISK
+            /// </summary>
+            [EnumMember(Value = "ISK")]
+            ISK = 75,
+            
+            /// <summary>
+            /// Enum JPY for value: JPY
+            /// </summary>
+            [EnumMember(Value = "JPY")]
+            JPY = 76,
+            
+            /// <summary>
+            /// Enum GEL for value: GEL
+            /// </summary>
+            [EnumMember(Value = "GEL")]
+            GEL = 77,
+            
+            /// <summary>
+            /// Enum KZT for value: KZT
+            /// </summary>
+            [EnumMember(Value = "KZT")]
+            KZT = 78,
+            
+            /// <summary>
+            /// Enum KHR for value: KHR
+            /// </summary>
+            [EnumMember(Value = "KHR")]
+            KHR = 79,
+            
+            /// <summary>
+            /// Enum KRW for value: KRW
+            /// </summary>
+            [EnumMember(Value = "KRW")]
+            KRW = 80,
+            
+            /// <summary>
+            /// Enum KGS for value: KGS
+            /// </summary>
+            [EnumMember(Value = "KGS")]
+            KGS = 81,
+            
+            /// <summary>
+            /// Enum LAK for value: LAK
+            /// </summary>
+            [EnumMember(Value = "LAK")]
+            LAK = 82,
+            
+            /// <summary>
+            /// Enum MKD for value: MKD
+            /// </summary>
+            [EnumMember(Value = "MKD")]
+            MKD = 83,
+            
+            /// <summary>
+            /// Enum MNT for value: MNT
+            /// </summary>
+            [EnumMember(Value = "MNT")]
+            MNT = 84,
+            
+            /// <summary>
+            /// Enum BND for value: BND
+            /// </summary>
+            [EnumMember(Value = "BND")]
+            BND = 85,
+            
+            /// <summary>
+            /// Enum MMK for value: MMK
+            /// </summary>
+            [EnumMember(Value = "MMK")]
+            MMK = 86,
+            
+            /// <summary>
+            /// Enum NOK for value: NOK
+            /// </summary>
+            [EnumMember(Value = "NOK")]
+            NOK = 87,
+            
+            /// <summary>
+            /// Enum NPR for value: NPR
+            /// </summary>
+            [EnumMember(Value = "NPR")]
+            NPR = 88,
+            
+            /// <summary>
+            /// Enum PKR for value: PKR
+            /// </summary>
+            [EnumMember(Value = "PKR")]
+            PKR = 89,
+            
+            /// <summary>
+            /// Enum PLN for value: PLN
+            /// </summary>
+            [EnumMember(Value = "PLN")]
+            PLN = 90,
+            
+            /// <summary>
+            /// Enum AFN for value: AFN
+            /// </summary>
+            [EnumMember(Value = "AFN")]
+            AFN = 91,
+            
+            /// <summary>
+            /// Enum BRL for value: BRL
+            /// </summary>
+            [EnumMember(Value = "BRL")]
+            BRL = 92,
+            
+            /// <summary>
+            /// Enum MDL for value: MDL
+            /// </summary>
+            [EnumMember(Value = "MDL")]
+            MDL = 93,
+            
+            /// <summary>
+            /// Enum RON for value: RON
+            /// </summary>
+            [EnumMember(Value = "RON")]
+            RON = 94,
+            
+            /// <summary>
+            /// Enum RWF for value: RWF
+            /// </summary>
+            [EnumMember(Value = "RWF")]
+            RWF = 95,
+            
+            /// <summary>
+            /// Enum SEK for value: SEK
+            /// </summary>
+            [EnumMember(Value = "SEK")]
+            SEK = 96,
+            
+            /// <summary>
+            /// Enum LKR for value: LKR
+            /// </summary>
+            [EnumMember(Value = "LKR")]
+            LKR = 97,
+            
+            /// <summary>
+            /// Enum SOS for value: SOS
+            /// </summary>
+            [EnumMember(Value = "SOS")]
+            SOS = 98,
+            
+            /// <summary>
+            /// Enum ALL for value: ALL
+            /// </summary>
+            [EnumMember(Value = "ALL")]
+            ALL = 99,
+            
+            /// <summary>
+            /// Enum RSD for value: RSD
+            /// </summary>
+            [EnumMember(Value = "RSD")]
+            RSD = 100,
+            
+            /// <summary>
+            /// Enum KES for value: KES
+            /// </summary>
+            [EnumMember(Value = "KES")]
+            KES = 101,
+            
+            /// <summary>
+            /// Enum TJS for value: TJS
+            /// </summary>
+            [EnumMember(Value = "TJS")]
+            TJS = 102,
+            
+            /// <summary>
+            /// Enum THB for value: THB
+            /// </summary>
+            [EnumMember(Value = "THB")]
+            THB = 103,
+            
+            /// <summary>
+            /// Enum ERN for value: ERN
+            /// </summary>
+            [EnumMember(Value = "ERN")]
+            ERN = 104,
+            
+            /// <summary>
+            /// Enum TMT for value: TMT
+            /// </summary>
+            [EnumMember(Value = "TMT")]
+            TMT = 105,
+            
+            /// <summary>
+            /// Enum BWP for value: BWP
+            /// </summary>
+            [EnumMember(Value = "BWP")]
+            BWP = 106,
+            
+            /// <summary>
+            /// Enum TRY for value: TRY
+            /// </summary>
+            [EnumMember(Value = "TRY")]
+            TRY = 107,
+            
+            /// <summary>
+            /// Enum UAH for value: UAH
+            /// </summary>
+            [EnumMember(Value = "UAH")]
+            UAH = 108,
+            
+            /// <summary>
+            /// Enum UZS for value: UZS
+            /// </summary>
+            [EnumMember(Value = "UZS")]
+            UZS = 109,
+            
+            /// <summary>
+            /// Enum VND for value: VND
+            /// </summary>
+            [EnumMember(Value = "VND")]
+            VND = 110,
+            
+            /// <summary>
+            /// Enum MOP for value: MOP
+            /// </summary>
+            [EnumMember(Value = "MOP")]
+            MOP = 111,
+            
+            /// <summary>
+            /// Enum TWD for value: TWD
+            /// </summary>
+            [EnumMember(Value = "TWD")]
+            TWD = 112,
+            
+            /// <summary>
+            /// Enum BMD for value: BMD
+            /// </summary>
+            [EnumMember(Value = "BMD")]
+            BMD = 113
+        }
+
+        /// <summary>
+        /// Currency
+        /// </summary>
+        /// <value>Currency</value>
+        [DataMember(Name="Currency", EmitDefaultValue=false)]
+        public CurrencyEnum Currency { get; set; }
+        /// <summary>
+        /// Status
+        /// </summary>
+        /// <value>Status</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum StatusEnum
+        {
+            
+            /// <summary>
+            /// Enum Draft for value: Draft
+            /// </summary>
+            [EnumMember(Value = "Draft")]
+            Draft = 1,
+            
+            /// <summary>
+            /// Enum Open for value: Open
+            /// </summary>
+            [EnumMember(Value = "Open")]
+            Open = 2,
+            
+            /// <summary>
+            /// Enum Paid for value: Paid
+            /// </summary>
+            [EnumMember(Value = "Paid")]
+            Paid = 3,
+            
+            /// <summary>
+            /// Enum UnCollectible for value: UnCollectible
+            /// </summary>
+            [EnumMember(Value = "UnCollectible")]
+            UnCollectible = 4,
+            
+            /// <summary>
+            /// Enum Void for value: Void
+            /// </summary>
+            [EnumMember(Value = "Void")]
+            Void = 5
+        }
+
+        /// <summary>
+        /// Status
+        /// </summary>
+        /// <value>Status</value>
+        [DataMember(Name="Status", EmitDefaultValue=false)]
+        public StatusEnum Status { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubscriptionInvoice" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected SubscriptionInvoice() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubscriptionInvoice" /> class.
+        /// </summary>
+        /// <param name="invoiceId">The invoice identifier (required).</param>
+        /// <param name="number">Invoice number (required).</param>
+        /// <param name="total">Total.</param>
+        /// <param name="currency">Currency (required).</param>
+        /// <param name="status">Status (required).</param>
+        /// <param name="subscriptionId">The subscription identifier.</param>
+        /// <param name="paidAt">Paid At.</param>
+        /// <param name="finalisedAt">Finalised At.</param>
+        /// <param name="pdfLink">Pdf Link (required).</param>
+        /// <param name="hostedUrl">Hosted Url (required).</param>
+        /// <param name="overdue">Overdue (required).</param>
+        public SubscriptionInvoice(string invoiceId = default(string), string number = default(string), double? total = default(double?), CurrencyEnum currency = default(CurrencyEnum), StatusEnum status = default(StatusEnum), string subscriptionId = default(string), DateTime? paidAt = default(DateTime?), DateTime? finalisedAt = default(DateTime?), string pdfLink = default(string), string hostedUrl = default(string), bool? overdue = default(bool?))
+        {
+            // to ensure "invoiceId" is required (not null)
+            if (invoiceId == null)
+            {
+                throw new InvalidDataException("invoiceId is a required property for SubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.InvoiceId = invoiceId;
+            }
+            // to ensure "number" is required (not null)
+            if (number == null)
+            {
+                throw new InvalidDataException("number is a required property for SubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.Number = number;
+            }
+            // to ensure "currency" is required (not null)
+            if (currency == null)
+            {
+                throw new InvalidDataException("currency is a required property for SubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.Currency = currency;
+            }
+            // to ensure "status" is required (not null)
+            if (status == null)
+            {
+                throw new InvalidDataException("status is a required property for SubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.Status = status;
+            }
+            // to ensure "pdfLink" is required (not null)
+            if (pdfLink == null)
+            {
+                throw new InvalidDataException("pdfLink is a required property for SubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.PdfLink = pdfLink;
+            }
+            // to ensure "hostedUrl" is required (not null)
+            if (hostedUrl == null)
+            {
+                throw new InvalidDataException("hostedUrl is a required property for SubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.HostedUrl = hostedUrl;
+            }
+            // to ensure "overdue" is required (not null)
+            if (overdue == null)
+            {
+                throw new InvalidDataException("overdue is a required property for SubscriptionInvoice and cannot be null");
+            }
+            else
+            {
+                this.Overdue = overdue;
+            }
+            this.Total = total;
+            this.SubscriptionId = subscriptionId;
+            this.PaidAt = paidAt;
+            this.FinalisedAt = finalisedAt;
+        }
+        
+        /// <summary>
+        /// The invoice identifier
+        /// </summary>
+        /// <value>The invoice identifier</value>
+        [DataMember(Name="InvoiceId", EmitDefaultValue=false)]
+        public string InvoiceId { get; set; }
+
+        /// <summary>
+        /// Invoice number
+        /// </summary>
+        /// <value>Invoice number</value>
+        [DataMember(Name="Number", EmitDefaultValue=false)]
+        public string Number { get; set; }
+
+        /// <summary>
+        /// Total
+        /// </summary>
+        /// <value>Total</value>
+        [DataMember(Name="Total", EmitDefaultValue=false)]
+        public double? Total { get; set; }
+
+
+
+        /// <summary>
+        /// The subscription identifier
+        /// </summary>
+        /// <value>The subscription identifier</value>
+        [DataMember(Name="SubscriptionId", EmitDefaultValue=false)]
+        public string SubscriptionId { get; set; }
+
+        /// <summary>
+        /// Paid At
+        /// </summary>
+        /// <value>Paid At</value>
+        [DataMember(Name="PaidAt", EmitDefaultValue=false)]
+        public DateTime? PaidAt { get; set; }
+
+        /// <summary>
+        /// Finalised At
+        /// </summary>
+        /// <value>Finalised At</value>
+        [DataMember(Name="FinalisedAt", EmitDefaultValue=false)]
+        public DateTime? FinalisedAt { get; set; }
+
+        /// <summary>
+        /// Pdf Link
+        /// </summary>
+        /// <value>Pdf Link</value>
+        [DataMember(Name="PdfLink", EmitDefaultValue=false)]
+        public string PdfLink { get; set; }
+
+        /// <summary>
+        /// Hosted Url
+        /// </summary>
+        /// <value>Hosted Url</value>
+        [DataMember(Name="HostedUrl", EmitDefaultValue=false)]
+        public string HostedUrl { get; set; }
+
+        /// <summary>
+        /// Overdue
+        /// </summary>
+        /// <value>Overdue</value>
+        [DataMember(Name="Overdue", EmitDefaultValue=false)]
+        public bool? Overdue { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SubscriptionInvoice {\n");
+            sb.Append("  InvoiceId: ").Append(InvoiceId).Append("\n");
+            sb.Append("  Number: ").Append(Number).Append("\n");
+            sb.Append("  Total: ").Append(Total).Append("\n");
+            sb.Append("  Currency: ").Append(Currency).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  SubscriptionId: ").Append(SubscriptionId).Append("\n");
+            sb.Append("  PaidAt: ").Append(PaidAt).Append("\n");
+            sb.Append("  FinalisedAt: ").Append(FinalisedAt).Append("\n");
+            sb.Append("  PdfLink: ").Append(PdfLink).Append("\n");
+            sb.Append("  HostedUrl: ").Append(HostedUrl).Append("\n");
+            sb.Append("  Overdue: ").Append(Overdue).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SubscriptionInvoice);
+        }
+
+        /// <summary>
+        /// Returns true if SubscriptionInvoice instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SubscriptionInvoice to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SubscriptionInvoice input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.InvoiceId == input.InvoiceId ||
+                    (this.InvoiceId != null &&
+                    this.InvoiceId.Equals(input.InvoiceId))
+                ) && 
+                (
+                    this.Number == input.Number ||
+                    (this.Number != null &&
+                    this.Number.Equals(input.Number))
+                ) && 
+                (
+                    this.Total == input.Total ||
+                    (this.Total != null &&
+                    this.Total.Equals(input.Total))
+                ) && 
+                (
+                    this.Currency == input.Currency ||
+                    (this.Currency != null &&
+                    this.Currency.Equals(input.Currency))
+                ) && 
+                (
+                    this.Status == input.Status ||
+                    (this.Status != null &&
+                    this.Status.Equals(input.Status))
+                ) && 
+                (
+                    this.SubscriptionId == input.SubscriptionId ||
+                    (this.SubscriptionId != null &&
+                    this.SubscriptionId.Equals(input.SubscriptionId))
+                ) && 
+                (
+                    this.PaidAt == input.PaidAt ||
+                    (this.PaidAt != null &&
+                    this.PaidAt.Equals(input.PaidAt))
+                ) && 
+                (
+                    this.FinalisedAt == input.FinalisedAt ||
+                    (this.FinalisedAt != null &&
+                    this.FinalisedAt.Equals(input.FinalisedAt))
+                ) && 
+                (
+                    this.PdfLink == input.PdfLink ||
+                    (this.PdfLink != null &&
+                    this.PdfLink.Equals(input.PdfLink))
+                ) && 
+                (
+                    this.HostedUrl == input.HostedUrl ||
+                    (this.HostedUrl != null &&
+                    this.HostedUrl.Equals(input.HostedUrl))
+                ) && 
+                (
+                    this.Overdue == input.Overdue ||
+                    (this.Overdue != null &&
+                    this.Overdue.Equals(input.Overdue))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.InvoiceId != null)
+                    hashCode = hashCode * 59 + this.InvoiceId.GetHashCode();
+                if (this.Number != null)
+                    hashCode = hashCode * 59 + this.Number.GetHashCode();
+                if (this.Total != null)
+                    hashCode = hashCode * 59 + this.Total.GetHashCode();
+                if (this.Currency != null)
+                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
+                if (this.Status != null)
+                    hashCode = hashCode * 59 + this.Status.GetHashCode();
+                if (this.SubscriptionId != null)
+                    hashCode = hashCode * 59 + this.SubscriptionId.GetHashCode();
+                if (this.PaidAt != null)
+                    hashCode = hashCode * 59 + this.PaidAt.GetHashCode();
+                if (this.FinalisedAt != null)
+                    hashCode = hashCode * 59 + this.FinalisedAt.GetHashCode();
+                if (this.PdfLink != null)
+                    hashCode = hashCode * 59 + this.PdfLink.GetHashCode();
+                if (this.HostedUrl != null)
+                    hashCode = hashCode * 59 + this.HostedUrl.GetHashCode();
+                if (this.Overdue != null)
+                    hashCode = hashCode * 59 + this.Overdue.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SubscriptionPlan.cs b/src/Flipdish/Model/SubscriptionPlan.cs
deleted file mode 100644
index bf0ec996..00000000
--- a/src/Flipdish/Model/SubscriptionPlan.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Subscription plan
-    /// </summary>
-    [DataContract]
-    public partial class SubscriptionPlan :  IEquatable<SubscriptionPlan>, IValidatableObject
-    {
-        /// <summary>
-        /// Interval billing for the subscription
-        /// </summary>
-        /// <value>Interval billing for the subscription</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum IntervalEnum
-        {
-            
-            /// <summary>
-            /// Enum Monthly for value: Monthly
-            /// </summary>
-            [EnumMember(Value = "Monthly")]
-            Monthly = 1,
-            
-            /// <summary>
-            /// Enum Yearly for value: Yearly
-            /// </summary>
-            [EnumMember(Value = "Yearly")]
-            Yearly = 2
-        }
-
-        /// <summary>
-        /// Interval billing for the subscription
-        /// </summary>
-        /// <value>Interval billing for the subscription</value>
-        [DataMember(Name="Interval", EmitDefaultValue=false)]
-        public IntervalEnum? Interval { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SubscriptionPlan" /> class.
-        /// </summary>
-        /// <param name="subscriptionPlanId">Subscription plan identifier.</param>
-        /// <param name="name">Name of the plan.</param>
-        /// <param name="currency">ISO Currency.</param>
-        /// <param name="price">Price for single unit.</param>
-        /// <param name="interval">Interval billing for the subscription.</param>
-        public SubscriptionPlan(int? subscriptionPlanId = default(int?), string name = default(string), string currency = default(string), double? price = default(double?), IntervalEnum? interval = default(IntervalEnum?))
-        {
-            this.SubscriptionPlanId = subscriptionPlanId;
-            this.Name = name;
-            this.Currency = currency;
-            this.Price = price;
-            this.Interval = interval;
-        }
-        
-        /// <summary>
-        /// Subscription plan identifier
-        /// </summary>
-        /// <value>Subscription plan identifier</value>
-        [DataMember(Name="SubscriptionPlanId", EmitDefaultValue=false)]
-        public int? SubscriptionPlanId { get; set; }
-
-        /// <summary>
-        /// Name of the plan
-        /// </summary>
-        /// <value>Name of the plan</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// ISO Currency
-        /// </summary>
-        /// <value>ISO Currency</value>
-        [DataMember(Name="Currency", EmitDefaultValue=false)]
-        public string Currency { get; set; }
-
-        /// <summary>
-        /// Price for single unit
-        /// </summary>
-        /// <value>Price for single unit</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public double? Price { get; set; }
-
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class SubscriptionPlan {\n");
-            sb.Append("  SubscriptionPlanId: ").Append(SubscriptionPlanId).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Currency: ").Append(Currency).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  Interval: ").Append(Interval).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as SubscriptionPlan);
-        }
-
-        /// <summary>
-        /// Returns true if SubscriptionPlan instances are equal
-        /// </summary>
-        /// <param name="input">Instance of SubscriptionPlan to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(SubscriptionPlan input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.SubscriptionPlanId == input.SubscriptionPlanId ||
-                    (this.SubscriptionPlanId != null &&
-                    this.SubscriptionPlanId.Equals(input.SubscriptionPlanId))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Currency == input.Currency ||
-                    (this.Currency != null &&
-                    this.Currency.Equals(input.Currency))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.Interval == input.Interval ||
-                    (this.Interval != null &&
-                    this.Interval.Equals(input.Interval))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.SubscriptionPlanId != null)
-                    hashCode = hashCode * 59 + this.SubscriptionPlanId.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Currency != null)
-                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.Interval != null)
-                    hashCode = hashCode * 59 + this.Interval.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/SubscriptionPlansResponse.cs b/src/Flipdish/Model/SubscriptionPlansResponse.cs
deleted file mode 100644
index 00b4a60e..00000000
--- a/src/Flipdish/Model/SubscriptionPlansResponse.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Available plans and mandatory fields to subscribe
-    /// </summary>
-    [DataContract]
-    public partial class SubscriptionPlansResponse :  IEquatable<SubscriptionPlansResponse>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SubscriptionPlansResponse" /> class.
-        /// </summary>
-        /// <param name="publishableApiKey">Stripe publishable api key.</param>
-        /// <param name="email">User email.</param>
-        /// <param name="subscriptionPlans">Available plans.</param>
-        /// <param name="appIds">App ids (string name) to which the user belongs.</param>
-        public SubscriptionPlansResponse(string publishableApiKey = default(string), string email = default(string), List<SubscriptionPlan> subscriptionPlans = default(List<SubscriptionPlan>), List<string> appIds = default(List<string>))
-        {
-            this.PublishableApiKey = publishableApiKey;
-            this.Email = email;
-            this.SubscriptionPlans = subscriptionPlans;
-            this.AppIds = appIds;
-        }
-        
-        /// <summary>
-        /// Stripe publishable api key
-        /// </summary>
-        /// <value>Stripe publishable api key</value>
-        [DataMember(Name="PublishableApiKey", EmitDefaultValue=false)]
-        public string PublishableApiKey { get; set; }
-
-        /// <summary>
-        /// User email
-        /// </summary>
-        /// <value>User email</value>
-        [DataMember(Name="Email", EmitDefaultValue=false)]
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Available plans
-        /// </summary>
-        /// <value>Available plans</value>
-        [DataMember(Name="SubscriptionPlans", EmitDefaultValue=false)]
-        public List<SubscriptionPlan> SubscriptionPlans { get; set; }
-
-        /// <summary>
-        /// App ids (string name) to which the user belongs
-        /// </summary>
-        /// <value>App ids (string name) to which the user belongs</value>
-        [DataMember(Name="AppIds", EmitDefaultValue=false)]
-        public List<string> AppIds { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class SubscriptionPlansResponse {\n");
-            sb.Append("  PublishableApiKey: ").Append(PublishableApiKey).Append("\n");
-            sb.Append("  Email: ").Append(Email).Append("\n");
-            sb.Append("  SubscriptionPlans: ").Append(SubscriptionPlans).Append("\n");
-            sb.Append("  AppIds: ").Append(AppIds).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as SubscriptionPlansResponse);
-        }
-
-        /// <summary>
-        /// Returns true if SubscriptionPlansResponse instances are equal
-        /// </summary>
-        /// <param name="input">Instance of SubscriptionPlansResponse to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(SubscriptionPlansResponse input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.PublishableApiKey == input.PublishableApiKey ||
-                    (this.PublishableApiKey != null &&
-                    this.PublishableApiKey.Equals(input.PublishableApiKey))
-                ) && 
-                (
-                    this.Email == input.Email ||
-                    (this.Email != null &&
-                    this.Email.Equals(input.Email))
-                ) && 
-                (
-                    this.SubscriptionPlans == input.SubscriptionPlans ||
-                    this.SubscriptionPlans != null &&
-                    this.SubscriptionPlans.SequenceEqual(input.SubscriptionPlans)
-                ) && 
-                (
-                    this.AppIds == input.AppIds ||
-                    this.AppIds != null &&
-                    this.AppIds.SequenceEqual(input.AppIds)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.PublishableApiKey != null)
-                    hashCode = hashCode * 59 + this.PublishableApiKey.GetHashCode();
-                if (this.Email != null)
-                    hashCode = hashCode * 59 + this.Email.GetHashCode();
-                if (this.SubscriptionPlans != null)
-                    hashCode = hashCode * 59 + this.SubscriptionPlans.GetHashCode();
-                if (this.AppIds != null)
-                    hashCode = hashCode * 59 + this.AppIds.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/SubscriptionProduct.cs b/src/Flipdish/Model/SubscriptionProduct.cs
new file mode 100644
index 00000000..85f0ad63
--- /dev/null
+++ b/src/Flipdish/Model/SubscriptionProduct.cs
@@ -0,0 +1,285 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Product
+    /// </summary>
+    [DataContract]
+    public partial class SubscriptionProduct :  IEquatable<SubscriptionProduct>
+    {
+        /// <summary>
+        /// Payment Frequency
+        /// </summary>
+        /// <value>Payment Frequency</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum PaymentFrequencyEnum
+        {
+            
+            /// <summary>
+            /// Enum Day for value: day
+            /// </summary>
+            [EnumMember(Value = "day")]
+            Day = 1,
+            
+            /// <summary>
+            /// Enum Week for value: week
+            /// </summary>
+            [EnumMember(Value = "week")]
+            Week = 2,
+            
+            /// <summary>
+            /// Enum Month for value: month
+            /// </summary>
+            [EnumMember(Value = "month")]
+            Month = 3,
+            
+            /// <summary>
+            /// Enum Year for value: year
+            /// </summary>
+            [EnumMember(Value = "year")]
+            Year = 4
+        }
+
+        /// <summary>
+        /// Payment Frequency
+        /// </summary>
+        /// <value>Payment Frequency</value>
+        [DataMember(Name="PaymentFrequency", EmitDefaultValue=false)]
+        public PaymentFrequencyEnum PaymentFrequency { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubscriptionProduct" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected SubscriptionProduct() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubscriptionProduct" /> class.
+        /// </summary>
+        /// <param name="productId">Product Identifier (required).</param>
+        /// <param name="name">Name (required).</param>
+        /// <param name="quantity">Quantity (required).</param>
+        /// <param name="pricePerUnit">Price Per Unit.</param>
+        /// <param name="priceTotal">Price Total.</param>
+        /// <param name="paymentFrequency">Payment Frequency (required).</param>
+        /// <param name="stores">Stores.</param>
+        public SubscriptionProduct(string productId = default(string), string name = default(string), long? quantity = default(long?), double? pricePerUnit = default(double?), double? priceTotal = default(double?), PaymentFrequencyEnum paymentFrequency = default(PaymentFrequencyEnum), List<SubscriptionStore> stores = default(List<SubscriptionStore>))
+        {
+            // to ensure "productId" is required (not null)
+            if (productId == null)
+            {
+                throw new InvalidDataException("productId is a required property for SubscriptionProduct and cannot be null");
+            }
+            else
+            {
+                this.ProductId = productId;
+            }
+            // to ensure "name" is required (not null)
+            if (name == null)
+            {
+                throw new InvalidDataException("name is a required property for SubscriptionProduct and cannot be null");
+            }
+            else
+            {
+                this.Name = name;
+            }
+            // to ensure "quantity" is required (not null)
+            if (quantity == null)
+            {
+                throw new InvalidDataException("quantity is a required property for SubscriptionProduct and cannot be null");
+            }
+            else
+            {
+                this.Quantity = quantity;
+            }
+            // to ensure "paymentFrequency" is required (not null)
+            if (paymentFrequency == null)
+            {
+                throw new InvalidDataException("paymentFrequency is a required property for SubscriptionProduct and cannot be null");
+            }
+            else
+            {
+                this.PaymentFrequency = paymentFrequency;
+            }
+            this.PricePerUnit = pricePerUnit;
+            this.PriceTotal = priceTotal;
+            this.Stores = stores;
+        }
+        
+        /// <summary>
+        /// Product Identifier
+        /// </summary>
+        /// <value>Product Identifier</value>
+        [DataMember(Name="ProductId", EmitDefaultValue=false)]
+        public string ProductId { get; set; }
+
+        /// <summary>
+        /// Name
+        /// </summary>
+        /// <value>Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Quantity
+        /// </summary>
+        /// <value>Quantity</value>
+        [DataMember(Name="Quantity", EmitDefaultValue=false)]
+        public long? Quantity { get; set; }
+
+        /// <summary>
+        /// Price Per Unit
+        /// </summary>
+        /// <value>Price Per Unit</value>
+        [DataMember(Name="PricePerUnit", EmitDefaultValue=false)]
+        public double? PricePerUnit { get; set; }
+
+        /// <summary>
+        /// Price Total
+        /// </summary>
+        /// <value>Price Total</value>
+        [DataMember(Name="PriceTotal", EmitDefaultValue=false)]
+        public double? PriceTotal { get; set; }
+
+
+        /// <summary>
+        /// Stores
+        /// </summary>
+        /// <value>Stores</value>
+        [DataMember(Name="Stores", EmitDefaultValue=false)]
+        public List<SubscriptionStore> Stores { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SubscriptionProduct {\n");
+            sb.Append("  ProductId: ").Append(ProductId).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Quantity: ").Append(Quantity).Append("\n");
+            sb.Append("  PricePerUnit: ").Append(PricePerUnit).Append("\n");
+            sb.Append("  PriceTotal: ").Append(PriceTotal).Append("\n");
+            sb.Append("  PaymentFrequency: ").Append(PaymentFrequency).Append("\n");
+            sb.Append("  Stores: ").Append(Stores).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SubscriptionProduct);
+        }
+
+        /// <summary>
+        /// Returns true if SubscriptionProduct instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SubscriptionProduct to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SubscriptionProduct input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.ProductId == input.ProductId ||
+                    (this.ProductId != null &&
+                    this.ProductId.Equals(input.ProductId))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Quantity == input.Quantity ||
+                    (this.Quantity != null &&
+                    this.Quantity.Equals(input.Quantity))
+                ) && 
+                (
+                    this.PricePerUnit == input.PricePerUnit ||
+                    (this.PricePerUnit != null &&
+                    this.PricePerUnit.Equals(input.PricePerUnit))
+                ) && 
+                (
+                    this.PriceTotal == input.PriceTotal ||
+                    (this.PriceTotal != null &&
+                    this.PriceTotal.Equals(input.PriceTotal))
+                ) && 
+                (
+                    this.PaymentFrequency == input.PaymentFrequency ||
+                    (this.PaymentFrequency != null &&
+                    this.PaymentFrequency.Equals(input.PaymentFrequency))
+                ) && 
+                (
+                    this.Stores == input.Stores ||
+                    this.Stores != null &&
+                    this.Stores.SequenceEqual(input.Stores)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.ProductId != null)
+                    hashCode = hashCode * 59 + this.ProductId.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Quantity != null)
+                    hashCode = hashCode * 59 + this.Quantity.GetHashCode();
+                if (this.PricePerUnit != null)
+                    hashCode = hashCode * 59 + this.PricePerUnit.GetHashCode();
+                if (this.PriceTotal != null)
+                    hashCode = hashCode * 59 + this.PriceTotal.GetHashCode();
+                if (this.PaymentFrequency != null)
+                    hashCode = hashCode * 59 + this.PaymentFrequency.GetHashCode();
+                if (this.Stores != null)
+                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SubscriptionStore.cs b/src/Flipdish/Model/SubscriptionStore.cs
new file mode 100644
index 00000000..8b53009a
--- /dev/null
+++ b/src/Flipdish/Model/SubscriptionStore.cs
@@ -0,0 +1,151 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Subscription Store
+    /// </summary>
+    [DataContract]
+    public partial class SubscriptionStore :  IEquatable<SubscriptionStore>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubscriptionStore" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected SubscriptionStore() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubscriptionStore" /> class.
+        /// </summary>
+        /// <param name="id">Store Id (required).</param>
+        /// <param name="name">Name (required).</param>
+        public SubscriptionStore(int? id = default(int?), string name = default(string))
+        {
+            // to ensure "id" is required (not null)
+            if (id == null)
+            {
+                throw new InvalidDataException("id is a required property for SubscriptionStore and cannot be null");
+            }
+            else
+            {
+                this.Id = id;
+            }
+            // to ensure "name" is required (not null)
+            if (name == null)
+            {
+                throw new InvalidDataException("name is a required property for SubscriptionStore and cannot be null");
+            }
+            else
+            {
+                this.Name = name;
+            }
+        }
+        
+        /// <summary>
+        /// Store Id
+        /// </summary>
+        /// <value>Store Id</value>
+        [DataMember(Name="Id", EmitDefaultValue=false)]
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// Name
+        /// </summary>
+        /// <value>Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SubscriptionStore {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SubscriptionStore);
+        }
+
+        /// <summary>
+        /// Returns true if SubscriptionStore instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SubscriptionStore to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SubscriptionStore input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SubscriptionSummary.cs b/src/Flipdish/Model/SubscriptionSummary.cs
new file mode 100644
index 00000000..70df2d18
--- /dev/null
+++ b/src/Flipdish/Model/SubscriptionSummary.cs
@@ -0,0 +1,1049 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Subscription Summary
+    /// </summary>
+    [DataContract]
+    public partial class SubscriptionSummary :  IEquatable<SubscriptionSummary>
+    {
+        /// <summary>
+        /// Status
+        /// </summary>
+        /// <value>Status</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum StatusEnum
+        {
+            
+            /// <summary>
+            /// Enum Incomplete for value: Incomplete
+            /// </summary>
+            [EnumMember(Value = "Incomplete")]
+            Incomplete = 1,
+            
+            /// <summary>
+            /// Enum IncompleteExpired for value: IncompleteExpired
+            /// </summary>
+            [EnumMember(Value = "IncompleteExpired")]
+            IncompleteExpired = 2,
+            
+            /// <summary>
+            /// Enum Trialing for value: Trialing
+            /// </summary>
+            [EnumMember(Value = "Trialing")]
+            Trialing = 3,
+            
+            /// <summary>
+            /// Enum Active for value: Active
+            /// </summary>
+            [EnumMember(Value = "Active")]
+            Active = 4,
+            
+            /// <summary>
+            /// Enum PastDue for value: PastDue
+            /// </summary>
+            [EnumMember(Value = "PastDue")]
+            PastDue = 5,
+            
+            /// <summary>
+            /// Enum Canceled for value: Canceled
+            /// </summary>
+            [EnumMember(Value = "Canceled")]
+            Canceled = 6,
+            
+            /// <summary>
+            /// Enum Unpaid for value: Unpaid
+            /// </summary>
+            [EnumMember(Value = "Unpaid")]
+            Unpaid = 7
+        }
+
+        /// <summary>
+        /// Status
+        /// </summary>
+        /// <value>Status</value>
+        [DataMember(Name="Status", EmitDefaultValue=false)]
+        public StatusEnum Status { get; set; }
+        /// <summary>
+        /// Currency
+        /// </summary>
+        /// <value>Currency</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum CurrencyEnum
+        {
+            
+            /// <summary>
+            /// Enum EUR for value: EUR
+            /// </summary>
+            [EnumMember(Value = "EUR")]
+            EUR = 1,
+            
+            /// <summary>
+            /// Enum USD for value: USD
+            /// </summary>
+            [EnumMember(Value = "USD")]
+            USD = 2,
+            
+            /// <summary>
+            /// Enum GBP for value: GBP
+            /// </summary>
+            [EnumMember(Value = "GBP")]
+            GBP = 3,
+            
+            /// <summary>
+            /// Enum CAD for value: CAD
+            /// </summary>
+            [EnumMember(Value = "CAD")]
+            CAD = 4,
+            
+            /// <summary>
+            /// Enum AUD for value: AUD
+            /// </summary>
+            [EnumMember(Value = "AUD")]
+            AUD = 5,
+            
+            /// <summary>
+            /// Enum DJF for value: DJF
+            /// </summary>
+            [EnumMember(Value = "DJF")]
+            DJF = 6,
+            
+            /// <summary>
+            /// Enum ZAR for value: ZAR
+            /// </summary>
+            [EnumMember(Value = "ZAR")]
+            ZAR = 7,
+            
+            /// <summary>
+            /// Enum ETB for value: ETB
+            /// </summary>
+            [EnumMember(Value = "ETB")]
+            ETB = 8,
+            
+            /// <summary>
+            /// Enum AED for value: AED
+            /// </summary>
+            [EnumMember(Value = "AED")]
+            AED = 9,
+            
+            /// <summary>
+            /// Enum BHD for value: BHD
+            /// </summary>
+            [EnumMember(Value = "BHD")]
+            BHD = 10,
+            
+            /// <summary>
+            /// Enum DZD for value: DZD
+            /// </summary>
+            [EnumMember(Value = "DZD")]
+            DZD = 11,
+            
+            /// <summary>
+            /// Enum EGP for value: EGP
+            /// </summary>
+            [EnumMember(Value = "EGP")]
+            EGP = 12,
+            
+            /// <summary>
+            /// Enum IQD for value: IQD
+            /// </summary>
+            [EnumMember(Value = "IQD")]
+            IQD = 13,
+            
+            /// <summary>
+            /// Enum JOD for value: JOD
+            /// </summary>
+            [EnumMember(Value = "JOD")]
+            JOD = 14,
+            
+            /// <summary>
+            /// Enum KWD for value: KWD
+            /// </summary>
+            [EnumMember(Value = "KWD")]
+            KWD = 15,
+            
+            /// <summary>
+            /// Enum LBP for value: LBP
+            /// </summary>
+            [EnumMember(Value = "LBP")]
+            LBP = 16,
+            
+            /// <summary>
+            /// Enum LYD for value: LYD
+            /// </summary>
+            [EnumMember(Value = "LYD")]
+            LYD = 17,
+            
+            /// <summary>
+            /// Enum MAD for value: MAD
+            /// </summary>
+            [EnumMember(Value = "MAD")]
+            MAD = 18,
+            
+            /// <summary>
+            /// Enum OMR for value: OMR
+            /// </summary>
+            [EnumMember(Value = "OMR")]
+            OMR = 19,
+            
+            /// <summary>
+            /// Enum QAR for value: QAR
+            /// </summary>
+            [EnumMember(Value = "QAR")]
+            QAR = 20,
+            
+            /// <summary>
+            /// Enum SAR for value: SAR
+            /// </summary>
+            [EnumMember(Value = "SAR")]
+            SAR = 21,
+            
+            /// <summary>
+            /// Enum SYP for value: SYP
+            /// </summary>
+            [EnumMember(Value = "SYP")]
+            SYP = 22,
+            
+            /// <summary>
+            /// Enum TND for value: TND
+            /// </summary>
+            [EnumMember(Value = "TND")]
+            TND = 23,
+            
+            /// <summary>
+            /// Enum YER for value: YER
+            /// </summary>
+            [EnumMember(Value = "YER")]
+            YER = 24,
+            
+            /// <summary>
+            /// Enum CLP for value: CLP
+            /// </summary>
+            [EnumMember(Value = "CLP")]
+            CLP = 25,
+            
+            /// <summary>
+            /// Enum INR for value: INR
+            /// </summary>
+            [EnumMember(Value = "INR")]
+            INR = 26,
+            
+            /// <summary>
+            /// Enum AZN for value: AZN
+            /// </summary>
+            [EnumMember(Value = "AZN")]
+            AZN = 27,
+            
+            /// <summary>
+            /// Enum RUB for value: RUB
+            /// </summary>
+            [EnumMember(Value = "RUB")]
+            RUB = 28,
+            
+            /// <summary>
+            /// Enum BYN for value: BYN
+            /// </summary>
+            [EnumMember(Value = "BYN")]
+            BYN = 29,
+            
+            /// <summary>
+            /// Enum BGN for value: BGN
+            /// </summary>
+            [EnumMember(Value = "BGN")]
+            BGN = 30,
+            
+            /// <summary>
+            /// Enum NGN for value: NGN
+            /// </summary>
+            [EnumMember(Value = "NGN")]
+            NGN = 31,
+            
+            /// <summary>
+            /// Enum BDT for value: BDT
+            /// </summary>
+            [EnumMember(Value = "BDT")]
+            BDT = 32,
+            
+            /// <summary>
+            /// Enum CNY for value: CNY
+            /// </summary>
+            [EnumMember(Value = "CNY")]
+            CNY = 33,
+            
+            /// <summary>
+            /// Enum BAM for value: BAM
+            /// </summary>
+            [EnumMember(Value = "BAM")]
+            BAM = 34,
+            
+            /// <summary>
+            /// Enum CZK for value: CZK
+            /// </summary>
+            [EnumMember(Value = "CZK")]
+            CZK = 35,
+            
+            /// <summary>
+            /// Enum DKK for value: DKK
+            /// </summary>
+            [EnumMember(Value = "DKK")]
+            DKK = 36,
+            
+            /// <summary>
+            /// Enum CHF for value: CHF
+            /// </summary>
+            [EnumMember(Value = "CHF")]
+            CHF = 37,
+            
+            /// <summary>
+            /// Enum MVR for value: MVR
+            /// </summary>
+            [EnumMember(Value = "MVR")]
+            MVR = 38,
+            
+            /// <summary>
+            /// Enum BTN for value: BTN
+            /// </summary>
+            [EnumMember(Value = "BTN")]
+            BTN = 39,
+            
+            /// <summary>
+            /// Enum XCD for value: XCD
+            /// </summary>
+            [EnumMember(Value = "XCD")]
+            XCD = 40,
+            
+            /// <summary>
+            /// Enum BZD for value: BZD
+            /// </summary>
+            [EnumMember(Value = "BZD")]
+            BZD = 41,
+            
+            /// <summary>
+            /// Enum HKD for value: HKD
+            /// </summary>
+            [EnumMember(Value = "HKD")]
+            HKD = 42,
+            
+            /// <summary>
+            /// Enum IDR for value: IDR
+            /// </summary>
+            [EnumMember(Value = "IDR")]
+            IDR = 43,
+            
+            /// <summary>
+            /// Enum JMD for value: JMD
+            /// </summary>
+            [EnumMember(Value = "JMD")]
+            JMD = 44,
+            
+            /// <summary>
+            /// Enum MYR for value: MYR
+            /// </summary>
+            [EnumMember(Value = "MYR")]
+            MYR = 45,
+            
+            /// <summary>
+            /// Enum NZD for value: NZD
+            /// </summary>
+            [EnumMember(Value = "NZD")]
+            NZD = 46,
+            
+            /// <summary>
+            /// Enum PHP for value: PHP
+            /// </summary>
+            [EnumMember(Value = "PHP")]
+            PHP = 47,
+            
+            /// <summary>
+            /// Enum SGD for value: SGD
+            /// </summary>
+            [EnumMember(Value = "SGD")]
+            SGD = 48,
+            
+            /// <summary>
+            /// Enum TTD for value: TTD
+            /// </summary>
+            [EnumMember(Value = "TTD")]
+            TTD = 49,
+            
+            /// <summary>
+            /// Enum XDR for value: XDR
+            /// </summary>
+            [EnumMember(Value = "XDR")]
+            XDR = 50,
+            
+            /// <summary>
+            /// Enum ARS for value: ARS
+            /// </summary>
+            [EnumMember(Value = "ARS")]
+            ARS = 51,
+            
+            /// <summary>
+            /// Enum BOB for value: BOB
+            /// </summary>
+            [EnumMember(Value = "BOB")]
+            BOB = 52,
+            
+            /// <summary>
+            /// Enum COP for value: COP
+            /// </summary>
+            [EnumMember(Value = "COP")]
+            COP = 53,
+            
+            /// <summary>
+            /// Enum CRC for value: CRC
+            /// </summary>
+            [EnumMember(Value = "CRC")]
+            CRC = 54,
+            
+            /// <summary>
+            /// Enum CUP for value: CUP
+            /// </summary>
+            [EnumMember(Value = "CUP")]
+            CUP = 55,
+            
+            /// <summary>
+            /// Enum DOP for value: DOP
+            /// </summary>
+            [EnumMember(Value = "DOP")]
+            DOP = 56,
+            
+            /// <summary>
+            /// Enum GTQ for value: GTQ
+            /// </summary>
+            [EnumMember(Value = "GTQ")]
+            GTQ = 57,
+            
+            /// <summary>
+            /// Enum HNL for value: HNL
+            /// </summary>
+            [EnumMember(Value = "HNL")]
+            HNL = 58,
+            
+            /// <summary>
+            /// Enum MXN for value: MXN
+            /// </summary>
+            [EnumMember(Value = "MXN")]
+            MXN = 59,
+            
+            /// <summary>
+            /// Enum NIO for value: NIO
+            /// </summary>
+            [EnumMember(Value = "NIO")]
+            NIO = 60,
+            
+            /// <summary>
+            /// Enum PAB for value: PAB
+            /// </summary>
+            [EnumMember(Value = "PAB")]
+            PAB = 61,
+            
+            /// <summary>
+            /// Enum PEN for value: PEN
+            /// </summary>
+            [EnumMember(Value = "PEN")]
+            PEN = 62,
+            
+            /// <summary>
+            /// Enum PYG for value: PYG
+            /// </summary>
+            [EnumMember(Value = "PYG")]
+            PYG = 63,
+            
+            /// <summary>
+            /// Enum UYU for value: UYU
+            /// </summary>
+            [EnumMember(Value = "UYU")]
+            UYU = 64,
+            
+            /// <summary>
+            /// Enum VEF for value: VEF
+            /// </summary>
+            [EnumMember(Value = "VEF")]
+            VEF = 65,
+            
+            /// <summary>
+            /// Enum IRR for value: IRR
+            /// </summary>
+            [EnumMember(Value = "IRR")]
+            IRR = 66,
+            
+            /// <summary>
+            /// Enum XOF for value: XOF
+            /// </summary>
+            [EnumMember(Value = "XOF")]
+            XOF = 67,
+            
+            /// <summary>
+            /// Enum CDF for value: CDF
+            /// </summary>
+            [EnumMember(Value = "CDF")]
+            CDF = 68,
+            
+            /// <summary>
+            /// Enum XAF for value: XAF
+            /// </summary>
+            [EnumMember(Value = "XAF")]
+            XAF = 69,
+            
+            /// <summary>
+            /// Enum HTG for value: HTG
+            /// </summary>
+            [EnumMember(Value = "HTG")]
+            HTG = 70,
+            
+            /// <summary>
+            /// Enum ILS for value: ILS
+            /// </summary>
+            [EnumMember(Value = "ILS")]
+            ILS = 71,
+            
+            /// <summary>
+            /// Enum HRK for value: HRK
+            /// </summary>
+            [EnumMember(Value = "HRK")]
+            HRK = 72,
+            
+            /// <summary>
+            /// Enum HUF for value: HUF
+            /// </summary>
+            [EnumMember(Value = "HUF")]
+            HUF = 73,
+            
+            /// <summary>
+            /// Enum AMD for value: AMD
+            /// </summary>
+            [EnumMember(Value = "AMD")]
+            AMD = 74,
+            
+            /// <summary>
+            /// Enum ISK for value: ISK
+            /// </summary>
+            [EnumMember(Value = "ISK")]
+            ISK = 75,
+            
+            /// <summary>
+            /// Enum JPY for value: JPY
+            /// </summary>
+            [EnumMember(Value = "JPY")]
+            JPY = 76,
+            
+            /// <summary>
+            /// Enum GEL for value: GEL
+            /// </summary>
+            [EnumMember(Value = "GEL")]
+            GEL = 77,
+            
+            /// <summary>
+            /// Enum KZT for value: KZT
+            /// </summary>
+            [EnumMember(Value = "KZT")]
+            KZT = 78,
+            
+            /// <summary>
+            /// Enum KHR for value: KHR
+            /// </summary>
+            [EnumMember(Value = "KHR")]
+            KHR = 79,
+            
+            /// <summary>
+            /// Enum KRW for value: KRW
+            /// </summary>
+            [EnumMember(Value = "KRW")]
+            KRW = 80,
+            
+            /// <summary>
+            /// Enum KGS for value: KGS
+            /// </summary>
+            [EnumMember(Value = "KGS")]
+            KGS = 81,
+            
+            /// <summary>
+            /// Enum LAK for value: LAK
+            /// </summary>
+            [EnumMember(Value = "LAK")]
+            LAK = 82,
+            
+            /// <summary>
+            /// Enum MKD for value: MKD
+            /// </summary>
+            [EnumMember(Value = "MKD")]
+            MKD = 83,
+            
+            /// <summary>
+            /// Enum MNT for value: MNT
+            /// </summary>
+            [EnumMember(Value = "MNT")]
+            MNT = 84,
+            
+            /// <summary>
+            /// Enum BND for value: BND
+            /// </summary>
+            [EnumMember(Value = "BND")]
+            BND = 85,
+            
+            /// <summary>
+            /// Enum MMK for value: MMK
+            /// </summary>
+            [EnumMember(Value = "MMK")]
+            MMK = 86,
+            
+            /// <summary>
+            /// Enum NOK for value: NOK
+            /// </summary>
+            [EnumMember(Value = "NOK")]
+            NOK = 87,
+            
+            /// <summary>
+            /// Enum NPR for value: NPR
+            /// </summary>
+            [EnumMember(Value = "NPR")]
+            NPR = 88,
+            
+            /// <summary>
+            /// Enum PKR for value: PKR
+            /// </summary>
+            [EnumMember(Value = "PKR")]
+            PKR = 89,
+            
+            /// <summary>
+            /// Enum PLN for value: PLN
+            /// </summary>
+            [EnumMember(Value = "PLN")]
+            PLN = 90,
+            
+            /// <summary>
+            /// Enum AFN for value: AFN
+            /// </summary>
+            [EnumMember(Value = "AFN")]
+            AFN = 91,
+            
+            /// <summary>
+            /// Enum BRL for value: BRL
+            /// </summary>
+            [EnumMember(Value = "BRL")]
+            BRL = 92,
+            
+            /// <summary>
+            /// Enum MDL for value: MDL
+            /// </summary>
+            [EnumMember(Value = "MDL")]
+            MDL = 93,
+            
+            /// <summary>
+            /// Enum RON for value: RON
+            /// </summary>
+            [EnumMember(Value = "RON")]
+            RON = 94,
+            
+            /// <summary>
+            /// Enum RWF for value: RWF
+            /// </summary>
+            [EnumMember(Value = "RWF")]
+            RWF = 95,
+            
+            /// <summary>
+            /// Enum SEK for value: SEK
+            /// </summary>
+            [EnumMember(Value = "SEK")]
+            SEK = 96,
+            
+            /// <summary>
+            /// Enum LKR for value: LKR
+            /// </summary>
+            [EnumMember(Value = "LKR")]
+            LKR = 97,
+            
+            /// <summary>
+            /// Enum SOS for value: SOS
+            /// </summary>
+            [EnumMember(Value = "SOS")]
+            SOS = 98,
+            
+            /// <summary>
+            /// Enum ALL for value: ALL
+            /// </summary>
+            [EnumMember(Value = "ALL")]
+            ALL = 99,
+            
+            /// <summary>
+            /// Enum RSD for value: RSD
+            /// </summary>
+            [EnumMember(Value = "RSD")]
+            RSD = 100,
+            
+            /// <summary>
+            /// Enum KES for value: KES
+            /// </summary>
+            [EnumMember(Value = "KES")]
+            KES = 101,
+            
+            /// <summary>
+            /// Enum TJS for value: TJS
+            /// </summary>
+            [EnumMember(Value = "TJS")]
+            TJS = 102,
+            
+            /// <summary>
+            /// Enum THB for value: THB
+            /// </summary>
+            [EnumMember(Value = "THB")]
+            THB = 103,
+            
+            /// <summary>
+            /// Enum ERN for value: ERN
+            /// </summary>
+            [EnumMember(Value = "ERN")]
+            ERN = 104,
+            
+            /// <summary>
+            /// Enum TMT for value: TMT
+            /// </summary>
+            [EnumMember(Value = "TMT")]
+            TMT = 105,
+            
+            /// <summary>
+            /// Enum BWP for value: BWP
+            /// </summary>
+            [EnumMember(Value = "BWP")]
+            BWP = 106,
+            
+            /// <summary>
+            /// Enum TRY for value: TRY
+            /// </summary>
+            [EnumMember(Value = "TRY")]
+            TRY = 107,
+            
+            /// <summary>
+            /// Enum UAH for value: UAH
+            /// </summary>
+            [EnumMember(Value = "UAH")]
+            UAH = 108,
+            
+            /// <summary>
+            /// Enum UZS for value: UZS
+            /// </summary>
+            [EnumMember(Value = "UZS")]
+            UZS = 109,
+            
+            /// <summary>
+            /// Enum VND for value: VND
+            /// </summary>
+            [EnumMember(Value = "VND")]
+            VND = 110,
+            
+            /// <summary>
+            /// Enum MOP for value: MOP
+            /// </summary>
+            [EnumMember(Value = "MOP")]
+            MOP = 111,
+            
+            /// <summary>
+            /// Enum TWD for value: TWD
+            /// </summary>
+            [EnumMember(Value = "TWD")]
+            TWD = 112,
+            
+            /// <summary>
+            /// Enum BMD for value: BMD
+            /// </summary>
+            [EnumMember(Value = "BMD")]
+            BMD = 113
+        }
+
+        /// <summary>
+        /// Currency
+        /// </summary>
+        /// <value>Currency</value>
+        [DataMember(Name="Currency", EmitDefaultValue=false)]
+        public CurrencyEnum Currency { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubscriptionSummary" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected SubscriptionSummary() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubscriptionSummary" /> class.
+        /// </summary>
+        /// <param name="nextInvoiceAmount">Next invoice amount.</param>
+        /// <param name="nextInvoiceBillingDate">Next invoice billing date.</param>
+        /// <param name="subscriptionId">The subscription identifier (required).</param>
+        /// <param name="name">Name (required).</param>
+        /// <param name="status">Status (required).</param>
+        /// <param name="currency">Currency (required).</param>
+        /// <param name="user">User (required).</param>
+        /// <param name="defaultPaymentDescription">Default payment description.</param>
+        /// <param name="cancellationRequestDate">Cancellation Date.</param>
+        /// <param name="cancellationDate">Cancel Date.</param>
+        public SubscriptionSummary(double? nextInvoiceAmount = default(double?), DateTime? nextInvoiceBillingDate = default(DateTime?), string subscriptionId = default(string), string name = default(string), StatusEnum status = default(StatusEnum), CurrencyEnum currency = default(CurrencyEnum), string user = default(string), string defaultPaymentDescription = default(string), DateTime? cancellationRequestDate = default(DateTime?), DateTime? cancellationDate = default(DateTime?))
+        {
+            // to ensure "subscriptionId" is required (not null)
+            if (subscriptionId == null)
+            {
+                throw new InvalidDataException("subscriptionId is a required property for SubscriptionSummary and cannot be null");
+            }
+            else
+            {
+                this.SubscriptionId = subscriptionId;
+            }
+            // to ensure "name" is required (not null)
+            if (name == null)
+            {
+                throw new InvalidDataException("name is a required property for SubscriptionSummary and cannot be null");
+            }
+            else
+            {
+                this.Name = name;
+            }
+            // to ensure "status" is required (not null)
+            if (status == null)
+            {
+                throw new InvalidDataException("status is a required property for SubscriptionSummary and cannot be null");
+            }
+            else
+            {
+                this.Status = status;
+            }
+            // to ensure "currency" is required (not null)
+            if (currency == null)
+            {
+                throw new InvalidDataException("currency is a required property for SubscriptionSummary and cannot be null");
+            }
+            else
+            {
+                this.Currency = currency;
+            }
+            // to ensure "user" is required (not null)
+            if (user == null)
+            {
+                throw new InvalidDataException("user is a required property for SubscriptionSummary and cannot be null");
+            }
+            else
+            {
+                this.User = user;
+            }
+            this.NextInvoiceAmount = nextInvoiceAmount;
+            this.NextInvoiceBillingDate = nextInvoiceBillingDate;
+            this.DefaultPaymentDescription = defaultPaymentDescription;
+            this.CancellationRequestDate = cancellationRequestDate;
+            this.CancellationDate = cancellationDate;
+        }
+        
+        /// <summary>
+        /// Next invoice amount
+        /// </summary>
+        /// <value>Next invoice amount</value>
+        [DataMember(Name="NextInvoiceAmount", EmitDefaultValue=false)]
+        public double? NextInvoiceAmount { get; set; }
+
+        /// <summary>
+        /// Next invoice billing date
+        /// </summary>
+        /// <value>Next invoice billing date</value>
+        [DataMember(Name="NextInvoiceBillingDate", EmitDefaultValue=false)]
+        public DateTime? NextInvoiceBillingDate { get; set; }
+
+        /// <summary>
+        /// The subscription identifier
+        /// </summary>
+        /// <value>The subscription identifier</value>
+        [DataMember(Name="SubscriptionId", EmitDefaultValue=false)]
+        public string SubscriptionId { get; set; }
+
+        /// <summary>
+        /// Name
+        /// </summary>
+        /// <value>Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+
+
+        /// <summary>
+        /// User
+        /// </summary>
+        /// <value>User</value>
+        [DataMember(Name="User", EmitDefaultValue=false)]
+        public string User { get; set; }
+
+        /// <summary>
+        /// Default payment description
+        /// </summary>
+        /// <value>Default payment description</value>
+        [DataMember(Name="DefaultPaymentDescription", EmitDefaultValue=false)]
+        public string DefaultPaymentDescription { get; set; }
+
+        /// <summary>
+        /// Cancellation Date
+        /// </summary>
+        /// <value>Cancellation Date</value>
+        [DataMember(Name="CancellationRequestDate", EmitDefaultValue=false)]
+        public DateTime? CancellationRequestDate { get; set; }
+
+        /// <summary>
+        /// Cancel Date
+        /// </summary>
+        /// <value>Cancel Date</value>
+        [DataMember(Name="CancellationDate", EmitDefaultValue=false)]
+        public DateTime? CancellationDate { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class SubscriptionSummary {\n");
+            sb.Append("  NextInvoiceAmount: ").Append(NextInvoiceAmount).Append("\n");
+            sb.Append("  NextInvoiceBillingDate: ").Append(NextInvoiceBillingDate).Append("\n");
+            sb.Append("  SubscriptionId: ").Append(SubscriptionId).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Currency: ").Append(Currency).Append("\n");
+            sb.Append("  User: ").Append(User).Append("\n");
+            sb.Append("  DefaultPaymentDescription: ").Append(DefaultPaymentDescription).Append("\n");
+            sb.Append("  CancellationRequestDate: ").Append(CancellationRequestDate).Append("\n");
+            sb.Append("  CancellationDate: ").Append(CancellationDate).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as SubscriptionSummary);
+        }
+
+        /// <summary>
+        /// Returns true if SubscriptionSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of SubscriptionSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(SubscriptionSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.NextInvoiceAmount == input.NextInvoiceAmount ||
+                    (this.NextInvoiceAmount != null &&
+                    this.NextInvoiceAmount.Equals(input.NextInvoiceAmount))
+                ) && 
+                (
+                    this.NextInvoiceBillingDate == input.NextInvoiceBillingDate ||
+                    (this.NextInvoiceBillingDate != null &&
+                    this.NextInvoiceBillingDate.Equals(input.NextInvoiceBillingDate))
+                ) && 
+                (
+                    this.SubscriptionId == input.SubscriptionId ||
+                    (this.SubscriptionId != null &&
+                    this.SubscriptionId.Equals(input.SubscriptionId))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Status == input.Status ||
+                    (this.Status != null &&
+                    this.Status.Equals(input.Status))
+                ) && 
+                (
+                    this.Currency == input.Currency ||
+                    (this.Currency != null &&
+                    this.Currency.Equals(input.Currency))
+                ) && 
+                (
+                    this.User == input.User ||
+                    (this.User != null &&
+                    this.User.Equals(input.User))
+                ) && 
+                (
+                    this.DefaultPaymentDescription == input.DefaultPaymentDescription ||
+                    (this.DefaultPaymentDescription != null &&
+                    this.DefaultPaymentDescription.Equals(input.DefaultPaymentDescription))
+                ) && 
+                (
+                    this.CancellationRequestDate == input.CancellationRequestDate ||
+                    (this.CancellationRequestDate != null &&
+                    this.CancellationRequestDate.Equals(input.CancellationRequestDate))
+                ) && 
+                (
+                    this.CancellationDate == input.CancellationDate ||
+                    (this.CancellationDate != null &&
+                    this.CancellationDate.Equals(input.CancellationDate))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.NextInvoiceAmount != null)
+                    hashCode = hashCode * 59 + this.NextInvoiceAmount.GetHashCode();
+                if (this.NextInvoiceBillingDate != null)
+                    hashCode = hashCode * 59 + this.NextInvoiceBillingDate.GetHashCode();
+                if (this.SubscriptionId != null)
+                    hashCode = hashCode * 59 + this.SubscriptionId.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Status != null)
+                    hashCode = hashCode * 59 + this.Status.GetHashCode();
+                if (this.Currency != null)
+                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
+                if (this.User != null)
+                    hashCode = hashCode * 59 + this.User.GetHashCode();
+                if (this.DefaultPaymentDescription != null)
+                    hashCode = hashCode * 59 + this.DefaultPaymentDescription.GetHashCode();
+                if (this.CancellationRequestDate != null)
+                    hashCode = hashCode * 59 + this.CancellationRequestDate.GetHashCode();
+                if (this.CancellationDate != null)
+                    hashCode = hashCode * 59 + this.CancellationDate.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/SubscriptionWithToken.cs b/src/Flipdish/Model/SubscriptionWithToken.cs
deleted file mode 100644
index 7aa4a67c..00000000
--- a/src/Flipdish/Model/SubscriptionWithToken.cs
+++ /dev/null
@@ -1,267 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Subscription Base + token
-    /// </summary>
-    [DataContract]
-    public partial class SubscriptionWithToken :  IEquatable<SubscriptionWithToken>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SubscriptionWithToken" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected SubscriptionWithToken() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SubscriptionWithToken" /> class.
-        /// </summary>
-        /// <param name="token">Token (required).</param>
-        /// <param name="quantity">Number of physical restaurants (required).</param>
-        /// <param name="subscriptionPlanId">Subscription plan identifier (required).</param>
-        /// <param name="appId">App name Id of the subscription (required).</param>
-        /// <param name="vatNumber">Last 4 digits of the card.</param>
-        /// <param name="vatCountryCode">Expiry date of the card (required).</param>
-        public SubscriptionWithToken(string token = default(string), int? quantity = default(int?), int? subscriptionPlanId = default(int?), string appId = default(string), string vatNumber = default(string), string vatCountryCode = default(string))
-        {
-            // to ensure "token" is required (not null)
-            if (token == null)
-            {
-                throw new InvalidDataException("token is a required property for SubscriptionWithToken and cannot be null");
-            }
-            else
-            {
-                this.Token = token;
-            }
-            // to ensure "quantity" is required (not null)
-            if (quantity == null)
-            {
-                throw new InvalidDataException("quantity is a required property for SubscriptionWithToken and cannot be null");
-            }
-            else
-            {
-                this.Quantity = quantity;
-            }
-            // to ensure "subscriptionPlanId" is required (not null)
-            if (subscriptionPlanId == null)
-            {
-                throw new InvalidDataException("subscriptionPlanId is a required property for SubscriptionWithToken and cannot be null");
-            }
-            else
-            {
-                this.SubscriptionPlanId = subscriptionPlanId;
-            }
-            // to ensure "appId" is required (not null)
-            if (appId == null)
-            {
-                throw new InvalidDataException("appId is a required property for SubscriptionWithToken and cannot be null");
-            }
-            else
-            {
-                this.AppId = appId;
-            }
-            // to ensure "vatCountryCode" is required (not null)
-            if (vatCountryCode == null)
-            {
-                throw new InvalidDataException("vatCountryCode is a required property for SubscriptionWithToken and cannot be null");
-            }
-            else
-            {
-                this.VatCountryCode = vatCountryCode;
-            }
-            this.VatNumber = vatNumber;
-        }
-        
-        /// <summary>
-        /// Token
-        /// </summary>
-        /// <value>Token</value>
-        [DataMember(Name="Token", EmitDefaultValue=false)]
-        public string Token { get; set; }
-
-        /// <summary>
-        /// Number of physical restaurants
-        /// </summary>
-        /// <value>Number of physical restaurants</value>
-        [DataMember(Name="Quantity", EmitDefaultValue=false)]
-        public int? Quantity { get; set; }
-
-        /// <summary>
-        /// Subscription plan identifier
-        /// </summary>
-        /// <value>Subscription plan identifier</value>
-        [DataMember(Name="SubscriptionPlanId", EmitDefaultValue=false)]
-        public int? SubscriptionPlanId { get; set; }
-
-        /// <summary>
-        /// App name Id of the subscription
-        /// </summary>
-        /// <value>App name Id of the subscription</value>
-        [DataMember(Name="AppId", EmitDefaultValue=false)]
-        public string AppId { get; set; }
-
-        /// <summary>
-        /// Last 4 digits of the card
-        /// </summary>
-        /// <value>Last 4 digits of the card</value>
-        [DataMember(Name="VatNumber", EmitDefaultValue=false)]
-        public string VatNumber { get; set; }
-
-        /// <summary>
-        /// Expiry date of the card
-        /// </summary>
-        /// <value>Expiry date of the card</value>
-        [DataMember(Name="VatCountryCode", EmitDefaultValue=false)]
-        public string VatCountryCode { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class SubscriptionWithToken {\n");
-            sb.Append("  Token: ").Append(Token).Append("\n");
-            sb.Append("  Quantity: ").Append(Quantity).Append("\n");
-            sb.Append("  SubscriptionPlanId: ").Append(SubscriptionPlanId).Append("\n");
-            sb.Append("  AppId: ").Append(AppId).Append("\n");
-            sb.Append("  VatNumber: ").Append(VatNumber).Append("\n");
-            sb.Append("  VatCountryCode: ").Append(VatCountryCode).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as SubscriptionWithToken);
-        }
-
-        /// <summary>
-        /// Returns true if SubscriptionWithToken instances are equal
-        /// </summary>
-        /// <param name="input">Instance of SubscriptionWithToken to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(SubscriptionWithToken input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Token == input.Token ||
-                    (this.Token != null &&
-                    this.Token.Equals(input.Token))
-                ) && 
-                (
-                    this.Quantity == input.Quantity ||
-                    (this.Quantity != null &&
-                    this.Quantity.Equals(input.Quantity))
-                ) && 
-                (
-                    this.SubscriptionPlanId == input.SubscriptionPlanId ||
-                    (this.SubscriptionPlanId != null &&
-                    this.SubscriptionPlanId.Equals(input.SubscriptionPlanId))
-                ) && 
-                (
-                    this.AppId == input.AppId ||
-                    (this.AppId != null &&
-                    this.AppId.Equals(input.AppId))
-                ) && 
-                (
-                    this.VatNumber == input.VatNumber ||
-                    (this.VatNumber != null &&
-                    this.VatNumber.Equals(input.VatNumber))
-                ) && 
-                (
-                    this.VatCountryCode == input.VatCountryCode ||
-                    (this.VatCountryCode != null &&
-                    this.VatCountryCode.Equals(input.VatCountryCode))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Token != null)
-                    hashCode = hashCode * 59 + this.Token.GetHashCode();
-                if (this.Quantity != null)
-                    hashCode = hashCode * 59 + this.Quantity.GetHashCode();
-                if (this.SubscriptionPlanId != null)
-                    hashCode = hashCode * 59 + this.SubscriptionPlanId.GetHashCode();
-                if (this.AppId != null)
-                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
-                if (this.VatNumber != null)
-                    hashCode = hashCode * 59 + this.VatNumber.GetHashCode();
-                if (this.VatCountryCode != null)
-                    hashCode = hashCode * 59 + this.VatCountryCode.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Quantity (int?) maximum
-            if(this.Quantity > (int?)2147483647)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Quantity, must be a value less than or equal to 2147483647.", new [] { "Quantity" });
-            }
-
-            // Quantity (int?) minimum
-            if(this.Quantity < (int?)1)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Quantity, must be a value greater than or equal to 1.", new [] { "Quantity" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/SupportedCountry.cs b/src/Flipdish/Model/SupportedCountry.cs
index d2087cdc..e2ad7c25 100644
--- a/src/Flipdish/Model/SupportedCountry.cs
+++ b/src/Flipdish/Model/SupportedCountry.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Describes a supported country
     /// </summary>
     [DataContract]
-    public partial class SupportedCountry :  IEquatable<SupportedCountry>, IValidatableObject
+    public partial class SupportedCountry :  IEquatable<SupportedCountry>
     {
         /// <summary>
         /// Address layout format. This changes the layout of address entry forms on the web app, iOS and Android app and should be set based on local custom.
@@ -344,16 +342,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TaxItem.cs b/src/Flipdish/Model/TaxItem.cs
new file mode 100644
index 00000000..72e9869b
--- /dev/null
+++ b/src/Flipdish/Model/TaxItem.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// A collection of tax items on the order.
+    /// </summary>
+    [DataContract]
+    public partial class TaxItem :  IEquatable<TaxItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TaxItem" /> class.
+        /// </summary>
+        /// <param name="name">The name of the tax item..</param>
+        /// <param name="rate">The tax rate applied to the item..</param>
+        /// <param name="amount">The amount of tax applied to the item..</param>
+        public TaxItem(string name = default(string), double? rate = default(double?), double? amount = default(double?))
+        {
+            this.Name = name;
+            this.Rate = rate;
+            this.Amount = amount;
+        }
+        
+        /// <summary>
+        /// The name of the tax item.
+        /// </summary>
+        /// <value>The name of the tax item.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The tax rate applied to the item.
+        /// </summary>
+        /// <value>The tax rate applied to the item.</value>
+        [DataMember(Name="Rate", EmitDefaultValue=false)]
+        public double? Rate { get; set; }
+
+        /// <summary>
+        /// The amount of tax applied to the item.
+        /// </summary>
+        /// <value>The amount of tax applied to the item.</value>
+        [DataMember(Name="Amount", EmitDefaultValue=false)]
+        public double? Amount { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class TaxItem {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Rate: ").Append(Rate).Append("\n");
+            sb.Append("  Amount: ").Append(Amount).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as TaxItem);
+        }
+
+        /// <summary>
+        /// Returns true if TaxItem instances are equal
+        /// </summary>
+        /// <param name="input">Instance of TaxItem to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(TaxItem input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Rate == input.Rate ||
+                    (this.Rate != null &&
+                    this.Rate.Equals(input.Rate))
+                ) && 
+                (
+                    this.Amount == input.Amount ||
+                    (this.Amount != null &&
+                    this.Amount.Equals(input.Amount))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Rate != null)
+                    hashCode = hashCode * 59 + this.Rate.GetHashCode();
+                if (this.Amount != null)
+                    hashCode = hashCode * 59 + this.Amount.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/TaxRate.cs b/src/Flipdish/Model/TaxRate.cs
new file mode 100644
index 00000000..97baff42
--- /dev/null
+++ b/src/Flipdish/Model/TaxRate.cs
@@ -0,0 +1,144 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// TaxRate
+    /// </summary>
+    [DataContract]
+    public partial class TaxRate :  IEquatable<TaxRate>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TaxRate" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        /// <param name="percentage">percentage.</param>
+        /// <param name="total">total.</param>
+        public TaxRate(string name = default(string), double? percentage = default(double?), double? total = default(double?))
+        {
+            this.Name = name;
+            this.Percentage = percentage;
+            this.Total = total;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Percentage
+        /// </summary>
+        [DataMember(Name="Percentage", EmitDefaultValue=false)]
+        public double? Percentage { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Total
+        /// </summary>
+        [DataMember(Name="Total", EmitDefaultValue=false)]
+        public double? Total { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class TaxRate {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Percentage: ").Append(Percentage).Append("\n");
+            sb.Append("  Total: ").Append(Total).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as TaxRate);
+        }
+
+        /// <summary>
+        /// Returns true if TaxRate instances are equal
+        /// </summary>
+        /// <param name="input">Instance of TaxRate to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(TaxRate input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Percentage == input.Percentage ||
+                    (this.Percentage != null &&
+                    this.Percentage.Equals(input.Percentage))
+                ) && 
+                (
+                    this.Total == input.Total ||
+                    (this.Total != null &&
+                    this.Total.Equals(input.Total))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Percentage != null)
+                    hashCode = hashCode * 59 + this.Percentage.GetHashCode();
+                if (this.Total != null)
+                    hashCode = hashCode * 59 + this.Total.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/Teammate.cs b/src/Flipdish/Model/Teammate.cs
index 723b8587..72f79b7b 100644
--- a/src/Flipdish/Model/Teammate.cs
+++ b/src/Flipdish/Model/Teammate.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Teammate
     /// </summary>
     [DataContract]
-    public partial class Teammate :  IEquatable<Teammate>, IValidatableObject
+    public partial class Teammate :  IEquatable<Teammate>
     {
         /// <summary>
         /// Invitation status
@@ -89,47 +87,71 @@ public enum AppAccessLevelEnum
             [EnumMember(Value = "StoreOwner")]
             StoreOwner = 3,
             
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 4,
+            
             /// <summary>
             /// Enum ManagedOwner for value: ManagedOwner
             /// </summary>
             [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 4,
+            ManagedOwner = 5,
             
             /// <summary>
             /// Enum Integrator for value: Integrator
             /// </summary>
             [EnumMember(Value = "Integrator")]
-            Integrator = 5,
+            Integrator = 6,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 7,
             
             /// <summary>
             /// Enum StoreManager for value: StoreManager
             /// </summary>
             [EnumMember(Value = "StoreManager")]
-            StoreManager = 6,
+            StoreManager = 8,
             
             /// <summary>
             /// Enum StoreStaff for value: StoreStaff
             /// </summary>
             [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 7,
+            StoreStaff = 9,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 10,
             
             /// <summary>
             /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
             /// </summary>
             [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 8,
+            StoreReadOnlyAccess = 11,
             
             /// <summary>
             /// Enum FinanceManger for value: FinanceManger
             /// </summary>
             [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 9,
+            FinanceManger = 12,
+            
+            /// <summary>
+            /// Enum Onboarding for value: Onboarding
+            /// </summary>
+            [EnumMember(Value = "Onboarding")]
+            Onboarding = 13,
             
             /// <summary>
             /// Enum Support for value: Support
             /// </summary>
             [EnumMember(Value = "Support")]
-            Support = 10
+            Support = 14
         }
 
         /// <summary>
@@ -142,6 +164,7 @@ public enum AppAccessLevelEnum
         /// Initializes a new instance of the <see cref="Teammate" /> class.
         /// </summary>
         /// <param name="teammateId">Unique indentifier.</param>
+        /// <param name="userId">User ID of the teammate.</param>
         /// <param name="name">Name.</param>
         /// <param name="lastActivity">Last activity.</param>
         /// <param name="appId">Access level is for this App.</param>
@@ -150,9 +173,11 @@ public enum AppAccessLevelEnum
         /// <param name="appAccessLevel">App access level.</param>
         /// <param name="hasAccessToAllStores">The user has access to all stores for the app (including new stores that added later).</param>
         /// <param name="storeIds">Store IDs the user has access to (if HasAccessToAllStores is false).</param>
-        public Teammate(string teammateId = default(string), string name = default(string), DateTime? lastActivity = default(DateTime?), string appId = default(string), InvitationStatusEnum? invitationStatus = default(InvitationStatusEnum?), string email = default(string), AppAccessLevelEnum? appAccessLevel = default(AppAccessLevelEnum?), bool? hasAccessToAllStores = default(bool?), List<int?> storeIds = default(List<int?>))
+        /// <param name="propertyIds">Property Ids the user has access to (if HasAccessToAllStores is false).</param>
+        public Teammate(string teammateId = default(string), int? userId = default(int?), string name = default(string), DateTime? lastActivity = default(DateTime?), string appId = default(string), InvitationStatusEnum? invitationStatus = default(InvitationStatusEnum?), string email = default(string), AppAccessLevelEnum? appAccessLevel = default(AppAccessLevelEnum?), bool? hasAccessToAllStores = default(bool?), List<int?> storeIds = default(List<int?>), List<string> propertyIds = default(List<string>))
         {
             this.TeammateId = teammateId;
+            this.UserId = userId;
             this.Name = name;
             this.LastActivity = lastActivity;
             this.AppId = appId;
@@ -161,6 +186,7 @@ public enum AppAccessLevelEnum
             this.AppAccessLevel = appAccessLevel;
             this.HasAccessToAllStores = hasAccessToAllStores;
             this.StoreIds = storeIds;
+            this.PropertyIds = propertyIds;
         }
         
         /// <summary>
@@ -170,6 +196,13 @@ public enum AppAccessLevelEnum
         [DataMember(Name="TeammateId", EmitDefaultValue=false)]
         public string TeammateId { get; set; }
 
+        /// <summary>
+        /// User ID of the teammate
+        /// </summary>
+        /// <value>User ID of the teammate</value>
+        [DataMember(Name="UserId", EmitDefaultValue=false)]
+        public int? UserId { get; set; }
+
         /// <summary>
         /// Name
         /// </summary>
@@ -214,6 +247,13 @@ public enum AppAccessLevelEnum
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
+        /// <summary>
+        /// Property Ids the user has access to (if HasAccessToAllStores is false)
+        /// </summary>
+        /// <value>Property Ids the user has access to (if HasAccessToAllStores is false)</value>
+        [DataMember(Name="PropertyIds", EmitDefaultValue=false)]
+        public List<string> PropertyIds { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -223,6 +263,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class Teammate {\n");
             sb.Append("  TeammateId: ").Append(TeammateId).Append("\n");
+            sb.Append("  UserId: ").Append(UserId).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  LastActivity: ").Append(LastActivity).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
@@ -231,6 +272,7 @@ public override string ToString()
             sb.Append("  AppAccessLevel: ").Append(AppAccessLevel).Append("\n");
             sb.Append("  HasAccessToAllStores: ").Append(HasAccessToAllStores).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  PropertyIds: ").Append(PropertyIds).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -270,6 +312,11 @@ public bool Equals(Teammate input)
                     (this.TeammateId != null &&
                     this.TeammateId.Equals(input.TeammateId))
                 ) && 
+                (
+                    this.UserId == input.UserId ||
+                    (this.UserId != null &&
+                    this.UserId.Equals(input.UserId))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -309,6 +356,11 @@ public bool Equals(Teammate input)
                     this.StoreIds == input.StoreIds ||
                     this.StoreIds != null &&
                     this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.PropertyIds == input.PropertyIds ||
+                    this.PropertyIds != null &&
+                    this.PropertyIds.SequenceEqual(input.PropertyIds)
                 );
         }
 
@@ -323,6 +375,8 @@ public override int GetHashCode()
                 int hashCode = 41;
                 if (this.TeammateId != null)
                     hashCode = hashCode * 59 + this.TeammateId.GetHashCode();
+                if (this.UserId != null)
+                    hashCode = hashCode * 59 + this.UserId.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.LastActivity != null)
@@ -339,19 +393,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.HasAccessToAllStores.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.PropertyIds != null)
+                    hashCode = hashCode * 59 + this.PropertyIds.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TeammateBase.cs b/src/Flipdish/Model/TeammateBase.cs
index 3b9e1927..62ea8d05 100644
--- a/src/Flipdish/Model/TeammateBase.cs
+++ b/src/Flipdish/Model/TeammateBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// TeammateBase
     /// </summary>
     [DataContract]
-    public partial class TeammateBase :  IEquatable<TeammateBase>, IValidatableObject
+    public partial class TeammateBase :  IEquatable<TeammateBase>
     {
         /// <summary>
         /// App access level
@@ -56,47 +54,71 @@ public enum AppAccessLevelEnum
             [EnumMember(Value = "StoreOwner")]
             StoreOwner = 3,
             
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 4,
+            
             /// <summary>
             /// Enum ManagedOwner for value: ManagedOwner
             /// </summary>
             [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 4,
+            ManagedOwner = 5,
             
             /// <summary>
             /// Enum Integrator for value: Integrator
             /// </summary>
             [EnumMember(Value = "Integrator")]
-            Integrator = 5,
+            Integrator = 6,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 7,
             
             /// <summary>
             /// Enum StoreManager for value: StoreManager
             /// </summary>
             [EnumMember(Value = "StoreManager")]
-            StoreManager = 6,
+            StoreManager = 8,
             
             /// <summary>
             /// Enum StoreStaff for value: StoreStaff
             /// </summary>
             [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 7,
+            StoreStaff = 9,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 10,
             
             /// <summary>
             /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
             /// </summary>
             [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 8,
+            StoreReadOnlyAccess = 11,
             
             /// <summary>
             /// Enum FinanceManger for value: FinanceManger
             /// </summary>
             [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 9,
+            FinanceManger = 12,
+            
+            /// <summary>
+            /// Enum Onboarding for value: Onboarding
+            /// </summary>
+            [EnumMember(Value = "Onboarding")]
+            Onboarding = 13,
             
             /// <summary>
             /// Enum Support for value: Support
             /// </summary>
             [EnumMember(Value = "Support")]
-            Support = 10
+            Support = 14
         }
 
         /// <summary>
@@ -111,11 +133,13 @@ public enum AppAccessLevelEnum
         /// <param name="appAccessLevel">App access level.</param>
         /// <param name="hasAccessToAllStores">The user has access to all stores for the app (including new stores that added later).</param>
         /// <param name="storeIds">Store IDs the user has access to (if HasAccessToAllStores is false).</param>
-        public TeammateBase(AppAccessLevelEnum? appAccessLevel = default(AppAccessLevelEnum?), bool? hasAccessToAllStores = default(bool?), List<int?> storeIds = default(List<int?>))
+        /// <param name="propertyIds">Property Ids the user has access to (if HasAccessToAllStores is false).</param>
+        public TeammateBase(AppAccessLevelEnum? appAccessLevel = default(AppAccessLevelEnum?), bool? hasAccessToAllStores = default(bool?), List<int?> storeIds = default(List<int?>), List<string> propertyIds = default(List<string>))
         {
             this.AppAccessLevel = appAccessLevel;
             this.HasAccessToAllStores = hasAccessToAllStores;
             this.StoreIds = storeIds;
+            this.PropertyIds = propertyIds;
         }
         
 
@@ -133,6 +157,13 @@ public enum AppAccessLevelEnum
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
+        /// <summary>
+        /// Property Ids the user has access to (if HasAccessToAllStores is false)
+        /// </summary>
+        /// <value>Property Ids the user has access to (if HasAccessToAllStores is false)</value>
+        [DataMember(Name="PropertyIds", EmitDefaultValue=false)]
+        public List<string> PropertyIds { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,6 +175,7 @@ public override string ToString()
             sb.Append("  AppAccessLevel: ").Append(AppAccessLevel).Append("\n");
             sb.Append("  HasAccessToAllStores: ").Append(HasAccessToAllStores).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
+            sb.Append("  PropertyIds: ").Append(PropertyIds).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -192,6 +224,11 @@ public bool Equals(TeammateBase input)
                     this.StoreIds == input.StoreIds ||
                     this.StoreIds != null &&
                     this.StoreIds.SequenceEqual(input.StoreIds)
+                ) && 
+                (
+                    this.PropertyIds == input.PropertyIds ||
+                    this.PropertyIds != null &&
+                    this.PropertyIds.SequenceEqual(input.PropertyIds)
                 );
         }
 
@@ -210,19 +247,11 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.HasAccessToAllStores.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
+                if (this.PropertyIds != null)
+                    hashCode = hashCode * 59 + this.PropertyIds.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TeammateDeletedEvent.cs b/src/Flipdish/Model/TeammateDeletedEvent.cs
index 68aa2497..de367afb 100644
--- a/src/Flipdish/Model/TeammateDeletedEvent.cs
+++ b/src/Flipdish/Model/TeammateDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// TeammateDeletedEvent
     /// </summary>
     [DataContract]
-    public partial class TeammateDeletedEvent :  IEquatable<TeammateDeletedEvent>, IValidatableObject
+    public partial class TeammateDeletedEvent :  IEquatable<TeammateDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TeammateDeletedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class TeammateDeletedEvent :  IEquatable<TeammateDeletedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public TeammateDeletedEvent(Teammate teammate = default(Teammate), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public TeammateDeletedEvent(Teammate teammate = default(Teammate), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.Teammate = teammate;
             this.User = user;
@@ -50,7 +51,10 @@ public partial class TeammateDeletedEvent :  IEquatable<TeammateDeletedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class TeammateDeletedEvent :  IEquatable<TeammateDeletedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class TeammateDeletedEvent :  IEquatable<TeammateDeletedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(TeammateDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TeammateInviteAcceptedEvent.cs b/src/Flipdish/Model/TeammateInviteAcceptedEvent.cs
index 5e6825c7..184b57ae 100644
--- a/src/Flipdish/Model/TeammateInviteAcceptedEvent.cs
+++ b/src/Flipdish/Model/TeammateInviteAcceptedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// TeammateInviteAcceptedEvent
     /// </summary>
     [DataContract]
-    public partial class TeammateInviteAcceptedEvent :  IEquatable<TeammateInviteAcceptedEvent>, IValidatableObject
+    public partial class TeammateInviteAcceptedEvent :  IEquatable<TeammateInviteAcceptedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TeammateInviteAcceptedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class TeammateInviteAcceptedEvent :  IEquatable<TeammateInviteAcc
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public TeammateInviteAcceptedEvent(Teammate teammate = default(Teammate), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public TeammateInviteAcceptedEvent(Teammate teammate = default(Teammate), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.Teammate = teammate;
             this.User = user;
@@ -50,7 +51,10 @@ public partial class TeammateInviteAcceptedEvent :  IEquatable<TeammateInviteAcc
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class TeammateInviteAcceptedEvent :  IEquatable<TeammateInviteAcc
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class TeammateInviteAcceptedEvent :  IEquatable<TeammateInviteAcc
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(TeammateInviteAcceptedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TeammateInviteSentEvent.cs b/src/Flipdish/Model/TeammateInviteSentEvent.cs
index 05cdda99..10c1b5b6 100644
--- a/src/Flipdish/Model/TeammateInviteSentEvent.cs
+++ b/src/Flipdish/Model/TeammateInviteSentEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// TeammateInviteSentEvent
     /// </summary>
     [DataContract]
-    public partial class TeammateInviteSentEvent :  IEquatable<TeammateInviteSentEvent>, IValidatableObject
+    public partial class TeammateInviteSentEvent :  IEquatable<TeammateInviteSentEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TeammateInviteSentEvent" /> class.
@@ -40,8 +38,11 @@ public partial class TeammateInviteSentEvent :  IEquatable<TeammateInviteSentEve
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public TeammateInviteSentEvent(Teammate teammate = default(Teammate), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public TeammateInviteSentEvent(Teammate teammate = default(Teammate), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.Teammate = teammate;
             this.User = user;
@@ -50,7 +51,10 @@ public partial class TeammateInviteSentEvent :  IEquatable<TeammateInviteSentEve
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class TeammateInviteSentEvent :  IEquatable<TeammateInviteSentEve
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class TeammateInviteSentEvent :  IEquatable<TeammateInviteSentEve
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(TeammateInviteSentEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TeammateUpdatedEvent.cs b/src/Flipdish/Model/TeammateUpdatedEvent.cs
index ab6cff0f..cd4f3841 100644
--- a/src/Flipdish/Model/TeammateUpdatedEvent.cs
+++ b/src/Flipdish/Model/TeammateUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// TeammateUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class TeammateUpdatedEvent :  IEquatable<TeammateUpdatedEvent>, IValidatableObject
+    public partial class TeammateUpdatedEvent :  IEquatable<TeammateUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TeammateUpdatedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class TeammateUpdatedEvent :  IEquatable<TeammateUpdatedEvent>, I
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public TeammateUpdatedEvent(Teammate teammate = default(Teammate), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public TeammateUpdatedEvent(Teammate teammate = default(Teammate), UserEventInfo user = default(UserEventInfo), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.Teammate = teammate;
             this.User = user;
@@ -50,7 +51,10 @@ public partial class TeammateUpdatedEvent :  IEquatable<TeammateUpdatedEvent>, I
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class TeammateUpdatedEvent :  IEquatable<TeammateUpdatedEvent>, I
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class TeammateUpdatedEvent :  IEquatable<TeammateUpdatedEvent>, I
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(TeammateUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TelemetrySeriesProperty.cs b/src/Flipdish/Model/TelemetrySeriesProperty.cs
index 7b83972a..fdbb6253 100644
--- a/src/Flipdish/Model/TelemetrySeriesProperty.cs
+++ b/src/Flipdish/Model/TelemetrySeriesProperty.cs
@@ -12,32 +12,30 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// TelemetrySeriesProperty
+    /// TelemetrySeriesProperty.
     /// </summary>
     [DataContract]
-    public partial class TelemetrySeriesProperty :  IEquatable<TelemetrySeriesProperty>, IValidatableObject
+    public partial class TelemetrySeriesProperty :  IEquatable<TelemetrySeriesProperty>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TelemetrySeriesProperty" /> class.
         /// </summary>
-        /// <param name="name">name.</param>
-        /// <param name="type">type.</param>
-        /// <param name="intValues">intValues.</param>
-        /// <param name="stringValues">stringValues.</param>
-        /// <param name="doubleValues">doubleValues.</param>
+        /// <param name="name">Name..</param>
+        /// <param name="type">Type..</param>
+        /// <param name="intValues">IntValues..</param>
+        /// <param name="stringValues">StringValues..</param>
+        /// <param name="doubleValues">DoubleValues..</param>
         public TelemetrySeriesProperty(string name = default(string), string type = default(string), List<int?> intValues = default(List<int?>), List<string> stringValues = default(List<string>), List<double?> doubleValues = default(List<double?>))
         {
             this.Name = name;
@@ -48,32 +46,37 @@ public partial class TelemetrySeriesProperty :  IEquatable<TelemetrySeriesProper
         }
         
         /// <summary>
-        /// Gets or Sets Name
+        /// Name.
         /// </summary>
+        /// <value>Name.</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or Sets Type
+        /// Type.
         /// </summary>
+        /// <value>Type.</value>
         [DataMember(Name="Type", EmitDefaultValue=false)]
         public string Type { get; set; }
 
         /// <summary>
-        /// Gets or Sets IntValues
+        /// IntValues.
         /// </summary>
+        /// <value>IntValues.</value>
         [DataMember(Name="IntValues", EmitDefaultValue=false)]
         public List<int?> IntValues { get; set; }
 
         /// <summary>
-        /// Gets or Sets StringValues
+        /// StringValues.
         /// </summary>
+        /// <value>StringValues.</value>
         [DataMember(Name="StringValues", EmitDefaultValue=false)]
         public List<string> StringValues { get; set; }
 
         /// <summary>
-        /// Gets or Sets DoubleValues
+        /// DoubleValues.
         /// </summary>
+        /// <value>DoubleValues.</value>
         [DataMember(Name="DoubleValues", EmitDefaultValue=false)]
         public List<double?> DoubleValues { get; set; }
 
@@ -173,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TelemetrySeriesQueryParameters.cs b/src/Flipdish/Model/TelemetrySeriesQueryParameters.cs
index 1d2c66c1..8a67fdf6 100644
--- a/src/Flipdish/Model/TelemetrySeriesQueryParameters.cs
+++ b/src/Flipdish/Model/TelemetrySeriesQueryParameters.cs
@@ -12,31 +12,29 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// TelemetrySeriesQueryParameters
+    /// TelemetrySeriesQueryParameters.
     /// </summary>
     [DataContract]
-    public partial class TelemetrySeriesQueryParameters :  IEquatable<TelemetrySeriesQueryParameters>, IValidatableObject
+    public partial class TelemetrySeriesQueryParameters :  IEquatable<TelemetrySeriesQueryParameters>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TelemetrySeriesQueryParameters" /> class.
         /// </summary>
-        /// <param name="kioskId">kioskId.</param>
-        /// <param name="variables">variables.</param>
-        /// <param name="startDate">startDate.</param>
-        /// <param name="endDate">endDate.</param>
+        /// <param name="kioskId">KioskId..</param>
+        /// <param name="variables">Variables..</param>
+        /// <param name="startDate">StartDate..</param>
+        /// <param name="endDate">EndDate..</param>
         public TelemetrySeriesQueryParameters(string kioskId = default(string), List<string> variables = default(List<string>), DateTime? startDate = default(DateTime?), DateTime? endDate = default(DateTime?))
         {
             this.KioskId = kioskId;
@@ -46,26 +44,30 @@ public partial class TelemetrySeriesQueryParameters :  IEquatable<TelemetrySerie
         }
         
         /// <summary>
-        /// Gets or Sets KioskId
+        /// KioskId.
         /// </summary>
+        /// <value>KioskId.</value>
         [DataMember(Name="KioskId", EmitDefaultValue=false)]
         public string KioskId { get; set; }
 
         /// <summary>
-        /// Gets or Sets Variables
+        /// Variables.
         /// </summary>
+        /// <value>Variables.</value>
         [DataMember(Name="Variables", EmitDefaultValue=false)]
         public List<string> Variables { get; set; }
 
         /// <summary>
-        /// Gets or Sets StartDate
+        /// StartDate.
         /// </summary>
+        /// <value>StartDate.</value>
         [DataMember(Name="StartDate", EmitDefaultValue=false)]
         public DateTime? StartDate { get; set; }
 
         /// <summary>
-        /// Gets or Sets EndDate
+        /// EndDate.
         /// </summary>
+        /// <value>EndDate.</value>
         [DataMember(Name="EndDate", EmitDefaultValue=false)]
         public DateTime? EndDate { get; set; }
 
@@ -157,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TelemetrySeriesResult.cs b/src/Flipdish/Model/TelemetrySeriesResult.cs
index 3cfde8b9..60ba1b67 100644
--- a/src/Flipdish/Model/TelemetrySeriesResult.cs
+++ b/src/Flipdish/Model/TelemetrySeriesResult.cs
@@ -12,29 +12,27 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// TelemetrySeriesResult
+    /// TelemetrySeriesResult.
     /// </summary>
     [DataContract]
-    public partial class TelemetrySeriesResult :  IEquatable<TelemetrySeriesResult>, IValidatableObject
+    public partial class TelemetrySeriesResult :  IEquatable<TelemetrySeriesResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TelemetrySeriesResult" /> class.
         /// </summary>
-        /// <param name="timestamps">timestamps.</param>
-        /// <param name="properties">properties.</param>
+        /// <param name="timestamps">Timestamps..</param>
+        /// <param name="properties">Properties..</param>
         public TelemetrySeriesResult(List<DateTime?> timestamps = default(List<DateTime?>), List<TelemetrySeriesProperty> properties = default(List<TelemetrySeriesProperty>))
         {
             this.Timestamps = timestamps;
@@ -42,14 +40,16 @@ public partial class TelemetrySeriesResult :  IEquatable<TelemetrySeriesResult>,
         }
         
         /// <summary>
-        /// Gets or Sets Timestamps
+        /// Timestamps.
         /// </summary>
+        /// <value>Timestamps.</value>
         [DataMember(Name="Timestamps", EmitDefaultValue=false)]
         public List<DateTime?> Timestamps { get; set; }
 
         /// <summary>
-        /// Gets or Sets Properties
+        /// Properties.
         /// </summary>
+        /// <value>Properties.</value>
         [DataMember(Name="Properties", EmitDefaultValue=false)]
         public List<TelemetrySeriesProperty> Properties { get; set; }
 
@@ -125,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/TelephonyConfig.cs b/src/Flipdish/Model/TelephonyConfig.cs
new file mode 100644
index 00000000..6034dde2
--- /dev/null
+++ b/src/Flipdish/Model/TelephonyConfig.cs
@@ -0,0 +1,287 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Phone call
+    /// </summary>
+    [DataContract]
+    public partial class TelephonyConfig :  IEquatable<TelephonyConfig>
+    {
+        /// <summary>
+        /// Type of telephony service
+        /// </summary>
+        /// <value>Type of telephony service</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum TypeEnum
+        {
+            
+            /// <summary>
+            /// Enum PreRecorded for value: PreRecorded
+            /// </summary>
+            [EnumMember(Value = "PreRecorded")]
+            PreRecorded = 1,
+            
+            /// <summary>
+            /// Enum VoiceAI for value: VoiceAI
+            /// </summary>
+            [EnumMember(Value = "VoiceAI")]
+            VoiceAI = 2
+        }
+
+        /// <summary>
+        /// Type of telephony service
+        /// </summary>
+        /// <value>Type of telephony service</value>
+        [DataMember(Name="Type", EmitDefaultValue=false)]
+        public TypeEnum? Type { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TelephonyConfig" /> class.
+        /// </summary>
+        /// <param name="telephonyConfigId">ID of the phone call.</param>
+        /// <param name="apmEnabled">APM enabled flag.</param>
+        /// <param name="type">Type of telephony service.</param>
+        /// <param name="consentEnabled">Consent enabled flag.</param>
+        /// <param name="phoneNumber">APM phone number of the store.</param>
+        /// <param name="sendAppLinkSms">Send app link SMS flag.</param>
+        /// <param name="useCustomAppLinkSmsMessage">Use custom app link SMS message flag.</param>
+        /// <param name="useCustomVoiceMessage">Use custom voice message flag.</param>
+        /// <param name="appLinkSmsMessage">App link SMS message.</param>
+        /// <param name="resendApmMessageAfterDays">Amount of days to resend APM message.</param>
+        public TelephonyConfig(int? telephonyConfigId = default(int?), bool? apmEnabled = default(bool?), TypeEnum? type = default(TypeEnum?), bool? consentEnabled = default(bool?), string phoneNumber = default(string), bool? sendAppLinkSms = default(bool?), bool? useCustomAppLinkSmsMessage = default(bool?), bool? useCustomVoiceMessage = default(bool?), string appLinkSmsMessage = default(string), int? resendApmMessageAfterDays = default(int?))
+        {
+            this.TelephonyConfigId = telephonyConfigId;
+            this.ApmEnabled = apmEnabled;
+            this.Type = type;
+            this.ConsentEnabled = consentEnabled;
+            this.PhoneNumber = phoneNumber;
+            this.SendAppLinkSms = sendAppLinkSms;
+            this.UseCustomAppLinkSmsMessage = useCustomAppLinkSmsMessage;
+            this.UseCustomVoiceMessage = useCustomVoiceMessage;
+            this.AppLinkSmsMessage = appLinkSmsMessage;
+            this.ResendApmMessageAfterDays = resendApmMessageAfterDays;
+        }
+        
+        /// <summary>
+        /// ID of the phone call
+        /// </summary>
+        /// <value>ID of the phone call</value>
+        [DataMember(Name="TelephonyConfigId", EmitDefaultValue=false)]
+        public int? TelephonyConfigId { get; set; }
+
+        /// <summary>
+        /// APM enabled flag
+        /// </summary>
+        /// <value>APM enabled flag</value>
+        [DataMember(Name="ApmEnabled", EmitDefaultValue=false)]
+        public bool? ApmEnabled { get; set; }
+
+
+        /// <summary>
+        /// Consent enabled flag
+        /// </summary>
+        /// <value>Consent enabled flag</value>
+        [DataMember(Name="ConsentEnabled", EmitDefaultValue=false)]
+        public bool? ConsentEnabled { get; set; }
+
+        /// <summary>
+        /// APM phone number of the store
+        /// </summary>
+        /// <value>APM phone number of the store</value>
+        [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
+        public string PhoneNumber { get; set; }
+
+        /// <summary>
+        /// Send app link SMS flag
+        /// </summary>
+        /// <value>Send app link SMS flag</value>
+        [DataMember(Name="SendAppLinkSms", EmitDefaultValue=false)]
+        public bool? SendAppLinkSms { get; set; }
+
+        /// <summary>
+        /// Use custom app link SMS message flag
+        /// </summary>
+        /// <value>Use custom app link SMS message flag</value>
+        [DataMember(Name="UseCustomAppLinkSmsMessage", EmitDefaultValue=false)]
+        public bool? UseCustomAppLinkSmsMessage { get; set; }
+
+        /// <summary>
+        /// Use custom voice message flag
+        /// </summary>
+        /// <value>Use custom voice message flag</value>
+        [DataMember(Name="UseCustomVoiceMessage", EmitDefaultValue=false)]
+        public bool? UseCustomVoiceMessage { get; set; }
+
+        /// <summary>
+        /// App link SMS message
+        /// </summary>
+        /// <value>App link SMS message</value>
+        [DataMember(Name="AppLinkSmsMessage", EmitDefaultValue=false)]
+        public string AppLinkSmsMessage { get; set; }
+
+        /// <summary>
+        /// Amount of days to resend APM message
+        /// </summary>
+        /// <value>Amount of days to resend APM message</value>
+        [DataMember(Name="ResendApmMessageAfterDays", EmitDefaultValue=false)]
+        public int? ResendApmMessageAfterDays { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class TelephonyConfig {\n");
+            sb.Append("  TelephonyConfigId: ").Append(TelephonyConfigId).Append("\n");
+            sb.Append("  ApmEnabled: ").Append(ApmEnabled).Append("\n");
+            sb.Append("  Type: ").Append(Type).Append("\n");
+            sb.Append("  ConsentEnabled: ").Append(ConsentEnabled).Append("\n");
+            sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
+            sb.Append("  SendAppLinkSms: ").Append(SendAppLinkSms).Append("\n");
+            sb.Append("  UseCustomAppLinkSmsMessage: ").Append(UseCustomAppLinkSmsMessage).Append("\n");
+            sb.Append("  UseCustomVoiceMessage: ").Append(UseCustomVoiceMessage).Append("\n");
+            sb.Append("  AppLinkSmsMessage: ").Append(AppLinkSmsMessage).Append("\n");
+            sb.Append("  ResendApmMessageAfterDays: ").Append(ResendApmMessageAfterDays).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as TelephonyConfig);
+        }
+
+        /// <summary>
+        /// Returns true if TelephonyConfig instances are equal
+        /// </summary>
+        /// <param name="input">Instance of TelephonyConfig to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(TelephonyConfig input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.TelephonyConfigId == input.TelephonyConfigId ||
+                    (this.TelephonyConfigId != null &&
+                    this.TelephonyConfigId.Equals(input.TelephonyConfigId))
+                ) && 
+                (
+                    this.ApmEnabled == input.ApmEnabled ||
+                    (this.ApmEnabled != null &&
+                    this.ApmEnabled.Equals(input.ApmEnabled))
+                ) && 
+                (
+                    this.Type == input.Type ||
+                    (this.Type != null &&
+                    this.Type.Equals(input.Type))
+                ) && 
+                (
+                    this.ConsentEnabled == input.ConsentEnabled ||
+                    (this.ConsentEnabled != null &&
+                    this.ConsentEnabled.Equals(input.ConsentEnabled))
+                ) && 
+                (
+                    this.PhoneNumber == input.PhoneNumber ||
+                    (this.PhoneNumber != null &&
+                    this.PhoneNumber.Equals(input.PhoneNumber))
+                ) && 
+                (
+                    this.SendAppLinkSms == input.SendAppLinkSms ||
+                    (this.SendAppLinkSms != null &&
+                    this.SendAppLinkSms.Equals(input.SendAppLinkSms))
+                ) && 
+                (
+                    this.UseCustomAppLinkSmsMessage == input.UseCustomAppLinkSmsMessage ||
+                    (this.UseCustomAppLinkSmsMessage != null &&
+                    this.UseCustomAppLinkSmsMessage.Equals(input.UseCustomAppLinkSmsMessage))
+                ) && 
+                (
+                    this.UseCustomVoiceMessage == input.UseCustomVoiceMessage ||
+                    (this.UseCustomVoiceMessage != null &&
+                    this.UseCustomVoiceMessage.Equals(input.UseCustomVoiceMessage))
+                ) && 
+                (
+                    this.AppLinkSmsMessage == input.AppLinkSmsMessage ||
+                    (this.AppLinkSmsMessage != null &&
+                    this.AppLinkSmsMessage.Equals(input.AppLinkSmsMessage))
+                ) && 
+                (
+                    this.ResendApmMessageAfterDays == input.ResendApmMessageAfterDays ||
+                    (this.ResendApmMessageAfterDays != null &&
+                    this.ResendApmMessageAfterDays.Equals(input.ResendApmMessageAfterDays))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.TelephonyConfigId != null)
+                    hashCode = hashCode * 59 + this.TelephonyConfigId.GetHashCode();
+                if (this.ApmEnabled != null)
+                    hashCode = hashCode * 59 + this.ApmEnabled.GetHashCode();
+                if (this.Type != null)
+                    hashCode = hashCode * 59 + this.Type.GetHashCode();
+                if (this.ConsentEnabled != null)
+                    hashCode = hashCode * 59 + this.ConsentEnabled.GetHashCode();
+                if (this.PhoneNumber != null)
+                    hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
+                if (this.SendAppLinkSms != null)
+                    hashCode = hashCode * 59 + this.SendAppLinkSms.GetHashCode();
+                if (this.UseCustomAppLinkSmsMessage != null)
+                    hashCode = hashCode * 59 + this.UseCustomAppLinkSmsMessage.GetHashCode();
+                if (this.UseCustomVoiceMessage != null)
+                    hashCode = hashCode * 59 + this.UseCustomVoiceMessage.GetHashCode();
+                if (this.AppLinkSmsMessage != null)
+                    hashCode = hashCode * 59 + this.AppLinkSmsMessage.GetHashCode();
+                if (this.ResendApmMessageAfterDays != null)
+                    hashCode = hashCode * 59 + this.ResendApmMessageAfterDays.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/TelephonyConfigUpdatedEvent.cs b/src/Flipdish/Model/TelephonyConfigUpdatedEvent.cs
new file mode 100644
index 00000000..ba26fc0d
--- /dev/null
+++ b/src/Flipdish/Model/TelephonyConfigUpdatedEvent.cs
@@ -0,0 +1,317 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Telephony Config Updated Event
+    /// </summary>
+    [DataContract]
+    public partial class TelephonyConfigUpdatedEvent :  IEquatable<TelephonyConfigUpdatedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TelephonyConfigUpdatedEvent" /> class.
+        /// </summary>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="description">Description.</param>
+        /// <param name="storeId">Store Id.</param>
+        /// <param name="telephonyConfig">The telephony config.</param>
+        /// <param name="propertyId">Property Id.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public TelephonyConfigUpdatedEvent(string eventName = default(string), string description = default(string), int? storeId = default(int?), TelephonyConfig telephonyConfig = default(TelephonyConfig), string propertyId = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.EventName = eventName;
+            this.Description = description;
+            this.StoreId = storeId;
+            this.TelephonyConfig = telephonyConfig;
+            this.PropertyId = propertyId;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// Description
+        /// </summary>
+        /// <value>Description</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Store Id
+        /// </summary>
+        /// <value>Store Id</value>
+        [DataMember(Name="StoreId", EmitDefaultValue=false)]
+        public int? StoreId { get; set; }
+
+        /// <summary>
+        /// The telephony config
+        /// </summary>
+        /// <value>The telephony config</value>
+        [DataMember(Name="TelephonyConfig", EmitDefaultValue=false)]
+        public TelephonyConfig TelephonyConfig { get; set; }
+
+        /// <summary>
+        /// Property Id
+        /// </summary>
+        /// <value>Property Id</value>
+        [DataMember(Name="PropertyId", EmitDefaultValue=false)]
+        public string PropertyId { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class TelephonyConfigUpdatedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  TelephonyConfig: ").Append(TelephonyConfig).Append("\n");
+            sb.Append("  PropertyId: ").Append(PropertyId).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as TelephonyConfigUpdatedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if TelephonyConfigUpdatedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of TelephonyConfigUpdatedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(TelephonyConfigUpdatedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.StoreId == input.StoreId ||
+                    (this.StoreId != null &&
+                    this.StoreId.Equals(input.StoreId))
+                ) && 
+                (
+                    this.TelephonyConfig == input.TelephonyConfig ||
+                    (this.TelephonyConfig != null &&
+                    this.TelephonyConfig.Equals(input.TelephonyConfig))
+                ) && 
+                (
+                    this.PropertyId == input.PropertyId ||
+                    (this.PropertyId != null &&
+                    this.PropertyId.Equals(input.PropertyId))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.StoreId != null)
+                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.TelephonyConfig != null)
+                    hashCode = hashCode * 59 + this.TelephonyConfig.GetHashCode();
+                if (this.PropertyId != null)
+                    hashCode = hashCode * 59 + this.PropertyId.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ThirdPartyFeesDetails.cs b/src/Flipdish/Model/ThirdPartyFeesDetails.cs
new file mode 100644
index 00000000..de33985c
--- /dev/null
+++ b/src/Flipdish/Model/ThirdPartyFeesDetails.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Breakdown of third party integration fees
+    /// </summary>
+    [DataContract]
+    public partial class ThirdPartyFeesDetails :  IEquatable<ThirdPartyFeesDetails>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ThirdPartyFeesDetails" /> class.
+        /// </summary>
+        /// <param name="deliveryIntegrationFee">Third party integration delivery fee.</param>
+        /// <param name="deliveryTipFee">Third party integration delivery tip fee.</param>
+        /// <param name="totalThirdPartyFees">Total third party integration fees.</param>
+        public ThirdPartyFeesDetails(double? deliveryIntegrationFee = default(double?), double? deliveryTipFee = default(double?), double? totalThirdPartyFees = default(double?))
+        {
+            this.DeliveryIntegrationFee = deliveryIntegrationFee;
+            this.DeliveryTipFee = deliveryTipFee;
+            this.TotalThirdPartyFees = totalThirdPartyFees;
+        }
+        
+        /// <summary>
+        /// Third party integration delivery fee
+        /// </summary>
+        /// <value>Third party integration delivery fee</value>
+        [DataMember(Name="DeliveryIntegrationFee", EmitDefaultValue=false)]
+        public double? DeliveryIntegrationFee { get; set; }
+
+        /// <summary>
+        /// Third party integration delivery tip fee
+        /// </summary>
+        /// <value>Third party integration delivery tip fee</value>
+        [DataMember(Name="DeliveryTipFee", EmitDefaultValue=false)]
+        public double? DeliveryTipFee { get; set; }
+
+        /// <summary>
+        /// Total third party integration fees
+        /// </summary>
+        /// <value>Total third party integration fees</value>
+        [DataMember(Name="TotalThirdPartyFees", EmitDefaultValue=false)]
+        public double? TotalThirdPartyFees { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ThirdPartyFeesDetails {\n");
+            sb.Append("  DeliveryIntegrationFee: ").Append(DeliveryIntegrationFee).Append("\n");
+            sb.Append("  DeliveryTipFee: ").Append(DeliveryTipFee).Append("\n");
+            sb.Append("  TotalThirdPartyFees: ").Append(TotalThirdPartyFees).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ThirdPartyFeesDetails);
+        }
+
+        /// <summary>
+        /// Returns true if ThirdPartyFeesDetails instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ThirdPartyFeesDetails to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ThirdPartyFeesDetails input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeliveryIntegrationFee == input.DeliveryIntegrationFee ||
+                    (this.DeliveryIntegrationFee != null &&
+                    this.DeliveryIntegrationFee.Equals(input.DeliveryIntegrationFee))
+                ) && 
+                (
+                    this.DeliveryTipFee == input.DeliveryTipFee ||
+                    (this.DeliveryTipFee != null &&
+                    this.DeliveryTipFee.Equals(input.DeliveryTipFee))
+                ) && 
+                (
+                    this.TotalThirdPartyFees == input.TotalThirdPartyFees ||
+                    (this.TotalThirdPartyFees != null &&
+                    this.TotalThirdPartyFees.Equals(input.TotalThirdPartyFees))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeliveryIntegrationFee != null)
+                    hashCode = hashCode * 59 + this.DeliveryIntegrationFee.GetHashCode();
+                if (this.DeliveryTipFee != null)
+                    hashCode = hashCode * 59 + this.DeliveryTipFee.GetHashCode();
+                if (this.TotalThirdPartyFees != null)
+                    hashCode = hashCode * 59 + this.TotalThirdPartyFees.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/TipConfiguration.cs b/src/Flipdish/Model/TipConfiguration.cs
index aea4bf88..86f0615f 100644
--- a/src/Flipdish/Model/TipConfiguration.cs
+++ b/src/Flipdish/Model/TipConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Describes the configuration of tipping
     /// </summary>
     [DataContract]
-    public partial class TipConfiguration :  IEquatable<TipConfiguration>, IValidatableObject
+    public partial class TipConfiguration :  IEquatable<TipConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="TipConfiguration" /> class.
@@ -212,16 +210,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UnRegisterCardReaderRequest.cs b/src/Flipdish/Model/UnRegisterCardReaderRequest.cs
index 835cfdb8..a47da202 100644
--- a/src/Flipdish/Model/UnRegisterCardReaderRequest.cs
+++ b/src/Flipdish/Model/UnRegisterCardReaderRequest.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Un-Register card reader request
     /// </summary>
     [DataContract]
-    public partial class UnRegisterCardReaderRequest :  IEquatable<UnRegisterCardReaderRequest>, IValidatableObject
+    public partial class UnRegisterCardReaderRequest :  IEquatable<UnRegisterCardReaderRequest>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UnRegisterCardReaderRequest" /> class.
@@ -148,16 +146,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpcomingInvoice.cs b/src/Flipdish/Model/UpcomingInvoice.cs
new file mode 100644
index 00000000..8443288d
--- /dev/null
+++ b/src/Flipdish/Model/UpcomingInvoice.cs
@@ -0,0 +1,261 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// UpcomingInvoice.
+    /// </summary>
+    [DataContract]
+    public partial class UpcomingInvoice :  IEquatable<UpcomingInvoice>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpcomingInvoice" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected UpcomingInvoice() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpcomingInvoice" /> class.
+        /// </summary>
+        /// <param name="amount">Amount.</param>
+        /// <param name="nextBillingDate">Next billing date.</param>
+        /// <param name="subtotal">Subtotal (required).</param>
+        /// <param name="totalExcludingTax">Total excluding tax.</param>
+        /// <param name="amountDue">Amount due (required).</param>
+        /// <param name="tax">Tax (required).</param>
+        /// <param name="items">Items.</param>
+        /// <param name="discounts">Discounts.</param>
+        public UpcomingInvoice(double? amount = default(double?), DateTime? nextBillingDate = default(DateTime?), double? subtotal = default(double?), double? totalExcludingTax = default(double?), double? amountDue = default(double?), double? tax = default(double?), List<InvoiceItem> items = default(List<InvoiceItem>), List<InvoiceDiscount> discounts = default(List<InvoiceDiscount>))
+        {
+            // to ensure "subtotal" is required (not null)
+            if (subtotal == null)
+            {
+                throw new InvalidDataException("subtotal is a required property for UpcomingInvoice and cannot be null");
+            }
+            else
+            {
+                this.Subtotal = subtotal;
+            }
+            // to ensure "amountDue" is required (not null)
+            if (amountDue == null)
+            {
+                throw new InvalidDataException("amountDue is a required property for UpcomingInvoice and cannot be null");
+            }
+            else
+            {
+                this.AmountDue = amountDue;
+            }
+            // to ensure "tax" is required (not null)
+            if (tax == null)
+            {
+                throw new InvalidDataException("tax is a required property for UpcomingInvoice and cannot be null");
+            }
+            else
+            {
+                this.Tax = tax;
+            }
+            this.Amount = amount;
+            this.NextBillingDate = nextBillingDate;
+            this.TotalExcludingTax = totalExcludingTax;
+            this.Items = items;
+            this.Discounts = discounts;
+        }
+        
+        /// <summary>
+        /// Amount
+        /// </summary>
+        /// <value>Amount</value>
+        [DataMember(Name="Amount", EmitDefaultValue=false)]
+        public double? Amount { get; set; }
+
+        /// <summary>
+        /// Next billing date
+        /// </summary>
+        /// <value>Next billing date</value>
+        [DataMember(Name="NextBillingDate", EmitDefaultValue=false)]
+        public DateTime? NextBillingDate { get; set; }
+
+        /// <summary>
+        /// Subtotal
+        /// </summary>
+        /// <value>Subtotal</value>
+        [DataMember(Name="Subtotal", EmitDefaultValue=false)]
+        public double? Subtotal { get; set; }
+
+        /// <summary>
+        /// Total excluding tax
+        /// </summary>
+        /// <value>Total excluding tax</value>
+        [DataMember(Name="TotalExcludingTax", EmitDefaultValue=false)]
+        public double? TotalExcludingTax { get; set; }
+
+        /// <summary>
+        /// Amount due
+        /// </summary>
+        /// <value>Amount due</value>
+        [DataMember(Name="AmountDue", EmitDefaultValue=false)]
+        public double? AmountDue { get; set; }
+
+        /// <summary>
+        /// Tax
+        /// </summary>
+        /// <value>Tax</value>
+        [DataMember(Name="Tax", EmitDefaultValue=false)]
+        public double? Tax { get; set; }
+
+        /// <summary>
+        /// Items
+        /// </summary>
+        /// <value>Items</value>
+        [DataMember(Name="Items", EmitDefaultValue=false)]
+        public List<InvoiceItem> Items { get; set; }
+
+        /// <summary>
+        /// Discounts
+        /// </summary>
+        /// <value>Discounts</value>
+        [DataMember(Name="Discounts", EmitDefaultValue=false)]
+        public List<InvoiceDiscount> Discounts { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UpcomingInvoice {\n");
+            sb.Append("  Amount: ").Append(Amount).Append("\n");
+            sb.Append("  NextBillingDate: ").Append(NextBillingDate).Append("\n");
+            sb.Append("  Subtotal: ").Append(Subtotal).Append("\n");
+            sb.Append("  TotalExcludingTax: ").Append(TotalExcludingTax).Append("\n");
+            sb.Append("  AmountDue: ").Append(AmountDue).Append("\n");
+            sb.Append("  Tax: ").Append(Tax).Append("\n");
+            sb.Append("  Items: ").Append(Items).Append("\n");
+            sb.Append("  Discounts: ").Append(Discounts).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UpcomingInvoice);
+        }
+
+        /// <summary>
+        /// Returns true if UpcomingInvoice instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UpcomingInvoice to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UpcomingInvoice input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Amount == input.Amount ||
+                    (this.Amount != null &&
+                    this.Amount.Equals(input.Amount))
+                ) && 
+                (
+                    this.NextBillingDate == input.NextBillingDate ||
+                    (this.NextBillingDate != null &&
+                    this.NextBillingDate.Equals(input.NextBillingDate))
+                ) && 
+                (
+                    this.Subtotal == input.Subtotal ||
+                    (this.Subtotal != null &&
+                    this.Subtotal.Equals(input.Subtotal))
+                ) && 
+                (
+                    this.TotalExcludingTax == input.TotalExcludingTax ||
+                    (this.TotalExcludingTax != null &&
+                    this.TotalExcludingTax.Equals(input.TotalExcludingTax))
+                ) && 
+                (
+                    this.AmountDue == input.AmountDue ||
+                    (this.AmountDue != null &&
+                    this.AmountDue.Equals(input.AmountDue))
+                ) && 
+                (
+                    this.Tax == input.Tax ||
+                    (this.Tax != null &&
+                    this.Tax.Equals(input.Tax))
+                ) && 
+                (
+                    this.Items == input.Items ||
+                    this.Items != null &&
+                    this.Items.SequenceEqual(input.Items)
+                ) && 
+                (
+                    this.Discounts == input.Discounts ||
+                    this.Discounts != null &&
+                    this.Discounts.SequenceEqual(input.Discounts)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Amount != null)
+                    hashCode = hashCode * 59 + this.Amount.GetHashCode();
+                if (this.NextBillingDate != null)
+                    hashCode = hashCode * 59 + this.NextBillingDate.GetHashCode();
+                if (this.Subtotal != null)
+                    hashCode = hashCode * 59 + this.Subtotal.GetHashCode();
+                if (this.TotalExcludingTax != null)
+                    hashCode = hashCode * 59 + this.TotalExcludingTax.GetHashCode();
+                if (this.AmountDue != null)
+                    hashCode = hashCode * 59 + this.AmountDue.GetHashCode();
+                if (this.Tax != null)
+                    hashCode = hashCode * 59 + this.Tax.GetHashCode();
+                if (this.Items != null)
+                    hashCode = hashCode * 59 + this.Items.GetHashCode();
+                if (this.Discounts != null)
+                    hashCode = hashCode * 59 + this.Discounts.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UpdateAppConfiguration.cs b/src/Flipdish/Model/UpdateAppConfiguration.cs
deleted file mode 100644
index ca5f6860..00000000
--- a/src/Flipdish/Model/UpdateAppConfiguration.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// UpdateAppConfiguration
-    /// </summary>
-    [DataContract]
-    public partial class UpdateAppConfiguration :  IEquatable<UpdateAppConfiguration>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateAppConfiguration" /> class.
-        /// </summary>
-        /// <param name="id">id.</param>
-        /// <param name="physicalRestaurants">physicalRestaurants.</param>
-        /// <param name="isEnabled">isEnabled.</param>
-        /// <param name="settings">settings.</param>
-        public UpdateAppConfiguration(string id = default(string), List<int?> physicalRestaurants = default(List<int?>), bool? isEnabled = default(bool?), List<AppConfigurationSetting> settings = default(List<AppConfigurationSetting>))
-        {
-            this.Id = id;
-            this.PhysicalRestaurants = physicalRestaurants;
-            this.IsEnabled = isEnabled;
-            this.Settings = settings;
-        }
-        
-        /// <summary>
-        /// Gets or Sets Id
-        /// </summary>
-        [DataMember(Name="Id", EmitDefaultValue=false)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or Sets PhysicalRestaurants
-        /// </summary>
-        [DataMember(Name="PhysicalRestaurants", EmitDefaultValue=false)]
-        public List<int?> PhysicalRestaurants { get; set; }
-
-        /// <summary>
-        /// Gets or Sets IsEnabled
-        /// </summary>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or Sets Settings
-        /// </summary>
-        [DataMember(Name="Settings", EmitDefaultValue=false)]
-        public List<AppConfigurationSetting> Settings { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class UpdateAppConfiguration {\n");
-            sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  PhysicalRestaurants: ").Append(PhysicalRestaurants).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  Settings: ").Append(Settings).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as UpdateAppConfiguration);
-        }
-
-        /// <summary>
-        /// Returns true if UpdateAppConfiguration instances are equal
-        /// </summary>
-        /// <param name="input">Instance of UpdateAppConfiguration to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(UpdateAppConfiguration input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Id == input.Id ||
-                    (this.Id != null &&
-                    this.Id.Equals(input.Id))
-                ) && 
-                (
-                    this.PhysicalRestaurants == input.PhysicalRestaurants ||
-                    this.PhysicalRestaurants != null &&
-                    this.PhysicalRestaurants.SequenceEqual(input.PhysicalRestaurants)
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.Settings == input.Settings ||
-                    this.Settings != null &&
-                    this.Settings.SequenceEqual(input.Settings)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Id != null)
-                    hashCode = hashCode * 59 + this.Id.GetHashCode();
-                if (this.PhysicalRestaurants != null)
-                    hashCode = hashCode * 59 + this.PhysicalRestaurants.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.Settings != null)
-                    hashCode = hashCode * 59 + this.Settings.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/UpdateAppStoreApp.cs b/src/Flipdish/Model/UpdateAppStoreApp.cs
index e3ceb2ed..a26e76f5 100644
--- a/src/Flipdish/Model/UpdateAppStoreApp.cs
+++ b/src/Flipdish/Model/UpdateAppStoreApp.cs
@@ -12,28 +12,25 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Update App store app
+    /// UpdateAppStoreApp
     /// </summary>
     [DataContract]
-    public partial class UpdateAppStoreApp :  IEquatable<UpdateAppStoreApp>, IValidatableObject
+    public partial class UpdateAppStoreApp :  IEquatable<UpdateAppStoreApp>
     {
         /// <summary>
-        /// Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;
+        /// Defines ConfigurationType
         /// </summary>
-        /// <value>Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum ConfigurationTypeEnum
         {
@@ -52,15 +49,13 @@ public enum ConfigurationTypeEnum
         }
 
         /// <summary>
-        /// Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;
+        /// Gets or Sets ConfigurationType
         /// </summary>
-        /// <value>Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt;</value>
         [DataMember(Name="ConfigurationType", EmitDefaultValue=false)]
         public ConfigurationTypeEnum ConfigurationType { get; set; }
         /// <summary>
-        /// Store selector type
+        /// Defines StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StoreSelectorTypeEnum
         {
@@ -85,15 +80,13 @@ public enum StoreSelectorTypeEnum
         }
 
         /// <summary>
-        /// Store selector type
+        /// Gets or Sets StoreSelectorType
         /// </summary>
-        /// <value>Store selector type</value>
         [DataMember(Name="StoreSelectorType", EmitDefaultValue=false)]
         public StoreSelectorTypeEnum StoreSelectorType { get; set; }
         /// <summary>
-        /// Teammate app access level
+        /// Defines TeammateAppAccessLevel
         /// </summary>
-        /// <value>Teammate app access level</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum TeammateAppAccessLevelEnum
         {
@@ -110,53 +103,69 @@ public enum TeammateAppAccessLevelEnum
             [EnumMember(Value = "StoreOwner")]
             StoreOwner = 2,
             
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 3,
+            
             /// <summary>
             /// Enum ManagedOwner for value: ManagedOwner
             /// </summary>
             [EnumMember(Value = "ManagedOwner")]
-            ManagedOwner = 3,
+            ManagedOwner = 4,
             
             /// <summary>
             /// Enum Integrator for value: Integrator
             /// </summary>
             [EnumMember(Value = "Integrator")]
-            Integrator = 4,
+            Integrator = 5,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 6,
             
             /// <summary>
             /// Enum StoreManager for value: StoreManager
             /// </summary>
             [EnumMember(Value = "StoreManager")]
-            StoreManager = 5,
+            StoreManager = 7,
             
             /// <summary>
             /// Enum StoreStaff for value: StoreStaff
             /// </summary>
             [EnumMember(Value = "StoreStaff")]
-            StoreStaff = 6,
+            StoreStaff = 8,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 9,
             
             /// <summary>
             /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
             /// </summary>
             [EnumMember(Value = "StoreReadOnlyAccess")]
-            StoreReadOnlyAccess = 7,
+            StoreReadOnlyAccess = 10,
             
             /// <summary>
             /// Enum FinanceManger for value: FinanceManger
             /// </summary>
             [EnumMember(Value = "FinanceManger")]
-            FinanceManger = 8
+            FinanceManger = 11
         }
 
         /// <summary>
-        /// Teammate app access level
+        /// Gets or Sets TeammateAppAccessLevel
         /// </summary>
-        /// <value>Teammate app access level</value>
         [DataMember(Name="TeammateAppAccessLevel", EmitDefaultValue=false)]
         public TeammateAppAccessLevelEnum? TeammateAppAccessLevel { get; set; }
         /// <summary>
-        /// Permissions type
+        /// Defines PermissionsType
         /// </summary>
-        /// <value>Permissions type</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum PermissionsTypeEnum
         {
@@ -169,9 +178,8 @@ public enum PermissionsTypeEnum
         }
 
         /// <summary>
-        /// Permissions type
+        /// Gets or Sets PermissionsType
         /// </summary>
-        /// <value>Permissions type</value>
         [DataMember(Name="PermissionsType", EmitDefaultValue=false)]
         public PermissionsTypeEnum PermissionsType { get; set; }
         /// <summary>
@@ -226,9 +234,8 @@ public enum CategoriesEnum
 
 
         /// <summary>
-        /// Categories
+        /// Gets or Sets Categories
         /// </summary>
-        /// <value>Categories</value>
         [DataMember(Name="Categories", EmitDefaultValue=false)]
         public List<CategoriesEnum> Categories { get; set; }
         /// <summary>
@@ -343,9 +350,8 @@ public enum CountriesEnum
 
 
         /// <summary>
-        /// Countries
+        /// Gets or Sets Countries
         /// </summary>
-        /// <value>Countries</value>
         [DataMember(Name="Countries", EmitDefaultValue=false)]
         public List<CountriesEnum> Countries { get; set; }
         /// <summary>
@@ -356,22 +362,25 @@ protected UpdateAppStoreApp() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateAppStoreApp" /> class.
         /// </summary>
-        /// <param name="details">Details (required).</param>
-        /// <param name="configurationType">Configuration type  &lt;example&gt;External link&lt;/example&gt;&lt;example&gt;Flipdish hosted&lt;/example&gt; (required).</param>
-        /// <param name="storeSelectorType">Store selector type (required).</param>
-        /// <param name="fieldGroups">Field groups.</param>
-        /// <param name="setupInstructions">Setup instructions.</param>
-        /// <param name="externalSetupLink">External setup link.</param>
-        /// <param name="teammateAppAccessLevel">Teammate app access level.</param>
-        /// <param name="permissionsType">Permissions type (required).</param>
-        /// <param name="support">Support information.</param>
-        /// <param name="name">Name (required).</param>
-        /// <param name="description">Description (required).</param>
-        /// <param name="isEnabled">Is application enabled.</param>
-        /// <param name="categories">Categories (required).</param>
-        /// <param name="countries">Countries (required).</param>
-        /// <param name="developerName">Developer Name.</param>
-        public UpdateAppStoreApp(string details = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), AppStoreAppSupportInfo support = default(AppStoreAppSupportInfo), string name = default(string), string description = default(string), bool? isEnabled = default(bool?), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
+        /// <param name="details">details (required).</param>
+        /// <param name="configurationType">configurationType (required).</param>
+        /// <param name="storeSelectorType">storeSelectorType (required).</param>
+        /// <param name="fieldGroups">fieldGroups.</param>
+        /// <param name="setupInstructions">setupInstructions.</param>
+        /// <param name="externalSetupLink">externalSetupLink.</param>
+        /// <param name="teammateAppAccessLevel">teammateAppAccessLevel.</param>
+        /// <param name="permissionsType">permissionsType (required).</param>
+        /// <param name="support">support.</param>
+        /// <param name="externalFunctionActionUrl">externalFunctionActionUrl.</param>
+        /// <param name="externalFunctionSignatureKey">externalFunctionSignatureKey.</param>
+        /// <param name="isPaid">isPaid.</param>
+        /// <param name="name">name (required).</param>
+        /// <param name="description">description (required).</param>
+        /// <param name="isEnabled">isEnabled.</param>
+        /// <param name="categories">categories (required).</param>
+        /// <param name="countries">countries (required).</param>
+        /// <param name="developerName">developerName.</param>
+        public UpdateAppStoreApp(string details = default(string), ConfigurationTypeEnum configurationType = default(ConfigurationTypeEnum), StoreSelectorTypeEnum storeSelectorType = default(StoreSelectorTypeEnum), List<FieldGroup> fieldGroups = default(List<FieldGroup>), string setupInstructions = default(string), string externalSetupLink = default(string), TeammateAppAccessLevelEnum? teammateAppAccessLevel = default(TeammateAppAccessLevelEnum?), PermissionsTypeEnum permissionsType = default(PermissionsTypeEnum), AppStoreAppSupportInfo support = default(AppStoreAppSupportInfo), string externalFunctionActionUrl = default(string), string externalFunctionSignatureKey = default(string), bool? isPaid = default(bool?), string name = default(string), string description = default(string), bool? isEnabled = default(bool?), List<CategoriesEnum> categories = default(List<CategoriesEnum>), List<CountriesEnum> countries = default(List<CountriesEnum>), string developerName = default(string))
         {
             // to ensure "details" is required (not null)
             if (details == null)
@@ -450,76 +459,88 @@ protected UpdateAppStoreApp() { }
             this.ExternalSetupLink = externalSetupLink;
             this.TeammateAppAccessLevel = teammateAppAccessLevel;
             this.Support = support;
+            this.ExternalFunctionActionUrl = externalFunctionActionUrl;
+            this.ExternalFunctionSignatureKey = externalFunctionSignatureKey;
+            this.IsPaid = isPaid;
             this.IsEnabled = isEnabled;
             this.DeveloperName = developerName;
         }
         
         /// <summary>
-        /// Details
+        /// Gets or Sets Details
         /// </summary>
-        /// <value>Details</value>
         [DataMember(Name="Details", EmitDefaultValue=false)]
         public string Details { get; set; }
 
 
 
         /// <summary>
-        /// Field groups
+        /// Gets or Sets FieldGroups
         /// </summary>
-        /// <value>Field groups</value>
         [DataMember(Name="FieldGroups", EmitDefaultValue=false)]
         public List<FieldGroup> FieldGroups { get; set; }
 
         /// <summary>
-        /// Setup instructions
+        /// Gets or Sets SetupInstructions
         /// </summary>
-        /// <value>Setup instructions</value>
         [DataMember(Name="SetupInstructions", EmitDefaultValue=false)]
         public string SetupInstructions { get; set; }
 
         /// <summary>
-        /// External setup link
+        /// Gets or Sets ExternalSetupLink
         /// </summary>
-        /// <value>External setup link</value>
         [DataMember(Name="ExternalSetupLink", EmitDefaultValue=false)]
         public string ExternalSetupLink { get; set; }
 
 
 
         /// <summary>
-        /// Support information
+        /// Gets or Sets Support
         /// </summary>
-        /// <value>Support information</value>
         [DataMember(Name="Support", EmitDefaultValue=false)]
         public AppStoreAppSupportInfo Support { get; set; }
 
         /// <summary>
-        /// Name
+        /// Gets or Sets ExternalFunctionActionUrl
+        /// </summary>
+        [DataMember(Name="ExternalFunctionActionUrl", EmitDefaultValue=false)]
+        public string ExternalFunctionActionUrl { get; set; }
+
+        /// <summary>
+        /// Gets or Sets ExternalFunctionSignatureKey
+        /// </summary>
+        [DataMember(Name="ExternalFunctionSignatureKey", EmitDefaultValue=false)]
+        public string ExternalFunctionSignatureKey { get; set; }
+
+        /// <summary>
+        /// Gets or Sets IsPaid
+        /// </summary>
+        [DataMember(Name="IsPaid", EmitDefaultValue=false)]
+        public bool? IsPaid { get; set; }
+
+        /// <summary>
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
         /// <summary>
-        /// Description
+        /// Gets or Sets Description
         /// </summary>
-        /// <value>Description</value>
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
         /// <summary>
-        /// Is application enabled
+        /// Gets or Sets IsEnabled
         /// </summary>
-        /// <value>Is application enabled</value>
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
 
 
         /// <summary>
-        /// Developer Name
+        /// Gets or Sets DeveloperName
         /// </summary>
-        /// <value>Developer Name</value>
         [DataMember(Name="DeveloperName", EmitDefaultValue=false)]
         public string DeveloperName { get; set; }
 
@@ -540,6 +561,9 @@ public override string ToString()
             sb.Append("  TeammateAppAccessLevel: ").Append(TeammateAppAccessLevel).Append("\n");
             sb.Append("  PermissionsType: ").Append(PermissionsType).Append("\n");
             sb.Append("  Support: ").Append(Support).Append("\n");
+            sb.Append("  ExternalFunctionActionUrl: ").Append(ExternalFunctionActionUrl).Append("\n");
+            sb.Append("  ExternalFunctionSignatureKey: ").Append(ExternalFunctionSignatureKey).Append("\n");
+            sb.Append("  IsPaid: ").Append(IsPaid).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
@@ -625,6 +649,21 @@ public bool Equals(UpdateAppStoreApp input)
                     (this.Support != null &&
                     this.Support.Equals(input.Support))
                 ) && 
+                (
+                    this.ExternalFunctionActionUrl == input.ExternalFunctionActionUrl ||
+                    (this.ExternalFunctionActionUrl != null &&
+                    this.ExternalFunctionActionUrl.Equals(input.ExternalFunctionActionUrl))
+                ) && 
+                (
+                    this.ExternalFunctionSignatureKey == input.ExternalFunctionSignatureKey ||
+                    (this.ExternalFunctionSignatureKey != null &&
+                    this.ExternalFunctionSignatureKey.Equals(input.ExternalFunctionSignatureKey))
+                ) && 
+                (
+                    this.IsPaid == input.IsPaid ||
+                    (this.IsPaid != null &&
+                    this.IsPaid.Equals(input.IsPaid))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -684,6 +723,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.PermissionsType.GetHashCode();
                 if (this.Support != null)
                     hashCode = hashCode * 59 + this.Support.GetHashCode();
+                if (this.ExternalFunctionActionUrl != null)
+                    hashCode = hashCode * 59 + this.ExternalFunctionActionUrl.GetHashCode();
+                if (this.ExternalFunctionSignatureKey != null)
+                    hashCode = hashCode * 59 + this.ExternalFunctionSignatureKey.GetHashCode();
+                if (this.IsPaid != null)
+                    hashCode = hashCode * 59 + this.IsPaid.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 if (this.Description != null)
@@ -699,16 +744,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateAppStoreAppConfiguration.cs b/src/Flipdish/Model/UpdateAppStoreAppConfiguration.cs
index e52e6748..109b5cb7 100644
--- a/src/Flipdish/Model/UpdateAppStoreAppConfiguration.cs
+++ b/src/Flipdish/Model/UpdateAppStoreAppConfiguration.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Update App store app configuration
+    /// UpdateAppStoreAppConfiguration
     /// </summary>
     [DataContract]
-    public partial class UpdateAppStoreAppConfiguration :  IEquatable<UpdateAppStoreAppConfiguration>, IValidatableObject
+    public partial class UpdateAppStoreAppConfiguration :  IEquatable<UpdateAppStoreAppConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateAppStoreAppConfiguration" /> class.
@@ -38,9 +36,9 @@ protected UpdateAppStoreAppConfiguration() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateAppStoreAppConfiguration" /> class.
         /// </summary>
-        /// <param name="isEnabled">Is enabled (required).</param>
-        /// <param name="storeIds">Stores id&#39;s.</param>
-        /// <param name="settings">Settings.</param>
+        /// <param name="isEnabled">isEnabled (required).</param>
+        /// <param name="storeIds">storeIds.</param>
+        /// <param name="settings">settings.</param>
         public UpdateAppStoreAppConfiguration(bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>), List<Setting> settings = default(List<Setting>))
         {
             // to ensure "isEnabled" is required (not null)
@@ -57,23 +55,20 @@ protected UpdateAppStoreAppConfiguration() { }
         }
         
         /// <summary>
-        /// Is enabled
+        /// Gets or Sets IsEnabled
         /// </summary>
-        /// <value>Is enabled</value>
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
         /// <summary>
-        /// Stores id&#39;s
+        /// Gets or Sets StoreIds
         /// </summary>
-        /// <value>Stores id&#39;s</value>
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
         /// <summary>
-        /// Settings
+        /// Gets or Sets Settings
         /// </summary>
-        /// <value>Settings</value>
         [DataMember(Name="Settings", EmitDefaultValue=false)]
         public List<Setting> Settings { get; set; }
 
@@ -157,16 +152,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateAppStoreAppConfigurationValuesBatch.cs b/src/Flipdish/Model/UpdateAppStoreAppConfigurationValuesBatch.cs
new file mode 100644
index 00000000..8804d75c
--- /dev/null
+++ b/src/Flipdish/Model/UpdateAppStoreAppConfigurationValuesBatch.cs
@@ -0,0 +1,112 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// UpdateAppStoreAppConfigurationValuesBatch
+    /// </summary>
+    [DataContract]
+    public partial class UpdateAppStoreAppConfigurationValuesBatch :  IEquatable<UpdateAppStoreAppConfigurationValuesBatch>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateAppStoreAppConfigurationValuesBatch" /> class.
+        /// </summary>
+        /// <param name="settings">settings.</param>
+        public UpdateAppStoreAppConfigurationValuesBatch(List<Setting> settings = default(List<Setting>))
+        {
+            this.Settings = settings;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Settings
+        /// </summary>
+        [DataMember(Name="Settings", EmitDefaultValue=false)]
+        public List<Setting> Settings { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UpdateAppStoreAppConfigurationValuesBatch {\n");
+            sb.Append("  Settings: ").Append(Settings).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UpdateAppStoreAppConfigurationValuesBatch);
+        }
+
+        /// <summary>
+        /// Returns true if UpdateAppStoreAppConfigurationValuesBatch instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UpdateAppStoreAppConfigurationValuesBatch to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UpdateAppStoreAppConfigurationValuesBatch input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Settings == input.Settings ||
+                    this.Settings != null &&
+                    this.Settings.SequenceEqual(input.Settings)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Settings != null)
+                    hashCode = hashCode * 59 + this.Settings.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UpdateAppStoreAppConfigurationWebhookDTO.cs b/src/Flipdish/Model/UpdateAppStoreAppConfigurationWebhookDTO.cs
index e04a6cd4..c3556ba9 100644
--- a/src/Flipdish/Model/UpdateAppStoreAppConfigurationWebhookDTO.cs
+++ b/src/Flipdish/Model/UpdateAppStoreAppConfigurationWebhookDTO.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// App store app configuration webhook event
+    /// UpdateAppStoreAppConfigurationWebhookDTO
     /// </summary>
     [DataContract]
-    public partial class UpdateAppStoreAppConfigurationWebhookDTO :  IEquatable<UpdateAppStoreAppConfigurationWebhookDTO>, IValidatableObject
+    public partial class UpdateAppStoreAppConfigurationWebhookDTO :  IEquatable<UpdateAppStoreAppConfigurationWebhookDTO>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateAppStoreAppConfigurationWebhookDTO" /> class.
@@ -38,10 +36,10 @@ protected UpdateAppStoreAppConfigurationWebhookDTO() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateAppStoreAppConfigurationWebhookDTO" /> class.
         /// </summary>
-        /// <param name="id">Unique App store app configuration id (required).</param>
-        /// <param name="isEnabled">Is enabled (required).</param>
-        /// <param name="storeIds">Store id&#39;s.</param>
-        /// <param name="settings">Settings.</param>
+        /// <param name="id">id (required).</param>
+        /// <param name="isEnabled">isEnabled (required).</param>
+        /// <param name="storeIds">storeIds.</param>
+        /// <param name="settings">settings.</param>
         public UpdateAppStoreAppConfigurationWebhookDTO(string id = default(string), bool? isEnabled = default(bool?), List<int?> storeIds = default(List<int?>), List<Setting> settings = default(List<Setting>))
         {
             // to ensure "id" is required (not null)
@@ -67,30 +65,26 @@ protected UpdateAppStoreAppConfigurationWebhookDTO() { }
         }
         
         /// <summary>
-        /// Unique App store app configuration id
+        /// Gets or Sets Id
         /// </summary>
-        /// <value>Unique App store app configuration id</value>
         [DataMember(Name="Id", EmitDefaultValue=false)]
         public string Id { get; set; }
 
         /// <summary>
-        /// Is enabled
+        /// Gets or Sets IsEnabled
         /// </summary>
-        /// <value>Is enabled</value>
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
         /// <summary>
-        /// Store id&#39;s
+        /// Gets or Sets StoreIds
         /// </summary>
-        /// <value>Store id&#39;s</value>
         [DataMember(Name="StoreIds", EmitDefaultValue=false)]
         public List<int?> StoreIds { get; set; }
 
         /// <summary>
-        /// Settings
+        /// Gets or Sets Settings
         /// </summary>
-        /// <value>Settings</value>
         [DataMember(Name="Settings", EmitDefaultValue=false)]
         public List<Setting> Settings { get; set; }
 
@@ -182,16 +176,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateAppStoreAppExternalProduct.cs b/src/Flipdish/Model/UpdateAppStoreAppExternalProduct.cs
new file mode 100644
index 00000000..aef6e7e7
--- /dev/null
+++ b/src/Flipdish/Model/UpdateAppStoreAppExternalProduct.cs
@@ -0,0 +1,112 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// UpdateAppStoreAppExternalProduct
+    /// </summary>
+    [DataContract]
+    public partial class UpdateAppStoreAppExternalProduct :  IEquatable<UpdateAppStoreAppExternalProduct>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateAppStoreAppExternalProduct" /> class.
+        /// </summary>
+        /// <param name="externalProductId">externalProductId.</param>
+        public UpdateAppStoreAppExternalProduct(string externalProductId = default(string))
+        {
+            this.ExternalProductId = externalProductId;
+        }
+        
+        /// <summary>
+        /// Gets or Sets ExternalProductId
+        /// </summary>
+        [DataMember(Name="ExternalProductId", EmitDefaultValue=false)]
+        public string ExternalProductId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UpdateAppStoreAppExternalProduct {\n");
+            sb.Append("  ExternalProductId: ").Append(ExternalProductId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UpdateAppStoreAppExternalProduct);
+        }
+
+        /// <summary>
+        /// Returns true if UpdateAppStoreAppExternalProduct instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UpdateAppStoreAppExternalProduct to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UpdateAppStoreAppExternalProduct input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.ExternalProductId == input.ExternalProductId ||
+                    (this.ExternalProductId != null &&
+                    this.ExternalProductId.Equals(input.ExternalProductId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.ExternalProductId != null)
+                    hashCode = hashCode * 59 + this.ExternalProductId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UpdateCatalogGroup.cs b/src/Flipdish/Model/UpdateCatalogGroup.cs
deleted file mode 100644
index 4f17783a..00000000
--- a/src/Flipdish/Model/UpdateCatalogGroup.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Update Catalog Group
-    /// </summary>
-    [DataContract]
-    public partial class UpdateCatalogGroup :  IEquatable<UpdateCatalogGroup>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateCatalogGroup" /> class.
-        /// </summary>
-        /// <param name="sku">Stock Keeping Unit (SKU).</param>
-        /// <param name="name">Group name.</param>
-        /// <param name="autogenerateDisplayText">Autogenerate display text in ordering applications.</param>
-        /// <param name="imageFileName">Image File Name.</param>
-        /// <param name="minSelectCount">Minimum number of items that the user has to select.</param>
-        /// <param name="maxSelectCount">Maximum number of items that the user has to select.</param>
-        /// <param name="items">Collection of items associated with this group.</param>
-        /// <param name="metafields">Collection of metafields.</param>
-        public UpdateCatalogGroup(string sku = default(string), string name = default(string), bool? autogenerateDisplayText = default(bool?), string imageFileName = default(string), int? minSelectCount = default(int?), int? maxSelectCount = default(int?), List<UpdateCatalogItemReference> items = default(List<UpdateCatalogItemReference>), List<Metafield> metafields = default(List<Metafield>))
-        {
-            this.Sku = sku;
-            this.Name = name;
-            this.AutogenerateDisplayText = autogenerateDisplayText;
-            this.ImageFileName = imageFileName;
-            this.MinSelectCount = minSelectCount;
-            this.MaxSelectCount = maxSelectCount;
-            this.Items = items;
-            this.Metafields = metafields;
-        }
-        
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Group name
-        /// </summary>
-        /// <value>Group name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Autogenerate display text in ordering applications
-        /// </summary>
-        /// <value>Autogenerate display text in ordering applications</value>
-        [DataMember(Name="AutogenerateDisplayText", EmitDefaultValue=false)]
-        public bool? AutogenerateDisplayText { get; set; }
-
-        /// <summary>
-        /// Image File Name
-        /// </summary>
-        /// <value>Image File Name</value>
-        [DataMember(Name="ImageFileName", EmitDefaultValue=false)]
-        public string ImageFileName { get; set; }
-
-        /// <summary>
-        /// Minimum number of items that the user has to select
-        /// </summary>
-        /// <value>Minimum number of items that the user has to select</value>
-        [DataMember(Name="MinSelectCount", EmitDefaultValue=false)]
-        public int? MinSelectCount { get; set; }
-
-        /// <summary>
-        /// Maximum number of items that the user has to select
-        /// </summary>
-        /// <value>Maximum number of items that the user has to select</value>
-        [DataMember(Name="MaxSelectCount", EmitDefaultValue=false)]
-        public int? MaxSelectCount { get; set; }
-
-        /// <summary>
-        /// Collection of items associated with this group
-        /// </summary>
-        /// <value>Collection of items associated with this group</value>
-        [DataMember(Name="Items", EmitDefaultValue=false)]
-        public List<UpdateCatalogItemReference> Items { get; set; }
-
-        /// <summary>
-        /// Collection of metafields
-        /// </summary>
-        /// <value>Collection of metafields</value>
-        [DataMember(Name="Metafields", EmitDefaultValue=false)]
-        public List<Metafield> Metafields { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class UpdateCatalogGroup {\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  AutogenerateDisplayText: ").Append(AutogenerateDisplayText).Append("\n");
-            sb.Append("  ImageFileName: ").Append(ImageFileName).Append("\n");
-            sb.Append("  MinSelectCount: ").Append(MinSelectCount).Append("\n");
-            sb.Append("  MaxSelectCount: ").Append(MaxSelectCount).Append("\n");
-            sb.Append("  Items: ").Append(Items).Append("\n");
-            sb.Append("  Metafields: ").Append(Metafields).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as UpdateCatalogGroup);
-        }
-
-        /// <summary>
-        /// Returns true if UpdateCatalogGroup instances are equal
-        /// </summary>
-        /// <param name="input">Instance of UpdateCatalogGroup to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(UpdateCatalogGroup input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.AutogenerateDisplayText == input.AutogenerateDisplayText ||
-                    (this.AutogenerateDisplayText != null &&
-                    this.AutogenerateDisplayText.Equals(input.AutogenerateDisplayText))
-                ) && 
-                (
-                    this.ImageFileName == input.ImageFileName ||
-                    (this.ImageFileName != null &&
-                    this.ImageFileName.Equals(input.ImageFileName))
-                ) && 
-                (
-                    this.MinSelectCount == input.MinSelectCount ||
-                    (this.MinSelectCount != null &&
-                    this.MinSelectCount.Equals(input.MinSelectCount))
-                ) && 
-                (
-                    this.MaxSelectCount == input.MaxSelectCount ||
-                    (this.MaxSelectCount != null &&
-                    this.MaxSelectCount.Equals(input.MaxSelectCount))
-                ) && 
-                (
-                    this.Items == input.Items ||
-                    this.Items != null &&
-                    this.Items.SequenceEqual(input.Items)
-                ) && 
-                (
-                    this.Metafields == input.Metafields ||
-                    this.Metafields != null &&
-                    this.Metafields.SequenceEqual(input.Metafields)
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.AutogenerateDisplayText != null)
-                    hashCode = hashCode * 59 + this.AutogenerateDisplayText.GetHashCode();
-                if (this.ImageFileName != null)
-                    hashCode = hashCode * 59 + this.ImageFileName.GetHashCode();
-                if (this.MinSelectCount != null)
-                    hashCode = hashCode * 59 + this.MinSelectCount.GetHashCode();
-                if (this.MaxSelectCount != null)
-                    hashCode = hashCode * 59 + this.MaxSelectCount.GetHashCode();
-                if (this.Items != null)
-                    hashCode = hashCode * 59 + this.Items.GetHashCode();
-                if (this.Metafields != null)
-                    hashCode = hashCode * 59 + this.Metafields.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/UpdateCatalogGroupReference.cs b/src/Flipdish/Model/UpdateCatalogGroupReference.cs
index 64b996d8..ea618456 100644
--- a/src/Flipdish/Model/UpdateCatalogGroupReference.cs
+++ b/src/Flipdish/Model/UpdateCatalogGroupReference.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Data to update a {Flipdish.PublicModels.V1.Catalog.Items.CatalogGroupReference}
+    /// Data to update a {Flipdish.Menus.PublicModels.V1.Catalog.Items.CatalogGroupReference}
     /// </summary>
     [DataContract]
-    public partial class UpdateCatalogGroupReference :  IEquatable<UpdateCatalogGroupReference>, IValidatableObject
+    public partial class UpdateCatalogGroupReference :  IEquatable<UpdateCatalogGroupReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -180,40 +178,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogGroupId (string) maxLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be less than 30.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogGroupId (string) minLength
-            if(this.CatalogGroupId != null && this.CatalogGroupId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogGroupId, length must be greater than 0.", new [] { "CatalogGroupId" });
-            }
-
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateCatalogItem.cs b/src/Flipdish/Model/UpdateCatalogItem.cs
index be3a3bdc..805af183 100644
--- a/src/Flipdish/Model/UpdateCatalogItem.cs
+++ b/src/Flipdish/Model/UpdateCatalogItem.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Update Catalog Item
     /// </summary>
     [DataContract]
-    public partial class UpdateCatalogItem :  IEquatable<UpdateCatalogItem>, IValidatableObject
+    public partial class UpdateCatalogItem :  IEquatable<UpdateCatalogItem>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateCatalogItem" /> class.
@@ -229,70 +227,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 3000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 3000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateCatalogItemReference.cs b/src/Flipdish/Model/UpdateCatalogItemReference.cs
deleted file mode 100644
index ca6efebf..00000000
--- a/src/Flipdish/Model/UpdateCatalogItemReference.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Data to update a {!:CatalogGroupReference}
-    /// </summary>
-    [DataContract]
-    public partial class UpdateCatalogItemReference :  IEquatable<UpdateCatalogItemReference>, IValidatableObject
-    {
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum ItemTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum Product for value: Product
-            /// </summary>
-            [EnumMember(Value = "Product")]
-            Product = 1,
-            
-            /// <summary>
-            /// Enum Modifier for value: Modifier
-            /// </summary>
-            [EnumMember(Value = "Modifier")]
-            Modifier = 2
-        }
-
-        /// <summary>
-        /// Type of the SupProduct
-        /// </summary>
-        /// <value>Type of the SupProduct</value>
-        [DataMember(Name="ItemType", EmitDefaultValue=false)]
-        public ItemTypeEnum ItemType { get; set; }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateCatalogItemReference" /> class.
-        /// </summary>
-        [JsonConstructorAttribute]
-        protected UpdateCatalogItemReference() { }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateCatalogItemReference" /> class.
-        /// </summary>
-        /// <param name="catalogItemId">Identifier of the CatalogItemId to use as SubProduct (required).</param>
-        /// <param name="itemType">Type of the SupProduct (required).</param>
-        /// <param name="preselectedQuantity">Quantity of the modifier that will be set when the parent product is placed in the basket.</param>
-        public UpdateCatalogItemReference(string catalogItemId = default(string), ItemTypeEnum itemType = default(ItemTypeEnum), int? preselectedQuantity = default(int?))
-        {
-            // to ensure "catalogItemId" is required (not null)
-            if (catalogItemId == null)
-            {
-                throw new InvalidDataException("catalogItemId is a required property for UpdateCatalogItemReference and cannot be null");
-            }
-            else
-            {
-                this.CatalogItemId = catalogItemId;
-            }
-            // to ensure "itemType" is required (not null)
-            if (itemType == null)
-            {
-                throw new InvalidDataException("itemType is a required property for UpdateCatalogItemReference and cannot be null");
-            }
-            else
-            {
-                this.ItemType = itemType;
-            }
-            this.PreselectedQuantity = preselectedQuantity;
-        }
-        
-        /// <summary>
-        /// Identifier of the CatalogItemId to use as SubProduct
-        /// </summary>
-        /// <value>Identifier of the CatalogItemId to use as SubProduct</value>
-        [DataMember(Name="CatalogItemId", EmitDefaultValue=false)]
-        public string CatalogItemId { get; set; }
-
-
-        /// <summary>
-        /// Quantity of the modifier that will be set when the parent product is placed in the basket
-        /// </summary>
-        /// <value>Quantity of the modifier that will be set when the parent product is placed in the basket</value>
-        [DataMember(Name="PreselectedQuantity", EmitDefaultValue=false)]
-        public int? PreselectedQuantity { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class UpdateCatalogItemReference {\n");
-            sb.Append("  CatalogItemId: ").Append(CatalogItemId).Append("\n");
-            sb.Append("  ItemType: ").Append(ItemType).Append("\n");
-            sb.Append("  PreselectedQuantity: ").Append(PreselectedQuantity).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as UpdateCatalogItemReference);
-        }
-
-        /// <summary>
-        /// Returns true if UpdateCatalogItemReference instances are equal
-        /// </summary>
-        /// <param name="input">Instance of UpdateCatalogItemReference to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(UpdateCatalogItemReference input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.CatalogItemId == input.CatalogItemId ||
-                    (this.CatalogItemId != null &&
-                    this.CatalogItemId.Equals(input.CatalogItemId))
-                ) && 
-                (
-                    this.ItemType == input.ItemType ||
-                    (this.ItemType != null &&
-                    this.ItemType.Equals(input.ItemType))
-                ) && 
-                (
-                    this.PreselectedQuantity == input.PreselectedQuantity ||
-                    (this.PreselectedQuantity != null &&
-                    this.PreselectedQuantity.Equals(input.PreselectedQuantity))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.CatalogItemId != null)
-                    hashCode = hashCode * 59 + this.CatalogItemId.GetHashCode();
-                if (this.ItemType != null)
-                    hashCode = hashCode * 59 + this.ItemType.GetHashCode();
-                if (this.PreselectedQuantity != null)
-                    hashCode = hashCode * 59 + this.PreselectedQuantity.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/UpdateDriverNotificationToken.cs b/src/Flipdish/Model/UpdateDriverNotificationToken.cs
index caa8dfae..b3b5bf19 100644
--- a/src/Flipdish/Model/UpdateDriverNotificationToken.cs
+++ b/src/Flipdish/Model/UpdateDriverNotificationToken.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// UpdateDriver Push Notification Token
     /// </summary>
     [DataContract]
-    public partial class UpdateDriverNotificationToken :  IEquatable<UpdateDriverNotificationToken>, IValidatableObject
+    public partial class UpdateDriverNotificationToken :  IEquatable<UpdateDriverNotificationToken>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateDriverNotificationToken" /> class.
@@ -123,16 +121,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateDriverProfileModel.cs b/src/Flipdish/Model/UpdateDriverProfileModel.cs
index d4b461fe..f9cec58f 100644
--- a/src/Flipdish/Model/UpdateDriverProfileModel.cs
+++ b/src/Flipdish/Model/UpdateDriverProfileModel.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Update Driver Profile
     /// </summary>
     [DataContract]
-    public partial class UpdateDriverProfileModel :  IEquatable<UpdateDriverProfileModel>, IValidatableObject
+    public partial class UpdateDriverProfileModel :  IEquatable<UpdateDriverProfileModel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateDriverProfileModel" /> class.
@@ -110,16 +108,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateFulfillmentStatesConfiguration.cs b/src/Flipdish/Model/UpdateFulfillmentStatesConfiguration.cs
index 40c9f80f..cec3901f 100644
--- a/src/Flipdish/Model/UpdateFulfillmentStatesConfiguration.cs
+++ b/src/Flipdish/Model/UpdateFulfillmentStatesConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Update fulfillment states configuration
     /// </summary>
     [DataContract]
-    public partial class UpdateFulfillmentStatesConfiguration :  IEquatable<UpdateFulfillmentStatesConfiguration>, IValidatableObject
+    public partial class UpdateFulfillmentStatesConfiguration :  IEquatable<UpdateFulfillmentStatesConfiguration>
     {
         /// <summary>
         /// Store Selector Type
@@ -66,18 +64,29 @@ public enum StoreSelectorTypeEnum
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateFulfillmentStatesConfiguration" /> class.
         /// </summary>
+        /// <param name="overwriteSystemTemplate">Set to true if a system configuration template is to be updated (permissions also needed).</param>
         /// <param name="storeIds">Stores id&#39;s.</param>
         /// <param name="storeSelectorType">Store Selector Type.</param>
         /// <param name="states">Settings.</param>
+        /// <param name="automaticTransitionsEnabled">Enable automatic transitions.</param>
         /// <param name="name">Name.</param>
-        public UpdateFulfillmentStatesConfiguration(List<int?> storeIds = default(List<int?>), StoreSelectorTypeEnum? storeSelectorType = default(StoreSelectorTypeEnum?), List<FulfillmentStatusConfigurationItem> states = default(List<FulfillmentStatusConfigurationItem>), string name = default(string))
+        public UpdateFulfillmentStatesConfiguration(bool? overwriteSystemTemplate = default(bool?), List<int?> storeIds = default(List<int?>), StoreSelectorTypeEnum? storeSelectorType = default(StoreSelectorTypeEnum?), List<FulfillmentStatusConfigurationItem> states = default(List<FulfillmentStatusConfigurationItem>), bool? automaticTransitionsEnabled = default(bool?), string name = default(string))
         {
+            this.OverwriteSystemTemplate = overwriteSystemTemplate;
             this.StoreIds = storeIds;
             this.StoreSelectorType = storeSelectorType;
             this.States = states;
+            this.AutomaticTransitionsEnabled = automaticTransitionsEnabled;
             this.Name = name;
         }
         
+        /// <summary>
+        /// Set to true if a system configuration template is to be updated (permissions also needed)
+        /// </summary>
+        /// <value>Set to true if a system configuration template is to be updated (permissions also needed)</value>
+        [DataMember(Name="OverwriteSystemTemplate", EmitDefaultValue=false)]
+        public bool? OverwriteSystemTemplate { get; set; }
+
         /// <summary>
         /// Stores id&#39;s
         /// </summary>
@@ -93,6 +102,13 @@ public enum StoreSelectorTypeEnum
         [DataMember(Name="States", EmitDefaultValue=false)]
         public List<FulfillmentStatusConfigurationItem> States { get; set; }
 
+        /// <summary>
+        /// Enable automatic transitions
+        /// </summary>
+        /// <value>Enable automatic transitions</value>
+        [DataMember(Name="AutomaticTransitionsEnabled", EmitDefaultValue=false)]
+        public bool? AutomaticTransitionsEnabled { get; set; }
+
         /// <summary>
         /// Name
         /// </summary>
@@ -108,9 +124,11 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class UpdateFulfillmentStatesConfiguration {\n");
+            sb.Append("  OverwriteSystemTemplate: ").Append(OverwriteSystemTemplate).Append("\n");
             sb.Append("  StoreIds: ").Append(StoreIds).Append("\n");
             sb.Append("  StoreSelectorType: ").Append(StoreSelectorType).Append("\n");
             sb.Append("  States: ").Append(States).Append("\n");
+            sb.Append("  AutomaticTransitionsEnabled: ").Append(AutomaticTransitionsEnabled).Append("\n");
             sb.Append("  Name: ").Append(Name).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -146,6 +164,11 @@ public bool Equals(UpdateFulfillmentStatesConfiguration input)
                 return false;
 
             return 
+                (
+                    this.OverwriteSystemTemplate == input.OverwriteSystemTemplate ||
+                    (this.OverwriteSystemTemplate != null &&
+                    this.OverwriteSystemTemplate.Equals(input.OverwriteSystemTemplate))
+                ) && 
                 (
                     this.StoreIds == input.StoreIds ||
                     this.StoreIds != null &&
@@ -161,6 +184,11 @@ public bool Equals(UpdateFulfillmentStatesConfiguration input)
                     this.States != null &&
                     this.States.SequenceEqual(input.States)
                 ) && 
+                (
+                    this.AutomaticTransitionsEnabled == input.AutomaticTransitionsEnabled ||
+                    (this.AutomaticTransitionsEnabled != null &&
+                    this.AutomaticTransitionsEnabled.Equals(input.AutomaticTransitionsEnabled))
+                ) && 
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
@@ -177,27 +205,21 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.OverwriteSystemTemplate != null)
+                    hashCode = hashCode * 59 + this.OverwriteSystemTemplate.GetHashCode();
                 if (this.StoreIds != null)
                     hashCode = hashCode * 59 + this.StoreIds.GetHashCode();
                 if (this.StoreSelectorType != null)
                     hashCode = hashCode * 59 + this.StoreSelectorType.GetHashCode();
                 if (this.States != null)
                     hashCode = hashCode * 59 + this.States.GetHashCode();
+                if (this.AutomaticTransitionsEnabled != null)
+                    hashCode = hashCode * 59 + this.AutomaticTransitionsEnabled.GetHashCode();
                 if (this.Name != null)
                     hashCode = hashCode * 59 + this.Name.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateGroup.cs b/src/Flipdish/Model/UpdateGroup.cs
index a7e5123a..777fa585 100644
--- a/src/Flipdish/Model/UpdateGroup.cs
+++ b/src/Flipdish/Model/UpdateGroup.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Update Catalog Group
     /// </summary>
     [DataContract]
-    public partial class UpdateGroup :  IEquatable<UpdateGroup>, IValidatableObject
+    public partial class UpdateGroup :  IEquatable<UpdateGroup>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateGroup" /> class.
@@ -229,52 +227,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateGroupReference.cs b/src/Flipdish/Model/UpdateGroupReference.cs
index 3b945ca3..07bcca8b 100644
--- a/src/Flipdish/Model/UpdateGroupReference.cs
+++ b/src/Flipdish/Model/UpdateGroupReference.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Data to update a {Flipdish.PublicModels.V1.Catalog.Products.GroupReference}
+    /// Data to update a {Flipdish.Menus.PublicModels.V1.Catalog.Products.GroupReference}
     /// </summary>
     [DataContract]
-    public partial class UpdateGroupReference :  IEquatable<UpdateGroupReference>, IValidatableObject
+    public partial class UpdateGroupReference :  IEquatable<UpdateGroupReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -163,28 +161,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateLocationArea.cs b/src/Flipdish/Model/UpdateLocationArea.cs
index 89e04388..63f8d146 100644
--- a/src/Flipdish/Model/UpdateLocationArea.cs
+++ b/src/Flipdish/Model/UpdateLocationArea.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Input model for updating a LocationArea
     /// </summary>
     [DataContract]
-    public partial class UpdateLocationArea :  IEquatable<UpdateLocationArea>, IValidatableObject
+    public partial class UpdateLocationArea :  IEquatable<UpdateLocationArea>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateLocationArea" /> class.
@@ -165,16 +163,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateMetafieldDefinition.cs b/src/Flipdish/Model/UpdateMetafieldDefinition.cs
index 501cd1d0..ce90b248 100644
--- a/src/Flipdish/Model/UpdateMetafieldDefinition.cs
+++ b/src/Flipdish/Model/UpdateMetafieldDefinition.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Information to update a {Flipdish.PublicModels.V1.Metafields.MetafieldDefinition}
+    /// Information to update a {Flipdish.Metafields.PublicModels.V1.MetafieldDefinition}
     /// </summary>
     [DataContract]
-    public partial class UpdateMetafieldDefinition :  IEquatable<UpdateMetafieldDefinition>, IValidatableObject
+    public partial class UpdateMetafieldDefinition :  IEquatable<UpdateMetafieldDefinition>
     {
         /// <summary>
         /// Defines Behaviors
@@ -165,16 +163,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateMobileAppsSubmissionStatus.cs b/src/Flipdish/Model/UpdateMobileAppsSubmissionStatus.cs
index ff733ca5..f45ea922 100644
--- a/src/Flipdish/Model/UpdateMobileAppsSubmissionStatus.cs
+++ b/src/Flipdish/Model/UpdateMobileAppsSubmissionStatus.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Update Mobile Apps Status
     /// </summary>
     [DataContract]
-    public partial class UpdateMobileAppsSubmissionStatus :  IEquatable<UpdateMobileAppsSubmissionStatus>, IValidatableObject
+    public partial class UpdateMobileAppsSubmissionStatus :  IEquatable<UpdateMobileAppsSubmissionStatus>
     {
         /// <summary>
         /// Mobile Type
@@ -38,17 +36,23 @@ public partial class UpdateMobileAppsSubmissionStatus :  IEquatable<UpdateMobile
         public enum TypeEnum
         {
             
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
             /// <summary>
             /// Enum Android for value: Android
             /// </summary>
             [EnumMember(Value = "Android")]
-            Android = 1,
+            Android = 2,
             
             /// <summary>
             /// Enum IOS for value: IOS
             /// </summary>
             [EnumMember(Value = "IOS")]
-            IOS = 2
+            IOS = 3
         }
 
         /// <summary>
@@ -288,16 +292,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateModifier.cs b/src/Flipdish/Model/UpdateModifier.cs
deleted file mode 100644
index 84e42d33..00000000
--- a/src/Flipdish/Model/UpdateModifier.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Update Modifier
-    /// </summary>
-    [DataContract]
-    public partial class UpdateModifier :  IEquatable<UpdateModifier>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateModifier" /> class.
-        /// </summary>
-        /// <param name="sku">Stock Keeping Unit (SKU).</param>
-        /// <param name="name">Product name.</param>
-        /// <param name="description">Product description.</param>
-        /// <param name="price">Product price.</param>
-        /// <param name="alcohol">Product contains alcohol.</param>
-        public UpdateModifier(string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), bool? alcohol = default(bool?))
-        {
-            this.Sku = sku;
-            this.Name = name;
-            this.Description = description;
-            this.Price = price;
-            this.Alcohol = alcohol;
-        }
-        
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Product name
-        /// </summary>
-        /// <value>Product name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Product description
-        /// </summary>
-        /// <value>Product description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Product price
-        /// </summary>
-        /// <value>Product price</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public double? Price { get; set; }
-
-        /// <summary>
-        /// Product contains alcohol
-        /// </summary>
-        /// <value>Product contains alcohol</value>
-        [DataMember(Name="Alcohol", EmitDefaultValue=false)]
-        public bool? Alcohol { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class UpdateModifier {\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  Alcohol: ").Append(Alcohol).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as UpdateModifier);
-        }
-
-        /// <summary>
-        /// Returns true if UpdateModifier instances are equal
-        /// </summary>
-        /// <param name="input">Instance of UpdateModifier to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(UpdateModifier input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.Alcohol == input.Alcohol ||
-                    (this.Alcohol != null &&
-                    this.Alcohol.Equals(input.Alcohol))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.Alcohol != null)
-                    hashCode = hashCode * 59 + this.Alcohol.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 200)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 200.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 1000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 1000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/UpdateModifierGroup.cs b/src/Flipdish/Model/UpdateModifierGroup.cs
deleted file mode 100644
index 149714e7..00000000
--- a/src/Flipdish/Model/UpdateModifierGroup.cs
+++ /dev/null
@@ -1,286 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Update Modifier Group
-    /// </summary>
-    [DataContract]
-    public partial class UpdateModifierGroup :  IEquatable<UpdateModifierGroup>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateModifierGroup" /> class.
-        /// </summary>
-        /// <param name="minSelection">Minimum number of items that the user has to select.</param>
-        /// <param name="maxSelection">Maximum number of items that the user has to select.</param>
-        /// <param name="subProducts">Collection of products associated with this product.</param>
-        /// <param name="sku">Stock Keeping Unit (SKU).</param>
-        /// <param name="name">Product name.</param>
-        /// <param name="description">Product description.</param>
-        /// <param name="price">Product price.</param>
-        /// <param name="alcohol">Product contains alcohol.</param>
-        public UpdateModifierGroup(int? minSelection = default(int?), int? maxSelection = default(int?), List<ModifierGroupSubProduct> subProducts = default(List<ModifierGroupSubProduct>), string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), bool? alcohol = default(bool?))
-        {
-            this.MinSelection = minSelection;
-            this.MaxSelection = maxSelection;
-            this.SubProducts = subProducts;
-            this.Sku = sku;
-            this.Name = name;
-            this.Description = description;
-            this.Price = price;
-            this.Alcohol = alcohol;
-        }
-        
-        /// <summary>
-        /// Minimum number of items that the user has to select
-        /// </summary>
-        /// <value>Minimum number of items that the user has to select</value>
-        [DataMember(Name="MinSelection", EmitDefaultValue=false)]
-        public int? MinSelection { get; set; }
-
-        /// <summary>
-        /// Maximum number of items that the user has to select
-        /// </summary>
-        /// <value>Maximum number of items that the user has to select</value>
-        [DataMember(Name="MaxSelection", EmitDefaultValue=false)]
-        public int? MaxSelection { get; set; }
-
-        /// <summary>
-        /// Collection of products associated with this product
-        /// </summary>
-        /// <value>Collection of products associated with this product</value>
-        [DataMember(Name="SubProducts", EmitDefaultValue=false)]
-        public List<ModifierGroupSubProduct> SubProducts { get; set; }
-
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Product name
-        /// </summary>
-        /// <value>Product name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Product description
-        /// </summary>
-        /// <value>Product description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Product price
-        /// </summary>
-        /// <value>Product price</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public double? Price { get; set; }
-
-        /// <summary>
-        /// Product contains alcohol
-        /// </summary>
-        /// <value>Product contains alcohol</value>
-        [DataMember(Name="Alcohol", EmitDefaultValue=false)]
-        public bool? Alcohol { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class UpdateModifierGroup {\n");
-            sb.Append("  MinSelection: ").Append(MinSelection).Append("\n");
-            sb.Append("  MaxSelection: ").Append(MaxSelection).Append("\n");
-            sb.Append("  SubProducts: ").Append(SubProducts).Append("\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  Alcohol: ").Append(Alcohol).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as UpdateModifierGroup);
-        }
-
-        /// <summary>
-        /// Returns true if UpdateModifierGroup instances are equal
-        /// </summary>
-        /// <param name="input">Instance of UpdateModifierGroup to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(UpdateModifierGroup input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.MinSelection == input.MinSelection ||
-                    (this.MinSelection != null &&
-                    this.MinSelection.Equals(input.MinSelection))
-                ) && 
-                (
-                    this.MaxSelection == input.MaxSelection ||
-                    (this.MaxSelection != null &&
-                    this.MaxSelection.Equals(input.MaxSelection))
-                ) && 
-                (
-                    this.SubProducts == input.SubProducts ||
-                    this.SubProducts != null &&
-                    this.SubProducts.SequenceEqual(input.SubProducts)
-                ) && 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.Alcohol == input.Alcohol ||
-                    (this.Alcohol != null &&
-                    this.Alcohol.Equals(input.Alcohol))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.MinSelection != null)
-                    hashCode = hashCode * 59 + this.MinSelection.GetHashCode();
-                if (this.MaxSelection != null)
-                    hashCode = hashCode * 59 + this.MaxSelection.GetHashCode();
-                if (this.SubProducts != null)
-                    hashCode = hashCode * 59 + this.SubProducts.GetHashCode();
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.Alcohol != null)
-                    hashCode = hashCode * 59 + this.Alcohol.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 200)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 200.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 1000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 1000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/UpdatePayGreenConfigurationRequest.cs b/src/Flipdish/Model/UpdatePayGreenConfigurationRequest.cs
new file mode 100644
index 00000000..4d4dfff7
--- /dev/null
+++ b/src/Flipdish/Model/UpdatePayGreenConfigurationRequest.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// UpdatePayGreenConfigurationRequest.
+    /// </summary>
+    [DataContract]
+    public partial class UpdatePayGreenConfigurationRequest :  IEquatable<UpdatePayGreenConfigurationRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdatePayGreenConfigurationRequest" /> class.
+        /// </summary>
+        /// <param name="name">Name..</param>
+        /// <param name="assignedStores">AssignedStores..</param>
+        public UpdatePayGreenConfigurationRequest(string name = default(string), List<int?> assignedStores = default(List<int?>))
+        {
+            this.Name = name;
+            this.AssignedStores = assignedStores;
+        }
+        
+        /// <summary>
+        /// Name.
+        /// </summary>
+        /// <value>Name.</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// AssignedStores.
+        /// </summary>
+        /// <value>AssignedStores.</value>
+        [DataMember(Name="AssignedStores", EmitDefaultValue=false)]
+        public List<int?> AssignedStores { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UpdatePayGreenConfigurationRequest {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  AssignedStores: ").Append(AssignedStores).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UpdatePayGreenConfigurationRequest);
+        }
+
+        /// <summary>
+        /// Returns true if UpdatePayGreenConfigurationRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UpdatePayGreenConfigurationRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UpdatePayGreenConfigurationRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.AssignedStores == input.AssignedStores ||
+                    this.AssignedStores != null &&
+                    this.AssignedStores.SequenceEqual(input.AssignedStores)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.AssignedStores != null)
+                    hashCode = hashCode * 59 + this.AssignedStores.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UpdateProduct.cs b/src/Flipdish/Model/UpdateProduct.cs
index 63edcaea..b492426a 100644
--- a/src/Flipdish/Model/UpdateProduct.cs
+++ b/src/Flipdish/Model/UpdateProduct.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Update Product
     /// </summary>
     [DataContract]
-    public partial class UpdateProduct :  IEquatable<UpdateProduct>, IValidatableObject
+    public partial class UpdateProduct :  IEquatable<UpdateProduct>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateProduct" /> class.
@@ -229,70 +227,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 300)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 300.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 3000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 3000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            // ImageFileName (string) maxLength
-            if(this.ImageFileName != null && this.ImageFileName.Length > 512)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be less than 512.", new [] { "ImageFileName" });
-            }
-
-            // ImageFileName (string) minLength
-            if(this.ImageFileName != null && this.ImageFileName.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for ImageFileName, length must be greater than 0.", new [] { "ImageFileName" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateProductReference.cs b/src/Flipdish/Model/UpdateProductReference.cs
index 0c7b5fa6..a510fb9b 100644
--- a/src/Flipdish/Model/UpdateProductReference.cs
+++ b/src/Flipdish/Model/UpdateProductReference.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Data to update a {Flipdish.PublicModels.V1.Catalog.Groups.UpdateProductReference}
+    /// Data to update a {Flipdish.Menus.PublicModels.V1.Catalog.Groups.UpdateProductReference}
     /// </summary>
     [DataContract]
-    public partial class UpdateProductReference :  IEquatable<UpdateProductReference>, IValidatableObject
+    public partial class UpdateProductReference :  IEquatable<UpdateProductReference>
     {
         /// <summary>
         /// Type of the SupProduct
@@ -186,28 +184,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // CatalogItemId (string) maxLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be less than 30.", new [] { "CatalogItemId" });
-            }
-
-            // CatalogItemId (string) minLength
-            if(this.CatalogItemId != null && this.CatalogItemId.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for CatalogItemId, length must be greater than 0.", new [] { "CatalogItemId" });
-            }
-
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateSimpleProduct.cs b/src/Flipdish/Model/UpdateSimpleProduct.cs
deleted file mode 100644
index 5606cce6..00000000
--- a/src/Flipdish/Model/UpdateSimpleProduct.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Update Simple Product
-    /// </summary>
-    [DataContract]
-    public partial class UpdateSimpleProduct :  IEquatable<UpdateSimpleProduct>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UpdateSimpleProduct" /> class.
-        /// </summary>
-        /// <param name="subProducts">Collection of products associated with this product.</param>
-        /// <param name="sku">Stock Keeping Unit (SKU).</param>
-        /// <param name="name">Product name.</param>
-        /// <param name="description">Product description.</param>
-        /// <param name="price">Product price.</param>
-        /// <param name="alcohol">Product contains alcohol.</param>
-        public UpdateSimpleProduct(List<SimpleProductSubProduct> subProducts = default(List<SimpleProductSubProduct>), string sku = default(string), string name = default(string), string description = default(string), double? price = default(double?), bool? alcohol = default(bool?))
-        {
-            this.SubProducts = subProducts;
-            this.Sku = sku;
-            this.Name = name;
-            this.Description = description;
-            this.Price = price;
-            this.Alcohol = alcohol;
-        }
-        
-        /// <summary>
-        /// Collection of products associated with this product
-        /// </summary>
-        /// <value>Collection of products associated with this product</value>
-        [DataMember(Name="SubProducts", EmitDefaultValue=false)]
-        public List<SimpleProductSubProduct> SubProducts { get; set; }
-
-        /// <summary>
-        /// Stock Keeping Unit (SKU)
-        /// </summary>
-        /// <value>Stock Keeping Unit (SKU)</value>
-        [DataMember(Name="Sku", EmitDefaultValue=false)]
-        public string Sku { get; set; }
-
-        /// <summary>
-        /// Product name
-        /// </summary>
-        /// <value>Product name</value>
-        [DataMember(Name="Name", EmitDefaultValue=false)]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Product description
-        /// </summary>
-        /// <value>Product description</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Product price
-        /// </summary>
-        /// <value>Product price</value>
-        [DataMember(Name="Price", EmitDefaultValue=false)]
-        public double? Price { get; set; }
-
-        /// <summary>
-        /// Product contains alcohol
-        /// </summary>
-        /// <value>Product contains alcohol</value>
-        [DataMember(Name="Alcohol", EmitDefaultValue=false)]
-        public bool? Alcohol { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class UpdateSimpleProduct {\n");
-            sb.Append("  SubProducts: ").Append(SubProducts).Append("\n");
-            sb.Append("  Sku: ").Append(Sku).Append("\n");
-            sb.Append("  Name: ").Append(Name).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  Price: ").Append(Price).Append("\n");
-            sb.Append("  Alcohol: ").Append(Alcohol).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as UpdateSimpleProduct);
-        }
-
-        /// <summary>
-        /// Returns true if UpdateSimpleProduct instances are equal
-        /// </summary>
-        /// <param name="input">Instance of UpdateSimpleProduct to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(UpdateSimpleProduct input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.SubProducts == input.SubProducts ||
-                    this.SubProducts != null &&
-                    this.SubProducts.SequenceEqual(input.SubProducts)
-                ) && 
-                (
-                    this.Sku == input.Sku ||
-                    (this.Sku != null &&
-                    this.Sku.Equals(input.Sku))
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.Price == input.Price ||
-                    (this.Price != null &&
-                    this.Price.Equals(input.Price))
-                ) && 
-                (
-                    this.Alcohol == input.Alcohol ||
-                    (this.Alcohol != null &&
-                    this.Alcohol.Equals(input.Alcohol))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.SubProducts != null)
-                    hashCode = hashCode * 59 + this.SubProducts.GetHashCode();
-                if (this.Sku != null)
-                    hashCode = hashCode * 59 + this.Sku.GetHashCode();
-                if (this.Name != null)
-                    hashCode = hashCode * 59 + this.Name.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.Price != null)
-                    hashCode = hashCode * 59 + this.Price.GetHashCode();
-                if (this.Alcohol != null)
-                    hashCode = hashCode * 59 + this.Alcohol.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            // Sku (string) maxLength
-            if(this.Sku != null && this.Sku.Length > 30)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be less than 30.", new [] { "Sku" });
-            }
-
-            // Sku (string) minLength
-            if(this.Sku != null && this.Sku.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Sku, length must be greater than 0.", new [] { "Sku" });
-            }
-
-            // Name (string) maxLength
-            if(this.Name != null && this.Name.Length > 200)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be less than 200.", new [] { "Name" });
-            }
-
-            // Name (string) minLength
-            if(this.Name != null && this.Name.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Name, length must be greater than 0.", new [] { "Name" });
-            }
-
-            // Description (string) maxLength
-            if(this.Description != null && this.Description.Length > 1000)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be less than 1000.", new [] { "Description" });
-            }
-
-            // Description (string) minLength
-            if(this.Description != null && this.Description.Length < 0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Description, length must be greater than 0.", new [] { "Description" });
-            }
-
-            // Price (double?) minimum
-            if(this.Price < (double?)0)
-            {
-                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for Price, must be a value greater than or equal to 0.", new [] { "Price" });
-            }
-
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/UpdateStorePayGreenConfigurationRequest.cs b/src/Flipdish/Model/UpdateStorePayGreenConfigurationRequest.cs
new file mode 100644
index 00000000..bf5f3844
--- /dev/null
+++ b/src/Flipdish/Model/UpdateStorePayGreenConfigurationRequest.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// UpdateStorePayGreenConfigurationRequest.
+    /// </summary>
+    [DataContract]
+    public partial class UpdateStorePayGreenConfigurationRequest :  IEquatable<UpdateStorePayGreenConfigurationRequest>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateStorePayGreenConfigurationRequest" /> class.
+        /// </summary>
+        /// <param name="active">Active..</param>
+        /// <param name="payGreenConfigurationId">PayGreenConfigurationId..</param>
+        public UpdateStorePayGreenConfigurationRequest(bool? active = default(bool?), int? payGreenConfigurationId = default(int?))
+        {
+            this.Active = active;
+            this.PayGreenConfigurationId = payGreenConfigurationId;
+        }
+        
+        /// <summary>
+        /// Active.
+        /// </summary>
+        /// <value>Active.</value>
+        [DataMember(Name="Active", EmitDefaultValue=false)]
+        public bool? Active { get; set; }
+
+        /// <summary>
+        /// PayGreenConfigurationId.
+        /// </summary>
+        /// <value>PayGreenConfigurationId.</value>
+        [DataMember(Name="PayGreenConfigurationId", EmitDefaultValue=false)]
+        public int? PayGreenConfigurationId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UpdateStorePayGreenConfigurationRequest {\n");
+            sb.Append("  Active: ").Append(Active).Append("\n");
+            sb.Append("  PayGreenConfigurationId: ").Append(PayGreenConfigurationId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UpdateStorePayGreenConfigurationRequest);
+        }
+
+        /// <summary>
+        /// Returns true if UpdateStorePayGreenConfigurationRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UpdateStorePayGreenConfigurationRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UpdateStorePayGreenConfigurationRequest input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Active == input.Active ||
+                    (this.Active != null &&
+                    this.Active.Equals(input.Active))
+                ) && 
+                (
+                    this.PayGreenConfigurationId == input.PayGreenConfigurationId ||
+                    (this.PayGreenConfigurationId != null &&
+                    this.PayGreenConfigurationId.Equals(input.PayGreenConfigurationId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Active != null)
+                    hashCode = hashCode * 59 + this.Active.GetHashCode();
+                if (this.PayGreenConfigurationId != null)
+                    hashCode = hashCode * 59 + this.PayGreenConfigurationId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UpdateTipConfiguration.cs b/src/Flipdish/Model/UpdateTipConfiguration.cs
index f4ec6347..f5b8dc68 100644
--- a/src/Flipdish/Model/UpdateTipConfiguration.cs
+++ b/src/Flipdish/Model/UpdateTipConfiguration.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Describes the configuration of tipping
     /// </summary>
     [DataContract]
-    public partial class UpdateTipConfiguration :  IEquatable<UpdateTipConfiguration>, IValidatableObject
+    public partial class UpdateTipConfiguration :  IEquatable<UpdateTipConfiguration>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateTipConfiguration" /> class.
@@ -195,16 +193,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UpdateVoucher.cs b/src/Flipdish/Model/UpdateVoucher.cs
new file mode 100644
index 00000000..1fb5373f
--- /dev/null
+++ b/src/Flipdish/Model/UpdateVoucher.cs
@@ -0,0 +1,668 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Update Voucher
+    /// </summary>
+    [DataContract]
+    public partial class UpdateVoucher :  IEquatable<UpdateVoucher>
+    {
+        /// <summary>
+        /// Defines ChannelRestrictions
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ChannelRestrictionsEnum
+        {
+            
+            /// <summary>
+            /// Enum Ios for value: Ios
+            /// </summary>
+            [EnumMember(Value = "Ios")]
+            Ios = 1,
+            
+            /// <summary>
+            /// Enum Android for value: Android
+            /// </summary>
+            [EnumMember(Value = "Android")]
+            Android = 2,
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 3,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 4,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 5,
+            
+            /// <summary>
+            /// Enum Google for value: Google
+            /// </summary>
+            [EnumMember(Value = "Google")]
+            Google = 6
+        }
+
+
+        /// <summary>
+        /// Limit the channels this voucher can be used on
+        /// </summary>
+        /// <value>Limit the channels this voucher can be used on</value>
+        [DataMember(Name="ChannelRestrictions", EmitDefaultValue=false)]
+        public List<ChannelRestrictionsEnum> ChannelRestrictions { get; set; }
+        /// <summary>
+        /// Voucher Subtype
+        /// </summary>
+        /// <value>Voucher Subtype</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum VoucherSubTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
+            /// <summary>
+            /// Enum SignUp for value: SignUp
+            /// </summary>
+            [EnumMember(Value = "SignUp")]
+            SignUp = 2,
+            
+            /// <summary>
+            /// Enum Loyalty for value: Loyalty
+            /// </summary>
+            [EnumMember(Value = "Loyalty")]
+            Loyalty = 3,
+            
+            /// <summary>
+            /// Enum Loyalty25 for value: Loyalty25
+            /// </summary>
+            [EnumMember(Value = "Loyalty25")]
+            Loyalty25 = 4,
+            
+            /// <summary>
+            /// Enum Retention for value: Retention
+            /// </summary>
+            [EnumMember(Value = "Retention")]
+            Retention = 5,
+            
+            /// <summary>
+            /// Enum SecondaryRetention for value: SecondaryRetention
+            /// </summary>
+            [EnumMember(Value = "SecondaryRetention")]
+            SecondaryRetention = 6,
+            
+            /// <summary>
+            /// Enum Custom for value: Custom
+            /// </summary>
+            [EnumMember(Value = "Custom")]
+            Custom = 7
+        }
+
+        /// <summary>
+        /// Voucher Subtype
+        /// </summary>
+        /// <value>Voucher Subtype</value>
+        [DataMember(Name="VoucherSubType", EmitDefaultValue=false)]
+        public VoucherSubTypeEnum? VoucherSubType { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateVoucher" /> class.
+        /// </summary>
+        /// <param name="promotionId">Promotion ID to update.</param>
+        /// <param name="promotionName">The updated name of the promotion.</param>
+        /// <param name="promotionAwardMenuItemPublicIds">The updated menu items that the promotion awards.</param>
+        /// <param name="code">Voucher Code.</param>
+        /// <param name="description">Voucher Description (Visible on printout).</param>
+        /// <param name="stores">Stores that this voucher applies to.</param>
+        /// <param name="validOnOrdersOver">Valid on orders on or above.</param>
+        /// <param name="takesPriority">Takes priority.</param>
+        /// <param name="isEnabled">Is voucher enabled.</param>
+        /// <param name="isAutomaticallyApplied">Is voucher automatically applied.</param>
+        /// <param name="includeDeliveryFee">Include delivery fees.</param>
+        /// <param name="isValidForDeliveryOrders">Valid for delivery orders.</param>
+        /// <param name="isValidForPickupOrders">Valid for pickup orders.</param>
+        /// <param name="isValidForOrdersPayedOnline">Valid for orders payed online.</param>
+        /// <param name="isValidForOrdersPayedByCash">Valid for orders payed in cash.</param>
+        /// <param name="isValidForFirstOrderOnly">Valid only on the first order by the customer.</param>
+        /// <param name="isValidOncePerCustomer">Valid once per customer.</param>
+        /// <param name="isValidOnlyOnce">Valid only once, by any customer (once used cannot be used again by any other customer).</param>
+        /// <param name="isDiscoverable">Enables the voucher to be offered in the Voucher Discoverability feature.</param>
+        /// <param name="isPromoted">Marks the voucher as promoted.</param>
+        /// <param name="forceDiscount">Force the discount to be applied which bypasses some menu restrictions.</param>
+        /// <param name="startDate">Voucher Starts On (Time in UTC).</param>
+        /// <param name="expiryDate">Voucher Expires On (Time in UTC).</param>
+        /// <param name="channelRestrictions">Limit the channels this voucher can be used on.</param>
+        /// <param name="validityPeriods">Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated..</param>
+        /// <param name="voucherSubType">Voucher Subtype.</param>
+        /// <param name="customerId">Customer UserID.</param>
+        /// <param name="maxRedemptions">Maximum number of times the voucher can be redeemed (used).</param>
+        public UpdateVoucher(int? promotionId = default(int?), string promotionName = default(string), List<Guid?> promotionAwardMenuItemPublicIds = default(List<Guid?>), string code = default(string), string description = default(string), List<int?> stores = default(List<int?>), double? validOnOrdersOver = default(double?), bool? takesPriority = default(bool?), bool? isEnabled = default(bool?), bool? isAutomaticallyApplied = default(bool?), bool? includeDeliveryFee = default(bool?), bool? isValidForDeliveryOrders = default(bool?), bool? isValidForPickupOrders = default(bool?), bool? isValidForOrdersPayedOnline = default(bool?), bool? isValidForOrdersPayedByCash = default(bool?), bool? isValidForFirstOrderOnly = default(bool?), bool? isValidOncePerCustomer = default(bool?), bool? isValidOnlyOnce = default(bool?), bool? isDiscoverable = default(bool?), bool? isPromoted = default(bool?), bool? forceDiscount = default(bool?), DateTime? startDate = default(DateTime?), DateTime? expiryDate = default(DateTime?), List<ChannelRestrictionsEnum> channelRestrictions = default(List<ChannelRestrictionsEnum>), List<ValidityPeriod> validityPeriods = default(List<ValidityPeriod>), VoucherSubTypeEnum? voucherSubType = default(VoucherSubTypeEnum?), int? customerId = default(int?), int? maxRedemptions = default(int?))
+        {
+            this.PromotionId = promotionId;
+            this.PromotionName = promotionName;
+            this.PromotionAwardMenuItemPublicIds = promotionAwardMenuItemPublicIds;
+            this.Code = code;
+            this.Description = description;
+            this.Stores = stores;
+            this.ValidOnOrdersOver = validOnOrdersOver;
+            this.TakesPriority = takesPriority;
+            this.IsEnabled = isEnabled;
+            this.IsAutomaticallyApplied = isAutomaticallyApplied;
+            this.IncludeDeliveryFee = includeDeliveryFee;
+            this.IsValidForDeliveryOrders = isValidForDeliveryOrders;
+            this.IsValidForPickupOrders = isValidForPickupOrders;
+            this.IsValidForOrdersPayedOnline = isValidForOrdersPayedOnline;
+            this.IsValidForOrdersPayedByCash = isValidForOrdersPayedByCash;
+            this.IsValidForFirstOrderOnly = isValidForFirstOrderOnly;
+            this.IsValidOncePerCustomer = isValidOncePerCustomer;
+            this.IsValidOnlyOnce = isValidOnlyOnce;
+            this.IsDiscoverable = isDiscoverable;
+            this.IsPromoted = isPromoted;
+            this.ForceDiscount = forceDiscount;
+            this.StartDate = startDate;
+            this.ExpiryDate = expiryDate;
+            this.ChannelRestrictions = channelRestrictions;
+            this.ValidityPeriods = validityPeriods;
+            this.VoucherSubType = voucherSubType;
+            this.CustomerId = customerId;
+            this.MaxRedemptions = maxRedemptions;
+        }
+        
+        /// <summary>
+        /// Promotion ID to update
+        /// </summary>
+        /// <value>Promotion ID to update</value>
+        [DataMember(Name="PromotionId", EmitDefaultValue=false)]
+        public int? PromotionId { get; set; }
+
+        /// <summary>
+        /// The updated name of the promotion
+        /// </summary>
+        /// <value>The updated name of the promotion</value>
+        [DataMember(Name="PromotionName", EmitDefaultValue=false)]
+        public string PromotionName { get; set; }
+
+        /// <summary>
+        /// The updated menu items that the promotion awards
+        /// </summary>
+        /// <value>The updated menu items that the promotion awards</value>
+        [DataMember(Name="PromotionAwardMenuItemPublicIds", EmitDefaultValue=false)]
+        public List<Guid?> PromotionAwardMenuItemPublicIds { get; set; }
+
+        /// <summary>
+        /// Voucher Code
+        /// </summary>
+        /// <value>Voucher Code</value>
+        [DataMember(Name="Code", EmitDefaultValue=false)]
+        public string Code { get; set; }
+
+        /// <summary>
+        /// Voucher Description (Visible on printout)
+        /// </summary>
+        /// <value>Voucher Description (Visible on printout)</value>
+        [DataMember(Name="Description", EmitDefaultValue=false)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Stores that this voucher applies to
+        /// </summary>
+        /// <value>Stores that this voucher applies to</value>
+        [DataMember(Name="Stores", EmitDefaultValue=false)]
+        public List<int?> Stores { get; set; }
+
+        /// <summary>
+        /// Valid on orders on or above
+        /// </summary>
+        /// <value>Valid on orders on or above</value>
+        [DataMember(Name="ValidOnOrdersOver", EmitDefaultValue=false)]
+        public double? ValidOnOrdersOver { get; set; }
+
+        /// <summary>
+        /// Takes priority
+        /// </summary>
+        /// <value>Takes priority</value>
+        [DataMember(Name="TakesPriority", EmitDefaultValue=false)]
+        public bool? TakesPriority { get; set; }
+
+        /// <summary>
+        /// Is voucher enabled
+        /// </summary>
+        /// <value>Is voucher enabled</value>
+        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
+        public bool? IsEnabled { get; set; }
+
+        /// <summary>
+        /// Is voucher automatically applied
+        /// </summary>
+        /// <value>Is voucher automatically applied</value>
+        [DataMember(Name="IsAutomaticallyApplied", EmitDefaultValue=false)]
+        public bool? IsAutomaticallyApplied { get; set; }
+
+        /// <summary>
+        /// Include delivery fees
+        /// </summary>
+        /// <value>Include delivery fees</value>
+        [DataMember(Name="IncludeDeliveryFee", EmitDefaultValue=false)]
+        public bool? IncludeDeliveryFee { get; set; }
+
+        /// <summary>
+        /// Valid for delivery orders
+        /// </summary>
+        /// <value>Valid for delivery orders</value>
+        [DataMember(Name="IsValidForDeliveryOrders", EmitDefaultValue=false)]
+        public bool? IsValidForDeliveryOrders { get; set; }
+
+        /// <summary>
+        /// Valid for pickup orders
+        /// </summary>
+        /// <value>Valid for pickup orders</value>
+        [DataMember(Name="IsValidForPickupOrders", EmitDefaultValue=false)]
+        public bool? IsValidForPickupOrders { get; set; }
+
+        /// <summary>
+        /// Valid for orders payed online
+        /// </summary>
+        /// <value>Valid for orders payed online</value>
+        [DataMember(Name="IsValidForOrdersPayedOnline", EmitDefaultValue=false)]
+        public bool? IsValidForOrdersPayedOnline { get; set; }
+
+        /// <summary>
+        /// Valid for orders payed in cash
+        /// </summary>
+        /// <value>Valid for orders payed in cash</value>
+        [DataMember(Name="IsValidForOrdersPayedByCash", EmitDefaultValue=false)]
+        public bool? IsValidForOrdersPayedByCash { get; set; }
+
+        /// <summary>
+        /// Valid only on the first order by the customer
+        /// </summary>
+        /// <value>Valid only on the first order by the customer</value>
+        [DataMember(Name="IsValidForFirstOrderOnly", EmitDefaultValue=false)]
+        public bool? IsValidForFirstOrderOnly { get; set; }
+
+        /// <summary>
+        /// Valid once per customer
+        /// </summary>
+        /// <value>Valid once per customer</value>
+        [DataMember(Name="IsValidOncePerCustomer", EmitDefaultValue=false)]
+        public bool? IsValidOncePerCustomer { get; set; }
+
+        /// <summary>
+        /// Valid only once, by any customer (once used cannot be used again by any other customer)
+        /// </summary>
+        /// <value>Valid only once, by any customer (once used cannot be used again by any other customer)</value>
+        [DataMember(Name="IsValidOnlyOnce", EmitDefaultValue=false)]
+        public bool? IsValidOnlyOnce { get; set; }
+
+        /// <summary>
+        /// Enables the voucher to be offered in the Voucher Discoverability feature
+        /// </summary>
+        /// <value>Enables the voucher to be offered in the Voucher Discoverability feature</value>
+        [DataMember(Name="IsDiscoverable", EmitDefaultValue=false)]
+        public bool? IsDiscoverable { get; set; }
+
+        /// <summary>
+        /// Marks the voucher as promoted
+        /// </summary>
+        /// <value>Marks the voucher as promoted</value>
+        [DataMember(Name="IsPromoted", EmitDefaultValue=false)]
+        public bool? IsPromoted { get; set; }
+
+        /// <summary>
+        /// Force the discount to be applied which bypasses some menu restrictions
+        /// </summary>
+        /// <value>Force the discount to be applied which bypasses some menu restrictions</value>
+        [DataMember(Name="ForceDiscount", EmitDefaultValue=false)]
+        public bool? ForceDiscount { get; set; }
+
+        /// <summary>
+        /// Voucher Starts On (Time in UTC)
+        /// </summary>
+        /// <value>Voucher Starts On (Time in UTC)</value>
+        [DataMember(Name="StartDate", EmitDefaultValue=false)]
+        public DateTime? StartDate { get; set; }
+
+        /// <summary>
+        /// Voucher Expires On (Time in UTC)
+        /// </summary>
+        /// <value>Voucher Expires On (Time in UTC)</value>
+        [DataMember(Name="ExpiryDate", EmitDefaultValue=false)]
+        public DateTime? ExpiryDate { get; set; }
+
+
+        /// <summary>
+        /// Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated.
+        /// </summary>
+        /// <value>Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated.</value>
+        [DataMember(Name="ValidityPeriods", EmitDefaultValue=false)]
+        public List<ValidityPeriod> ValidityPeriods { get; set; }
+
+
+        /// <summary>
+        /// Customer UserID
+        /// </summary>
+        /// <value>Customer UserID</value>
+        [DataMember(Name="CustomerId", EmitDefaultValue=false)]
+        public int? CustomerId { get; set; }
+
+        /// <summary>
+        /// Maximum number of times the voucher can be redeemed (used)
+        /// </summary>
+        /// <value>Maximum number of times the voucher can be redeemed (used)</value>
+        [DataMember(Name="MaxRedemptions", EmitDefaultValue=false)]
+        public int? MaxRedemptions { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UpdateVoucher {\n");
+            sb.Append("  PromotionId: ").Append(PromotionId).Append("\n");
+            sb.Append("  PromotionName: ").Append(PromotionName).Append("\n");
+            sb.Append("  PromotionAwardMenuItemPublicIds: ").Append(PromotionAwardMenuItemPublicIds).Append("\n");
+            sb.Append("  Code: ").Append(Code).Append("\n");
+            sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  Stores: ").Append(Stores).Append("\n");
+            sb.Append("  ValidOnOrdersOver: ").Append(ValidOnOrdersOver).Append("\n");
+            sb.Append("  TakesPriority: ").Append(TakesPriority).Append("\n");
+            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
+            sb.Append("  IsAutomaticallyApplied: ").Append(IsAutomaticallyApplied).Append("\n");
+            sb.Append("  IncludeDeliveryFee: ").Append(IncludeDeliveryFee).Append("\n");
+            sb.Append("  IsValidForDeliveryOrders: ").Append(IsValidForDeliveryOrders).Append("\n");
+            sb.Append("  IsValidForPickupOrders: ").Append(IsValidForPickupOrders).Append("\n");
+            sb.Append("  IsValidForOrdersPayedOnline: ").Append(IsValidForOrdersPayedOnline).Append("\n");
+            sb.Append("  IsValidForOrdersPayedByCash: ").Append(IsValidForOrdersPayedByCash).Append("\n");
+            sb.Append("  IsValidForFirstOrderOnly: ").Append(IsValidForFirstOrderOnly).Append("\n");
+            sb.Append("  IsValidOncePerCustomer: ").Append(IsValidOncePerCustomer).Append("\n");
+            sb.Append("  IsValidOnlyOnce: ").Append(IsValidOnlyOnce).Append("\n");
+            sb.Append("  IsDiscoverable: ").Append(IsDiscoverable).Append("\n");
+            sb.Append("  IsPromoted: ").Append(IsPromoted).Append("\n");
+            sb.Append("  ForceDiscount: ").Append(ForceDiscount).Append("\n");
+            sb.Append("  StartDate: ").Append(StartDate).Append("\n");
+            sb.Append("  ExpiryDate: ").Append(ExpiryDate).Append("\n");
+            sb.Append("  ChannelRestrictions: ").Append(ChannelRestrictions).Append("\n");
+            sb.Append("  ValidityPeriods: ").Append(ValidityPeriods).Append("\n");
+            sb.Append("  VoucherSubType: ").Append(VoucherSubType).Append("\n");
+            sb.Append("  CustomerId: ").Append(CustomerId).Append("\n");
+            sb.Append("  MaxRedemptions: ").Append(MaxRedemptions).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UpdateVoucher);
+        }
+
+        /// <summary>
+        /// Returns true if UpdateVoucher instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UpdateVoucher to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UpdateVoucher input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PromotionId == input.PromotionId ||
+                    (this.PromotionId != null &&
+                    this.PromotionId.Equals(input.PromotionId))
+                ) && 
+                (
+                    this.PromotionName == input.PromotionName ||
+                    (this.PromotionName != null &&
+                    this.PromotionName.Equals(input.PromotionName))
+                ) && 
+                (
+                    this.PromotionAwardMenuItemPublicIds == input.PromotionAwardMenuItemPublicIds ||
+                    this.PromotionAwardMenuItemPublicIds != null &&
+                    this.PromotionAwardMenuItemPublicIds.SequenceEqual(input.PromotionAwardMenuItemPublicIds)
+                ) && 
+                (
+                    this.Code == input.Code ||
+                    (this.Code != null &&
+                    this.Code.Equals(input.Code))
+                ) && 
+                (
+                    this.Description == input.Description ||
+                    (this.Description != null &&
+                    this.Description.Equals(input.Description))
+                ) && 
+                (
+                    this.Stores == input.Stores ||
+                    this.Stores != null &&
+                    this.Stores.SequenceEqual(input.Stores)
+                ) && 
+                (
+                    this.ValidOnOrdersOver == input.ValidOnOrdersOver ||
+                    (this.ValidOnOrdersOver != null &&
+                    this.ValidOnOrdersOver.Equals(input.ValidOnOrdersOver))
+                ) && 
+                (
+                    this.TakesPriority == input.TakesPriority ||
+                    (this.TakesPriority != null &&
+                    this.TakesPriority.Equals(input.TakesPriority))
+                ) && 
+                (
+                    this.IsEnabled == input.IsEnabled ||
+                    (this.IsEnabled != null &&
+                    this.IsEnabled.Equals(input.IsEnabled))
+                ) && 
+                (
+                    this.IsAutomaticallyApplied == input.IsAutomaticallyApplied ||
+                    (this.IsAutomaticallyApplied != null &&
+                    this.IsAutomaticallyApplied.Equals(input.IsAutomaticallyApplied))
+                ) && 
+                (
+                    this.IncludeDeliveryFee == input.IncludeDeliveryFee ||
+                    (this.IncludeDeliveryFee != null &&
+                    this.IncludeDeliveryFee.Equals(input.IncludeDeliveryFee))
+                ) && 
+                (
+                    this.IsValidForDeliveryOrders == input.IsValidForDeliveryOrders ||
+                    (this.IsValidForDeliveryOrders != null &&
+                    this.IsValidForDeliveryOrders.Equals(input.IsValidForDeliveryOrders))
+                ) && 
+                (
+                    this.IsValidForPickupOrders == input.IsValidForPickupOrders ||
+                    (this.IsValidForPickupOrders != null &&
+                    this.IsValidForPickupOrders.Equals(input.IsValidForPickupOrders))
+                ) && 
+                (
+                    this.IsValidForOrdersPayedOnline == input.IsValidForOrdersPayedOnline ||
+                    (this.IsValidForOrdersPayedOnline != null &&
+                    this.IsValidForOrdersPayedOnline.Equals(input.IsValidForOrdersPayedOnline))
+                ) && 
+                (
+                    this.IsValidForOrdersPayedByCash == input.IsValidForOrdersPayedByCash ||
+                    (this.IsValidForOrdersPayedByCash != null &&
+                    this.IsValidForOrdersPayedByCash.Equals(input.IsValidForOrdersPayedByCash))
+                ) && 
+                (
+                    this.IsValidForFirstOrderOnly == input.IsValidForFirstOrderOnly ||
+                    (this.IsValidForFirstOrderOnly != null &&
+                    this.IsValidForFirstOrderOnly.Equals(input.IsValidForFirstOrderOnly))
+                ) && 
+                (
+                    this.IsValidOncePerCustomer == input.IsValidOncePerCustomer ||
+                    (this.IsValidOncePerCustomer != null &&
+                    this.IsValidOncePerCustomer.Equals(input.IsValidOncePerCustomer))
+                ) && 
+                (
+                    this.IsValidOnlyOnce == input.IsValidOnlyOnce ||
+                    (this.IsValidOnlyOnce != null &&
+                    this.IsValidOnlyOnce.Equals(input.IsValidOnlyOnce))
+                ) && 
+                (
+                    this.IsDiscoverable == input.IsDiscoverable ||
+                    (this.IsDiscoverable != null &&
+                    this.IsDiscoverable.Equals(input.IsDiscoverable))
+                ) && 
+                (
+                    this.IsPromoted == input.IsPromoted ||
+                    (this.IsPromoted != null &&
+                    this.IsPromoted.Equals(input.IsPromoted))
+                ) && 
+                (
+                    this.ForceDiscount == input.ForceDiscount ||
+                    (this.ForceDiscount != null &&
+                    this.ForceDiscount.Equals(input.ForceDiscount))
+                ) && 
+                (
+                    this.StartDate == input.StartDate ||
+                    (this.StartDate != null &&
+                    this.StartDate.Equals(input.StartDate))
+                ) && 
+                (
+                    this.ExpiryDate == input.ExpiryDate ||
+                    (this.ExpiryDate != null &&
+                    this.ExpiryDate.Equals(input.ExpiryDate))
+                ) && 
+                (
+                    this.ChannelRestrictions == input.ChannelRestrictions ||
+                    this.ChannelRestrictions != null &&
+                    this.ChannelRestrictions.SequenceEqual(input.ChannelRestrictions)
+                ) && 
+                (
+                    this.ValidityPeriods == input.ValidityPeriods ||
+                    this.ValidityPeriods != null &&
+                    this.ValidityPeriods.SequenceEqual(input.ValidityPeriods)
+                ) && 
+                (
+                    this.VoucherSubType == input.VoucherSubType ||
+                    (this.VoucherSubType != null &&
+                    this.VoucherSubType.Equals(input.VoucherSubType))
+                ) && 
+                (
+                    this.CustomerId == input.CustomerId ||
+                    (this.CustomerId != null &&
+                    this.CustomerId.Equals(input.CustomerId))
+                ) && 
+                (
+                    this.MaxRedemptions == input.MaxRedemptions ||
+                    (this.MaxRedemptions != null &&
+                    this.MaxRedemptions.Equals(input.MaxRedemptions))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PromotionId != null)
+                    hashCode = hashCode * 59 + this.PromotionId.GetHashCode();
+                if (this.PromotionName != null)
+                    hashCode = hashCode * 59 + this.PromotionName.GetHashCode();
+                if (this.PromotionAwardMenuItemPublicIds != null)
+                    hashCode = hashCode * 59 + this.PromotionAwardMenuItemPublicIds.GetHashCode();
+                if (this.Code != null)
+                    hashCode = hashCode * 59 + this.Code.GetHashCode();
+                if (this.Description != null)
+                    hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.Stores != null)
+                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
+                if (this.ValidOnOrdersOver != null)
+                    hashCode = hashCode * 59 + this.ValidOnOrdersOver.GetHashCode();
+                if (this.TakesPriority != null)
+                    hashCode = hashCode * 59 + this.TakesPriority.GetHashCode();
+                if (this.IsEnabled != null)
+                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
+                if (this.IsAutomaticallyApplied != null)
+                    hashCode = hashCode * 59 + this.IsAutomaticallyApplied.GetHashCode();
+                if (this.IncludeDeliveryFee != null)
+                    hashCode = hashCode * 59 + this.IncludeDeliveryFee.GetHashCode();
+                if (this.IsValidForDeliveryOrders != null)
+                    hashCode = hashCode * 59 + this.IsValidForDeliveryOrders.GetHashCode();
+                if (this.IsValidForPickupOrders != null)
+                    hashCode = hashCode * 59 + this.IsValidForPickupOrders.GetHashCode();
+                if (this.IsValidForOrdersPayedOnline != null)
+                    hashCode = hashCode * 59 + this.IsValidForOrdersPayedOnline.GetHashCode();
+                if (this.IsValidForOrdersPayedByCash != null)
+                    hashCode = hashCode * 59 + this.IsValidForOrdersPayedByCash.GetHashCode();
+                if (this.IsValidForFirstOrderOnly != null)
+                    hashCode = hashCode * 59 + this.IsValidForFirstOrderOnly.GetHashCode();
+                if (this.IsValidOncePerCustomer != null)
+                    hashCode = hashCode * 59 + this.IsValidOncePerCustomer.GetHashCode();
+                if (this.IsValidOnlyOnce != null)
+                    hashCode = hashCode * 59 + this.IsValidOnlyOnce.GetHashCode();
+                if (this.IsDiscoverable != null)
+                    hashCode = hashCode * 59 + this.IsDiscoverable.GetHashCode();
+                if (this.IsPromoted != null)
+                    hashCode = hashCode * 59 + this.IsPromoted.GetHashCode();
+                if (this.ForceDiscount != null)
+                    hashCode = hashCode * 59 + this.ForceDiscount.GetHashCode();
+                if (this.StartDate != null)
+                    hashCode = hashCode * 59 + this.StartDate.GetHashCode();
+                if (this.ExpiryDate != null)
+                    hashCode = hashCode * 59 + this.ExpiryDate.GetHashCode();
+                if (this.ChannelRestrictions != null)
+                    hashCode = hashCode * 59 + this.ChannelRestrictions.GetHashCode();
+                if (this.ValidityPeriods != null)
+                    hashCode = hashCode * 59 + this.ValidityPeriods.GetHashCode();
+                if (this.VoucherSubType != null)
+                    hashCode = hashCode * 59 + this.VoucherSubType.GetHashCode();
+                if (this.CustomerId != null)
+                    hashCode = hashCode * 59 + this.CustomerId.GetHashCode();
+                if (this.MaxRedemptions != null)
+                    hashCode = hashCode * 59 + this.MaxRedemptions.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UpdateVoucherUsage.cs b/src/Flipdish/Model/UpdateVoucherUsage.cs
new file mode 100644
index 00000000..ab2063ed
--- /dev/null
+++ b/src/Flipdish/Model/UpdateVoucherUsage.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Update Voucher Usage
+    /// </summary>
+    [DataContract]
+    public partial class UpdateVoucherUsage :  IEquatable<UpdateVoucherUsage>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdateVoucherUsage" /> class.
+        /// </summary>
+        /// <param name="isUsed">Flag indicating whether the voucher is used.</param>
+        /// <param name="usedByCustomerId">Indicates Customer that used the voucher..</param>
+        /// <param name="transactionKey">An opaque string, to ensure idempotency. This allows for safely retrying requests without accidentally performing the same stamp operation twice.   This will typically contain the the ID of the sale order..</param>
+        public UpdateVoucherUsage(bool? isUsed = default(bool?), int? usedByCustomerId = default(int?), string transactionKey = default(string))
+        {
+            this.IsUsed = isUsed;
+            this.UsedByCustomerId = usedByCustomerId;
+            this.TransactionKey = transactionKey;
+        }
+        
+        /// <summary>
+        /// Flag indicating whether the voucher is used
+        /// </summary>
+        /// <value>Flag indicating whether the voucher is used</value>
+        [DataMember(Name="IsUsed", EmitDefaultValue=false)]
+        public bool? IsUsed { get; set; }
+
+        /// <summary>
+        /// Indicates Customer that used the voucher.
+        /// </summary>
+        /// <value>Indicates Customer that used the voucher.</value>
+        [DataMember(Name="UsedByCustomerId", EmitDefaultValue=false)]
+        public int? UsedByCustomerId { get; set; }
+
+        /// <summary>
+        /// An opaque string, to ensure idempotency. This allows for safely retrying requests without accidentally performing the same stamp operation twice.   This will typically contain the the ID of the sale order.
+        /// </summary>
+        /// <value>An opaque string, to ensure idempotency. This allows for safely retrying requests without accidentally performing the same stamp operation twice.   This will typically contain the the ID of the sale order.</value>
+        [DataMember(Name="TransactionKey", EmitDefaultValue=false)]
+        public string TransactionKey { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UpdateVoucherUsage {\n");
+            sb.Append("  IsUsed: ").Append(IsUsed).Append("\n");
+            sb.Append("  UsedByCustomerId: ").Append(UsedByCustomerId).Append("\n");
+            sb.Append("  TransactionKey: ").Append(TransactionKey).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UpdateVoucherUsage);
+        }
+
+        /// <summary>
+        /// Returns true if UpdateVoucherUsage instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UpdateVoucherUsage to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UpdateVoucherUsage input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.IsUsed == input.IsUsed ||
+                    (this.IsUsed != null &&
+                    this.IsUsed.Equals(input.IsUsed))
+                ) && 
+                (
+                    this.UsedByCustomerId == input.UsedByCustomerId ||
+                    (this.UsedByCustomerId != null &&
+                    this.UsedByCustomerId.Equals(input.UsedByCustomerId))
+                ) && 
+                (
+                    this.TransactionKey == input.TransactionKey ||
+                    (this.TransactionKey != null &&
+                    this.TransactionKey.Equals(input.TransactionKey))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.IsUsed != null)
+                    hashCode = hashCode * 59 + this.IsUsed.GetHashCode();
+                if (this.UsedByCustomerId != null)
+                    hashCode = hashCode * 59 + this.UsedByCustomerId.GetHashCode();
+                if (this.TransactionKey != null)
+                    hashCode = hashCode * 59 + this.TransactionKey.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserAnsweredSignupQuestionsEvent.cs b/src/Flipdish/Model/UserAnsweredSignupQuestionsEvent.cs
index a37f6709..0422539b 100644
--- a/src/Flipdish/Model/UserAnsweredSignupQuestionsEvent.cs
+++ b/src/Flipdish/Model/UserAnsweredSignupQuestionsEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// User answered signup questions event
     /// </summary>
     [DataContract]
-    public partial class UserAnsweredSignupQuestionsEvent :  IEquatable<UserAnsweredSignupQuestionsEvent>, IValidatableObject
+    public partial class UserAnsweredSignupQuestionsEvent :  IEquatable<UserAnsweredSignupQuestionsEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UserAnsweredSignupQuestionsEvent" /> class.
@@ -40,8 +38,11 @@ public partial class UserAnsweredSignupQuestionsEvent :  IEquatable<UserAnswered
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public UserAnsweredSignupQuestionsEvent(string eventName = default(string), UserEventInfo user = default(UserEventInfo), string signupAnswers = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public UserAnsweredSignupQuestionsEvent(string eventName = default(string), UserEventInfo user = default(UserEventInfo), string signupAnswers = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.User = user;
@@ -50,7 +51,10 @@ public partial class UserAnsweredSignupQuestionsEvent :  IEquatable<UserAnswered
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class UserAnsweredSignupQuestionsEvent :  IEquatable<UserAnswered
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class UserAnsweredSignupQuestionsEvent :  IEquatable<UserAnswered
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(UserAnsweredSignupQuestionsEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UserCreatedEvent.cs b/src/Flipdish/Model/UserCreatedEvent.cs
index 8f1eda0a..ec8819f2 100644
--- a/src/Flipdish/Model/UserCreatedEvent.cs
+++ b/src/Flipdish/Model/UserCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// User created event
     /// </summary>
     [DataContract]
-    public partial class UserCreatedEvent :  IEquatable<UserCreatedEvent>, IValidatableObject
+    public partial class UserCreatedEvent :  IEquatable<UserCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UserCreatedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class UserCreatedEvent :  IEquatable<UserCreatedEvent>, IValidata
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public UserCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public UserCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class UserCreatedEvent :  IEquatable<UserCreatedEvent>, IValidata
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class UserCreatedEvent :  IEquatable<UserCreatedEvent>, IValidata
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class UserCreatedEvent :  IEquatable<UserCreatedEvent>, IValidata
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(UserCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UserDeletedEvent.cs b/src/Flipdish/Model/UserDeletedEvent.cs
index a569dc6d..b473b0a2 100644
--- a/src/Flipdish/Model/UserDeletedEvent.cs
+++ b/src/Flipdish/Model/UserDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// User deleted event
     /// </summary>
     [DataContract]
-    public partial class UserDeletedEvent :  IEquatable<UserDeletedEvent>, IValidatableObject
+    public partial class UserDeletedEvent :  IEquatable<UserDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UserDeletedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class UserDeletedEvent :  IEquatable<UserDeletedEvent>, IValidata
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public UserDeletedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public UserDeletedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class UserDeletedEvent :  IEquatable<UserDeletedEvent>, IValidata
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class UserDeletedEvent :  IEquatable<UserDeletedEvent>, IValidata
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class UserDeletedEvent :  IEquatable<UserDeletedEvent>, IValidata
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(UserDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UserDeliveryLocationAdmin.cs b/src/Flipdish/Model/UserDeliveryLocationAdmin.cs
new file mode 100644
index 00000000..5bd4791a
--- /dev/null
+++ b/src/Flipdish/Model/UserDeliveryLocationAdmin.cs
@@ -0,0 +1,266 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Delivery location with identifiers for admin user management.
+    /// </summary>
+    [DataContract]
+    public partial class UserDeliveryLocationAdmin :  IEquatable<UserDeliveryLocationAdmin>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserDeliveryLocationAdmin" /> class.
+        /// </summary>
+        /// <param name="deliveryLocationId">DeliveryLocationId..</param>
+        /// <param name="building">Building..</param>
+        /// <param name="street">Street..</param>
+        /// <param name="town">Town..</param>
+        /// <param name="postCode">PostCode..</param>
+        /// <param name="deliveryInstructions">DeliveryInstructions..</param>
+        /// <param name="autoSelectThisLocation">AutoSelectThisLocation..</param>
+        /// <param name="isDisplayed">IsDisplayed..</param>
+        /// <param name="isConfirmed">IsConfirmed..</param>
+        /// <param name="coordinates">Coordinates..</param>
+        public UserDeliveryLocationAdmin(int? deliveryLocationId = default(int?), string building = default(string), string street = default(string), string town = default(string), string postCode = default(string), string deliveryInstructions = default(string), bool? autoSelectThisLocation = default(bool?), bool? isDisplayed = default(bool?), bool? isConfirmed = default(bool?), Coordinates coordinates = default(Coordinates))
+        {
+            this.DeliveryLocationId = deliveryLocationId;
+            this.Building = building;
+            this.Street = street;
+            this.Town = town;
+            this.PostCode = postCode;
+            this.DeliveryInstructions = deliveryInstructions;
+            this.AutoSelectThisLocation = autoSelectThisLocation;
+            this.IsDisplayed = isDisplayed;
+            this.IsConfirmed = isConfirmed;
+            this.Coordinates = coordinates;
+        }
+        
+        /// <summary>
+        /// DeliveryLocationId.
+        /// </summary>
+        /// <value>DeliveryLocationId.</value>
+        [DataMember(Name="DeliveryLocationId", EmitDefaultValue=false)]
+        public int? DeliveryLocationId { get; set; }
+
+        /// <summary>
+        /// Building.
+        /// </summary>
+        /// <value>Building.</value>
+        [DataMember(Name="Building", EmitDefaultValue=false)]
+        public string Building { get; set; }
+
+        /// <summary>
+        /// Street.
+        /// </summary>
+        /// <value>Street.</value>
+        [DataMember(Name="Street", EmitDefaultValue=false)]
+        public string Street { get; set; }
+
+        /// <summary>
+        /// Town.
+        /// </summary>
+        /// <value>Town.</value>
+        [DataMember(Name="Town", EmitDefaultValue=false)]
+        public string Town { get; set; }
+
+        /// <summary>
+        /// PostCode.
+        /// </summary>
+        /// <value>PostCode.</value>
+        [DataMember(Name="PostCode", EmitDefaultValue=false)]
+        public string PostCode { get; set; }
+
+        /// <summary>
+        /// DeliveryInstructions.
+        /// </summary>
+        /// <value>DeliveryInstructions.</value>
+        [DataMember(Name="DeliveryInstructions", EmitDefaultValue=false)]
+        public string DeliveryInstructions { get; set; }
+
+        /// <summary>
+        /// AutoSelectThisLocation.
+        /// </summary>
+        /// <value>AutoSelectThisLocation.</value>
+        [DataMember(Name="AutoSelectThisLocation", EmitDefaultValue=false)]
+        public bool? AutoSelectThisLocation { get; set; }
+
+        /// <summary>
+        /// IsDisplayed.
+        /// </summary>
+        /// <value>IsDisplayed.</value>
+        [DataMember(Name="IsDisplayed", EmitDefaultValue=false)]
+        public bool? IsDisplayed { get; set; }
+
+        /// <summary>
+        /// IsConfirmed.
+        /// </summary>
+        /// <value>IsConfirmed.</value>
+        [DataMember(Name="IsConfirmed", EmitDefaultValue=false)]
+        public bool? IsConfirmed { get; set; }
+
+        /// <summary>
+        /// Coordinates.
+        /// </summary>
+        /// <value>Coordinates.</value>
+        [DataMember(Name="Coordinates", EmitDefaultValue=false)]
+        public Coordinates Coordinates { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserDeliveryLocationAdmin {\n");
+            sb.Append("  DeliveryLocationId: ").Append(DeliveryLocationId).Append("\n");
+            sb.Append("  Building: ").Append(Building).Append("\n");
+            sb.Append("  Street: ").Append(Street).Append("\n");
+            sb.Append("  Town: ").Append(Town).Append("\n");
+            sb.Append("  PostCode: ").Append(PostCode).Append("\n");
+            sb.Append("  DeliveryInstructions: ").Append(DeliveryInstructions).Append("\n");
+            sb.Append("  AutoSelectThisLocation: ").Append(AutoSelectThisLocation).Append("\n");
+            sb.Append("  IsDisplayed: ").Append(IsDisplayed).Append("\n");
+            sb.Append("  IsConfirmed: ").Append(IsConfirmed).Append("\n");
+            sb.Append("  Coordinates: ").Append(Coordinates).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserDeliveryLocationAdmin);
+        }
+
+        /// <summary>
+        /// Returns true if UserDeliveryLocationAdmin instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserDeliveryLocationAdmin to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserDeliveryLocationAdmin input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DeliveryLocationId == input.DeliveryLocationId ||
+                    (this.DeliveryLocationId != null &&
+                    this.DeliveryLocationId.Equals(input.DeliveryLocationId))
+                ) && 
+                (
+                    this.Building == input.Building ||
+                    (this.Building != null &&
+                    this.Building.Equals(input.Building))
+                ) && 
+                (
+                    this.Street == input.Street ||
+                    (this.Street != null &&
+                    this.Street.Equals(input.Street))
+                ) && 
+                (
+                    this.Town == input.Town ||
+                    (this.Town != null &&
+                    this.Town.Equals(input.Town))
+                ) && 
+                (
+                    this.PostCode == input.PostCode ||
+                    (this.PostCode != null &&
+                    this.PostCode.Equals(input.PostCode))
+                ) && 
+                (
+                    this.DeliveryInstructions == input.DeliveryInstructions ||
+                    (this.DeliveryInstructions != null &&
+                    this.DeliveryInstructions.Equals(input.DeliveryInstructions))
+                ) && 
+                (
+                    this.AutoSelectThisLocation == input.AutoSelectThisLocation ||
+                    (this.AutoSelectThisLocation != null &&
+                    this.AutoSelectThisLocation.Equals(input.AutoSelectThisLocation))
+                ) && 
+                (
+                    this.IsDisplayed == input.IsDisplayed ||
+                    (this.IsDisplayed != null &&
+                    this.IsDisplayed.Equals(input.IsDisplayed))
+                ) && 
+                (
+                    this.IsConfirmed == input.IsConfirmed ||
+                    (this.IsConfirmed != null &&
+                    this.IsConfirmed.Equals(input.IsConfirmed))
+                ) && 
+                (
+                    this.Coordinates == input.Coordinates ||
+                    (this.Coordinates != null &&
+                    this.Coordinates.Equals(input.Coordinates))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DeliveryLocationId != null)
+                    hashCode = hashCode * 59 + this.DeliveryLocationId.GetHashCode();
+                if (this.Building != null)
+                    hashCode = hashCode * 59 + this.Building.GetHashCode();
+                if (this.Street != null)
+                    hashCode = hashCode * 59 + this.Street.GetHashCode();
+                if (this.Town != null)
+                    hashCode = hashCode * 59 + this.Town.GetHashCode();
+                if (this.PostCode != null)
+                    hashCode = hashCode * 59 + this.PostCode.GetHashCode();
+                if (this.DeliveryInstructions != null)
+                    hashCode = hashCode * 59 + this.DeliveryInstructions.GetHashCode();
+                if (this.AutoSelectThisLocation != null)
+                    hashCode = hashCode * 59 + this.AutoSelectThisLocation.GetHashCode();
+                if (this.IsDisplayed != null)
+                    hashCode = hashCode * 59 + this.IsDisplayed.GetHashCode();
+                if (this.IsConfirmed != null)
+                    hashCode = hashCode * 59 + this.IsConfirmed.GetHashCode();
+                if (this.Coordinates != null)
+                    hashCode = hashCode * 59 + this.Coordinates.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserEventInfo.cs b/src/Flipdish/Model/UserEventInfo.cs
index 612998da..4412562b 100644
--- a/src/Flipdish/Model/UserEventInfo.cs
+++ b/src/Flipdish/Model/UserEventInfo.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// User Event Info
     /// </summary>
     [DataContract]
-    public partial class UserEventInfo :  IEquatable<UserEventInfo>, IValidatableObject
+    public partial class UserEventInfo :  IEquatable<UserEventInfo>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UserEventInfo" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UserFlipdishAccount.cs b/src/Flipdish/Model/UserFlipdishAccount.cs
new file mode 100644
index 00000000..46aa489a
--- /dev/null
+++ b/src/Flipdish/Model/UserFlipdishAccount.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Flipdish account information associated with a user
+    /// </summary>
+    [DataContract]
+    public partial class UserFlipdishAccount :  IEquatable<UserFlipdishAccount>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserFlipdishAccount" /> class.
+        /// </summary>
+        /// <param name="payeeBankAccountDataId">Payee Bank Account Data Id.</param>
+        /// <param name="flipdishAccountId">Flipdish Account Id.</param>
+        /// <param name="name">Flipdish Account Name.</param>
+        public UserFlipdishAccount(int? payeeBankAccountDataId = default(int?), int? flipdishAccountId = default(int?), string name = default(string))
+        {
+            this.PayeeBankAccountDataId = payeeBankAccountDataId;
+            this.FlipdishAccountId = flipdishAccountId;
+            this.Name = name;
+        }
+        
+        /// <summary>
+        /// Payee Bank Account Data Id
+        /// </summary>
+        /// <value>Payee Bank Account Data Id</value>
+        [DataMember(Name="PayeeBankAccountDataId", EmitDefaultValue=false)]
+        public int? PayeeBankAccountDataId { get; set; }
+
+        /// <summary>
+        /// Flipdish Account Id
+        /// </summary>
+        /// <value>Flipdish Account Id</value>
+        [DataMember(Name="FlipdishAccountId", EmitDefaultValue=false)]
+        public int? FlipdishAccountId { get; set; }
+
+        /// <summary>
+        /// Flipdish Account Name
+        /// </summary>
+        /// <value>Flipdish Account Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserFlipdishAccount {\n");
+            sb.Append("  PayeeBankAccountDataId: ").Append(PayeeBankAccountDataId).Append("\n");
+            sb.Append("  FlipdishAccountId: ").Append(FlipdishAccountId).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserFlipdishAccount);
+        }
+
+        /// <summary>
+        /// Returns true if UserFlipdishAccount instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserFlipdishAccount to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserFlipdishAccount input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PayeeBankAccountDataId == input.PayeeBankAccountDataId ||
+                    (this.PayeeBankAccountDataId != null &&
+                    this.PayeeBankAccountDataId.Equals(input.PayeeBankAccountDataId))
+                ) && 
+                (
+                    this.FlipdishAccountId == input.FlipdishAccountId ||
+                    (this.FlipdishAccountId != null &&
+                    this.FlipdishAccountId.Equals(input.FlipdishAccountId))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PayeeBankAccountDataId != null)
+                    hashCode = hashCode * 59 + this.PayeeBankAccountDataId.GetHashCode();
+                if (this.FlipdishAccountId != null)
+                    hashCode = hashCode * 59 + this.FlipdishAccountId.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserInfo.cs b/src/Flipdish/Model/UserInfo.cs
new file mode 100644
index 00000000..3b0e1ec3
--- /dev/null
+++ b/src/Flipdish/Model/UserInfo.cs
@@ -0,0 +1,555 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// User information
+    /// </summary>
+    [DataContract]
+    public partial class UserInfo :  IEquatable<UserInfo>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserInfo" /> class.
+        /// </summary>
+        /// <param name="phoneNumber">The user&#39;s phone number..</param>
+        /// <param name="email">The user&#39;s email address..</param>
+        /// <param name="emailConfirmed">Indicates if the user&#39;s email address has been confirmed..</param>
+        /// <param name="preventFromUsingCards">Indicates if the user is prevented from using cards..</param>
+        /// <param name="isUserPhoneNumberBlocked">Indicates if the user&#39;s phone number is blocked..</param>
+        /// <param name="userWhiteLabels">List of white label information associated with the user..</param>
+        /// <param name="userId">The unique identifier for the user..</param>
+        /// <param name="userName">The user&#39;s username..</param>
+        /// <param name="customerName">The customer&#39;s name..</param>
+        /// <param name="hasLoggedIn">Indicates if the user has logged in..</param>
+        /// <param name="disableAppRatingControl">Indicates if the app rating control is disabled for the user..</param>
+        /// <param name="globallyOptedOut">Indicates if the user has globally opted out..</param>
+        /// <param name="completedOrderCount">The number of completed orders by the user..</param>
+        /// <param name="cancelledOrderCount">The number of cancelled orders by the user..</param>
+        /// <param name="orderTotalValue">The total value of orders placed by the user..</param>
+        /// <param name="tsMostRecentOrder">The timestamp of the user&#39;s most recent order..</param>
+        /// <param name="tsFirstOrder">The timestamp of the user&#39;s first order..</param>
+        /// <param name="isRestaurantUser">Indicates if the user is a restaurant user..</param>
+        /// <param name="installs">List of app installs associated with the user..</param>
+        /// <param name="deliveryLocations">List of delivery locations associated with the user..</param>
+        /// <param name="paymentAccounts">List of payment accounts associated with the user..</param>
+        /// <param name="languageId">The language identifier for the user..</param>
+        /// <param name="currentLanguageName">Current language name for the user..</param>
+        /// <param name="languages">Available languages that the user can choose from..</param>
+        /// <param name="salesForceContactId">The Salesforce contact ID for the user..</param>
+        /// <param name="stripeCustomerId">The Stripe customer ID for the user..</param>
+        /// <param name="userMonthlyCommissions">User&#39;s monthly commissions..</param>
+        public UserInfo(string phoneNumber = default(string), string email = default(string), bool? emailConfirmed = default(bool?), bool? preventFromUsingCards = default(bool?), bool? isUserPhoneNumberBlocked = default(bool?), List<UserWhiteLabelInfo> userWhiteLabels = default(List<UserWhiteLabelInfo>), int? userId = default(int?), string userName = default(string), string customerName = default(string), bool? hasLoggedIn = default(bool?), bool? disableAppRatingControl = default(bool?), bool? globallyOptedOut = default(bool?), int? completedOrderCount = default(int?), int? cancelledOrderCount = default(int?), double? orderTotalValue = default(double?), DateTime? tsMostRecentOrder = default(DateTime?), DateTime? tsFirstOrder = default(DateTime?), bool? isRestaurantUser = default(bool?), List<AppInstall> installs = default(List<AppInstall>), List<DeliveryLocation> deliveryLocations = default(List<DeliveryLocation>), List<PaymentAccount> paymentAccounts = default(List<PaymentAccount>), string languageId = default(string), string currentLanguageName = default(string), List<Language> languages = default(List<Language>), string salesForceContactId = default(string), string stripeCustomerId = default(string), List<UserMonthlyCommission> userMonthlyCommissions = default(List<UserMonthlyCommission>))
+        {
+            this.PhoneNumber = phoneNumber;
+            this.Email = email;
+            this.EmailConfirmed = emailConfirmed;
+            this.PreventFromUsingCards = preventFromUsingCards;
+            this.IsUserPhoneNumberBlocked = isUserPhoneNumberBlocked;
+            this.UserWhiteLabels = userWhiteLabels;
+            this.UserId = userId;
+            this.UserName = userName;
+            this.CustomerName = customerName;
+            this.HasLoggedIn = hasLoggedIn;
+            this.DisableAppRatingControl = disableAppRatingControl;
+            this.GloballyOptedOut = globallyOptedOut;
+            this.CompletedOrderCount = completedOrderCount;
+            this.CancelledOrderCount = cancelledOrderCount;
+            this.OrderTotalValue = orderTotalValue;
+            this.TsMostRecentOrder = tsMostRecentOrder;
+            this.TsFirstOrder = tsFirstOrder;
+            this.IsRestaurantUser = isRestaurantUser;
+            this.Installs = installs;
+            this.DeliveryLocations = deliveryLocations;
+            this.PaymentAccounts = paymentAccounts;
+            this.LanguageId = languageId;
+            this.CurrentLanguageName = currentLanguageName;
+            this.Languages = languages;
+            this.SalesForceContactId = salesForceContactId;
+            this.StripeCustomerId = stripeCustomerId;
+            this.UserMonthlyCommissions = userMonthlyCommissions;
+        }
+        
+        /// <summary>
+        /// The user&#39;s phone number.
+        /// </summary>
+        /// <value>The user&#39;s phone number.</value>
+        [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
+        public string PhoneNumber { get; set; }
+
+        /// <summary>
+        /// The user&#39;s email address.
+        /// </summary>
+        /// <value>The user&#39;s email address.</value>
+        [DataMember(Name="Email", EmitDefaultValue=false)]
+        public string Email { get; set; }
+
+        /// <summary>
+        /// Indicates if the user&#39;s email address has been confirmed.
+        /// </summary>
+        /// <value>Indicates if the user&#39;s email address has been confirmed.</value>
+        [DataMember(Name="EmailConfirmed", EmitDefaultValue=false)]
+        public bool? EmailConfirmed { get; set; }
+
+        /// <summary>
+        /// Indicates if the user is prevented from using cards.
+        /// </summary>
+        /// <value>Indicates if the user is prevented from using cards.</value>
+        [DataMember(Name="PreventFromUsingCards", EmitDefaultValue=false)]
+        public bool? PreventFromUsingCards { get; set; }
+
+        /// <summary>
+        /// Indicates if the user&#39;s phone number is blocked.
+        /// </summary>
+        /// <value>Indicates if the user&#39;s phone number is blocked.</value>
+        [DataMember(Name="IsUserPhoneNumberBlocked", EmitDefaultValue=false)]
+        public bool? IsUserPhoneNumberBlocked { get; set; }
+
+        /// <summary>
+        /// List of white label information associated with the user.
+        /// </summary>
+        /// <value>List of white label information associated with the user.</value>
+        [DataMember(Name="UserWhiteLabels", EmitDefaultValue=false)]
+        public List<UserWhiteLabelInfo> UserWhiteLabels { get; set; }
+
+        /// <summary>
+        /// The unique identifier for the user.
+        /// </summary>
+        /// <value>The unique identifier for the user.</value>
+        [DataMember(Name="UserId", EmitDefaultValue=false)]
+        public int? UserId { get; set; }
+
+        /// <summary>
+        /// The user&#39;s username.
+        /// </summary>
+        /// <value>The user&#39;s username.</value>
+        [DataMember(Name="UserName", EmitDefaultValue=false)]
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// The customer&#39;s name.
+        /// </summary>
+        /// <value>The customer&#39;s name.</value>
+        [DataMember(Name="CustomerName", EmitDefaultValue=false)]
+        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// Indicates if the user has logged in.
+        /// </summary>
+        /// <value>Indicates if the user has logged in.</value>
+        [DataMember(Name="HasLoggedIn", EmitDefaultValue=false)]
+        public bool? HasLoggedIn { get; set; }
+
+        /// <summary>
+        /// Indicates if the app rating control is disabled for the user.
+        /// </summary>
+        /// <value>Indicates if the app rating control is disabled for the user.</value>
+        [DataMember(Name="DisableAppRatingControl", EmitDefaultValue=false)]
+        public bool? DisableAppRatingControl { get; set; }
+
+        /// <summary>
+        /// Indicates if the user has globally opted out.
+        /// </summary>
+        /// <value>Indicates if the user has globally opted out.</value>
+        [DataMember(Name="GloballyOptedOut", EmitDefaultValue=false)]
+        public bool? GloballyOptedOut { get; set; }
+
+        /// <summary>
+        /// The number of completed orders by the user.
+        /// </summary>
+        /// <value>The number of completed orders by the user.</value>
+        [DataMember(Name="CompletedOrderCount", EmitDefaultValue=false)]
+        public int? CompletedOrderCount { get; set; }
+
+        /// <summary>
+        /// The number of cancelled orders by the user.
+        /// </summary>
+        /// <value>The number of cancelled orders by the user.</value>
+        [DataMember(Name="CancelledOrderCount", EmitDefaultValue=false)]
+        public int? CancelledOrderCount { get; set; }
+
+        /// <summary>
+        /// The total value of orders placed by the user.
+        /// </summary>
+        /// <value>The total value of orders placed by the user.</value>
+        [DataMember(Name="OrderTotalValue", EmitDefaultValue=false)]
+        public double? OrderTotalValue { get; set; }
+
+        /// <summary>
+        /// The timestamp of the user&#39;s most recent order.
+        /// </summary>
+        /// <value>The timestamp of the user&#39;s most recent order.</value>
+        [DataMember(Name="TsMostRecentOrder", EmitDefaultValue=false)]
+        public DateTime? TsMostRecentOrder { get; set; }
+
+        /// <summary>
+        /// The timestamp of the user&#39;s first order.
+        /// </summary>
+        /// <value>The timestamp of the user&#39;s first order.</value>
+        [DataMember(Name="TsFirstOrder", EmitDefaultValue=false)]
+        public DateTime? TsFirstOrder { get; set; }
+
+        /// <summary>
+        /// Indicates if the user is a restaurant user.
+        /// </summary>
+        /// <value>Indicates if the user is a restaurant user.</value>
+        [DataMember(Name="IsRestaurantUser", EmitDefaultValue=false)]
+        public bool? IsRestaurantUser { get; set; }
+
+        /// <summary>
+        /// List of app installs associated with the user.
+        /// </summary>
+        /// <value>List of app installs associated with the user.</value>
+        [DataMember(Name="Installs", EmitDefaultValue=false)]
+        public List<AppInstall> Installs { get; set; }
+
+        /// <summary>
+        /// List of delivery locations associated with the user.
+        /// </summary>
+        /// <value>List of delivery locations associated with the user.</value>
+        [DataMember(Name="DeliveryLocations", EmitDefaultValue=false)]
+        public List<DeliveryLocation> DeliveryLocations { get; set; }
+
+        /// <summary>
+        /// List of payment accounts associated with the user.
+        /// </summary>
+        /// <value>List of payment accounts associated with the user.</value>
+        [DataMember(Name="PaymentAccounts", EmitDefaultValue=false)]
+        public List<PaymentAccount> PaymentAccounts { get; set; }
+
+        /// <summary>
+        /// The language identifier for the user.
+        /// </summary>
+        /// <value>The language identifier for the user.</value>
+        [DataMember(Name="LanguageId", EmitDefaultValue=false)]
+        public string LanguageId { get; set; }
+
+        /// <summary>
+        /// Current language name for the user.
+        /// </summary>
+        /// <value>Current language name for the user.</value>
+        [DataMember(Name="CurrentLanguageName", EmitDefaultValue=false)]
+        public string CurrentLanguageName { get; set; }
+
+        /// <summary>
+        /// Available languages that the user can choose from.
+        /// </summary>
+        /// <value>Available languages that the user can choose from.</value>
+        [DataMember(Name="Languages", EmitDefaultValue=false)]
+        public List<Language> Languages { get; set; }
+
+        /// <summary>
+        /// The Salesforce contact ID for the user.
+        /// </summary>
+        /// <value>The Salesforce contact ID for the user.</value>
+        [DataMember(Name="SalesForceContactId", EmitDefaultValue=false)]
+        public string SalesForceContactId { get; set; }
+
+        /// <summary>
+        /// The Stripe customer ID for the user.
+        /// </summary>
+        /// <value>The Stripe customer ID for the user.</value>
+        [DataMember(Name="StripeCustomerId", EmitDefaultValue=false)]
+        public string StripeCustomerId { get; set; }
+
+        /// <summary>
+        /// User&#39;s monthly commissions.
+        /// </summary>
+        /// <value>User&#39;s monthly commissions.</value>
+        [DataMember(Name="UserMonthlyCommissions", EmitDefaultValue=false)]
+        public List<UserMonthlyCommission> UserMonthlyCommissions { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserInfo {\n");
+            sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  EmailConfirmed: ").Append(EmailConfirmed).Append("\n");
+            sb.Append("  PreventFromUsingCards: ").Append(PreventFromUsingCards).Append("\n");
+            sb.Append("  IsUserPhoneNumberBlocked: ").Append(IsUserPhoneNumberBlocked).Append("\n");
+            sb.Append("  UserWhiteLabels: ").Append(UserWhiteLabels).Append("\n");
+            sb.Append("  UserId: ").Append(UserId).Append("\n");
+            sb.Append("  UserName: ").Append(UserName).Append("\n");
+            sb.Append("  CustomerName: ").Append(CustomerName).Append("\n");
+            sb.Append("  HasLoggedIn: ").Append(HasLoggedIn).Append("\n");
+            sb.Append("  DisableAppRatingControl: ").Append(DisableAppRatingControl).Append("\n");
+            sb.Append("  GloballyOptedOut: ").Append(GloballyOptedOut).Append("\n");
+            sb.Append("  CompletedOrderCount: ").Append(CompletedOrderCount).Append("\n");
+            sb.Append("  CancelledOrderCount: ").Append(CancelledOrderCount).Append("\n");
+            sb.Append("  OrderTotalValue: ").Append(OrderTotalValue).Append("\n");
+            sb.Append("  TsMostRecentOrder: ").Append(TsMostRecentOrder).Append("\n");
+            sb.Append("  TsFirstOrder: ").Append(TsFirstOrder).Append("\n");
+            sb.Append("  IsRestaurantUser: ").Append(IsRestaurantUser).Append("\n");
+            sb.Append("  Installs: ").Append(Installs).Append("\n");
+            sb.Append("  DeliveryLocations: ").Append(DeliveryLocations).Append("\n");
+            sb.Append("  PaymentAccounts: ").Append(PaymentAccounts).Append("\n");
+            sb.Append("  LanguageId: ").Append(LanguageId).Append("\n");
+            sb.Append("  CurrentLanguageName: ").Append(CurrentLanguageName).Append("\n");
+            sb.Append("  Languages: ").Append(Languages).Append("\n");
+            sb.Append("  SalesForceContactId: ").Append(SalesForceContactId).Append("\n");
+            sb.Append("  StripeCustomerId: ").Append(StripeCustomerId).Append("\n");
+            sb.Append("  UserMonthlyCommissions: ").Append(UserMonthlyCommissions).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserInfo);
+        }
+
+        /// <summary>
+        /// Returns true if UserInfo instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserInfo to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserInfo input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PhoneNumber == input.PhoneNumber ||
+                    (this.PhoneNumber != null &&
+                    this.PhoneNumber.Equals(input.PhoneNumber))
+                ) && 
+                (
+                    this.Email == input.Email ||
+                    (this.Email != null &&
+                    this.Email.Equals(input.Email))
+                ) && 
+                (
+                    this.EmailConfirmed == input.EmailConfirmed ||
+                    (this.EmailConfirmed != null &&
+                    this.EmailConfirmed.Equals(input.EmailConfirmed))
+                ) && 
+                (
+                    this.PreventFromUsingCards == input.PreventFromUsingCards ||
+                    (this.PreventFromUsingCards != null &&
+                    this.PreventFromUsingCards.Equals(input.PreventFromUsingCards))
+                ) && 
+                (
+                    this.IsUserPhoneNumberBlocked == input.IsUserPhoneNumberBlocked ||
+                    (this.IsUserPhoneNumberBlocked != null &&
+                    this.IsUserPhoneNumberBlocked.Equals(input.IsUserPhoneNumberBlocked))
+                ) && 
+                (
+                    this.UserWhiteLabels == input.UserWhiteLabels ||
+                    this.UserWhiteLabels != null &&
+                    this.UserWhiteLabels.SequenceEqual(input.UserWhiteLabels)
+                ) && 
+                (
+                    this.UserId == input.UserId ||
+                    (this.UserId != null &&
+                    this.UserId.Equals(input.UserId))
+                ) && 
+                (
+                    this.UserName == input.UserName ||
+                    (this.UserName != null &&
+                    this.UserName.Equals(input.UserName))
+                ) && 
+                (
+                    this.CustomerName == input.CustomerName ||
+                    (this.CustomerName != null &&
+                    this.CustomerName.Equals(input.CustomerName))
+                ) && 
+                (
+                    this.HasLoggedIn == input.HasLoggedIn ||
+                    (this.HasLoggedIn != null &&
+                    this.HasLoggedIn.Equals(input.HasLoggedIn))
+                ) && 
+                (
+                    this.DisableAppRatingControl == input.DisableAppRatingControl ||
+                    (this.DisableAppRatingControl != null &&
+                    this.DisableAppRatingControl.Equals(input.DisableAppRatingControl))
+                ) && 
+                (
+                    this.GloballyOptedOut == input.GloballyOptedOut ||
+                    (this.GloballyOptedOut != null &&
+                    this.GloballyOptedOut.Equals(input.GloballyOptedOut))
+                ) && 
+                (
+                    this.CompletedOrderCount == input.CompletedOrderCount ||
+                    (this.CompletedOrderCount != null &&
+                    this.CompletedOrderCount.Equals(input.CompletedOrderCount))
+                ) && 
+                (
+                    this.CancelledOrderCount == input.CancelledOrderCount ||
+                    (this.CancelledOrderCount != null &&
+                    this.CancelledOrderCount.Equals(input.CancelledOrderCount))
+                ) && 
+                (
+                    this.OrderTotalValue == input.OrderTotalValue ||
+                    (this.OrderTotalValue != null &&
+                    this.OrderTotalValue.Equals(input.OrderTotalValue))
+                ) && 
+                (
+                    this.TsMostRecentOrder == input.TsMostRecentOrder ||
+                    (this.TsMostRecentOrder != null &&
+                    this.TsMostRecentOrder.Equals(input.TsMostRecentOrder))
+                ) && 
+                (
+                    this.TsFirstOrder == input.TsFirstOrder ||
+                    (this.TsFirstOrder != null &&
+                    this.TsFirstOrder.Equals(input.TsFirstOrder))
+                ) && 
+                (
+                    this.IsRestaurantUser == input.IsRestaurantUser ||
+                    (this.IsRestaurantUser != null &&
+                    this.IsRestaurantUser.Equals(input.IsRestaurantUser))
+                ) && 
+                (
+                    this.Installs == input.Installs ||
+                    this.Installs != null &&
+                    this.Installs.SequenceEqual(input.Installs)
+                ) && 
+                (
+                    this.DeliveryLocations == input.DeliveryLocations ||
+                    this.DeliveryLocations != null &&
+                    this.DeliveryLocations.SequenceEqual(input.DeliveryLocations)
+                ) && 
+                (
+                    this.PaymentAccounts == input.PaymentAccounts ||
+                    this.PaymentAccounts != null &&
+                    this.PaymentAccounts.SequenceEqual(input.PaymentAccounts)
+                ) && 
+                (
+                    this.LanguageId == input.LanguageId ||
+                    (this.LanguageId != null &&
+                    this.LanguageId.Equals(input.LanguageId))
+                ) && 
+                (
+                    this.CurrentLanguageName == input.CurrentLanguageName ||
+                    (this.CurrentLanguageName != null &&
+                    this.CurrentLanguageName.Equals(input.CurrentLanguageName))
+                ) && 
+                (
+                    this.Languages == input.Languages ||
+                    this.Languages != null &&
+                    this.Languages.SequenceEqual(input.Languages)
+                ) && 
+                (
+                    this.SalesForceContactId == input.SalesForceContactId ||
+                    (this.SalesForceContactId != null &&
+                    this.SalesForceContactId.Equals(input.SalesForceContactId))
+                ) && 
+                (
+                    this.StripeCustomerId == input.StripeCustomerId ||
+                    (this.StripeCustomerId != null &&
+                    this.StripeCustomerId.Equals(input.StripeCustomerId))
+                ) && 
+                (
+                    this.UserMonthlyCommissions == input.UserMonthlyCommissions ||
+                    this.UserMonthlyCommissions != null &&
+                    this.UserMonthlyCommissions.SequenceEqual(input.UserMonthlyCommissions)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PhoneNumber != null)
+                    hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
+                if (this.Email != null)
+                    hashCode = hashCode * 59 + this.Email.GetHashCode();
+                if (this.EmailConfirmed != null)
+                    hashCode = hashCode * 59 + this.EmailConfirmed.GetHashCode();
+                if (this.PreventFromUsingCards != null)
+                    hashCode = hashCode * 59 + this.PreventFromUsingCards.GetHashCode();
+                if (this.IsUserPhoneNumberBlocked != null)
+                    hashCode = hashCode * 59 + this.IsUserPhoneNumberBlocked.GetHashCode();
+                if (this.UserWhiteLabels != null)
+                    hashCode = hashCode * 59 + this.UserWhiteLabels.GetHashCode();
+                if (this.UserId != null)
+                    hashCode = hashCode * 59 + this.UserId.GetHashCode();
+                if (this.UserName != null)
+                    hashCode = hashCode * 59 + this.UserName.GetHashCode();
+                if (this.CustomerName != null)
+                    hashCode = hashCode * 59 + this.CustomerName.GetHashCode();
+                if (this.HasLoggedIn != null)
+                    hashCode = hashCode * 59 + this.HasLoggedIn.GetHashCode();
+                if (this.DisableAppRatingControl != null)
+                    hashCode = hashCode * 59 + this.DisableAppRatingControl.GetHashCode();
+                if (this.GloballyOptedOut != null)
+                    hashCode = hashCode * 59 + this.GloballyOptedOut.GetHashCode();
+                if (this.CompletedOrderCount != null)
+                    hashCode = hashCode * 59 + this.CompletedOrderCount.GetHashCode();
+                if (this.CancelledOrderCount != null)
+                    hashCode = hashCode * 59 + this.CancelledOrderCount.GetHashCode();
+                if (this.OrderTotalValue != null)
+                    hashCode = hashCode * 59 + this.OrderTotalValue.GetHashCode();
+                if (this.TsMostRecentOrder != null)
+                    hashCode = hashCode * 59 + this.TsMostRecentOrder.GetHashCode();
+                if (this.TsFirstOrder != null)
+                    hashCode = hashCode * 59 + this.TsFirstOrder.GetHashCode();
+                if (this.IsRestaurantUser != null)
+                    hashCode = hashCode * 59 + this.IsRestaurantUser.GetHashCode();
+                if (this.Installs != null)
+                    hashCode = hashCode * 59 + this.Installs.GetHashCode();
+                if (this.DeliveryLocations != null)
+                    hashCode = hashCode * 59 + this.DeliveryLocations.GetHashCode();
+                if (this.PaymentAccounts != null)
+                    hashCode = hashCode * 59 + this.PaymentAccounts.GetHashCode();
+                if (this.LanguageId != null)
+                    hashCode = hashCode * 59 + this.LanguageId.GetHashCode();
+                if (this.CurrentLanguageName != null)
+                    hashCode = hashCode * 59 + this.CurrentLanguageName.GetHashCode();
+                if (this.Languages != null)
+                    hashCode = hashCode * 59 + this.Languages.GetHashCode();
+                if (this.SalesForceContactId != null)
+                    hashCode = hashCode * 59 + this.SalesForceContactId.GetHashCode();
+                if (this.StripeCustomerId != null)
+                    hashCode = hashCode * 59 + this.StripeCustomerId.GetHashCode();
+                if (this.UserMonthlyCommissions != null)
+                    hashCode = hashCode * 59 + this.UserMonthlyCommissions.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserLoginEvent.cs b/src/Flipdish/Model/UserLoginEvent.cs
index 8424cd24..52f0b564 100644
--- a/src/Flipdish/Model/UserLoginEvent.cs
+++ b/src/Flipdish/Model/UserLoginEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// User login event
     /// </summary>
     [DataContract]
-    public partial class UserLoginEvent :  IEquatable<UserLoginEvent>, IValidatableObject
+    public partial class UserLoginEvent :  IEquatable<UserLoginEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UserLoginEvent" /> class.
@@ -40,8 +38,11 @@ public partial class UserLoginEvent :  IEquatable<UserLoginEvent>, IValidatableO
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public UserLoginEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public UserLoginEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class UserLoginEvent :  IEquatable<UserLoginEvent>, IValidatableO
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class UserLoginEvent :  IEquatable<UserLoginEvent>, IValidatableO
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class UserLoginEvent :  IEquatable<UserLoginEvent>, IValidatableO
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(UserLoginEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UserMonthlyCommission.cs b/src/Flipdish/Model/UserMonthlyCommission.cs
new file mode 100644
index 00000000..6d7c0228
--- /dev/null
+++ b/src/Flipdish/Model/UserMonthlyCommission.cs
@@ -0,0 +1,868 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// User Monthly Commission
+    /// </summary>
+    [DataContract]
+    public partial class UserMonthlyCommission :  IEquatable<UserMonthlyCommission>
+    {
+        /// <summary>
+        /// The currency in which the commission is paid.
+        /// </summary>
+        /// <value>The currency in which the commission is paid.</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum CurrencyEnum
+        {
+            
+            /// <summary>
+            /// Enum EUR for value: EUR
+            /// </summary>
+            [EnumMember(Value = "EUR")]
+            EUR = 1,
+            
+            /// <summary>
+            /// Enum USD for value: USD
+            /// </summary>
+            [EnumMember(Value = "USD")]
+            USD = 2,
+            
+            /// <summary>
+            /// Enum GBP for value: GBP
+            /// </summary>
+            [EnumMember(Value = "GBP")]
+            GBP = 3,
+            
+            /// <summary>
+            /// Enum CAD for value: CAD
+            /// </summary>
+            [EnumMember(Value = "CAD")]
+            CAD = 4,
+            
+            /// <summary>
+            /// Enum AUD for value: AUD
+            /// </summary>
+            [EnumMember(Value = "AUD")]
+            AUD = 5,
+            
+            /// <summary>
+            /// Enum DJF for value: DJF
+            /// </summary>
+            [EnumMember(Value = "DJF")]
+            DJF = 6,
+            
+            /// <summary>
+            /// Enum ZAR for value: ZAR
+            /// </summary>
+            [EnumMember(Value = "ZAR")]
+            ZAR = 7,
+            
+            /// <summary>
+            /// Enum ETB for value: ETB
+            /// </summary>
+            [EnumMember(Value = "ETB")]
+            ETB = 8,
+            
+            /// <summary>
+            /// Enum AED for value: AED
+            /// </summary>
+            [EnumMember(Value = "AED")]
+            AED = 9,
+            
+            /// <summary>
+            /// Enum BHD for value: BHD
+            /// </summary>
+            [EnumMember(Value = "BHD")]
+            BHD = 10,
+            
+            /// <summary>
+            /// Enum DZD for value: DZD
+            /// </summary>
+            [EnumMember(Value = "DZD")]
+            DZD = 11,
+            
+            /// <summary>
+            /// Enum EGP for value: EGP
+            /// </summary>
+            [EnumMember(Value = "EGP")]
+            EGP = 12,
+            
+            /// <summary>
+            /// Enum IQD for value: IQD
+            /// </summary>
+            [EnumMember(Value = "IQD")]
+            IQD = 13,
+            
+            /// <summary>
+            /// Enum JOD for value: JOD
+            /// </summary>
+            [EnumMember(Value = "JOD")]
+            JOD = 14,
+            
+            /// <summary>
+            /// Enum KWD for value: KWD
+            /// </summary>
+            [EnumMember(Value = "KWD")]
+            KWD = 15,
+            
+            /// <summary>
+            /// Enum LBP for value: LBP
+            /// </summary>
+            [EnumMember(Value = "LBP")]
+            LBP = 16,
+            
+            /// <summary>
+            /// Enum LYD for value: LYD
+            /// </summary>
+            [EnumMember(Value = "LYD")]
+            LYD = 17,
+            
+            /// <summary>
+            /// Enum MAD for value: MAD
+            /// </summary>
+            [EnumMember(Value = "MAD")]
+            MAD = 18,
+            
+            /// <summary>
+            /// Enum OMR for value: OMR
+            /// </summary>
+            [EnumMember(Value = "OMR")]
+            OMR = 19,
+            
+            /// <summary>
+            /// Enum QAR for value: QAR
+            /// </summary>
+            [EnumMember(Value = "QAR")]
+            QAR = 20,
+            
+            /// <summary>
+            /// Enum SAR for value: SAR
+            /// </summary>
+            [EnumMember(Value = "SAR")]
+            SAR = 21,
+            
+            /// <summary>
+            /// Enum SYP for value: SYP
+            /// </summary>
+            [EnumMember(Value = "SYP")]
+            SYP = 22,
+            
+            /// <summary>
+            /// Enum TND for value: TND
+            /// </summary>
+            [EnumMember(Value = "TND")]
+            TND = 23,
+            
+            /// <summary>
+            /// Enum YER for value: YER
+            /// </summary>
+            [EnumMember(Value = "YER")]
+            YER = 24,
+            
+            /// <summary>
+            /// Enum CLP for value: CLP
+            /// </summary>
+            [EnumMember(Value = "CLP")]
+            CLP = 25,
+            
+            /// <summary>
+            /// Enum INR for value: INR
+            /// </summary>
+            [EnumMember(Value = "INR")]
+            INR = 26,
+            
+            /// <summary>
+            /// Enum AZN for value: AZN
+            /// </summary>
+            [EnumMember(Value = "AZN")]
+            AZN = 27,
+            
+            /// <summary>
+            /// Enum RUB for value: RUB
+            /// </summary>
+            [EnumMember(Value = "RUB")]
+            RUB = 28,
+            
+            /// <summary>
+            /// Enum BYN for value: BYN
+            /// </summary>
+            [EnumMember(Value = "BYN")]
+            BYN = 29,
+            
+            /// <summary>
+            /// Enum BGN for value: BGN
+            /// </summary>
+            [EnumMember(Value = "BGN")]
+            BGN = 30,
+            
+            /// <summary>
+            /// Enum NGN for value: NGN
+            /// </summary>
+            [EnumMember(Value = "NGN")]
+            NGN = 31,
+            
+            /// <summary>
+            /// Enum BDT for value: BDT
+            /// </summary>
+            [EnumMember(Value = "BDT")]
+            BDT = 32,
+            
+            /// <summary>
+            /// Enum CNY for value: CNY
+            /// </summary>
+            [EnumMember(Value = "CNY")]
+            CNY = 33,
+            
+            /// <summary>
+            /// Enum BAM for value: BAM
+            /// </summary>
+            [EnumMember(Value = "BAM")]
+            BAM = 34,
+            
+            /// <summary>
+            /// Enum CZK for value: CZK
+            /// </summary>
+            [EnumMember(Value = "CZK")]
+            CZK = 35,
+            
+            /// <summary>
+            /// Enum DKK for value: DKK
+            /// </summary>
+            [EnumMember(Value = "DKK")]
+            DKK = 36,
+            
+            /// <summary>
+            /// Enum CHF for value: CHF
+            /// </summary>
+            [EnumMember(Value = "CHF")]
+            CHF = 37,
+            
+            /// <summary>
+            /// Enum MVR for value: MVR
+            /// </summary>
+            [EnumMember(Value = "MVR")]
+            MVR = 38,
+            
+            /// <summary>
+            /// Enum BTN for value: BTN
+            /// </summary>
+            [EnumMember(Value = "BTN")]
+            BTN = 39,
+            
+            /// <summary>
+            /// Enum XCD for value: XCD
+            /// </summary>
+            [EnumMember(Value = "XCD")]
+            XCD = 40,
+            
+            /// <summary>
+            /// Enum BZD for value: BZD
+            /// </summary>
+            [EnumMember(Value = "BZD")]
+            BZD = 41,
+            
+            /// <summary>
+            /// Enum HKD for value: HKD
+            /// </summary>
+            [EnumMember(Value = "HKD")]
+            HKD = 42,
+            
+            /// <summary>
+            /// Enum IDR for value: IDR
+            /// </summary>
+            [EnumMember(Value = "IDR")]
+            IDR = 43,
+            
+            /// <summary>
+            /// Enum JMD for value: JMD
+            /// </summary>
+            [EnumMember(Value = "JMD")]
+            JMD = 44,
+            
+            /// <summary>
+            /// Enum MYR for value: MYR
+            /// </summary>
+            [EnumMember(Value = "MYR")]
+            MYR = 45,
+            
+            /// <summary>
+            /// Enum NZD for value: NZD
+            /// </summary>
+            [EnumMember(Value = "NZD")]
+            NZD = 46,
+            
+            /// <summary>
+            /// Enum PHP for value: PHP
+            /// </summary>
+            [EnumMember(Value = "PHP")]
+            PHP = 47,
+            
+            /// <summary>
+            /// Enum SGD for value: SGD
+            /// </summary>
+            [EnumMember(Value = "SGD")]
+            SGD = 48,
+            
+            /// <summary>
+            /// Enum TTD for value: TTD
+            /// </summary>
+            [EnumMember(Value = "TTD")]
+            TTD = 49,
+            
+            /// <summary>
+            /// Enum XDR for value: XDR
+            /// </summary>
+            [EnumMember(Value = "XDR")]
+            XDR = 50,
+            
+            /// <summary>
+            /// Enum ARS for value: ARS
+            /// </summary>
+            [EnumMember(Value = "ARS")]
+            ARS = 51,
+            
+            /// <summary>
+            /// Enum BOB for value: BOB
+            /// </summary>
+            [EnumMember(Value = "BOB")]
+            BOB = 52,
+            
+            /// <summary>
+            /// Enum COP for value: COP
+            /// </summary>
+            [EnumMember(Value = "COP")]
+            COP = 53,
+            
+            /// <summary>
+            /// Enum CRC for value: CRC
+            /// </summary>
+            [EnumMember(Value = "CRC")]
+            CRC = 54,
+            
+            /// <summary>
+            /// Enum CUP for value: CUP
+            /// </summary>
+            [EnumMember(Value = "CUP")]
+            CUP = 55,
+            
+            /// <summary>
+            /// Enum DOP for value: DOP
+            /// </summary>
+            [EnumMember(Value = "DOP")]
+            DOP = 56,
+            
+            /// <summary>
+            /// Enum GTQ for value: GTQ
+            /// </summary>
+            [EnumMember(Value = "GTQ")]
+            GTQ = 57,
+            
+            /// <summary>
+            /// Enum HNL for value: HNL
+            /// </summary>
+            [EnumMember(Value = "HNL")]
+            HNL = 58,
+            
+            /// <summary>
+            /// Enum MXN for value: MXN
+            /// </summary>
+            [EnumMember(Value = "MXN")]
+            MXN = 59,
+            
+            /// <summary>
+            /// Enum NIO for value: NIO
+            /// </summary>
+            [EnumMember(Value = "NIO")]
+            NIO = 60,
+            
+            /// <summary>
+            /// Enum PAB for value: PAB
+            /// </summary>
+            [EnumMember(Value = "PAB")]
+            PAB = 61,
+            
+            /// <summary>
+            /// Enum PEN for value: PEN
+            /// </summary>
+            [EnumMember(Value = "PEN")]
+            PEN = 62,
+            
+            /// <summary>
+            /// Enum PYG for value: PYG
+            /// </summary>
+            [EnumMember(Value = "PYG")]
+            PYG = 63,
+            
+            /// <summary>
+            /// Enum UYU for value: UYU
+            /// </summary>
+            [EnumMember(Value = "UYU")]
+            UYU = 64,
+            
+            /// <summary>
+            /// Enum VEF for value: VEF
+            /// </summary>
+            [EnumMember(Value = "VEF")]
+            VEF = 65,
+            
+            /// <summary>
+            /// Enum IRR for value: IRR
+            /// </summary>
+            [EnumMember(Value = "IRR")]
+            IRR = 66,
+            
+            /// <summary>
+            /// Enum XOF for value: XOF
+            /// </summary>
+            [EnumMember(Value = "XOF")]
+            XOF = 67,
+            
+            /// <summary>
+            /// Enum CDF for value: CDF
+            /// </summary>
+            [EnumMember(Value = "CDF")]
+            CDF = 68,
+            
+            /// <summary>
+            /// Enum XAF for value: XAF
+            /// </summary>
+            [EnumMember(Value = "XAF")]
+            XAF = 69,
+            
+            /// <summary>
+            /// Enum HTG for value: HTG
+            /// </summary>
+            [EnumMember(Value = "HTG")]
+            HTG = 70,
+            
+            /// <summary>
+            /// Enum ILS for value: ILS
+            /// </summary>
+            [EnumMember(Value = "ILS")]
+            ILS = 71,
+            
+            /// <summary>
+            /// Enum HRK for value: HRK
+            /// </summary>
+            [EnumMember(Value = "HRK")]
+            HRK = 72,
+            
+            /// <summary>
+            /// Enum HUF for value: HUF
+            /// </summary>
+            [EnumMember(Value = "HUF")]
+            HUF = 73,
+            
+            /// <summary>
+            /// Enum AMD for value: AMD
+            /// </summary>
+            [EnumMember(Value = "AMD")]
+            AMD = 74,
+            
+            /// <summary>
+            /// Enum ISK for value: ISK
+            /// </summary>
+            [EnumMember(Value = "ISK")]
+            ISK = 75,
+            
+            /// <summary>
+            /// Enum JPY for value: JPY
+            /// </summary>
+            [EnumMember(Value = "JPY")]
+            JPY = 76,
+            
+            /// <summary>
+            /// Enum GEL for value: GEL
+            /// </summary>
+            [EnumMember(Value = "GEL")]
+            GEL = 77,
+            
+            /// <summary>
+            /// Enum KZT for value: KZT
+            /// </summary>
+            [EnumMember(Value = "KZT")]
+            KZT = 78,
+            
+            /// <summary>
+            /// Enum KHR for value: KHR
+            /// </summary>
+            [EnumMember(Value = "KHR")]
+            KHR = 79,
+            
+            /// <summary>
+            /// Enum KRW for value: KRW
+            /// </summary>
+            [EnumMember(Value = "KRW")]
+            KRW = 80,
+            
+            /// <summary>
+            /// Enum KGS for value: KGS
+            /// </summary>
+            [EnumMember(Value = "KGS")]
+            KGS = 81,
+            
+            /// <summary>
+            /// Enum LAK for value: LAK
+            /// </summary>
+            [EnumMember(Value = "LAK")]
+            LAK = 82,
+            
+            /// <summary>
+            /// Enum MKD for value: MKD
+            /// </summary>
+            [EnumMember(Value = "MKD")]
+            MKD = 83,
+            
+            /// <summary>
+            /// Enum MNT for value: MNT
+            /// </summary>
+            [EnumMember(Value = "MNT")]
+            MNT = 84,
+            
+            /// <summary>
+            /// Enum BND for value: BND
+            /// </summary>
+            [EnumMember(Value = "BND")]
+            BND = 85,
+            
+            /// <summary>
+            /// Enum MMK for value: MMK
+            /// </summary>
+            [EnumMember(Value = "MMK")]
+            MMK = 86,
+            
+            /// <summary>
+            /// Enum NOK for value: NOK
+            /// </summary>
+            [EnumMember(Value = "NOK")]
+            NOK = 87,
+            
+            /// <summary>
+            /// Enum NPR for value: NPR
+            /// </summary>
+            [EnumMember(Value = "NPR")]
+            NPR = 88,
+            
+            /// <summary>
+            /// Enum PKR for value: PKR
+            /// </summary>
+            [EnumMember(Value = "PKR")]
+            PKR = 89,
+            
+            /// <summary>
+            /// Enum PLN for value: PLN
+            /// </summary>
+            [EnumMember(Value = "PLN")]
+            PLN = 90,
+            
+            /// <summary>
+            /// Enum AFN for value: AFN
+            /// </summary>
+            [EnumMember(Value = "AFN")]
+            AFN = 91,
+            
+            /// <summary>
+            /// Enum BRL for value: BRL
+            /// </summary>
+            [EnumMember(Value = "BRL")]
+            BRL = 92,
+            
+            /// <summary>
+            /// Enum MDL for value: MDL
+            /// </summary>
+            [EnumMember(Value = "MDL")]
+            MDL = 93,
+            
+            /// <summary>
+            /// Enum RON for value: RON
+            /// </summary>
+            [EnumMember(Value = "RON")]
+            RON = 94,
+            
+            /// <summary>
+            /// Enum RWF for value: RWF
+            /// </summary>
+            [EnumMember(Value = "RWF")]
+            RWF = 95,
+            
+            /// <summary>
+            /// Enum SEK for value: SEK
+            /// </summary>
+            [EnumMember(Value = "SEK")]
+            SEK = 96,
+            
+            /// <summary>
+            /// Enum LKR for value: LKR
+            /// </summary>
+            [EnumMember(Value = "LKR")]
+            LKR = 97,
+            
+            /// <summary>
+            /// Enum SOS for value: SOS
+            /// </summary>
+            [EnumMember(Value = "SOS")]
+            SOS = 98,
+            
+            /// <summary>
+            /// Enum ALL for value: ALL
+            /// </summary>
+            [EnumMember(Value = "ALL")]
+            ALL = 99,
+            
+            /// <summary>
+            /// Enum RSD for value: RSD
+            /// </summary>
+            [EnumMember(Value = "RSD")]
+            RSD = 100,
+            
+            /// <summary>
+            /// Enum KES for value: KES
+            /// </summary>
+            [EnumMember(Value = "KES")]
+            KES = 101,
+            
+            /// <summary>
+            /// Enum TJS for value: TJS
+            /// </summary>
+            [EnumMember(Value = "TJS")]
+            TJS = 102,
+            
+            /// <summary>
+            /// Enum THB for value: THB
+            /// </summary>
+            [EnumMember(Value = "THB")]
+            THB = 103,
+            
+            /// <summary>
+            /// Enum ERN for value: ERN
+            /// </summary>
+            [EnumMember(Value = "ERN")]
+            ERN = 104,
+            
+            /// <summary>
+            /// Enum TMT for value: TMT
+            /// </summary>
+            [EnumMember(Value = "TMT")]
+            TMT = 105,
+            
+            /// <summary>
+            /// Enum BWP for value: BWP
+            /// </summary>
+            [EnumMember(Value = "BWP")]
+            BWP = 106,
+            
+            /// <summary>
+            /// Enum TRY for value: TRY
+            /// </summary>
+            [EnumMember(Value = "TRY")]
+            TRY = 107,
+            
+            /// <summary>
+            /// Enum UAH for value: UAH
+            /// </summary>
+            [EnumMember(Value = "UAH")]
+            UAH = 108,
+            
+            /// <summary>
+            /// Enum UZS for value: UZS
+            /// </summary>
+            [EnumMember(Value = "UZS")]
+            UZS = 109,
+            
+            /// <summary>
+            /// Enum VND for value: VND
+            /// </summary>
+            [EnumMember(Value = "VND")]
+            VND = 110,
+            
+            /// <summary>
+            /// Enum MOP for value: MOP
+            /// </summary>
+            [EnumMember(Value = "MOP")]
+            MOP = 111,
+            
+            /// <summary>
+            /// Enum TWD for value: TWD
+            /// </summary>
+            [EnumMember(Value = "TWD")]
+            TWD = 112,
+            
+            /// <summary>
+            /// Enum BMD for value: BMD
+            /// </summary>
+            [EnumMember(Value = "BMD")]
+            BMD = 113
+        }
+
+        /// <summary>
+        /// The currency in which the commission is paid.
+        /// </summary>
+        /// <value>The currency in which the commission is paid.</value>
+        [DataMember(Name="Currency", EmitDefaultValue=false)]
+        public CurrencyEnum? Currency { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserMonthlyCommission" /> class.
+        /// </summary>
+        /// <param name="userId">The unique identifier of the user..</param>
+        /// <param name="monthStart">The start date of the month for which the commission is calculated..</param>
+        /// <param name="commissionAmount">The total commission amount for the user in the specified month..</param>
+        /// <param name="currency">The currency in which the commission is paid..</param>
+        /// <param name="isoCurrency">The ISO currency code for the commission currency..</param>
+        public UserMonthlyCommission(int? userId = default(int?), DateTime? monthStart = default(DateTime?), double? commissionAmount = default(double?), CurrencyEnum? currency = default(CurrencyEnum?), string isoCurrency = default(string))
+        {
+            this.UserId = userId;
+            this.MonthStart = monthStart;
+            this.CommissionAmount = commissionAmount;
+            this.Currency = currency;
+            this.IsoCurrency = isoCurrency;
+        }
+        
+        /// <summary>
+        /// The unique identifier of the user.
+        /// </summary>
+        /// <value>The unique identifier of the user.</value>
+        [DataMember(Name="UserId", EmitDefaultValue=false)]
+        public int? UserId { get; set; }
+
+        /// <summary>
+        /// The start date of the month for which the commission is calculated.
+        /// </summary>
+        /// <value>The start date of the month for which the commission is calculated.</value>
+        [DataMember(Name="MonthStart", EmitDefaultValue=false)]
+        public DateTime? MonthStart { get; set; }
+
+        /// <summary>
+        /// The total commission amount for the user in the specified month.
+        /// </summary>
+        /// <value>The total commission amount for the user in the specified month.</value>
+        [DataMember(Name="CommissionAmount", EmitDefaultValue=false)]
+        public double? CommissionAmount { get; set; }
+
+
+        /// <summary>
+        /// The ISO currency code for the commission currency.
+        /// </summary>
+        /// <value>The ISO currency code for the commission currency.</value>
+        [DataMember(Name="IsoCurrency", EmitDefaultValue=false)]
+        public string IsoCurrency { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserMonthlyCommission {\n");
+            sb.Append("  UserId: ").Append(UserId).Append("\n");
+            sb.Append("  MonthStart: ").Append(MonthStart).Append("\n");
+            sb.Append("  CommissionAmount: ").Append(CommissionAmount).Append("\n");
+            sb.Append("  Currency: ").Append(Currency).Append("\n");
+            sb.Append("  IsoCurrency: ").Append(IsoCurrency).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserMonthlyCommission);
+        }
+
+        /// <summary>
+        /// Returns true if UserMonthlyCommission instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserMonthlyCommission to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserMonthlyCommission input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.UserId == input.UserId ||
+                    (this.UserId != null &&
+                    this.UserId.Equals(input.UserId))
+                ) && 
+                (
+                    this.MonthStart == input.MonthStart ||
+                    (this.MonthStart != null &&
+                    this.MonthStart.Equals(input.MonthStart))
+                ) && 
+                (
+                    this.CommissionAmount == input.CommissionAmount ||
+                    (this.CommissionAmount != null &&
+                    this.CommissionAmount.Equals(input.CommissionAmount))
+                ) && 
+                (
+                    this.Currency == input.Currency ||
+                    (this.Currency != null &&
+                    this.Currency.Equals(input.Currency))
+                ) && 
+                (
+                    this.IsoCurrency == input.IsoCurrency ||
+                    (this.IsoCurrency != null &&
+                    this.IsoCurrency.Equals(input.IsoCurrency))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.UserId != null)
+                    hashCode = hashCode * 59 + this.UserId.GetHashCode();
+                if (this.MonthStart != null)
+                    hashCode = hashCode * 59 + this.MonthStart.GetHashCode();
+                if (this.CommissionAmount != null)
+                    hashCode = hashCode * 59 + this.CommissionAmount.GetHashCode();
+                if (this.Currency != null)
+                    hashCode = hashCode * 59 + this.Currency.GetHashCode();
+                if (this.IsoCurrency != null)
+                    hashCode = hashCode * 59 + this.IsoCurrency.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserNote.cs b/src/Flipdish/Model/UserNote.cs
new file mode 100644
index 00000000..ad44fc0a
--- /dev/null
+++ b/src/Flipdish/Model/UserNote.cs
@@ -0,0 +1,215 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// User Note
+    /// </summary>
+    [DataContract]
+    public partial class UserNote :  IEquatable<UserNote>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserNote" /> class.
+        /// </summary>
+        /// <param name="userNoteId">Identifier for the user note..</param>
+        /// <param name="userId">User identifier associated with the note..</param>
+        /// <param name="note">Note content..</param>
+        /// <param name="tsCreate">Creation timestamp of the note..</param>
+        /// <param name="createdByUserId">Identifier of the user who created the note..</param>
+        /// <param name="createdByUserName">Name of the user who created the note..</param>
+        /// <param name="createdByUserEmail">Email of the user who created the note..</param>
+        public UserNote(int? userNoteId = default(int?), int? userId = default(int?), string note = default(string), DateTime? tsCreate = default(DateTime?), int? createdByUserId = default(int?), string createdByUserName = default(string), string createdByUserEmail = default(string))
+        {
+            this.UserNoteId = userNoteId;
+            this.UserId = userId;
+            this.Note = note;
+            this.TsCreate = tsCreate;
+            this.CreatedByUserId = createdByUserId;
+            this.CreatedByUserName = createdByUserName;
+            this.CreatedByUserEmail = createdByUserEmail;
+        }
+        
+        /// <summary>
+        /// Identifier for the user note.
+        /// </summary>
+        /// <value>Identifier for the user note.</value>
+        [DataMember(Name="UserNoteId", EmitDefaultValue=false)]
+        public int? UserNoteId { get; set; }
+
+        /// <summary>
+        /// User identifier associated with the note.
+        /// </summary>
+        /// <value>User identifier associated with the note.</value>
+        [DataMember(Name="UserId", EmitDefaultValue=false)]
+        public int? UserId { get; set; }
+
+        /// <summary>
+        /// Note content.
+        /// </summary>
+        /// <value>Note content.</value>
+        [DataMember(Name="Note", EmitDefaultValue=false)]
+        public string Note { get; set; }
+
+        /// <summary>
+        /// Creation timestamp of the note.
+        /// </summary>
+        /// <value>Creation timestamp of the note.</value>
+        [DataMember(Name="TsCreate", EmitDefaultValue=false)]
+        public DateTime? TsCreate { get; set; }
+
+        /// <summary>
+        /// Identifier of the user who created the note.
+        /// </summary>
+        /// <value>Identifier of the user who created the note.</value>
+        [DataMember(Name="CreatedByUserId", EmitDefaultValue=false)]
+        public int? CreatedByUserId { get; set; }
+
+        /// <summary>
+        /// Name of the user who created the note.
+        /// </summary>
+        /// <value>Name of the user who created the note.</value>
+        [DataMember(Name="CreatedByUserName", EmitDefaultValue=false)]
+        public string CreatedByUserName { get; set; }
+
+        /// <summary>
+        /// Email of the user who created the note.
+        /// </summary>
+        /// <value>Email of the user who created the note.</value>
+        [DataMember(Name="CreatedByUserEmail", EmitDefaultValue=false)]
+        public string CreatedByUserEmail { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserNote {\n");
+            sb.Append("  UserNoteId: ").Append(UserNoteId).Append("\n");
+            sb.Append("  UserId: ").Append(UserId).Append("\n");
+            sb.Append("  Note: ").Append(Note).Append("\n");
+            sb.Append("  TsCreate: ").Append(TsCreate).Append("\n");
+            sb.Append("  CreatedByUserId: ").Append(CreatedByUserId).Append("\n");
+            sb.Append("  CreatedByUserName: ").Append(CreatedByUserName).Append("\n");
+            sb.Append("  CreatedByUserEmail: ").Append(CreatedByUserEmail).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserNote);
+        }
+
+        /// <summary>
+        /// Returns true if UserNote instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserNote to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserNote input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.UserNoteId == input.UserNoteId ||
+                    (this.UserNoteId != null &&
+                    this.UserNoteId.Equals(input.UserNoteId))
+                ) && 
+                (
+                    this.UserId == input.UserId ||
+                    (this.UserId != null &&
+                    this.UserId.Equals(input.UserId))
+                ) && 
+                (
+                    this.Note == input.Note ||
+                    (this.Note != null &&
+                    this.Note.Equals(input.Note))
+                ) && 
+                (
+                    this.TsCreate == input.TsCreate ||
+                    (this.TsCreate != null &&
+                    this.TsCreate.Equals(input.TsCreate))
+                ) && 
+                (
+                    this.CreatedByUserId == input.CreatedByUserId ||
+                    (this.CreatedByUserId != null &&
+                    this.CreatedByUserId.Equals(input.CreatedByUserId))
+                ) && 
+                (
+                    this.CreatedByUserName == input.CreatedByUserName ||
+                    (this.CreatedByUserName != null &&
+                    this.CreatedByUserName.Equals(input.CreatedByUserName))
+                ) && 
+                (
+                    this.CreatedByUserEmail == input.CreatedByUserEmail ||
+                    (this.CreatedByUserEmail != null &&
+                    this.CreatedByUserEmail.Equals(input.CreatedByUserEmail))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.UserNoteId != null)
+                    hashCode = hashCode * 59 + this.UserNoteId.GetHashCode();
+                if (this.UserId != null)
+                    hashCode = hashCode * 59 + this.UserId.GetHashCode();
+                if (this.Note != null)
+                    hashCode = hashCode * 59 + this.Note.GetHashCode();
+                if (this.TsCreate != null)
+                    hashCode = hashCode * 59 + this.TsCreate.GetHashCode();
+                if (this.CreatedByUserId != null)
+                    hashCode = hashCode * 59 + this.CreatedByUserId.GetHashCode();
+                if (this.CreatedByUserName != null)
+                    hashCode = hashCode * 59 + this.CreatedByUserName.GetHashCode();
+                if (this.CreatedByUserEmail != null)
+                    hashCode = hashCode * 59 + this.CreatedByUserEmail.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserOrderSummary.cs b/src/Flipdish/Model/UserOrderSummary.cs
new file mode 100644
index 00000000..e9b97a6e
--- /dev/null
+++ b/src/Flipdish/Model/UserOrderSummary.cs
@@ -0,0 +1,283 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// A previous order row for admin user management (structured; no HTML).
+    /// </summary>
+    [DataContract]
+    public partial class UserOrderSummary :  IEquatable<UserOrderSummary>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserOrderSummary" /> class.
+        /// </summary>
+        /// <param name="orderId">OrderId..</param>
+        /// <param name="tsOrderPlacedUtc">TsOrderPlacedUtc..</param>
+        /// <param name="tsUpdateUtc">TsUpdateUtc..</param>
+        /// <param name="restaurantName">RestaurantName..</param>
+        /// <param name="foodAmount">FoodAmount..</param>
+        /// <param name="tipAmount">TipAmount..</param>
+        /// <param name="totalRestaurantAmount">TotalRestaurantAmount..</param>
+        /// <param name="isoCurrency">IsoCurrency..</param>
+        /// <param name="deliveryType">DeliveryType..</param>
+        /// <param name="orderState">OrderState..</param>
+        /// <param name="paymentAccountDescription">PaymentAccountDescription..</param>
+        public UserOrderSummary(int? orderId = default(int?), DateTime? tsOrderPlacedUtc = default(DateTime?), DateTime? tsUpdateUtc = default(DateTime?), string restaurantName = default(string), double? foodAmount = default(double?), double? tipAmount = default(double?), double? totalRestaurantAmount = default(double?), string isoCurrency = default(string), string deliveryType = default(string), string orderState = default(string), string paymentAccountDescription = default(string))
+        {
+            this.OrderId = orderId;
+            this.TsOrderPlacedUtc = tsOrderPlacedUtc;
+            this.TsUpdateUtc = tsUpdateUtc;
+            this.RestaurantName = restaurantName;
+            this.FoodAmount = foodAmount;
+            this.TipAmount = tipAmount;
+            this.TotalRestaurantAmount = totalRestaurantAmount;
+            this.IsoCurrency = isoCurrency;
+            this.DeliveryType = deliveryType;
+            this.OrderState = orderState;
+            this.PaymentAccountDescription = paymentAccountDescription;
+        }
+        
+        /// <summary>
+        /// OrderId.
+        /// </summary>
+        /// <value>OrderId.</value>
+        [DataMember(Name="OrderId", EmitDefaultValue=false)]
+        public int? OrderId { get; set; }
+
+        /// <summary>
+        /// TsOrderPlacedUtc.
+        /// </summary>
+        /// <value>TsOrderPlacedUtc.</value>
+        [DataMember(Name="TsOrderPlacedUtc", EmitDefaultValue=false)]
+        public DateTime? TsOrderPlacedUtc { get; set; }
+
+        /// <summary>
+        /// TsUpdateUtc.
+        /// </summary>
+        /// <value>TsUpdateUtc.</value>
+        [DataMember(Name="TsUpdateUtc", EmitDefaultValue=false)]
+        public DateTime? TsUpdateUtc { get; set; }
+
+        /// <summary>
+        /// RestaurantName.
+        /// </summary>
+        /// <value>RestaurantName.</value>
+        [DataMember(Name="RestaurantName", EmitDefaultValue=false)]
+        public string RestaurantName { get; set; }
+
+        /// <summary>
+        /// FoodAmount.
+        /// </summary>
+        /// <value>FoodAmount.</value>
+        [DataMember(Name="FoodAmount", EmitDefaultValue=false)]
+        public double? FoodAmount { get; set; }
+
+        /// <summary>
+        /// TipAmount.
+        /// </summary>
+        /// <value>TipAmount.</value>
+        [DataMember(Name="TipAmount", EmitDefaultValue=false)]
+        public double? TipAmount { get; set; }
+
+        /// <summary>
+        /// TotalRestaurantAmount.
+        /// </summary>
+        /// <value>TotalRestaurantAmount.</value>
+        [DataMember(Name="TotalRestaurantAmount", EmitDefaultValue=false)]
+        public double? TotalRestaurantAmount { get; set; }
+
+        /// <summary>
+        /// IsoCurrency.
+        /// </summary>
+        /// <value>IsoCurrency.</value>
+        [DataMember(Name="IsoCurrency", EmitDefaultValue=false)]
+        public string IsoCurrency { get; set; }
+
+        /// <summary>
+        /// DeliveryType.
+        /// </summary>
+        /// <value>DeliveryType.</value>
+        [DataMember(Name="DeliveryType", EmitDefaultValue=false)]
+        public string DeliveryType { get; set; }
+
+        /// <summary>
+        /// OrderState.
+        /// </summary>
+        /// <value>OrderState.</value>
+        [DataMember(Name="OrderState", EmitDefaultValue=false)]
+        public string OrderState { get; set; }
+
+        /// <summary>
+        /// PaymentAccountDescription.
+        /// </summary>
+        /// <value>PaymentAccountDescription.</value>
+        [DataMember(Name="PaymentAccountDescription", EmitDefaultValue=false)]
+        public string PaymentAccountDescription { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserOrderSummary {\n");
+            sb.Append("  OrderId: ").Append(OrderId).Append("\n");
+            sb.Append("  TsOrderPlacedUtc: ").Append(TsOrderPlacedUtc).Append("\n");
+            sb.Append("  TsUpdateUtc: ").Append(TsUpdateUtc).Append("\n");
+            sb.Append("  RestaurantName: ").Append(RestaurantName).Append("\n");
+            sb.Append("  FoodAmount: ").Append(FoodAmount).Append("\n");
+            sb.Append("  TipAmount: ").Append(TipAmount).Append("\n");
+            sb.Append("  TotalRestaurantAmount: ").Append(TotalRestaurantAmount).Append("\n");
+            sb.Append("  IsoCurrency: ").Append(IsoCurrency).Append("\n");
+            sb.Append("  DeliveryType: ").Append(DeliveryType).Append("\n");
+            sb.Append("  OrderState: ").Append(OrderState).Append("\n");
+            sb.Append("  PaymentAccountDescription: ").Append(PaymentAccountDescription).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserOrderSummary);
+        }
+
+        /// <summary>
+        /// Returns true if UserOrderSummary instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserOrderSummary to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserOrderSummary input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.OrderId == input.OrderId ||
+                    (this.OrderId != null &&
+                    this.OrderId.Equals(input.OrderId))
+                ) && 
+                (
+                    this.TsOrderPlacedUtc == input.TsOrderPlacedUtc ||
+                    (this.TsOrderPlacedUtc != null &&
+                    this.TsOrderPlacedUtc.Equals(input.TsOrderPlacedUtc))
+                ) && 
+                (
+                    this.TsUpdateUtc == input.TsUpdateUtc ||
+                    (this.TsUpdateUtc != null &&
+                    this.TsUpdateUtc.Equals(input.TsUpdateUtc))
+                ) && 
+                (
+                    this.RestaurantName == input.RestaurantName ||
+                    (this.RestaurantName != null &&
+                    this.RestaurantName.Equals(input.RestaurantName))
+                ) && 
+                (
+                    this.FoodAmount == input.FoodAmount ||
+                    (this.FoodAmount != null &&
+                    this.FoodAmount.Equals(input.FoodAmount))
+                ) && 
+                (
+                    this.TipAmount == input.TipAmount ||
+                    (this.TipAmount != null &&
+                    this.TipAmount.Equals(input.TipAmount))
+                ) && 
+                (
+                    this.TotalRestaurantAmount == input.TotalRestaurantAmount ||
+                    (this.TotalRestaurantAmount != null &&
+                    this.TotalRestaurantAmount.Equals(input.TotalRestaurantAmount))
+                ) && 
+                (
+                    this.IsoCurrency == input.IsoCurrency ||
+                    (this.IsoCurrency != null &&
+                    this.IsoCurrency.Equals(input.IsoCurrency))
+                ) && 
+                (
+                    this.DeliveryType == input.DeliveryType ||
+                    (this.DeliveryType != null &&
+                    this.DeliveryType.Equals(input.DeliveryType))
+                ) && 
+                (
+                    this.OrderState == input.OrderState ||
+                    (this.OrderState != null &&
+                    this.OrderState.Equals(input.OrderState))
+                ) && 
+                (
+                    this.PaymentAccountDescription == input.PaymentAccountDescription ||
+                    (this.PaymentAccountDescription != null &&
+                    this.PaymentAccountDescription.Equals(input.PaymentAccountDescription))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.OrderId != null)
+                    hashCode = hashCode * 59 + this.OrderId.GetHashCode();
+                if (this.TsOrderPlacedUtc != null)
+                    hashCode = hashCode * 59 + this.TsOrderPlacedUtc.GetHashCode();
+                if (this.TsUpdateUtc != null)
+                    hashCode = hashCode * 59 + this.TsUpdateUtc.GetHashCode();
+                if (this.RestaurantName != null)
+                    hashCode = hashCode * 59 + this.RestaurantName.GetHashCode();
+                if (this.FoodAmount != null)
+                    hashCode = hashCode * 59 + this.FoodAmount.GetHashCode();
+                if (this.TipAmount != null)
+                    hashCode = hashCode * 59 + this.TipAmount.GetHashCode();
+                if (this.TotalRestaurantAmount != null)
+                    hashCode = hashCode * 59 + this.TotalRestaurantAmount.GetHashCode();
+                if (this.IsoCurrency != null)
+                    hashCode = hashCode * 59 + this.IsoCurrency.GetHashCode();
+                if (this.DeliveryType != null)
+                    hashCode = hashCode * 59 + this.DeliveryType.GetHashCode();
+                if (this.OrderState != null)
+                    hashCode = hashCode * 59 + this.OrderState.GetHashCode();
+                if (this.PaymentAccountDescription != null)
+                    hashCode = hashCode * 59 + this.PaymentAccountDescription.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserPasswordCreatedEvent.cs b/src/Flipdish/Model/UserPasswordCreatedEvent.cs
index a4507ba3..d1be959b 100644
--- a/src/Flipdish/Model/UserPasswordCreatedEvent.cs
+++ b/src/Flipdish/Model/UserPasswordCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// User created password event
     /// </summary>
     [DataContract]
-    public partial class UserPasswordCreatedEvent :  IEquatable<UserPasswordCreatedEvent>, IValidatableObject
+    public partial class UserPasswordCreatedEvent :  IEquatable<UserPasswordCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UserPasswordCreatedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class UserPasswordCreatedEvent :  IEquatable<UserPasswordCreatedE
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public UserPasswordCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public UserPasswordCreatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class UserPasswordCreatedEvent :  IEquatable<UserPasswordCreatedE
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class UserPasswordCreatedEvent :  IEquatable<UserPasswordCreatedE
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class UserPasswordCreatedEvent :  IEquatable<UserPasswordCreatedE
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(UserPasswordCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UserPushNotificationSentResult.cs b/src/Flipdish/Model/UserPushNotificationSentResult.cs
new file mode 100644
index 00000000..2e0cf3ef
--- /dev/null
+++ b/src/Flipdish/Model/UserPushNotificationSentResult.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Result of sending push notification.
+    /// </summary>
+    [DataContract]
+    public partial class UserPushNotificationSentResult :  IEquatable<UserPushNotificationSentResult>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserPushNotificationSentResult" /> class.
+        /// </summary>
+        /// <param name="tokenCount">TokenCount..</param>
+        public UserPushNotificationSentResult(int? tokenCount = default(int?))
+        {
+            this.TokenCount = tokenCount;
+        }
+        
+        /// <summary>
+        /// TokenCount.
+        /// </summary>
+        /// <value>TokenCount.</value>
+        [DataMember(Name="TokenCount", EmitDefaultValue=false)]
+        public int? TokenCount { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserPushNotificationSentResult {\n");
+            sb.Append("  TokenCount: ").Append(TokenCount).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserPushNotificationSentResult);
+        }
+
+        /// <summary>
+        /// Returns true if UserPushNotificationSentResult instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserPushNotificationSentResult to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserPushNotificationSentResult input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.TokenCount == input.TokenCount ||
+                    (this.TokenCount != null &&
+                    this.TokenCount.Equals(input.TokenCount))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.TokenCount != null)
+                    hashCode = hashCode * 59 + this.TokenCount.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserRole.cs b/src/Flipdish/Model/UserRole.cs
new file mode 100644
index 00000000..eef9b1f4
--- /dev/null
+++ b/src/Flipdish/Model/UserRole.cs
@@ -0,0 +1,130 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// User Role
+    /// </summary>
+    [DataContract]
+    public partial class UserRole :  IEquatable<UserRole>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserRole" /> class.
+        /// </summary>
+        /// <param name="rolesUserIn">Roles the user is in.</param>
+        /// <param name="rolesUserNotIn">Roles the user is not in.</param>
+        public UserRole(List<string> rolesUserIn = default(List<string>), List<string> rolesUserNotIn = default(List<string>))
+        {
+            this.RolesUserIn = rolesUserIn;
+            this.RolesUserNotIn = rolesUserNotIn;
+        }
+        
+        /// <summary>
+        /// Roles the user is in
+        /// </summary>
+        /// <value>Roles the user is in</value>
+        [DataMember(Name="RolesUserIn", EmitDefaultValue=false)]
+        public List<string> RolesUserIn { get; set; }
+
+        /// <summary>
+        /// Roles the user is not in
+        /// </summary>
+        /// <value>Roles the user is not in</value>
+        [DataMember(Name="RolesUserNotIn", EmitDefaultValue=false)]
+        public List<string> RolesUserNotIn { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserRole {\n");
+            sb.Append("  RolesUserIn: ").Append(RolesUserIn).Append("\n");
+            sb.Append("  RolesUserNotIn: ").Append(RolesUserNotIn).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserRole);
+        }
+
+        /// <summary>
+        /// Returns true if UserRole instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserRole to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserRole input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.RolesUserIn == input.RolesUserIn ||
+                    this.RolesUserIn != null &&
+                    this.RolesUserIn.SequenceEqual(input.RolesUserIn)
+                ) && 
+                (
+                    this.RolesUserNotIn == input.RolesUserNotIn ||
+                    this.RolesUserNotIn != null &&
+                    this.RolesUserNotIn.SequenceEqual(input.RolesUserNotIn)
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.RolesUserIn != null)
+                    hashCode = hashCode * 59 + this.RolesUserIn.GetHashCode();
+                if (this.RolesUserNotIn != null)
+                    hashCode = hashCode * 59 + this.RolesUserNotIn.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserSearch.cs b/src/Flipdish/Model/UserSearch.cs
new file mode 100644
index 00000000..5a488573
--- /dev/null
+++ b/src/Flipdish/Model/UserSearch.cs
@@ -0,0 +1,280 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// User Search Result
+    /// </summary>
+    [DataContract]
+    public partial class UserSearch :  IEquatable<UserSearch>
+    {
+        /// <summary>
+        /// User Discriminator
+        /// </summary>
+        /// <value>User Discriminator</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum UserDiscriminatorEnum
+        {
+            
+            /// <summary>
+            /// Enum All for value: All
+            /// </summary>
+            [EnumMember(Value = "All")]
+            All = 1,
+            
+            /// <summary>
+            /// Enum ApplicationUsers for value: ApplicationUsers
+            /// </summary>
+            [EnumMember(Value = "ApplicationUsers")]
+            ApplicationUsers = 2,
+            
+            /// <summary>
+            /// Enum RestaurantUsers for value: RestaurantUsers
+            /// </summary>
+            [EnumMember(Value = "RestaurantUsers")]
+            RestaurantUsers = 3,
+            
+            /// <summary>
+            /// Enum HydraUsers for value: HydraUsers
+            /// </summary>
+            [EnumMember(Value = "HydraUsers")]
+            HydraUsers = 4
+        }
+
+        /// <summary>
+        /// User Discriminator
+        /// </summary>
+        /// <value>User Discriminator</value>
+        [DataMember(Name="UserDiscriminator", EmitDefaultValue=false)]
+        public UserDiscriminatorEnum? UserDiscriminator { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserSearch" /> class.
+        /// </summary>
+        /// <param name="id">User Id.</param>
+        /// <param name="phoneNumber">Phone Number.</param>
+        /// <param name="email">Email.</param>
+        /// <param name="customerName">Customer Name.</param>
+        /// <param name="hasLoggedIn">Has Logged In.</param>
+        /// <param name="userDiscriminator">User Discriminator.</param>
+        /// <param name="tsCreate">Timestamp Created.</param>
+        /// <param name="whiteLabelConfigs">WhiteLabel Configs.</param>
+        public UserSearch(int? id = default(int?), string phoneNumber = default(string), string email = default(string), string customerName = default(string), bool? hasLoggedIn = default(bool?), UserDiscriminatorEnum? userDiscriminator = default(UserDiscriminatorEnum?), DateTime? tsCreate = default(DateTime?), List<UserWhiteLabelConfig> whiteLabelConfigs = default(List<UserWhiteLabelConfig>))
+        {
+            this.Id = id;
+            this.PhoneNumber = phoneNumber;
+            this.Email = email;
+            this.CustomerName = customerName;
+            this.HasLoggedIn = hasLoggedIn;
+            this.UserDiscriminator = userDiscriminator;
+            this.TsCreate = tsCreate;
+            this.WhiteLabelConfigs = whiteLabelConfigs;
+        }
+        
+        /// <summary>
+        /// User Id
+        /// </summary>
+        /// <value>User Id</value>
+        [DataMember(Name="Id", EmitDefaultValue=false)]
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// Phone Number
+        /// </summary>
+        /// <value>Phone Number</value>
+        [DataMember(Name="PhoneNumber", EmitDefaultValue=false)]
+        public string PhoneNumber { get; set; }
+
+        /// <summary>
+        /// Email
+        /// </summary>
+        /// <value>Email</value>
+        [DataMember(Name="Email", EmitDefaultValue=false)]
+        public string Email { get; set; }
+
+        /// <summary>
+        /// Customer Name
+        /// </summary>
+        /// <value>Customer Name</value>
+        [DataMember(Name="CustomerName", EmitDefaultValue=false)]
+        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// Has Logged In
+        /// </summary>
+        /// <value>Has Logged In</value>
+        [DataMember(Name="HasLoggedIn", EmitDefaultValue=false)]
+        public bool? HasLoggedIn { get; set; }
+
+
+        /// <summary>
+        /// Timestamp Created
+        /// </summary>
+        /// <value>Timestamp Created</value>
+        [DataMember(Name="TsCreate", EmitDefaultValue=false)]
+        public DateTime? TsCreate { get; set; }
+
+        /// <summary>
+        /// WhiteLabel Configs
+        /// </summary>
+        /// <value>WhiteLabel Configs</value>
+        [DataMember(Name="WhiteLabelConfigs", EmitDefaultValue=false)]
+        public List<UserWhiteLabelConfig> WhiteLabelConfigs { get; set; }
+
+        /// <summary>
+        /// User Type
+        /// </summary>
+        /// <value>User Type</value>
+        [DataMember(Name="UserType", EmitDefaultValue=false)]
+        public string UserType { get; private set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserSearch {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  PhoneNumber: ").Append(PhoneNumber).Append("\n");
+            sb.Append("  Email: ").Append(Email).Append("\n");
+            sb.Append("  CustomerName: ").Append(CustomerName).Append("\n");
+            sb.Append("  HasLoggedIn: ").Append(HasLoggedIn).Append("\n");
+            sb.Append("  UserDiscriminator: ").Append(UserDiscriminator).Append("\n");
+            sb.Append("  TsCreate: ").Append(TsCreate).Append("\n");
+            sb.Append("  WhiteLabelConfigs: ").Append(WhiteLabelConfigs).Append("\n");
+            sb.Append("  UserType: ").Append(UserType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserSearch);
+        }
+
+        /// <summary>
+        /// Returns true if UserSearch instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserSearch to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserSearch input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.PhoneNumber == input.PhoneNumber ||
+                    (this.PhoneNumber != null &&
+                    this.PhoneNumber.Equals(input.PhoneNumber))
+                ) && 
+                (
+                    this.Email == input.Email ||
+                    (this.Email != null &&
+                    this.Email.Equals(input.Email))
+                ) && 
+                (
+                    this.CustomerName == input.CustomerName ||
+                    (this.CustomerName != null &&
+                    this.CustomerName.Equals(input.CustomerName))
+                ) && 
+                (
+                    this.HasLoggedIn == input.HasLoggedIn ||
+                    (this.HasLoggedIn != null &&
+                    this.HasLoggedIn.Equals(input.HasLoggedIn))
+                ) && 
+                (
+                    this.UserDiscriminator == input.UserDiscriminator ||
+                    (this.UserDiscriminator != null &&
+                    this.UserDiscriminator.Equals(input.UserDiscriminator))
+                ) && 
+                (
+                    this.TsCreate == input.TsCreate ||
+                    (this.TsCreate != null &&
+                    this.TsCreate.Equals(input.TsCreate))
+                ) && 
+                (
+                    this.WhiteLabelConfigs == input.WhiteLabelConfigs ||
+                    this.WhiteLabelConfigs != null &&
+                    this.WhiteLabelConfigs.SequenceEqual(input.WhiteLabelConfigs)
+                ) && 
+                (
+                    this.UserType == input.UserType ||
+                    (this.UserType != null &&
+                    this.UserType.Equals(input.UserType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.PhoneNumber != null)
+                    hashCode = hashCode * 59 + this.PhoneNumber.GetHashCode();
+                if (this.Email != null)
+                    hashCode = hashCode * 59 + this.Email.GetHashCode();
+                if (this.CustomerName != null)
+                    hashCode = hashCode * 59 + this.CustomerName.GetHashCode();
+                if (this.HasLoggedIn != null)
+                    hashCode = hashCode * 59 + this.HasLoggedIn.GetHashCode();
+                if (this.UserDiscriminator != null)
+                    hashCode = hashCode * 59 + this.UserDiscriminator.GetHashCode();
+                if (this.TsCreate != null)
+                    hashCode = hashCode * 59 + this.TsCreate.GetHashCode();
+                if (this.WhiteLabelConfigs != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelConfigs.GetHashCode();
+                if (this.UserType != null)
+                    hashCode = hashCode * 59 + this.UserType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserSmsChatItem.cs b/src/Flipdish/Model/UserSmsChatItem.cs
new file mode 100644
index 00000000..46a8fe92
--- /dev/null
+++ b/src/Flipdish/Model/UserSmsChatItem.cs
@@ -0,0 +1,181 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// An SMS conversation item for admin user chat.
+    /// </summary>
+    [DataContract]
+    public partial class UserSmsChatItem :  IEquatable<UserSmsChatItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserSmsChatItem" /> class.
+        /// </summary>
+        /// <param name="smsConversationItemId">SmsConversationItemId..</param>
+        /// <param name="direction">Direction..</param>
+        /// <param name="from">From..</param>
+        /// <param name="text">Text..</param>
+        /// <param name="tsSentReceivedUtc">TsSentReceivedUtc..</param>
+        public UserSmsChatItem(int? smsConversationItemId = default(int?), string direction = default(string), string from = default(string), string text = default(string), DateTime? tsSentReceivedUtc = default(DateTime?))
+        {
+            this.SmsConversationItemId = smsConversationItemId;
+            this.Direction = direction;
+            this.From = from;
+            this.Text = text;
+            this.TsSentReceivedUtc = tsSentReceivedUtc;
+        }
+        
+        /// <summary>
+        /// SmsConversationItemId.
+        /// </summary>
+        /// <value>SmsConversationItemId.</value>
+        [DataMember(Name="SmsConversationItemId", EmitDefaultValue=false)]
+        public int? SmsConversationItemId { get; set; }
+
+        /// <summary>
+        /// Direction.
+        /// </summary>
+        /// <value>Direction.</value>
+        [DataMember(Name="Direction", EmitDefaultValue=false)]
+        public string Direction { get; set; }
+
+        /// <summary>
+        /// From.
+        /// </summary>
+        /// <value>From.</value>
+        [DataMember(Name="From", EmitDefaultValue=false)]
+        public string From { get; set; }
+
+        /// <summary>
+        /// Text.
+        /// </summary>
+        /// <value>Text.</value>
+        [DataMember(Name="Text", EmitDefaultValue=false)]
+        public string Text { get; set; }
+
+        /// <summary>
+        /// TsSentReceivedUtc.
+        /// </summary>
+        /// <value>TsSentReceivedUtc.</value>
+        [DataMember(Name="TsSentReceivedUtc", EmitDefaultValue=false)]
+        public DateTime? TsSentReceivedUtc { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserSmsChatItem {\n");
+            sb.Append("  SmsConversationItemId: ").Append(SmsConversationItemId).Append("\n");
+            sb.Append("  Direction: ").Append(Direction).Append("\n");
+            sb.Append("  From: ").Append(From).Append("\n");
+            sb.Append("  Text: ").Append(Text).Append("\n");
+            sb.Append("  TsSentReceivedUtc: ").Append(TsSentReceivedUtc).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserSmsChatItem);
+        }
+
+        /// <summary>
+        /// Returns true if UserSmsChatItem instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserSmsChatItem to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserSmsChatItem input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.SmsConversationItemId == input.SmsConversationItemId ||
+                    (this.SmsConversationItemId != null &&
+                    this.SmsConversationItemId.Equals(input.SmsConversationItemId))
+                ) && 
+                (
+                    this.Direction == input.Direction ||
+                    (this.Direction != null &&
+                    this.Direction.Equals(input.Direction))
+                ) && 
+                (
+                    this.From == input.From ||
+                    (this.From != null &&
+                    this.From.Equals(input.From))
+                ) && 
+                (
+                    this.Text == input.Text ||
+                    (this.Text != null &&
+                    this.Text.Equals(input.Text))
+                ) && 
+                (
+                    this.TsSentReceivedUtc == input.TsSentReceivedUtc ||
+                    (this.TsSentReceivedUtc != null &&
+                    this.TsSentReceivedUtc.Equals(input.TsSentReceivedUtc))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.SmsConversationItemId != null)
+                    hashCode = hashCode * 59 + this.SmsConversationItemId.GetHashCode();
+                if (this.Direction != null)
+                    hashCode = hashCode * 59 + this.Direction.GetHashCode();
+                if (this.From != null)
+                    hashCode = hashCode * 59 + this.From.GetHashCode();
+                if (this.Text != null)
+                    hashCode = hashCode * 59 + this.Text.GetHashCode();
+                if (this.TsSentReceivedUtc != null)
+                    hashCode = hashCode * 59 + this.TsSentReceivedUtc.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserStoreInfo.cs b/src/Flipdish/Model/UserStoreInfo.cs
new file mode 100644
index 00000000..fa30e87c
--- /dev/null
+++ b/src/Flipdish/Model/UserStoreInfo.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Stores that the user is associated with
+    /// </summary>
+    [DataContract]
+    public partial class UserStoreInfo :  IEquatable<UserStoreInfo>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserStoreInfo" /> class.
+        /// </summary>
+        /// <param name="propertyId">Property Id.</param>
+        /// <param name="storeId">Store Id.</param>
+        /// <param name="storeName">Store Name.</param>
+        public UserStoreInfo(string propertyId = default(string), int? storeId = default(int?), string storeName = default(string))
+        {
+            this.PropertyId = propertyId;
+            this.StoreId = storeId;
+            this.StoreName = storeName;
+        }
+        
+        /// <summary>
+        /// Property Id
+        /// </summary>
+        /// <value>Property Id</value>
+        [DataMember(Name="PropertyId", EmitDefaultValue=false)]
+        public string PropertyId { get; set; }
+
+        /// <summary>
+        /// Store Id
+        /// </summary>
+        /// <value>Store Id</value>
+        [DataMember(Name="StoreId", EmitDefaultValue=false)]
+        public int? StoreId { get; set; }
+
+        /// <summary>
+        /// Store Name
+        /// </summary>
+        /// <value>Store Name</value>
+        [DataMember(Name="StoreName", EmitDefaultValue=false)]
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserStoreInfo {\n");
+            sb.Append("  PropertyId: ").Append(PropertyId).Append("\n");
+            sb.Append("  StoreId: ").Append(StoreId).Append("\n");
+            sb.Append("  StoreName: ").Append(StoreName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserStoreInfo);
+        }
+
+        /// <summary>
+        /// Returns true if UserStoreInfo instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserStoreInfo to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserStoreInfo input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.PropertyId == input.PropertyId ||
+                    (this.PropertyId != null &&
+                    this.PropertyId.Equals(input.PropertyId))
+                ) && 
+                (
+                    this.StoreId == input.StoreId ||
+                    (this.StoreId != null &&
+                    this.StoreId.Equals(input.StoreId))
+                ) && 
+                (
+                    this.StoreName == input.StoreName ||
+                    (this.StoreName != null &&
+                    this.StoreName.Equals(input.StoreName))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.PropertyId != null)
+                    hashCode = hashCode * 59 + this.PropertyId.GetHashCode();
+                if (this.StoreId != null)
+                    hashCode = hashCode * 59 + this.StoreId.GetHashCode();
+                if (this.StoreName != null)
+                    hashCode = hashCode * 59 + this.StoreName.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserUpdatedEvent.cs b/src/Flipdish/Model/UserUpdatedEvent.cs
index 05a20cfe..eb5eda86 100644
--- a/src/Flipdish/Model/UserUpdatedEvent.cs
+++ b/src/Flipdish/Model/UserUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// User updated event
     /// </summary>
     [DataContract]
-    public partial class UserUpdatedEvent :  IEquatable<UserUpdatedEvent>, IValidatableObject
+    public partial class UserUpdatedEvent :  IEquatable<UserUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UserUpdatedEvent" /> class.
@@ -40,8 +38,11 @@ public partial class UserUpdatedEvent :  IEquatable<UserUpdatedEvent>, IValidata
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public UserUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public UserUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.Description = description;
@@ -50,7 +51,10 @@ public partial class UserUpdatedEvent :  IEquatable<UserUpdatedEvent>, IValidata
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -102,6 +106,13 @@ public partial class UserUpdatedEvent :  IEquatable<UserUpdatedEvent>, IValidata
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -109,6 +120,20 @@ public partial class UserUpdatedEvent :  IEquatable<UserUpdatedEvent>, IValidata
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,7 +149,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -194,10 +222,25 @@ public bool Equals(UserUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -224,21 +267,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/UserWhiteLabelConfig.cs b/src/Flipdish/Model/UserWhiteLabelConfig.cs
new file mode 100644
index 00000000..5d3153e3
--- /dev/null
+++ b/src/Flipdish/Model/UserWhiteLabelConfig.cs
@@ -0,0 +1,268 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// User WhiteLabelConfig
+    /// </summary>
+    [DataContract]
+    public partial class UserWhiteLabelConfig :  IEquatable<UserWhiteLabelConfig>
+    {
+        /// <summary>
+        /// WhiteLabel Access Level
+        /// </summary>
+        /// <value>WhiteLabel Access Level</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum LevelEnum
+        {
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
+            /// <summary>
+            /// Enum Owner for value: Owner
+            /// </summary>
+            [EnumMember(Value = "Owner")]
+            Owner = 2,
+            
+            /// <summary>
+            /// Enum StoreOwner for value: StoreOwner
+            /// </summary>
+            [EnumMember(Value = "StoreOwner")]
+            StoreOwner = 3,
+            
+            /// <summary>
+            /// Enum PropertyOwner for value: PropertyOwner
+            /// </summary>
+            [EnumMember(Value = "PropertyOwner")]
+            PropertyOwner = 4,
+            
+            /// <summary>
+            /// Enum ManagedOwner for value: ManagedOwner
+            /// </summary>
+            [EnumMember(Value = "ManagedOwner")]
+            ManagedOwner = 5,
+            
+            /// <summary>
+            /// Enum Integrator for value: Integrator
+            /// </summary>
+            [EnumMember(Value = "Integrator")]
+            Integrator = 6,
+            
+            /// <summary>
+            /// Enum PropertyManager for value: PropertyManager
+            /// </summary>
+            [EnumMember(Value = "PropertyManager")]
+            PropertyManager = 7,
+            
+            /// <summary>
+            /// Enum StoreManager for value: StoreManager
+            /// </summary>
+            [EnumMember(Value = "StoreManager")]
+            StoreManager = 8,
+            
+            /// <summary>
+            /// Enum StoreStaff for value: StoreStaff
+            /// </summary>
+            [EnumMember(Value = "StoreStaff")]
+            StoreStaff = 9,
+            
+            /// <summary>
+            /// Enum StaffMember for value: StaffMember
+            /// </summary>
+            [EnumMember(Value = "StaffMember")]
+            StaffMember = 10,
+            
+            /// <summary>
+            /// Enum StoreReadOnlyAccess for value: StoreReadOnlyAccess
+            /// </summary>
+            [EnumMember(Value = "StoreReadOnlyAccess")]
+            StoreReadOnlyAccess = 11,
+            
+            /// <summary>
+            /// Enum FinanceManager for value: FinanceManager
+            /// </summary>
+            [EnumMember(Value = "FinanceManager")]
+            FinanceManager = 12,
+            
+            /// <summary>
+            /// Enum Support for value: Support
+            /// </summary>
+            [EnumMember(Value = "Support")]
+            Support = 13
+        }
+
+        /// <summary>
+        /// WhiteLabel Access Level
+        /// </summary>
+        /// <value>WhiteLabel Access Level</value>
+        [DataMember(Name="Level", EmitDefaultValue=false)]
+        public LevelEnum? Level { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserWhiteLabelConfig" /> class.
+        /// </summary>
+        /// <param name="id">Identifier.</param>
+        /// <param name="configId">WlConfigId.</param>
+        /// <param name="appId">Brand Id.</param>
+        /// <param name="name">WhiteLabel Name.</param>
+        /// <param name="level">WhiteLabel Access Level.</param>
+        public UserWhiteLabelConfig(int? id = default(int?), int? configId = default(int?), string appId = default(string), string name = default(string), LevelEnum? level = default(LevelEnum?))
+        {
+            this.Id = id;
+            this.ConfigId = configId;
+            this.AppId = appId;
+            this.Name = name;
+            this.Level = level;
+        }
+        
+        /// <summary>
+        /// Identifier
+        /// </summary>
+        /// <value>Identifier</value>
+        [DataMember(Name="Id", EmitDefaultValue=false)]
+        public int? Id { get; set; }
+
+        /// <summary>
+        /// WlConfigId
+        /// </summary>
+        /// <value>WlConfigId</value>
+        [DataMember(Name="ConfigId", EmitDefaultValue=false)]
+        public int? ConfigId { get; set; }
+
+        /// <summary>
+        /// Brand Id
+        /// </summary>
+        /// <value>Brand Id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// WhiteLabel Name
+        /// </summary>
+        /// <value>WhiteLabel Name</value>
+        [DataMember(Name="Name", EmitDefaultValue=false)]
+        public string Name { get; set; }
+
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserWhiteLabelConfig {\n");
+            sb.Append("  Id: ").Append(Id).Append("\n");
+            sb.Append("  ConfigId: ").Append(ConfigId).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  Level: ").Append(Level).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserWhiteLabelConfig);
+        }
+
+        /// <summary>
+        /// Returns true if UserWhiteLabelConfig instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserWhiteLabelConfig to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserWhiteLabelConfig input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Id == input.Id ||
+                    (this.Id != null &&
+                    this.Id.Equals(input.Id))
+                ) && 
+                (
+                    this.ConfigId == input.ConfigId ||
+                    (this.ConfigId != null &&
+                    this.ConfigId.Equals(input.ConfigId))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
+                ) && 
+                (
+                    this.Level == input.Level ||
+                    (this.Level != null &&
+                    this.Level.Equals(input.Level))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Id != null)
+                    hashCode = hashCode * 59 + this.Id.GetHashCode();
+                if (this.ConfigId != null)
+                    hashCode = hashCode * 59 + this.ConfigId.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.Name != null)
+                    hashCode = hashCode * 59 + this.Name.GetHashCode();
+                if (this.Level != null)
+                    hashCode = hashCode * 59 + this.Level.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/UserWhiteLabelInfo.cs b/src/Flipdish/Model/UserWhiteLabelInfo.cs
new file mode 100644
index 00000000..5e74a8cf
--- /dev/null
+++ b/src/Flipdish/Model/UserWhiteLabelInfo.cs
@@ -0,0 +1,147 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// User WhiteLabel information
+    /// </summary>
+    [DataContract]
+    public partial class UserWhiteLabelInfo :  IEquatable<UserWhiteLabelInfo>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserWhiteLabelInfo" /> class.
+        /// </summary>
+        /// <param name="wlConfigId">WhiteLabelConfig Id.</param>
+        /// <param name="appId">Brand Id (AppId).</param>
+        /// <param name="whiteLabelName">WhiteLabel Name.</param>
+        public UserWhiteLabelInfo(int? wlConfigId = default(int?), string appId = default(string), string whiteLabelName = default(string))
+        {
+            this.WlConfigId = wlConfigId;
+            this.AppId = appId;
+            this.WhiteLabelName = whiteLabelName;
+        }
+        
+        /// <summary>
+        /// WhiteLabelConfig Id
+        /// </summary>
+        /// <value>WhiteLabelConfig Id</value>
+        [DataMember(Name="WlConfigId", EmitDefaultValue=false)]
+        public int? WlConfigId { get; set; }
+
+        /// <summary>
+        /// Brand Id (AppId)
+        /// </summary>
+        /// <value>Brand Id (AppId)</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// WhiteLabel Name
+        /// </summary>
+        /// <value>WhiteLabel Name</value>
+        [DataMember(Name="WhiteLabelName", EmitDefaultValue=false)]
+        public string WhiteLabelName { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class UserWhiteLabelInfo {\n");
+            sb.Append("  WlConfigId: ").Append(WlConfigId).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  WhiteLabelName: ").Append(WhiteLabelName).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as UserWhiteLabelInfo);
+        }
+
+        /// <summary>
+        /// Returns true if UserWhiteLabelInfo instances are equal
+        /// </summary>
+        /// <param name="input">Instance of UserWhiteLabelInfo to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(UserWhiteLabelInfo input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WlConfigId == input.WlConfigId ||
+                    (this.WlConfigId != null &&
+                    this.WlConfigId.Equals(input.WlConfigId))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.WhiteLabelName == input.WhiteLabelName ||
+                    (this.WhiteLabelName != null &&
+                    this.WhiteLabelName.Equals(input.WhiteLabelName))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WlConfigId != null)
+                    hashCode = hashCode * 59 + this.WlConfigId.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.WhiteLabelName != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelName.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/ValidValue.cs b/src/Flipdish/Model/ValidValue.cs
index a316a13b..92f9f05b 100644
--- a/src/Flipdish/Model/ValidValue.cs
+++ b/src/Flipdish/Model/ValidValue.cs
@@ -12,23 +12,21 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
 {
     /// <summary>
-    /// Valid Value
+    /// ValidValue
     /// </summary>
     [DataContract]
-    public partial class ValidValue :  IEquatable<ValidValue>, IValidatableObject
+    public partial class ValidValue :  IEquatable<ValidValue>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ValidValue" /> class.
@@ -38,8 +36,8 @@ protected ValidValue() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="ValidValue" /> class.
         /// </summary>
-        /// <param name="code">Code (required).</param>
-        /// <param name="name">Name (required).</param>
+        /// <param name="code">code (required).</param>
+        /// <param name="name">name (required).</param>
         public ValidValue(string code = default(string), string name = default(string))
         {
             // to ensure "code" is required (not null)
@@ -63,16 +61,14 @@ protected ValidValue() { }
         }
         
         /// <summary>
-        /// Code
+        /// Gets or Sets Code
         /// </summary>
-        /// <value>Code</value>
         [DataMember(Name="Code", EmitDefaultValue=false)]
         public string Code { get; set; }
 
         /// <summary>
-        /// Name
+        /// Gets or Sets Name
         /// </summary>
-        /// <value>Name</value>
         [DataMember(Name="Name", EmitDefaultValue=false)]
         public string Name { get; set; }
 
@@ -148,16 +144,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ValidationErrorResult.cs b/src/Flipdish/Model/ValidationErrorResult.cs
index ffcd0d0b..19df10d4 100644
--- a/src/Flipdish/Model/ValidationErrorResult.cs
+++ b/src/Flipdish/Model/ValidationErrorResult.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Validation error result
     /// </summary>
     [DataContract]
-    public partial class ValidationErrorResult :  IEquatable<ValidationErrorResult>, IValidatableObject
+    public partial class ValidationErrorResult :  IEquatable<ValidationErrorResult>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ValidationErrorResult" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/ValidityPeriod.cs b/src/Flipdish/Model/ValidityPeriod.cs
new file mode 100644
index 00000000..29c2fe51
--- /dev/null
+++ b/src/Flipdish/Model/ValidityPeriod.cs
@@ -0,0 +1,198 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// ValidityPeriod.
+    /// </summary>
+    [DataContract]
+    public partial class ValidityPeriod :  IEquatable<ValidityPeriod>
+    {
+        /// <summary>
+        /// DayOfWeek.
+        /// </summary>
+        /// <value>DayOfWeek.</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum DayOfWeekEnum
+        {
+            
+            /// <summary>
+            /// Enum Sunday for value: Sunday
+            /// </summary>
+            [EnumMember(Value = "Sunday")]
+            Sunday = 1,
+            
+            /// <summary>
+            /// Enum Monday for value: Monday
+            /// </summary>
+            [EnumMember(Value = "Monday")]
+            Monday = 2,
+            
+            /// <summary>
+            /// Enum Tuesday for value: Tuesday
+            /// </summary>
+            [EnumMember(Value = "Tuesday")]
+            Tuesday = 3,
+            
+            /// <summary>
+            /// Enum Wednesday for value: Wednesday
+            /// </summary>
+            [EnumMember(Value = "Wednesday")]
+            Wednesday = 4,
+            
+            /// <summary>
+            /// Enum Thursday for value: Thursday
+            /// </summary>
+            [EnumMember(Value = "Thursday")]
+            Thursday = 5,
+            
+            /// <summary>
+            /// Enum Friday for value: Friday
+            /// </summary>
+            [EnumMember(Value = "Friday")]
+            Friday = 6,
+            
+            /// <summary>
+            /// Enum Saturday for value: Saturday
+            /// </summary>
+            [EnumMember(Value = "Saturday")]
+            Saturday = 7
+        }
+
+        /// <summary>
+        /// DayOfWeek.
+        /// </summary>
+        /// <value>DayOfWeek.</value>
+        [DataMember(Name="DayOfWeek", EmitDefaultValue=false)]
+        public DayOfWeekEnum? DayOfWeek { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidityPeriod" /> class.
+        /// </summary>
+        /// <param name="dayOfWeek">DayOfWeek..</param>
+        /// <param name="startTime">StartTime..</param>
+        /// <param name="endTime">EndTime..</param>
+        public ValidityPeriod(DayOfWeekEnum? dayOfWeek = default(DayOfWeekEnum?), string startTime = default(string), string endTime = default(string))
+        {
+            this.DayOfWeek = dayOfWeek;
+            this.StartTime = startTime;
+            this.EndTime = endTime;
+        }
+        
+
+        /// <summary>
+        /// StartTime.
+        /// </summary>
+        /// <value>StartTime.</value>
+        [DataMember(Name="StartTime", EmitDefaultValue=false)]
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// EndTime.
+        /// </summary>
+        /// <value>EndTime.</value>
+        [DataMember(Name="EndTime", EmitDefaultValue=false)]
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class ValidityPeriod {\n");
+            sb.Append("  DayOfWeek: ").Append(DayOfWeek).Append("\n");
+            sb.Append("  StartTime: ").Append(StartTime).Append("\n");
+            sb.Append("  EndTime: ").Append(EndTime).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as ValidityPeriod);
+        }
+
+        /// <summary>
+        /// Returns true if ValidityPeriod instances are equal
+        /// </summary>
+        /// <param name="input">Instance of ValidityPeriod to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(ValidityPeriod input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.DayOfWeek == input.DayOfWeek ||
+                    (this.DayOfWeek != null &&
+                    this.DayOfWeek.Equals(input.DayOfWeek))
+                ) && 
+                (
+                    this.StartTime == input.StartTime ||
+                    (this.StartTime != null &&
+                    this.StartTime.Equals(input.StartTime))
+                ) && 
+                (
+                    this.EndTime == input.EndTime ||
+                    (this.EndTime != null &&
+                    this.EndTime.Equals(input.EndTime))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.DayOfWeek != null)
+                    hashCode = hashCode * 59 + this.DayOfWeek.GetHashCode();
+                if (this.StartTime != null)
+                    hashCode = hashCode * 59 + this.StartTime.GetHashCode();
+                if (this.EndTime != null)
+                    hashCode = hashCode * 59 + this.EndTime.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/Voucher.cs b/src/Flipdish/Model/Voucher.cs
index 7619f450..13564d93 100644
--- a/src/Flipdish/Model/Voucher.cs
+++ b/src/Flipdish/Model/Voucher.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Voucher
     /// </summary>
     [DataContract]
-    public partial class Voucher :  IEquatable<Voucher>, IValidatableObject
+    public partial class Voucher :  IEquatable<Voucher>
     {
         /// <summary>
         /// Voucher Status
@@ -105,7 +103,13 @@ public enum VoucherTypeEnum
             /// Enum CreditNote for value: CreditNote
             /// </summary>
             [EnumMember(Value = "CreditNote")]
-            CreditNote = 4
+            CreditNote = 4,
+            
+            /// <summary>
+            /// Enum FreeDelivery for value: FreeDelivery
+            /// </summary>
+            [EnumMember(Value = "FreeDelivery")]
+            FreeDelivery = 5
         }
 
         /// <summary>
@@ -115,63 +119,6 @@ public enum VoucherTypeEnum
         [DataMember(Name="VoucherType", EmitDefaultValue=false)]
         public VoucherTypeEnum? VoucherType { get; set; }
         /// <summary>
-        /// Voucher Sub Type
-        /// </summary>
-        /// <value>Voucher Sub Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum VoucherSubTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum None for value: None
-            /// </summary>
-            [EnumMember(Value = "None")]
-            None = 1,
-            
-            /// <summary>
-            /// Enum SignUp for value: SignUp
-            /// </summary>
-            [EnumMember(Value = "SignUp")]
-            SignUp = 2,
-            
-            /// <summary>
-            /// Enum Loyalty for value: Loyalty
-            /// </summary>
-            [EnumMember(Value = "Loyalty")]
-            Loyalty = 3,
-            
-            /// <summary>
-            /// Enum Loyalty25 for value: Loyalty25
-            /// </summary>
-            [EnumMember(Value = "Loyalty25")]
-            Loyalty25 = 4,
-            
-            /// <summary>
-            /// Enum Retention for value: Retention
-            /// </summary>
-            [EnumMember(Value = "Retention")]
-            Retention = 5,
-            
-            /// <summary>
-            /// Enum SecondaryRetention for value: SecondaryRetention
-            /// </summary>
-            [EnumMember(Value = "SecondaryRetention")]
-            SecondaryRetention = 6,
-            
-            /// <summary>
-            /// Enum Custom for value: Custom
-            /// </summary>
-            [EnumMember(Value = "Custom")]
-            Custom = 7
-        }
-
-        /// <summary>
-        /// Voucher Sub Type
-        /// </summary>
-        /// <value>Voucher Sub Type</value>
-        [DataMember(Name="VoucherSubType", EmitDefaultValue=false)]
-        public VoucherSubTypeEnum? VoucherSubType { get; set; }
-        /// <summary>
         /// Currency of the voucher
         /// </summary>
         /// <value>Currency of the voucher</value>
@@ -865,21 +812,128 @@ public enum CurrencyEnum
         [DataMember(Name="Currency", EmitDefaultValue=false)]
         public CurrencyEnum? Currency { get; set; }
         /// <summary>
+        /// Defines ChannelRestrictions
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ChannelRestrictionsEnum
+        {
+            
+            /// <summary>
+            /// Enum Ios for value: Ios
+            /// </summary>
+            [EnumMember(Value = "Ios")]
+            Ios = 1,
+            
+            /// <summary>
+            /// Enum Android for value: Android
+            /// </summary>
+            [EnumMember(Value = "Android")]
+            Android = 2,
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 3,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 4,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 5,
+            
+            /// <summary>
+            /// Enum Google for value: Google
+            /// </summary>
+            [EnumMember(Value = "Google")]
+            Google = 6
+        }
+
+
+        /// <summary>
+        /// Limit the channels this voucher can be used on
+        /// </summary>
+        /// <value>Limit the channels this voucher can be used on</value>
+        [DataMember(Name="ChannelRestrictions", EmitDefaultValue=false)]
+        public List<ChannelRestrictionsEnum> ChannelRestrictions { get; set; }
+        /// <summary>
+        /// Voucher Subtype
+        /// </summary>
+        /// <value>Voucher Subtype</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum VoucherSubTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
+            /// <summary>
+            /// Enum SignUp for value: SignUp
+            /// </summary>
+            [EnumMember(Value = "SignUp")]
+            SignUp = 2,
+            
+            /// <summary>
+            /// Enum Loyalty for value: Loyalty
+            /// </summary>
+            [EnumMember(Value = "Loyalty")]
+            Loyalty = 3,
+            
+            /// <summary>
+            /// Enum Loyalty25 for value: Loyalty25
+            /// </summary>
+            [EnumMember(Value = "Loyalty25")]
+            Loyalty25 = 4,
+            
+            /// <summary>
+            /// Enum Retention for value: Retention
+            /// </summary>
+            [EnumMember(Value = "Retention")]
+            Retention = 5,
+            
+            /// <summary>
+            /// Enum SecondaryRetention for value: SecondaryRetention
+            /// </summary>
+            [EnumMember(Value = "SecondaryRetention")]
+            SecondaryRetention = 6,
+            
+            /// <summary>
+            /// Enum Custom for value: Custom
+            /// </summary>
+            [EnumMember(Value = "Custom")]
+            Custom = 7
+        }
+
+        /// <summary>
+        /// Voucher Subtype
+        /// </summary>
+        /// <value>Voucher Subtype</value>
+        [DataMember(Name="VoucherSubType", EmitDefaultValue=false)]
+        public VoucherSubTypeEnum? VoucherSubType { get; set; }
+        /// <summary>
         /// Initializes a new instance of the <see cref="Voucher" /> class.
         /// </summary>
         /// <param name="voucherId">Voucher Id.</param>
         /// <param name="status">Voucher Status.</param>
         /// <param name="voucherType">Voucher Type.</param>
-        /// <param name="voucherSubType">Voucher Sub Type.</param>
         /// <param name="currency">Currency of the voucher.</param>
-        /// <param name="stores">Stores that this voucher applies to.</param>
         /// <param name="storeNames">Stores that this voucher applies to.</param>
-        /// <param name="addItemDetails">Add item details.</param>
+        /// <param name="promotionDetails">Promotion details.</param>
         /// <param name="creditNoteDetails">Credit note details.</param>
         /// <param name="lumpDiscountDetails">Lump discount details.</param>
         /// <param name="percentDiscountDetails">Percent discount details.</param>
         /// <param name="code">Voucher Code.</param>
         /// <param name="description">Voucher Description (Visible on printout).</param>
+        /// <param name="stores">Stores that this voucher applies to.</param>
         /// <param name="validOnOrdersOver">Valid on orders on or above.</param>
         /// <param name="takesPriority">Takes priority.</param>
         /// <param name="isEnabled">Is voucher enabled.</param>
@@ -892,23 +946,30 @@ public enum CurrencyEnum
         /// <param name="isValidForFirstOrderOnly">Valid only on the first order by the customer.</param>
         /// <param name="isValidOncePerCustomer">Valid once per customer.</param>
         /// <param name="isValidOnlyOnce">Valid only once, by any customer (once used cannot be used again by any other customer).</param>
+        /// <param name="isDiscoverable">Enables the voucher to be offered in the Voucher Discoverability feature.</param>
+        /// <param name="isPromoted">Marks the voucher as promoted.</param>
+        /// <param name="forceDiscount">Force the discount to be applied which bypasses some menu restrictions.</param>
         /// <param name="startDate">Voucher Starts On (Time in UTC).</param>
         /// <param name="expiryDate">Voucher Expires On (Time in UTC).</param>
-        public Voucher(int? voucherId = default(int?), StatusEnum? status = default(StatusEnum?), VoucherTypeEnum? voucherType = default(VoucherTypeEnum?), VoucherSubTypeEnum? voucherSubType = default(VoucherSubTypeEnum?), CurrencyEnum? currency = default(CurrencyEnum?), List<int?> stores = default(List<int?>), List<string> storeNames = default(List<string>), AddItemDetails addItemDetails = default(AddItemDetails), CreditNoteDetails creditNoteDetails = default(CreditNoteDetails), LumpDiscountDetails lumpDiscountDetails = default(LumpDiscountDetails), PercentDiscountDetails percentDiscountDetails = default(PercentDiscountDetails), string code = default(string), string description = default(string), double? validOnOrdersOver = default(double?), bool? takesPriority = default(bool?), bool? isEnabled = default(bool?), bool? isAutomaticallyApplied = default(bool?), bool? includeDeliveryFee = default(bool?), bool? isValidForDeliveryOrders = default(bool?), bool? isValidForPickupOrders = default(bool?), bool? isValidForOrdersPayedOnline = default(bool?), bool? isValidForOrdersPayedByCash = default(bool?), bool? isValidForFirstOrderOnly = default(bool?), bool? isValidOncePerCustomer = default(bool?), bool? isValidOnlyOnce = default(bool?), DateTime? startDate = default(DateTime?), DateTime? expiryDate = default(DateTime?))
+        /// <param name="channelRestrictions">Limit the channels this voucher can be used on.</param>
+        /// <param name="validityPeriods">Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated..</param>
+        /// <param name="voucherSubType">Voucher Subtype.</param>
+        /// <param name="customerId">Customer UserID.</param>
+        /// <param name="maxRedemptions">Maximum number of times the voucher can be redeemed (used).</param>
+        public Voucher(int? voucherId = default(int?), StatusEnum? status = default(StatusEnum?), VoucherTypeEnum? voucherType = default(VoucherTypeEnum?), CurrencyEnum? currency = default(CurrencyEnum?), List<string> storeNames = default(List<string>), PromotionDetails promotionDetails = default(PromotionDetails), CreditNoteDetails creditNoteDetails = default(CreditNoteDetails), LumpDiscountDetails lumpDiscountDetails = default(LumpDiscountDetails), PercentDiscountDetails percentDiscountDetails = default(PercentDiscountDetails), string code = default(string), string description = default(string), List<int?> stores = default(List<int?>), double? validOnOrdersOver = default(double?), bool? takesPriority = default(bool?), bool? isEnabled = default(bool?), bool? isAutomaticallyApplied = default(bool?), bool? includeDeliveryFee = default(bool?), bool? isValidForDeliveryOrders = default(bool?), bool? isValidForPickupOrders = default(bool?), bool? isValidForOrdersPayedOnline = default(bool?), bool? isValidForOrdersPayedByCash = default(bool?), bool? isValidForFirstOrderOnly = default(bool?), bool? isValidOncePerCustomer = default(bool?), bool? isValidOnlyOnce = default(bool?), bool? isDiscoverable = default(bool?), bool? isPromoted = default(bool?), bool? forceDiscount = default(bool?), DateTime? startDate = default(DateTime?), DateTime? expiryDate = default(DateTime?), List<ChannelRestrictionsEnum> channelRestrictions = default(List<ChannelRestrictionsEnum>), List<ValidityPeriod> validityPeriods = default(List<ValidityPeriod>), VoucherSubTypeEnum? voucherSubType = default(VoucherSubTypeEnum?), int? customerId = default(int?), int? maxRedemptions = default(int?))
         {
             this.VoucherId = voucherId;
             this.Status = status;
             this.VoucherType = voucherType;
-            this.VoucherSubType = voucherSubType;
             this.Currency = currency;
-            this.Stores = stores;
             this.StoreNames = storeNames;
-            this.AddItemDetails = addItemDetails;
+            this.PromotionDetails = promotionDetails;
             this.CreditNoteDetails = creditNoteDetails;
             this.LumpDiscountDetails = lumpDiscountDetails;
             this.PercentDiscountDetails = percentDiscountDetails;
             this.Code = code;
             this.Description = description;
+            this.Stores = stores;
             this.ValidOnOrdersOver = validOnOrdersOver;
             this.TakesPriority = takesPriority;
             this.IsEnabled = isEnabled;
@@ -921,8 +982,16 @@ public enum CurrencyEnum
             this.IsValidForFirstOrderOnly = isValidForFirstOrderOnly;
             this.IsValidOncePerCustomer = isValidOncePerCustomer;
             this.IsValidOnlyOnce = isValidOnlyOnce;
+            this.IsDiscoverable = isDiscoverable;
+            this.IsPromoted = isPromoted;
+            this.ForceDiscount = forceDiscount;
             this.StartDate = startDate;
             this.ExpiryDate = expiryDate;
+            this.ChannelRestrictions = channelRestrictions;
+            this.ValidityPeriods = validityPeriods;
+            this.VoucherSubType = voucherSubType;
+            this.CustomerId = customerId;
+            this.MaxRedemptions = maxRedemptions;
         }
         
         /// <summary>
@@ -935,14 +1004,6 @@ public enum CurrencyEnum
 
 
 
-
-        /// <summary>
-        /// Stores that this voucher applies to
-        /// </summary>
-        /// <value>Stores that this voucher applies to</value>
-        [DataMember(Name="Stores", EmitDefaultValue=false)]
-        public List<int?> Stores { get; set; }
-
         /// <summary>
         /// Stores that this voucher applies to
         /// </summary>
@@ -951,11 +1012,11 @@ public enum CurrencyEnum
         public List<string> StoreNames { get; set; }
 
         /// <summary>
-        /// Add item details
+        /// Promotion details
         /// </summary>
-        /// <value>Add item details</value>
-        [DataMember(Name="AddItemDetails", EmitDefaultValue=false)]
-        public AddItemDetails AddItemDetails { get; set; }
+        /// <value>Promotion details</value>
+        [DataMember(Name="PromotionDetails", EmitDefaultValue=false)]
+        public PromotionDetails PromotionDetails { get; set; }
 
         /// <summary>
         /// Credit note details
@@ -992,6 +1053,13 @@ public enum CurrencyEnum
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
+        /// <summary>
+        /// Stores that this voucher applies to
+        /// </summary>
+        /// <value>Stores that this voucher applies to</value>
+        [DataMember(Name="Stores", EmitDefaultValue=false)]
+        public List<int?> Stores { get; set; }
+
         /// <summary>
         /// Valid on orders on or above
         /// </summary>
@@ -1076,6 +1144,27 @@ public enum CurrencyEnum
         [DataMember(Name="IsValidOnlyOnce", EmitDefaultValue=false)]
         public bool? IsValidOnlyOnce { get; set; }
 
+        /// <summary>
+        /// Enables the voucher to be offered in the Voucher Discoverability feature
+        /// </summary>
+        /// <value>Enables the voucher to be offered in the Voucher Discoverability feature</value>
+        [DataMember(Name="IsDiscoverable", EmitDefaultValue=false)]
+        public bool? IsDiscoverable { get; set; }
+
+        /// <summary>
+        /// Marks the voucher as promoted
+        /// </summary>
+        /// <value>Marks the voucher as promoted</value>
+        [DataMember(Name="IsPromoted", EmitDefaultValue=false)]
+        public bool? IsPromoted { get; set; }
+
+        /// <summary>
+        /// Force the discount to be applied which bypasses some menu restrictions
+        /// </summary>
+        /// <value>Force the discount to be applied which bypasses some menu restrictions</value>
+        [DataMember(Name="ForceDiscount", EmitDefaultValue=false)]
+        public bool? ForceDiscount { get; set; }
+
         /// <summary>
         /// Voucher Starts On (Time in UTC)
         /// </summary>
@@ -1090,6 +1179,29 @@ public enum CurrencyEnum
         [DataMember(Name="ExpiryDate", EmitDefaultValue=false)]
         public DateTime? ExpiryDate { get; set; }
 
+
+        /// <summary>
+        /// Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated.
+        /// </summary>
+        /// <value>Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated.</value>
+        [DataMember(Name="ValidityPeriods", EmitDefaultValue=false)]
+        public List<ValidityPeriod> ValidityPeriods { get; set; }
+
+
+        /// <summary>
+        /// Customer UserID
+        /// </summary>
+        /// <value>Customer UserID</value>
+        [DataMember(Name="CustomerId", EmitDefaultValue=false)]
+        public int? CustomerId { get; set; }
+
+        /// <summary>
+        /// Maximum number of times the voucher can be redeemed (used)
+        /// </summary>
+        /// <value>Maximum number of times the voucher can be redeemed (used)</value>
+        [DataMember(Name="MaxRedemptions", EmitDefaultValue=false)]
+        public int? MaxRedemptions { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -1101,16 +1213,15 @@ public override string ToString()
             sb.Append("  VoucherId: ").Append(VoucherId).Append("\n");
             sb.Append("  Status: ").Append(Status).Append("\n");
             sb.Append("  VoucherType: ").Append(VoucherType).Append("\n");
-            sb.Append("  VoucherSubType: ").Append(VoucherSubType).Append("\n");
             sb.Append("  Currency: ").Append(Currency).Append("\n");
-            sb.Append("  Stores: ").Append(Stores).Append("\n");
             sb.Append("  StoreNames: ").Append(StoreNames).Append("\n");
-            sb.Append("  AddItemDetails: ").Append(AddItemDetails).Append("\n");
+            sb.Append("  PromotionDetails: ").Append(PromotionDetails).Append("\n");
             sb.Append("  CreditNoteDetails: ").Append(CreditNoteDetails).Append("\n");
             sb.Append("  LumpDiscountDetails: ").Append(LumpDiscountDetails).Append("\n");
             sb.Append("  PercentDiscountDetails: ").Append(PercentDiscountDetails).Append("\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  Stores: ").Append(Stores).Append("\n");
             sb.Append("  ValidOnOrdersOver: ").Append(ValidOnOrdersOver).Append("\n");
             sb.Append("  TakesPriority: ").Append(TakesPriority).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
@@ -1123,8 +1234,16 @@ public override string ToString()
             sb.Append("  IsValidForFirstOrderOnly: ").Append(IsValidForFirstOrderOnly).Append("\n");
             sb.Append("  IsValidOncePerCustomer: ").Append(IsValidOncePerCustomer).Append("\n");
             sb.Append("  IsValidOnlyOnce: ").Append(IsValidOnlyOnce).Append("\n");
+            sb.Append("  IsDiscoverable: ").Append(IsDiscoverable).Append("\n");
+            sb.Append("  IsPromoted: ").Append(IsPromoted).Append("\n");
+            sb.Append("  ForceDiscount: ").Append(ForceDiscount).Append("\n");
             sb.Append("  StartDate: ").Append(StartDate).Append("\n");
             sb.Append("  ExpiryDate: ").Append(ExpiryDate).Append("\n");
+            sb.Append("  ChannelRestrictions: ").Append(ChannelRestrictions).Append("\n");
+            sb.Append("  ValidityPeriods: ").Append(ValidityPeriods).Append("\n");
+            sb.Append("  VoucherSubType: ").Append(VoucherSubType).Append("\n");
+            sb.Append("  CustomerId: ").Append(CustomerId).Append("\n");
+            sb.Append("  MaxRedemptions: ").Append(MaxRedemptions).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -1174,30 +1293,20 @@ public bool Equals(Voucher input)
                     (this.VoucherType != null &&
                     this.VoucherType.Equals(input.VoucherType))
                 ) && 
-                (
-                    this.VoucherSubType == input.VoucherSubType ||
-                    (this.VoucherSubType != null &&
-                    this.VoucherSubType.Equals(input.VoucherSubType))
-                ) && 
                 (
                     this.Currency == input.Currency ||
                     (this.Currency != null &&
                     this.Currency.Equals(input.Currency))
                 ) && 
-                (
-                    this.Stores == input.Stores ||
-                    this.Stores != null &&
-                    this.Stores.SequenceEqual(input.Stores)
-                ) && 
                 (
                     this.StoreNames == input.StoreNames ||
                     this.StoreNames != null &&
                     this.StoreNames.SequenceEqual(input.StoreNames)
                 ) && 
                 (
-                    this.AddItemDetails == input.AddItemDetails ||
-                    (this.AddItemDetails != null &&
-                    this.AddItemDetails.Equals(input.AddItemDetails))
+                    this.PromotionDetails == input.PromotionDetails ||
+                    (this.PromotionDetails != null &&
+                    this.PromotionDetails.Equals(input.PromotionDetails))
                 ) && 
                 (
                     this.CreditNoteDetails == input.CreditNoteDetails ||
@@ -1224,6 +1333,11 @@ public bool Equals(Voucher input)
                     (this.Description != null &&
                     this.Description.Equals(input.Description))
                 ) && 
+                (
+                    this.Stores == input.Stores ||
+                    this.Stores != null &&
+                    this.Stores.SequenceEqual(input.Stores)
+                ) && 
                 (
                     this.ValidOnOrdersOver == input.ValidOnOrdersOver ||
                     (this.ValidOnOrdersOver != null &&
@@ -1284,6 +1398,21 @@ public bool Equals(Voucher input)
                     (this.IsValidOnlyOnce != null &&
                     this.IsValidOnlyOnce.Equals(input.IsValidOnlyOnce))
                 ) && 
+                (
+                    this.IsDiscoverable == input.IsDiscoverable ||
+                    (this.IsDiscoverable != null &&
+                    this.IsDiscoverable.Equals(input.IsDiscoverable))
+                ) && 
+                (
+                    this.IsPromoted == input.IsPromoted ||
+                    (this.IsPromoted != null &&
+                    this.IsPromoted.Equals(input.IsPromoted))
+                ) && 
+                (
+                    this.ForceDiscount == input.ForceDiscount ||
+                    (this.ForceDiscount != null &&
+                    this.ForceDiscount.Equals(input.ForceDiscount))
+                ) && 
                 (
                     this.StartDate == input.StartDate ||
                     (this.StartDate != null &&
@@ -1293,6 +1422,31 @@ public bool Equals(Voucher input)
                     this.ExpiryDate == input.ExpiryDate ||
                     (this.ExpiryDate != null &&
                     this.ExpiryDate.Equals(input.ExpiryDate))
+                ) && 
+                (
+                    this.ChannelRestrictions == input.ChannelRestrictions ||
+                    this.ChannelRestrictions != null &&
+                    this.ChannelRestrictions.SequenceEqual(input.ChannelRestrictions)
+                ) && 
+                (
+                    this.ValidityPeriods == input.ValidityPeriods ||
+                    this.ValidityPeriods != null &&
+                    this.ValidityPeriods.SequenceEqual(input.ValidityPeriods)
+                ) && 
+                (
+                    this.VoucherSubType == input.VoucherSubType ||
+                    (this.VoucherSubType != null &&
+                    this.VoucherSubType.Equals(input.VoucherSubType))
+                ) && 
+                (
+                    this.CustomerId == input.CustomerId ||
+                    (this.CustomerId != null &&
+                    this.CustomerId.Equals(input.CustomerId))
+                ) && 
+                (
+                    this.MaxRedemptions == input.MaxRedemptions ||
+                    (this.MaxRedemptions != null &&
+                    this.MaxRedemptions.Equals(input.MaxRedemptions))
                 );
         }
 
@@ -1311,16 +1465,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Status.GetHashCode();
                 if (this.VoucherType != null)
                     hashCode = hashCode * 59 + this.VoucherType.GetHashCode();
-                if (this.VoucherSubType != null)
-                    hashCode = hashCode * 59 + this.VoucherSubType.GetHashCode();
                 if (this.Currency != null)
                     hashCode = hashCode * 59 + this.Currency.GetHashCode();
-                if (this.Stores != null)
-                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
                 if (this.StoreNames != null)
                     hashCode = hashCode * 59 + this.StoreNames.GetHashCode();
-                if (this.AddItemDetails != null)
-                    hashCode = hashCode * 59 + this.AddItemDetails.GetHashCode();
+                if (this.PromotionDetails != null)
+                    hashCode = hashCode * 59 + this.PromotionDetails.GetHashCode();
                 if (this.CreditNoteDetails != null)
                     hashCode = hashCode * 59 + this.CreditNoteDetails.GetHashCode();
                 if (this.LumpDiscountDetails != null)
@@ -1331,6 +1481,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Code.GetHashCode();
                 if (this.Description != null)
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.Stores != null)
+                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
                 if (this.ValidOnOrdersOver != null)
                     hashCode = hashCode * 59 + this.ValidOnOrdersOver.GetHashCode();
                 if (this.TakesPriority != null)
@@ -1355,23 +1507,29 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.IsValidOncePerCustomer.GetHashCode();
                 if (this.IsValidOnlyOnce != null)
                     hashCode = hashCode * 59 + this.IsValidOnlyOnce.GetHashCode();
+                if (this.IsDiscoverable != null)
+                    hashCode = hashCode * 59 + this.IsDiscoverable.GetHashCode();
+                if (this.IsPromoted != null)
+                    hashCode = hashCode * 59 + this.IsPromoted.GetHashCode();
+                if (this.ForceDiscount != null)
+                    hashCode = hashCode * 59 + this.ForceDiscount.GetHashCode();
                 if (this.StartDate != null)
                     hashCode = hashCode * 59 + this.StartDate.GetHashCode();
                 if (this.ExpiryDate != null)
                     hashCode = hashCode * 59 + this.ExpiryDate.GetHashCode();
+                if (this.ChannelRestrictions != null)
+                    hashCode = hashCode * 59 + this.ChannelRestrictions.GetHashCode();
+                if (this.ValidityPeriods != null)
+                    hashCode = hashCode * 59 + this.ValidityPeriods.GetHashCode();
+                if (this.VoucherSubType != null)
+                    hashCode = hashCode * 59 + this.VoucherSubType.GetHashCode();
+                if (this.CustomerId != null)
+                    hashCode = hashCode * 59 + this.CustomerId.GetHashCode();
+                if (this.MaxRedemptions != null)
+                    hashCode = hashCode * 59 + this.MaxRedemptions.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/VoucherAppliedEvent.cs b/src/Flipdish/Model/VoucherAppliedEvent.cs
new file mode 100644
index 00000000..e14e5a1a
--- /dev/null
+++ b/src/Flipdish/Model/VoucherAppliedEvent.cs
@@ -0,0 +1,283 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// Voucher Applied Event
+    /// </summary>
+    [DataContract]
+    public partial class VoucherAppliedEvent :  IEquatable<VoucherAppliedEvent>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VoucherAppliedEvent" /> class.
+        /// </summary>
+        /// <param name="voucherId">Voucher Id.</param>
+        /// <param name="eventName">The event name.</param>
+        /// <param name="orderId">Order id.</param>
+        /// <param name="flipdishEventId">The identitfier of the event.</param>
+        /// <param name="createTime">The time of creation of the event.</param>
+        /// <param name="position">Position.</param>
+        /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
+        /// <param name="ipAddress">Ip Address.</param>
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public VoucherAppliedEvent(int? voucherId = default(int?), string eventName = default(string), int? orderId = default(int?), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
+        {
+            this.VoucherId = voucherId;
+            this.EventName = eventName;
+            this.OrderId = orderId;
+            this.FlipdishEventId = flipdishEventId;
+            this.CreateTime = createTime;
+            this.Position = position;
+            this.AppId = appId;
+            this.OrgId = orgId;
+            this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
+        }
+        
+        /// <summary>
+        /// Voucher Id
+        /// </summary>
+        /// <value>Voucher Id</value>
+        [DataMember(Name="VoucherId", EmitDefaultValue=false)]
+        public int? VoucherId { get; set; }
+
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
+        /// <summary>
+        /// Order id
+        /// </summary>
+        /// <value>Order id</value>
+        [DataMember(Name="OrderId", EmitDefaultValue=false)]
+        public int? OrderId { get; set; }
+
+        /// <summary>
+        /// The identitfier of the event
+        /// </summary>
+        /// <value>The identitfier of the event</value>
+        [DataMember(Name="FlipdishEventId", EmitDefaultValue=false)]
+        public Guid? FlipdishEventId { get; set; }
+
+        /// <summary>
+        /// The time of creation of the event
+        /// </summary>
+        /// <value>The time of creation of the event</value>
+        [DataMember(Name="CreateTime", EmitDefaultValue=false)]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// Position
+        /// </summary>
+        /// <value>Position</value>
+        [DataMember(Name="Position", EmitDefaultValue=false)]
+        public int? Position { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppId", EmitDefaultValue=false)]
+        public string AppId { get; set; }
+
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// Ip Address
+        /// </summary>
+        /// <value>Ip Address</value>
+        [DataMember(Name="IpAddress", EmitDefaultValue=false)]
+        public string IpAddress { get; set; }
+
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class VoucherAppliedEvent {\n");
+            sb.Append("  VoucherId: ").Append(VoucherId).Append("\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
+            sb.Append("  OrderId: ").Append(OrderId).Append("\n");
+            sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
+            sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
+            sb.Append("  Position: ").Append(Position).Append("\n");
+            sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as VoucherAppliedEvent);
+        }
+
+        /// <summary>
+        /// Returns true if VoucherAppliedEvent instances are equal
+        /// </summary>
+        /// <param name="input">Instance of VoucherAppliedEvent to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(VoucherAppliedEvent input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.VoucherId == input.VoucherId ||
+                    (this.VoucherId != null &&
+                    this.VoucherId.Equals(input.VoucherId))
+                ) && 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
+                (
+                    this.OrderId == input.OrderId ||
+                    (this.OrderId != null &&
+                    this.OrderId.Equals(input.OrderId))
+                ) && 
+                (
+                    this.FlipdishEventId == input.FlipdishEventId ||
+                    (this.FlipdishEventId != null &&
+                    this.FlipdishEventId.Equals(input.FlipdishEventId))
+                ) && 
+                (
+                    this.CreateTime == input.CreateTime ||
+                    (this.CreateTime != null &&
+                    this.CreateTime.Equals(input.CreateTime))
+                ) && 
+                (
+                    this.Position == input.Position ||
+                    (this.Position != null &&
+                    this.Position.Equals(input.Position))
+                ) && 
+                (
+                    this.AppId == input.AppId ||
+                    (this.AppId != null &&
+                    this.AppId.Equals(input.AppId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.IpAddress == input.IpAddress ||
+                    (this.IpAddress != null &&
+                    this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.VoucherId != null)
+                    hashCode = hashCode * 59 + this.VoucherId.GetHashCode();
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
+                if (this.OrderId != null)
+                    hashCode = hashCode * 59 + this.OrderId.GetHashCode();
+                if (this.FlipdishEventId != null)
+                    hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
+                if (this.CreateTime != null)
+                    hashCode = hashCode * 59 + this.CreateTime.GetHashCode();
+                if (this.Position != null)
+                    hashCode = hashCode * 59 + this.Position.GetHashCode();
+                if (this.AppId != null)
+                    hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.IpAddress != null)
+                    hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/VoucherBase.cs b/src/Flipdish/Model/VoucherBase.cs
deleted file mode 100644
index 8488f394..00000000
--- a/src/Flipdish/Model/VoucherBase.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-/* 
- * Flipdish Open API v1.0
- *
- * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
- *
- * OpenAPI spec version: v1.0
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-using System;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
-using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
-
-namespace Flipdish.Model
-{
-    /// <summary>
-    /// Voucher Base
-    /// </summary>
-    [DataContract]
-    public partial class VoucherBase :  IEquatable<VoucherBase>, IValidatableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VoucherBase" /> class.
-        /// </summary>
-        /// <param name="code">Voucher Code.</param>
-        /// <param name="description">Voucher Description (Visible on printout).</param>
-        /// <param name="validOnOrdersOver">Valid on orders on or above.</param>
-        /// <param name="takesPriority">Takes priority.</param>
-        /// <param name="isEnabled">Is voucher enabled.</param>
-        /// <param name="isAutomaticallyApplied">Is voucher automatically applied.</param>
-        /// <param name="includeDeliveryFee">Include delivery fees.</param>
-        /// <param name="isValidForDeliveryOrders">Valid for delivery orders.</param>
-        /// <param name="isValidForPickupOrders">Valid for pickup orders.</param>
-        /// <param name="isValidForOrdersPayedOnline">Valid for orders payed online.</param>
-        /// <param name="isValidForOrdersPayedByCash">Valid for orders payed in cash.</param>
-        /// <param name="isValidForFirstOrderOnly">Valid only on the first order by the customer.</param>
-        /// <param name="isValidOncePerCustomer">Valid once per customer.</param>
-        /// <param name="isValidOnlyOnce">Valid only once, by any customer (once used cannot be used again by any other customer).</param>
-        /// <param name="startDate">Voucher Starts On (Time in UTC).</param>
-        /// <param name="expiryDate">Voucher Expires On (Time in UTC).</param>
-        public VoucherBase(string code = default(string), string description = default(string), double? validOnOrdersOver = default(double?), bool? takesPriority = default(bool?), bool? isEnabled = default(bool?), bool? isAutomaticallyApplied = default(bool?), bool? includeDeliveryFee = default(bool?), bool? isValidForDeliveryOrders = default(bool?), bool? isValidForPickupOrders = default(bool?), bool? isValidForOrdersPayedOnline = default(bool?), bool? isValidForOrdersPayedByCash = default(bool?), bool? isValidForFirstOrderOnly = default(bool?), bool? isValidOncePerCustomer = default(bool?), bool? isValidOnlyOnce = default(bool?), DateTime? startDate = default(DateTime?), DateTime? expiryDate = default(DateTime?))
-        {
-            this.Code = code;
-            this.Description = description;
-            this.ValidOnOrdersOver = validOnOrdersOver;
-            this.TakesPriority = takesPriority;
-            this.IsEnabled = isEnabled;
-            this.IsAutomaticallyApplied = isAutomaticallyApplied;
-            this.IncludeDeliveryFee = includeDeliveryFee;
-            this.IsValidForDeliveryOrders = isValidForDeliveryOrders;
-            this.IsValidForPickupOrders = isValidForPickupOrders;
-            this.IsValidForOrdersPayedOnline = isValidForOrdersPayedOnline;
-            this.IsValidForOrdersPayedByCash = isValidForOrdersPayedByCash;
-            this.IsValidForFirstOrderOnly = isValidForFirstOrderOnly;
-            this.IsValidOncePerCustomer = isValidOncePerCustomer;
-            this.IsValidOnlyOnce = isValidOnlyOnce;
-            this.StartDate = startDate;
-            this.ExpiryDate = expiryDate;
-        }
-        
-        /// <summary>
-        /// Voucher Code
-        /// </summary>
-        /// <value>Voucher Code</value>
-        [DataMember(Name="Code", EmitDefaultValue=false)]
-        public string Code { get; set; }
-
-        /// <summary>
-        /// Voucher Description (Visible on printout)
-        /// </summary>
-        /// <value>Voucher Description (Visible on printout)</value>
-        [DataMember(Name="Description", EmitDefaultValue=false)]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Valid on orders on or above
-        /// </summary>
-        /// <value>Valid on orders on or above</value>
-        [DataMember(Name="ValidOnOrdersOver", EmitDefaultValue=false)]
-        public double? ValidOnOrdersOver { get; set; }
-
-        /// <summary>
-        /// Takes priority
-        /// </summary>
-        /// <value>Takes priority</value>
-        [DataMember(Name="TakesPriority", EmitDefaultValue=false)]
-        public bool? TakesPriority { get; set; }
-
-        /// <summary>
-        /// Is voucher enabled
-        /// </summary>
-        /// <value>Is voucher enabled</value>
-        [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
-        public bool? IsEnabled { get; set; }
-
-        /// <summary>
-        /// Is voucher automatically applied
-        /// </summary>
-        /// <value>Is voucher automatically applied</value>
-        [DataMember(Name="IsAutomaticallyApplied", EmitDefaultValue=false)]
-        public bool? IsAutomaticallyApplied { get; set; }
-
-        /// <summary>
-        /// Include delivery fees
-        /// </summary>
-        /// <value>Include delivery fees</value>
-        [DataMember(Name="IncludeDeliveryFee", EmitDefaultValue=false)]
-        public bool? IncludeDeliveryFee { get; set; }
-
-        /// <summary>
-        /// Valid for delivery orders
-        /// </summary>
-        /// <value>Valid for delivery orders</value>
-        [DataMember(Name="IsValidForDeliveryOrders", EmitDefaultValue=false)]
-        public bool? IsValidForDeliveryOrders { get; set; }
-
-        /// <summary>
-        /// Valid for pickup orders
-        /// </summary>
-        /// <value>Valid for pickup orders</value>
-        [DataMember(Name="IsValidForPickupOrders", EmitDefaultValue=false)]
-        public bool? IsValidForPickupOrders { get; set; }
-
-        /// <summary>
-        /// Valid for orders payed online
-        /// </summary>
-        /// <value>Valid for orders payed online</value>
-        [DataMember(Name="IsValidForOrdersPayedOnline", EmitDefaultValue=false)]
-        public bool? IsValidForOrdersPayedOnline { get; set; }
-
-        /// <summary>
-        /// Valid for orders payed in cash
-        /// </summary>
-        /// <value>Valid for orders payed in cash</value>
-        [DataMember(Name="IsValidForOrdersPayedByCash", EmitDefaultValue=false)]
-        public bool? IsValidForOrdersPayedByCash { get; set; }
-
-        /// <summary>
-        /// Valid only on the first order by the customer
-        /// </summary>
-        /// <value>Valid only on the first order by the customer</value>
-        [DataMember(Name="IsValidForFirstOrderOnly", EmitDefaultValue=false)]
-        public bool? IsValidForFirstOrderOnly { get; set; }
-
-        /// <summary>
-        /// Valid once per customer
-        /// </summary>
-        /// <value>Valid once per customer</value>
-        [DataMember(Name="IsValidOncePerCustomer", EmitDefaultValue=false)]
-        public bool? IsValidOncePerCustomer { get; set; }
-
-        /// <summary>
-        /// Valid only once, by any customer (once used cannot be used again by any other customer)
-        /// </summary>
-        /// <value>Valid only once, by any customer (once used cannot be used again by any other customer)</value>
-        [DataMember(Name="IsValidOnlyOnce", EmitDefaultValue=false)]
-        public bool? IsValidOnlyOnce { get; set; }
-
-        /// <summary>
-        /// Voucher Starts On (Time in UTC)
-        /// </summary>
-        /// <value>Voucher Starts On (Time in UTC)</value>
-        [DataMember(Name="StartDate", EmitDefaultValue=false)]
-        public DateTime? StartDate { get; set; }
-
-        /// <summary>
-        /// Voucher Expires On (Time in UTC)
-        /// </summary>
-        /// <value>Voucher Expires On (Time in UTC)</value>
-        [DataMember(Name="ExpiryDate", EmitDefaultValue=false)]
-        public DateTime? ExpiryDate { get; set; }
-
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class VoucherBase {\n");
-            sb.Append("  Code: ").Append(Code).Append("\n");
-            sb.Append("  Description: ").Append(Description).Append("\n");
-            sb.Append("  ValidOnOrdersOver: ").Append(ValidOnOrdersOver).Append("\n");
-            sb.Append("  TakesPriority: ").Append(TakesPriority).Append("\n");
-            sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
-            sb.Append("  IsAutomaticallyApplied: ").Append(IsAutomaticallyApplied).Append("\n");
-            sb.Append("  IncludeDeliveryFee: ").Append(IncludeDeliveryFee).Append("\n");
-            sb.Append("  IsValidForDeliveryOrders: ").Append(IsValidForDeliveryOrders).Append("\n");
-            sb.Append("  IsValidForPickupOrders: ").Append(IsValidForPickupOrders).Append("\n");
-            sb.Append("  IsValidForOrdersPayedOnline: ").Append(IsValidForOrdersPayedOnline).Append("\n");
-            sb.Append("  IsValidForOrdersPayedByCash: ").Append(IsValidForOrdersPayedByCash).Append("\n");
-            sb.Append("  IsValidForFirstOrderOnly: ").Append(IsValidForFirstOrderOnly).Append("\n");
-            sb.Append("  IsValidOncePerCustomer: ").Append(IsValidOncePerCustomer).Append("\n");
-            sb.Append("  IsValidOnlyOnce: ").Append(IsValidOnlyOnce).Append("\n");
-            sb.Append("  StartDate: ").Append(StartDate).Append("\n");
-            sb.Append("  ExpiryDate: ").Append(ExpiryDate).Append("\n");
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-  
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public virtual string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as VoucherBase);
-        }
-
-        /// <summary>
-        /// Returns true if VoucherBase instances are equal
-        /// </summary>
-        /// <param name="input">Instance of VoucherBase to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(VoucherBase input)
-        {
-            if (input == null)
-                return false;
-
-            return 
-                (
-                    this.Code == input.Code ||
-                    (this.Code != null &&
-                    this.Code.Equals(input.Code))
-                ) && 
-                (
-                    this.Description == input.Description ||
-                    (this.Description != null &&
-                    this.Description.Equals(input.Description))
-                ) && 
-                (
-                    this.ValidOnOrdersOver == input.ValidOnOrdersOver ||
-                    (this.ValidOnOrdersOver != null &&
-                    this.ValidOnOrdersOver.Equals(input.ValidOnOrdersOver))
-                ) && 
-                (
-                    this.TakesPriority == input.TakesPriority ||
-                    (this.TakesPriority != null &&
-                    this.TakesPriority.Equals(input.TakesPriority))
-                ) && 
-                (
-                    this.IsEnabled == input.IsEnabled ||
-                    (this.IsEnabled != null &&
-                    this.IsEnabled.Equals(input.IsEnabled))
-                ) && 
-                (
-                    this.IsAutomaticallyApplied == input.IsAutomaticallyApplied ||
-                    (this.IsAutomaticallyApplied != null &&
-                    this.IsAutomaticallyApplied.Equals(input.IsAutomaticallyApplied))
-                ) && 
-                (
-                    this.IncludeDeliveryFee == input.IncludeDeliveryFee ||
-                    (this.IncludeDeliveryFee != null &&
-                    this.IncludeDeliveryFee.Equals(input.IncludeDeliveryFee))
-                ) && 
-                (
-                    this.IsValidForDeliveryOrders == input.IsValidForDeliveryOrders ||
-                    (this.IsValidForDeliveryOrders != null &&
-                    this.IsValidForDeliveryOrders.Equals(input.IsValidForDeliveryOrders))
-                ) && 
-                (
-                    this.IsValidForPickupOrders == input.IsValidForPickupOrders ||
-                    (this.IsValidForPickupOrders != null &&
-                    this.IsValidForPickupOrders.Equals(input.IsValidForPickupOrders))
-                ) && 
-                (
-                    this.IsValidForOrdersPayedOnline == input.IsValidForOrdersPayedOnline ||
-                    (this.IsValidForOrdersPayedOnline != null &&
-                    this.IsValidForOrdersPayedOnline.Equals(input.IsValidForOrdersPayedOnline))
-                ) && 
-                (
-                    this.IsValidForOrdersPayedByCash == input.IsValidForOrdersPayedByCash ||
-                    (this.IsValidForOrdersPayedByCash != null &&
-                    this.IsValidForOrdersPayedByCash.Equals(input.IsValidForOrdersPayedByCash))
-                ) && 
-                (
-                    this.IsValidForFirstOrderOnly == input.IsValidForFirstOrderOnly ||
-                    (this.IsValidForFirstOrderOnly != null &&
-                    this.IsValidForFirstOrderOnly.Equals(input.IsValidForFirstOrderOnly))
-                ) && 
-                (
-                    this.IsValidOncePerCustomer == input.IsValidOncePerCustomer ||
-                    (this.IsValidOncePerCustomer != null &&
-                    this.IsValidOncePerCustomer.Equals(input.IsValidOncePerCustomer))
-                ) && 
-                (
-                    this.IsValidOnlyOnce == input.IsValidOnlyOnce ||
-                    (this.IsValidOnlyOnce != null &&
-                    this.IsValidOnlyOnce.Equals(input.IsValidOnlyOnce))
-                ) && 
-                (
-                    this.StartDate == input.StartDate ||
-                    (this.StartDate != null &&
-                    this.StartDate.Equals(input.StartDate))
-                ) && 
-                (
-                    this.ExpiryDate == input.ExpiryDate ||
-                    (this.ExpiryDate != null &&
-                    this.ExpiryDate.Equals(input.ExpiryDate))
-                );
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Code != null)
-                    hashCode = hashCode * 59 + this.Code.GetHashCode();
-                if (this.Description != null)
-                    hashCode = hashCode * 59 + this.Description.GetHashCode();
-                if (this.ValidOnOrdersOver != null)
-                    hashCode = hashCode * 59 + this.ValidOnOrdersOver.GetHashCode();
-                if (this.TakesPriority != null)
-                    hashCode = hashCode * 59 + this.TakesPriority.GetHashCode();
-                if (this.IsEnabled != null)
-                    hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
-                if (this.IsAutomaticallyApplied != null)
-                    hashCode = hashCode * 59 + this.IsAutomaticallyApplied.GetHashCode();
-                if (this.IncludeDeliveryFee != null)
-                    hashCode = hashCode * 59 + this.IncludeDeliveryFee.GetHashCode();
-                if (this.IsValidForDeliveryOrders != null)
-                    hashCode = hashCode * 59 + this.IsValidForDeliveryOrders.GetHashCode();
-                if (this.IsValidForPickupOrders != null)
-                    hashCode = hashCode * 59 + this.IsValidForPickupOrders.GetHashCode();
-                if (this.IsValidForOrdersPayedOnline != null)
-                    hashCode = hashCode * 59 + this.IsValidForOrdersPayedOnline.GetHashCode();
-                if (this.IsValidForOrdersPayedByCash != null)
-                    hashCode = hashCode * 59 + this.IsValidForOrdersPayedByCash.GetHashCode();
-                if (this.IsValidForFirstOrderOnly != null)
-                    hashCode = hashCode * 59 + this.IsValidForFirstOrderOnly.GetHashCode();
-                if (this.IsValidOncePerCustomer != null)
-                    hashCode = hashCode * 59 + this.IsValidOncePerCustomer.GetHashCode();
-                if (this.IsValidOnlyOnce != null)
-                    hashCode = hashCode * 59 + this.IsValidOnlyOnce.GetHashCode();
-                if (this.StartDate != null)
-                    hashCode = hashCode * 59 + this.StartDate.GetHashCode();
-                if (this.ExpiryDate != null)
-                    hashCode = hashCode * 59 + this.ExpiryDate.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
-    }
-
-}
diff --git a/src/Flipdish/Model/VoucherCreatedEvent.cs b/src/Flipdish/Model/VoucherCreatedEvent.cs
index 05c3587a..24060b24 100644
--- a/src/Flipdish/Model/VoucherCreatedEvent.cs
+++ b/src/Flipdish/Model/VoucherCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Voucher Created Event
     /// </summary>
     [DataContract]
-    public partial class VoucherCreatedEvent :  IEquatable<VoucherCreatedEvent>, IValidatableObject
+    public partial class VoucherCreatedEvent :  IEquatable<VoucherCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="VoucherCreatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class VoucherCreatedEvent :  IEquatable<VoucherCreatedEvent>, IVa
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public VoucherCreatedEvent(int? voucherId = default(int?), string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Voucher voucher = default(Voucher), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public VoucherCreatedEvent(int? voucherId = default(int?), string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Voucher voucher = default(Voucher), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.VoucherId = voucherId;
             this.EventName = eventName;
@@ -54,7 +55,10 @@ public partial class VoucherCreatedEvent :  IEquatable<VoucherCreatedEvent>, IVa
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class VoucherCreatedEvent :  IEquatable<VoucherCreatedEvent>, IVa
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class VoucherCreatedEvent :  IEquatable<VoucherCreatedEvent>, IVa
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(VoucherCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/VoucherDataPoint.cs b/src/Flipdish/Model/VoucherDataPoint.cs
index 61546886..6e3b0cca 100644
--- a/src/Flipdish/Model/VoucherDataPoint.cs
+++ b/src/Flipdish/Model/VoucherDataPoint.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// A single data point in timeline graphs related to Vouchers
     /// </summary>
     [DataContract]
-    public partial class VoucherDataPoint :  IEquatable<VoucherDataPoint>, IValidatableObject
+    public partial class VoucherDataPoint :  IEquatable<VoucherDataPoint>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="VoucherDataPoint" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/VoucherDeletedEvent.cs b/src/Flipdish/Model/VoucherDeletedEvent.cs
index f67cd772..5ab212bf 100644
--- a/src/Flipdish/Model/VoucherDeletedEvent.cs
+++ b/src/Flipdish/Model/VoucherDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Voucher Deleted Event
     /// </summary>
     [DataContract]
-    public partial class VoucherDeletedEvent :  IEquatable<VoucherDeletedEvent>, IValidatableObject
+    public partial class VoucherDeletedEvent :  IEquatable<VoucherDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="VoucherDeletedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class VoucherDeletedEvent :  IEquatable<VoucherDeletedEvent>, IVa
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public VoucherDeletedEvent(int? voucherId = default(int?), string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Voucher voucher = default(Voucher), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public VoucherDeletedEvent(int? voucherId = default(int?), string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Voucher voucher = default(Voucher), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.VoucherId = voucherId;
             this.EventName = eventName;
@@ -54,7 +55,10 @@ public partial class VoucherDeletedEvent :  IEquatable<VoucherDeletedEvent>, IVa
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class VoucherDeletedEvent :  IEquatable<VoucherDeletedEvent>, IVa
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class VoucherDeletedEvent :  IEquatable<VoucherDeletedEvent>, IVa
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(VoucherDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/VoucherSummary.cs b/src/Flipdish/Model/VoucherSummary.cs
index 1da03475..816f19d1 100644
--- a/src/Flipdish/Model/VoucherSummary.cs
+++ b/src/Flipdish/Model/VoucherSummary.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Voucher Summary
     /// </summary>
     [DataContract]
-    public partial class VoucherSummary :  IEquatable<VoucherSummary>, IValidatableObject
+    public partial class VoucherSummary :  IEquatable<VoucherSummary>
     {
         /// <summary>
         /// Voucher Status
@@ -105,7 +103,13 @@ public enum VoucherTypeEnum
             /// Enum CreditNote for value: CreditNote
             /// </summary>
             [EnumMember(Value = "CreditNote")]
-            CreditNote = 4
+            CreditNote = 4,
+            
+            /// <summary>
+            /// Enum FreeDelivery for value: FreeDelivery
+            /// </summary>
+            [EnumMember(Value = "FreeDelivery")]
+            FreeDelivery = 5
         }
 
         /// <summary>
@@ -172,6 +176,57 @@ public enum VoucherSubTypeEnum
         [DataMember(Name="VoucherSubType", EmitDefaultValue=false)]
         public VoucherSubTypeEnum? VoucherSubType { get; set; }
         /// <summary>
+        /// Defines ChannelRestrictions
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ChannelRestrictionsEnum
+        {
+            
+            /// <summary>
+            /// Enum Ios for value: Ios
+            /// </summary>
+            [EnumMember(Value = "Ios")]
+            Ios = 1,
+            
+            /// <summary>
+            /// Enum Android for value: Android
+            /// </summary>
+            [EnumMember(Value = "Android")]
+            Android = 2,
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 3,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 4,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 5,
+            
+            /// <summary>
+            /// Enum Google for value: Google
+            /// </summary>
+            [EnumMember(Value = "Google")]
+            Google = 6
+        }
+
+
+        /// <summary>
+        /// Channels the voucher is restricted to
+        /// </summary>
+        /// <value>Channels the voucher is restricted to</value>
+        [DataMember(Name="ChannelRestrictions", EmitDefaultValue=false)]
+        public List<ChannelRestrictionsEnum> ChannelRestrictions { get; set; }
+        /// <summary>
         /// Initializes a new instance of the <see cref="VoucherSummary" /> class.
         /// </summary>
         /// <param name="voucherId">Voucher Id.</param>
@@ -181,7 +236,11 @@ public enum VoucherSubTypeEnum
         /// <param name="voucherSubType">Voucher Sub Type.</param>
         /// <param name="description">Voucher Description (Visible on printout).</param>
         /// <param name="isEnabled">Is voucher enabled.</param>
-        public VoucherSummary(int? voucherId = default(int?), string code = default(string), StatusEnum? status = default(StatusEnum?), VoucherTypeEnum? voucherType = default(VoucherTypeEnum?), VoucherSubTypeEnum? voucherSubType = default(VoucherSubTypeEnum?), string description = default(string), bool? isEnabled = default(bool?))
+        /// <param name="isPromoted">Marks the voucher as promoted.</param>
+        /// <param name="storeNames">Store names associated with this voucher.</param>
+        /// <param name="isAvailableOnAllStores">True if the voucher is available on all active stores in the app.</param>
+        /// <param name="channelRestrictions">Channels the voucher is restricted to.</param>
+        public VoucherSummary(int? voucherId = default(int?), string code = default(string), StatusEnum? status = default(StatusEnum?), VoucherTypeEnum? voucherType = default(VoucherTypeEnum?), VoucherSubTypeEnum? voucherSubType = default(VoucherSubTypeEnum?), string description = default(string), bool? isEnabled = default(bool?), bool? isPromoted = default(bool?), List<string> storeNames = default(List<string>), bool? isAvailableOnAllStores = default(bool?), List<ChannelRestrictionsEnum> channelRestrictions = default(List<ChannelRestrictionsEnum>))
         {
             this.VoucherId = voucherId;
             this.Code = code;
@@ -190,6 +249,10 @@ public enum VoucherSubTypeEnum
             this.VoucherSubType = voucherSubType;
             this.Description = description;
             this.IsEnabled = isEnabled;
+            this.IsPromoted = isPromoted;
+            this.StoreNames = storeNames;
+            this.IsAvailableOnAllStores = isAvailableOnAllStores;
+            this.ChannelRestrictions = channelRestrictions;
         }
         
         /// <summary>
@@ -223,6 +286,28 @@ public enum VoucherSubTypeEnum
         [DataMember(Name="IsEnabled", EmitDefaultValue=false)]
         public bool? IsEnabled { get; set; }
 
+        /// <summary>
+        /// Marks the voucher as promoted
+        /// </summary>
+        /// <value>Marks the voucher as promoted</value>
+        [DataMember(Name="IsPromoted", EmitDefaultValue=false)]
+        public bool? IsPromoted { get; set; }
+
+        /// <summary>
+        /// Store names associated with this voucher
+        /// </summary>
+        /// <value>Store names associated with this voucher</value>
+        [DataMember(Name="StoreNames", EmitDefaultValue=false)]
+        public List<string> StoreNames { get; set; }
+
+        /// <summary>
+        /// True if the voucher is available on all active stores in the app
+        /// </summary>
+        /// <value>True if the voucher is available on all active stores in the app</value>
+        [DataMember(Name="IsAvailableOnAllStores", EmitDefaultValue=false)]
+        public bool? IsAvailableOnAllStores { get; set; }
+
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -238,6 +323,10 @@ public override string ToString()
             sb.Append("  VoucherSubType: ").Append(VoucherSubType).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
+            sb.Append("  IsPromoted: ").Append(IsPromoted).Append("\n");
+            sb.Append("  StoreNames: ").Append(StoreNames).Append("\n");
+            sb.Append("  IsAvailableOnAllStores: ").Append(IsAvailableOnAllStores).Append("\n");
+            sb.Append("  ChannelRestrictions: ").Append(ChannelRestrictions).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -306,6 +395,26 @@ public bool Equals(VoucherSummary input)
                     this.IsEnabled == input.IsEnabled ||
                     (this.IsEnabled != null &&
                     this.IsEnabled.Equals(input.IsEnabled))
+                ) && 
+                (
+                    this.IsPromoted == input.IsPromoted ||
+                    (this.IsPromoted != null &&
+                    this.IsPromoted.Equals(input.IsPromoted))
+                ) && 
+                (
+                    this.StoreNames == input.StoreNames ||
+                    this.StoreNames != null &&
+                    this.StoreNames.SequenceEqual(input.StoreNames)
+                ) && 
+                (
+                    this.IsAvailableOnAllStores == input.IsAvailableOnAllStores ||
+                    (this.IsAvailableOnAllStores != null &&
+                    this.IsAvailableOnAllStores.Equals(input.IsAvailableOnAllStores))
+                ) && 
+                (
+                    this.ChannelRestrictions == input.ChannelRestrictions ||
+                    this.ChannelRestrictions != null &&
+                    this.ChannelRestrictions.SequenceEqual(input.ChannelRestrictions)
                 );
         }
 
@@ -332,19 +441,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
                 if (this.IsEnabled != null)
                     hashCode = hashCode * 59 + this.IsEnabled.GetHashCode();
+                if (this.IsPromoted != null)
+                    hashCode = hashCode * 59 + this.IsPromoted.GetHashCode();
+                if (this.StoreNames != null)
+                    hashCode = hashCode * 59 + this.StoreNames.GetHashCode();
+                if (this.IsAvailableOnAllStores != null)
+                    hashCode = hashCode * 59 + this.IsAvailableOnAllStores.GetHashCode();
+                if (this.ChannelRestrictions != null)
+                    hashCode = hashCode * 59 + this.ChannelRestrictions.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/VoucherUpdatedEvent.cs b/src/Flipdish/Model/VoucherUpdatedEvent.cs
index ccdce2ee..babf3f3e 100644
--- a/src/Flipdish/Model/VoucherUpdatedEvent.cs
+++ b/src/Flipdish/Model/VoucherUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Voucher Updated Event
     /// </summary>
     [DataContract]
-    public partial class VoucherUpdatedEvent :  IEquatable<VoucherUpdatedEvent>, IValidatableObject
+    public partial class VoucherUpdatedEvent :  IEquatable<VoucherUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="VoucherUpdatedEvent" /> class.
@@ -42,8 +40,11 @@ public partial class VoucherUpdatedEvent :  IEquatable<VoucherUpdatedEvent>, IVa
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public VoucherUpdatedEvent(int? voucherId = default(int?), string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Voucher voucher = default(Voucher), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public VoucherUpdatedEvent(int? voucherId = default(int?), string eventName = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), Voucher voucher = default(Voucher), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.VoucherId = voucherId;
             this.EventName = eventName;
@@ -54,7 +55,10 @@ public partial class VoucherUpdatedEvent :  IEquatable<VoucherUpdatedEvent>, IVa
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -120,6 +124,13 @@ public partial class VoucherUpdatedEvent :  IEquatable<VoucherUpdatedEvent>, IVa
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -127,6 +138,20 @@ public partial class VoucherUpdatedEvent :  IEquatable<VoucherUpdatedEvent>, IVa
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -144,7 +169,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -224,10 +252,25 @@ public bool Equals(VoucherUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -258,21 +301,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/VoucherWithStats.cs b/src/Flipdish/Model/VoucherWithStats.cs
index 0a2952ef..52491759 100644
--- a/src/Flipdish/Model/VoucherWithStats.cs
+++ b/src/Flipdish/Model/VoucherWithStats.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Voucher With Statistics
     /// </summary>
     [DataContract]
-    public partial class VoucherWithStats :  IEquatable<VoucherWithStats>, IValidatableObject
+    public partial class VoucherWithStats :  IEquatable<VoucherWithStats>
     {
         /// <summary>
         /// Voucher Status
@@ -105,7 +103,13 @@ public enum VoucherTypeEnum
             /// Enum CreditNote for value: CreditNote
             /// </summary>
             [EnumMember(Value = "CreditNote")]
-            CreditNote = 4
+            CreditNote = 4,
+            
+            /// <summary>
+            /// Enum FreeDelivery for value: FreeDelivery
+            /// </summary>
+            [EnumMember(Value = "FreeDelivery")]
+            FreeDelivery = 5
         }
 
         /// <summary>
@@ -115,63 +119,6 @@ public enum VoucherTypeEnum
         [DataMember(Name="VoucherType", EmitDefaultValue=false)]
         public VoucherTypeEnum? VoucherType { get; set; }
         /// <summary>
-        /// Voucher Sub Type
-        /// </summary>
-        /// <value>Voucher Sub Type</value>
-        [JsonConverter(typeof(StringEnumConverter))]
-        public enum VoucherSubTypeEnum
-        {
-            
-            /// <summary>
-            /// Enum None for value: None
-            /// </summary>
-            [EnumMember(Value = "None")]
-            None = 1,
-            
-            /// <summary>
-            /// Enum SignUp for value: SignUp
-            /// </summary>
-            [EnumMember(Value = "SignUp")]
-            SignUp = 2,
-            
-            /// <summary>
-            /// Enum Loyalty for value: Loyalty
-            /// </summary>
-            [EnumMember(Value = "Loyalty")]
-            Loyalty = 3,
-            
-            /// <summary>
-            /// Enum Loyalty25 for value: Loyalty25
-            /// </summary>
-            [EnumMember(Value = "Loyalty25")]
-            Loyalty25 = 4,
-            
-            /// <summary>
-            /// Enum Retention for value: Retention
-            /// </summary>
-            [EnumMember(Value = "Retention")]
-            Retention = 5,
-            
-            /// <summary>
-            /// Enum SecondaryRetention for value: SecondaryRetention
-            /// </summary>
-            [EnumMember(Value = "SecondaryRetention")]
-            SecondaryRetention = 6,
-            
-            /// <summary>
-            /// Enum Custom for value: Custom
-            /// </summary>
-            [EnumMember(Value = "Custom")]
-            Custom = 7
-        }
-
-        /// <summary>
-        /// Voucher Sub Type
-        /// </summary>
-        /// <value>Voucher Sub Type</value>
-        [DataMember(Name="VoucherSubType", EmitDefaultValue=false)]
-        public VoucherSubTypeEnum? VoucherSubType { get; set; }
-        /// <summary>
         /// Currency of the voucher
         /// </summary>
         /// <value>Currency of the voucher</value>
@@ -865,6 +812,114 @@ public enum CurrencyEnum
         [DataMember(Name="Currency", EmitDefaultValue=false)]
         public CurrencyEnum? Currency { get; set; }
         /// <summary>
+        /// Defines ChannelRestrictions
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ChannelRestrictionsEnum
+        {
+            
+            /// <summary>
+            /// Enum Ios for value: Ios
+            /// </summary>
+            [EnumMember(Value = "Ios")]
+            Ios = 1,
+            
+            /// <summary>
+            /// Enum Android for value: Android
+            /// </summary>
+            [EnumMember(Value = "Android")]
+            Android = 2,
+            
+            /// <summary>
+            /// Enum Web for value: Web
+            /// </summary>
+            [EnumMember(Value = "Web")]
+            Web = 3,
+            
+            /// <summary>
+            /// Enum Kiosk for value: Kiosk
+            /// </summary>
+            [EnumMember(Value = "Kiosk")]
+            Kiosk = 4,
+            
+            /// <summary>
+            /// Enum Pos for value: Pos
+            /// </summary>
+            [EnumMember(Value = "Pos")]
+            Pos = 5,
+            
+            /// <summary>
+            /// Enum Google for value: Google
+            /// </summary>
+            [EnumMember(Value = "Google")]
+            Google = 6
+        }
+
+
+        /// <summary>
+        /// Limit the channels this voucher can be used on
+        /// </summary>
+        /// <value>Limit the channels this voucher can be used on</value>
+        [DataMember(Name="ChannelRestrictions", EmitDefaultValue=false)]
+        public List<ChannelRestrictionsEnum> ChannelRestrictions { get; set; }
+        /// <summary>
+        /// Voucher Subtype
+        /// </summary>
+        /// <value>Voucher Subtype</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum VoucherSubTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum None for value: None
+            /// </summary>
+            [EnumMember(Value = "None")]
+            None = 1,
+            
+            /// <summary>
+            /// Enum SignUp for value: SignUp
+            /// </summary>
+            [EnumMember(Value = "SignUp")]
+            SignUp = 2,
+            
+            /// <summary>
+            /// Enum Loyalty for value: Loyalty
+            /// </summary>
+            [EnumMember(Value = "Loyalty")]
+            Loyalty = 3,
+            
+            /// <summary>
+            /// Enum Loyalty25 for value: Loyalty25
+            /// </summary>
+            [EnumMember(Value = "Loyalty25")]
+            Loyalty25 = 4,
+            
+            /// <summary>
+            /// Enum Retention for value: Retention
+            /// </summary>
+            [EnumMember(Value = "Retention")]
+            Retention = 5,
+            
+            /// <summary>
+            /// Enum SecondaryRetention for value: SecondaryRetention
+            /// </summary>
+            [EnumMember(Value = "SecondaryRetention")]
+            SecondaryRetention = 6,
+            
+            /// <summary>
+            /// Enum Custom for value: Custom
+            /// </summary>
+            [EnumMember(Value = "Custom")]
+            Custom = 7
+        }
+
+        /// <summary>
+        /// Voucher Subtype
+        /// </summary>
+        /// <value>Voucher Subtype</value>
+        [DataMember(Name="VoucherSubType", EmitDefaultValue=false)]
+        public VoucherSubTypeEnum? VoucherSubType { get; set; }
+        /// <summary>
         /// Initializes a new instance of the <see cref="VoucherWithStats" /> class.
         /// </summary>
         /// <param name="totalUsed">Total times the voucher was used.</param>
@@ -875,16 +930,15 @@ public enum CurrencyEnum
         /// <param name="voucherId">Voucher Id.</param>
         /// <param name="status">Voucher Status.</param>
         /// <param name="voucherType">Voucher Type.</param>
-        /// <param name="voucherSubType">Voucher Sub Type.</param>
         /// <param name="currency">Currency of the voucher.</param>
-        /// <param name="stores">Stores that this voucher applies to.</param>
         /// <param name="storeNames">Stores that this voucher applies to.</param>
-        /// <param name="addItemDetails">Add item details.</param>
+        /// <param name="promotionDetails">Promotion details.</param>
         /// <param name="creditNoteDetails">Credit note details.</param>
         /// <param name="lumpDiscountDetails">Lump discount details.</param>
         /// <param name="percentDiscountDetails">Percent discount details.</param>
         /// <param name="code">Voucher Code.</param>
         /// <param name="description">Voucher Description (Visible on printout).</param>
+        /// <param name="stores">Stores that this voucher applies to.</param>
         /// <param name="validOnOrdersOver">Valid on orders on or above.</param>
         /// <param name="takesPriority">Takes priority.</param>
         /// <param name="isEnabled">Is voucher enabled.</param>
@@ -897,9 +951,17 @@ public enum CurrencyEnum
         /// <param name="isValidForFirstOrderOnly">Valid only on the first order by the customer.</param>
         /// <param name="isValidOncePerCustomer">Valid once per customer.</param>
         /// <param name="isValidOnlyOnce">Valid only once, by any customer (once used cannot be used again by any other customer).</param>
+        /// <param name="isDiscoverable">Enables the voucher to be offered in the Voucher Discoverability feature.</param>
+        /// <param name="isPromoted">Marks the voucher as promoted.</param>
+        /// <param name="forceDiscount">Force the discount to be applied which bypasses some menu restrictions.</param>
         /// <param name="startDate">Voucher Starts On (Time in UTC).</param>
         /// <param name="expiryDate">Voucher Expires On (Time in UTC).</param>
-        public VoucherWithStats(int? totalUsed = default(int?), int? totalCustomers = default(int?), double? totalAmountFromOrders = default(double?), double? totalDiscounted = default(double?), double? averageOrderSize = default(double?), int? voucherId = default(int?), StatusEnum? status = default(StatusEnum?), VoucherTypeEnum? voucherType = default(VoucherTypeEnum?), VoucherSubTypeEnum? voucherSubType = default(VoucherSubTypeEnum?), CurrencyEnum? currency = default(CurrencyEnum?), List<int?> stores = default(List<int?>), List<string> storeNames = default(List<string>), AddItemDetails addItemDetails = default(AddItemDetails), CreditNoteDetails creditNoteDetails = default(CreditNoteDetails), LumpDiscountDetails lumpDiscountDetails = default(LumpDiscountDetails), PercentDiscountDetails percentDiscountDetails = default(PercentDiscountDetails), string code = default(string), string description = default(string), double? validOnOrdersOver = default(double?), bool? takesPriority = default(bool?), bool? isEnabled = default(bool?), bool? isAutomaticallyApplied = default(bool?), bool? includeDeliveryFee = default(bool?), bool? isValidForDeliveryOrders = default(bool?), bool? isValidForPickupOrders = default(bool?), bool? isValidForOrdersPayedOnline = default(bool?), bool? isValidForOrdersPayedByCash = default(bool?), bool? isValidForFirstOrderOnly = default(bool?), bool? isValidOncePerCustomer = default(bool?), bool? isValidOnlyOnce = default(bool?), DateTime? startDate = default(DateTime?), DateTime? expiryDate = default(DateTime?))
+        /// <param name="channelRestrictions">Limit the channels this voucher can be used on.</param>
+        /// <param name="validityPeriods">Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated..</param>
+        /// <param name="voucherSubType">Voucher Subtype.</param>
+        /// <param name="customerId">Customer UserID.</param>
+        /// <param name="maxRedemptions">Maximum number of times the voucher can be redeemed (used).</param>
+        public VoucherWithStats(int? totalUsed = default(int?), int? totalCustomers = default(int?), double? totalAmountFromOrders = default(double?), double? totalDiscounted = default(double?), double? averageOrderSize = default(double?), int? voucherId = default(int?), StatusEnum? status = default(StatusEnum?), VoucherTypeEnum? voucherType = default(VoucherTypeEnum?), CurrencyEnum? currency = default(CurrencyEnum?), List<string> storeNames = default(List<string>), PromotionDetails promotionDetails = default(PromotionDetails), CreditNoteDetails creditNoteDetails = default(CreditNoteDetails), LumpDiscountDetails lumpDiscountDetails = default(LumpDiscountDetails), PercentDiscountDetails percentDiscountDetails = default(PercentDiscountDetails), string code = default(string), string description = default(string), List<int?> stores = default(List<int?>), double? validOnOrdersOver = default(double?), bool? takesPriority = default(bool?), bool? isEnabled = default(bool?), bool? isAutomaticallyApplied = default(bool?), bool? includeDeliveryFee = default(bool?), bool? isValidForDeliveryOrders = default(bool?), bool? isValidForPickupOrders = default(bool?), bool? isValidForOrdersPayedOnline = default(bool?), bool? isValidForOrdersPayedByCash = default(bool?), bool? isValidForFirstOrderOnly = default(bool?), bool? isValidOncePerCustomer = default(bool?), bool? isValidOnlyOnce = default(bool?), bool? isDiscoverable = default(bool?), bool? isPromoted = default(bool?), bool? forceDiscount = default(bool?), DateTime? startDate = default(DateTime?), DateTime? expiryDate = default(DateTime?), List<ChannelRestrictionsEnum> channelRestrictions = default(List<ChannelRestrictionsEnum>), List<ValidityPeriod> validityPeriods = default(List<ValidityPeriod>), VoucherSubTypeEnum? voucherSubType = default(VoucherSubTypeEnum?), int? customerId = default(int?), int? maxRedemptions = default(int?))
         {
             this.TotalUsed = totalUsed;
             this.TotalCustomers = totalCustomers;
@@ -909,16 +971,15 @@ public enum CurrencyEnum
             this.VoucherId = voucherId;
             this.Status = status;
             this.VoucherType = voucherType;
-            this.VoucherSubType = voucherSubType;
             this.Currency = currency;
-            this.Stores = stores;
             this.StoreNames = storeNames;
-            this.AddItemDetails = addItemDetails;
+            this.PromotionDetails = promotionDetails;
             this.CreditNoteDetails = creditNoteDetails;
             this.LumpDiscountDetails = lumpDiscountDetails;
             this.PercentDiscountDetails = percentDiscountDetails;
             this.Code = code;
             this.Description = description;
+            this.Stores = stores;
             this.ValidOnOrdersOver = validOnOrdersOver;
             this.TakesPriority = takesPriority;
             this.IsEnabled = isEnabled;
@@ -931,8 +992,16 @@ public enum CurrencyEnum
             this.IsValidForFirstOrderOnly = isValidForFirstOrderOnly;
             this.IsValidOncePerCustomer = isValidOncePerCustomer;
             this.IsValidOnlyOnce = isValidOnlyOnce;
+            this.IsDiscoverable = isDiscoverable;
+            this.IsPromoted = isPromoted;
+            this.ForceDiscount = forceDiscount;
             this.StartDate = startDate;
             this.ExpiryDate = expiryDate;
+            this.ChannelRestrictions = channelRestrictions;
+            this.ValidityPeriods = validityPeriods;
+            this.VoucherSubType = voucherSubType;
+            this.CustomerId = customerId;
+            this.MaxRedemptions = maxRedemptions;
         }
         
         /// <summary>
@@ -980,14 +1049,6 @@ public enum CurrencyEnum
 
 
 
-
-        /// <summary>
-        /// Stores that this voucher applies to
-        /// </summary>
-        /// <value>Stores that this voucher applies to</value>
-        [DataMember(Name="Stores", EmitDefaultValue=false)]
-        public List<int?> Stores { get; set; }
-
         /// <summary>
         /// Stores that this voucher applies to
         /// </summary>
@@ -996,11 +1057,11 @@ public enum CurrencyEnum
         public List<string> StoreNames { get; set; }
 
         /// <summary>
-        /// Add item details
+        /// Promotion details
         /// </summary>
-        /// <value>Add item details</value>
-        [DataMember(Name="AddItemDetails", EmitDefaultValue=false)]
-        public AddItemDetails AddItemDetails { get; set; }
+        /// <value>Promotion details</value>
+        [DataMember(Name="PromotionDetails", EmitDefaultValue=false)]
+        public PromotionDetails PromotionDetails { get; set; }
 
         /// <summary>
         /// Credit note details
@@ -1037,6 +1098,13 @@ public enum CurrencyEnum
         [DataMember(Name="Description", EmitDefaultValue=false)]
         public string Description { get; set; }
 
+        /// <summary>
+        /// Stores that this voucher applies to
+        /// </summary>
+        /// <value>Stores that this voucher applies to</value>
+        [DataMember(Name="Stores", EmitDefaultValue=false)]
+        public List<int?> Stores { get; set; }
+
         /// <summary>
         /// Valid on orders on or above
         /// </summary>
@@ -1121,6 +1189,27 @@ public enum CurrencyEnum
         [DataMember(Name="IsValidOnlyOnce", EmitDefaultValue=false)]
         public bool? IsValidOnlyOnce { get; set; }
 
+        /// <summary>
+        /// Enables the voucher to be offered in the Voucher Discoverability feature
+        /// </summary>
+        /// <value>Enables the voucher to be offered in the Voucher Discoverability feature</value>
+        [DataMember(Name="IsDiscoverable", EmitDefaultValue=false)]
+        public bool? IsDiscoverable { get; set; }
+
+        /// <summary>
+        /// Marks the voucher as promoted
+        /// </summary>
+        /// <value>Marks the voucher as promoted</value>
+        [DataMember(Name="IsPromoted", EmitDefaultValue=false)]
+        public bool? IsPromoted { get; set; }
+
+        /// <summary>
+        /// Force the discount to be applied which bypasses some menu restrictions
+        /// </summary>
+        /// <value>Force the discount to be applied which bypasses some menu restrictions</value>
+        [DataMember(Name="ForceDiscount", EmitDefaultValue=false)]
+        public bool? ForceDiscount { get; set; }
+
         /// <summary>
         /// Voucher Starts On (Time in UTC)
         /// </summary>
@@ -1135,6 +1224,29 @@ public enum CurrencyEnum
         [DataMember(Name="ExpiryDate", EmitDefaultValue=false)]
         public DateTime? ExpiryDate { get; set; }
 
+
+        /// <summary>
+        /// Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated.
+        /// </summary>
+        /// <value>Periods in which the voucher is valid.  An empty list means the voucher is valid at all times.  When updating the voucher, if this is set to null, the validity periods won&#39;t be updated.</value>
+        [DataMember(Name="ValidityPeriods", EmitDefaultValue=false)]
+        public List<ValidityPeriod> ValidityPeriods { get; set; }
+
+
+        /// <summary>
+        /// Customer UserID
+        /// </summary>
+        /// <value>Customer UserID</value>
+        [DataMember(Name="CustomerId", EmitDefaultValue=false)]
+        public int? CustomerId { get; set; }
+
+        /// <summary>
+        /// Maximum number of times the voucher can be redeemed (used)
+        /// </summary>
+        /// <value>Maximum number of times the voucher can be redeemed (used)</value>
+        [DataMember(Name="MaxRedemptions", EmitDefaultValue=false)]
+        public int? MaxRedemptions { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -1151,16 +1263,15 @@ public override string ToString()
             sb.Append("  VoucherId: ").Append(VoucherId).Append("\n");
             sb.Append("  Status: ").Append(Status).Append("\n");
             sb.Append("  VoucherType: ").Append(VoucherType).Append("\n");
-            sb.Append("  VoucherSubType: ").Append(VoucherSubType).Append("\n");
             sb.Append("  Currency: ").Append(Currency).Append("\n");
-            sb.Append("  Stores: ").Append(Stores).Append("\n");
             sb.Append("  StoreNames: ").Append(StoreNames).Append("\n");
-            sb.Append("  AddItemDetails: ").Append(AddItemDetails).Append("\n");
+            sb.Append("  PromotionDetails: ").Append(PromotionDetails).Append("\n");
             sb.Append("  CreditNoteDetails: ").Append(CreditNoteDetails).Append("\n");
             sb.Append("  LumpDiscountDetails: ").Append(LumpDiscountDetails).Append("\n");
             sb.Append("  PercentDiscountDetails: ").Append(PercentDiscountDetails).Append("\n");
             sb.Append("  Code: ").Append(Code).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
+            sb.Append("  Stores: ").Append(Stores).Append("\n");
             sb.Append("  ValidOnOrdersOver: ").Append(ValidOnOrdersOver).Append("\n");
             sb.Append("  TakesPriority: ").Append(TakesPriority).Append("\n");
             sb.Append("  IsEnabled: ").Append(IsEnabled).Append("\n");
@@ -1173,8 +1284,16 @@ public override string ToString()
             sb.Append("  IsValidForFirstOrderOnly: ").Append(IsValidForFirstOrderOnly).Append("\n");
             sb.Append("  IsValidOncePerCustomer: ").Append(IsValidOncePerCustomer).Append("\n");
             sb.Append("  IsValidOnlyOnce: ").Append(IsValidOnlyOnce).Append("\n");
+            sb.Append("  IsDiscoverable: ").Append(IsDiscoverable).Append("\n");
+            sb.Append("  IsPromoted: ").Append(IsPromoted).Append("\n");
+            sb.Append("  ForceDiscount: ").Append(ForceDiscount).Append("\n");
             sb.Append("  StartDate: ").Append(StartDate).Append("\n");
             sb.Append("  ExpiryDate: ").Append(ExpiryDate).Append("\n");
+            sb.Append("  ChannelRestrictions: ").Append(ChannelRestrictions).Append("\n");
+            sb.Append("  ValidityPeriods: ").Append(ValidityPeriods).Append("\n");
+            sb.Append("  VoucherSubType: ").Append(VoucherSubType).Append("\n");
+            sb.Append("  CustomerId: ").Append(CustomerId).Append("\n");
+            sb.Append("  MaxRedemptions: ").Append(MaxRedemptions).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -1249,30 +1368,20 @@ public bool Equals(VoucherWithStats input)
                     (this.VoucherType != null &&
                     this.VoucherType.Equals(input.VoucherType))
                 ) && 
-                (
-                    this.VoucherSubType == input.VoucherSubType ||
-                    (this.VoucherSubType != null &&
-                    this.VoucherSubType.Equals(input.VoucherSubType))
-                ) && 
                 (
                     this.Currency == input.Currency ||
                     (this.Currency != null &&
                     this.Currency.Equals(input.Currency))
                 ) && 
-                (
-                    this.Stores == input.Stores ||
-                    this.Stores != null &&
-                    this.Stores.SequenceEqual(input.Stores)
-                ) && 
                 (
                     this.StoreNames == input.StoreNames ||
                     this.StoreNames != null &&
                     this.StoreNames.SequenceEqual(input.StoreNames)
                 ) && 
                 (
-                    this.AddItemDetails == input.AddItemDetails ||
-                    (this.AddItemDetails != null &&
-                    this.AddItemDetails.Equals(input.AddItemDetails))
+                    this.PromotionDetails == input.PromotionDetails ||
+                    (this.PromotionDetails != null &&
+                    this.PromotionDetails.Equals(input.PromotionDetails))
                 ) && 
                 (
                     this.CreditNoteDetails == input.CreditNoteDetails ||
@@ -1299,6 +1408,11 @@ public bool Equals(VoucherWithStats input)
                     (this.Description != null &&
                     this.Description.Equals(input.Description))
                 ) && 
+                (
+                    this.Stores == input.Stores ||
+                    this.Stores != null &&
+                    this.Stores.SequenceEqual(input.Stores)
+                ) && 
                 (
                     this.ValidOnOrdersOver == input.ValidOnOrdersOver ||
                     (this.ValidOnOrdersOver != null &&
@@ -1359,6 +1473,21 @@ public bool Equals(VoucherWithStats input)
                     (this.IsValidOnlyOnce != null &&
                     this.IsValidOnlyOnce.Equals(input.IsValidOnlyOnce))
                 ) && 
+                (
+                    this.IsDiscoverable == input.IsDiscoverable ||
+                    (this.IsDiscoverable != null &&
+                    this.IsDiscoverable.Equals(input.IsDiscoverable))
+                ) && 
+                (
+                    this.IsPromoted == input.IsPromoted ||
+                    (this.IsPromoted != null &&
+                    this.IsPromoted.Equals(input.IsPromoted))
+                ) && 
+                (
+                    this.ForceDiscount == input.ForceDiscount ||
+                    (this.ForceDiscount != null &&
+                    this.ForceDiscount.Equals(input.ForceDiscount))
+                ) && 
                 (
                     this.StartDate == input.StartDate ||
                     (this.StartDate != null &&
@@ -1368,6 +1497,31 @@ public bool Equals(VoucherWithStats input)
                     this.ExpiryDate == input.ExpiryDate ||
                     (this.ExpiryDate != null &&
                     this.ExpiryDate.Equals(input.ExpiryDate))
+                ) && 
+                (
+                    this.ChannelRestrictions == input.ChannelRestrictions ||
+                    this.ChannelRestrictions != null &&
+                    this.ChannelRestrictions.SequenceEqual(input.ChannelRestrictions)
+                ) && 
+                (
+                    this.ValidityPeriods == input.ValidityPeriods ||
+                    this.ValidityPeriods != null &&
+                    this.ValidityPeriods.SequenceEqual(input.ValidityPeriods)
+                ) && 
+                (
+                    this.VoucherSubType == input.VoucherSubType ||
+                    (this.VoucherSubType != null &&
+                    this.VoucherSubType.Equals(input.VoucherSubType))
+                ) && 
+                (
+                    this.CustomerId == input.CustomerId ||
+                    (this.CustomerId != null &&
+                    this.CustomerId.Equals(input.CustomerId))
+                ) && 
+                (
+                    this.MaxRedemptions == input.MaxRedemptions ||
+                    (this.MaxRedemptions != null &&
+                    this.MaxRedemptions.Equals(input.MaxRedemptions))
                 );
         }
 
@@ -1396,16 +1550,12 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Status.GetHashCode();
                 if (this.VoucherType != null)
                     hashCode = hashCode * 59 + this.VoucherType.GetHashCode();
-                if (this.VoucherSubType != null)
-                    hashCode = hashCode * 59 + this.VoucherSubType.GetHashCode();
                 if (this.Currency != null)
                     hashCode = hashCode * 59 + this.Currency.GetHashCode();
-                if (this.Stores != null)
-                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
                 if (this.StoreNames != null)
                     hashCode = hashCode * 59 + this.StoreNames.GetHashCode();
-                if (this.AddItemDetails != null)
-                    hashCode = hashCode * 59 + this.AddItemDetails.GetHashCode();
+                if (this.PromotionDetails != null)
+                    hashCode = hashCode * 59 + this.PromotionDetails.GetHashCode();
                 if (this.CreditNoteDetails != null)
                     hashCode = hashCode * 59 + this.CreditNoteDetails.GetHashCode();
                 if (this.LumpDiscountDetails != null)
@@ -1416,6 +1566,8 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Code.GetHashCode();
                 if (this.Description != null)
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
+                if (this.Stores != null)
+                    hashCode = hashCode * 59 + this.Stores.GetHashCode();
                 if (this.ValidOnOrdersOver != null)
                     hashCode = hashCode * 59 + this.ValidOnOrdersOver.GetHashCode();
                 if (this.TakesPriority != null)
@@ -1440,23 +1592,29 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.IsValidOncePerCustomer.GetHashCode();
                 if (this.IsValidOnlyOnce != null)
                     hashCode = hashCode * 59 + this.IsValidOnlyOnce.GetHashCode();
+                if (this.IsDiscoverable != null)
+                    hashCode = hashCode * 59 + this.IsDiscoverable.GetHashCode();
+                if (this.IsPromoted != null)
+                    hashCode = hashCode * 59 + this.IsPromoted.GetHashCode();
+                if (this.ForceDiscount != null)
+                    hashCode = hashCode * 59 + this.ForceDiscount.GetHashCode();
                 if (this.StartDate != null)
                     hashCode = hashCode * 59 + this.StartDate.GetHashCode();
                 if (this.ExpiryDate != null)
                     hashCode = hashCode * 59 + this.ExpiryDate.GetHashCode();
+                if (this.ChannelRestrictions != null)
+                    hashCode = hashCode * 59 + this.ChannelRestrictions.GetHashCode();
+                if (this.ValidityPeriods != null)
+                    hashCode = hashCode * 59 + this.ValidityPeriods.GetHashCode();
+                if (this.VoucherSubType != null)
+                    hashCode = hashCode * 59 + this.VoucherSubType.GetHashCode();
+                if (this.CustomerId != null)
+                    hashCode = hashCode * 59 + this.CustomerId.GetHashCode();
+                if (this.MaxRedemptions != null)
+                    hashCode = hashCode * 59 + this.MaxRedemptions.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WaitHandle.cs b/src/Flipdish/Model/WaitHandle.cs
new file mode 100644
index 00000000..f2052404
--- /dev/null
+++ b/src/Flipdish/Model/WaitHandle.cs
@@ -0,0 +1,128 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// WaitHandle
+    /// </summary>
+    [DataContract]
+    public partial class WaitHandle :  IEquatable<WaitHandle>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WaitHandle" /> class.
+        /// </summary>
+        /// <param name="handle">handle.</param>
+        /// <param name="safeWaitHandle">safeWaitHandle.</param>
+        public WaitHandle(Object handle = default(Object), SafeWaitHandle safeWaitHandle = default(SafeWaitHandle))
+        {
+            this.Handle = handle;
+            this.SafeWaitHandle = safeWaitHandle;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Handle
+        /// </summary>
+        [DataMember(Name="Handle", EmitDefaultValue=false)]
+        public Object Handle { get; set; }
+
+        /// <summary>
+        /// Gets or Sets SafeWaitHandle
+        /// </summary>
+        [DataMember(Name="SafeWaitHandle", EmitDefaultValue=false)]
+        public SafeWaitHandle SafeWaitHandle { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class WaitHandle {\n");
+            sb.Append("  Handle: ").Append(Handle).Append("\n");
+            sb.Append("  SafeWaitHandle: ").Append(SafeWaitHandle).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as WaitHandle);
+        }
+
+        /// <summary>
+        /// Returns true if WaitHandle instances are equal
+        /// </summary>
+        /// <param name="input">Instance of WaitHandle to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(WaitHandle input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Handle == input.Handle ||
+                    (this.Handle != null &&
+                    this.Handle.Equals(input.Handle))
+                ) && 
+                (
+                    this.SafeWaitHandle == input.SafeWaitHandle ||
+                    (this.SafeWaitHandle != null &&
+                    this.SafeWaitHandle.Equals(input.SafeWaitHandle))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Handle != null)
+                    hashCode = hashCode * 59 + this.Handle.GetHashCode();
+                if (this.SafeWaitHandle != null)
+                    hashCode = hashCode * 59 + this.SafeWaitHandle.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/WebhookEventSample.cs b/src/Flipdish/Model/WebhookEventSample.cs
index e4719ff7..24f21e7f 100644
--- a/src/Flipdish/Model/WebhookEventSample.cs
+++ b/src/Flipdish/Model/WebhookEventSample.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Sample payload of a webhook event
     /// </summary>
     [DataContract]
-    public partial class WebhookEventSample :  IEquatable<WebhookEventSample>, IValidatableObject
+    public partial class WebhookEventSample :  IEquatable<WebhookEventSample>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebhookEventSample" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebhookLog.cs b/src/Flipdish/Model/WebhookLog.cs
index 6b745eec..d0be13bf 100644
--- a/src/Flipdish/Model/WebhookLog.cs
+++ b/src/Flipdish/Model/WebhookLog.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Webhook log
     /// </summary>
     [DataContract]
-    public partial class WebhookLog :  IEquatable<WebhookLog>, IValidatableObject
+    public partial class WebhookLog :  IEquatable<WebhookLog>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebhookLog" /> class.
@@ -348,16 +346,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebhookSubscription.cs b/src/Flipdish/Model/WebhookSubscription.cs
index faf2d122..b3dc0f11 100644
--- a/src/Flipdish/Model/WebhookSubscription.cs
+++ b/src/Flipdish/Model/WebhookSubscription.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Webhook subscription
     /// </summary>
     [DataContract]
-    public partial class WebhookSubscription :  IEquatable<WebhookSubscription>, IValidatableObject
+    public partial class WebhookSubscription :  IEquatable<WebhookSubscription>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebhookSubscription" /> class.
@@ -212,16 +210,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebhookSubscriptionCreatedEvent.cs b/src/Flipdish/Model/WebhookSubscriptionCreatedEvent.cs
index bc5a3617..4341a915 100644
--- a/src/Flipdish/Model/WebhookSubscriptionCreatedEvent.cs
+++ b/src/Flipdish/Model/WebhookSubscriptionCreatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// WebhookSubscriptionCreatedEvent
     /// </summary>
     [DataContract]
-    public partial class WebhookSubscriptionCreatedEvent :  IEquatable<WebhookSubscriptionCreatedEvent>, IValidatableObject
+    public partial class WebhookSubscriptionCreatedEvent :  IEquatable<WebhookSubscriptionCreatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebhookSubscriptionCreatedEvent" /> class.
@@ -39,8 +37,11 @@ public partial class WebhookSubscriptionCreatedEvent :  IEquatable<WebhookSubscr
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public WebhookSubscriptionCreatedEvent(string eventName = default(string), WebhookSubscriptionEventInfo webhookSubscriptionEventInfo = default(WebhookSubscriptionEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public WebhookSubscriptionCreatedEvent(string eventName = default(string), WebhookSubscriptionEventInfo webhookSubscriptionEventInfo = default(WebhookSubscriptionEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.WebhookSubscriptionEventInfo = webhookSubscriptionEventInfo;
@@ -48,7 +49,10 @@ public partial class WebhookSubscriptionCreatedEvent :  IEquatable<WebhookSubscr
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -93,6 +97,13 @@ public partial class WebhookSubscriptionCreatedEvent :  IEquatable<WebhookSubscr
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -100,6 +111,20 @@ public partial class WebhookSubscriptionCreatedEvent :  IEquatable<WebhookSubscr
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -114,7 +139,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -179,10 +207,25 @@ public bool Equals(WebhookSubscriptionCreatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -207,21 +250,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebhookSubscriptionDeletedEvent.cs b/src/Flipdish/Model/WebhookSubscriptionDeletedEvent.cs
index ad345014..36af97b2 100644
--- a/src/Flipdish/Model/WebhookSubscriptionDeletedEvent.cs
+++ b/src/Flipdish/Model/WebhookSubscriptionDeletedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// WebhookSubscriptionDeletedEvent
     /// </summary>
     [DataContract]
-    public partial class WebhookSubscriptionDeletedEvent :  IEquatable<WebhookSubscriptionDeletedEvent>, IValidatableObject
+    public partial class WebhookSubscriptionDeletedEvent :  IEquatable<WebhookSubscriptionDeletedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebhookSubscriptionDeletedEvent" /> class.
@@ -39,8 +37,11 @@ public partial class WebhookSubscriptionDeletedEvent :  IEquatable<WebhookSubscr
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public WebhookSubscriptionDeletedEvent(string eventName = default(string), WebhookSubscriptionEventInfo webhookSubscriptionEventInfo = default(WebhookSubscriptionEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public WebhookSubscriptionDeletedEvent(string eventName = default(string), WebhookSubscriptionEventInfo webhookSubscriptionEventInfo = default(WebhookSubscriptionEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.WebhookSubscriptionEventInfo = webhookSubscriptionEventInfo;
@@ -48,7 +49,10 @@ public partial class WebhookSubscriptionDeletedEvent :  IEquatable<WebhookSubscr
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -93,6 +97,13 @@ public partial class WebhookSubscriptionDeletedEvent :  IEquatable<WebhookSubscr
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -100,6 +111,20 @@ public partial class WebhookSubscriptionDeletedEvent :  IEquatable<WebhookSubscr
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -114,7 +139,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -179,10 +207,25 @@ public bool Equals(WebhookSubscriptionDeletedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -207,21 +250,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebhookSubscriptionEventInfo.cs b/src/Flipdish/Model/WebhookSubscriptionEventInfo.cs
index 216e50a1..c30d2f3f 100644
--- a/src/Flipdish/Model/WebhookSubscriptionEventInfo.cs
+++ b/src/Flipdish/Model/WebhookSubscriptionEventInfo.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// WebhookSubscriptionEventInfo
     /// </summary>
     [DataContract]
-    public partial class WebhookSubscriptionEventInfo :  IEquatable<WebhookSubscriptionEventInfo>, IValidatableObject
+    public partial class WebhookSubscriptionEventInfo :  IEquatable<WebhookSubscriptionEventInfo>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebhookSubscriptionEventInfo" /> class.
@@ -161,16 +159,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebhookSubscriptionUpdatedEvent.cs b/src/Flipdish/Model/WebhookSubscriptionUpdatedEvent.cs
index 03d108ff..b78e3537 100644
--- a/src/Flipdish/Model/WebhookSubscriptionUpdatedEvent.cs
+++ b/src/Flipdish/Model/WebhookSubscriptionUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// WebhookSubscriptionUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class WebhookSubscriptionUpdatedEvent :  IEquatable<WebhookSubscriptionUpdatedEvent>, IValidatableObject
+    public partial class WebhookSubscriptionUpdatedEvent :  IEquatable<WebhookSubscriptionUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebhookSubscriptionUpdatedEvent" /> class.
@@ -39,8 +37,11 @@ public partial class WebhookSubscriptionUpdatedEvent :  IEquatable<WebhookSubscr
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public WebhookSubscriptionUpdatedEvent(string eventName = default(string), WebhookSubscriptionEventInfo webhookSubscriptionEventInfo = default(WebhookSubscriptionEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public WebhookSubscriptionUpdatedEvent(string eventName = default(string), WebhookSubscriptionEventInfo webhookSubscriptionEventInfo = default(WebhookSubscriptionEventInfo), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.EventName = eventName;
             this.WebhookSubscriptionEventInfo = webhookSubscriptionEventInfo;
@@ -48,7 +49,10 @@ public partial class WebhookSubscriptionUpdatedEvent :  IEquatable<WebhookSubscr
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -93,6 +97,13 @@ public partial class WebhookSubscriptionUpdatedEvent :  IEquatable<WebhookSubscr
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -100,6 +111,20 @@ public partial class WebhookSubscriptionUpdatedEvent :  IEquatable<WebhookSubscr
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -114,7 +139,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -179,10 +207,25 @@ public bool Equals(WebhookSubscriptionUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -207,21 +250,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebsiteImage.cs b/src/Flipdish/Model/WebsiteImage.cs
index 0f92be99..49470149 100644
--- a/src/Flipdish/Model/WebsiteImage.cs
+++ b/src/Flipdish/Model/WebsiteImage.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a website image
     /// </summary>
     [DataContract]
-    public partial class WebsiteImage :  IEquatable<WebsiteImage>, IValidatableObject
+    public partial class WebsiteImage :  IEquatable<WebsiteImage>
     {
         /// <summary>
         /// Represents the location of the image
@@ -189,16 +187,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebsiteTestimonial.cs b/src/Flipdish/Model/WebsiteTestimonial.cs
index e7b93aaf..60dbed5c 100644
--- a/src/Flipdish/Model/WebsiteTestimonial.cs
+++ b/src/Flipdish/Model/WebsiteTestimonial.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a testimonial
     /// </summary>
     [DataContract]
-    public partial class WebsiteTestimonial :  IEquatable<WebsiteTestimonial>, IValidatableObject
+    public partial class WebsiteTestimonial :  IEquatable<WebsiteTestimonial>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebsiteTestimonial" /> class.
@@ -144,16 +142,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebsiteTestimonialBase.cs b/src/Flipdish/Model/WebsiteTestimonialBase.cs
index fd4b46c5..32186a94 100644
--- a/src/Flipdish/Model/WebsiteTestimonialBase.cs
+++ b/src/Flipdish/Model/WebsiteTestimonialBase.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// Represents a testimonial base
     /// </summary>
     [DataContract]
-    public partial class WebsiteTestimonialBase :  IEquatable<WebsiteTestimonialBase>, IValidatableObject
+    public partial class WebsiteTestimonialBase :  IEquatable<WebsiteTestimonialBase>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebsiteTestimonialBase" /> class.
@@ -127,16 +125,6 @@ public override int GetHashCode()
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebsiteUpdatedEvent.cs b/src/Flipdish/Model/WebsiteUpdatedEvent.cs
index 5cdc24a3..3588bb24 100644
--- a/src/Flipdish/Model/WebsiteUpdatedEvent.cs
+++ b/src/Flipdish/Model/WebsiteUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,7 +26,7 @@ namespace Flipdish.Model
     /// WebsiteUpdatedEvent
     /// </summary>
     [DataContract]
-    public partial class WebsiteUpdatedEvent :  IEquatable<WebsiteUpdatedEvent>, IValidatableObject
+    public partial class WebsiteUpdatedEvent :  IEquatable<WebsiteUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebsiteUpdatedEvent" /> class.
@@ -41,8 +39,11 @@ public partial class WebsiteUpdatedEvent :  IEquatable<WebsiteUpdatedEvent>, IVa
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public WebsiteUpdatedEvent(string appNameId = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public WebsiteUpdatedEvent(string appNameId = default(string), UserEventInfo user = default(UserEventInfo), string description = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
             this.AppNameId = appNameId;
             this.User = user;
@@ -52,7 +53,10 @@ public partial class WebsiteUpdatedEvent :  IEquatable<WebsiteUpdatedEvent>, IVa
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
         /// <summary>
@@ -111,6 +115,13 @@ public partial class WebsiteUpdatedEvent :  IEquatable<WebsiteUpdatedEvent>, IVa
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class WebsiteUpdatedEvent :  IEquatable<WebsiteUpdatedEvent>, IVa
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -134,7 +159,10 @@ public override string ToString()
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -209,10 +237,25 @@ public bool Equals(WebsiteUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WebsiteVanityUrlUpdatedEvent.cs b/src/Flipdish/Model/WebsiteVanityUrlUpdatedEvent.cs
index 61d0c57e..c18b7aba 100644
--- a/src/Flipdish/Model/WebsiteVanityUrlUpdatedEvent.cs
+++ b/src/Flipdish/Model/WebsiteVanityUrlUpdatedEvent.cs
@@ -12,14 +12,12 @@
 using System.Linq;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System.ComponentModel.DataAnnotations;
 using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
 
 namespace Flipdish.Model
@@ -28,33 +26,46 @@ namespace Flipdish.Model
     /// Website vanity url
     /// </summary>
     [DataContract]
-    public partial class WebsiteVanityUrlUpdatedEvent :  IEquatable<WebsiteVanityUrlUpdatedEvent>, IValidatableObject
+    public partial class WebsiteVanityUrlUpdatedEvent :  IEquatable<WebsiteVanityUrlUpdatedEvent>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WebsiteVanityUrlUpdatedEvent" /> class.
         /// </summary>
+        /// <param name="eventName">The event name.</param>
         /// <param name="description">Description.</param>
         /// <param name="user">User who has updated the url.</param>
         /// <param name="vanityUrl">New vanity url.</param>
-        /// <param name="eventName">The event name.</param>
         /// <param name="flipdishEventId">The identitfier of the event.</param>
         /// <param name="createTime">The time of creation of the event.</param>
         /// <param name="position">Position.</param>
         /// <param name="appId">App id.</param>
+        /// <param name="orgId">Org id.</param>
         /// <param name="ipAddress">Ip Address.</param>
-        public WebsiteVanityUrlUpdatedEvent(string description = default(string), UserEventInfo user = default(UserEventInfo), string vanityUrl = default(string), string eventName = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string ipAddress = default(string))
+        /// <param name="activityId">Activity Id.</param>
+        /// <param name="activityType">Activity Type.</param>
+        public WebsiteVanityUrlUpdatedEvent(string eventName = default(string), string description = default(string), UserEventInfo user = default(UserEventInfo), string vanityUrl = default(string), Guid? flipdishEventId = default(Guid?), DateTime? createTime = default(DateTime?), int? position = default(int?), string appId = default(string), string orgId = default(string), string ipAddress = default(string), string activityId = default(string), string activityType = default(string))
         {
+            this.EventName = eventName;
             this.Description = description;
             this.User = user;
             this.VanityUrl = vanityUrl;
-            this.EventName = eventName;
             this.FlipdishEventId = flipdishEventId;
             this.CreateTime = createTime;
             this.Position = position;
             this.AppId = appId;
+            this.OrgId = orgId;
             this.IpAddress = ipAddress;
+            this.ActivityId = activityId;
+            this.ActivityType = activityType;
         }
         
+        /// <summary>
+        /// The event name
+        /// </summary>
+        /// <value>The event name</value>
+        [DataMember(Name="EventName", EmitDefaultValue=false)]
+        public string EventName { get; set; }
+
         /// <summary>
         /// Description
         /// </summary>
@@ -76,13 +87,6 @@ public partial class WebsiteVanityUrlUpdatedEvent :  IEquatable<WebsiteVanityUrl
         [DataMember(Name="VanityUrl", EmitDefaultValue=false)]
         public string VanityUrl { get; set; }
 
-        /// <summary>
-        /// The event name
-        /// </summary>
-        /// <value>The event name</value>
-        [DataMember(Name="EventName", EmitDefaultValue=false)]
-        public string EventName { get; set; }
-
         /// <summary>
         /// The identitfier of the event
         /// </summary>
@@ -111,6 +115,13 @@ public partial class WebsiteVanityUrlUpdatedEvent :  IEquatable<WebsiteVanityUrl
         [DataMember(Name="AppId", EmitDefaultValue=false)]
         public string AppId { get; set; }
 
+        /// <summary>
+        /// Org id
+        /// </summary>
+        /// <value>Org id</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
         /// <summary>
         /// Ip Address
         /// </summary>
@@ -118,6 +129,20 @@ public partial class WebsiteVanityUrlUpdatedEvent :  IEquatable<WebsiteVanityUrl
         [DataMember(Name="IpAddress", EmitDefaultValue=false)]
         public string IpAddress { get; set; }
 
+        /// <summary>
+        /// Activity Id
+        /// </summary>
+        /// <value>Activity Id</value>
+        [DataMember(Name="ActivityId", EmitDefaultValue=false)]
+        public string ActivityId { get; set; }
+
+        /// <summary>
+        /// Activity Type
+        /// </summary>
+        /// <value>Activity Type</value>
+        [DataMember(Name="ActivityType", EmitDefaultValue=false)]
+        public string ActivityType { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -126,15 +151,18 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class WebsiteVanityUrlUpdatedEvent {\n");
+            sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  Description: ").Append(Description).Append("\n");
             sb.Append("  User: ").Append(User).Append("\n");
             sb.Append("  VanityUrl: ").Append(VanityUrl).Append("\n");
-            sb.Append("  EventName: ").Append(EventName).Append("\n");
             sb.Append("  FlipdishEventId: ").Append(FlipdishEventId).Append("\n");
             sb.Append("  CreateTime: ").Append(CreateTime).Append("\n");
             sb.Append("  Position: ").Append(Position).Append("\n");
             sb.Append("  AppId: ").Append(AppId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
             sb.Append("  IpAddress: ").Append(IpAddress).Append("\n");
+            sb.Append("  ActivityId: ").Append(ActivityId).Append("\n");
+            sb.Append("  ActivityType: ").Append(ActivityType).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -169,6 +197,11 @@ public bool Equals(WebsiteVanityUrlUpdatedEvent input)
                 return false;
 
             return 
+                (
+                    this.EventName == input.EventName ||
+                    (this.EventName != null &&
+                    this.EventName.Equals(input.EventName))
+                ) && 
                 (
                     this.Description == input.Description ||
                     (this.Description != null &&
@@ -184,11 +217,6 @@ public bool Equals(WebsiteVanityUrlUpdatedEvent input)
                     (this.VanityUrl != null &&
                     this.VanityUrl.Equals(input.VanityUrl))
                 ) && 
-                (
-                    this.EventName == input.EventName ||
-                    (this.EventName != null &&
-                    this.EventName.Equals(input.EventName))
-                ) && 
                 (
                     this.FlipdishEventId == input.FlipdishEventId ||
                     (this.FlipdishEventId != null &&
@@ -209,10 +237,25 @@ public bool Equals(WebsiteVanityUrlUpdatedEvent input)
                     (this.AppId != null &&
                     this.AppId.Equals(input.AppId))
                 ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
                 (
                     this.IpAddress == input.IpAddress ||
                     (this.IpAddress != null &&
                     this.IpAddress.Equals(input.IpAddress))
+                ) && 
+                (
+                    this.ActivityId == input.ActivityId ||
+                    (this.ActivityId != null &&
+                    this.ActivityId.Equals(input.ActivityId))
+                ) && 
+                (
+                    this.ActivityType == input.ActivityType ||
+                    (this.ActivityType != null &&
+                    this.ActivityType.Equals(input.ActivityType))
                 );
         }
 
@@ -225,14 +268,14 @@ public override int GetHashCode()
             unchecked // Overflow is fine, just wrap
             {
                 int hashCode = 41;
+                if (this.EventName != null)
+                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
                 if (this.Description != null)
                     hashCode = hashCode * 59 + this.Description.GetHashCode();
                 if (this.User != null)
                     hashCode = hashCode * 59 + this.User.GetHashCode();
                 if (this.VanityUrl != null)
                     hashCode = hashCode * 59 + this.VanityUrl.GetHashCode();
-                if (this.EventName != null)
-                    hashCode = hashCode * 59 + this.EventName.GetHashCode();
                 if (this.FlipdishEventId != null)
                     hashCode = hashCode * 59 + this.FlipdishEventId.GetHashCode();
                 if (this.CreateTime != null)
@@ -241,21 +284,17 @@ public override int GetHashCode()
                     hashCode = hashCode * 59 + this.Position.GetHashCode();
                 if (this.AppId != null)
                     hashCode = hashCode * 59 + this.AppId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
                 if (this.IpAddress != null)
                     hashCode = hashCode * 59 + this.IpAddress.GetHashCode();
+                if (this.ActivityId != null)
+                    hashCode = hashCode * 59 + this.ActivityId.GetHashCode();
+                if (this.ActivityType != null)
+                    hashCode = hashCode * 59 + this.ActivityType.GetHashCode();
                 return hashCode;
             }
         }
-
-        /// <summary>
-        /// To validate all properties of the instance
-        /// </summary>
-        /// <param name="validationContext">Validation context</param>
-        /// <returns>Validation Result</returns>
-        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
-        {
-            yield break;
-        }
     }
 
 }
diff --git a/src/Flipdish/Model/WhiteLabelAssetModel.cs b/src/Flipdish/Model/WhiteLabelAssetModel.cs
new file mode 100644
index 00000000..11a444c4
--- /dev/null
+++ b/src/Flipdish/Model/WhiteLabelAssetModel.cs
@@ -0,0 +1,181 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// White label asset model
+    /// </summary>
+    [DataContract]
+    public partial class WhiteLabelAssetModel :  IEquatable<WhiteLabelAssetModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelAssetModel" /> class.
+        /// </summary>
+        /// <param name="whiteLabelAssetId">White label asset ID.</param>
+        /// <param name="whiteLabelConfigId">White label configuration ID.</param>
+        /// <param name="filePath">File path.</param>
+        /// <param name="url">Asset URL.</param>
+        /// <param name="tsUpdate">Timestamp update.</param>
+        public WhiteLabelAssetModel(int? whiteLabelAssetId = default(int?), int? whiteLabelConfigId = default(int?), string filePath = default(string), string url = default(string), DateTime? tsUpdate = default(DateTime?))
+        {
+            this.WhiteLabelAssetId = whiteLabelAssetId;
+            this.WhiteLabelConfigId = whiteLabelConfigId;
+            this.FilePath = filePath;
+            this.Url = url;
+            this.TsUpdate = tsUpdate;
+        }
+        
+        /// <summary>
+        /// White label asset ID
+        /// </summary>
+        /// <value>White label asset ID</value>
+        [DataMember(Name="WhiteLabelAssetId", EmitDefaultValue=false)]
+        public int? WhiteLabelAssetId { get; set; }
+
+        /// <summary>
+        /// White label configuration ID
+        /// </summary>
+        /// <value>White label configuration ID</value>
+        [DataMember(Name="WhiteLabelConfigId", EmitDefaultValue=false)]
+        public int? WhiteLabelConfigId { get; set; }
+
+        /// <summary>
+        /// File path
+        /// </summary>
+        /// <value>File path</value>
+        [DataMember(Name="FilePath", EmitDefaultValue=false)]
+        public string FilePath { get; set; }
+
+        /// <summary>
+        /// Asset URL
+        /// </summary>
+        /// <value>Asset URL</value>
+        [DataMember(Name="Url", EmitDefaultValue=false)]
+        public string Url { get; set; }
+
+        /// <summary>
+        /// Timestamp update
+        /// </summary>
+        /// <value>Timestamp update</value>
+        [DataMember(Name="TsUpdate", EmitDefaultValue=false)]
+        public DateTime? TsUpdate { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class WhiteLabelAssetModel {\n");
+            sb.Append("  WhiteLabelAssetId: ").Append(WhiteLabelAssetId).Append("\n");
+            sb.Append("  WhiteLabelConfigId: ").Append(WhiteLabelConfigId).Append("\n");
+            sb.Append("  FilePath: ").Append(FilePath).Append("\n");
+            sb.Append("  Url: ").Append(Url).Append("\n");
+            sb.Append("  TsUpdate: ").Append(TsUpdate).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as WhiteLabelAssetModel);
+        }
+
+        /// <summary>
+        /// Returns true if WhiteLabelAssetModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of WhiteLabelAssetModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(WhiteLabelAssetModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelAssetId == input.WhiteLabelAssetId ||
+                    (this.WhiteLabelAssetId != null &&
+                    this.WhiteLabelAssetId.Equals(input.WhiteLabelAssetId))
+                ) && 
+                (
+                    this.WhiteLabelConfigId == input.WhiteLabelConfigId ||
+                    (this.WhiteLabelConfigId != null &&
+                    this.WhiteLabelConfigId.Equals(input.WhiteLabelConfigId))
+                ) && 
+                (
+                    this.FilePath == input.FilePath ||
+                    (this.FilePath != null &&
+                    this.FilePath.Equals(input.FilePath))
+                ) && 
+                (
+                    this.Url == input.Url ||
+                    (this.Url != null &&
+                    this.Url.Equals(input.Url))
+                ) && 
+                (
+                    this.TsUpdate == input.TsUpdate ||
+                    (this.TsUpdate != null &&
+                    this.TsUpdate.Equals(input.TsUpdate))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelAssetId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelAssetId.GetHashCode();
+                if (this.WhiteLabelConfigId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelConfigId.GetHashCode();
+                if (this.FilePath != null)
+                    hashCode = hashCode * 59 + this.FilePath.GetHashCode();
+                if (this.Url != null)
+                    hashCode = hashCode * 59 + this.Url.GetHashCode();
+                if (this.TsUpdate != null)
+                    hashCode = hashCode * 59 + this.TsUpdate.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/WhiteLabelColorSchemeModel.cs b/src/Flipdish/Model/WhiteLabelColorSchemeModel.cs
new file mode 100644
index 00000000..f34b5ab5
--- /dev/null
+++ b/src/Flipdish/Model/WhiteLabelColorSchemeModel.cs
@@ -0,0 +1,334 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// White label color scheme model
+    /// </summary>
+    [DataContract]
+    public partial class WhiteLabelColorSchemeModel :  IEquatable<WhiteLabelColorSchemeModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelColorSchemeModel" /> class.
+        /// </summary>
+        /// <param name="whiteLabelColorSchemeId">White label color scheme ID.</param>
+        /// <param name="font">Font.</param>
+        /// <param name="color">Color.</param>
+        /// <param name="color2">Color 2.</param>
+        /// <param name="color3">Color 3.</param>
+        /// <param name="color4">Color 4.</param>
+        /// <param name="color5">Color 5.</param>
+        /// <param name="color6">Color 6.</param>
+        /// <param name="color7">Color 7.</param>
+        /// <param name="color8">Color 8.</param>
+        /// <param name="color9">Color 9.</param>
+        /// <param name="color10">Color 10.</param>
+        /// <param name="color11">Color 11.</param>
+        /// <param name="color12">Color 12 (Kiosk Primary Colour).</param>
+        public WhiteLabelColorSchemeModel(int? whiteLabelColorSchemeId = default(int?), string font = default(string), string color = default(string), string color2 = default(string), string color3 = default(string), string color4 = default(string), string color5 = default(string), string color6 = default(string), string color7 = default(string), string color8 = default(string), string color9 = default(string), string color10 = default(string), string color11 = default(string), string color12 = default(string))
+        {
+            this.WhiteLabelColorSchemeId = whiteLabelColorSchemeId;
+            this.Font = font;
+            this.Color = color;
+            this.Color2 = color2;
+            this.Color3 = color3;
+            this.Color4 = color4;
+            this.Color5 = color5;
+            this.Color6 = color6;
+            this.Color7 = color7;
+            this.Color8 = color8;
+            this.Color9 = color9;
+            this.Color10 = color10;
+            this.Color11 = color11;
+            this.Color12 = color12;
+        }
+        
+        /// <summary>
+        /// White label color scheme ID
+        /// </summary>
+        /// <value>White label color scheme ID</value>
+        [DataMember(Name="WhiteLabelColorSchemeId", EmitDefaultValue=false)]
+        public int? WhiteLabelColorSchemeId { get; set; }
+
+        /// <summary>
+        /// Font
+        /// </summary>
+        /// <value>Font</value>
+        [DataMember(Name="Font", EmitDefaultValue=false)]
+        public string Font { get; set; }
+
+        /// <summary>
+        /// Color
+        /// </summary>
+        /// <value>Color</value>
+        [DataMember(Name="Color", EmitDefaultValue=false)]
+        public string Color { get; set; }
+
+        /// <summary>
+        /// Color 2
+        /// </summary>
+        /// <value>Color 2</value>
+        [DataMember(Name="Color2", EmitDefaultValue=false)]
+        public string Color2 { get; set; }
+
+        /// <summary>
+        /// Color 3
+        /// </summary>
+        /// <value>Color 3</value>
+        [DataMember(Name="Color3", EmitDefaultValue=false)]
+        public string Color3 { get; set; }
+
+        /// <summary>
+        /// Color 4
+        /// </summary>
+        /// <value>Color 4</value>
+        [DataMember(Name="Color4", EmitDefaultValue=false)]
+        public string Color4 { get; set; }
+
+        /// <summary>
+        /// Color 5
+        /// </summary>
+        /// <value>Color 5</value>
+        [DataMember(Name="Color5", EmitDefaultValue=false)]
+        public string Color5 { get; set; }
+
+        /// <summary>
+        /// Color 6
+        /// </summary>
+        /// <value>Color 6</value>
+        [DataMember(Name="Color6", EmitDefaultValue=false)]
+        public string Color6 { get; set; }
+
+        /// <summary>
+        /// Color 7
+        /// </summary>
+        /// <value>Color 7</value>
+        [DataMember(Name="Color7", EmitDefaultValue=false)]
+        public string Color7 { get; set; }
+
+        /// <summary>
+        /// Color 8
+        /// </summary>
+        /// <value>Color 8</value>
+        [DataMember(Name="Color8", EmitDefaultValue=false)]
+        public string Color8 { get; set; }
+
+        /// <summary>
+        /// Color 9
+        /// </summary>
+        /// <value>Color 9</value>
+        [DataMember(Name="Color9", EmitDefaultValue=false)]
+        public string Color9 { get; set; }
+
+        /// <summary>
+        /// Color 10
+        /// </summary>
+        /// <value>Color 10</value>
+        [DataMember(Name="Color10", EmitDefaultValue=false)]
+        public string Color10 { get; set; }
+
+        /// <summary>
+        /// Color 11
+        /// </summary>
+        /// <value>Color 11</value>
+        [DataMember(Name="Color11", EmitDefaultValue=false)]
+        public string Color11 { get; set; }
+
+        /// <summary>
+        /// Color 12 (Kiosk Primary Colour)
+        /// </summary>
+        /// <value>Color 12 (Kiosk Primary Colour)</value>
+        [DataMember(Name="Color12", EmitDefaultValue=false)]
+        public string Color12 { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class WhiteLabelColorSchemeModel {\n");
+            sb.Append("  WhiteLabelColorSchemeId: ").Append(WhiteLabelColorSchemeId).Append("\n");
+            sb.Append("  Font: ").Append(Font).Append("\n");
+            sb.Append("  Color: ").Append(Color).Append("\n");
+            sb.Append("  Color2: ").Append(Color2).Append("\n");
+            sb.Append("  Color3: ").Append(Color3).Append("\n");
+            sb.Append("  Color4: ").Append(Color4).Append("\n");
+            sb.Append("  Color5: ").Append(Color5).Append("\n");
+            sb.Append("  Color6: ").Append(Color6).Append("\n");
+            sb.Append("  Color7: ").Append(Color7).Append("\n");
+            sb.Append("  Color8: ").Append(Color8).Append("\n");
+            sb.Append("  Color9: ").Append(Color9).Append("\n");
+            sb.Append("  Color10: ").Append(Color10).Append("\n");
+            sb.Append("  Color11: ").Append(Color11).Append("\n");
+            sb.Append("  Color12: ").Append(Color12).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as WhiteLabelColorSchemeModel);
+        }
+
+        /// <summary>
+        /// Returns true if WhiteLabelColorSchemeModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of WhiteLabelColorSchemeModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(WhiteLabelColorSchemeModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelColorSchemeId == input.WhiteLabelColorSchemeId ||
+                    (this.WhiteLabelColorSchemeId != null &&
+                    this.WhiteLabelColorSchemeId.Equals(input.WhiteLabelColorSchemeId))
+                ) && 
+                (
+                    this.Font == input.Font ||
+                    (this.Font != null &&
+                    this.Font.Equals(input.Font))
+                ) && 
+                (
+                    this.Color == input.Color ||
+                    (this.Color != null &&
+                    this.Color.Equals(input.Color))
+                ) && 
+                (
+                    this.Color2 == input.Color2 ||
+                    (this.Color2 != null &&
+                    this.Color2.Equals(input.Color2))
+                ) && 
+                (
+                    this.Color3 == input.Color3 ||
+                    (this.Color3 != null &&
+                    this.Color3.Equals(input.Color3))
+                ) && 
+                (
+                    this.Color4 == input.Color4 ||
+                    (this.Color4 != null &&
+                    this.Color4.Equals(input.Color4))
+                ) && 
+                (
+                    this.Color5 == input.Color5 ||
+                    (this.Color5 != null &&
+                    this.Color5.Equals(input.Color5))
+                ) && 
+                (
+                    this.Color6 == input.Color6 ||
+                    (this.Color6 != null &&
+                    this.Color6.Equals(input.Color6))
+                ) && 
+                (
+                    this.Color7 == input.Color7 ||
+                    (this.Color7 != null &&
+                    this.Color7.Equals(input.Color7))
+                ) && 
+                (
+                    this.Color8 == input.Color8 ||
+                    (this.Color8 != null &&
+                    this.Color8.Equals(input.Color8))
+                ) && 
+                (
+                    this.Color9 == input.Color9 ||
+                    (this.Color9 != null &&
+                    this.Color9.Equals(input.Color9))
+                ) && 
+                (
+                    this.Color10 == input.Color10 ||
+                    (this.Color10 != null &&
+                    this.Color10.Equals(input.Color10))
+                ) && 
+                (
+                    this.Color11 == input.Color11 ||
+                    (this.Color11 != null &&
+                    this.Color11.Equals(input.Color11))
+                ) && 
+                (
+                    this.Color12 == input.Color12 ||
+                    (this.Color12 != null &&
+                    this.Color12.Equals(input.Color12))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelColorSchemeId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelColorSchemeId.GetHashCode();
+                if (this.Font != null)
+                    hashCode = hashCode * 59 + this.Font.GetHashCode();
+                if (this.Color != null)
+                    hashCode = hashCode * 59 + this.Color.GetHashCode();
+                if (this.Color2 != null)
+                    hashCode = hashCode * 59 + this.Color2.GetHashCode();
+                if (this.Color3 != null)
+                    hashCode = hashCode * 59 + this.Color3.GetHashCode();
+                if (this.Color4 != null)
+                    hashCode = hashCode * 59 + this.Color4.GetHashCode();
+                if (this.Color5 != null)
+                    hashCode = hashCode * 59 + this.Color5.GetHashCode();
+                if (this.Color6 != null)
+                    hashCode = hashCode * 59 + this.Color6.GetHashCode();
+                if (this.Color7 != null)
+                    hashCode = hashCode * 59 + this.Color7.GetHashCode();
+                if (this.Color8 != null)
+                    hashCode = hashCode * 59 + this.Color8.GetHashCode();
+                if (this.Color9 != null)
+                    hashCode = hashCode * 59 + this.Color9.GetHashCode();
+                if (this.Color10 != null)
+                    hashCode = hashCode * 59 + this.Color10.GetHashCode();
+                if (this.Color11 != null)
+                    hashCode = hashCode * 59 + this.Color11.GetHashCode();
+                if (this.Color12 != null)
+                    hashCode = hashCode * 59 + this.Color12.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/WhiteLabelConfig.cs b/src/Flipdish/Model/WhiteLabelConfig.cs
new file mode 100644
index 00000000..81f1bc73
--- /dev/null
+++ b/src/Flipdish/Model/WhiteLabelConfig.cs
@@ -0,0 +1,198 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// White label configuration details
+    /// </summary>
+    [DataContract]
+    public partial class WhiteLabelConfig :  IEquatable<WhiteLabelConfig>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelConfig" /> class.
+        /// </summary>
+        /// <param name="whiteLabelId">White label identifier.</param>
+        /// <param name="whiteLabelName">White label name.</param>
+        /// <param name="countryId">Country identifier.</param>
+        /// <param name="appNameId">App id.</param>
+        /// <param name="website">Website URL.</param>
+        /// <param name="panaceaVanityUrl">Panacea vanity URL.</param>
+        public WhiteLabelConfig(int? whiteLabelId = default(int?), string whiteLabelName = default(string), string countryId = default(string), string appNameId = default(string), string website = default(string), string panaceaVanityUrl = default(string))
+        {
+            this.WhiteLabelId = whiteLabelId;
+            this.WhiteLabelName = whiteLabelName;
+            this.CountryId = countryId;
+            this.AppNameId = appNameId;
+            this.Website = website;
+            this.PanaceaVanityUrl = panaceaVanityUrl;
+        }
+        
+        /// <summary>
+        /// White label identifier
+        /// </summary>
+        /// <value>White label identifier</value>
+        [DataMember(Name="WhiteLabelId", EmitDefaultValue=false)]
+        public int? WhiteLabelId { get; set; }
+
+        /// <summary>
+        /// White label name
+        /// </summary>
+        /// <value>White label name</value>
+        [DataMember(Name="WhiteLabelName", EmitDefaultValue=false)]
+        public string WhiteLabelName { get; set; }
+
+        /// <summary>
+        /// Country identifier
+        /// </summary>
+        /// <value>Country identifier</value>
+        [DataMember(Name="CountryId", EmitDefaultValue=false)]
+        public string CountryId { get; set; }
+
+        /// <summary>
+        /// App id
+        /// </summary>
+        /// <value>App id</value>
+        [DataMember(Name="AppNameId", EmitDefaultValue=false)]
+        public string AppNameId { get; set; }
+
+        /// <summary>
+        /// Website URL
+        /// </summary>
+        /// <value>Website URL</value>
+        [DataMember(Name="Website", EmitDefaultValue=false)]
+        public string Website { get; set; }
+
+        /// <summary>
+        /// Panacea vanity URL
+        /// </summary>
+        /// <value>Panacea vanity URL</value>
+        [DataMember(Name="PanaceaVanityUrl", EmitDefaultValue=false)]
+        public string PanaceaVanityUrl { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class WhiteLabelConfig {\n");
+            sb.Append("  WhiteLabelId: ").Append(WhiteLabelId).Append("\n");
+            sb.Append("  WhiteLabelName: ").Append(WhiteLabelName).Append("\n");
+            sb.Append("  CountryId: ").Append(CountryId).Append("\n");
+            sb.Append("  AppNameId: ").Append(AppNameId).Append("\n");
+            sb.Append("  Website: ").Append(Website).Append("\n");
+            sb.Append("  PanaceaVanityUrl: ").Append(PanaceaVanityUrl).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as WhiteLabelConfig);
+        }
+
+        /// <summary>
+        /// Returns true if WhiteLabelConfig instances are equal
+        /// </summary>
+        /// <param name="input">Instance of WhiteLabelConfig to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(WhiteLabelConfig input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelId == input.WhiteLabelId ||
+                    (this.WhiteLabelId != null &&
+                    this.WhiteLabelId.Equals(input.WhiteLabelId))
+                ) && 
+                (
+                    this.WhiteLabelName == input.WhiteLabelName ||
+                    (this.WhiteLabelName != null &&
+                    this.WhiteLabelName.Equals(input.WhiteLabelName))
+                ) && 
+                (
+                    this.CountryId == input.CountryId ||
+                    (this.CountryId != null &&
+                    this.CountryId.Equals(input.CountryId))
+                ) && 
+                (
+                    this.AppNameId == input.AppNameId ||
+                    (this.AppNameId != null &&
+                    this.AppNameId.Equals(input.AppNameId))
+                ) && 
+                (
+                    this.Website == input.Website ||
+                    (this.Website != null &&
+                    this.Website.Equals(input.Website))
+                ) && 
+                (
+                    this.PanaceaVanityUrl == input.PanaceaVanityUrl ||
+                    (this.PanaceaVanityUrl != null &&
+                    this.PanaceaVanityUrl.Equals(input.PanaceaVanityUrl))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelId.GetHashCode();
+                if (this.WhiteLabelName != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelName.GetHashCode();
+                if (this.CountryId != null)
+                    hashCode = hashCode * 59 + this.CountryId.GetHashCode();
+                if (this.AppNameId != null)
+                    hashCode = hashCode * 59 + this.AppNameId.GetHashCode();
+                if (this.Website != null)
+                    hashCode = hashCode * 59 + this.Website.GetHashCode();
+                if (this.PanaceaVanityUrl != null)
+                    hashCode = hashCode * 59 + this.PanaceaVanityUrl.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/WhiteLabelConfigModel.cs b/src/Flipdish/Model/WhiteLabelConfigModel.cs
new file mode 100644
index 00000000..60a0f392
--- /dev/null
+++ b/src/Flipdish/Model/WhiteLabelConfigModel.cs
@@ -0,0 +1,1953 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// WhiteLabelConfig model
+    /// </summary>
+    [DataContract]
+    public partial class WhiteLabelConfigModel :  IEquatable<WhiteLabelConfigModel>
+    {
+        /// <summary>
+        /// Compliance type
+        /// </summary>
+        /// <value>Compliance type</value>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum ComplianceTypeEnum
+        {
+            
+            /// <summary>
+            /// Enum Default for value: Default
+            /// </summary>
+            [EnumMember(Value = "Default")]
+            Default = 1,
+            
+            /// <summary>
+            /// Enum GdprCompliance for value: GdprCompliance
+            /// </summary>
+            [EnumMember(Value = "GdprCompliance")]
+            GdprCompliance = 2
+        }
+
+        /// <summary>
+        /// Compliance type
+        /// </summary>
+        /// <value>Compliance type</value>
+        [DataMember(Name="ComplianceType", EmitDefaultValue=false)]
+        public ComplianceTypeEnum? ComplianceType { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelConfigModel" /> class.
+        /// </summary>
+        /// <param name="whiteLabelLanguages">White label languages.</param>
+        /// <param name="whiteLabelAssets">White label assets.</param>
+        /// <param name="colorScheme">White label color scheme.</param>
+        /// <param name="whiteLabelConfigId">White label configuration ID.</param>
+        /// <param name="whiteLabelId">White label ID.</param>
+        /// <param name="whiteLabelName">White label name.</param>
+        /// <param name="appNameId">App name ID (Bundle ID Suffix).</param>
+        /// <param name="orgId">Organization ID.</param>
+        /// <param name="smsRestaurantName">SMS restaurant name.</param>
+        /// <param name="deepLinkUrlScheme">Deep link URL scheme.</param>
+        /// <param name="hostName">Host name.</param>
+        /// <param name="nexmoSupportSmsNumber">Nexmo support SMS number.</param>
+        /// <param name="twilioSupportSmsNumber">Twilio support SMS number.</param>
+        /// <param name="mixpanelToken">Mixpanel token.</param>
+        /// <param name="intercomAppId">Intercom app ID.</param>
+        /// <param name="shareMessageEmailSubject">Share message email subject.</param>
+        /// <param name="shareMessageEmailMessage">Share message email message.</param>
+        /// <param name="shareMessageSmsMessage">Share message SMS message.</param>
+        /// <param name="shareMessageWhatsAppMessage">Share message WhatsApp message.</param>
+        /// <param name="shareMessageFacebookMessage">Share message Facebook message.</param>
+        /// <param name="shareMessageTwitterMessage">Share message Twitter message.</param>
+        /// <param name="shareMessageGenericMessage">Share message generic message.</param>
+        /// <param name="displayDeliveryRestaurantListScreen">Display delivery restaurant list screen.</param>
+        /// <param name="contactFormType">Contact form type.</param>
+        /// <param name="contactPhoneNumber">Contact phone number.</param>
+        /// <param name="displayBumpSideMenuItem">Display bump side menu item.</param>
+        /// <param name="displayFreeCokeSideMenuItem">Display free coke side menu item.</param>
+        /// <param name="appStoreUrl">App store URL.</param>
+        /// <param name="deliveryEnabled">Delivery enabled.</param>
+        /// <param name="pickupEnabled">Pickup enabled.</param>
+        /// <param name="displayPickupRestaurantListScreen">Display pickup restaurant list screen.</param>
+        /// <param name="displayCuisineTypeListAndRestaurantSearchBar">Display cuisine type list and restaurant search bar.</param>
+        /// <param name="displayUserRestaurantRatings">Display user restaurant ratings.</param>
+        /// <param name="readyToPublishWeb">Ready to publish web.</param>
+        /// <param name="readyToPublishIos">Ready to publish iOS.</param>
+        /// <param name="readyToPublishAndroid">Ready to publish Android.</param>
+        /// <param name="displayFooterLinksToOtherSites">Display footer links to other sites.</param>
+        /// <param name="displayOnlineOrderingMenu">Display online ordering menu.</param>
+        /// <param name="hideAppConfigFromAdminList">Hide app config from admin list.</param>
+        /// <param name="complianceType">Compliance type.</param>
+        /// <param name="isMenuMigratedToRms">Is menu migrated to RMS.</param>
+        /// <param name="mapBoundryMaxLongitude">Map boundary max longitude.</param>
+        /// <param name="mapBoundryMinLongitude">Map boundary min longitude.</param>
+        /// <param name="mapBoundryMaxLatitude">Map boundary max latitude.</param>
+        /// <param name="mapBoundryMinLatitude">Map boundary min latitude.</param>
+        /// <param name="appStoreAppleId">App store Apple ID.</param>
+        /// <param name="appStoreToken">App store token.</param>
+        /// <param name="websiteDisplayStaticMenuPage">Website display static menu page.</param>
+        /// <param name="isEmbed">Is embed.</param>
+        /// <param name="displayTipOptionToUsersByDefault">Display tip option to users by default.</param>
+        /// <param name="emailRequestMode">Email request mode.</param>
+        /// <param name="addressEntryType">Address entry type.</param>
+        /// <param name="addressLayout">Address layout.</param>
+        /// <param name="category">Category.</param>
+        /// <param name="mapCenterLatitude">Map center latitude.</param>
+        /// <param name="mapCenterLongitude">Map center longitude.</param>
+        /// <param name="intercomTokenIos">Intercom token iOS.</param>
+        /// <param name="intercomTokenAndroid">Intercom token Android.</param>
+        /// <param name="googleAnalyticsTokensCsv">Google Analytics tokens CSV.</param>
+        /// <param name="facebookTokensCsv">Facebook tokens CSV.</param>
+        /// <param name="shareMessageGenericUrl">Share message generic URL.</param>
+        /// <param name="privateSupportEmailAddress">Private support email address.</param>
+        /// <param name="appStoreId">App store ID.</param>
+        /// <param name="playConsoleAccount">Play console account.</param>
+        /// <param name="apnCertificateValidAfter">APN certificate valid after.</param>
+        /// <param name="apnCertificateValidBefore">APN certificate valid before.</param>
+        /// <param name="dineInEnabled">Dine in enabled.</param>
+        /// <param name="appFont">App font.</param>
+        /// <param name="whiteLabelColorSchemeId">White label color scheme ID.</param>
+        /// <param name="whiteLabelImagesId">White label images ID.</param>
+        /// <param name="appStoreCopyright">App store copyright.</param>
+        /// <param name="appStoreDescription">App store description.</param>
+        /// <param name="appStoreShortDescription">App store short description.</param>
+        /// <param name="appStoreKeywords">App store keywords.</param>
+        /// <param name="appStoreMarketingUrl">App store marketing URL.</param>
+        /// <param name="appStoreName">App store name.</param>
+        /// <param name="appStorePrivacyUrl">App store privacy URL.</param>
+        /// <param name="appStoreSupportUrl">App store support URL.</param>
+        /// <param name="appStoreReleaseNotes">App store release notes.</param>
+        /// <param name="appStoreIconUrl">App store icon URL.</param>
+        /// <param name="appStoreIconThumbnail100Url">App store icon thumbnail 100 URL.</param>
+        /// <param name="transparentLogoUrl">Transparent logo URL.</param>
+        /// <param name="logoImageName">Logo image name.</param>
+        /// <param name="kioskNameScreenImage">Kiosk name screen image.</param>
+        /// <param name="webToAppRedirect">Web to app redirect.</param>
+        /// <param name="featuresCsv">Features CSV.</param>
+        /// <param name="appStorePassword">App store password.</param>
+        /// <param name="appStoreTeamId">App store team ID.</param>
+        /// <param name="appStoreAppGroup">App store app group.</param>
+        /// <param name="appStoreSigningIdentity">App store signing identity.</param>
+        /// <param name="appStoreItcTeamId">App store ITC team ID.</param>
+        /// <param name="headHtml">Head HTML.</param>
+        /// <param name="socialTwitterUrl">Social Twitter URL.</param>
+        /// <param name="socialFacebookUrl">Social Facebook URL.</param>
+        /// <param name="socialInstagramUrl">Social Instagram URL.</param>
+        /// <param name="socialPintrestUrl">Social Pinterest URL.</param>
+        /// <param name="socialTripAdvisorUrl">Social TripAdvisor URL.</param>
+        /// <param name="socialGooglePlusUrl">Social Google Plus URL.</param>
+        /// <param name="socialFourSquareUrl">Social FourSquare URL.</param>
+        /// <param name="socialYelpUrl">Social Yelp URL.</param>
+        /// <param name="websiteType">Website type.</param>
+        /// <param name="externalOrderingPageUrl">External ordering page URL.</param>
+        /// <param name="panaceaEnabled">Panacea enabled.</param>
+        /// <param name="cookieConsentPromptEnabled">Cookie consent prompt enabled.</param>
+        /// <param name="panaceaVanityUrl">Panacea vanity URL.</param>
+        /// <param name="countryId">Country ID.</param>
+        /// <param name="referralUserId">Referral user ID.</param>
+        /// <param name="referralCampaignId">Referral campaign ID.</param>
+        public WhiteLabelConfigModel(List<WhiteLabelLanguageModel> whiteLabelLanguages = default(List<WhiteLabelLanguageModel>), List<WhiteLabelAssetModel> whiteLabelAssets = default(List<WhiteLabelAssetModel>), WhiteLabelColorSchemeModel colorScheme = default(WhiteLabelColorSchemeModel), int? whiteLabelConfigId = default(int?), int? whiteLabelId = default(int?), string whiteLabelName = default(string), string appNameId = default(string), string orgId = default(string), string smsRestaurantName = default(string), string deepLinkUrlScheme = default(string), string hostName = default(string), string nexmoSupportSmsNumber = default(string), string twilioSupportSmsNumber = default(string), string mixpanelToken = default(string), string intercomAppId = default(string), string shareMessageEmailSubject = default(string), string shareMessageEmailMessage = default(string), string shareMessageSmsMessage = default(string), string shareMessageWhatsAppMessage = default(string), string shareMessageFacebookMessage = default(string), string shareMessageTwitterMessage = default(string), string shareMessageGenericMessage = default(string), bool? displayDeliveryRestaurantListScreen = default(bool?), int? contactFormType = default(int?), string contactPhoneNumber = default(string), bool? displayBumpSideMenuItem = default(bool?), bool? displayFreeCokeSideMenuItem = default(bool?), string appStoreUrl = default(string), bool? deliveryEnabled = default(bool?), bool? pickupEnabled = default(bool?), bool? displayPickupRestaurantListScreen = default(bool?), bool? displayCuisineTypeListAndRestaurantSearchBar = default(bool?), bool? displayUserRestaurantRatings = default(bool?), bool? readyToPublishWeb = default(bool?), bool? readyToPublishIos = default(bool?), bool? readyToPublishAndroid = default(bool?), bool? displayFooterLinksToOtherSites = default(bool?), bool? displayOnlineOrderingMenu = default(bool?), bool? hideAppConfigFromAdminList = default(bool?), ComplianceTypeEnum? complianceType = default(ComplianceTypeEnum?), bool? isMenuMigratedToRms = default(bool?), double? mapBoundryMaxLongitude = default(double?), double? mapBoundryMinLongitude = default(double?), double? mapBoundryMaxLatitude = default(double?), double? mapBoundryMinLatitude = default(double?), string appStoreAppleId = default(string), string appStoreToken = default(string), bool? websiteDisplayStaticMenuPage = default(bool?), bool? isEmbed = default(bool?), bool? displayTipOptionToUsersByDefault = default(bool?), int? emailRequestMode = default(int?), int? addressEntryType = default(int?), int? addressLayout = default(int?), int? category = default(int?), double? mapCenterLatitude = default(double?), double? mapCenterLongitude = default(double?), string intercomTokenIos = default(string), string intercomTokenAndroid = default(string), string googleAnalyticsTokensCsv = default(string), string facebookTokensCsv = default(string), string shareMessageGenericUrl = default(string), string privateSupportEmailAddress = default(string), string appStoreId = default(string), int? playConsoleAccount = default(int?), DateTime? apnCertificateValidAfter = default(DateTime?), DateTime? apnCertificateValidBefore = default(DateTime?), bool? dineInEnabled = default(bool?), string appFont = default(string), int? whiteLabelColorSchemeId = default(int?), int? whiteLabelImagesId = default(int?), string appStoreCopyright = default(string), string appStoreDescription = default(string), string appStoreShortDescription = default(string), string appStoreKeywords = default(string), string appStoreMarketingUrl = default(string), string appStoreName = default(string), string appStorePrivacyUrl = default(string), string appStoreSupportUrl = default(string), string appStoreReleaseNotes = default(string), string appStoreIconUrl = default(string), string appStoreIconThumbnail100Url = default(string), string transparentLogoUrl = default(string), string logoImageName = default(string), string kioskNameScreenImage = default(string), int? webToAppRedirect = default(int?), string featuresCsv = default(string), string appStorePassword = default(string), string appStoreTeamId = default(string), string appStoreAppGroup = default(string), string appStoreSigningIdentity = default(string), string appStoreItcTeamId = default(string), string headHtml = default(string), string socialTwitterUrl = default(string), string socialFacebookUrl = default(string), string socialInstagramUrl = default(string), string socialPintrestUrl = default(string), string socialTripAdvisorUrl = default(string), string socialGooglePlusUrl = default(string), string socialFourSquareUrl = default(string), string socialYelpUrl = default(string), int? websiteType = default(int?), string externalOrderingPageUrl = default(string), bool? panaceaEnabled = default(bool?), bool? cookieConsentPromptEnabled = default(bool?), string panaceaVanityUrl = default(string), string countryId = default(string), int? referralUserId = default(int?), string referralCampaignId = default(string))
+        {
+            this.WhiteLabelLanguages = whiteLabelLanguages;
+            this.WhiteLabelAssets = whiteLabelAssets;
+            this.ColorScheme = colorScheme;
+            this.WhiteLabelConfigId = whiteLabelConfigId;
+            this.WhiteLabelId = whiteLabelId;
+            this.WhiteLabelName = whiteLabelName;
+            this.AppNameId = appNameId;
+            this.OrgId = orgId;
+            this.SmsRestaurantName = smsRestaurantName;
+            this.DeepLinkUrlScheme = deepLinkUrlScheme;
+            this.HostName = hostName;
+            this.NexmoSupportSmsNumber = nexmoSupportSmsNumber;
+            this.TwilioSupportSmsNumber = twilioSupportSmsNumber;
+            this.MixpanelToken = mixpanelToken;
+            this.IntercomAppId = intercomAppId;
+            this.ShareMessageEmailSubject = shareMessageEmailSubject;
+            this.ShareMessageEmailMessage = shareMessageEmailMessage;
+            this.ShareMessageSmsMessage = shareMessageSmsMessage;
+            this.ShareMessageWhatsAppMessage = shareMessageWhatsAppMessage;
+            this.ShareMessageFacebookMessage = shareMessageFacebookMessage;
+            this.ShareMessageTwitterMessage = shareMessageTwitterMessage;
+            this.ShareMessageGenericMessage = shareMessageGenericMessage;
+            this.DisplayDeliveryRestaurantListScreen = displayDeliveryRestaurantListScreen;
+            this.ContactFormType = contactFormType;
+            this.ContactPhoneNumber = contactPhoneNumber;
+            this.DisplayBumpSideMenuItem = displayBumpSideMenuItem;
+            this.DisplayFreeCokeSideMenuItem = displayFreeCokeSideMenuItem;
+            this.AppStoreUrl = appStoreUrl;
+            this.DeliveryEnabled = deliveryEnabled;
+            this.PickupEnabled = pickupEnabled;
+            this.DisplayPickupRestaurantListScreen = displayPickupRestaurantListScreen;
+            this.DisplayCuisineTypeListAndRestaurantSearchBar = displayCuisineTypeListAndRestaurantSearchBar;
+            this.DisplayUserRestaurantRatings = displayUserRestaurantRatings;
+            this.ReadyToPublishWeb = readyToPublishWeb;
+            this.ReadyToPublishIos = readyToPublishIos;
+            this.ReadyToPublishAndroid = readyToPublishAndroid;
+            this.DisplayFooterLinksToOtherSites = displayFooterLinksToOtherSites;
+            this.DisplayOnlineOrderingMenu = displayOnlineOrderingMenu;
+            this.HideAppConfigFromAdminList = hideAppConfigFromAdminList;
+            this.ComplianceType = complianceType;
+            this.IsMenuMigratedToRms = isMenuMigratedToRms;
+            this.MapBoundryMaxLongitude = mapBoundryMaxLongitude;
+            this.MapBoundryMinLongitude = mapBoundryMinLongitude;
+            this.MapBoundryMaxLatitude = mapBoundryMaxLatitude;
+            this.MapBoundryMinLatitude = mapBoundryMinLatitude;
+            this.AppStoreAppleId = appStoreAppleId;
+            this.AppStoreToken = appStoreToken;
+            this.WebsiteDisplayStaticMenuPage = websiteDisplayStaticMenuPage;
+            this.IsEmbed = isEmbed;
+            this.DisplayTipOptionToUsersByDefault = displayTipOptionToUsersByDefault;
+            this.EmailRequestMode = emailRequestMode;
+            this.AddressEntryType = addressEntryType;
+            this.AddressLayout = addressLayout;
+            this.Category = category;
+            this.MapCenterLatitude = mapCenterLatitude;
+            this.MapCenterLongitude = mapCenterLongitude;
+            this.IntercomTokenIos = intercomTokenIos;
+            this.IntercomTokenAndroid = intercomTokenAndroid;
+            this.GoogleAnalyticsTokensCsv = googleAnalyticsTokensCsv;
+            this.FacebookTokensCsv = facebookTokensCsv;
+            this.ShareMessageGenericUrl = shareMessageGenericUrl;
+            this.PrivateSupportEmailAddress = privateSupportEmailAddress;
+            this.AppStoreId = appStoreId;
+            this.PlayConsoleAccount = playConsoleAccount;
+            this.ApnCertificateValidAfter = apnCertificateValidAfter;
+            this.ApnCertificateValidBefore = apnCertificateValidBefore;
+            this.DineInEnabled = dineInEnabled;
+            this.AppFont = appFont;
+            this.WhiteLabelColorSchemeId = whiteLabelColorSchemeId;
+            this.WhiteLabelImagesId = whiteLabelImagesId;
+            this.AppStoreCopyright = appStoreCopyright;
+            this.AppStoreDescription = appStoreDescription;
+            this.AppStoreShortDescription = appStoreShortDescription;
+            this.AppStoreKeywords = appStoreKeywords;
+            this.AppStoreMarketingUrl = appStoreMarketingUrl;
+            this.AppStoreName = appStoreName;
+            this.AppStorePrivacyUrl = appStorePrivacyUrl;
+            this.AppStoreSupportUrl = appStoreSupportUrl;
+            this.AppStoreReleaseNotes = appStoreReleaseNotes;
+            this.AppStoreIconUrl = appStoreIconUrl;
+            this.AppStoreIconThumbnail100Url = appStoreIconThumbnail100Url;
+            this.TransparentLogoUrl = transparentLogoUrl;
+            this.LogoImageName = logoImageName;
+            this.KioskNameScreenImage = kioskNameScreenImage;
+            this.WebToAppRedirect = webToAppRedirect;
+            this.FeaturesCsv = featuresCsv;
+            this.AppStorePassword = appStorePassword;
+            this.AppStoreTeamId = appStoreTeamId;
+            this.AppStoreAppGroup = appStoreAppGroup;
+            this.AppStoreSigningIdentity = appStoreSigningIdentity;
+            this.AppStoreItcTeamId = appStoreItcTeamId;
+            this.HeadHtml = headHtml;
+            this.SocialTwitterUrl = socialTwitterUrl;
+            this.SocialFacebookUrl = socialFacebookUrl;
+            this.SocialInstagramUrl = socialInstagramUrl;
+            this.SocialPintrestUrl = socialPintrestUrl;
+            this.SocialTripAdvisorUrl = socialTripAdvisorUrl;
+            this.SocialGooglePlusUrl = socialGooglePlusUrl;
+            this.SocialFourSquareUrl = socialFourSquareUrl;
+            this.SocialYelpUrl = socialYelpUrl;
+            this.WebsiteType = websiteType;
+            this.ExternalOrderingPageUrl = externalOrderingPageUrl;
+            this.PanaceaEnabled = panaceaEnabled;
+            this.CookieConsentPromptEnabled = cookieConsentPromptEnabled;
+            this.PanaceaVanityUrl = panaceaVanityUrl;
+            this.CountryId = countryId;
+            this.ReferralUserId = referralUserId;
+            this.ReferralCampaignId = referralCampaignId;
+        }
+        
+        /// <summary>
+        /// White label languages
+        /// </summary>
+        /// <value>White label languages</value>
+        [DataMember(Name="WhiteLabelLanguages", EmitDefaultValue=false)]
+        public List<WhiteLabelLanguageModel> WhiteLabelLanguages { get; set; }
+
+        /// <summary>
+        /// White label assets
+        /// </summary>
+        /// <value>White label assets</value>
+        [DataMember(Name="WhiteLabelAssets", EmitDefaultValue=false)]
+        public List<WhiteLabelAssetModel> WhiteLabelAssets { get; set; }
+
+        /// <summary>
+        /// White label color scheme
+        /// </summary>
+        /// <value>White label color scheme</value>
+        [DataMember(Name="ColorScheme", EmitDefaultValue=false)]
+        public WhiteLabelColorSchemeModel ColorScheme { get; set; }
+
+        /// <summary>
+        /// White label configuration ID
+        /// </summary>
+        /// <value>White label configuration ID</value>
+        [DataMember(Name="WhiteLabelConfigId", EmitDefaultValue=false)]
+        public int? WhiteLabelConfigId { get; set; }
+
+        /// <summary>
+        /// White label ID
+        /// </summary>
+        /// <value>White label ID</value>
+        [DataMember(Name="WhiteLabelId", EmitDefaultValue=false)]
+        public int? WhiteLabelId { get; set; }
+
+        /// <summary>
+        /// White label name
+        /// </summary>
+        /// <value>White label name</value>
+        [DataMember(Name="WhiteLabelName", EmitDefaultValue=false)]
+        public string WhiteLabelName { get; set; }
+
+        /// <summary>
+        /// App name ID (Bundle ID Suffix)
+        /// </summary>
+        /// <value>App name ID (Bundle ID Suffix)</value>
+        [DataMember(Name="AppNameId", EmitDefaultValue=false)]
+        public string AppNameId { get; set; }
+
+        /// <summary>
+        /// Organization ID
+        /// </summary>
+        /// <value>Organization ID</value>
+        [DataMember(Name="OrgId", EmitDefaultValue=false)]
+        public string OrgId { get; set; }
+
+        /// <summary>
+        /// SMS restaurant name
+        /// </summary>
+        /// <value>SMS restaurant name</value>
+        [DataMember(Name="SmsRestaurantName", EmitDefaultValue=false)]
+        public string SmsRestaurantName { get; set; }
+
+        /// <summary>
+        /// Deep link URL scheme
+        /// </summary>
+        /// <value>Deep link URL scheme</value>
+        [DataMember(Name="DeepLinkUrlScheme", EmitDefaultValue=false)]
+        public string DeepLinkUrlScheme { get; set; }
+
+        /// <summary>
+        /// Host name
+        /// </summary>
+        /// <value>Host name</value>
+        [DataMember(Name="HostName", EmitDefaultValue=false)]
+        public string HostName { get; set; }
+
+        /// <summary>
+        /// Nexmo support SMS number
+        /// </summary>
+        /// <value>Nexmo support SMS number</value>
+        [DataMember(Name="NexmoSupportSmsNumber", EmitDefaultValue=false)]
+        public string NexmoSupportSmsNumber { get; set; }
+
+        /// <summary>
+        /// Twilio support SMS number
+        /// </summary>
+        /// <value>Twilio support SMS number</value>
+        [DataMember(Name="TwilioSupportSmsNumber", EmitDefaultValue=false)]
+        public string TwilioSupportSmsNumber { get; set; }
+
+        /// <summary>
+        /// Mixpanel token
+        /// </summary>
+        /// <value>Mixpanel token</value>
+        [DataMember(Name="MixpanelToken", EmitDefaultValue=false)]
+        public string MixpanelToken { get; set; }
+
+        /// <summary>
+        /// Intercom app ID
+        /// </summary>
+        /// <value>Intercom app ID</value>
+        [DataMember(Name="IntercomAppId", EmitDefaultValue=false)]
+        public string IntercomAppId { get; set; }
+
+        /// <summary>
+        /// Share message email subject
+        /// </summary>
+        /// <value>Share message email subject</value>
+        [DataMember(Name="ShareMessageEmailSubject", EmitDefaultValue=false)]
+        public string ShareMessageEmailSubject { get; set; }
+
+        /// <summary>
+        /// Share message email message
+        /// </summary>
+        /// <value>Share message email message</value>
+        [DataMember(Name="ShareMessageEmailMessage", EmitDefaultValue=false)]
+        public string ShareMessageEmailMessage { get; set; }
+
+        /// <summary>
+        /// Share message SMS message
+        /// </summary>
+        /// <value>Share message SMS message</value>
+        [DataMember(Name="ShareMessageSmsMessage", EmitDefaultValue=false)]
+        public string ShareMessageSmsMessage { get; set; }
+
+        /// <summary>
+        /// Share message WhatsApp message
+        /// </summary>
+        /// <value>Share message WhatsApp message</value>
+        [DataMember(Name="ShareMessageWhatsAppMessage", EmitDefaultValue=false)]
+        public string ShareMessageWhatsAppMessage { get; set; }
+
+        /// <summary>
+        /// Share message Facebook message
+        /// </summary>
+        /// <value>Share message Facebook message</value>
+        [DataMember(Name="ShareMessageFacebookMessage", EmitDefaultValue=false)]
+        public string ShareMessageFacebookMessage { get; set; }
+
+        /// <summary>
+        /// Share message Twitter message
+        /// </summary>
+        /// <value>Share message Twitter message</value>
+        [DataMember(Name="ShareMessageTwitterMessage", EmitDefaultValue=false)]
+        public string ShareMessageTwitterMessage { get; set; }
+
+        /// <summary>
+        /// Share message generic message
+        /// </summary>
+        /// <value>Share message generic message</value>
+        [DataMember(Name="ShareMessageGenericMessage", EmitDefaultValue=false)]
+        public string ShareMessageGenericMessage { get; set; }
+
+        /// <summary>
+        /// Display delivery restaurant list screen
+        /// </summary>
+        /// <value>Display delivery restaurant list screen</value>
+        [DataMember(Name="DisplayDeliveryRestaurantListScreen", EmitDefaultValue=false)]
+        public bool? DisplayDeliveryRestaurantListScreen { get; set; }
+
+        /// <summary>
+        /// Contact form type
+        /// </summary>
+        /// <value>Contact form type</value>
+        [DataMember(Name="ContactFormType", EmitDefaultValue=false)]
+        public int? ContactFormType { get; set; }
+
+        /// <summary>
+        /// Contact phone number
+        /// </summary>
+        /// <value>Contact phone number</value>
+        [DataMember(Name="ContactPhoneNumber", EmitDefaultValue=false)]
+        public string ContactPhoneNumber { get; set; }
+
+        /// <summary>
+        /// Display bump side menu item
+        /// </summary>
+        /// <value>Display bump side menu item</value>
+        [DataMember(Name="DisplayBumpSideMenuItem", EmitDefaultValue=false)]
+        public bool? DisplayBumpSideMenuItem { get; set; }
+
+        /// <summary>
+        /// Display free coke side menu item
+        /// </summary>
+        /// <value>Display free coke side menu item</value>
+        [DataMember(Name="DisplayFreeCokeSideMenuItem", EmitDefaultValue=false)]
+        public bool? DisplayFreeCokeSideMenuItem { get; set; }
+
+        /// <summary>
+        /// App store URL
+        /// </summary>
+        /// <value>App store URL</value>
+        [DataMember(Name="AppStoreUrl", EmitDefaultValue=false)]
+        public string AppStoreUrl { get; set; }
+
+        /// <summary>
+        /// Delivery enabled
+        /// </summary>
+        /// <value>Delivery enabled</value>
+        [DataMember(Name="DeliveryEnabled", EmitDefaultValue=false)]
+        public bool? DeliveryEnabled { get; set; }
+
+        /// <summary>
+        /// Pickup enabled
+        /// </summary>
+        /// <value>Pickup enabled</value>
+        [DataMember(Name="PickupEnabled", EmitDefaultValue=false)]
+        public bool? PickupEnabled { get; set; }
+
+        /// <summary>
+        /// Display pickup restaurant list screen
+        /// </summary>
+        /// <value>Display pickup restaurant list screen</value>
+        [DataMember(Name="DisplayPickupRestaurantListScreen", EmitDefaultValue=false)]
+        public bool? DisplayPickupRestaurantListScreen { get; set; }
+
+        /// <summary>
+        /// Display cuisine type list and restaurant search bar
+        /// </summary>
+        /// <value>Display cuisine type list and restaurant search bar</value>
+        [DataMember(Name="DisplayCuisineTypeListAndRestaurantSearchBar", EmitDefaultValue=false)]
+        public bool? DisplayCuisineTypeListAndRestaurantSearchBar { get; set; }
+
+        /// <summary>
+        /// Display user restaurant ratings
+        /// </summary>
+        /// <value>Display user restaurant ratings</value>
+        [DataMember(Name="DisplayUserRestaurantRatings", EmitDefaultValue=false)]
+        public bool? DisplayUserRestaurantRatings { get; set; }
+
+        /// <summary>
+        /// Ready to publish web
+        /// </summary>
+        /// <value>Ready to publish web</value>
+        [DataMember(Name="ReadyToPublishWeb", EmitDefaultValue=false)]
+        public bool? ReadyToPublishWeb { get; set; }
+
+        /// <summary>
+        /// Ready to publish iOS
+        /// </summary>
+        /// <value>Ready to publish iOS</value>
+        [DataMember(Name="ReadyToPublishIos", EmitDefaultValue=false)]
+        public bool? ReadyToPublishIos { get; set; }
+
+        /// <summary>
+        /// Ready to publish Android
+        /// </summary>
+        /// <value>Ready to publish Android</value>
+        [DataMember(Name="ReadyToPublishAndroid", EmitDefaultValue=false)]
+        public bool? ReadyToPublishAndroid { get; set; }
+
+        /// <summary>
+        /// Display footer links to other sites
+        /// </summary>
+        /// <value>Display footer links to other sites</value>
+        [DataMember(Name="DisplayFooterLinksToOtherSites", EmitDefaultValue=false)]
+        public bool? DisplayFooterLinksToOtherSites { get; set; }
+
+        /// <summary>
+        /// Display online ordering menu
+        /// </summary>
+        /// <value>Display online ordering menu</value>
+        [DataMember(Name="DisplayOnlineOrderingMenu", EmitDefaultValue=false)]
+        public bool? DisplayOnlineOrderingMenu { get; set; }
+
+        /// <summary>
+        /// Hide app config from admin list
+        /// </summary>
+        /// <value>Hide app config from admin list</value>
+        [DataMember(Name="HideAppConfigFromAdminList", EmitDefaultValue=false)]
+        public bool? HideAppConfigFromAdminList { get; set; }
+
+
+        /// <summary>
+        /// Is menu migrated to RMS
+        /// </summary>
+        /// <value>Is menu migrated to RMS</value>
+        [DataMember(Name="IsMenuMigratedToRms", EmitDefaultValue=false)]
+        public bool? IsMenuMigratedToRms { get; set; }
+
+        /// <summary>
+        /// Map boundary max longitude
+        /// </summary>
+        /// <value>Map boundary max longitude</value>
+        [DataMember(Name="MapBoundryMaxLongitude", EmitDefaultValue=false)]
+        public double? MapBoundryMaxLongitude { get; set; }
+
+        /// <summary>
+        /// Map boundary min longitude
+        /// </summary>
+        /// <value>Map boundary min longitude</value>
+        [DataMember(Name="MapBoundryMinLongitude", EmitDefaultValue=false)]
+        public double? MapBoundryMinLongitude { get; set; }
+
+        /// <summary>
+        /// Map boundary max latitude
+        /// </summary>
+        /// <value>Map boundary max latitude</value>
+        [DataMember(Name="MapBoundryMaxLatitude", EmitDefaultValue=false)]
+        public double? MapBoundryMaxLatitude { get; set; }
+
+        /// <summary>
+        /// Map boundary min latitude
+        /// </summary>
+        /// <value>Map boundary min latitude</value>
+        [DataMember(Name="MapBoundryMinLatitude", EmitDefaultValue=false)]
+        public double? MapBoundryMinLatitude { get; set; }
+
+        /// <summary>
+        /// App store Apple ID
+        /// </summary>
+        /// <value>App store Apple ID</value>
+        [DataMember(Name="AppStoreAppleId", EmitDefaultValue=false)]
+        public string AppStoreAppleId { get; set; }
+
+        /// <summary>
+        /// App store token
+        /// </summary>
+        /// <value>App store token</value>
+        [DataMember(Name="AppStoreToken", EmitDefaultValue=false)]
+        public string AppStoreToken { get; set; }
+
+        /// <summary>
+        /// Website display static menu page
+        /// </summary>
+        /// <value>Website display static menu page</value>
+        [DataMember(Name="WebsiteDisplayStaticMenuPage", EmitDefaultValue=false)]
+        public bool? WebsiteDisplayStaticMenuPage { get; set; }
+
+        /// <summary>
+        /// Is embed
+        /// </summary>
+        /// <value>Is embed</value>
+        [DataMember(Name="IsEmbed", EmitDefaultValue=false)]
+        public bool? IsEmbed { get; set; }
+
+        /// <summary>
+        /// Display tip option to users by default
+        /// </summary>
+        /// <value>Display tip option to users by default</value>
+        [DataMember(Name="DisplayTipOptionToUsersByDefault", EmitDefaultValue=false)]
+        public bool? DisplayTipOptionToUsersByDefault { get; set; }
+
+        /// <summary>
+        /// Email request mode
+        /// </summary>
+        /// <value>Email request mode</value>
+        [DataMember(Name="EmailRequestMode", EmitDefaultValue=false)]
+        public int? EmailRequestMode { get; set; }
+
+        /// <summary>
+        /// Address entry type
+        /// </summary>
+        /// <value>Address entry type</value>
+        [DataMember(Name="AddressEntryType", EmitDefaultValue=false)]
+        public int? AddressEntryType { get; set; }
+
+        /// <summary>
+        /// Address layout
+        /// </summary>
+        /// <value>Address layout</value>
+        [DataMember(Name="AddressLayout", EmitDefaultValue=false)]
+        public int? AddressLayout { get; set; }
+
+        /// <summary>
+        /// Category
+        /// </summary>
+        /// <value>Category</value>
+        [DataMember(Name="Category", EmitDefaultValue=false)]
+        public int? Category { get; set; }
+
+        /// <summary>
+        /// Map center latitude
+        /// </summary>
+        /// <value>Map center latitude</value>
+        [DataMember(Name="MapCenterLatitude", EmitDefaultValue=false)]
+        public double? MapCenterLatitude { get; set; }
+
+        /// <summary>
+        /// Map center longitude
+        /// </summary>
+        /// <value>Map center longitude</value>
+        [DataMember(Name="MapCenterLongitude", EmitDefaultValue=false)]
+        public double? MapCenterLongitude { get; set; }
+
+        /// <summary>
+        /// Intercom token iOS
+        /// </summary>
+        /// <value>Intercom token iOS</value>
+        [DataMember(Name="IntercomTokenIos", EmitDefaultValue=false)]
+        public string IntercomTokenIos { get; set; }
+
+        /// <summary>
+        /// Intercom token Android
+        /// </summary>
+        /// <value>Intercom token Android</value>
+        [DataMember(Name="IntercomTokenAndroid", EmitDefaultValue=false)]
+        public string IntercomTokenAndroid { get; set; }
+
+        /// <summary>
+        /// Google Analytics tokens CSV
+        /// </summary>
+        /// <value>Google Analytics tokens CSV</value>
+        [DataMember(Name="GoogleAnalyticsTokensCsv", EmitDefaultValue=false)]
+        public string GoogleAnalyticsTokensCsv { get; set; }
+
+        /// <summary>
+        /// Facebook tokens CSV
+        /// </summary>
+        /// <value>Facebook tokens CSV</value>
+        [DataMember(Name="FacebookTokensCsv", EmitDefaultValue=false)]
+        public string FacebookTokensCsv { get; set; }
+
+        /// <summary>
+        /// Share message generic URL
+        /// </summary>
+        /// <value>Share message generic URL</value>
+        [DataMember(Name="ShareMessageGenericUrl", EmitDefaultValue=false)]
+        public string ShareMessageGenericUrl { get; set; }
+
+        /// <summary>
+        /// Private support email address
+        /// </summary>
+        /// <value>Private support email address</value>
+        [DataMember(Name="PrivateSupportEmailAddress", EmitDefaultValue=false)]
+        public string PrivateSupportEmailAddress { get; set; }
+
+        /// <summary>
+        /// App store ID
+        /// </summary>
+        /// <value>App store ID</value>
+        [DataMember(Name="AppStoreId", EmitDefaultValue=false)]
+        public string AppStoreId { get; set; }
+
+        /// <summary>
+        /// Play console account
+        /// </summary>
+        /// <value>Play console account</value>
+        [DataMember(Name="PlayConsoleAccount", EmitDefaultValue=false)]
+        public int? PlayConsoleAccount { get; set; }
+
+        /// <summary>
+        /// APN certificate valid after
+        /// </summary>
+        /// <value>APN certificate valid after</value>
+        [DataMember(Name="ApnCertificateValidAfter", EmitDefaultValue=false)]
+        public DateTime? ApnCertificateValidAfter { get; set; }
+
+        /// <summary>
+        /// APN certificate valid before
+        /// </summary>
+        /// <value>APN certificate valid before</value>
+        [DataMember(Name="ApnCertificateValidBefore", EmitDefaultValue=false)]
+        public DateTime? ApnCertificateValidBefore { get; set; }
+
+        /// <summary>
+        /// Dine in enabled
+        /// </summary>
+        /// <value>Dine in enabled</value>
+        [DataMember(Name="DineInEnabled", EmitDefaultValue=false)]
+        public bool? DineInEnabled { get; set; }
+
+        /// <summary>
+        /// App font
+        /// </summary>
+        /// <value>App font</value>
+        [DataMember(Name="AppFont", EmitDefaultValue=false)]
+        public string AppFont { get; set; }
+
+        /// <summary>
+        /// White label color scheme ID
+        /// </summary>
+        /// <value>White label color scheme ID</value>
+        [DataMember(Name="WhiteLabelColorSchemeId", EmitDefaultValue=false)]
+        public int? WhiteLabelColorSchemeId { get; set; }
+
+        /// <summary>
+        /// White label images ID
+        /// </summary>
+        /// <value>White label images ID</value>
+        [DataMember(Name="WhiteLabelImagesId", EmitDefaultValue=false)]
+        public int? WhiteLabelImagesId { get; set; }
+
+        /// <summary>
+        /// App store copyright
+        /// </summary>
+        /// <value>App store copyright</value>
+        [DataMember(Name="AppStoreCopyright", EmitDefaultValue=false)]
+        public string AppStoreCopyright { get; set; }
+
+        /// <summary>
+        /// App store description
+        /// </summary>
+        /// <value>App store description</value>
+        [DataMember(Name="AppStoreDescription", EmitDefaultValue=false)]
+        public string AppStoreDescription { get; set; }
+
+        /// <summary>
+        /// App store short description
+        /// </summary>
+        /// <value>App store short description</value>
+        [DataMember(Name="AppStoreShortDescription", EmitDefaultValue=false)]
+        public string AppStoreShortDescription { get; set; }
+
+        /// <summary>
+        /// App store keywords
+        /// </summary>
+        /// <value>App store keywords</value>
+        [DataMember(Name="AppStoreKeywords", EmitDefaultValue=false)]
+        public string AppStoreKeywords { get; set; }
+
+        /// <summary>
+        /// App store marketing URL
+        /// </summary>
+        /// <value>App store marketing URL</value>
+        [DataMember(Name="AppStoreMarketingUrl", EmitDefaultValue=false)]
+        public string AppStoreMarketingUrl { get; set; }
+
+        /// <summary>
+        /// App store name
+        /// </summary>
+        /// <value>App store name</value>
+        [DataMember(Name="AppStoreName", EmitDefaultValue=false)]
+        public string AppStoreName { get; set; }
+
+        /// <summary>
+        /// App store privacy URL
+        /// </summary>
+        /// <value>App store privacy URL</value>
+        [DataMember(Name="AppStorePrivacyUrl", EmitDefaultValue=false)]
+        public string AppStorePrivacyUrl { get; set; }
+
+        /// <summary>
+        /// App store support URL
+        /// </summary>
+        /// <value>App store support URL</value>
+        [DataMember(Name="AppStoreSupportUrl", EmitDefaultValue=false)]
+        public string AppStoreSupportUrl { get; set; }
+
+        /// <summary>
+        /// App store release notes
+        /// </summary>
+        /// <value>App store release notes</value>
+        [DataMember(Name="AppStoreReleaseNotes", EmitDefaultValue=false)]
+        public string AppStoreReleaseNotes { get; set; }
+
+        /// <summary>
+        /// App store icon URL
+        /// </summary>
+        /// <value>App store icon URL</value>
+        [DataMember(Name="AppStoreIconUrl", EmitDefaultValue=false)]
+        public string AppStoreIconUrl { get; set; }
+
+        /// <summary>
+        /// App store icon thumbnail 100 URL
+        /// </summary>
+        /// <value>App store icon thumbnail 100 URL</value>
+        [DataMember(Name="AppStoreIconThumbnail100Url", EmitDefaultValue=false)]
+        public string AppStoreIconThumbnail100Url { get; set; }
+
+        /// <summary>
+        /// Transparent logo URL
+        /// </summary>
+        /// <value>Transparent logo URL</value>
+        [DataMember(Name="TransparentLogoUrl", EmitDefaultValue=false)]
+        public string TransparentLogoUrl { get; set; }
+
+        /// <summary>
+        /// Logo image name
+        /// </summary>
+        /// <value>Logo image name</value>
+        [DataMember(Name="LogoImageName", EmitDefaultValue=false)]
+        public string LogoImageName { get; set; }
+
+        /// <summary>
+        /// Kiosk name screen image
+        /// </summary>
+        /// <value>Kiosk name screen image</value>
+        [DataMember(Name="KioskNameScreenImage", EmitDefaultValue=false)]
+        public string KioskNameScreenImage { get; set; }
+
+        /// <summary>
+        /// Web to app redirect
+        /// </summary>
+        /// <value>Web to app redirect</value>
+        [DataMember(Name="WebToAppRedirect", EmitDefaultValue=false)]
+        public int? WebToAppRedirect { get; set; }
+
+        /// <summary>
+        /// Features CSV
+        /// </summary>
+        /// <value>Features CSV</value>
+        [DataMember(Name="FeaturesCsv", EmitDefaultValue=false)]
+        public string FeaturesCsv { get; set; }
+
+        /// <summary>
+        /// App store password
+        /// </summary>
+        /// <value>App store password</value>
+        [DataMember(Name="AppStorePassword", EmitDefaultValue=false)]
+        public string AppStorePassword { get; set; }
+
+        /// <summary>
+        /// App store team ID
+        /// </summary>
+        /// <value>App store team ID</value>
+        [DataMember(Name="AppStoreTeamId", EmitDefaultValue=false)]
+        public string AppStoreTeamId { get; set; }
+
+        /// <summary>
+        /// App store app group
+        /// </summary>
+        /// <value>App store app group</value>
+        [DataMember(Name="AppStoreAppGroup", EmitDefaultValue=false)]
+        public string AppStoreAppGroup { get; set; }
+
+        /// <summary>
+        /// App store signing identity
+        /// </summary>
+        /// <value>App store signing identity</value>
+        [DataMember(Name="AppStoreSigningIdentity", EmitDefaultValue=false)]
+        public string AppStoreSigningIdentity { get; set; }
+
+        /// <summary>
+        /// App store ITC team ID
+        /// </summary>
+        /// <value>App store ITC team ID</value>
+        [DataMember(Name="AppStoreItcTeamId", EmitDefaultValue=false)]
+        public string AppStoreItcTeamId { get; set; }
+
+        /// <summary>
+        /// Head HTML
+        /// </summary>
+        /// <value>Head HTML</value>
+        [DataMember(Name="HeadHtml", EmitDefaultValue=false)]
+        public string HeadHtml { get; set; }
+
+        /// <summary>
+        /// Social Twitter URL
+        /// </summary>
+        /// <value>Social Twitter URL</value>
+        [DataMember(Name="SocialTwitterUrl", EmitDefaultValue=false)]
+        public string SocialTwitterUrl { get; set; }
+
+        /// <summary>
+        /// Social Facebook URL
+        /// </summary>
+        /// <value>Social Facebook URL</value>
+        [DataMember(Name="SocialFacebookUrl", EmitDefaultValue=false)]
+        public string SocialFacebookUrl { get; set; }
+
+        /// <summary>
+        /// Social Instagram URL
+        /// </summary>
+        /// <value>Social Instagram URL</value>
+        [DataMember(Name="SocialInstagramUrl", EmitDefaultValue=false)]
+        public string SocialInstagramUrl { get; set; }
+
+        /// <summary>
+        /// Social Pinterest URL
+        /// </summary>
+        /// <value>Social Pinterest URL</value>
+        [DataMember(Name="SocialPintrestUrl", EmitDefaultValue=false)]
+        public string SocialPintrestUrl { get; set; }
+
+        /// <summary>
+        /// Social TripAdvisor URL
+        /// </summary>
+        /// <value>Social TripAdvisor URL</value>
+        [DataMember(Name="SocialTripAdvisorUrl", EmitDefaultValue=false)]
+        public string SocialTripAdvisorUrl { get; set; }
+
+        /// <summary>
+        /// Social Google Plus URL
+        /// </summary>
+        /// <value>Social Google Plus URL</value>
+        [DataMember(Name="SocialGooglePlusUrl", EmitDefaultValue=false)]
+        public string SocialGooglePlusUrl { get; set; }
+
+        /// <summary>
+        /// Social FourSquare URL
+        /// </summary>
+        /// <value>Social FourSquare URL</value>
+        [DataMember(Name="SocialFourSquareUrl", EmitDefaultValue=false)]
+        public string SocialFourSquareUrl { get; set; }
+
+        /// <summary>
+        /// Social Yelp URL
+        /// </summary>
+        /// <value>Social Yelp URL</value>
+        [DataMember(Name="SocialYelpUrl", EmitDefaultValue=false)]
+        public string SocialYelpUrl { get; set; }
+
+        /// <summary>
+        /// Website type
+        /// </summary>
+        /// <value>Website type</value>
+        [DataMember(Name="WebsiteType", EmitDefaultValue=false)]
+        public int? WebsiteType { get; set; }
+
+        /// <summary>
+        /// External ordering page URL
+        /// </summary>
+        /// <value>External ordering page URL</value>
+        [DataMember(Name="ExternalOrderingPageUrl", EmitDefaultValue=false)]
+        public string ExternalOrderingPageUrl { get; set; }
+
+        /// <summary>
+        /// Panacea enabled
+        /// </summary>
+        /// <value>Panacea enabled</value>
+        [DataMember(Name="PanaceaEnabled", EmitDefaultValue=false)]
+        public bool? PanaceaEnabled { get; set; }
+
+        /// <summary>
+        /// Cookie consent prompt enabled
+        /// </summary>
+        /// <value>Cookie consent prompt enabled</value>
+        [DataMember(Name="CookieConsentPromptEnabled", EmitDefaultValue=false)]
+        public bool? CookieConsentPromptEnabled { get; set; }
+
+        /// <summary>
+        /// Panacea vanity URL
+        /// </summary>
+        /// <value>Panacea vanity URL</value>
+        [DataMember(Name="PanaceaVanityUrl", EmitDefaultValue=false)]
+        public string PanaceaVanityUrl { get; set; }
+
+        /// <summary>
+        /// Country ID
+        /// </summary>
+        /// <value>Country ID</value>
+        [DataMember(Name="CountryId", EmitDefaultValue=false)]
+        public string CountryId { get; set; }
+
+        /// <summary>
+        /// Referral user ID
+        /// </summary>
+        /// <value>Referral user ID</value>
+        [DataMember(Name="ReferralUserId", EmitDefaultValue=false)]
+        public int? ReferralUserId { get; set; }
+
+        /// <summary>
+        /// Referral campaign ID
+        /// </summary>
+        /// <value>Referral campaign ID</value>
+        [DataMember(Name="ReferralCampaignId", EmitDefaultValue=false)]
+        public string ReferralCampaignId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class WhiteLabelConfigModel {\n");
+            sb.Append("  WhiteLabelLanguages: ").Append(WhiteLabelLanguages).Append("\n");
+            sb.Append("  WhiteLabelAssets: ").Append(WhiteLabelAssets).Append("\n");
+            sb.Append("  ColorScheme: ").Append(ColorScheme).Append("\n");
+            sb.Append("  WhiteLabelConfigId: ").Append(WhiteLabelConfigId).Append("\n");
+            sb.Append("  WhiteLabelId: ").Append(WhiteLabelId).Append("\n");
+            sb.Append("  WhiteLabelName: ").Append(WhiteLabelName).Append("\n");
+            sb.Append("  AppNameId: ").Append(AppNameId).Append("\n");
+            sb.Append("  OrgId: ").Append(OrgId).Append("\n");
+            sb.Append("  SmsRestaurantName: ").Append(SmsRestaurantName).Append("\n");
+            sb.Append("  DeepLinkUrlScheme: ").Append(DeepLinkUrlScheme).Append("\n");
+            sb.Append("  HostName: ").Append(HostName).Append("\n");
+            sb.Append("  NexmoSupportSmsNumber: ").Append(NexmoSupportSmsNumber).Append("\n");
+            sb.Append("  TwilioSupportSmsNumber: ").Append(TwilioSupportSmsNumber).Append("\n");
+            sb.Append("  MixpanelToken: ").Append(MixpanelToken).Append("\n");
+            sb.Append("  IntercomAppId: ").Append(IntercomAppId).Append("\n");
+            sb.Append("  ShareMessageEmailSubject: ").Append(ShareMessageEmailSubject).Append("\n");
+            sb.Append("  ShareMessageEmailMessage: ").Append(ShareMessageEmailMessage).Append("\n");
+            sb.Append("  ShareMessageSmsMessage: ").Append(ShareMessageSmsMessage).Append("\n");
+            sb.Append("  ShareMessageWhatsAppMessage: ").Append(ShareMessageWhatsAppMessage).Append("\n");
+            sb.Append("  ShareMessageFacebookMessage: ").Append(ShareMessageFacebookMessage).Append("\n");
+            sb.Append("  ShareMessageTwitterMessage: ").Append(ShareMessageTwitterMessage).Append("\n");
+            sb.Append("  ShareMessageGenericMessage: ").Append(ShareMessageGenericMessage).Append("\n");
+            sb.Append("  DisplayDeliveryRestaurantListScreen: ").Append(DisplayDeliveryRestaurantListScreen).Append("\n");
+            sb.Append("  ContactFormType: ").Append(ContactFormType).Append("\n");
+            sb.Append("  ContactPhoneNumber: ").Append(ContactPhoneNumber).Append("\n");
+            sb.Append("  DisplayBumpSideMenuItem: ").Append(DisplayBumpSideMenuItem).Append("\n");
+            sb.Append("  DisplayFreeCokeSideMenuItem: ").Append(DisplayFreeCokeSideMenuItem).Append("\n");
+            sb.Append("  AppStoreUrl: ").Append(AppStoreUrl).Append("\n");
+            sb.Append("  DeliveryEnabled: ").Append(DeliveryEnabled).Append("\n");
+            sb.Append("  PickupEnabled: ").Append(PickupEnabled).Append("\n");
+            sb.Append("  DisplayPickupRestaurantListScreen: ").Append(DisplayPickupRestaurantListScreen).Append("\n");
+            sb.Append("  DisplayCuisineTypeListAndRestaurantSearchBar: ").Append(DisplayCuisineTypeListAndRestaurantSearchBar).Append("\n");
+            sb.Append("  DisplayUserRestaurantRatings: ").Append(DisplayUserRestaurantRatings).Append("\n");
+            sb.Append("  ReadyToPublishWeb: ").Append(ReadyToPublishWeb).Append("\n");
+            sb.Append("  ReadyToPublishIos: ").Append(ReadyToPublishIos).Append("\n");
+            sb.Append("  ReadyToPublishAndroid: ").Append(ReadyToPublishAndroid).Append("\n");
+            sb.Append("  DisplayFooterLinksToOtherSites: ").Append(DisplayFooterLinksToOtherSites).Append("\n");
+            sb.Append("  DisplayOnlineOrderingMenu: ").Append(DisplayOnlineOrderingMenu).Append("\n");
+            sb.Append("  HideAppConfigFromAdminList: ").Append(HideAppConfigFromAdminList).Append("\n");
+            sb.Append("  ComplianceType: ").Append(ComplianceType).Append("\n");
+            sb.Append("  IsMenuMigratedToRms: ").Append(IsMenuMigratedToRms).Append("\n");
+            sb.Append("  MapBoundryMaxLongitude: ").Append(MapBoundryMaxLongitude).Append("\n");
+            sb.Append("  MapBoundryMinLongitude: ").Append(MapBoundryMinLongitude).Append("\n");
+            sb.Append("  MapBoundryMaxLatitude: ").Append(MapBoundryMaxLatitude).Append("\n");
+            sb.Append("  MapBoundryMinLatitude: ").Append(MapBoundryMinLatitude).Append("\n");
+            sb.Append("  AppStoreAppleId: ").Append(AppStoreAppleId).Append("\n");
+            sb.Append("  AppStoreToken: ").Append(AppStoreToken).Append("\n");
+            sb.Append("  WebsiteDisplayStaticMenuPage: ").Append(WebsiteDisplayStaticMenuPage).Append("\n");
+            sb.Append("  IsEmbed: ").Append(IsEmbed).Append("\n");
+            sb.Append("  DisplayTipOptionToUsersByDefault: ").Append(DisplayTipOptionToUsersByDefault).Append("\n");
+            sb.Append("  EmailRequestMode: ").Append(EmailRequestMode).Append("\n");
+            sb.Append("  AddressEntryType: ").Append(AddressEntryType).Append("\n");
+            sb.Append("  AddressLayout: ").Append(AddressLayout).Append("\n");
+            sb.Append("  Category: ").Append(Category).Append("\n");
+            sb.Append("  MapCenterLatitude: ").Append(MapCenterLatitude).Append("\n");
+            sb.Append("  MapCenterLongitude: ").Append(MapCenterLongitude).Append("\n");
+            sb.Append("  IntercomTokenIos: ").Append(IntercomTokenIos).Append("\n");
+            sb.Append("  IntercomTokenAndroid: ").Append(IntercomTokenAndroid).Append("\n");
+            sb.Append("  GoogleAnalyticsTokensCsv: ").Append(GoogleAnalyticsTokensCsv).Append("\n");
+            sb.Append("  FacebookTokensCsv: ").Append(FacebookTokensCsv).Append("\n");
+            sb.Append("  ShareMessageGenericUrl: ").Append(ShareMessageGenericUrl).Append("\n");
+            sb.Append("  PrivateSupportEmailAddress: ").Append(PrivateSupportEmailAddress).Append("\n");
+            sb.Append("  AppStoreId: ").Append(AppStoreId).Append("\n");
+            sb.Append("  PlayConsoleAccount: ").Append(PlayConsoleAccount).Append("\n");
+            sb.Append("  ApnCertificateValidAfter: ").Append(ApnCertificateValidAfter).Append("\n");
+            sb.Append("  ApnCertificateValidBefore: ").Append(ApnCertificateValidBefore).Append("\n");
+            sb.Append("  DineInEnabled: ").Append(DineInEnabled).Append("\n");
+            sb.Append("  AppFont: ").Append(AppFont).Append("\n");
+            sb.Append("  WhiteLabelColorSchemeId: ").Append(WhiteLabelColorSchemeId).Append("\n");
+            sb.Append("  WhiteLabelImagesId: ").Append(WhiteLabelImagesId).Append("\n");
+            sb.Append("  AppStoreCopyright: ").Append(AppStoreCopyright).Append("\n");
+            sb.Append("  AppStoreDescription: ").Append(AppStoreDescription).Append("\n");
+            sb.Append("  AppStoreShortDescription: ").Append(AppStoreShortDescription).Append("\n");
+            sb.Append("  AppStoreKeywords: ").Append(AppStoreKeywords).Append("\n");
+            sb.Append("  AppStoreMarketingUrl: ").Append(AppStoreMarketingUrl).Append("\n");
+            sb.Append("  AppStoreName: ").Append(AppStoreName).Append("\n");
+            sb.Append("  AppStorePrivacyUrl: ").Append(AppStorePrivacyUrl).Append("\n");
+            sb.Append("  AppStoreSupportUrl: ").Append(AppStoreSupportUrl).Append("\n");
+            sb.Append("  AppStoreReleaseNotes: ").Append(AppStoreReleaseNotes).Append("\n");
+            sb.Append("  AppStoreIconUrl: ").Append(AppStoreIconUrl).Append("\n");
+            sb.Append("  AppStoreIconThumbnail100Url: ").Append(AppStoreIconThumbnail100Url).Append("\n");
+            sb.Append("  TransparentLogoUrl: ").Append(TransparentLogoUrl).Append("\n");
+            sb.Append("  LogoImageName: ").Append(LogoImageName).Append("\n");
+            sb.Append("  KioskNameScreenImage: ").Append(KioskNameScreenImage).Append("\n");
+            sb.Append("  WebToAppRedirect: ").Append(WebToAppRedirect).Append("\n");
+            sb.Append("  FeaturesCsv: ").Append(FeaturesCsv).Append("\n");
+            sb.Append("  AppStorePassword: ").Append(AppStorePassword).Append("\n");
+            sb.Append("  AppStoreTeamId: ").Append(AppStoreTeamId).Append("\n");
+            sb.Append("  AppStoreAppGroup: ").Append(AppStoreAppGroup).Append("\n");
+            sb.Append("  AppStoreSigningIdentity: ").Append(AppStoreSigningIdentity).Append("\n");
+            sb.Append("  AppStoreItcTeamId: ").Append(AppStoreItcTeamId).Append("\n");
+            sb.Append("  HeadHtml: ").Append(HeadHtml).Append("\n");
+            sb.Append("  SocialTwitterUrl: ").Append(SocialTwitterUrl).Append("\n");
+            sb.Append("  SocialFacebookUrl: ").Append(SocialFacebookUrl).Append("\n");
+            sb.Append("  SocialInstagramUrl: ").Append(SocialInstagramUrl).Append("\n");
+            sb.Append("  SocialPintrestUrl: ").Append(SocialPintrestUrl).Append("\n");
+            sb.Append("  SocialTripAdvisorUrl: ").Append(SocialTripAdvisorUrl).Append("\n");
+            sb.Append("  SocialGooglePlusUrl: ").Append(SocialGooglePlusUrl).Append("\n");
+            sb.Append("  SocialFourSquareUrl: ").Append(SocialFourSquareUrl).Append("\n");
+            sb.Append("  SocialYelpUrl: ").Append(SocialYelpUrl).Append("\n");
+            sb.Append("  WebsiteType: ").Append(WebsiteType).Append("\n");
+            sb.Append("  ExternalOrderingPageUrl: ").Append(ExternalOrderingPageUrl).Append("\n");
+            sb.Append("  PanaceaEnabled: ").Append(PanaceaEnabled).Append("\n");
+            sb.Append("  CookieConsentPromptEnabled: ").Append(CookieConsentPromptEnabled).Append("\n");
+            sb.Append("  PanaceaVanityUrl: ").Append(PanaceaVanityUrl).Append("\n");
+            sb.Append("  CountryId: ").Append(CountryId).Append("\n");
+            sb.Append("  ReferralUserId: ").Append(ReferralUserId).Append("\n");
+            sb.Append("  ReferralCampaignId: ").Append(ReferralCampaignId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as WhiteLabelConfigModel);
+        }
+
+        /// <summary>
+        /// Returns true if WhiteLabelConfigModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of WhiteLabelConfigModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(WhiteLabelConfigModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.WhiteLabelLanguages == input.WhiteLabelLanguages ||
+                    this.WhiteLabelLanguages != null &&
+                    this.WhiteLabelLanguages.SequenceEqual(input.WhiteLabelLanguages)
+                ) && 
+                (
+                    this.WhiteLabelAssets == input.WhiteLabelAssets ||
+                    this.WhiteLabelAssets != null &&
+                    this.WhiteLabelAssets.SequenceEqual(input.WhiteLabelAssets)
+                ) && 
+                (
+                    this.ColorScheme == input.ColorScheme ||
+                    (this.ColorScheme != null &&
+                    this.ColorScheme.Equals(input.ColorScheme))
+                ) && 
+                (
+                    this.WhiteLabelConfigId == input.WhiteLabelConfigId ||
+                    (this.WhiteLabelConfigId != null &&
+                    this.WhiteLabelConfigId.Equals(input.WhiteLabelConfigId))
+                ) && 
+                (
+                    this.WhiteLabelId == input.WhiteLabelId ||
+                    (this.WhiteLabelId != null &&
+                    this.WhiteLabelId.Equals(input.WhiteLabelId))
+                ) && 
+                (
+                    this.WhiteLabelName == input.WhiteLabelName ||
+                    (this.WhiteLabelName != null &&
+                    this.WhiteLabelName.Equals(input.WhiteLabelName))
+                ) && 
+                (
+                    this.AppNameId == input.AppNameId ||
+                    (this.AppNameId != null &&
+                    this.AppNameId.Equals(input.AppNameId))
+                ) && 
+                (
+                    this.OrgId == input.OrgId ||
+                    (this.OrgId != null &&
+                    this.OrgId.Equals(input.OrgId))
+                ) && 
+                (
+                    this.SmsRestaurantName == input.SmsRestaurantName ||
+                    (this.SmsRestaurantName != null &&
+                    this.SmsRestaurantName.Equals(input.SmsRestaurantName))
+                ) && 
+                (
+                    this.DeepLinkUrlScheme == input.DeepLinkUrlScheme ||
+                    (this.DeepLinkUrlScheme != null &&
+                    this.DeepLinkUrlScheme.Equals(input.DeepLinkUrlScheme))
+                ) && 
+                (
+                    this.HostName == input.HostName ||
+                    (this.HostName != null &&
+                    this.HostName.Equals(input.HostName))
+                ) && 
+                (
+                    this.NexmoSupportSmsNumber == input.NexmoSupportSmsNumber ||
+                    (this.NexmoSupportSmsNumber != null &&
+                    this.NexmoSupportSmsNumber.Equals(input.NexmoSupportSmsNumber))
+                ) && 
+                (
+                    this.TwilioSupportSmsNumber == input.TwilioSupportSmsNumber ||
+                    (this.TwilioSupportSmsNumber != null &&
+                    this.TwilioSupportSmsNumber.Equals(input.TwilioSupportSmsNumber))
+                ) && 
+                (
+                    this.MixpanelToken == input.MixpanelToken ||
+                    (this.MixpanelToken != null &&
+                    this.MixpanelToken.Equals(input.MixpanelToken))
+                ) && 
+                (
+                    this.IntercomAppId == input.IntercomAppId ||
+                    (this.IntercomAppId != null &&
+                    this.IntercomAppId.Equals(input.IntercomAppId))
+                ) && 
+                (
+                    this.ShareMessageEmailSubject == input.ShareMessageEmailSubject ||
+                    (this.ShareMessageEmailSubject != null &&
+                    this.ShareMessageEmailSubject.Equals(input.ShareMessageEmailSubject))
+                ) && 
+                (
+                    this.ShareMessageEmailMessage == input.ShareMessageEmailMessage ||
+                    (this.ShareMessageEmailMessage != null &&
+                    this.ShareMessageEmailMessage.Equals(input.ShareMessageEmailMessage))
+                ) && 
+                (
+                    this.ShareMessageSmsMessage == input.ShareMessageSmsMessage ||
+                    (this.ShareMessageSmsMessage != null &&
+                    this.ShareMessageSmsMessage.Equals(input.ShareMessageSmsMessage))
+                ) && 
+                (
+                    this.ShareMessageWhatsAppMessage == input.ShareMessageWhatsAppMessage ||
+                    (this.ShareMessageWhatsAppMessage != null &&
+                    this.ShareMessageWhatsAppMessage.Equals(input.ShareMessageWhatsAppMessage))
+                ) && 
+                (
+                    this.ShareMessageFacebookMessage == input.ShareMessageFacebookMessage ||
+                    (this.ShareMessageFacebookMessage != null &&
+                    this.ShareMessageFacebookMessage.Equals(input.ShareMessageFacebookMessage))
+                ) && 
+                (
+                    this.ShareMessageTwitterMessage == input.ShareMessageTwitterMessage ||
+                    (this.ShareMessageTwitterMessage != null &&
+                    this.ShareMessageTwitterMessage.Equals(input.ShareMessageTwitterMessage))
+                ) && 
+                (
+                    this.ShareMessageGenericMessage == input.ShareMessageGenericMessage ||
+                    (this.ShareMessageGenericMessage != null &&
+                    this.ShareMessageGenericMessage.Equals(input.ShareMessageGenericMessage))
+                ) && 
+                (
+                    this.DisplayDeliveryRestaurantListScreen == input.DisplayDeliveryRestaurantListScreen ||
+                    (this.DisplayDeliveryRestaurantListScreen != null &&
+                    this.DisplayDeliveryRestaurantListScreen.Equals(input.DisplayDeliveryRestaurantListScreen))
+                ) && 
+                (
+                    this.ContactFormType == input.ContactFormType ||
+                    (this.ContactFormType != null &&
+                    this.ContactFormType.Equals(input.ContactFormType))
+                ) && 
+                (
+                    this.ContactPhoneNumber == input.ContactPhoneNumber ||
+                    (this.ContactPhoneNumber != null &&
+                    this.ContactPhoneNumber.Equals(input.ContactPhoneNumber))
+                ) && 
+                (
+                    this.DisplayBumpSideMenuItem == input.DisplayBumpSideMenuItem ||
+                    (this.DisplayBumpSideMenuItem != null &&
+                    this.DisplayBumpSideMenuItem.Equals(input.DisplayBumpSideMenuItem))
+                ) && 
+                (
+                    this.DisplayFreeCokeSideMenuItem == input.DisplayFreeCokeSideMenuItem ||
+                    (this.DisplayFreeCokeSideMenuItem != null &&
+                    this.DisplayFreeCokeSideMenuItem.Equals(input.DisplayFreeCokeSideMenuItem))
+                ) && 
+                (
+                    this.AppStoreUrl == input.AppStoreUrl ||
+                    (this.AppStoreUrl != null &&
+                    this.AppStoreUrl.Equals(input.AppStoreUrl))
+                ) && 
+                (
+                    this.DeliveryEnabled == input.DeliveryEnabled ||
+                    (this.DeliveryEnabled != null &&
+                    this.DeliveryEnabled.Equals(input.DeliveryEnabled))
+                ) && 
+                (
+                    this.PickupEnabled == input.PickupEnabled ||
+                    (this.PickupEnabled != null &&
+                    this.PickupEnabled.Equals(input.PickupEnabled))
+                ) && 
+                (
+                    this.DisplayPickupRestaurantListScreen == input.DisplayPickupRestaurantListScreen ||
+                    (this.DisplayPickupRestaurantListScreen != null &&
+                    this.DisplayPickupRestaurantListScreen.Equals(input.DisplayPickupRestaurantListScreen))
+                ) && 
+                (
+                    this.DisplayCuisineTypeListAndRestaurantSearchBar == input.DisplayCuisineTypeListAndRestaurantSearchBar ||
+                    (this.DisplayCuisineTypeListAndRestaurantSearchBar != null &&
+                    this.DisplayCuisineTypeListAndRestaurantSearchBar.Equals(input.DisplayCuisineTypeListAndRestaurantSearchBar))
+                ) && 
+                (
+                    this.DisplayUserRestaurantRatings == input.DisplayUserRestaurantRatings ||
+                    (this.DisplayUserRestaurantRatings != null &&
+                    this.DisplayUserRestaurantRatings.Equals(input.DisplayUserRestaurantRatings))
+                ) && 
+                (
+                    this.ReadyToPublishWeb == input.ReadyToPublishWeb ||
+                    (this.ReadyToPublishWeb != null &&
+                    this.ReadyToPublishWeb.Equals(input.ReadyToPublishWeb))
+                ) && 
+                (
+                    this.ReadyToPublishIos == input.ReadyToPublishIos ||
+                    (this.ReadyToPublishIos != null &&
+                    this.ReadyToPublishIos.Equals(input.ReadyToPublishIos))
+                ) && 
+                (
+                    this.ReadyToPublishAndroid == input.ReadyToPublishAndroid ||
+                    (this.ReadyToPublishAndroid != null &&
+                    this.ReadyToPublishAndroid.Equals(input.ReadyToPublishAndroid))
+                ) && 
+                (
+                    this.DisplayFooterLinksToOtherSites == input.DisplayFooterLinksToOtherSites ||
+                    (this.DisplayFooterLinksToOtherSites != null &&
+                    this.DisplayFooterLinksToOtherSites.Equals(input.DisplayFooterLinksToOtherSites))
+                ) && 
+                (
+                    this.DisplayOnlineOrderingMenu == input.DisplayOnlineOrderingMenu ||
+                    (this.DisplayOnlineOrderingMenu != null &&
+                    this.DisplayOnlineOrderingMenu.Equals(input.DisplayOnlineOrderingMenu))
+                ) && 
+                (
+                    this.HideAppConfigFromAdminList == input.HideAppConfigFromAdminList ||
+                    (this.HideAppConfigFromAdminList != null &&
+                    this.HideAppConfigFromAdminList.Equals(input.HideAppConfigFromAdminList))
+                ) && 
+                (
+                    this.ComplianceType == input.ComplianceType ||
+                    (this.ComplianceType != null &&
+                    this.ComplianceType.Equals(input.ComplianceType))
+                ) && 
+                (
+                    this.IsMenuMigratedToRms == input.IsMenuMigratedToRms ||
+                    (this.IsMenuMigratedToRms != null &&
+                    this.IsMenuMigratedToRms.Equals(input.IsMenuMigratedToRms))
+                ) && 
+                (
+                    this.MapBoundryMaxLongitude == input.MapBoundryMaxLongitude ||
+                    (this.MapBoundryMaxLongitude != null &&
+                    this.MapBoundryMaxLongitude.Equals(input.MapBoundryMaxLongitude))
+                ) && 
+                (
+                    this.MapBoundryMinLongitude == input.MapBoundryMinLongitude ||
+                    (this.MapBoundryMinLongitude != null &&
+                    this.MapBoundryMinLongitude.Equals(input.MapBoundryMinLongitude))
+                ) && 
+                (
+                    this.MapBoundryMaxLatitude == input.MapBoundryMaxLatitude ||
+                    (this.MapBoundryMaxLatitude != null &&
+                    this.MapBoundryMaxLatitude.Equals(input.MapBoundryMaxLatitude))
+                ) && 
+                (
+                    this.MapBoundryMinLatitude == input.MapBoundryMinLatitude ||
+                    (this.MapBoundryMinLatitude != null &&
+                    this.MapBoundryMinLatitude.Equals(input.MapBoundryMinLatitude))
+                ) && 
+                (
+                    this.AppStoreAppleId == input.AppStoreAppleId ||
+                    (this.AppStoreAppleId != null &&
+                    this.AppStoreAppleId.Equals(input.AppStoreAppleId))
+                ) && 
+                (
+                    this.AppStoreToken == input.AppStoreToken ||
+                    (this.AppStoreToken != null &&
+                    this.AppStoreToken.Equals(input.AppStoreToken))
+                ) && 
+                (
+                    this.WebsiteDisplayStaticMenuPage == input.WebsiteDisplayStaticMenuPage ||
+                    (this.WebsiteDisplayStaticMenuPage != null &&
+                    this.WebsiteDisplayStaticMenuPage.Equals(input.WebsiteDisplayStaticMenuPage))
+                ) && 
+                (
+                    this.IsEmbed == input.IsEmbed ||
+                    (this.IsEmbed != null &&
+                    this.IsEmbed.Equals(input.IsEmbed))
+                ) && 
+                (
+                    this.DisplayTipOptionToUsersByDefault == input.DisplayTipOptionToUsersByDefault ||
+                    (this.DisplayTipOptionToUsersByDefault != null &&
+                    this.DisplayTipOptionToUsersByDefault.Equals(input.DisplayTipOptionToUsersByDefault))
+                ) && 
+                (
+                    this.EmailRequestMode == input.EmailRequestMode ||
+                    (this.EmailRequestMode != null &&
+                    this.EmailRequestMode.Equals(input.EmailRequestMode))
+                ) && 
+                (
+                    this.AddressEntryType == input.AddressEntryType ||
+                    (this.AddressEntryType != null &&
+                    this.AddressEntryType.Equals(input.AddressEntryType))
+                ) && 
+                (
+                    this.AddressLayout == input.AddressLayout ||
+                    (this.AddressLayout != null &&
+                    this.AddressLayout.Equals(input.AddressLayout))
+                ) && 
+                (
+                    this.Category == input.Category ||
+                    (this.Category != null &&
+                    this.Category.Equals(input.Category))
+                ) && 
+                (
+                    this.MapCenterLatitude == input.MapCenterLatitude ||
+                    (this.MapCenterLatitude != null &&
+                    this.MapCenterLatitude.Equals(input.MapCenterLatitude))
+                ) && 
+                (
+                    this.MapCenterLongitude == input.MapCenterLongitude ||
+                    (this.MapCenterLongitude != null &&
+                    this.MapCenterLongitude.Equals(input.MapCenterLongitude))
+                ) && 
+                (
+                    this.IntercomTokenIos == input.IntercomTokenIos ||
+                    (this.IntercomTokenIos != null &&
+                    this.IntercomTokenIos.Equals(input.IntercomTokenIos))
+                ) && 
+                (
+                    this.IntercomTokenAndroid == input.IntercomTokenAndroid ||
+                    (this.IntercomTokenAndroid != null &&
+                    this.IntercomTokenAndroid.Equals(input.IntercomTokenAndroid))
+                ) && 
+                (
+                    this.GoogleAnalyticsTokensCsv == input.GoogleAnalyticsTokensCsv ||
+                    (this.GoogleAnalyticsTokensCsv != null &&
+                    this.GoogleAnalyticsTokensCsv.Equals(input.GoogleAnalyticsTokensCsv))
+                ) && 
+                (
+                    this.FacebookTokensCsv == input.FacebookTokensCsv ||
+                    (this.FacebookTokensCsv != null &&
+                    this.FacebookTokensCsv.Equals(input.FacebookTokensCsv))
+                ) && 
+                (
+                    this.ShareMessageGenericUrl == input.ShareMessageGenericUrl ||
+                    (this.ShareMessageGenericUrl != null &&
+                    this.ShareMessageGenericUrl.Equals(input.ShareMessageGenericUrl))
+                ) && 
+                (
+                    this.PrivateSupportEmailAddress == input.PrivateSupportEmailAddress ||
+                    (this.PrivateSupportEmailAddress != null &&
+                    this.PrivateSupportEmailAddress.Equals(input.PrivateSupportEmailAddress))
+                ) && 
+                (
+                    this.AppStoreId == input.AppStoreId ||
+                    (this.AppStoreId != null &&
+                    this.AppStoreId.Equals(input.AppStoreId))
+                ) && 
+                (
+                    this.PlayConsoleAccount == input.PlayConsoleAccount ||
+                    (this.PlayConsoleAccount != null &&
+                    this.PlayConsoleAccount.Equals(input.PlayConsoleAccount))
+                ) && 
+                (
+                    this.ApnCertificateValidAfter == input.ApnCertificateValidAfter ||
+                    (this.ApnCertificateValidAfter != null &&
+                    this.ApnCertificateValidAfter.Equals(input.ApnCertificateValidAfter))
+                ) && 
+                (
+                    this.ApnCertificateValidBefore == input.ApnCertificateValidBefore ||
+                    (this.ApnCertificateValidBefore != null &&
+                    this.ApnCertificateValidBefore.Equals(input.ApnCertificateValidBefore))
+                ) && 
+                (
+                    this.DineInEnabled == input.DineInEnabled ||
+                    (this.DineInEnabled != null &&
+                    this.DineInEnabled.Equals(input.DineInEnabled))
+                ) && 
+                (
+                    this.AppFont == input.AppFont ||
+                    (this.AppFont != null &&
+                    this.AppFont.Equals(input.AppFont))
+                ) && 
+                (
+                    this.WhiteLabelColorSchemeId == input.WhiteLabelColorSchemeId ||
+                    (this.WhiteLabelColorSchemeId != null &&
+                    this.WhiteLabelColorSchemeId.Equals(input.WhiteLabelColorSchemeId))
+                ) && 
+                (
+                    this.WhiteLabelImagesId == input.WhiteLabelImagesId ||
+                    (this.WhiteLabelImagesId != null &&
+                    this.WhiteLabelImagesId.Equals(input.WhiteLabelImagesId))
+                ) && 
+                (
+                    this.AppStoreCopyright == input.AppStoreCopyright ||
+                    (this.AppStoreCopyright != null &&
+                    this.AppStoreCopyright.Equals(input.AppStoreCopyright))
+                ) && 
+                (
+                    this.AppStoreDescription == input.AppStoreDescription ||
+                    (this.AppStoreDescription != null &&
+                    this.AppStoreDescription.Equals(input.AppStoreDescription))
+                ) && 
+                (
+                    this.AppStoreShortDescription == input.AppStoreShortDescription ||
+                    (this.AppStoreShortDescription != null &&
+                    this.AppStoreShortDescription.Equals(input.AppStoreShortDescription))
+                ) && 
+                (
+                    this.AppStoreKeywords == input.AppStoreKeywords ||
+                    (this.AppStoreKeywords != null &&
+                    this.AppStoreKeywords.Equals(input.AppStoreKeywords))
+                ) && 
+                (
+                    this.AppStoreMarketingUrl == input.AppStoreMarketingUrl ||
+                    (this.AppStoreMarketingUrl != null &&
+                    this.AppStoreMarketingUrl.Equals(input.AppStoreMarketingUrl))
+                ) && 
+                (
+                    this.AppStoreName == input.AppStoreName ||
+                    (this.AppStoreName != null &&
+                    this.AppStoreName.Equals(input.AppStoreName))
+                ) && 
+                (
+                    this.AppStorePrivacyUrl == input.AppStorePrivacyUrl ||
+                    (this.AppStorePrivacyUrl != null &&
+                    this.AppStorePrivacyUrl.Equals(input.AppStorePrivacyUrl))
+                ) && 
+                (
+                    this.AppStoreSupportUrl == input.AppStoreSupportUrl ||
+                    (this.AppStoreSupportUrl != null &&
+                    this.AppStoreSupportUrl.Equals(input.AppStoreSupportUrl))
+                ) && 
+                (
+                    this.AppStoreReleaseNotes == input.AppStoreReleaseNotes ||
+                    (this.AppStoreReleaseNotes != null &&
+                    this.AppStoreReleaseNotes.Equals(input.AppStoreReleaseNotes))
+                ) && 
+                (
+                    this.AppStoreIconUrl == input.AppStoreIconUrl ||
+                    (this.AppStoreIconUrl != null &&
+                    this.AppStoreIconUrl.Equals(input.AppStoreIconUrl))
+                ) && 
+                (
+                    this.AppStoreIconThumbnail100Url == input.AppStoreIconThumbnail100Url ||
+                    (this.AppStoreIconThumbnail100Url != null &&
+                    this.AppStoreIconThumbnail100Url.Equals(input.AppStoreIconThumbnail100Url))
+                ) && 
+                (
+                    this.TransparentLogoUrl == input.TransparentLogoUrl ||
+                    (this.TransparentLogoUrl != null &&
+                    this.TransparentLogoUrl.Equals(input.TransparentLogoUrl))
+                ) && 
+                (
+                    this.LogoImageName == input.LogoImageName ||
+                    (this.LogoImageName != null &&
+                    this.LogoImageName.Equals(input.LogoImageName))
+                ) && 
+                (
+                    this.KioskNameScreenImage == input.KioskNameScreenImage ||
+                    (this.KioskNameScreenImage != null &&
+                    this.KioskNameScreenImage.Equals(input.KioskNameScreenImage))
+                ) && 
+                (
+                    this.WebToAppRedirect == input.WebToAppRedirect ||
+                    (this.WebToAppRedirect != null &&
+                    this.WebToAppRedirect.Equals(input.WebToAppRedirect))
+                ) && 
+                (
+                    this.FeaturesCsv == input.FeaturesCsv ||
+                    (this.FeaturesCsv != null &&
+                    this.FeaturesCsv.Equals(input.FeaturesCsv))
+                ) && 
+                (
+                    this.AppStorePassword == input.AppStorePassword ||
+                    (this.AppStorePassword != null &&
+                    this.AppStorePassword.Equals(input.AppStorePassword))
+                ) && 
+                (
+                    this.AppStoreTeamId == input.AppStoreTeamId ||
+                    (this.AppStoreTeamId != null &&
+                    this.AppStoreTeamId.Equals(input.AppStoreTeamId))
+                ) && 
+                (
+                    this.AppStoreAppGroup == input.AppStoreAppGroup ||
+                    (this.AppStoreAppGroup != null &&
+                    this.AppStoreAppGroup.Equals(input.AppStoreAppGroup))
+                ) && 
+                (
+                    this.AppStoreSigningIdentity == input.AppStoreSigningIdentity ||
+                    (this.AppStoreSigningIdentity != null &&
+                    this.AppStoreSigningIdentity.Equals(input.AppStoreSigningIdentity))
+                ) && 
+                (
+                    this.AppStoreItcTeamId == input.AppStoreItcTeamId ||
+                    (this.AppStoreItcTeamId != null &&
+                    this.AppStoreItcTeamId.Equals(input.AppStoreItcTeamId))
+                ) && 
+                (
+                    this.HeadHtml == input.HeadHtml ||
+                    (this.HeadHtml != null &&
+                    this.HeadHtml.Equals(input.HeadHtml))
+                ) && 
+                (
+                    this.SocialTwitterUrl == input.SocialTwitterUrl ||
+                    (this.SocialTwitterUrl != null &&
+                    this.SocialTwitterUrl.Equals(input.SocialTwitterUrl))
+                ) && 
+                (
+                    this.SocialFacebookUrl == input.SocialFacebookUrl ||
+                    (this.SocialFacebookUrl != null &&
+                    this.SocialFacebookUrl.Equals(input.SocialFacebookUrl))
+                ) && 
+                (
+                    this.SocialInstagramUrl == input.SocialInstagramUrl ||
+                    (this.SocialInstagramUrl != null &&
+                    this.SocialInstagramUrl.Equals(input.SocialInstagramUrl))
+                ) && 
+                (
+                    this.SocialPintrestUrl == input.SocialPintrestUrl ||
+                    (this.SocialPintrestUrl != null &&
+                    this.SocialPintrestUrl.Equals(input.SocialPintrestUrl))
+                ) && 
+                (
+                    this.SocialTripAdvisorUrl == input.SocialTripAdvisorUrl ||
+                    (this.SocialTripAdvisorUrl != null &&
+                    this.SocialTripAdvisorUrl.Equals(input.SocialTripAdvisorUrl))
+                ) && 
+                (
+                    this.SocialGooglePlusUrl == input.SocialGooglePlusUrl ||
+                    (this.SocialGooglePlusUrl != null &&
+                    this.SocialGooglePlusUrl.Equals(input.SocialGooglePlusUrl))
+                ) && 
+                (
+                    this.SocialFourSquareUrl == input.SocialFourSquareUrl ||
+                    (this.SocialFourSquareUrl != null &&
+                    this.SocialFourSquareUrl.Equals(input.SocialFourSquareUrl))
+                ) && 
+                (
+                    this.SocialYelpUrl == input.SocialYelpUrl ||
+                    (this.SocialYelpUrl != null &&
+                    this.SocialYelpUrl.Equals(input.SocialYelpUrl))
+                ) && 
+                (
+                    this.WebsiteType == input.WebsiteType ||
+                    (this.WebsiteType != null &&
+                    this.WebsiteType.Equals(input.WebsiteType))
+                ) && 
+                (
+                    this.ExternalOrderingPageUrl == input.ExternalOrderingPageUrl ||
+                    (this.ExternalOrderingPageUrl != null &&
+                    this.ExternalOrderingPageUrl.Equals(input.ExternalOrderingPageUrl))
+                ) && 
+                (
+                    this.PanaceaEnabled == input.PanaceaEnabled ||
+                    (this.PanaceaEnabled != null &&
+                    this.PanaceaEnabled.Equals(input.PanaceaEnabled))
+                ) && 
+                (
+                    this.CookieConsentPromptEnabled == input.CookieConsentPromptEnabled ||
+                    (this.CookieConsentPromptEnabled != null &&
+                    this.CookieConsentPromptEnabled.Equals(input.CookieConsentPromptEnabled))
+                ) && 
+                (
+                    this.PanaceaVanityUrl == input.PanaceaVanityUrl ||
+                    (this.PanaceaVanityUrl != null &&
+                    this.PanaceaVanityUrl.Equals(input.PanaceaVanityUrl))
+                ) && 
+                (
+                    this.CountryId == input.CountryId ||
+                    (this.CountryId != null &&
+                    this.CountryId.Equals(input.CountryId))
+                ) && 
+                (
+                    this.ReferralUserId == input.ReferralUserId ||
+                    (this.ReferralUserId != null &&
+                    this.ReferralUserId.Equals(input.ReferralUserId))
+                ) && 
+                (
+                    this.ReferralCampaignId == input.ReferralCampaignId ||
+                    (this.ReferralCampaignId != null &&
+                    this.ReferralCampaignId.Equals(input.ReferralCampaignId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.WhiteLabelLanguages != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelLanguages.GetHashCode();
+                if (this.WhiteLabelAssets != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelAssets.GetHashCode();
+                if (this.ColorScheme != null)
+                    hashCode = hashCode * 59 + this.ColorScheme.GetHashCode();
+                if (this.WhiteLabelConfigId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelConfigId.GetHashCode();
+                if (this.WhiteLabelId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelId.GetHashCode();
+                if (this.WhiteLabelName != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelName.GetHashCode();
+                if (this.AppNameId != null)
+                    hashCode = hashCode * 59 + this.AppNameId.GetHashCode();
+                if (this.OrgId != null)
+                    hashCode = hashCode * 59 + this.OrgId.GetHashCode();
+                if (this.SmsRestaurantName != null)
+                    hashCode = hashCode * 59 + this.SmsRestaurantName.GetHashCode();
+                if (this.DeepLinkUrlScheme != null)
+                    hashCode = hashCode * 59 + this.DeepLinkUrlScheme.GetHashCode();
+                if (this.HostName != null)
+                    hashCode = hashCode * 59 + this.HostName.GetHashCode();
+                if (this.NexmoSupportSmsNumber != null)
+                    hashCode = hashCode * 59 + this.NexmoSupportSmsNumber.GetHashCode();
+                if (this.TwilioSupportSmsNumber != null)
+                    hashCode = hashCode * 59 + this.TwilioSupportSmsNumber.GetHashCode();
+                if (this.MixpanelToken != null)
+                    hashCode = hashCode * 59 + this.MixpanelToken.GetHashCode();
+                if (this.IntercomAppId != null)
+                    hashCode = hashCode * 59 + this.IntercomAppId.GetHashCode();
+                if (this.ShareMessageEmailSubject != null)
+                    hashCode = hashCode * 59 + this.ShareMessageEmailSubject.GetHashCode();
+                if (this.ShareMessageEmailMessage != null)
+                    hashCode = hashCode * 59 + this.ShareMessageEmailMessage.GetHashCode();
+                if (this.ShareMessageSmsMessage != null)
+                    hashCode = hashCode * 59 + this.ShareMessageSmsMessage.GetHashCode();
+                if (this.ShareMessageWhatsAppMessage != null)
+                    hashCode = hashCode * 59 + this.ShareMessageWhatsAppMessage.GetHashCode();
+                if (this.ShareMessageFacebookMessage != null)
+                    hashCode = hashCode * 59 + this.ShareMessageFacebookMessage.GetHashCode();
+                if (this.ShareMessageTwitterMessage != null)
+                    hashCode = hashCode * 59 + this.ShareMessageTwitterMessage.GetHashCode();
+                if (this.ShareMessageGenericMessage != null)
+                    hashCode = hashCode * 59 + this.ShareMessageGenericMessage.GetHashCode();
+                if (this.DisplayDeliveryRestaurantListScreen != null)
+                    hashCode = hashCode * 59 + this.DisplayDeliveryRestaurantListScreen.GetHashCode();
+                if (this.ContactFormType != null)
+                    hashCode = hashCode * 59 + this.ContactFormType.GetHashCode();
+                if (this.ContactPhoneNumber != null)
+                    hashCode = hashCode * 59 + this.ContactPhoneNumber.GetHashCode();
+                if (this.DisplayBumpSideMenuItem != null)
+                    hashCode = hashCode * 59 + this.DisplayBumpSideMenuItem.GetHashCode();
+                if (this.DisplayFreeCokeSideMenuItem != null)
+                    hashCode = hashCode * 59 + this.DisplayFreeCokeSideMenuItem.GetHashCode();
+                if (this.AppStoreUrl != null)
+                    hashCode = hashCode * 59 + this.AppStoreUrl.GetHashCode();
+                if (this.DeliveryEnabled != null)
+                    hashCode = hashCode * 59 + this.DeliveryEnabled.GetHashCode();
+                if (this.PickupEnabled != null)
+                    hashCode = hashCode * 59 + this.PickupEnabled.GetHashCode();
+                if (this.DisplayPickupRestaurantListScreen != null)
+                    hashCode = hashCode * 59 + this.DisplayPickupRestaurantListScreen.GetHashCode();
+                if (this.DisplayCuisineTypeListAndRestaurantSearchBar != null)
+                    hashCode = hashCode * 59 + this.DisplayCuisineTypeListAndRestaurantSearchBar.GetHashCode();
+                if (this.DisplayUserRestaurantRatings != null)
+                    hashCode = hashCode * 59 + this.DisplayUserRestaurantRatings.GetHashCode();
+                if (this.ReadyToPublishWeb != null)
+                    hashCode = hashCode * 59 + this.ReadyToPublishWeb.GetHashCode();
+                if (this.ReadyToPublishIos != null)
+                    hashCode = hashCode * 59 + this.ReadyToPublishIos.GetHashCode();
+                if (this.ReadyToPublishAndroid != null)
+                    hashCode = hashCode * 59 + this.ReadyToPublishAndroid.GetHashCode();
+                if (this.DisplayFooterLinksToOtherSites != null)
+                    hashCode = hashCode * 59 + this.DisplayFooterLinksToOtherSites.GetHashCode();
+                if (this.DisplayOnlineOrderingMenu != null)
+                    hashCode = hashCode * 59 + this.DisplayOnlineOrderingMenu.GetHashCode();
+                if (this.HideAppConfigFromAdminList != null)
+                    hashCode = hashCode * 59 + this.HideAppConfigFromAdminList.GetHashCode();
+                if (this.ComplianceType != null)
+                    hashCode = hashCode * 59 + this.ComplianceType.GetHashCode();
+                if (this.IsMenuMigratedToRms != null)
+                    hashCode = hashCode * 59 + this.IsMenuMigratedToRms.GetHashCode();
+                if (this.MapBoundryMaxLongitude != null)
+                    hashCode = hashCode * 59 + this.MapBoundryMaxLongitude.GetHashCode();
+                if (this.MapBoundryMinLongitude != null)
+                    hashCode = hashCode * 59 + this.MapBoundryMinLongitude.GetHashCode();
+                if (this.MapBoundryMaxLatitude != null)
+                    hashCode = hashCode * 59 + this.MapBoundryMaxLatitude.GetHashCode();
+                if (this.MapBoundryMinLatitude != null)
+                    hashCode = hashCode * 59 + this.MapBoundryMinLatitude.GetHashCode();
+                if (this.AppStoreAppleId != null)
+                    hashCode = hashCode * 59 + this.AppStoreAppleId.GetHashCode();
+                if (this.AppStoreToken != null)
+                    hashCode = hashCode * 59 + this.AppStoreToken.GetHashCode();
+                if (this.WebsiteDisplayStaticMenuPage != null)
+                    hashCode = hashCode * 59 + this.WebsiteDisplayStaticMenuPage.GetHashCode();
+                if (this.IsEmbed != null)
+                    hashCode = hashCode * 59 + this.IsEmbed.GetHashCode();
+                if (this.DisplayTipOptionToUsersByDefault != null)
+                    hashCode = hashCode * 59 + this.DisplayTipOptionToUsersByDefault.GetHashCode();
+                if (this.EmailRequestMode != null)
+                    hashCode = hashCode * 59 + this.EmailRequestMode.GetHashCode();
+                if (this.AddressEntryType != null)
+                    hashCode = hashCode * 59 + this.AddressEntryType.GetHashCode();
+                if (this.AddressLayout != null)
+                    hashCode = hashCode * 59 + this.AddressLayout.GetHashCode();
+                if (this.Category != null)
+                    hashCode = hashCode * 59 + this.Category.GetHashCode();
+                if (this.MapCenterLatitude != null)
+                    hashCode = hashCode * 59 + this.MapCenterLatitude.GetHashCode();
+                if (this.MapCenterLongitude != null)
+                    hashCode = hashCode * 59 + this.MapCenterLongitude.GetHashCode();
+                if (this.IntercomTokenIos != null)
+                    hashCode = hashCode * 59 + this.IntercomTokenIos.GetHashCode();
+                if (this.IntercomTokenAndroid != null)
+                    hashCode = hashCode * 59 + this.IntercomTokenAndroid.GetHashCode();
+                if (this.GoogleAnalyticsTokensCsv != null)
+                    hashCode = hashCode * 59 + this.GoogleAnalyticsTokensCsv.GetHashCode();
+                if (this.FacebookTokensCsv != null)
+                    hashCode = hashCode * 59 + this.FacebookTokensCsv.GetHashCode();
+                if (this.ShareMessageGenericUrl != null)
+                    hashCode = hashCode * 59 + this.ShareMessageGenericUrl.GetHashCode();
+                if (this.PrivateSupportEmailAddress != null)
+                    hashCode = hashCode * 59 + this.PrivateSupportEmailAddress.GetHashCode();
+                if (this.AppStoreId != null)
+                    hashCode = hashCode * 59 + this.AppStoreId.GetHashCode();
+                if (this.PlayConsoleAccount != null)
+                    hashCode = hashCode * 59 + this.PlayConsoleAccount.GetHashCode();
+                if (this.ApnCertificateValidAfter != null)
+                    hashCode = hashCode * 59 + this.ApnCertificateValidAfter.GetHashCode();
+                if (this.ApnCertificateValidBefore != null)
+                    hashCode = hashCode * 59 + this.ApnCertificateValidBefore.GetHashCode();
+                if (this.DineInEnabled != null)
+                    hashCode = hashCode * 59 + this.DineInEnabled.GetHashCode();
+                if (this.AppFont != null)
+                    hashCode = hashCode * 59 + this.AppFont.GetHashCode();
+                if (this.WhiteLabelColorSchemeId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelColorSchemeId.GetHashCode();
+                if (this.WhiteLabelImagesId != null)
+                    hashCode = hashCode * 59 + this.WhiteLabelImagesId.GetHashCode();
+                if (this.AppStoreCopyright != null)
+                    hashCode = hashCode * 59 + this.AppStoreCopyright.GetHashCode();
+                if (this.AppStoreDescription != null)
+                    hashCode = hashCode * 59 + this.AppStoreDescription.GetHashCode();
+                if (this.AppStoreShortDescription != null)
+                    hashCode = hashCode * 59 + this.AppStoreShortDescription.GetHashCode();
+                if (this.AppStoreKeywords != null)
+                    hashCode = hashCode * 59 + this.AppStoreKeywords.GetHashCode();
+                if (this.AppStoreMarketingUrl != null)
+                    hashCode = hashCode * 59 + this.AppStoreMarketingUrl.GetHashCode();
+                if (this.AppStoreName != null)
+                    hashCode = hashCode * 59 + this.AppStoreName.GetHashCode();
+                if (this.AppStorePrivacyUrl != null)
+                    hashCode = hashCode * 59 + this.AppStorePrivacyUrl.GetHashCode();
+                if (this.AppStoreSupportUrl != null)
+                    hashCode = hashCode * 59 + this.AppStoreSupportUrl.GetHashCode();
+                if (this.AppStoreReleaseNotes != null)
+                    hashCode = hashCode * 59 + this.AppStoreReleaseNotes.GetHashCode();
+                if (this.AppStoreIconUrl != null)
+                    hashCode = hashCode * 59 + this.AppStoreIconUrl.GetHashCode();
+                if (this.AppStoreIconThumbnail100Url != null)
+                    hashCode = hashCode * 59 + this.AppStoreIconThumbnail100Url.GetHashCode();
+                if (this.TransparentLogoUrl != null)
+                    hashCode = hashCode * 59 + this.TransparentLogoUrl.GetHashCode();
+                if (this.LogoImageName != null)
+                    hashCode = hashCode * 59 + this.LogoImageName.GetHashCode();
+                if (this.KioskNameScreenImage != null)
+                    hashCode = hashCode * 59 + this.KioskNameScreenImage.GetHashCode();
+                if (this.WebToAppRedirect != null)
+                    hashCode = hashCode * 59 + this.WebToAppRedirect.GetHashCode();
+                if (this.FeaturesCsv != null)
+                    hashCode = hashCode * 59 + this.FeaturesCsv.GetHashCode();
+                if (this.AppStorePassword != null)
+                    hashCode = hashCode * 59 + this.AppStorePassword.GetHashCode();
+                if (this.AppStoreTeamId != null)
+                    hashCode = hashCode * 59 + this.AppStoreTeamId.GetHashCode();
+                if (this.AppStoreAppGroup != null)
+                    hashCode = hashCode * 59 + this.AppStoreAppGroup.GetHashCode();
+                if (this.AppStoreSigningIdentity != null)
+                    hashCode = hashCode * 59 + this.AppStoreSigningIdentity.GetHashCode();
+                if (this.AppStoreItcTeamId != null)
+                    hashCode = hashCode * 59 + this.AppStoreItcTeamId.GetHashCode();
+                if (this.HeadHtml != null)
+                    hashCode = hashCode * 59 + this.HeadHtml.GetHashCode();
+                if (this.SocialTwitterUrl != null)
+                    hashCode = hashCode * 59 + this.SocialTwitterUrl.GetHashCode();
+                if (this.SocialFacebookUrl != null)
+                    hashCode = hashCode * 59 + this.SocialFacebookUrl.GetHashCode();
+                if (this.SocialInstagramUrl != null)
+                    hashCode = hashCode * 59 + this.SocialInstagramUrl.GetHashCode();
+                if (this.SocialPintrestUrl != null)
+                    hashCode = hashCode * 59 + this.SocialPintrestUrl.GetHashCode();
+                if (this.SocialTripAdvisorUrl != null)
+                    hashCode = hashCode * 59 + this.SocialTripAdvisorUrl.GetHashCode();
+                if (this.SocialGooglePlusUrl != null)
+                    hashCode = hashCode * 59 + this.SocialGooglePlusUrl.GetHashCode();
+                if (this.SocialFourSquareUrl != null)
+                    hashCode = hashCode * 59 + this.SocialFourSquareUrl.GetHashCode();
+                if (this.SocialYelpUrl != null)
+                    hashCode = hashCode * 59 + this.SocialYelpUrl.GetHashCode();
+                if (this.WebsiteType != null)
+                    hashCode = hashCode * 59 + this.WebsiteType.GetHashCode();
+                if (this.ExternalOrderingPageUrl != null)
+                    hashCode = hashCode * 59 + this.ExternalOrderingPageUrl.GetHashCode();
+                if (this.PanaceaEnabled != null)
+                    hashCode = hashCode * 59 + this.PanaceaEnabled.GetHashCode();
+                if (this.CookieConsentPromptEnabled != null)
+                    hashCode = hashCode * 59 + this.CookieConsentPromptEnabled.GetHashCode();
+                if (this.PanaceaVanityUrl != null)
+                    hashCode = hashCode * 59 + this.PanaceaVanityUrl.GetHashCode();
+                if (this.CountryId != null)
+                    hashCode = hashCode * 59 + this.CountryId.GetHashCode();
+                if (this.ReferralUserId != null)
+                    hashCode = hashCode * 59 + this.ReferralUserId.GetHashCode();
+                if (this.ReferralCampaignId != null)
+                    hashCode = hashCode * 59 + this.ReferralCampaignId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/Model/WhiteLabelLanguageModel.cs b/src/Flipdish/Model/WhiteLabelLanguageModel.cs
new file mode 100644
index 00000000..1d853077
--- /dev/null
+++ b/src/Flipdish/Model/WhiteLabelLanguageModel.cs
@@ -0,0 +1,113 @@
+/* 
+ * Flipdish Open API v1.0
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: v1.0
+ * 
+ * Generated by: https://github.com/swagger-api/swagger-codegen.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using SwaggerDateConverter = Flipdish.Client.SwaggerDateConverter;
+
+namespace Flipdish.Model
+{
+    /// <summary>
+    /// White label language model
+    /// </summary>
+    [DataContract]
+    public partial class WhiteLabelLanguageModel :  IEquatable<WhiteLabelLanguageModel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WhiteLabelLanguageModel" /> class.
+        /// </summary>
+        /// <param name="languageId">Language ID.</param>
+        public WhiteLabelLanguageModel(string languageId = default(string))
+        {
+            this.LanguageId = languageId;
+        }
+        
+        /// <summary>
+        /// Language ID
+        /// </summary>
+        /// <value>Language ID</value>
+        [DataMember(Name="LanguageId", EmitDefaultValue=false)]
+        public string LanguageId { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class WhiteLabelLanguageModel {\n");
+            sb.Append("  LanguageId: ").Append(LanguageId).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as WhiteLabelLanguageModel);
+        }
+
+        /// <summary>
+        /// Returns true if WhiteLabelLanguageModel instances are equal
+        /// </summary>
+        /// <param name="input">Instance of WhiteLabelLanguageModel to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(WhiteLabelLanguageModel input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.LanguageId == input.LanguageId ||
+                    (this.LanguageId != null &&
+                    this.LanguageId.Equals(input.LanguageId))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.LanguageId != null)
+                    hashCode = hashCode * 59 + this.LanguageId.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+
+}
diff --git a/src/Flipdish/packages.config b/src/Flipdish/packages.config
deleted file mode 100644
index 3caf34e0..00000000
--- a/src/Flipdish/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
-  <package id="JsonSubTypes" version="1.2.0" targetFramework="net45" developmentDependency="true" />
-</packages>
diff --git a/src/Flipdish/project.json b/src/Flipdish/project.json
new file mode 100644
index 00000000..d5d3017c
--- /dev/null
+++ b/src/Flipdish/project.json
@@ -0,0 +1,12 @@
+{
+    "supports": {},
+    "dependencies": {
+        "FubarCoder.RestSharp.Portable.Core": "4.0.7",
+        "FubarCoder.RestSharp.Portable.HttpClient": "4.0.7",
+        "Newtonsoft.Json": "10.0.3",
+        "JsonSubTypes": "1.2.0"
+    },
+    "frameworks": {
+        "netstandard1.3": {}
+    }
+}
\ No newline at end of file